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

List:       kde-commits
Subject:    playground/utils/kdelirc/kcmlirc
From:       Michael Zanetti <michael_zanetti () gmx ! net>
Date:       2009-04-17 20:19:25
Message-ID: 1239999565.310028.18671.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 955519 by mzanetti:

fixes, cleanup


 M  +9 -2      editaction.cpp  
 M  +1 -1      editaction.h  
 M  +3 -4      kcmlirc.cpp  


--- trunk/playground/utils/kdelirc/kcmlirc/editaction.cpp #955518:955519
@@ -38,7 +38,7 @@
 #include <keditlistbox.h>
 #include <QStandardItemModel>
 
-EditAction::EditAction(IRAction *action, QWidget *parent, const bool &modal): \
KDialog(parent) +EditAction::EditAction(IRAction *action, const QStringList \
&modeList, QWidget *parent, const bool &modal): KDialog(parent)  {
     theAction = action;
     editActionBaseWidget = new EditActionBaseWidget();
@@ -56,8 +56,11 @@
     mainGroup.addButton(editActionBaseWidget->theChangeMode);
 
 
+    editActionBaseWidget->theModes->addItem(i18n("[Exit current mode]"));
+    foreach(QString mode, modeList){
+	editActionBaseWidget->theModes->addItem(mode);
+    }
 
-
     updateApplications();
     connectSignalsAndSlots();
     //initDBusApplications();
@@ -146,6 +149,10 @@
 
     if (theAction->isModeChange()) { // change mode
         editActionBaseWidget->theChangeMode->setChecked(true);
+	kDebug() << "is Mode change:" << theAction->object() << "at index" << \
editActionBaseWidget->theModes->findText(theAction->object()); +	for(int i = 0; i < \
editActionBaseWidget->theModes->count(); ++i){ +	  kDebug() << "combobox contents:" \
<< editActionBaseWidget->theModes->itemText(i); +	}
         if (theAction->object().isEmpty())
             editActionBaseWidget->theModes->setCurrentIndex(editActionBaseWidget->theModes->findText(i18n("[Exit \
current mode]")));  else
--- trunk/playground/utils/kdelirc/kcmlirc/editaction.h #955518:955519
@@ -74,7 +74,7 @@
 
 
 public:
-    explicit EditAction(IRAction *action, QWidget *parent = 0, const bool &modal = \
false); +    explicit EditAction(IRAction *action, const QStringList &modeList, \
QWidget *parent = 0, const bool &modal = false);  ~EditAction();
 
 
--- trunk/playground/utils/kdelirc/kcmlirc/kcmlirc.cpp #955518:955519
@@ -168,14 +168,13 @@
 
 void KCMLirc::slotEditAction()
 {
-    EditAction theDialog(currentAction());
     QTreeWidgetItem *item = theKCMLircBase->theModes->selectedItems().first();
     if (item->parent())
         item = item->parent();
-    //TODO: this in not nice should be rewritten
-    theDialog.addItem(i18n("[Exit current mode]"));
+    QStringList modeList;
     for (int i = 0; i < item->childCount(); i++)
-        theDialog.addItem(item->child(i)->text(0));
+        modeList << item->child(i)->text(0);
+    EditAction theDialog(currentAction(), modeList);
     if (theDialog.exec() == QDialog::Accepted) {
         theDialog.writeBack();
         emit changed(true);


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