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

List:       kde-commits
Subject:    KDE/kdepim/kpilot/kpilot
From:       Jason vanRijn Kasper <vR () movingparts ! net>
Date:       2008-08-15 4:28:58
Message-ID: 1218774538.020502.14025.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 847245 by vanrijn:

- more removing of backup/restore from obvious places. really not
  comfortable that these actually still work, being that we've paid zero
  attention to them. would rather then be not there than eat someone's palm,
  if we can help it.
- fixing hhtopc and pctohh. don't know how this happened, but pctohh was
  removed from the file menu, while hhtopc would have called pctohh. *shudder*
  that could have been bad.
- fixed defaults. default for KPilotSettings::syncType() was set to 6 in
  kpilot.kcfg. this is why we were always defaulting to "restore" mode. another
  ick! also, bumped default pilot speed from 9600 baud to something slightly
  more current with 38400. note, this is ignored for usb devices, but iirc,
  9600 baud destroys pilot-link when dealing with the old, original usb
  visor devices. avoid death and destruction with a sane default.


 M  +25 -9     kpilot.cc  
 M  +2 -2      kpilot.kcfg  
 M  +3 -0      pilotDaemon.cc  


--- trunk/KDE/kdepim/kpilot/kpilot/kpilot.cc #847244:847245
@@ -310,6 +310,31 @@
                 "should be a FullSync (check data on both sides)."));
         QObject::connect(a, SIGNAL(triggered()), parent, SLOT(slotFullSyncRequested()));
 
+        a = parent->actionCollection()->addAction( "file_PCtoHH");
+        a->setText(i18n("Copy PC to Handheld"));
+	a->setIcon(KIcon(CSL1("kpilot_hhtopc")));
+        a->setToolTip(i18n("Next HotSync will copy PC to Handheld."));
+        a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
+                "should copy all data from the PC to the Handheld, "
+                "overwriting entries on the Handheld."));
+        QObject::connect(a, SIGNAL(triggered()), parent, SLOT(slotPCtoHHRequested()));
+
+        a = parent->actionCollection()->addAction( "file_HHtoPC");
+        a->setText(i18n("Copy Handheld to PC"));
+	a->setIcon(KIcon(CSL1("kpilot_hhtopc")));
+        a->setToolTip(i18n("Next HotSync will copy Handheld to PC."));
+        a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
+                "should copy all data from the Handheld to the PC, "
+                "overwriting entries on the PC."));
+        QObject::connect(a, SIGNAL(triggered()), parent, SLOT(slotHHtoPCRequested()));
+
+        /*
+         * TODO: Not sure what the state of these are and we don't have
+         *       time/manpower to catch them before 4.2. These have been
+			*       taken out of kpilotui.rc for the time being. (Backup and
+			*       Restore). We can look at enabling them back later, after
+			*       the smoke has cleared.
+			*/
         a = parent->actionCollection()->addAction( "file_backup");
         a->setText(i18n("&Backup"));
         a->setIcon(KIcon(CSL1("kpilot_backup")));
@@ -326,15 +351,6 @@
                 "should restore the Handheld from data on the PC."));
         QObject::connect(a, SIGNAL(triggered()), parent, SLOT(slotRestoreRequested()));
 
-        a = parent->actionCollection()->addAction( "file_HHtoPC");
-        a->setText(i18n("Copy Handheld to PC"));
-	a->setIcon(KIcon(CSL1("kpilot_hhtopc")));
-        a->setToolTip(i18n("Next HotSync will be backup."));
-        a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
-                "should copy all data from the Handheld to the PC, "
-                "overwriting entries on the PC."));
-        QObject::connect(a, SIGNAL(triggered()), parent, SLOT(slotPCtoHHRequested()));
-
         a = parent->actionCollection()->addAction( "file_reload");
         a->setText(i18n("Rese&t Link"));
 	a->setIcon(KIcon(CSL1("kpilot_reset")));
--- trunk/KDE/kdepim/kpilot/kpilot/kpilot.kcfg #847244:847245
@@ -30,7 +30,7 @@
     <entry name="PilotSpeed" type="UInt">
         <label>
         </label>
-        <default>0</default>
+        <default>3</default>
     </entry>
     <entry name="Encoding" type="String">
         <label>
@@ -81,7 +81,7 @@
     <entry name="SyncType" type="UInt">
         <label>
         </label>
-        <default>6</default>
+        <default>1</default>
     </entry>
     <entry name="FullSyncOnPCChange" type="Bool">
         <label>
--- trunk/KDE/kdepim/kpilot/kpilot/pilotDaemon.cc #847244:847245
@@ -157,8 +157,11 @@
 	MI( SyncAction::SyncMode::eFullSync, false );
 	MI( SyncAction::SyncMode::eCopyPCToHH, false );
 	MI( SyncAction::SyncMode::eCopyHHToPC, false );
+   /*
+   TODO: Put these back when we're sure they still work. =:/
 	MI( SyncAction::SyncMode::eBackup, false );
 	MI( SyncAction::SyncMode::eRestore, false );
+   */
 #undef MI
 
 	connect( syncTypeActions, SIGNAL( triggered( QAction* ) ), daemon
[prev in list] [next in list] [prev in thread] [next in thread]