[FIX] Added a command widget

[FIX] More unneeded code in widget ctors removed
[FIX] Changed command delimiter to @ from %
[FIX] Request to save factored out of ObjectUI

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@158 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 11 insertions, 8 deletions

diff --git a/pokemodr/DialogUI.cpp b/pokemodr/DialogUI.cpp
index adaef591..98317e5e 100644
--- a/pokemodr/DialogUI.cpp
+++ b/pokemodr/DialogUI.cpp
@@ -19,10 +19,11 @@
 #include "DialogUI.h"
 
 // Command includes
-#include "commands/CommandWidget.h"
+#include "commands/FlagFlipCommand.h"
 
 // Pokemod includes
 #include "../pokemod/Dialog.h"
+#include "../pokemod/Pokemod.h"
 
 // KDE includes
 #include <KDialog>
@@ -31,7 +32,6 @@ DialogUI::DialogUI(Dialog* dialog, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
-    QMetaObject::connectSlotsByName(this);
     setObjects(dialog, new Dialog(*dialog));
 }
 
@@ -70,13 +70,15 @@ void DialogUI::on_varDialog_textChanged()
         static_cast<Dialog*>(modified())->setDialog(text);
 }
 
-void DialogUI::on_varCommand_currentIndexChanged(const int command)
+void DialogUI::on_varCommand_activated(const int command)
 {
     CommandWidget* commandWidget = NULL;
-    KDialog* dialog = NULL;
+    const Pokemod* pokemod = static_cast<const Pokemod*>(original()->pokemod());
     switch (command)
     {
         case Dialog::FlipFlag:
+            commandWidget = new FlagFlipCommand(pokemod, command);
+            break;
         case Dialog::SetFlag:
         case Dialog::UnsetFlag:
         case Dialog::RandomizeFlag:
@@ -128,11 +130,12 @@ void DialogUI::on_varCommand_currentIndexChanged(const int command)
     }
     if (commandWidget)
     {
-        dialog = new KDialog(this);
-        dialog->setButtons(KDialog::Ok | KDialog::Cancel);
+        KDialog* dialog = new KDialog(this);
+        dialog->setCaption(Dialog::CommandStr[command]);
         dialog->setMainWidget(commandWidget);
-        connect(dialog, SIGNAL(accept()), commandWidget, SLOT(accepted()));
-        connect(commandWidget, SIGNAL(command(const QString&)), varDialog, SLOT(const insertPlainText&));
+        dialog->setButtons(KDialog::Ok | KDialog::Cancel);
+        connect(dialog, SIGNAL(okClicked()), commandWidget, SLOT(accepted()));
+        connect(commandWidget, SIGNAL(command(const QString&)), varDialog, SLOT(insertPlainText(const QString&)));
         dialog->exec();
     }
 }