author | zautrix <zautrix> | 2005-02-09 19:31:50 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-09 19:31:50 (UTC) |
commit | a9eff860d8399a198a9fdc04e09ed369097fc745 (patch) (unidiff) | |
tree | c953f38ef75bed96bdedd61b1b4bf369e08cddee | |
parent | 22d5db839c9741cb2e988e84bbb367617934ebd9 (diff) | |
download | kdepimpi-a9eff860d8399a198a9fdc04e09ed369097fc745.zip kdepimpi-a9eff860d8399a198a9fdc04e09ed369097fc745.tar.gz kdepimpi-a9eff860d8399a198a9fdc04e09ed369097fc745.tar.bz2 |
fixes
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 9 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 18 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 1 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 13 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.h | 2 |
5 files changed, 34 insertions, 9 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 65bb075..6ccf763 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,98 +1,107 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.0.6 ************ | ||
4 | |||
5 | Two bugfixes in the pi-sync mode. | ||
6 | KO/Pi: | ||
7 | Made the todolist using alternate background. | ||
8 | |||
9 | Other minor fixes in KO/Pi. | ||
10 | |||
11 | |||
3 | ********** VERSION 2.0.5 ************ | 12 | ********** VERSION 2.0.5 ************ |
4 | 13 | ||
5 | Bugfixes in KO/Pi. | 14 | Bugfixes in KO/Pi. |
6 | 15 | ||
7 | ********** VERSION 2.0.4 ************ | 16 | ********** VERSION 2.0.4 ************ |
8 | 17 | ||
9 | KO/Pi: | 18 | KO/Pi: |
10 | Fixed problem loading translations for summary/location edit boxes in event/todo editor. | 19 | Fixed problem loading translations for summary/location edit boxes in event/todo editor. |
11 | 20 | ||
12 | Added a general "select week number" to the toolbar. | 21 | Added a general "select week number" to the toolbar. |
13 | 22 | ||
14 | Fixed some small problem of the new features introduced in version 2.0.3. | 23 | Fixed some small problem of the new features introduced in version 2.0.3. |
15 | 24 | ||
16 | Made it possible to specify one specific category as category color, | 25 | Made it possible to specify one specific category as category color, |
17 | if more than one categories are selected. | 26 | if more than one categories are selected. |
18 | 27 | ||
19 | Fixed a bug in saving colors for categories with non-ascii characters. | 28 | Fixed a bug in saving colors for categories with non-ascii characters. |
20 | (Like, e.g. German Umlauts). | 29 | (Like, e.g. German Umlauts). |
21 | Propably you have to set your colors again for those categories. | 30 | Propably you have to set your colors again for those categories. |
22 | 31 | ||
23 | 32 | ||
24 | ********** VERSION 2.0.3 ************ | 33 | ********** VERSION 2.0.3 ************ |
25 | 34 | ||
26 | KO/Pi: | 35 | KO/Pi: |
27 | Added feature for changing alarm settings for many items at once: | 36 | Added feature for changing alarm settings for many items at once: |
28 | Open list view (or search dialog), select the desired items and choose in | 37 | Open list view (or search dialog), select the desired items and choose in |
29 | the popup menu: Set alarm for selected... | 38 | the popup menu: Set alarm for selected... |
30 | 39 | ||
31 | Added to the event/todo viewer the option to send an email to | 40 | Added to the event/todo viewer the option to send an email to |
32 | all attendees or all selected (with RSVP) attendees. | 41 | all attendees or all selected (with RSVP) attendees. |
33 | 42 | ||
34 | Made the week-month mode changing in month view faster. | 43 | Made the week-month mode changing in month view faster. |
35 | 44 | ||
36 | Made month view better useable with keyboard. | 45 | Made month view better useable with keyboard. |
37 | Now TAB key jumps to next cell with an event/todo. | 46 | Now TAB key jumps to next cell with an event/todo. |
38 | Scroll in cell with coursor keys, scroll in time (next week) with | 47 | Scroll in cell with coursor keys, scroll in time (next week) with |
39 | Shift/Control + coursorkeys. | 48 | Shift/Control + coursorkeys. |
40 | 49 | ||
41 | Fixed bug that the todo view flat mode was reset after first view update. | 50 | Fixed bug that the todo view flat mode was reset after first view update. |
42 | 51 | ||
43 | If a todo is displayed closed in the todo view, | 52 | If a todo is displayed closed in the todo view, |
44 | it is now displayed in overdue/due today color depending on the subtodos overdue/due today properties. | 53 | it is now displayed in overdue/due today color depending on the subtodos overdue/due today properties. |
45 | 54 | ||
46 | Added info about the numbers of years to the caption (title) information about a birthday event. | 55 | Added info about the numbers of years to the caption (title) information about a birthday event. |
47 | 56 | ||
48 | Made completion date in todo editor editable. | 57 | Made completion date in todo editor editable. |
49 | 58 | ||
50 | Added possibility to save/load templates for journals. | 59 | Added possibility to save/load templates for journals. |
51 | (Which is just a simple "save text to file" or "insert text from file". | 60 | (Which is just a simple "save text to file" or "insert text from file". |
52 | 61 | ||
53 | ********** VERSION 2.0.2 ************ | 62 | ********** VERSION 2.0.2 ************ |
54 | 63 | ||
55 | KO/Pi: | 64 | KO/Pi: |
56 | Fixed the layout problem of the day label buttons | 65 | Fixed the layout problem of the day label buttons |
57 | of the agenda view introduced in version 2.0.1. | 66 | of the agenda view introduced in version 2.0.1. |
58 | 67 | ||
59 | Added WhatsThis support for the todo view and the list view. | 68 | Added WhatsThis support for the todo view and the list view. |
60 | 69 | ||
61 | Added a quite useful feature to the montview. | 70 | Added a quite useful feature to the montview. |
62 | Just click on the week numbers on the left. | 71 | Just click on the week numbers on the left. |
63 | And in the top right corner of month view/agenda view | 72 | And in the top right corner of month view/agenda view |
64 | there is now a "week number quick selector". | 73 | there is now a "week number quick selector". |
65 | (Click on the black triangle). | 74 | (Click on the black triangle). |
66 | 75 | ||
67 | Made the quite difficult timezone change in KO/Pi easy. | 76 | Made the quite difficult timezone change in KO/Pi easy. |
68 | 77 | ||
69 | OM/Pi: | 78 | OM/Pi: |
70 | Fixed too small icons on desktop. | 79 | Fixed too small icons on desktop. |
71 | Fixed non visible icons in mainwindow on Z with fastload enabled. | 80 | Fixed non visible icons in mainwindow on Z with fastload enabled. |
72 | Added signature file setting to smtp account config. | 81 | Added signature file setting to smtp account config. |
73 | And the signature can be edited and saved in the edit mail dialog. | 82 | And the signature can be edited and saved in the edit mail dialog. |
74 | That does mean: | 83 | That does mean: |
75 | Simply edit the signature for the selected smtp account in the | 84 | Simply edit the signature for the selected smtp account in the |
76 | edit new mail dialog and press the "save signature" button there. | 85 | edit new mail dialog and press the "save signature" button there. |
77 | Then the signature is saved to the file specified in the smtp account settings. | 86 | Then the signature is saved to the file specified in the smtp account settings. |
78 | If there is no file specified, it is saved automatically to the file | 87 | If there is no file specified, it is saved automatically to the file |
79 | kdepim/apps/kopiemail/<accountname>.sig. | 88 | kdepim/apps/kopiemail/<accountname>.sig. |
80 | 89 | ||
81 | 90 | ||
82 | 91 | ||
83 | ********** VERSION 2.0.1 ************ | 92 | ********** VERSION 2.0.1 ************ |
84 | 93 | ||
85 | Oooops ... I forgot to test on the Zaurus 5500 ... | 94 | Oooops ... I forgot to test on the Zaurus 5500 ... |
86 | 95 | ||
87 | Fixed many problems of new (english) strings (and german translations) | 96 | Fixed many problems of new (english) strings (and german translations) |
88 | introduced in the latest versions, where the text was not fitting on the | 97 | introduced in the latest versions, where the text was not fitting on the |
89 | 240x320 display of the Zaurus 5500. | 98 | 240x320 display of the Zaurus 5500. |
90 | 99 | ||
91 | KO/Pi: | 100 | KO/Pi: |
92 | Added a popup menu ( press pen and hold to get popup ) to the agenda view | 101 | Added a popup menu ( press pen and hold to get popup ) to the agenda view |
93 | with many useful items (add event/todo, show next week, two weeks, month, journal). | 102 | with many useful items (add event/todo, show next week, two weeks, month, journal). |
94 | 103 | ||
95 | Added items to the todolist popup menu for: | 104 | Added items to the todolist popup menu for: |
96 | Display all opened, all closed or all todos flat. | 105 | Display all opened, all closed or all todos flat. |
97 | The "flat" view makes is possible to sort all todos after ,e.g., prio or date. | 106 | The "flat" view makes is possible to sort all todos after ,e.g., prio or date. |
98 | Made the reparenting of todos on the desktop possible via Drag&Drop. | 107 | Made the reparenting of todos on the desktop possible via Drag&Drop. |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 468fd5b..18a4b12 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -172,193 +172,193 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
172 | QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); | 172 | QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); |
173 | splash->setAlignment ( AlignCenter ); | 173 | splash->setAlignment ( AlignCenter ); |
174 | setCentralWidget( splash ); | 174 | setCentralWidget( splash ); |
175 | #ifndef DESKTOP_VERSION | 175 | #ifndef DESKTOP_VERSION |
176 | showMaximized(); | 176 | showMaximized(); |
177 | #endif | 177 | #endif |
178 | 178 | ||
179 | //qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ()); | 179 | //qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ()); |
180 | setDefaultPreferences(); | 180 | setDefaultPreferences(); |
181 | mCalendar = new CalendarLocal(); | 181 | mCalendar = new CalendarLocal(); |
182 | mView = new CalendarView( mCalendar, this,"mCalendar " ); | 182 | mView = new CalendarView( mCalendar, this,"mCalendar " ); |
183 | mView->hide(); | 183 | mView->hide(); |
184 | //mView->resize(splash->size() ); | 184 | //mView->resize(splash->size() ); |
185 | initActions(); | 185 | initActions(); |
186 | mSyncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)mView, KSyncManager::KOPI, KOPrefs::instance(), syncMenu); | 186 | mSyncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)mView, KSyncManager::KOPI, KOPrefs::instance(), syncMenu); |
187 | mSyncManager->setBlockSave(false); | 187 | mSyncManager->setBlockSave(false); |
188 | mView->setSyncManager(mSyncManager); | 188 | mView->setSyncManager(mSyncManager); |
189 | #ifndef DESKTOP_VERSION | 189 | #ifndef DESKTOP_VERSION |
190 | iconToolBar->show(); | 190 | iconToolBar->show(); |
191 | qApp->processEvents(); | 191 | qApp->processEvents(); |
192 | #endif | 192 | #endif |
193 | //qDebug("Splashwidget x %d y %d w %d h %d", splash-> x(), splash->y(), splash->width(),splash-> height ()); | 193 | //qDebug("Splashwidget x %d y %d w %d h %d", splash-> x(), splash->y(), splash->width(),splash-> height ()); |
194 | int vh = height() ; | 194 | int vh = height() ; |
195 | int vw = width(); | 195 | int vw = width(); |
196 | //qDebug("Toolbar hei %d ",iconToolBar->height() ); | 196 | //qDebug("Toolbar hei %d ",iconToolBar->height() ); |
197 | if ( iconToolBar->orientation () == Qt:: Horizontal ) { | 197 | if ( iconToolBar->orientation () == Qt:: Horizontal ) { |
198 | vh -= iconToolBar->height(); | 198 | vh -= iconToolBar->height(); |
199 | } else { | 199 | } else { |
200 | vw -= iconToolBar->height(); | 200 | vw -= iconToolBar->height(); |
201 | } | 201 | } |
202 | //mView->setMaximumSize( splash->size() ); | 202 | //mView->setMaximumSize( splash->size() ); |
203 | //mView->resize( splash->size() ); | 203 | //mView->resize( splash->size() ); |
204 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); | 204 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); |
205 | mView->readSettings(); | 205 | mView->readSettings(); |
206 | bool newFile = false; | 206 | bool newFile = false; |
207 | if( !QFile::exists( defaultFileName() ) ) { | 207 | if( !QFile::exists( defaultFileName() ) ) { |
208 | QFileInfo finfo ( defaultFileName() ); | 208 | QFileInfo finfo ( defaultFileName() ); |
209 | QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics"); | 209 | QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics"); |
210 | qDebug("oldfile %s ", oldFile.latin1()); | 210 | qDebug("oldfile %s ", oldFile.latin1()); |
211 | QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n"; | 211 | QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n"; |
212 | finfo.setFile( oldFile ); | 212 | finfo.setFile( oldFile ); |
213 | if (finfo.exists() ) { | 213 | if (finfo.exists() ) { |
214 | KMessageBox::information( this, message); | 214 | KMessageBox::information( this, message); |
215 | mView->openCalendar( oldFile ); | 215 | mView->openCalendar( oldFile ); |
216 | qApp->processEvents(); | 216 | qApp->processEvents(); |
217 | } else { | 217 | } else { |
218 | oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/korganizer/mycalendar.ics"); | 218 | oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/korganizer/mycalendar.ics"); |
219 | finfo.setFile( oldFile ); | 219 | finfo.setFile( oldFile ); |
220 | if (finfo.exists() ) { | 220 | if (finfo.exists() ) { |
221 | KMessageBox::information( this, message); | 221 | KMessageBox::information( this, message); |
222 | mView->openCalendar( oldFile ); | 222 | mView->openCalendar( oldFile ); |
223 | qApp->processEvents(); | 223 | qApp->processEvents(); |
224 | } | 224 | } |
225 | } | 225 | } |
226 | mView->saveCalendar( defaultFileName() ); | 226 | mView->saveCalendar( defaultFileName() ); |
227 | newFile = true; | 227 | newFile = true; |
228 | } | 228 | } |
229 | 229 | ||
230 | QTime neededSaveTime = QDateTime::currentDateTime().time(); | 230 | QTime neededSaveTime = QDateTime::currentDateTime().time(); |
231 | mView->openCalendar( defaultFileName() ); | 231 | mView->openCalendar( defaultFileName() ); |
232 | int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); | 232 | int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); |
233 | qDebug("KO: Calendar loading time: %d ms",msNeeded ); | 233 | qDebug("KO: Calendar loading time: %d ms",msNeeded ); |
234 | 234 | ||
235 | if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) { | 235 | if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) { |
236 | KOPrefs::instance()->setAllDefaults(); | 236 | KOPrefs::instance()->setAllDefaults(); |
237 | int count = mView->addCategories(); | 237 | int count = mView->addCategories(); |
238 | } | 238 | } |
239 | processIncidenceSelection( 0 ); | 239 | processIncidenceSelection( 0 ); |
240 | connect( mView, SIGNAL( incidenceSelected( Incidence * ) ), | 240 | connect( mView, SIGNAL( incidenceSelected( Incidence * ) ), |
241 | SLOT( processIncidenceSelection( Incidence * ) ) ); | 241 | SLOT( processIncidenceSelection( Incidence * ) ) ); |
242 | connect( mView, SIGNAL( modifiedChanged( bool ) ), | 242 | connect( mView, SIGNAL( modifiedChanged( bool ) ), |
243 | SLOT( slotModifiedChanged( bool ) ) ); | 243 | SLOT( slotModifiedChanged( bool ) ) ); |
244 | 244 | ||
245 | 245 | ||
246 | connect( mView, SIGNAL( tempDisableBR(bool) ), | 246 | connect( mView, SIGNAL( tempDisableBR(bool) ), |
247 | SLOT( disableBR(bool) ) ); | 247 | SLOT( disableBR(bool) ) ); |
248 | connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) ); | 248 | connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) ); |
249 | mView->setModified( false ); | 249 | mView->setModified( false ); |
250 | mBlockAtStartup = false; | 250 | mBlockAtStartup = false; |
251 | mView->setModified( false ); | 251 | mView->setModified( false ); |
252 | setCentralWidget( mView ); | 252 | setCentralWidget( mView ); |
253 | globalFlagBlockStartup = 0; | 253 | globalFlagBlockStartup = 0; |
254 | mView->show(); | 254 | mView->show(); |
255 | delete splash; | 255 | delete splash; |
256 | if ( newFile ) | 256 | if ( newFile ) |
257 | mView->updateConfig(); | 257 | mView->updateConfig(); |
258 | // qApp->processEvents(); | 258 | // qApp->processEvents(); |
259 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); | 259 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); |
260 | //fillSyncMenu(); | 260 | //fillSyncMenu(); |
261 | 261 | ||
262 | 262 | ||
263 | connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) ); | 263 | connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) ); |
264 | connect(mView , SIGNAL( save() ), this, SLOT( save() ) ); | 264 | connect(mView , SIGNAL( save() ), this, SLOT( save() ) ); |
265 | connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) ); | 265 | connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) ); |
266 | connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); | 266 | connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); |
267 | connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); | 267 | connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); |
268 | mSyncManager->setDefaultFileName( defaultFileName()); | 268 | mSyncManager->setDefaultFileName( sentSyncFile()); |
269 | connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) ); | 269 | connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) ); |
270 | mSyncManager->fillSyncMenu(); | 270 | mSyncManager->fillSyncMenu(); |
271 | 271 | ||
272 | 272 | ||
273 | 273 | ||
274 | mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins ); | 274 | mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins ); |
275 | if ( showWarning ) { | 275 | if ( showWarning ) { |
276 | KMessageBox::information( this, | 276 | KMessageBox::information( this, |
277 | "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information"); | 277 | "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information"); |
278 | qApp->processEvents(); | 278 | qApp->processEvents(); |
279 | mView->dialogManager()->showSyncOptions(); | 279 | mView->dialogManager()->showSyncOptions(); |
280 | } | 280 | } |
281 | 281 | ||
282 | //US listen for result adressed from Ka/Pi | 282 | //US listen for result adressed from Ka/Pi |
283 | #ifndef DESKTOP_VERSION | 283 | #ifndef DESKTOP_VERSION |
284 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | 284 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); |
285 | #endif | 285 | #endif |
286 | #ifndef DESKTOP_VERSION | 286 | #ifndef DESKTOP_VERSION |
287 | infrared = 0; | 287 | infrared = 0; |
288 | #endif | 288 | #endif |
289 | updateWeek( mView->startDate() ); | 289 | updateWeek( mView->startDate() ); |
290 | connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), | 290 | connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), |
291 | SLOT( updateWeekNum( const KCal::DateList & ) ) ); | 291 | SLOT( updateWeekNum( const KCal::DateList & ) ) ); |
292 | mBRdisabled = false; | 292 | mBRdisabled = false; |
293 | //toggleBeamReceive(); | 293 | //toggleBeamReceive(); |
294 | } | 294 | } |
295 | MainWindow::~MainWindow() | 295 | MainWindow::~MainWindow() |
296 | { | 296 | { |
297 | //qDebug("MainWindow::~MainWindow() "); | 297 | //qDebug("MainWindow::~MainWindow() "); |
298 | //save toolbar location | 298 | //save toolbar location |
299 | delete mCalendar; | 299 | delete mCalendar; |
300 | delete mSyncManager; | 300 | delete mSyncManager; |
301 | #ifndef DESKTOP_VERSION | 301 | #ifndef DESKTOP_VERSION |
302 | if ( infrared ) | 302 | if ( infrared ) |
303 | delete infrared; | 303 | delete infrared; |
304 | #endif | 304 | #endif |
305 | 305 | ||
306 | 306 | ||
307 | } | 307 | } |
308 | 308 | ||
309 | void MainWindow::disableBR(bool b) | 309 | void MainWindow::disableBR(bool b) |
310 | { | 310 | { |
311 | #ifndef DESKTOP_VERSION | 311 | #ifndef DESKTOP_VERSION |
312 | if ( b ) { | 312 | if ( b ) { |
313 | if ( infrared ) { | 313 | if ( infrared ) { |
314 | toggleBeamReceive(); | 314 | toggleBeamReceive(); |
315 | mBRdisabled = true; | 315 | mBRdisabled = true; |
316 | } | 316 | } |
317 | mBRdisabled = true; | 317 | mBRdisabled = true; |
318 | } else { | 318 | } else { |
319 | if ( mBRdisabled ) { | 319 | if ( mBRdisabled ) { |
320 | mBRdisabled = false; | 320 | mBRdisabled = false; |
321 | //makes no sense,because other cal ap is probably running | 321 | //makes no sense,because other cal ap is probably running |
322 | // toggleBeamReceive(); | 322 | // toggleBeamReceive(); |
323 | } | 323 | } |
324 | } | 324 | } |
325 | #endif | 325 | #endif |
326 | 326 | ||
327 | } | 327 | } |
328 | bool MainWindow::beamReceiveEnabled() | 328 | bool MainWindow::beamReceiveEnabled() |
329 | { | 329 | { |
330 | #ifndef DESKTOP_VERSION | 330 | #ifndef DESKTOP_VERSION |
331 | return ( infrared != 0 ); | 331 | return ( infrared != 0 ); |
332 | #endif | 332 | #endif |
333 | return false; | 333 | return false; |
334 | } | 334 | } |
335 | 335 | ||
336 | void MainWindow::toggleBeamReceive() | 336 | void MainWindow::toggleBeamReceive() |
337 | { | 337 | { |
338 | if ( mBRdisabled ) | 338 | if ( mBRdisabled ) |
339 | return; | 339 | return; |
340 | #ifndef DESKTOP_VERSION | 340 | #ifndef DESKTOP_VERSION |
341 | if ( infrared ) { | 341 | if ( infrared ) { |
342 | qDebug("disable BeamReceive "); | 342 | qDebug("disable BeamReceive "); |
343 | delete infrared; | 343 | delete infrared; |
344 | infrared = 0; | 344 | infrared = 0; |
345 | brAction->setOn(false); | 345 | brAction->setOn(false); |
346 | return; | 346 | return; |
347 | } | 347 | } |
348 | qDebug("enable BeamReceive "); | 348 | qDebug("enable BeamReceive "); |
349 | brAction->setOn(true); | 349 | brAction->setOn(true); |
350 | infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ; | 350 | infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ; |
351 | QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve( const QCString&, const QByteArray& ))); | 351 | QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve( const QCString&, const QByteArray& ))); |
352 | #endif | 352 | #endif |
353 | } | 353 | } |
354 | void MainWindow::showMaximized () | 354 | void MainWindow::showMaximized () |
355 | { | 355 | { |
356 | #ifndef DESKTOP_VERSION | 356 | #ifndef DESKTOP_VERSION |
357 | if ( ! globalFlagBlockStartup ) | 357 | if ( ! globalFlagBlockStartup ) |
358 | if ( mClosed ) | 358 | if ( mClosed ) |
359 | mView->goToday(); | 359 | mView->goToday(); |
360 | #endif | 360 | #endif |
361 | QWidget::showMaximized () ; | 361 | QWidget::showMaximized () ; |
362 | mClosed = false; | 362 | mClosed = false; |
363 | } | 363 | } |
364 | void MainWindow::closeEvent( QCloseEvent* ce ) | 364 | void MainWindow::closeEvent( QCloseEvent* ce ) |
@@ -1899,168 +1899,180 @@ void MainWindow::loadCalendar() | |||
1899 | 0, 1 ); | 1899 | 0, 1 ); |
1900 | if ( result != 0 ) { | 1900 | if ( result != 0 ) { |
1901 | loadbup = false; | 1901 | loadbup = false; |
1902 | } | 1902 | } |
1903 | } else { | 1903 | } else { |
1904 | QMessageBox::warning( this, i18n("KO/Pi: Warning!"), | 1904 | QMessageBox::warning( this, i18n("KO/Pi: Warning!"), |
1905 | i18n("Backup file\ndoes not exist!\nNothing loaded!"), 0, 0, | 1905 | i18n("Backup file\ndoes not exist!\nNothing loaded!"), 0, 0, |
1906 | 0, 1 ); | 1906 | 0, 1 ); |
1907 | 1907 | ||
1908 | return; | 1908 | return; |
1909 | } | 1909 | } |
1910 | if ( loadbup ) { | 1910 | if ( loadbup ) { |
1911 | mView->openCalendar( fn ); | 1911 | mView->openCalendar( fn ); |
1912 | KOPrefs::instance()->mLastLoadFile = fn; | 1912 | KOPrefs::instance()->mLastLoadFile = fn; |
1913 | mess = i18n("KO/Pi:Loaded %1").arg(fn) ; | 1913 | mess = i18n("KO/Pi:Loaded %1").arg(fn) ; |
1914 | setCaption(mess); | 1914 | setCaption(mess); |
1915 | } | 1915 | } |
1916 | 1916 | ||
1917 | } | 1917 | } |
1918 | void MainWindow::quickImportIcal() | 1918 | void MainWindow::quickImportIcal() |
1919 | { | 1919 | { |
1920 | importFile( KOPrefs::instance()->mLastImportFile, false ); | 1920 | importFile( KOPrefs::instance()->mLastImportFile, false ); |
1921 | } | 1921 | } |
1922 | void MainWindow::importFile( QString fn, bool quick ) | 1922 | void MainWindow::importFile( QString fn, bool quick ) |
1923 | { | 1923 | { |
1924 | QFileInfo info; | 1924 | QFileInfo info; |
1925 | info.setFile( fn ); | 1925 | info.setFile( fn ); |
1926 | QString mess; | 1926 | QString mess; |
1927 | bool loadbup = true; | 1927 | bool loadbup = true; |
1928 | if ( !info. exists() ) { | 1928 | if ( !info. exists() ) { |
1929 | mess = i18n("Import file \n...%1\ndoes not exist!\nNothing imported!\n").arg(fn.right( 30)); | 1929 | mess = i18n("Import file \n...%1\ndoes not exist!\nNothing imported!\n").arg(fn.right( 30)); |
1930 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), | 1930 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), |
1931 | mess ); | 1931 | mess ); |
1932 | return; | 1932 | return; |
1933 | } | 1933 | } |
1934 | int result = 0; | 1934 | int result = 0; |
1935 | if ( !quick ) { | 1935 | if ( !quick ) { |
1936 | mess = i18n( "Import file \n...%1\nfrom:\n%2\nDuplicated entries\nwill not be imported!\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); | 1936 | mess = i18n( "Import file \n...%1\nfrom:\n%2\nDuplicated entries\nwill not be imported!\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); |
1937 | result = QMessageBox::warning( this, "KO/Pi: Warning!", | 1937 | result = QMessageBox::warning( this, "KO/Pi: Warning!", |
1938 | mess, | 1938 | mess, |
1939 | "Import", "Cancel", 0, | 1939 | "Import", "Cancel", 0, |
1940 | 0, 1 ); | 1940 | 0, 1 ); |
1941 | } | 1941 | } |
1942 | if ( result == 0 ) { | 1942 | if ( result == 0 ) { |
1943 | if ( mView->openCalendar( fn, true )) { | 1943 | if ( mView->openCalendar( fn, true )) { |
1944 | KOPrefs::instance()->mLastImportFile = fn; | 1944 | KOPrefs::instance()->mLastImportFile = fn; |
1945 | setCaption(i18n("Imported file successfully")); | 1945 | setCaption(i18n("Imported file successfully")); |
1946 | } else { | 1946 | } else { |
1947 | setCaption(i18n("Error importing file")); | 1947 | setCaption(i18n("Error importing file")); |
1948 | } | 1948 | } |
1949 | } | 1949 | } |
1950 | } | 1950 | } |
1951 | 1951 | ||
1952 | void MainWindow::importIcal() | 1952 | void MainWindow::importIcal() |
1953 | { | 1953 | { |
1954 | 1954 | ||
1955 | QString fn =KOPrefs::instance()->mLastImportFile; | 1955 | QString fn =KOPrefs::instance()->mLastImportFile; |
1956 | 1956 | ||
1957 | fn =KFileDialog:: getOpenFileName( fn, i18n("Import filename(*.ics/*.vcs)"), this ); | 1957 | fn =KFileDialog:: getOpenFileName( fn, i18n("Import filename(*.ics/*.vcs)"), this ); |
1958 | if ( fn == "" ) | 1958 | if ( fn == "" ) |
1959 | return; | 1959 | return; |
1960 | importFile( fn, true ); | 1960 | importFile( fn, true ); |
1961 | 1961 | ||
1962 | } | 1962 | } |
1963 | 1963 | ||
1964 | void MainWindow::exportVCalendar() | 1964 | void MainWindow::exportVCalendar() |
1965 | { | 1965 | { |
1966 | QString fn = KOPrefs::instance()->mLastVcalFile; | 1966 | QString fn = KOPrefs::instance()->mLastVcalFile; |
1967 | fn = KFileDialog::getSaveFileName( fn, i18n("Export vcal filename(*.vcs)"), this ); | 1967 | fn = KFileDialog::getSaveFileName( fn, i18n("Export vcal filename(*.vcs)"), this ); |
1968 | if ( fn == "" ) | 1968 | if ( fn == "" ) |
1969 | return; | 1969 | return; |
1970 | QFileInfo info; | 1970 | QFileInfo info; |
1971 | info.setFile( fn ); | 1971 | info.setFile( fn ); |
1972 | QString mes; | 1972 | QString mes; |
1973 | bool createbup = true; | 1973 | bool createbup = true; |
1974 | if ( info. exists() ) { | 1974 | if ( info. exists() ) { |
1975 | mes = i18n("Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false ) ); | 1975 | mes = i18n("Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false ) ); |
1976 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes, | 1976 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes, |
1977 | i18n("Overwrite!"), i18n("Cancel"), 0, | 1977 | i18n("Overwrite!"), i18n("Cancel"), 0, |
1978 | 0, 1 ); | 1978 | 0, 1 ); |
1979 | if ( result != 0 ) { | 1979 | if ( result != 0 ) { |
1980 | createbup = false; | 1980 | createbup = false; |
1981 | } | 1981 | } |
1982 | } | 1982 | } |
1983 | if ( createbup ) { | 1983 | if ( createbup ) { |
1984 | if ( mView->exportVCalendar( fn ) ) { | 1984 | if ( mView->exportVCalendar( fn ) ) { |
1985 | KOPrefs::instance()->mLastVcalFile = fn; | 1985 | KOPrefs::instance()->mLastVcalFile = fn; |
1986 | if ( fn.length() > 20 ) | 1986 | if ( fn.length() > 20 ) |
1987 | mes = i18n("KO/Pi:Exported to ...%1").arg(fn.right(20)) ; | 1987 | mes = i18n("KO/Pi:Exported to ...%1").arg(fn.right(20)) ; |
1988 | else | 1988 | else |
1989 | mes = i18n("KO/Pi:Exported to %1").arg(fn ); | 1989 | mes = i18n("KO/Pi:Exported to %1").arg(fn ); |
1990 | setCaption(mes); | 1990 | setCaption(mes); |
1991 | } | 1991 | } |
1992 | } | 1992 | } |
1993 | 1993 | ||
1994 | } | 1994 | } |
1995 | QString MainWindow::sentSyncFile() | ||
1996 | { | ||
1997 | #ifdef DESKTOP_VERSION | ||
1998 | return locateLocal( "tmp", "copysynccal.ics" ); | ||
1999 | #else | ||
2000 | return QString( "/tmp/copysynccal.ics" ); | ||
2001 | #endif | ||
2002 | } | ||
1995 | 2003 | ||
1996 | void MainWindow::syncFileRequest() | 2004 | void MainWindow::syncFileRequest() |
1997 | { | 2005 | { |
1998 | if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { | 2006 | if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { |
1999 | mSyncManager->slotSyncMenu( 999 ); | 2007 | mSyncManager->slotSyncMenu( 999 ); |
2000 | } | 2008 | } |
2001 | save(); | 2009 | |
2010 | setCaption(i18n("Saving Data to temp file ..." )); | ||
2011 | mView->saveCalendar( sentSyncFile() ); | ||
2012 | setCaption(i18n("Data saved to temp file!" )); | ||
2013 | |||
2002 | } | 2014 | } |
2003 | void MainWindow::getFile( bool success ) | 2015 | void MainWindow::getFile( bool success ) |
2004 | { | 2016 | { |
2005 | if ( ! success ) { | 2017 | if ( ! success ) { |
2006 | setCaption( i18n("Error receiving file. Nothing changed!") ); | 2018 | setCaption( i18n("Error receiving file. Nothing changed!") ); |
2007 | return; | 2019 | return; |
2008 | } | 2020 | } |
2009 | mView->openCalendar( defaultFileName() ); | 2021 | mView->openCalendar( sentSyncFile() ); |
2010 | if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { | 2022 | if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { |
2011 | mSyncManager->slotSyncMenu( 999 ); | 2023 | mSyncManager->slotSyncMenu( 999 ); |
2012 | } | 2024 | } |
2013 | setCaption( i18n("Pi-Sync successful!") ); | 2025 | setCaption( i18n("Pi-Sync successful!") ); |
2014 | } | 2026 | } |
2015 | 2027 | ||
2016 | void MainWindow::printSel( ) | 2028 | void MainWindow::printSel( ) |
2017 | { | 2029 | { |
2018 | mView->viewManager()->agendaView()->agenda()->printSelection(); | 2030 | mView->viewManager()->agendaView()->agenda()->printSelection(); |
2019 | } | 2031 | } |
2020 | 2032 | ||
2021 | void MainWindow::printCal() | 2033 | void MainWindow::printCal() |
2022 | { | 2034 | { |
2023 | mView->print();//mCp->showDialog(); | 2035 | mView->print();//mCp->showDialog(); |
2024 | } | 2036 | } |
2025 | 2037 | ||
2026 | 2038 | ||
2027 | #include "libkdepim/kdatepicker.h" | 2039 | #include "libkdepim/kdatepicker.h" |
2028 | #include <kdatetbl.h> | 2040 | #include <kdatetbl.h> |
2029 | void MainWindow::weekAction() | 2041 | void MainWindow::weekAction() |
2030 | { | 2042 | { |
2031 | int month; | 2043 | int month; |
2032 | KPopupFrame* popup = new KPopupFrame(this); | 2044 | KPopupFrame* popup = new KPopupFrame(this); |
2033 | KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(popup); | 2045 | KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(popup); |
2034 | // ----- | 2046 | // ----- |
2035 | picker->resize(picker->sizeHint()); | 2047 | picker->resize(picker->sizeHint()); |
2036 | popup->setMainWidget(picker); | 2048 | popup->setMainWidget(picker); |
2037 | picker->setFocus(); | 2049 | picker->setFocus(); |
2038 | connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int))); | 2050 | connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int))); |
2039 | int x = 0; | 2051 | int x = 0; |
2040 | int y = iconToolBar->height(); | 2052 | int y = iconToolBar->height(); |
2041 | int dX = 0; | 2053 | int dX = 0; |
2042 | int dY = 0; | 2054 | int dY = 0; |
2043 | if ( iconToolBar->orientation () == Qt:: Horizontal ) { | 2055 | if ( iconToolBar->orientation () == Qt:: Horizontal ) { |
2044 | if ( iconToolBar->y() > height()/2 ) { | 2056 | if ( iconToolBar->y() > height()/2 ) { |
2045 | dY = picker->sizeHint().height()+8; | 2057 | dY = picker->sizeHint().height()+8; |
2046 | y = 0; | 2058 | y = 0; |
2047 | } | 2059 | } |
2048 | } else { | 2060 | } else { |
2049 | if ( iconToolBar->x() > width()/2 ) { // right side | 2061 | if ( iconToolBar->x() > width()/2 ) { // right side |
2050 | x=0; | 2062 | x=0; |
2051 | dX= picker->sizeHint().width()+8; | 2063 | dX= picker->sizeHint().width()+8; |
2052 | y = 0; | 2064 | y = 0; |
2053 | } else { | 2065 | } else { |
2054 | x= iconToolBar->width(); | 2066 | x= iconToolBar->width(); |
2055 | y = 0; | 2067 | y = 0; |
2056 | } | 2068 | } |
2057 | } | 2069 | } |
2058 | //qDebug("dax %d dy %d %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() ); | 2070 | //qDebug("dax %d dy %d %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() ); |
2059 | if(popup->exec(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY)))) | 2071 | if(popup->exec(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY)))) |
2060 | { | 2072 | { |
2061 | month = picker->getResult(); | 2073 | month = picker->getResult(); |
2062 | emit selectWeek ( month ); | 2074 | emit selectWeek ( month ); |
2063 | //qDebug("weekSelected %d ", month); | 2075 | //qDebug("weekSelected %d ", month); |
2064 | } | 2076 | } |
2065 | delete popup; | 2077 | delete popup; |
2066 | } | 2078 | } |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 5b9f903..5808700 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -10,149 +10,150 @@ | |||
10 | #include <qregexp.h> | 10 | #include <qregexp.h> |
11 | 11 | ||
12 | #include <libkcal/incidence.h> | 12 | #include <libkcal/incidence.h> |
13 | #include "simplealarmclient.h" | 13 | #include "simplealarmclient.h" |
14 | #include <ksyncmanager.h> | 14 | #include <ksyncmanager.h> |
15 | #ifndef DESKTOP_VERSION | 15 | #ifndef DESKTOP_VERSION |
16 | #include <qcopchannel_qws.h> | 16 | #include <qcopchannel_qws.h> |
17 | #endif | 17 | #endif |
18 | class QAction; | 18 | class QAction; |
19 | class CalendarView; | 19 | class CalendarView; |
20 | class KSyncProfile; | 20 | class KSyncProfile; |
21 | #ifdef DESKTOP_VERSION | 21 | #ifdef DESKTOP_VERSION |
22 | 22 | ||
23 | #define QPEToolBar QToolBar | 23 | #define QPEToolBar QToolBar |
24 | #define QPEMenuBar QMenuBar | 24 | #define QPEMenuBar QMenuBar |
25 | #endif | 25 | #endif |
26 | class QPEToolBar; | 26 | class QPEToolBar; |
27 | 27 | ||
28 | 28 | ||
29 | namespace KCal { | 29 | namespace KCal { |
30 | class CalendarLocal; | 30 | class CalendarLocal; |
31 | } | 31 | } |
32 | 32 | ||
33 | class KOMenuBar : public QMenuBar | 33 | class KOMenuBar : public QMenuBar |
34 | { | 34 | { |
35 | public: | 35 | public: |
36 | KOMenuBar( QWidget *parent=0 ): QMenuBar (parent ) {;} | 36 | KOMenuBar( QWidget *parent=0 ): QMenuBar (parent ) {;} |
37 | QSize sizeHint () const{ qDebug("sizejint ");return QSize ( 40,25 );} | 37 | QSize sizeHint () const{ qDebug("sizejint ");return QSize ( 40,25 );} |
38 | }; | 38 | }; |
39 | 39 | ||
40 | using namespace KCal; | 40 | using namespace KCal; |
41 | 41 | ||
42 | class MainWindow : public QMainWindow | 42 | class MainWindow : public QMainWindow |
43 | { | 43 | { |
44 | Q_OBJECT | 44 | Q_OBJECT |
45 | public: | 45 | public: |
46 | MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); | 46 | MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); |
47 | ~MainWindow(); | 47 | ~MainWindow(); |
48 | bool beamReceiveEnabled(); | 48 | bool beamReceiveEnabled(); |
49 | static QString defaultFileName(); | 49 | static QString defaultFileName(); |
50 | static QString syncFileName(); | 50 | static QString syncFileName(); |
51 | static QString resourcePath(); | 51 | static QString resourcePath(); |
52 | public slots: | 52 | public slots: |
53 | void updateWeekNum(const KCal::DateList &); | 53 | void updateWeekNum(const KCal::DateList &); |
54 | void updateWeek(QDate); | 54 | void updateWeek(QDate); |
55 | virtual void showMaximized (); | 55 | virtual void showMaximized (); |
56 | void configureAgenda( int ); | 56 | void configureAgenda( int ); |
57 | void recieve( const QCString& msg, const QByteArray& data ); | 57 | void recieve( const QCString& msg, const QByteArray& data ); |
58 | protected slots: | 58 | protected slots: |
59 | void setCaptionToDates(); | 59 | void setCaptionToDates(); |
60 | void weekAction(); | 60 | void weekAction(); |
61 | void about(); | 61 | void about(); |
62 | void licence(); | 62 | void licence(); |
63 | void faq(); | 63 | void faq(); |
64 | void usertrans(); | 64 | void usertrans(); |
65 | void features(); | 65 | void features(); |
66 | void synchowto(); | 66 | void synchowto(); |
67 | void kdesynchowto(); | 67 | void kdesynchowto(); |
68 | void multisynchowto(); | 68 | void multisynchowto(); |
69 | void whatsNew(); | 69 | void whatsNew(); |
70 | void keyBindings(); | 70 | void keyBindings(); |
71 | void aboutAutoSaving();; | 71 | void aboutAutoSaving();; |
72 | void aboutKnownBugs(); | 72 | void aboutKnownBugs(); |
73 | 73 | ||
74 | void processIncidenceSelection( Incidence * ); | 74 | void processIncidenceSelection( Incidence * ); |
75 | 75 | ||
76 | void importQtopia(); | 76 | void importQtopia(); |
77 | void importBday(); | 77 | void importBday(); |
78 | void importOL(); | 78 | void importOL(); |
79 | void importIcal(); | 79 | void importIcal(); |
80 | void importFile( QString, bool ); | 80 | void importFile( QString, bool ); |
81 | void quickImportIcal(); | 81 | void quickImportIcal(); |
82 | 82 | ||
83 | void slotModifiedChanged( bool ); | 83 | void slotModifiedChanged( bool ); |
84 | 84 | ||
85 | void save(); | 85 | void save(); |
86 | void saveStopTimer(); | 86 | void saveStopTimer(); |
87 | void configureToolBar( int ); | 87 | void configureToolBar( int ); |
88 | void printSel(); | 88 | void printSel(); |
89 | void printCal(); | 89 | void printCal(); |
90 | void saveCalendar(); | 90 | void saveCalendar(); |
91 | void loadCalendar(); | 91 | void loadCalendar(); |
92 | void exportVCalendar(); | 92 | void exportVCalendar(); |
93 | void fillFilterMenu(); | 93 | void fillFilterMenu(); |
94 | void selectFilter( int ); | 94 | void selectFilter( int ); |
95 | void exportToPhone( int ); | 95 | void exportToPhone( int ); |
96 | void toggleBeamReceive(); | 96 | void toggleBeamReceive(); |
97 | void disableBR(bool); | 97 | void disableBR(bool); |
98 | signals: | 98 | signals: |
99 | void selectWeek ( int ); | 99 | void selectWeek ( int ); |
100 | private slots: | 100 | private slots: |
101 | void showConfigureAgenda(); | 101 | void showConfigureAgenda(); |
102 | void getFile( bool ); | 102 | void getFile( bool ); |
103 | void syncFileRequest(); | 103 | void syncFileRequest(); |
104 | 104 | ||
105 | protected: | 105 | protected: |
106 | QString sentSyncFile(); | ||
106 | void displayText( QString, QString); | 107 | void displayText( QString, QString); |
107 | void enableIncidenceActions( bool ); | 108 | void enableIncidenceActions( bool ); |
108 | 109 | ||
109 | private: | 110 | private: |
110 | bool mBRdisabled; | 111 | bool mBRdisabled; |
111 | #ifndef DESKTOP_VERSION | 112 | #ifndef DESKTOP_VERSION |
112 | QCopChannel* infrared; | 113 | QCopChannel* infrared; |
113 | #endif | 114 | #endif |
114 | QAction* brAction; | 115 | QAction* brAction; |
115 | KSyncManager* mSyncManager; | 116 | KSyncManager* mSyncManager; |
116 | bool mClosed; | 117 | bool mClosed; |
117 | void saveOnClose(); | 118 | void saveOnClose(); |
118 | bool mFlagKeyPressed; | 119 | bool mFlagKeyPressed; |
119 | bool mBlockAtStartup; | 120 | bool mBlockAtStartup; |
120 | QPEToolBar *iconToolBar; | 121 | QPEToolBar *iconToolBar; |
121 | void initActions(); | 122 | void initActions(); |
122 | void setDefaultPreferences(); | 123 | void setDefaultPreferences(); |
123 | void keyPressEvent ( QKeyEvent * ) ; | 124 | void keyPressEvent ( QKeyEvent * ) ; |
124 | void keyReleaseEvent ( QKeyEvent * ) ; | 125 | void keyReleaseEvent ( QKeyEvent * ) ; |
125 | QPopupMenu *configureToolBarMenu; | 126 | QPopupMenu *configureToolBarMenu; |
126 | QPopupMenu *selectFilterMenu; | 127 | QPopupMenu *selectFilterMenu; |
127 | QPopupMenu *configureAgendaMenu, *syncMenu; | 128 | QPopupMenu *configureAgendaMenu, *syncMenu; |
128 | CalendarLocal *mCalendar; | 129 | CalendarLocal *mCalendar; |
129 | CalendarView *mView; | 130 | CalendarView *mView; |
130 | QAction *mNewSubTodoAction; | 131 | QAction *mNewSubTodoAction; |
131 | QAction *mWeekAction; | 132 | QAction *mWeekAction; |
132 | QFont mWeekFont; | 133 | QFont mWeekFont; |
133 | QPixmap mWeekPixmap; | 134 | QPixmap mWeekPixmap; |
134 | QColor mWeekBgColor; | 135 | QColor mWeekBgColor; |
135 | 136 | ||
136 | QAction *mShowAction; | 137 | QAction *mShowAction; |
137 | QAction *mEditAction; | 138 | QAction *mEditAction; |
138 | QAction *mDeleteAction; | 139 | QAction *mDeleteAction; |
139 | QAction *mCloneAction; | 140 | QAction *mCloneAction; |
140 | QAction *mMoveAction; | 141 | QAction *mMoveAction; |
141 | QAction *mBeamAction; | 142 | QAction *mBeamAction; |
142 | QAction *mCancelAction; | 143 | QAction *mCancelAction; |
143 | 144 | ||
144 | QAction *mToggleNav; | 145 | QAction *mToggleNav; |
145 | QAction *mToggleFilter; | 146 | QAction *mToggleFilter; |
146 | QAction *mToggleAllday; | 147 | QAction *mToggleAllday; |
147 | 148 | ||
148 | 149 | ||
149 | void closeEvent( QCloseEvent* ce ); | 150 | void closeEvent( QCloseEvent* ce ); |
150 | SimpleAlarmClient mAlarmClient; | 151 | SimpleAlarmClient mAlarmClient; |
151 | QTimer mSaveTimer; | 152 | QTimer mSaveTimer; |
152 | //bool mBlockSaveFlag; | 153 | //bool mBlockSaveFlag; |
153 | bool mCalendarModifiedFlag; | 154 | bool mCalendarModifiedFlag; |
154 | QPixmap loadPixmap( QString ); | 155 | QPixmap loadPixmap( QString ); |
155 | }; | 156 | }; |
156 | 157 | ||
157 | 158 | ||
158 | #endif | 159 | #endif |
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 9177f63..c8d0e0d 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -1,180 +1,184 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KDE-Pim/Pi. | 2 | This file is part of KDE-Pim/Pi. |
3 | Copyright (c) 2004 Ulf Schenk | 3 | Copyright (c) 2004 Ulf Schenk |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Library General Public | 6 | modify it under the terms of the GNU Library General Public |
7 | License as published by the Free Software Foundation; either | 7 | License as published by the Free Software Foundation; either |
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | // $Id$ | 21 | // $Id$ |
22 | 22 | ||
23 | #include "ksyncmanager.h" | 23 | #include "ksyncmanager.h" |
24 | 24 | ||
25 | #include <stdlib.h> | 25 | #include <stdlib.h> |
26 | 26 | ||
27 | #ifndef _WIN32_ | 27 | #ifndef _WIN32_ |
28 | #include <unistd.h> | 28 | #include <unistd.h> |
29 | #endif | 29 | #endif |
30 | 30 | ||
31 | 31 | ||
32 | #include "ksyncprofile.h" | 32 | #include "ksyncprofile.h" |
33 | #include "ksyncprefsdialog.h" | 33 | #include "ksyncprefsdialog.h" |
34 | #include "kpimprefs.h" | 34 | #include "kpimprefs.h" |
35 | #include <kmessagebox.h> | 35 | #include <kmessagebox.h> |
36 | 36 | ||
37 | #include <qdir.h> | 37 | #include <qdir.h> |
38 | #include <qprogressbar.h> | 38 | #include <qprogressbar.h> |
39 | #include <qpopupmenu.h> | 39 | #include <qpopupmenu.h> |
40 | #include <qpushbutton.h> | 40 | #include <qpushbutton.h> |
41 | #include <qradiobutton.h> | 41 | #include <qradiobutton.h> |
42 | #include <qbuttongroup.h> | 42 | #include <qbuttongroup.h> |
43 | #include <qtimer.h> | 43 | #include <qtimer.h> |
44 | #include <qmessagebox.h> | 44 | #include <qmessagebox.h> |
45 | #include <qapplication.h> | 45 | #include <qapplication.h> |
46 | #include <qlineedit.h> | 46 | #include <qlineedit.h> |
47 | #include <qdialog.h> | 47 | #include <qdialog.h> |
48 | #include <qlayout.h> | 48 | #include <qlayout.h> |
49 | #include <qtextcodec.h> | 49 | #include <qtextcodec.h> |
50 | #include <qlabel.h> | 50 | #include <qlabel.h> |
51 | #include <qcheckbox.h> | 51 | #include <qcheckbox.h> |
52 | 52 | ||
53 | #include <klocale.h> | 53 | #include <klocale.h> |
54 | #include <kglobal.h> | 54 | #include <kglobal.h> |
55 | #include <kconfig.h> | 55 | #include <kconfig.h> |
56 | #include <kfiledialog.h> | 56 | #include <kfiledialog.h> |
57 | 57 | ||
58 | QDateTime KSyncManager::mRequestedSyncEvent; | 58 | QDateTime KSyncManager::mRequestedSyncEvent; |
59 | 59 | ||
60 | 60 | ||
61 | KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu) | 61 | KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu) |
62 | : QObject(), mPrefs(prefs ), mParent(parent),mImplementation(implementation), mTargetApp(ta), mSyncMenu(syncmenu) | 62 | : QObject(), mPrefs(prefs ), mParent(parent),mImplementation(implementation), mTargetApp(ta), mSyncMenu(syncmenu) |
63 | { | 63 | { |
64 | mServerSocket = 0; | 64 | mServerSocket = 0; |
65 | bar = new QProgressBar ( 1, 0 ); | 65 | bar = new QProgressBar ( 1, 0 ); |
66 | bar->setCaption (""); | 66 | bar->setCaption (""); |
67 | mWriteBackInPast = 2; | 67 | mWriteBackInPast = 2; |
68 | int w = 300; | 68 | int w = 300; |
69 | if ( QApplication::desktop()->width() < 320 ) | 69 | if ( QApplication::desktop()->width() < 320 ) |
70 | w = 220; | 70 | w = 220; |
71 | int h = bar->sizeHint().height() ; | 71 | int h = bar->sizeHint().height() ; |
72 | int dw = QApplication::desktop()->width(); | 72 | int dw = QApplication::desktop()->width(); |
73 | int dh = QApplication::desktop()->height(); | 73 | int dh = QApplication::desktop()->height(); |
74 | bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 74 | bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
75 | if ( mPrefs->mPassiveSyncAutoStart ) | ||
76 | enableQuick( false ); | ||
77 | 75 | ||
78 | } | 76 | } |
79 | 77 | ||
80 | KSyncManager::~KSyncManager() | 78 | KSyncManager::~KSyncManager() |
81 | { | 79 | { |
82 | delete bar; | 80 | delete bar; |
83 | } | 81 | } |
84 | 82 | ||
83 | void KSyncManager::setDefaultFileName( QString s) | ||
84 | { | ||
85 | mDefFileName = s ; | ||
86 | if ( mPrefs->mPassiveSyncAutoStart ) | ||
87 | enableQuick( false ); | ||
88 | } | ||
85 | 89 | ||
86 | void KSyncManager::fillSyncMenu() | 90 | void KSyncManager::fillSyncMenu() |
87 | { | 91 | { |
88 | if ( mSyncMenu->count() ) | 92 | if ( mSyncMenu->count() ) |
89 | mSyncMenu->clear(); | 93 | mSyncMenu->clear(); |
90 | 94 | ||
91 | mSyncMenu->insertItem( i18n("Configure..."), 0 ); | 95 | mSyncMenu->insertItem( i18n("Configure..."), 0 ); |
92 | mSyncMenu->insertSeparator(); | 96 | mSyncMenu->insertSeparator(); |
93 | QPopupMenu *clearMenu = new QPopupMenu ( mSyncMenu ); | 97 | QPopupMenu *clearMenu = new QPopupMenu ( mSyncMenu ); |
94 | mSyncMenu->insertItem( i18n("Remove sync info"),clearMenu, 5000 ); | 98 | mSyncMenu->insertItem( i18n("Remove sync info"),clearMenu, 5000 ); |
95 | clearMenu->insertItem( i18n("For all profiles"), 1 ); | 99 | clearMenu->insertItem( i18n("For all profiles"), 1 ); |
96 | clearMenu->insertSeparator(); | 100 | clearMenu->insertSeparator(); |
97 | connect ( clearMenu, SIGNAL( activated ( int ) ), this, SLOT (slotClearMenu( int ) ) ); | 101 | connect ( clearMenu, SIGNAL( activated ( int ) ), this, SLOT (slotClearMenu( int ) ) ); |
98 | mSyncMenu->insertSeparator(); | 102 | mSyncMenu->insertSeparator(); |
99 | if ( mServerSocket == 0 ) { | 103 | if ( mServerSocket == 0 ) { |
100 | mSyncMenu->insertItem( i18n("Enable Pi-Sync"), 2 ); | 104 | mSyncMenu->insertItem( i18n("Enable Pi-Sync"), 2 ); |
101 | } else { | 105 | } else { |
102 | mSyncMenu->insertItem( i18n("Disable Pi-Sync"), 3 ); | 106 | mSyncMenu->insertItem( i18n("Disable Pi-Sync"), 3 ); |
103 | } | 107 | } |
104 | mSyncMenu->insertSeparator(); | 108 | mSyncMenu->insertSeparator(); |
105 | mSyncMenu->insertItem( i18n("Multiple sync"), 1 ); | 109 | mSyncMenu->insertItem( i18n("Multiple sync"), 1 ); |
106 | mSyncMenu->insertSeparator(); | 110 | mSyncMenu->insertSeparator(); |
107 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); | 111 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
108 | config.setGroup("General"); | 112 | config.setGroup("General"); |
109 | QStringList prof = config.readListEntry("SyncProfileNames"); | 113 | QStringList prof = config.readListEntry("SyncProfileNames"); |
110 | mLocalMachineName = config.readEntry("LocalMachineName","undefined"); | 114 | mLocalMachineName = config.readEntry("LocalMachineName","undefined"); |
111 | if ( prof.count() < 2 ) { | 115 | if ( prof.count() < 2 ) { |
112 | prof.clear(); | 116 | prof.clear(); |
113 | QString externalName; | 117 | QString externalName; |
114 | #ifdef DESKTOP_VERSION | 118 | #ifdef DESKTOP_VERSION |
115 | #ifdef _WIN32_ | 119 | #ifdef _WIN32_ |
116 | externalName = "OutLook(not_implemented)"; | 120 | externalName = "OutLook(not_implemented)"; |
117 | #else | 121 | #else |
118 | externalName = "KDE_Desktop"; | 122 | externalName = "KDE_Desktop"; |
119 | #endif | 123 | #endif |
120 | #else | 124 | #else |
121 | externalName = "Sharp_DTM"; | 125 | externalName = "Sharp_DTM"; |
122 | #endif | 126 | #endif |
123 | prof << externalName; | 127 | prof << externalName; |
124 | prof << i18n("Local_file"); | 128 | prof << i18n("Local_file"); |
125 | prof << i18n("Last_file"); | 129 | prof << i18n("Last_file"); |
126 | KSyncProfile* temp = new KSyncProfile (); | 130 | KSyncProfile* temp = new KSyncProfile (); |
127 | temp->setName( prof[0] ); | 131 | temp->setName( prof[0] ); |
128 | temp->writeConfig(&config); | 132 | temp->writeConfig(&config); |
129 | temp->setName( prof[1] ); | 133 | temp->setName( prof[1] ); |
130 | temp->writeConfig(&config); | 134 | temp->writeConfig(&config); |
131 | temp->setName( prof[2] ); | 135 | temp->setName( prof[2] ); |
132 | temp->writeConfig(&config); | 136 | temp->writeConfig(&config); |
133 | config.setGroup("General"); | 137 | config.setGroup("General"); |
134 | config.writeEntry("SyncProfileNames",prof); | 138 | config.writeEntry("SyncProfileNames",prof); |
135 | config.writeEntry("ExternSyncProfiles",externalName); | 139 | config.writeEntry("ExternSyncProfiles",externalName); |
136 | config.sync(); | 140 | config.sync(); |
137 | delete temp; | 141 | delete temp; |
138 | } | 142 | } |
139 | mExternSyncProfiles = config.readListEntry("ExternSyncProfiles"); | 143 | mExternSyncProfiles = config.readListEntry("ExternSyncProfiles"); |
140 | mSyncProfileNames = prof; | 144 | mSyncProfileNames = prof; |
141 | unsigned int i; | 145 | unsigned int i; |
142 | for ( i = 0; i < prof.count(); ++i ) { | 146 | for ( i = 0; i < prof.count(); ++i ) { |
143 | mSyncMenu->insertItem( prof[i], 1000+i ); | 147 | mSyncMenu->insertItem( prof[i], 1000+i ); |
144 | clearMenu->insertItem( prof[i], 1000+i ); | 148 | clearMenu->insertItem( prof[i], 1000+i ); |
145 | if ( i == 2 ) | 149 | if ( i == 2 ) |
146 | mSyncMenu->insertSeparator(); | 150 | mSyncMenu->insertSeparator(); |
147 | } | 151 | } |
148 | QDir app_dir; | 152 | QDir app_dir; |
149 | //US do not display SharpDTM if app is pwmpi, or no sharpfiles available | 153 | //US do not display SharpDTM if app is pwmpi, or no sharpfiles available |
150 | if ( mTargetApp == PWMPI) { | 154 | if ( mTargetApp == PWMPI) { |
151 | mSyncMenu->removeItem( 1000 ); | 155 | mSyncMenu->removeItem( 1000 ); |
152 | clearMenu->removeItem( 1000 ); | 156 | clearMenu->removeItem( 1000 ); |
153 | } | 157 | } |
154 | #ifndef DESKTOP_VERSION | 158 | #ifndef DESKTOP_VERSION |
155 | else if (!app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) { | 159 | else if (!app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) { |
156 | mSyncMenu->removeItem( 1000 ); | 160 | mSyncMenu->removeItem( 1000 ); |
157 | clearMenu->removeItem( 1000 ); | 161 | clearMenu->removeItem( 1000 ); |
158 | } | 162 | } |
159 | #endif | 163 | #endif |
160 | mSyncMenu->removeItem( 1002 ); | 164 | mSyncMenu->removeItem( 1002 ); |
161 | clearMenu->removeItem( 1002 ); | 165 | clearMenu->removeItem( 1002 ); |
162 | } | 166 | } |
163 | void KSyncManager::slotClearMenu( int action ) | 167 | void KSyncManager::slotClearMenu( int action ) |
164 | { | 168 | { |
165 | QString syncDevice; | 169 | QString syncDevice; |
166 | if ( action > 999 ) { | 170 | if ( action > 999 ) { |
167 | syncDevice = mSyncProfileNames[action - 1000] ; | 171 | syncDevice = mSyncProfileNames[action - 1000] ; |
168 | } | 172 | } |
169 | 173 | ||
170 | 174 | ||
171 | 175 | ||
172 | int result = 0; | 176 | int result = 0; |
173 | QString sd; | 177 | QString sd; |
174 | if ( syncDevice.isEmpty() ) | 178 | if ( syncDevice.isEmpty() ) |
175 | sd = i18n("Do you want to\nclear all sync info\nof all profiles?"); | 179 | sd = i18n("Do you want to\nclear all sync info\nof all profiles?"); |
176 | else | 180 | else |
177 | sd = i18n("Do you want to\nclear the sync\ninfo of profile\n%1?\n"). arg( syncDevice ); | 181 | sd = i18n("Do you want to\nclear the sync\ninfo of profile\n%1?\n"). arg( syncDevice ); |
178 | 182 | ||
179 | result = QMessageBox::warning( mParent, i18n("Warning!"),sd,i18n("OK"), i18n("Cancel"), 0, | 183 | result = QMessageBox::warning( mParent, i18n("Warning!"),sd,i18n("OK"), i18n("Cancel"), 0, |
180 | 0, 1 ); | 184 | 0, 1 ); |
@@ -319,193 +323,192 @@ void KSyncManager::slotSyncMenu( int action ) | |||
319 | syncPi(); | 323 | syncPi(); |
320 | while ( !mPisyncFinished ) { | 324 | while ( !mPisyncFinished ) { |
321 | //qDebug("waiting "); | 325 | //qDebug("waiting "); |
322 | qApp->processEvents(); | 326 | qApp->processEvents(); |
323 | } | 327 | } |
324 | } else | 328 | } else |
325 | syncRemote( temp ); | 329 | syncRemote( temp ); |
326 | 330 | ||
327 | } | 331 | } |
328 | } | 332 | } |
329 | delete temp; | 333 | delete temp; |
330 | setBlockSave(false); | 334 | setBlockSave(false); |
331 | } | 335 | } |
332 | 336 | ||
333 | void KSyncManager::enableQuick( bool ask ) | 337 | void KSyncManager::enableQuick( bool ask ) |
334 | { | 338 | { |
335 | bool autoStart; | 339 | bool autoStart; |
336 | bool changed = false; | 340 | bool changed = false; |
337 | if ( ask ) { | 341 | if ( ask ) { |
338 | QDialog dia ( 0, "input-dialog", true ); | 342 | QDialog dia ( 0, "input-dialog", true ); |
339 | QLineEdit lab ( &dia ); | 343 | QLineEdit lab ( &dia ); |
340 | QVBoxLayout lay( &dia ); | 344 | QVBoxLayout lay( &dia ); |
341 | lab.setText( mPrefs->mPassiveSyncPort ); | 345 | lab.setText( mPrefs->mPassiveSyncPort ); |
342 | lay.setMargin(7); | 346 | lay.setMargin(7); |
343 | lay.setSpacing(7); | 347 | lay.setSpacing(7); |
344 | int po = 9197+mTargetApp; | 348 | int po = 9197+mTargetApp; |
345 | QLabel label ( i18n("Port number (Default: %1)").arg(po), &dia ); | 349 | QLabel label ( i18n("Port number (Default: %1)").arg(po), &dia ); |
346 | lay.addWidget( &label); | 350 | lay.addWidget( &label); |
347 | lay.addWidget( &lab); | 351 | lay.addWidget( &lab); |
348 | 352 | ||
349 | QLineEdit lepw ( &dia ); | 353 | QLineEdit lepw ( &dia ); |
350 | lepw.setText( mPrefs->mPassiveSyncPw ); | 354 | lepw.setText( mPrefs->mPassiveSyncPw ); |
351 | QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia ); | 355 | QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia ); |
352 | lay.addWidget( &label2); | 356 | lay.addWidget( &label2); |
353 | lay.addWidget( &lepw); | 357 | lay.addWidget( &lepw); |
354 | QCheckBox autostart(i18n("Automatically start\nat application startup"), &dia ); | 358 | QCheckBox autostart(i18n("Automatically start\nat application startup"), &dia ); |
355 | lay.addWidget( &autostart); | 359 | lay.addWidget( &autostart); |
356 | autostart.setChecked( mPrefs->mPassiveSyncAutoStart ); | 360 | autostart.setChecked( mPrefs->mPassiveSyncAutoStart ); |
357 | #ifdef DESKTOP_VERSION | 361 | #ifdef DESKTOP_VERSION |
358 | #ifdef _WIN32_ | 362 | #ifdef _WIN32_ |
359 | QCheckBox syncdesktop( i18n("Automatically sync with Outlook\nwhen receiving sync request"),&dia ); | 363 | QCheckBox syncdesktop( i18n("Automatically sync with Outlook\nwhen receiving sync request"),&dia ); |
360 | syncdesktop.hide();// not implemented! | 364 | syncdesktop.hide();// not implemented! |
361 | #else | 365 | #else |
362 | QCheckBox syncdesktop( i18n("Automatically sync with KDE-Desktop\nwhen receiving sync request"),&dia ); | 366 | QCheckBox syncdesktop( i18n("Automatically sync with KDE-Desktop\nwhen receiving sync request"),&dia ); |
363 | #endif | 367 | #endif |
364 | lay.addWidget( &syncdesktop); | 368 | lay.addWidget( &syncdesktop); |
365 | #else | 369 | #else |
366 | mPrefs->mPassiveSyncWithDesktop = false; | 370 | mPrefs->mPassiveSyncWithDesktop = false; |
367 | QCheckBox syncdesktop( i18n("Automatically sync\nwith KDE-Desktop"),&dia ); | 371 | QCheckBox syncdesktop( i18n("Automatically sync\nwith KDE-Desktop"),&dia ); |
368 | syncdesktop.hide(); | 372 | syncdesktop.hide(); |
369 | #endif | 373 | #endif |
370 | syncdesktop.setChecked( mPrefs->mPassiveSyncWithDesktop ); | 374 | syncdesktop.setChecked( mPrefs->mPassiveSyncWithDesktop ); |
371 | 375 | ||
372 | QPushButton pb ( "OK", &dia); | 376 | QPushButton pb ( "OK", &dia); |
373 | lay.addWidget( &pb ); | 377 | lay.addWidget( &pb ); |
374 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); | 378 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); |
375 | dia.resize( 230,120 ); | 379 | dia.resize( 230,120 ); |
376 | dia.setCaption( i18n("Enter port for Pi-Sync") ); | 380 | dia.setCaption( i18n("Enter port for Pi-Sync") ); |
377 | dia.show(); | 381 | dia.show(); |
378 | #ifndef DESKTOP_VERSION | 382 | #ifndef DESKTOP_VERSION |
379 | int dw = QApplication::desktop()->width(); | 383 | int dw = QApplication::desktop()->width(); |
380 | int dh = QApplication::desktop()->height(); | 384 | int dh = QApplication::desktop()->height(); |
381 | dia.move( (dw-dia.width())/2, (dh - dia.height() )/2 ); | 385 | dia.move( (dw-dia.width())/2, (dh - dia.height() )/2 ); |
382 | #endif | 386 | #endif |
383 | if ( ! dia.exec() ) | 387 | if ( ! dia.exec() ) |
384 | return; | 388 | return; |
385 | dia.hide(); | 389 | dia.hide(); |
386 | qApp->processEvents(); | 390 | qApp->processEvents(); |
387 | if ( mPrefs->mPassiveSyncPw != lepw.text() ) { | 391 | if ( mPrefs->mPassiveSyncPw != lepw.text() ) { |
388 | changed = true; | 392 | changed = true; |
389 | mPrefs->mPassiveSyncPw = lepw.text(); | 393 | mPrefs->mPassiveSyncPw = lepw.text(); |
390 | } | 394 | } |
391 | if ( mPrefs->mPassiveSyncPort != lab.text() ) { | 395 | if ( mPrefs->mPassiveSyncPort != lab.text() ) { |
392 | mPrefs->mPassiveSyncPort = lab.text(); | 396 | mPrefs->mPassiveSyncPort = lab.text(); |
393 | changed = true; | 397 | changed = true; |
394 | } | 398 | } |
395 | autoStart = autostart.isChecked(); | 399 | autoStart = autostart.isChecked(); |
396 | if (mPrefs->mPassiveSyncWithDesktop != syncdesktop.isChecked() ) { | 400 | if (mPrefs->mPassiveSyncWithDesktop != syncdesktop.isChecked() ) { |
397 | changed = true; | 401 | changed = true; |
398 | mPrefs->mPassiveSyncWithDesktop = syncdesktop.isChecked(); | 402 | mPrefs->mPassiveSyncWithDesktop = syncdesktop.isChecked(); |
399 | } | 403 | } |
400 | } | 404 | } |
401 | else | 405 | else |
402 | autoStart = mPrefs->mPassiveSyncAutoStart; | 406 | autoStart = mPrefs->mPassiveSyncAutoStart; |
403 | if ( autoStart != mPrefs->mPassiveSyncAutoStart ) | 407 | if ( autoStart != mPrefs->mPassiveSyncAutoStart ) |
404 | changed = true; | 408 | changed = true; |
405 | bool ok; | 409 | bool ok; |
406 | mPrefs->mPassiveSyncAutoStart = false; | 410 | mPrefs->mPassiveSyncAutoStart = false; |
407 | Q_UINT16 port = mPrefs->mPassiveSyncPort.toUInt(&ok); | 411 | Q_UINT16 port = mPrefs->mPassiveSyncPort.toUInt(&ok); |
408 | if ( ! ok ) { | 412 | if ( ! ok ) { |
409 | KMessageBox::information( 0, i18n("No valid port")); | 413 | KMessageBox::information( 0, i18n("No valid port")); |
410 | return; | 414 | return; |
411 | } | 415 | } |
412 | //qDebug("port %d ", port); | 416 | //qDebug("port %d ", port); |
413 | mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 ); | 417 | mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 ); |
414 | mServerSocket->setFileName( defaultFileName() );//bbb | 418 | mServerSocket->setFileName( defaultFileName() );//bbb |
415 | //qDebug("connected "); | ||
416 | if ( !mServerSocket->ok() ) { | 419 | if ( !mServerSocket->ok() ) { |
417 | KMessageBox::information( 0, i18n("Failed to bind or\nlisten to the port!")); | 420 | KMessageBox::information( 0, i18n("Failed to bind or\nlisten to the port!")); |
418 | delete mServerSocket; | 421 | delete mServerSocket; |
419 | mServerSocket = 0; | 422 | mServerSocket = 0; |
420 | return; | 423 | return; |
421 | } | 424 | } |
422 | mPrefs->mPassiveSyncAutoStart = autoStart; | 425 | mPrefs->mPassiveSyncAutoStart = autoStart; |
423 | if ( changed ) { | 426 | if ( changed ) { |
424 | mPrefs->writeConfig(); | 427 | mPrefs->writeConfig(); |
425 | } | 428 | } |
426 | connect( mServerSocket, SIGNAL ( request_file() ),this, SIGNAL ( request_file() ) ); | 429 | connect( mServerSocket, SIGNAL ( request_file() ),this, SIGNAL ( request_file() ) ); |
427 | connect( mServerSocket, SIGNAL ( file_received( bool ) ), this, SIGNAL ( getFile( bool ) ) ); | 430 | connect( mServerSocket, SIGNAL ( file_received( bool ) ), this, SIGNAL ( getFile( bool ) ) ); |
428 | } | 431 | } |
429 | 432 | ||
430 | void KSyncManager::syncLocalFile() | 433 | void KSyncManager::syncLocalFile() |
431 | { | 434 | { |
432 | 435 | ||
433 | QString fn =mPrefs->mLastSyncedLocalFile; | 436 | QString fn =mPrefs->mLastSyncedLocalFile; |
434 | QString ext; | 437 | QString ext; |
435 | 438 | ||
436 | switch(mTargetApp) | 439 | switch(mTargetApp) |
437 | { | 440 | { |
438 | case (KAPI): | 441 | case (KAPI): |
439 | ext = "(*.vcf)"; | 442 | ext = "(*.vcf)"; |
440 | break; | 443 | break; |
441 | case (KOPI): | 444 | case (KOPI): |
442 | ext = "(*.ics/*.vcs)"; | 445 | ext = "(*.ics/*.vcs)"; |
443 | break; | 446 | break; |
444 | case (PWMPI): | 447 | case (PWMPI): |
445 | ext = "(*.pwm)"; | 448 | ext = "(*.pwm)"; |
446 | break; | 449 | break; |
447 | default: | 450 | default: |
448 | qDebug("KSM::syncLocalFile: invalid apptype selected"); | 451 | qDebug("KSM::syncLocalFile: invalid apptype selected"); |
449 | break; | 452 | break; |
450 | 453 | ||
451 | } | 454 | } |
452 | 455 | ||
453 | fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename"+ext), mParent ); | 456 | fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename"+ext), mParent ); |
454 | if ( fn == "" ) | 457 | if ( fn == "" ) |
455 | return; | 458 | return; |
456 | if ( syncWithFile( fn, false ) ) { | 459 | if ( syncWithFile( fn, false ) ) { |
457 | qDebug("KSM::syncLocalFile() successful "); | 460 | qDebug("KSM::syncLocalFile() successful "); |
458 | } | 461 | } |
459 | 462 | ||
460 | } | 463 | } |
461 | 464 | ||
462 | bool KSyncManager::syncWithFile( QString fn , bool quick ) | 465 | bool KSyncManager::syncWithFile( QString fn , bool quick ) |
463 | { | 466 | { |
464 | bool ret = false; | 467 | bool ret = false; |
465 | QFileInfo info; | 468 | QFileInfo info; |
466 | info.setFile( fn ); | 469 | info.setFile( fn ); |
467 | QString mess; | 470 | QString mess; |
468 | if ( !info. exists() ) { | 471 | if ( !info. exists() ) { |
469 | mess = i18n( "Sync file \n...%1\ndoes not exist!\nNothing synced!\n").arg(fn.right( 30) ); | 472 | mess = i18n( "Sync file \n...%1\ndoes not exist!\nNothing synced!\n").arg(fn.right( 30) ); |
470 | QMessageBox::warning( mParent, i18n("Warning!"), | 473 | QMessageBox::warning( mParent, i18n("Warning!"), |
471 | mess ); | 474 | mess ); |
472 | return ret; | 475 | return ret; |
473 | } | 476 | } |
474 | int result = 0; | 477 | int result = 0; |
475 | if ( !quick ) { | 478 | if ( !quick ) { |
476 | mess = i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); | 479 | mess = i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); |
477 | result = QMessageBox::warning( mParent, i18n("Warning!"), | 480 | result = QMessageBox::warning( mParent, i18n("Warning!"), |
478 | mess, | 481 | mess, |
479 | i18n("Sync"), i18n("Cancel"), 0, | 482 | i18n("Sync"), i18n("Cancel"), 0, |
480 | 0, 1 ); | 483 | 0, 1 ); |
481 | if ( result ) | 484 | if ( result ) |
482 | return false; | 485 | return false; |
483 | } | 486 | } |
484 | if ( mAskForPreferences ) | 487 | if ( mAskForPreferences ) |
485 | if ( !edit_sync_options()) { | 488 | if ( !edit_sync_options()) { |
486 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); | 489 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); |
487 | return false; | 490 | return false; |
488 | } | 491 | } |
489 | if ( result == 0 ) { | 492 | if ( result == 0 ) { |
490 | //qDebug("Now sycing ... "); | 493 | //qDebug("Now sycing ... "); |
491 | if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ) ) | 494 | if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ) ) |
492 | mParent->topLevelWidget()->setCaption( i18n("Synchronization successful") ); | 495 | mParent->topLevelWidget()->setCaption( i18n("Synchronization successful") ); |
493 | else | 496 | else |
494 | mParent->topLevelWidget()->setCaption( i18n("Sync cancelled or failed.") ); | 497 | mParent->topLevelWidget()->setCaption( i18n("Sync cancelled or failed.") ); |
495 | if ( ! quick ) | 498 | if ( ! quick ) |
496 | mPrefs->mLastSyncedLocalFile = fn; | 499 | mPrefs->mLastSyncedLocalFile = fn; |
497 | } | 500 | } |
498 | return ret; | 501 | return ret; |
499 | } | 502 | } |
500 | 503 | ||
501 | void KSyncManager::quickSyncLocalFile() | 504 | void KSyncManager::quickSyncLocalFile() |
502 | { | 505 | { |
503 | 506 | ||
504 | if ( syncWithFile( mPrefs->mLastSyncedLocalFile, true ) ) { | 507 | if ( syncWithFile( mPrefs->mLastSyncedLocalFile, true ) ) { |
505 | qDebug("KSM::quick syncLocalFile() successful "); | 508 | qDebug("KSM::quick syncLocalFile() successful "); |
506 | 509 | ||
507 | } | 510 | } |
508 | } | 511 | } |
509 | 512 | ||
510 | void KSyncManager::multiSync( bool askforPrefs ) | 513 | void KSyncManager::multiSync( bool askforPrefs ) |
511 | { | 514 | { |
@@ -1024,193 +1027,193 @@ QString KSyncManager::syncFileName() | |||
1024 | { | 1027 | { |
1025 | case (KAPI): | 1028 | case (KAPI): |
1026 | fn = "tempsyncab.vcf"; | 1029 | fn = "tempsyncab.vcf"; |
1027 | break; | 1030 | break; |
1028 | case (KOPI): | 1031 | case (KOPI): |
1029 | fn = "tempsynccal.ics"; | 1032 | fn = "tempsynccal.ics"; |
1030 | break; | 1033 | break; |
1031 | case (PWMPI): | 1034 | case (PWMPI): |
1032 | fn = "tempsyncpw.pwm"; | 1035 | fn = "tempsyncpw.pwm"; |
1033 | break; | 1036 | break; |
1034 | default: | 1037 | default: |
1035 | break; | 1038 | break; |
1036 | } | 1039 | } |
1037 | #ifdef _WIN32_ | 1040 | #ifdef _WIN32_ |
1038 | return locateLocal( "tmp", fn ); | 1041 | return locateLocal( "tmp", fn ); |
1039 | #else | 1042 | #else |
1040 | return (QString( "/tmp/" )+ fn ); | 1043 | return (QString( "/tmp/" )+ fn ); |
1041 | #endif | 1044 | #endif |
1042 | } | 1045 | } |
1043 | 1046 | ||
1044 | void KSyncManager::syncPi() | 1047 | void KSyncManager::syncPi() |
1045 | { | 1048 | { |
1046 | mIsKapiFile = true; | 1049 | mIsKapiFile = true; |
1047 | mPisyncFinished = false; | 1050 | mPisyncFinished = false; |
1048 | qApp->processEvents(); | 1051 | qApp->processEvents(); |
1049 | if ( mAskForPreferences ) | 1052 | if ( mAskForPreferences ) |
1050 | if ( !edit_pisync_options()) { | 1053 | if ( !edit_pisync_options()) { |
1051 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); | 1054 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); |
1052 | return; | 1055 | return; |
1053 | } | 1056 | } |
1054 | bool ok; | 1057 | bool ok; |
1055 | Q_UINT16 port = mActiveSyncPort.toUInt(&ok); | 1058 | Q_UINT16 port = mActiveSyncPort.toUInt(&ok); |
1056 | if ( ! ok ) { | 1059 | if ( ! ok ) { |
1057 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); | 1060 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); |
1058 | return; | 1061 | return; |
1059 | } | 1062 | } |
1060 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); | 1063 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); |
1061 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); | 1064 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); |
1062 | commandSocket->readFile( syncFileName() ); | 1065 | commandSocket->readFile( syncFileName() ); |
1063 | } | 1066 | } |
1064 | 1067 | ||
1065 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) | 1068 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) |
1066 | { | 1069 | { |
1067 | //enum { success, errorW, errorR, quiet }; | 1070 | //enum { success, errorW, errorR, quiet }; |
1068 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) { | 1071 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) { |
1069 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); | 1072 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); |
1070 | delete s; | 1073 | delete s; |
1071 | if ( state == KCommandSocket::errorR ) { | 1074 | if ( state == KCommandSocket::errorR ) { |
1072 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget()); | 1075 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget()); |
1073 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 1076 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
1074 | commandSocket->sendStop(); | 1077 | commandSocket->sendStop(); |
1075 | } | 1078 | } |
1076 | mPisyncFinished = true; | 1079 | mPisyncFinished = true; |
1077 | return; | 1080 | return; |
1078 | 1081 | ||
1079 | } else if ( state == KCommandSocket::errorW ) { | 1082 | } else if ( state == KCommandSocket::errorW ) { |
1080 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); | 1083 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); |
1081 | mPisyncFinished = true; | 1084 | mPisyncFinished = true; |
1082 | 1085 | ||
1083 | } else if ( state == KCommandSocket::successR ) { | 1086 | } else if ( state == KCommandSocket::successR ) { |
1084 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); | 1087 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); |
1085 | 1088 | ||
1086 | } else if ( state == KCommandSocket::successW ) { | 1089 | } else if ( state == KCommandSocket::successW ) { |
1087 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); | 1090 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); |
1088 | mPisyncFinished = true; | 1091 | mPisyncFinished = true; |
1089 | } | 1092 | } |
1090 | 1093 | ||
1091 | delete s; | 1094 | delete s; |
1092 | } | 1095 | } |
1093 | 1096 | ||
1094 | void KSyncManager::readFileFromSocket() | 1097 | void KSyncManager::readFileFromSocket() |
1095 | { | 1098 | { |
1096 | QString fileName = syncFileName(); | 1099 | QString fileName = syncFileName(); |
1097 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); | 1100 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); |
1098 | if ( ! syncWithFile( fileName , true ) ) { | 1101 | if ( ! syncWithFile( fileName , true ) ) { |
1099 | mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); | 1102 | mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); |
1100 | mPisyncFinished = true; | 1103 | mPisyncFinished = true; |
1101 | return; | 1104 | return; |
1102 | } | 1105 | } |
1103 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() ); | 1106 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() ); |
1104 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 1107 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
1105 | if ( mWriteBackFile ) | 1108 | if ( mWriteBackFile ) |
1106 | commandSocket->writeFile( fileName ); | 1109 | commandSocket->writeFile( fileName ); |
1107 | else { | 1110 | else { |
1108 | commandSocket->sendStop(); | 1111 | commandSocket->sendStop(); |
1109 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); | 1112 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); |
1110 | mPisyncFinished = true; | 1113 | mPisyncFinished = true; |
1111 | } | 1114 | } |
1112 | } | 1115 | } |
1113 | 1116 | ||
1114 | KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) | 1117 | KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) |
1115 | { | 1118 | { |
1116 | mPassWord = pw; | 1119 | mPassWord = pw; |
1117 | mSocket = 0; | 1120 | mSocket = 0; |
1118 | mSyncActionDialog = 0; | 1121 | mSyncActionDialog = 0; |
1119 | blockRC = false; | 1122 | blockRC = false; |
1120 | }; | 1123 | } |
1121 | 1124 | ||
1122 | void KServerSocket::newConnection ( int socket ) | 1125 | void KServerSocket::newConnection ( int socket ) |
1123 | { | 1126 | { |
1124 | // qDebug("KServerSocket:New connection %d ", socket); | 1127 | // qDebug("KServerSocket:New connection %d ", socket); |
1125 | if ( mSocket ) { | 1128 | if ( mSocket ) { |
1126 | qDebug("KSS::newConnection Socket deleted! "); | 1129 | qDebug("KSS::newConnection Socket deleted! "); |
1127 | delete mSocket; | 1130 | delete mSocket; |
1128 | mSocket = 0; | 1131 | mSocket = 0; |
1129 | } | 1132 | } |
1130 | mSocket = new QSocket( this ); | 1133 | mSocket = new QSocket( this ); |
1131 | connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) ); | 1134 | connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) ); |
1132 | connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) ); | 1135 | connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) ); |
1133 | mSocket->setSocket( socket ); | 1136 | mSocket->setSocket( socket ); |
1134 | } | 1137 | } |
1135 | 1138 | ||
1136 | void KServerSocket::discardClient() | 1139 | void KServerSocket::discardClient() |
1137 | { | 1140 | { |
1138 | //qDebug(" KServerSocket::discardClient()"); | 1141 | //qDebug(" KServerSocket::discardClient()"); |
1139 | if ( mSocket ) { | 1142 | if ( mSocket ) { |
1140 | delete mSocket; | 1143 | delete mSocket; |
1141 | mSocket = 0; | 1144 | mSocket = 0; |
1142 | } | 1145 | } |
1143 | //emit endConnect(); | 1146 | //emit endConnect(); |
1144 | } | 1147 | } |
1145 | void KServerSocket::readClient() | 1148 | void KServerSocket::readClient() |
1146 | { | 1149 | { |
1147 | if ( blockRC ) | 1150 | if ( blockRC ) |
1148 | return; | 1151 | return; |
1149 | if ( mSocket == 0 ) { | 1152 | if ( mSocket == 0 ) { |
1150 | qDebug("ERROR::KSS::readClient(): mSocket == 0 "); | 1153 | qDebug("ERROR::KSS::readClient(): mSocket == 0 "); |
1151 | return; | 1154 | return; |
1152 | } | 1155 | } |
1153 | //qDebug("KServerSocket::readClient()"); | 1156 | //qDebug("KServerSocket::readClient()"); |
1154 | if ( mSocket->canReadLine() ) { | 1157 | if ( mSocket->canReadLine() ) { |
1155 | QString line = mSocket->readLine(); | 1158 | QString line = mSocket->readLine(); |
1156 | //qDebug("KServerSocket readline: %s ", line.latin1()); | 1159 | //qDebug("KServerSocket readline: %s ", line.latin1()); |
1157 | QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); | 1160 | QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); |
1158 | if ( tokens[0] == "GET" ) { | 1161 | if ( tokens[0] == "GET" ) { |
1159 | if ( tokens[1] == mPassWord ) { | 1162 | if ( tokens[1] == mPassWord ) { |
1160 | //emit sendFile( mSocket ); | 1163 | //emit sendFile( mSocket ); |
1161 | bool ok = false; | 1164 | bool ok = false; |
1162 | QDateTime dt = KGlobal::locale()->readDateTime( tokens[2], KLocale::ISODate, &ok); | 1165 | QDateTime dt = KGlobal::locale()->readDateTime( tokens[2], KLocale::ISODate, &ok); |
1163 | if ( ok ) { | 1166 | if ( ok ) { |
1164 | KSyncManager::mRequestedSyncEvent = dt; | 1167 | KSyncManager::mRequestedSyncEvent = dt; |
1165 | } | 1168 | } |
1166 | else | 1169 | else |
1167 | KSyncManager::mRequestedSyncEvent = QDateTime(); | 1170 | KSyncManager::mRequestedSyncEvent = QDateTime(); |
1168 | send_file(); | 1171 | send_file(); |
1169 | } | 1172 | } |
1170 | else { | 1173 | else { |
1171 | KMessageBox::error( 0, i18n("Got send file request\nwith invalid password")); | 1174 | KMessageBox::error( 0, i18n("Got send file request\nwith invalid password")); |
1172 | //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); | 1175 | //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); |
1173 | } | 1176 | } |
1174 | } | 1177 | } |
1175 | if ( tokens[0] == "PUT" ) { | 1178 | if ( tokens[0] == "PUT" ) { |
1176 | if ( tokens[1] == mPassWord ) { | 1179 | if ( tokens[1] == mPassWord ) { |
1177 | //emit getFile( mSocket ); | 1180 | //emit getFile( mSocket ); |
1178 | blockRC = true; | 1181 | blockRC = true; |
1179 | get_file(); | 1182 | get_file(); |
1180 | } | 1183 | } |
1181 | else { | 1184 | else { |
1182 | KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password")); | 1185 | KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password")); |
1183 | //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); | 1186 | //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); |
1184 | } | 1187 | } |
1185 | } | 1188 | } |
1186 | if ( tokens[0] == "STOP" ) { | 1189 | if ( tokens[0] == "STOP" ) { |
1187 | //emit endConnect(); | 1190 | //emit endConnect(); |
1188 | end_connect(); | 1191 | end_connect(); |
1189 | } | 1192 | } |
1190 | } | 1193 | } |
1191 | } | 1194 | } |
1192 | void KServerSocket::end_connect() | 1195 | void KServerSocket::end_connect() |
1193 | { | 1196 | { |
1194 | delete mSyncActionDialog; | 1197 | delete mSyncActionDialog; |
1195 | mSyncActionDialog = 0; | 1198 | mSyncActionDialog = 0; |
1196 | } | 1199 | } |
1197 | void KServerSocket::send_file() | 1200 | void KServerSocket::send_file() |
1198 | { | 1201 | { |
1199 | //qDebug("MainWindow::sendFile(QSocket* s) "); | 1202 | //qDebug("MainWindow::sendFile(QSocket* s) "); |
1200 | if ( mSyncActionDialog ) | 1203 | if ( mSyncActionDialog ) |
1201 | delete mSyncActionDialog; | 1204 | delete mSyncActionDialog; |
1202 | mSyncActionDialog = new QDialog ( 0, "input-dialog", true ); | 1205 | mSyncActionDialog = new QDialog ( 0, "input-dialog", true ); |
1203 | mSyncActionDialog->setCaption(i18n("Received sync request")); | 1206 | mSyncActionDialog->setCaption(i18n("Received sync request")); |
1204 | QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog ); | 1207 | QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog ); |
1205 | label->setAlignment ( Qt::AlignHCenter ); | 1208 | label->setAlignment ( Qt::AlignHCenter ); |
1206 | QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog ); | 1209 | QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog ); |
1207 | lay->addWidget( label); | 1210 | lay->addWidget( label); |
1208 | lay->setMargin(7); | 1211 | lay->setMargin(7); |
1209 | lay->setSpacing(7); | 1212 | lay->setSpacing(7); |
1210 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { | 1213 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { |
1211 | int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent ); | 1214 | int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent ); |
1212 | if ( secs < 0 ) | 1215 | if ( secs < 0 ) |
1213 | secs = secs * (-1); | 1216 | secs = secs * (-1); |
1214 | if ( secs > 30 ) | 1217 | if ( secs > 30 ) |
1215 | //if ( true ) | 1218 | //if ( true ) |
1216 | { | 1219 | { |
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index 9a3066e..09bd1c1 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h | |||
@@ -28,193 +28,193 @@ | |||
28 | #include <qdatetime.h> | 28 | #include <qdatetime.h> |
29 | #include <qserversocket.h> | 29 | #include <qserversocket.h> |
30 | #include <qtextstream.h> | 30 | #include <qtextstream.h> |
31 | #include <qregexp.h> | 31 | #include <qregexp.h> |
32 | 32 | ||
33 | class QPopupMenu; | 33 | class QPopupMenu; |
34 | class KSyncProfile; | 34 | class KSyncProfile; |
35 | class KPimPrefs; | 35 | class KPimPrefs; |
36 | class QWidget; | 36 | class QWidget; |
37 | class KSyncManager; | 37 | class KSyncManager; |
38 | class KSyncInterface; | 38 | class KSyncInterface; |
39 | class QProgressBar; | 39 | class QProgressBar; |
40 | 40 | ||
41 | 41 | ||
42 | class KServerSocket : public QServerSocket | 42 | class KServerSocket : public QServerSocket |
43 | { | 43 | { |
44 | Q_OBJECT | 44 | Q_OBJECT |
45 | 45 | ||
46 | public: | 46 | public: |
47 | KServerSocket ( QString password, Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 ); | 47 | KServerSocket ( QString password, Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 ); |
48 | 48 | ||
49 | void newConnection ( int socket ) ; | 49 | void newConnection ( int socket ) ; |
50 | void setFileName( QString fn ) {mFileName = fn;}; | 50 | void setFileName( QString fn ) {mFileName = fn;}; |
51 | signals: | 51 | signals: |
52 | void file_received( bool ); | 52 | void file_received( bool ); |
53 | void request_file(); | 53 | void request_file(); |
54 | void saveFile(); | 54 | void saveFile(); |
55 | void endConnect(); | 55 | void endConnect(); |
56 | private slots: | 56 | private slots: |
57 | void discardClient(); | 57 | void discardClient(); |
58 | void readClient(); | 58 | void readClient(); |
59 | void readBackFileFromSocket(); | 59 | void readBackFileFromSocket(); |
60 | private : | 60 | private : |
61 | bool blockRC; | 61 | bool blockRC; |
62 | void send_file(); | 62 | void send_file(); |
63 | void get_file(); | 63 | void get_file(); |
64 | void end_connect(); | 64 | void end_connect(); |
65 | QDialog* mSyncActionDialog; | 65 | QDialog* mSyncActionDialog; |
66 | QSocket* mSocket; | 66 | QSocket* mSocket; |
67 | QString mPassWord; | 67 | QString mPassWord; |
68 | QString mFileName; | 68 | QString mFileName; |
69 | QTime piTime; | 69 | QTime piTime; |
70 | QString piFileString; | 70 | QString piFileString; |
71 | }; | 71 | }; |
72 | 72 | ||
73 | class KCommandSocket : public QObject | 73 | class KCommandSocket : public QObject |
74 | { | 74 | { |
75 | Q_OBJECT | 75 | Q_OBJECT |
76 | public: | 76 | public: |
77 | enum state { successR, errorR, successW, errorW, errorTO, quiet }; | 77 | enum state { successR, errorR, successW, errorW, errorTO, quiet }; |
78 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 ); | 78 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 ); |
79 | void readFile( QString ); | 79 | void readFile( QString ); |
80 | void writeFile( QString ); | 80 | void writeFile( QString ); |
81 | void sendStop(); | 81 | void sendStop(); |
82 | 82 | ||
83 | private slots : | 83 | private slots : |
84 | void sendFileRequest(); | 84 | void sendFileRequest(); |
85 | 85 | ||
86 | signals: | 86 | signals: |
87 | void commandFinished( KCommandSocket*, int ); | 87 | void commandFinished( KCommandSocket*, int ); |
88 | private slots: | 88 | private slots: |
89 | void startReadFileFromSocket(); | 89 | void startReadFileFromSocket(); |
90 | void readFileFromSocket(); | 90 | void readFileFromSocket(); |
91 | void deleteSocket(); | 91 | void deleteSocket(); |
92 | void writeFileToSocket(); | 92 | void writeFileToSocket(); |
93 | private : | 93 | private : |
94 | QWidget* tlw; | 94 | QWidget* tlw; |
95 | QSocket* mSocket; | 95 | QSocket* mSocket; |
96 | QString mPassWord; | 96 | QString mPassWord; |
97 | Q_UINT16 mPort; | 97 | Q_UINT16 mPort; |
98 | QString mHost; | 98 | QString mHost; |
99 | QString mFileName; | 99 | QString mFileName; |
100 | QTimer* mTimerSocket; | 100 | QTimer* mTimerSocket; |
101 | int mRetVal; | 101 | int mRetVal; |
102 | QTime mTime; | 102 | QTime mTime; |
103 | QString mFileString; | 103 | QString mFileString; |
104 | bool mFirst; | 104 | bool mFirst; |
105 | }; | 105 | }; |
106 | 106 | ||
107 | 107 | ||
108 | class KSyncManager : public QObject | 108 | class KSyncManager : public QObject |
109 | { | 109 | { |
110 | Q_OBJECT | 110 | Q_OBJECT |
111 | 111 | ||
112 | public: | 112 | public: |
113 | enum TargetApp { | 113 | enum TargetApp { |
114 | KOPI = 0, | 114 | KOPI = 0, |
115 | KAPI = 1, | 115 | KAPI = 1, |
116 | PWMPI = 2 }; | 116 | PWMPI = 2 }; |
117 | 117 | ||
118 | KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu); | 118 | KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu); |
119 | ~KSyncManager() ; | 119 | ~KSyncManager() ; |
120 | 120 | ||
121 | void multiSync( bool askforPrefs ); | 121 | void multiSync( bool askforPrefs ); |
122 | bool blockSave() { return mBlockSaveFlag; } | 122 | bool blockSave() { return mBlockSaveFlag; } |
123 | void setBlockSave(bool sa) { mBlockSaveFlag = sa; } | 123 | void setBlockSave(bool sa) { mBlockSaveFlag = sa; } |
124 | void setDefaultFileName( QString s) { mDefFileName = s ;} | 124 | void setDefaultFileName( QString s) ; |
125 | QString defaultFileName() { return mDefFileName ;} | 125 | QString defaultFileName() { return mDefFileName ;} |
126 | QString syncFileName(); | 126 | QString syncFileName(); |
127 | void enableQuick( bool ask = true); | 127 | void enableQuick( bool ask = true); |
128 | 128 | ||
129 | bool syncWithDesktop () { return mSyncWithDesktop;} | 129 | bool syncWithDesktop () { return mSyncWithDesktop;} |
130 | QString getCurrentSyncDevice() { return mCurrentSyncDevice; } | 130 | QString getCurrentSyncDevice() { return mCurrentSyncDevice; } |
131 | QString getCurrentSyncName() { return mCurrentSyncName; } | 131 | QString getCurrentSyncName() { return mCurrentSyncName; } |
132 | 132 | ||
133 | void showProgressBar(int percentage, QString caption = QString::null, int total=100); | 133 | void showProgressBar(int percentage, QString caption = QString::null, int total=100); |
134 | void hideProgressBar(); | 134 | void hideProgressBar(); |
135 | bool isProgressBarCanceled(); | 135 | bool isProgressBarCanceled(); |
136 | 136 | ||
137 | // sync stuff | 137 | // sync stuff |
138 | QString mLocalMachineName; | 138 | QString mLocalMachineName; |
139 | QStringList mExternSyncProfiles; | 139 | QStringList mExternSyncProfiles; |
140 | QStringList mSyncProfileNames; | 140 | QStringList mSyncProfileNames; |
141 | bool mAskForPreferences; | 141 | bool mAskForPreferences; |
142 | bool mShowSyncSummary; | 142 | bool mShowSyncSummary; |
143 | bool mIsKapiFile; | 143 | bool mIsKapiFile; |
144 | bool mWriteBackExistingOnly; | 144 | bool mWriteBackExistingOnly; |
145 | int mSyncAlgoPrefs; | 145 | int mSyncAlgoPrefs; |
146 | bool mWriteBackFile; | 146 | bool mWriteBackFile; |
147 | int mWriteBackInFuture; | 147 | int mWriteBackInFuture; |
148 | int mWriteBackInPast; | 148 | int mWriteBackInPast; |
149 | QString mPhoneDevice; | 149 | QString mPhoneDevice; |
150 | QString mPhoneConnection; | 150 | QString mPhoneConnection; |
151 | QString mPhoneModel; | 151 | QString mPhoneModel; |
152 | QString mPassWordPiSync; | 152 | QString mPassWordPiSync; |
153 | QString mActiveSyncPort; | 153 | QString mActiveSyncPort; |
154 | QString mActiveSyncIP ; | 154 | QString mActiveSyncIP ; |
155 | QString mFilterInCal; | 155 | QString mFilterInCal; |
156 | QString mFilterOutCal; | 156 | QString mFilterOutCal; |
157 | QString mFilterInAB; | 157 | QString mFilterInAB; |
158 | QString mFilterOutAB; | 158 | QString mFilterOutAB; |
159 | static QDateTime mRequestedSyncEvent; | 159 | static QDateTime mRequestedSyncEvent; |
160 | 160 | ||
161 | signals: | 161 | signals: |
162 | void save(); | 162 | void save(); |
163 | void request_file(); | 163 | void request_file(); |
164 | void getFile( bool ); | 164 | void getFile( bool ); |
165 | 165 | ||
166 | public slots: | 166 | public slots: |
167 | void slotSyncMenu( int ); | 167 | void slotSyncMenu( int ); |
168 | void slotClearMenu( int action ); | 168 | void slotClearMenu( int action ); |
169 | void deleteCommandSocket(KCommandSocket*s, int state); | 169 | void deleteCommandSocket(KCommandSocket*s, int state); |
170 | void readFileFromSocket(); | 170 | void readFileFromSocket(); |
171 | void fillSyncMenu(); | 171 | void fillSyncMenu(); |
172 | 172 | ||
173 | private: | 173 | private: |
174 | void syncPi(); | 174 | void syncPi(); |
175 | KServerSocket * mServerSocket; | 175 | KServerSocket * mServerSocket; |
176 | KPimPrefs* mPrefs; | 176 | KPimPrefs* mPrefs; |
177 | QString mDefFileName; | 177 | QString mDefFileName; |
178 | QString mCurrentSyncDevice; | 178 | QString mCurrentSyncDevice; |
179 | QString mCurrentSyncName; | 179 | QString mCurrentSyncName; |
180 | void quickSyncLocalFile(); | 180 | void quickSyncLocalFile(); |
181 | bool syncWithFile( QString fn , bool quick ); | 181 | bool syncWithFile( QString fn , bool quick ); |
182 | void syncLocalFile(); | 182 | void syncLocalFile(); |
183 | void syncPhone(); | 183 | void syncPhone(); |
184 | void syncSharp(); | 184 | void syncSharp(); |
185 | void syncKDE(); | 185 | void syncKDE(); |
186 | bool syncExternalApplication(QString); | 186 | bool syncExternalApplication(QString); |
187 | int mCurrentSyncProfile ; | 187 | int mCurrentSyncProfile ; |
188 | void syncRemote( KSyncProfile* prof, bool ask = true); | 188 | void syncRemote( KSyncProfile* prof, bool ask = true); |
189 | bool edit_sync_options(); | 189 | bool edit_sync_options(); |
190 | bool edit_pisync_options(); | 190 | bool edit_pisync_options(); |
191 | int ringSync(); | 191 | int ringSync(); |
192 | QString getPassword( ); | 192 | QString getPassword( ); |
193 | bool mPisyncFinished; | 193 | bool mPisyncFinished; |
194 | bool mBlockSaveFlag; | 194 | bool mBlockSaveFlag; |
195 | QWidget* mParent; | 195 | QWidget* mParent; |
196 | KSyncInterface* mImplementation; | 196 | KSyncInterface* mImplementation; |
197 | TargetApp mTargetApp; | 197 | TargetApp mTargetApp; |
198 | QPopupMenu* mSyncMenu; | 198 | QPopupMenu* mSyncMenu; |
199 | QProgressBar* bar; | 199 | QProgressBar* bar; |
200 | bool mSyncWithDesktop; | 200 | bool mSyncWithDesktop; |
201 | 201 | ||
202 | private slots: | 202 | private slots: |
203 | void confSync(); | 203 | void confSync(); |
204 | 204 | ||
205 | 205 | ||
206 | }; | 206 | }; |
207 | 207 | ||
208 | 208 | ||
209 | class KSyncInterface | 209 | class KSyncInterface |
210 | { | 210 | { |
211 | public : | 211 | public : |
212 | virtual void removeSyncInfo( QString syncProfile) = 0; | 212 | virtual void removeSyncInfo( QString syncProfile) = 0; |
213 | virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0; | 213 | virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0; |
214 | virtual bool syncExternal(KSyncManager* manager, QString resource) | 214 | virtual bool syncExternal(KSyncManager* manager, QString resource) |
215 | { | 215 | { |
216 | // empty implementation, because some syncable applications do not | 216 | // empty implementation, because some syncable applications do not |
217 | // have an external(sharpdtm) syncmode, like pwmanager. | 217 | // have an external(sharpdtm) syncmode, like pwmanager. |
218 | return false; | 218 | return false; |
219 | } | 219 | } |
220 | 220 | ||