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

List:       kde-commits
Subject:    KDE/kdepim/kode
From:       Andre Duffeck <andre () duffeck ! de>
Date:       2007-03-28 10:12:06
Message-ID: 1175076726.601921.16054.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 647445 by duffeck:

Make the FormCreator create select elements


 M  +2 -0      compat/kdebug.h  
 M  +5 -0      compat/kmessagebox.cpp  
 M  +3 -0      compat/kmessagebox.h  
 M  +5 -2      kxforms/formcreator.cpp  
 M  +2 -1      kxforms/tests/simplefeature.xml  


--- trunk/KDE/kdepim/kode/compat/kdebug.h #647444:647445
@@ -22,6 +22,8 @@
 
 #include <QTextStream>
 
+#define k_funcinfo QString()
+
 class kDebug : public QTextStream
 {
   public:
--- trunk/KDE/kdepim/kode/compat/kmessagebox.cpp #647444:647445
@@ -5,6 +5,11 @@
 {
 }
 
+void KMessageBox::error( QWidget *parent, const QString &text,
+      const QString &caption )
+{
+}
+
 int KMessageBox::warningContinueCancel(QWidget *parent,
                          const QString &text,
                          const QString &caption )
--- trunk/KDE/kdepim/kode/compat/kmessagebox.h #647444:647445
@@ -40,6 +40,9 @@
     static void sorry( QWidget *parent, const QString &text,
       const QString &caption = QString() );
 
+    static void error( QWidget *parent, const QString &text,
+      const QString &caption = QString() );
+
     static int warningContinueCancel(QWidget *parent,
                          const QString &text,
                          const QString &caption = QString() );
--- trunk/KDE/kdepim/kode/kxforms/formcreator.cpp #647444:647445
@@ -159,7 +159,7 @@
     foreach( Schema::Relation r, element.elementRelations() ) {
       qDebug() << "  CHILD ELEMENT" << r.target();
       qDebug() << "    CHOICE" << r.choice();
-      if ( r.isList() ) {
+      if ( r.isList() && r.choice().isEmpty()) {
         bool isMixedList = r.choice().contains( "+" );
         if ( !list || r.choice().isEmpty() || currentChoice != r.choice() ) {
           list = section->tag( "list" );
@@ -201,7 +201,10 @@
         currentChoice = r.choice();
       } else if( !r.choice().isEmpty() ) {
         if( !choice ) {
-          choice = section->tag( "xf:select1" );
+          if( r.isList() )
+            choice = section->tag( "xf:select" );
+          else
+            choice = section->tag( "xf:select1" );
           choice->tag( "xf:label",  getLabel( element.ref(), element.name() ) );
           choice->attribute( "ref", (path + Reference( element.name() ) ).toString() );
         }
--- trunk/KDE/kdepim/kode/kxforms/tests/simplefeature.xml #647444:647445
@@ -44,6 +44,7 @@
     </product>
   </productcontext>
   <documentationstatus>
-    <dropped/>
+    <needinfo/>
+    <implementation/>
   </documentationstatus>
 </feature>
[prev in list] [next in list] [prev in thread] [next in thread]