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

List:       kde-commits
Subject:    kdepim/kpilot/conduits/vcalconduit
From:       Adriaan de Groot <groot () kde ! org>
Date:       2004-10-03 12:36:25
Message-ID: 20041003123625.8DDDD126E1 () office ! kde ! org
[Download RAW message or body]

CVS commit by adridg: 

Handle timeout / keeping the pilot awake.


  M +15 -6     vcal-conduitbase.cc   1.73


--- kdepim/kpilot/conduits/vcalconduit/vcal-conduitbase.cc  #1.72:1.73
@@ -651,9 +651,18 @@ int VCalConduitBase::resolveConflict(KCa
         {
                 // TODO: This is messed up!!!
-                return KMessageBox::warningYesNo(NULL,
-                        i18n("The following item was modified both on the Pilot and \
                on your PC:\nPC entry:\n\t")+e->summary()+i18n("\nPilot \
                entry:\n\t")+getTitle(de)+
-                                i18n("\n\nShould the Pilot entry overwrite the PC \
                entry? If you select \"No\", the PC entry will overwrite the Pilot \
                entry."),
-                        i18n("Conflicting Entries")
-                )==KMessageBox::No;
+                QString query = i18n("The following item was modified "
+                        "both on the Pilot and on your PC:\nPC entry:\n\t");
+                query += e->summary();
+                query += i18n("\nPilot entry:\n\t");
+                query += getTitle(de);
+                query += i18n("\n\nShould the Pilot entry overwrite the "
+                        "PC entry? If you select \"No\", the PC entry will "
+                        "overwrite the Pilot entry.");
+
+                return KMessageBox::No == questionYesNo(
+                        query,
+                        i18n("Conflicting Entries"),
+                        QString::null,
+                        0 /* Never timeout */);
         }
         return getConflictResolution();


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