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

List:       kde-commits
Subject:    koffice/kexi/formeditor
From:       Jarosław Staniek <staniek () kde ! org>
Date:       2010-02-02 22:40:57
Message-ID: 1265150457.157039.12818.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1084344 by staniek:

Forms
*fixed disappearing properties of renamed widgets (regression in 2.x)



 M  +14 -10    form.cpp  


--- trunk/koffice/kexi/formeditor/form.cpp #1084343:1084344
@@ -1256,7 +1256,15 @@
 {
     if (oldname == newname)
         return;
-    if (!d->topTree->rename(oldname, newname)) { // rename failed
+
+    if (d->topTree->rename(oldname, newname)) {
+#ifdef KFD_SIGSLOTS
+        d->connBuffer->fixName(oldname, newname);
+#endif
+        ResizeHandleSet *temp = d->resizeHandles.take(oldname);
+        d->resizeHandles.insert(newname, temp);
+    }
+    else { // rename failed
         KMessageBox::sorry(widget()->topLevelWidget(),
                            i18n("Renaming widget \"%1\" to \"%2\" failed.",
                                 QString(oldname), QString(newname)));
@@ -1264,16 +1272,9 @@
 //  KMessageBox::sorry(widget()->topLevelWidget(),
 //  i18n("A widget with this name already exists. "
 //   "Please choose another name or rename existing widget."));
-        kWarning() << "widget named " << newname << " already exists";
+        kWarning() << "widget" << newname << "already exists, reverting rename";
         d->propertySet.changeProperty("objectName", oldname);
     }
-    else {
-#ifdef KFD_SIGSLOTS
-        d->connBuffer->fixName(oldname, newname);
-#endif
-        ResizeHandleSet *temp = d->resizeHandles.take(oldname);
-        d->resizeHandles.insert(newname, temp);
-    }
 }
 
 void Form::emitChildAdded(ObjectTreeItem *item)
@@ -1777,8 +1778,10 @@
 
     // check if the name is valid (ie is correct identifier) and there is no name \
conflict  if (property == "objectName") {
-        if (d->selected.count() != 1)
+        if (d->selected.count() != 1) {
+            kWarning() << "changing objectName property only allowed for single \
selection";  return;
+        }
         if (!isNameValid(value.toString()))
             return;
     }
@@ -1830,6 +1833,7 @@
         /*}*/
 
         if (property == "objectName") {
+            changeName(d->selected.first()->objectName().toLatin1(), \
                p.value().toByteArray());
             emit widgetNameChanged(d->selected.first()->objectName().toLatin1(), \
p.value().toByteArray());  }
         d->selected.first()->setProperty(property, value);


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