[Ktutorial-commits] SF.net SVN: ktutorial:[261] trunk/ktutorial/ktutorial-editor

[<dan...@us...>]

Revision: 261
          http://ktutorial.svn.sourceforge.net/ktutorial/?rev=261&view=rev
Author:   danxuliu
Date:     2010-09-26 21:00:50 +0000 (Sun, 26 Sep 2010)

Log Message:
-----------
Set a different object name for each EditionDialog based on the CommandWidget it contains.

Modified Paths:
--------------
    trunk/ktutorial/ktutorial-editor/src/EditActions.cpp
    trunk/ktutorial/ktutorial-editor/src/view/WaitForWidget.cpp
    trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForWidgetTest.cpp

Modified: trunk/ktutorial/ktutorial-editor/src/EditActions.cpp
===================================================================
--- trunk/ktutorial/ktutorial-editor/src/EditActions.cpp	2010-09-26 18:49:53 UTC (rev 260)
+++ trunk/ktutorial/ktutorial-editor/src/EditActions.cpp	2010-09-26 21:00:50 UTC (rev 261)
@@ -228,8 +228,11 @@
 int EditActions::showEditionDialog(CommandWidget* commandWidget) {
     commandWidget->setUndoStack(mUndoStack);
 
+    QString dialogName = commandWidget->objectName();
+    dialogName.replace("Widget", "Dialog");
+
     EditionDialog* dialog = new EditionDialog(commandWidget, mTutorialEditor);
-    dialog->setObjectName("editionDialog");
+    dialog->setObjectName(dialogName);
     return DialogRunner(dialog).exec();
 }
 

Modified: trunk/ktutorial/ktutorial-editor/src/view/WaitForWidget.cpp
===================================================================
--- trunk/ktutorial/ktutorial-editor/src/view/WaitForWidget.cpp	2010-09-26 18:49:53 UTC (rev 260)
+++ trunk/ktutorial/ktutorial-editor/src/view/WaitForWidget.cpp	2010-09-26 21:00:50 UTC (rev 261)
@@ -240,8 +240,11 @@
 
     Q_ASSERT(editionWidget);
 
+    QString dialogName = "edit" + editionWidget->objectName();
+    dialogName.replace("Widget", "Dialog");
+
     EditionDialog* dialog = new EditionDialog(editionWidget, this);
-    dialog->setObjectName("editionDialog");
+    dialog->setObjectName(dialogName);
     DialogRunner(dialog).exec();
 }
 

Modified: trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForWidgetTest.cpp
===================================================================
--- trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForWidgetTest.cpp	2010-09-26 18:49:53 UTC (rev 260)
+++ trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForWidgetTest.cpp	2010-09-26 21:00:50 UTC (rev 261)
@@ -405,7 +405,8 @@
     QVERIFY(eventNameLineEdit);
     eventNameLineEdit->setText("The new event name");
 
-    EditionDialog* dialog = mWidget->findChild<EditionDialog*>("editionDialog");
+    EditionDialog* dialog =
+                mWidget->findChild<EditionDialog*>("editWaitForEventDialog");
     QVERIFY(dialog);
     dialog->button(KDialog::Ok)->click();
 }
@@ -425,7 +426,8 @@
     QVERIFY(signalNameLineEdit);
     signalNameLineEdit->setText("The new signal name");
 
-    EditionDialog* dialog = mWidget->findChild<EditionDialog*>("editionDialog");
+    EditionDialog* dialog =
+                mWidget->findChild<EditionDialog*>("editWaitForSignalDialog");
     QVERIFY(dialog);
     dialog->button(KDialog::Ok)->click();
 }
@@ -440,7 +442,8 @@
     QVERIFY(windowObjectNameLineEdit);
     windowObjectNameLineEdit->setText("The new window object name");
 
-    EditionDialog* dialog = mWidget->findChild<EditionDialog*>("editionDialog");
+    EditionDialog* dialog =
+                mWidget->findChild<EditionDialog*>("editWaitForWindowDialog");
     QVERIFY(dialog);
     dialog->button(KDialog::Ok)->click();
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.