Changeset 5944 for trunk/qt-gui

Timestamp:

12/09/07 20:14:38 (12 months ago)

Author:

flynd

Message:

Merged some fixes from qt4-gui:

• 5898: Let double clicking in owner manager list open the modify dialog.
• (5800): Moved MSN_PPID define to gui-defines.h

Location:

trunk/qt-gui/src

Files:

• gui-defines.h (modified) (1 diff)
• mainwin.h (modified) (1 diff)
• ownermanagerdlg.cpp (modified) (2 diffs)
• ownermanagerdlg.h (modified) (1 diff)
• usereventdlg.cpp (modified) (1 diff)

trunk/qt-gui/src/gui-defines.h

@@ -28 +28 @@
 #define COLOR_RECEIVED "red"
 
+// Defined here until there is a way to get constant from daemon
+#define MSN_PPID 0x4D534E5F
 
 enum UserMenu {

trunk/qt-gui/src/mainwin.h

@@ -43 +43 @@
 #include "gui-defines.h"
 #include "support.h"
-
-#define MSN_PPID 0x4D534E5F
 
 class QStyle;

trunk/qt-gui/src/ownermanagerdlg.cpp

@@ -272 +272 @@
   connect(ownerView, SIGNAL(spacePressed(QListViewItem *)),
           this, SLOT(slot_listClicked(QListViewItem *)));
+  connect(ownerView, SIGNAL(doubleClicked(QListViewItem*)),
+      this, SLOT(modifyOwner(QListViewItem*)));
   connect(btnAdd, SIGNAL(clicked()), this, SLOT(slot_addClicked()));
   connect(btnRegister, SIGNAL(clicked()), this, SLOT(slot_registerClicked()));
@@ -389 +391 @@
 void OwnerManagerDlg::slot_modifyClicked()
 {
-  OwnerItem *i = dynamic_cast<OwnerItem *>(ownerView->selectedItem());
+  modifyOwner(ownerView->selectedItem());
+}
+
+void OwnerManagerDlg::modifyOwner(QListViewItem* item)
+{
+  OwnerItem *i = dynamic_cast<OwnerItem *>(item);
   if (i == 0) return;
-  
+
   OwnerEditDlg *d = new OwnerEditDlg(server, i->Id(), i->PPID(), this);
   d->show();

trunk/qt-gui/src/ownermanagerdlg.h

@@ -90 +90 @@
   void slot_doneregister(bool, char *, unsigned long);
   void slot_modifyClicked();
+  void modifyOwner(QListViewItem* item);
   void slot_deleteClicked();
   void slot_update();

trunk/qt-gui/src/usereventdlg.cpp

@@ -74 +74 @@
 #include "emoticon.h"
 #include "ewidgets.h"
+#include "gui-defines.h"
 #include "mainwin.h"
 #include "messagebox.h"