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

List:       kde-commits
Subject:    kdepim/kpilot/kpilot
From:       Adriaan de Groot <groot () kde ! org>
Date:       2004-04-28 20:59:17
Message-ID: 20040428205917.49A3D9A4C () office ! kde ! org
[Download RAW message or body]

CVS commit by adridg: 

Patch from Joern. Thanks.
CCMAIL: 79925-done@bugs.kde.org


  M +18 -4     kpilot.cc   1.132
  M +1 -1      kpilotui.rc   1.11


--- kdepim/kpilot/kpilot/kpilot.cc  #1.131:1.132
@@ -55,4 +55,5 @@ static const char *kpilot_id =
 #include <kdebug.h>
 #include <kaction.h>
+#include <kactionclasses.h>
 #include <kstdaction.h>
 #include <kuniqueapp.h>
@@ -559,4 +560,11 @@ void KPilotInstaller::initMenu()
         KAction *a;
 
+        KActionMenu *syncPopup;
+
+        syncPopup = new KActionMenu(i18n("HotSync"), CSL1("hotsync"), 
+                actionCollection(), "popup_hotsync");
+        connect(syncPopup, SIGNAL(activated()), 
+                this, SLOT(slotHotSyncRequested()));
+
         // File actions
         a = new KAction(i18n("&HotSync"), CSL1("hotsync"), 0,
@@ -565,4 +573,5 @@ void KPilotInstaller::initMenu()
         a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
                 "should be a normal HotSync."));
+        syncPopup->insert(a);
 
         a = new KAction(i18n("&FastSync"), CSL1("fastsync"), 0,
@@ -571,4 +580,5 @@ void KPilotInstaller::initMenu()
         a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
                 "should be a FastSync (run conduits only)."));
+        syncPopup->insert(a);
 
         a = new KAction(i18n("Full&Sync"), CSL1("fullsync"), 0,
@@ -577,4 +587,5 @@ void KPilotInstaller::initMenu()
         a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
                 "should be a FullSync (check data on both sides)."));
+        syncPopup->insert(a);
 
 #ifdef DEBUG
@@ -585,4 +596,5 @@ void KPilotInstaller::initMenu()
                 "should just list the files on the Handheld and do nothing "
                 "else."));
+        syncPopup->insert(a);
 #endif
         a = new KAction(i18n("&Backup"), CSL1("backup"), 0,
@@ -591,4 +603,5 @@ void KPilotInstaller::initMenu()
         a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
                 "should back up the Handheld to the PC."));
+        syncPopup->insert(a);
 
         a = new KAction(i18n("&Restore"), CSL1("restore"), 0,
@@ -597,4 +610,5 @@ void KPilotInstaller::initMenu()
         a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
                 "should restore the Handheld from data on the PC."));
+        syncPopup->insert(a);
 
         a = new KAction(i18n("Rese&t Link"),CSL1("reload"), 0,

--- kdepim/kpilot/kpilot/kpilotui.rc  #1.10:1.11
@@ -35,5 +35,5 @@
 
 <ToolBar name="mainToolBar"><text>Main Toolbar</text>
-  <Action name="file_hotsync" />
+  <Action name="popup_hotsync" />
   <Action name="file_backup" />
   <Action name="file_reload" />


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