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

List:       kde-commits
Subject:    koffice/kexi/plugins/forms
From:       Jarosław Staniek <staniek () kde ! org>
Date:       2010-04-02 17:25:21
Message-ID: 20100402172521.1E3A3AC888 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1110295 by staniek:

skip subform code 


 M  +12 -4     kexidbfactory.cpp  


--- trunk/koffice/kexi/plugins/forms/kexidbfactory.cpp #1110294:1110295
@@ -382,14 +382,18 @@
     const bool designMode = options & KFormDesigner::WidgetFactory::DesignViewMode;
     bool createContainer = false;
 
-    if (c == "KexiDBSubForm")
-        w = new KexiDBSubForm(container->form(), p);
-    else if (c == "KexiDBLineEdit") {
+    if (c == "KexiDBLineEdit") {
         w = new KexiDBLineEdit(p);
 //2.0 moved to FormWidgetInterface
 //        if (designMode)
 //            w->setCursor(QCursor(Qt::ArrowCursor));
-    } else if (c == "KexiDBTextEdit") {
+    }
+#ifndef KEXI_NO_SUBFORM
+    if (c == "KexiDBSubForm") {
+        w = new KexiDBSubForm(container->form(), p);
+    }
+#endif
+    else if (c == "KexiDBTextEdit") {
         w = new KexiDBTextEdit(p);
 //2.0 moved to FormWidgetInterface
 //        if (designMode)
@@ -550,6 +554,7 @@
         }
         return true;
     }
+#ifndef KEXI_NO_SUBFORM
     else if (args.classname == "KexiDBSubForm") {
 //! @todo
         // open the form in design mode
@@ -563,6 +568,7 @@
         }
         return true;
     }
+#endif
 #if 0
     else if (   args.classname == "KexiDBDateEdit" || args.classname == \
                "KexiDBDateTimeEdit"
              || args.classname == "KexiDBTimeEdit" /*|| classname == \
"KexiDBIntSpinBox" || classname == "KexiDBDoubleSpinBox"*/) @@ -674,10 +680,12 @@
              && property != "textInteractionFlags"
 //! @todo support textInteractionFlags property of QLabel and QTextEdit
              ;
+#ifndef KEXI_NO_SUBFORM
     else if (classname == "KexiDBSubForm")
         ok = property != "dragAutoScroll"
              && property != "resizePolicy"
              && property != "focusPolicy";
+#endif
     else if (classname == "KexiDBForm")
         ok = property != "iconText"
              && property != "geometry" /*nonsense for toplevel widget; for size, \
"size" property is used*/;


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