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

List:       kde-commits
Subject:    koffice/kexi/plugins/forms
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2008-12-25 21:42:44
Message-ID: 1230241364.693589.18631.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 901545 by staniek:

Forms
- properly fill background
= use foreach() here and there



 M  +10 -12    kexiformview.cpp  
 M  +1 -0      widgets/kexidbform.cpp  


--- trunk/koffice/kexi/plugins/forms/kexiformview.cpp #901544:901545
@@ -314,9 +314,8 @@
         conn, dataSourceString.toLatin1(), dataSourcePartClassString == \
"org.kexi-project.table");  if (!tableOrQuery.table() && !tableOrQuery.query())
         return;
-    for (KFormDesigner::ObjectTreeDictIterator it(*form()->objectTree()->dict());
-            it.current(); ++it) {
-        KexiDBAutoField *afWidget = \
dynamic_cast<KexiDBAutoField*>(it.current()->widget()); +    foreach \
(KFormDesigner::ObjectTreeItem *item, *form()->objectTree()->hash()) { +        \
KexiDBAutoField *afWidget = dynamic_cast<KexiDBAutoField*>(item->widget());  if \
                (afWidget) {
             KexiDB::QueryColumnInfo *colInfo = \
tableOrQuery.columnInfo(afWidget->dataSource());  if (colInfo) {
@@ -343,18 +342,17 @@
     if (!tableOrQuery.table() && !tableOrQuery.query())
         return;
 
-    for (KFormDesigner::ObjectTreeDictIterator it(*form()->objectTree()->dict());
-            it.current(); ++it) {
+    foreach (KFormDesigner::ObjectTreeItem *item, *form()->objectTree()->hash()) {
         // (delayed) set values for subproperties
 //! @todo this could be at the KFD level, but KFD is going to be merged anyway with \
kexiforms, right?  KFormDesigner::WidgetWithSubpropertiesInterface* subpropIface
-        = dynamic_cast<KFormDesigner::WidgetWithSubpropertiesInterface*>(it.current()->widget());
                
-        if (subpropIface && subpropIface->subwidget() && \
it.current()->subproperties()) { +        = \
dynamic_cast<KFormDesigner::WidgetWithSubpropertiesInterface*>(item->widget()); +     \
if (subpropIface && subpropIface->subwidget() && item->subproperties()) {  QWidget \
                *subwidget = subpropIface->subwidget();
-            QMap<QString, QVariant>* subprops = it.current()->subproperties();
+            QMap<QString, QVariant>* subprops = item->subproperties();
             for (QMap<QString, QVariant>::const_iterator subpropIt = \
                subprops->constBegin(); subpropIt != subprops->constEnd(); \
                ++subpropIt) {
                 kexipluginsdbg << "KexiFormView::loadForm(): delayed setting of the \
                subproperty: widget="
-                << it.current()->widget()->objectName() << " prop=" << \
subpropIt.key() << " val=" +                << item->widget()->objectName() << " \
prop=" << subpropIt.key() << " val="  << subpropIt.value();
 
                 QMetaProperty meta = KexiUtils::findPropertyWithSuperclasses(
@@ -1154,9 +1152,9 @@
         group->addCommand(insertCmd, false/*don't exec twice*/);
 
         KFormDesigner::ObjectTreeItem *newWidgetItem
-        = form()->objectTree()->dict()->find(insertCmd->widgetName());
-        KexiDBAutoField* newWidget
-        = newWidgetItem ? dynamic_cast<KexiDBAutoField*>(newWidgetItem->widget()) : \
0; +            = form()->objectTree()->hash()->value(insertCmd->widgetName());
+        KexiDBAutoField* newWidget = newWidgetItem 
+            ? dynamic_cast<KexiDBAutoField*>(newWidgetItem->widget()) : 0;
         widgetsToSelect.append(newWidget);
 //#if 0
         KFormDesigner::CommandGroup *subGroup
--- trunk/koffice/kexi/plugins/forms/widgets/kexidbform.cpp #901544:901545
@@ -117,6 +117,7 @@
     kexipluginsdbg << "KexiDBForm::KexiDBForm(): ";
     setCursor(QCursor(Qt::ArrowCursor)); //to avoid keeping Size cursor when moving \
from form's boundaries  setAcceptDrops(true);
+    setAutoFillBackground(true);
 }
 
 KexiDBForm::~KexiDBForm()


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