[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kode/kxforms
From:       Cornelius Schumacher <schumacher () kde ! org>
Date:       2006-03-29 15:17:16
Message-ID: 1143645436.485153.5348.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 524032 by cschumac:

Implement support for form labels.


 M  +2 -0      formcreator.cpp  
 M  +20 -1     formgui.cpp  
 M  +2 -0      formgui.h  
 M  +1 -0      tests/features.kxform  
 M  +4 -0      tests/features.kxform.check  
 M  +6 -0      tests/project.kxform.check  


--- trunk/KDE/kdepim/kode/kxforms/formcreator.cpp #524031:524032
@@ -61,6 +61,8 @@
   qDebug() << "ELEMENT" << element.name(); 
   XmlBuilder *form = xml->tag( "form" )->attribute( "ref", element.name() );
 
+  form->tag( "xf:label", humanizeString( element.name() ) );
+
   foreach( Schema::Relation r, element.attributeRelations() ) {
     Schema::Attribute a = mDocument.attribute( r );
 
--- trunk/KDE/kdepim/kode/kxforms/formgui.cpp #524031:524032
@@ -26,6 +26,7 @@
 #include "input.h"
 #include "textarea.h"
 #include "select1.h"
+#include "prefs.h"
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -43,10 +44,25 @@
 
   mTopLayout = new QVBoxLayout( this );
 
+
+  mLabel = new QLabel( this );
+  QFont f = mLabel->font();
+  f.setBold( true );
+  mLabel->setFont( f );
+  mTopLayout->addWidget( mLabel );
+  mLabel->hide();
+
   mRefLabel = new QLabel( this );
+  f = mRefLabel->font();
+  f.setPointSize( f.pointSize() - 2 );
+  mRefLabel->setFont( f );
   mTopLayout->addWidget( mRefLabel );
 
   setRefLabel( "[undefined reference]" );
+
+  if ( !Prefs::developerMode() ) {
+    mRefLabel->hide();
+  }
 }
 
 void FormGui::setRef( const Reference &ref )
@@ -80,7 +96,10 @@
     kDebug() << "  Found element '" << tag << "'" << endl;
     XFormsCommon c = XFormsCommon::parseElement( e );
     GuiElement *guiElement = 0;
-    if ( tag == "list" ) {
+    if ( tag == "xf:label" ) {
+      mLabel->setText( e.text() );
+      mLabel->show();
+    } else if ( tag == "list" ) {
       guiElement = new KXForms::List( mManager, c.label(), this );
       guiElement->setRef( ref() );
       hasList = true;
--- trunk/KDE/kdepim/kode/kxforms/formgui.h #524031:524032
@@ -63,6 +63,8 @@
     GuiElement::List mGuiElements;
 
     QBoxLayout *mTopLayout;
+
+    QLabel *mLabel;
     QLabel *mRefLabel;
 };
 
--- trunk/KDE/kdepim/kode/kxforms/tests/features.kxform #524031:524032
@@ -1,5 +1,6 @@
 <kxforms>
   <form ref="features">
+    <xf:label>Features</xf:label>
     <list>
       <xf:label>Categories</xf:label>
       <itemclass ref="category">
--- trunk/KDE/kdepim/kode/kxforms/tests/features.kxform.check #524031:524032
@@ -1,5 +1,6 @@
 <kxforms>
   <form ref="features">
+    <xf:label>Features</xf:label>
     <list>
       <xf:label>Categories</xf:label>
       <itemclass ref="category">
@@ -8,6 +9,7 @@
     </list>
   </form>
   <form ref="responsible">
+    <xf:label>Responsible</xf:label>
     <xf:input ref="@name">
       <xf:label>Name</xf:label>
     </xf:input>
@@ -16,6 +18,7 @@
     </xf:input>
   </form>
   <form ref="feature">
+    <xf:label>Feature</xf:label>
     <xf:select1 ref="@status">
       <xf:label>Status</xf:label>
       <xf:item>
@@ -57,6 +60,7 @@
     </list>
   </form>
   <form ref="category">
+    <xf:label>Category</xf:label>
     <xf:input ref="@name">
       <xf:label>Name</xf:label>
     </xf:input>
--- trunk/KDE/kdepim/kode/kxforms/tests/project.kxform.check #524031:524032
@@ -1,5 +1,6 @@
 <kxforms>
   <form ref="project">
+    <xf:label>Project</xf:label>
     <xf:input ref="@name">
       <xf:label>Name</xf:label>
     </xf:input>
@@ -29,11 +30,13 @@
     </list>
   </form>
   <form ref="arch">
+    <xf:label>Arch</xf:label>
     <xf:input ref=".">
       <xf:label>Architecture</xf:label>
     </xf:input>
   </form>
   <form ref="path">
+    <xf:label>Path</xf:label>
     <xf:input ref="@project">
       <xf:label>Project</xf:label>
     </xf:input>
@@ -42,6 +45,7 @@
     </xf:input>
   </form>
   <form ref="repository">
+    <xf:label>Repository</xf:label>
     <xf:input ref="@name">
       <xf:label>Name</xf:label>
     </xf:input>
@@ -59,6 +63,7 @@
     </list>
   </form>
   <form ref="package">
+    <xf:label>Package</xf:label>
     <xf:input ref="@name">
       <xf:label>Name</xf:label>
     </xf:input>
@@ -67,6 +72,7 @@
     </xf:input>
   </form>
   <form ref="person">
+    <xf:label>Person</xf:label>
     <xf:input ref="@role">
       <xf:label>Role</xf:label>
     </xf:input>
[prev in list] [next in list] [prev in thread] [next in thread]