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

List:       kde-commits
Subject:    koffice/kexi
From:       Jarosław Staniek <staniek () kde ! org>
Date:       2009-11-01 1:37:21
Message-ID: 1257039441.965349.2288.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1043196 by staniek:

Forms
*fix setting data source: use QUndo's merging rather than extra code



 M  +17 -10    doc/dev/CHANGELOG-Kexi-js  
 M  +11 -9     formeditor/form.cpp  


--- trunk/koffice/kexi/doc/dev/CHANGELOG-Kexi-js #1043195:1043196
@@ -42,18 +42,11 @@
 - general: use KPluginInfo for any kind of plugins, what would allow for creating \
                main window
            (esp. the project navigator) without loading any plugins in advance
 
-2009-10-05..07
+2009-10-31
 Forms
-* Use KPluginLoader for widget factory plugins
-Plugins
-* Use KPluginLoader for Kexi plugins
-CSV Import Dialog
-* Improve layout
-* Fix updating "start row" widget when there is only single row of data or no rows \
                at all
-* Fix crash when importing just single \n character as data
+*fix setting data source: use QUndo's merging rather than extra code
+TODO: clearing widget's dataSource property sets datasource to "" in XML instead of \
clrearing it completely; the same for form's dataSource and dataSourcePartClass \
properties  
-~~~~~~~~~~~~~~~~ 2.2 alpha 1 ~~~~~~~~~~~~~~~~
-
 2009-10-28..30
 Forms
 *API: WidgetInfo
@@ -68,6 +61,20 @@
 General
 *versioning in par with koffice again
 
+~~~~~~~~~~~~~~~~ 2.2 alpha 1 ~~~~~~~~~~~~~~~~
+
+
+2009-10-05..07
+Forms
+* Use KPluginLoader for widget factory plugins
+Plugins
+* Use KPluginLoader for Kexi plugins
+CSV Import Dialog
+* Improve layout
+* Fix updating "start row" widget when there is only single row of data or no rows \
at all +* Fix crash when importing just single \n character as data
+
+
 ~~~~~~~~~~~~~~~~ 2.0 alpha 13 ~~~~~~~~~~~~~~~~
 
 2009-10-26
--- trunk/koffice/kexi/formeditor/form.cpp #1043195:1043196
@@ -1815,15 +1815,16 @@
     if (d->isUndoing && !d->isRedoing) // && !d->insideAddPropertyCommand)
         return;
 
-    const bool alterLastCommand = d->lastCommand && d->lastCommand->propertyName() \
== property; +//    const bool alterLastCommand = d->lastCommand && \
d->lastCommand->propertyName() == property;  
     if (d->selected.count() == 1) { // one widget selected
         // If the last command is the same, we just change its value
-        if (alterLastCommand && !d->isRedoing) {
+//! @todo add to merge in PropertyCommand if needed
+/*        if (alterLastCommand && !d->isRedoing) {
             d->lastCommand->setValue(value);
             emit modified();
         }
-        else  {
+        else  {*/
             if (d->slotPropertyChanged_addCommandEnabled && !d->isRedoing) {
                 addPropertyCommand(d->selected.first()->objectName().toLatin1(),
                     d->selected.first()->property(property), value, property, \
DontExecuteCommand); @@ -1834,7 +1835,7 @@
             if (tree && p.isModified()) {
                 tree->addModifiedProperty(property, \
d->selected.first()->property(property));  }
-        }
+        /*}*/
 
         if (property == "objectName") {
             emit widgetNameChanged(d->selected.first()->objectName().toLatin1(), \
p.value().toByteArray()); @@ -1843,10 +1844,11 @@
         handleWidgetPropertyChanged(d->selected.first(), property, value);
     }
     else {
-        if (alterLastCommand && !d->isRedoing) {
+//! @todo add to merge in PropertyCommand if needed
+/*        if (alterLastCommand && !d->isRedoing) {
             d->lastCommand->setValue(value);
         }
-        else {
+        else {*/
             if (d->slotPropertyChanged_addCommandEnabled && !d->isRedoing) {
                 // We store old values for each widget
                 QHash<QByteArray, QVariant> oldValues;
@@ -1855,14 +1857,14 @@
                 }
                 addPropertyCommand(oldValues, value, property, DontExecuteCommand);
             }
-        }
+/*        }*/
 
         foreach(QWidget* widget, d->selected) {
-            if (!alterLastCommand) {
+//            if (!alterLastCommand) {
                 ObjectTreeItem *titem = objectTree()->lookup(widget->objectName());
                 if (titem && p.isModified())
                     titem->addModifiedProperty(property, \
                widget->property(property));
-            }
+//            }
             widget->setProperty(property, value);
             handleWidgetPropertyChanged(widget, property, value);
         }


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