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

List:       kde-commits
Subject:    branches/work/kdelirc/kcmlirc
From:       Michael Zanetti <michael_zanetti () gmx ! net>
Date:       2010-01-31 22:05:21
Message-ID: 1264975521.723426.28626.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1083248 by mzanetti:

initial dbusaction ui


 M  +5 -6      CMakeLists.txt  
 A             actioncontainer.cpp   [License: GPL (v2+)]
 A             actioncontainer.h   [License: GPL (v2+)]
 A             actioncontainer.ui  
 A             addaction.cpp   [License: GPL (v2/3)]
 A             addaction.h   [License: GPL (v2/3)]
 A             addaction.ui  
 D             addactionbase.ui  
 A             configurationwidget.ui   kcmlircbase.ui#1083156
 A             editdbusaction.cpp   [License: GPL (v2+)]
 A             editdbusaction.h   [License: GPL (v2+)]
 A             editdbusaction.ui  
 M  +13 -29    kcmlirc.cpp  
 M  +3 -1      kcmlirc.h  
 D             kcmlircbase.ui  


--- branches/work/kdelirc/kcmlirc/CMakeLists.txt #1083247:1083248
@@ -13,17 +13,16 @@
 
 set(kcm_lirc_PART_SRCS 
 #    selectprofile.cpp
-   kcmlirc.cpp 
-#    addaction.cpp 
-#    editmode.cpp 
-#    editaction.cpp
-#    newmodedialog.cpp
+   kcmlirc.cpp
+   addaction.cpp
+   actioncontainer.cpp
+   editdbusaction.cpp
    model.cpp
    )
 
 qt4_add_dbus_adaptor(kcm_lirc_PART_SRCS org.kde.kcmlirc.xml kcmlirc.h KCMLirc)
 
-kde4_add_ui_files(kcm_lirc_PART_SRCS addactionbase.ui newmode.ui editactionbase.ui \
editmodebase.ui kcmlircbase.ui ) +kde4_add_ui_files(kcm_lirc_PART_SRCS addaction.ui \
actioncontainer.ui editdbusaction.ui configurationwidget.ui )  
 kde4_add_plugin(kcm_lirc ${kcm_lirc_PART_SRCS})
 
--- branches/work/kdelirc/kcmlirc/kcmlirc.cpp #1083247:1083248
@@ -25,7 +25,9 @@
 
 
 #include "kcmlirc.h"
-// #include "addaction.h"
+#include "addaction.h"
+#include "actioncontainer.h"
+
 // #include "newmodedialog.h"
 #include "profileserver.h"
 // #include "selectprofile.h"
@@ -59,6 +61,7 @@
 
 #define VERSION "version name goes here"
 #include <remote.h>
+#include "actioncontainer.h"
 
 
 
@@ -142,6 +145,9 @@
 
 
 void KCMLirc::connectSignalsAndSlots() {
+  
+  connect(ui.pbAddAction, SIGNAL(clicked(bool)), SLOT(addAction()));
+  
     connect(ui.tvRemotes, SIGNAL(itemSelectionChanged()), this, \
                SLOT(updateActions()));
     connect(ui.tvRemotes, SIGNAL(itemSelectionChanged()), this, \
SLOT(updateModesStatus()));  //     connect(ui.theActions, \
SIGNAL(itemSelectionChanged()), this, SLOT(updateActionsStatus())); @@ -217,35 \
+223,13 @@  //     }
 }
 
-void KCMLirc::slotAddAction()
+void KCMLirc::addAction()
 {
-//     kDebug();
-//     if (ui.theModes->selectedItems().isEmpty()){
-//         return;
-//     }
-//     Mode m = ui.theModes->currentItem()->data(0, Qt::UserRole).value<Mode>();
-//     QPointer<AddAction> theDialog = new AddAction(this, 0, m);
-//
-//     // populate the modes list box
-//     QTreeWidgetItem *item = ui.theModes->selectedItems().first();
-//     if (item->parent())
-//         item = item->parent();
-//     theDialog->theModes->setEnabled(item->child(0));
-//     theDialog->theSwitchMode->setEnabled(item->child(0));
-//     for (int i = 0; i < item->childCount(); i++) {
-//         QListWidgetItem *a = new QListWidgetItem(item->child(i)->text(0),
-//                 theDialog->theModes);
-//         if (item->isSelected()) {
-//             a->setSelected(true);
-//             theDialog->theModes->setCurrentItem(a);
-//         }
-//     }
-//
-//     if (theDialog->exec() == QDialog::Accepted) {
-//         allActions.addAction(theDialog->getAction());
-//         updateActions();
-//         emit changed(true);
-//     }
+    AddAction addActionDialog;
+    if(addActionDialog.exec() == KDialog::Accepted){
+        ActionContainer actionContainer(addActionDialog.getType());
+        actionContainer.exec();
+    }    
 }
 
 void KCMLirc::slotRemoveAction()
--- branches/work/kdelirc/kcmlirc/kcmlirc.h #1083247:1083248
@@ -82,12 +82,14 @@
     void slotAddMode();
     void slotRemoveMode();
     void slotSetDefaultMode();
-    void slotAddAction();
     void slotAddActions();
     void slotEditAction();
     void slotRemoveAction();
     void slotEditMode();
 
+private slots:
+  void addAction();  
+    
 signals:
     void haveButton(const QString &remote, const QString &button);
 


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