summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-09-18 23:40:38 (UTC)
committer zautrix <zautrix>2005-09-18 23:40:38 (UTC)
commit2d346e4052fd726e657daee4ac3f2bcc7103f5fb (patch) (unidiff)
tree9952b888e0790bc032ba4e0c3c4165ec283a4139
parent06ebec95579816144ee65981835e6e3482e20a28 (diff)
downloadkdepimpi-2d346e4052fd726e657daee4ac3f2bcc7103f5fb.zip
kdepimpi-2d346e4052fd726e657daee4ac3f2bcc7103f5fb.tar.gz
kdepimpi-2d346e4052fd726e657daee4ac3f2bcc7103f5fb.tar.bz2
wn
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kalarmd/alarmdialog.cpp12
-rw-r--r--kalarmd/simplealarmdaemonimpl.cpp11
-rw-r--r--korganizer/mainwindow.cpp13
3 files changed, 22 insertions, 14 deletions
diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp
index ddb125a..18ce9da 100644
--- a/kalarmd/alarmdialog.cpp
+++ b/kalarmd/alarmdialog.cpp
@@ -238,54 +238,58 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo
238 maxAlarmReplay = replay ; 238 maxAlarmReplay = replay ;
239 mStopAlarm = false; 239 mStopAlarm = false;
240 mSilent = false; 240 mSilent = false;
241 if ( !mMessage->text().stripWhiteSpace().isEmpty() ) { 241 if ( !mMessage->text().stripWhiteSpace().isEmpty() ) {
242 mMissedAlarmsCombo->show(); 242 mMissedAlarmsCombo->show();
243 QString newItem = mMessage->text().stripWhiteSpace(); 243 QString newItem = mMessage->text().stripWhiteSpace();
244 newItem.replace( QRegExp("\n"), QString(" ") ); 244 newItem.replace( QRegExp("\n"), QString(" ") );
245 mMissedAlarmsCombo->insertItem( newItem ); 245 mMissedAlarmsCombo->insertItem( newItem );
246 mMissedAlarms->setText( "Missed alarms:"); 246 mMissedAlarms->setText( "Missed alarms:");
247 } else 247 } else
248 mMissedAlarmsCombo->hide(); 248 mMissedAlarmsCombo->hide();
249 mMessage->setText(mess); 249 mMessage->setText(mess);
250 int w = minimumSizeHint().width() ; 250 int w = minimumSizeHint().width() ;
251 int h = minimumSizeHint().height() ; 251 int h = minimumSizeHint().height() ;
252 int dw = QApplication::desktop()->width(); 252 int dw = QApplication::desktop()->width();
253 int dh = QApplication::desktop()->height(); 253 int dh = QApplication::desktop()->height();
254 if ( w < 220 ) w = 220;
255 if ( h < 220 ) h = 220;
254 setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); 256 setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
255 hide(); 257 showNormal();
258 setActiveWindow();
259 raise();
260 setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
261 //hide();
256 262
257#ifndef _WIN32_ 263#ifndef _WIN32_
258 if ( fd_led > 0 ) { 264 if ( fd_led > 0 ) {
259 statusLED.status = LED_SALARM_ON ; 265 statusLED.status = LED_SALARM_ON ;
260 ioctl (fd_led, SHARP_LED_SETSTATUS, &statusLED); 266 ioctl (fd_led, SHARP_LED_SETSTATUS, &statusLED);
261 } 267 }
262#endif 268#endif
263 okbut->setDefault( true ); 269 okbut->setDefault( true );
264 QTimer::singleShot( 1, this, SLOT ( forceRepaint() ) ); 270 QTimer::singleShot( 1, this, SLOT ( forceRepaint() ) );
265 // playSoundTimer->start( 1000, true ); 271 // playSoundTimer->start( 1000, true );
266 return true; 272 return true;
267 273
268} 274}
269 275
270void AlarmDialog::forceRepaint() 276void AlarmDialog::forceRepaint()
271{ 277{
272
273 showNormal();
274 setActiveWindow(); 278 setActiveWindow();
275 raise(); 279 repaint();
276 mSuspendSpin->setFocus(); 280 mSuspendSpin->setFocus();
277 playSoundTimer->start( 1000, true ); 281 playSoundTimer->start( 1000, true );
278 282
279} 283}
280void AlarmDialog::spinBoxChanged( int v ) 284void AlarmDialog::spinBoxChanged( int v )
281{ 285{
282 okbut->setDefault( false ); 286 okbut->setDefault( false );
283 mSilent = true; 287 mSilent = true;
284} 288}
285 289
286void AlarmDialog::playSound () 290void AlarmDialog::playSound ()
287{ 291{
288 292
289 if (mStopAlarm ) 293 if (mStopAlarm )
290 return; 294 return;
291 if ( mSilent ) 295 if ( mSilent )
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index a0ac232..8ea8a73 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -54,32 +54,37 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
54 mAlarmDialog = new AlarmDialog( 0 ); 54 mAlarmDialog = new AlarmDialog( 0 );
55 mPopUp = new QPopupMenu( this ); 55 mPopUp = new QPopupMenu( this );
56 mPopUp->insertItem( "What's Next?", this, SLOT ( showWN() ) ); 56 mPopUp->insertItem( "What's Next?", this, SLOT ( showWN() ) );
57 mPopUp->insertItem( "Next Days!", this, SLOT ( showKO() ) ); 57 mPopUp->insertItem( "Next Days!", this, SLOT ( showKO() ) );
58 mPopUp->insertSeparator(); 58 mPopUp->insertSeparator();
59 mPopUp->insertItem( "Todo List", this, SLOT ( showTodo() ) ); 59 mPopUp->insertItem( "Todo List", this, SLOT ( showTodo() ) );
60 mPopUp->insertSeparator(); 60 mPopUp->insertSeparator();
61 mPopUp->insertItem( "Addresses", this, SLOT ( showAdd() ) ); 61 mPopUp->insertItem( "Addresses", this, SLOT ( showAdd() ) );
62 mPopUp->insertSeparator(); 62 mPopUp->insertSeparator();
63 mPopUp->insertItem( "Edit Journal", this, SLOT ( writeJournal() ) ); 63 mPopUp->insertItem( "Edit Journal", this, SLOT ( writeJournal() ) );
64 mPopUp->insertItem( "New Event", this, SLOT ( newEvent() ) ); 64 mPopUp->insertItem( "New Event", this, SLOT ( newEvent() ) );
65 mPopUp->insertItem( "New Todo", this, SLOT ( newTodo() ) ); 65 mPopUp->insertItem( "New Todo", this, SLOT ( newTodo() ) );
66 mPopUp->insertItem( "New Mail", this, SLOT ( newMail() ) ); 66 mPopUp->insertItem( "New Mail", this, SLOT ( newMail() ) );
67 mPopUp->insertSeparator(); 67 mPopUp->insertSeparator();
68 mPopUp->insertItem( "Multi Sync", this, SLOT ( ringSync() ) ); 68 mPopUp->insertItem( "Multi Sync", this, SLOT ( ringSync() ) );
69 mTimerPopUp = new QPopupMenu( this ); 69 mTimerPopUp = new QPopupMenu( this );
70 QFont fon = mTimerPopUp->font();
71 int points = (fon.pointSize()*4)/3;
72 fon.setPointSize( points );
73 mTimerPopUp->setFont( fon );
74 mPopUp->setFont( fon );
70 mBeepPopUp = new QPopupMenu( this ); 75 mBeepPopUp = new QPopupMenu( this );
71 mSoundPopUp = new QPopupMenu( this ); 76 mSoundPopUp = new QPopupMenu( this );
72 mPausePopUp = new QPopupMenu( this ); 77 mPausePopUp = new QPopupMenu( this );
73 QPopupMenu* savePopUp = new QPopupMenu( this ); 78 QPopupMenu* savePopUp = new QPopupMenu( this );
74 savePopUp->insertItem( "Save", 0 ); 79 savePopUp->insertItem( "Save", 0 );
75 savePopUp->insertItem( "Load", 1 ); 80 savePopUp->insertItem( "Load", 1 );
76 mSoundPopUp->insertItem( "Buzzer", 0 ); 81 mSoundPopUp->insertItem( "Buzzer", 0 );
77 mSoundPopUp->insertItem( "Wav file", 1 ); 82 mSoundPopUp->insertItem( "Wav file", 1 );
78 mPausePopUp->insertItem( " 1 sec", 1 ); 83 mPausePopUp->insertItem( " 1 sec", 1 );
79 mPausePopUp->insertItem( " 2 sec", 2 ); 84 mPausePopUp->insertItem( " 2 sec", 2 );
80 mPausePopUp->insertItem( " 3 sec", 3 ); 85 mPausePopUp->insertItem( " 3 sec", 3 );
81 mPausePopUp->insertItem( " 5 sec", 5 ); 86 mPausePopUp->insertItem( " 5 sec", 5 );
82 mPausePopUp->insertItem( "10 sec", 10 ); 87 mPausePopUp->insertItem( "10 sec", 10 );
83 mPausePopUp->insertItem( "30 sec", 30 ); 88 mPausePopUp->insertItem( "30 sec", 30 );
84 mPausePopUp->insertItem( " 1 min", 60 ); 89 mPausePopUp->insertItem( " 1 min", 60 );
85 mPausePopUp->insertItem( " 5 min", 300 ); 90 mPausePopUp->insertItem( " 5 min", 300 );
@@ -300,59 +305,59 @@ void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray& )
300 if ( len < 2 ) 305 if ( len < 2 )
301 error = true; 306 error = true;
302 else { 307 else {
303 tempfilename = mess.mid( 10, len ); 308 tempfilename = mess.mid( 10, len );
304 if ( !QFile::exists( tempfilename ) ) 309 if ( !QFile::exists( tempfilename ) )
305 error = true; 310 error = true;
306 } 311 }
307 if ( error ) { 312 if ( error ) {
308 mAlarmMessage = "Procedure Alarm\nError - File not found\n"; 313 mAlarmMessage = "Procedure Alarm\nError - File not found\n";
309 mAlarmMessage += mess.mid( 10+len+3+9 ); 314 mAlarmMessage += mess.mid( 10+len+3+9 );
310 } else { 315 } else {
311 //qDebug("-----system command %s ",tempfilename.latin1() ); 316 //qDebug("-----system command %s ",tempfilename.latin1() );
312 if ( vfork () == 0 ) { 317 if ( vfork () == 0 ) {
313 execl ( tempfilename.latin1(), 0 ); 318 execl ( tempfilename.latin1(), 0 );
314 return; 319 return;
315 } 320 }
316 QTimer::singleShot( 10000, this, SLOT ( writeFile() ) ); 321 QTimer::singleShot( 5000, this, SLOT ( writeFile() ) );
317 return; 322 return;
318 } 323 }
319 324
320 //qDebug("+++++++system command %s ",tempfilename.latin1() ); 325 //qDebug("+++++++system command %s ",tempfilename.latin1() );
321 } 326 }
322 if ( mess.left( 11 ) == "audio_alarm") { 327 if ( mess.left( 11 ) == "audio_alarm") {
323 bool error = false; 328 bool error = false;
324 int len = mess.mid( 11 ).find("+++"); 329 int len = mess.mid( 11 ).find("+++");
325 if ( len < 2 ) 330 if ( len < 2 )
326 error = true; 331 error = true;
327 else { 332 else {
328 tempfilename = mess.mid( 11, len ); 333 tempfilename = mess.mid( 11, len );
329 if ( !QFile::exists( tempfilename ) ) 334 if ( !QFile::exists( tempfilename ) )
330 error = true; 335 error = true;
331 } 336 }
332 if ( ! error ) { 337 if ( ! error ) {
333 filename = tempfilename; 338 filename = tempfilename;
334 } 339 }
335 mAlarmMessage = mess.mid( 11+len+3+9 ); 340 mAlarmMessage = mess.mid( 11+len+3+9 );
336 //qDebug("audio file command %s ",tempfilename.latin1() ); 341 //qDebug("audio file command %s ",tempfilename.latin1() );
337 } 342 }
338 if ( mess.left( 9 ) == "cal_alarm") { 343 if ( mess.left( 9 ) == "cal_alarm") {
339 mAlarmMessage = mess.mid( 9 ) ; 344 mAlarmMessage = mess.mid( 9 ) ;
340 } 345 }
341 346
342 QTimer::singleShot( 10000, this, SLOT ( writeFile() ) ); 347 QTimer::singleShot( 5000, this, SLOT ( writeFile() ) );
343 startAlarm( mAlarmMessage, filename ); 348 startAlarm( mAlarmMessage, filename );
344 349
345} 350}
346 351
347int SimpleAlarmDaemonImpl::getFileNameLen( QString mess ) 352int SimpleAlarmDaemonImpl::getFileNameLen( QString mess )
348{ 353{
349 return 0; 354 return 0;
350} 355}
351void SimpleAlarmDaemonImpl::startAlarm( QString mess, QString filename ) 356void SimpleAlarmDaemonImpl::startAlarm( QString mess, QString filename )
352{ 357{
353 //mAlarmDialog->show(); 358 //mAlarmDialog->show();
354 //mAlarmDialog->raise(); 359 //mAlarmDialog->raise();
355 mAlarmDialog->eventNotification( mess, mPlayBeeps, filename, wavAlarm,mPausePlay ,mSuspend ); 360 mAlarmDialog->eventNotification( mess, mPlayBeeps, filename, wavAlarm,mPausePlay ,mSuspend );
356} 361}
357 362
358 363
@@ -629,33 +634,33 @@ void SimpleAlarmDaemonImpl::newMail()
629} 634}
630void SimpleAlarmDaemonImpl::showAdd() 635void SimpleAlarmDaemonImpl::showAdd()
631{ 636{
632 QCopEnvelope e("QPE/Application/kapi", "raise()"); 637 QCopEnvelope e("QPE/Application/kapi", "raise()");
633} 638}
634void SimpleAlarmDaemonImpl::ringSync() 639void SimpleAlarmDaemonImpl::ringSync()
635{ 640{
636 QCopEnvelope e("QPE/Application/kopi", "-ringSync"); 641 QCopEnvelope e("QPE/Application/kopi", "-ringSync");
637 642
638} 643}
639void SimpleAlarmDaemonImpl::newCountdown() 644void SimpleAlarmDaemonImpl::newCountdown()
640{ 645{
641 //recieve("cal_alarm", 10 ); 646 //recieve("cal_alarm", 10 );
642} 647}
643void SimpleAlarmDaemonImpl::simulate() 648void SimpleAlarmDaemonImpl::simulate()
644{ 649{
645 QTimer::singleShot( 10000, this, SLOT ( writeFile() ) ); 650 QTimer::singleShot( 5000, this, SLOT ( writeFile() ) );
646 QString filename = getenv("QPEDIR") ; 651 QString filename = getenv("QPEDIR") ;
647 filename += "/pics/kdepim/korganizer/koalarm.wav"; 652 filename += "/pics/kdepim/korganizer/koalarm.wav";
648 startAlarm("Alarm simulation", filename ); 653 startAlarm("Alarm simulation", filename );
649} 654}
650void SimpleAlarmDaemonImpl::showKO() 655void SimpleAlarmDaemonImpl::showKO()
651{ 656{
652 QCopEnvelope e("QPE/Application/kopi", "-showKO"); 657 QCopEnvelope e("QPE/Application/kopi", "-showKO");
653 // testing only 658 // testing only
654 //QCopEnvelope e("QPE/Application/kopi", "nextView()"); 659 //QCopEnvelope e("QPE/Application/kopi", "nextView()");
655 660
656} 661}
657void SimpleAlarmDaemonImpl::showTodo() 662void SimpleAlarmDaemonImpl::showTodo()
658{ 663{
659 QCopEnvelope e("QPE/Application/kopi", "-showTodo"); 664 QCopEnvelope e("QPE/Application/kopi", "-showTodo");
660 665
661} 666}
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 98d3e35..fb0b4ad 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -295,34 +295,34 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
295#ifndef DESKTOP_VERSION 295#ifndef DESKTOP_VERSION
296 //showMaximized(); 296 //showMaximized();
297#endif 297#endif
298 298
299 //qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ()); 299 //qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ());
300 setDefaultPreferences(); 300 setDefaultPreferences();
301 mCalendar = new CalendarLocal(); 301 mCalendar = new CalendarLocal();
302 mView = new CalendarView( mCalendar, this,"mCalendar " ); 302 mView = new CalendarView( mCalendar, this,"mCalendar " );
303 setCentralWidget( mView ); 303 setCentralWidget( mView );
304 //mView->hide(); 304 //mView->hide();
305 //mView->resize(splash->size() ); 305 //mView->resize(splash->size() );
306 initActions(); 306 initActions();
307 mSyncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)mView, KSyncManager::KOPI, KOPrefs::instance(), syncMenu); 307 mSyncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)mView, KSyncManager::KOPI, KOPrefs::instance(), syncMenu);
308 mSyncManager->setBlockSave(false); 308 mSyncManager->setBlockSave(false);
309 mView->setSyncManager(mSyncManager); 309 mView->setSyncManager(mSyncManager);
310#ifndef DESKTOP_VERSION 310#ifndef DESKTOP_VERSION
311 iconToolBar->show(); 311 //iconToolBar->show();
312 qApp->processEvents(); 312 //qApp->processEvents();
313#endif 313#endif
314 //qDebug("Splashwidget x %d y %d w %d h %d", splash-> x(), splash->y(), splash->width(),splash-> height ()); 314 //qDebug("Splashwidget x %d y %d w %d h %d", splash-> x(), splash->y(), splash->width(),splash-> height ());
315 int vh = height() ; 315 int vh = height() ;
316 int vw = width(); 316 int vw = width();
317 //qDebug("Toolbar hei %d ",iconToolBar->height() ); 317 //qDebug("Toolbar hei %d ",iconToolBar->height() );
318 if ( iconToolBar->orientation () == Qt:: Horizontal ) { 318 if ( iconToolBar->orientation () == Qt:: Horizontal ) {
319 vh -= iconToolBar->height(); 319 vh -= iconToolBar->height();
320 } else { 320 } else {
321 vw -= iconToolBar->height(); 321 vw -= iconToolBar->height();
322 } 322 }
323 //mView->setMaximumSize( splash->size() ); 323 //mView->setMaximumSize( splash->size() );
324 //mView->resize( splash->size() ); 324 //mView->resize( splash->size() );
325 //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); 325 //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ());
326 mView->readSettings(); 326 mView->readSettings();
327 bool newFile = false; 327 bool newFile = false;
328 if( !QFile::exists( defaultFileName() ) ) { 328 if( !QFile::exists( defaultFileName() ) ) {
@@ -372,33 +372,33 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
372 372
373 373
374 connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) ); 374 connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) );
375 connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) ); 375 connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) );
376 connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); 376 connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) );
377 connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); 377 connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
378 mSyncManager->setDefaultFileName( sentSyncFile()); 378 mSyncManager->setDefaultFileName( sentSyncFile());
379 connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) ); 379 connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) );
380 mSyncManager->fillSyncMenu(); 380 mSyncManager->fillSyncMenu();
381 381
382 382
383 383
384 mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins ); 384 mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins );
385 if ( showWarning ) { 385 if ( showWarning ) {
386 KMessageBox::information( this, 386 KMessageBox::information( this,
387 "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"); 387 "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");
388 qApp->processEvents(); 388 //qApp->processEvents();
389 mView->dialogManager()->showSyncOptions(); 389 mView->dialogManager()->showSyncOptions();
390 } 390 }
391 391
392 //US listen for result adressed from Ka/Pi 392 //US listen for result adressed from Ka/Pi
393 393
394#ifndef DESKTOP_VERSION 394#ifndef DESKTOP_VERSION
395 infrared = 0; 395 infrared = 0;
396#endif 396#endif
397 updateFilterToolbar(); 397 updateFilterToolbar();
398 updateWeek( mView->startDate() ); 398 updateWeek( mView->startDate() );
399 connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), 399 connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
400 SLOT( updateWeekNum( const KCal::DateList & ) ) ); 400 SLOT( updateWeekNum( const KCal::DateList & ) ) );
401 mBRdisabled = false; 401 mBRdisabled = false;
402 //toggleBeamReceive(); 402 //toggleBeamReceive();
403 403
404 setCaption(i18n("Loading calendar files ... please wait" )); 404 setCaption(i18n("Loading calendar files ... please wait" ));
@@ -429,37 +429,36 @@ void MainWindow::loadDataAfterStart()
429 qDebug("KO: Calendar loading time: %d ms",msNeeded ); 429 qDebug("KO: Calendar loading time: %d ms",msNeeded );
430 //QTimer::singleShot( 1000, mView, SLOT ( checkFiles() )); 430 //QTimer::singleShot( 1000, mView, SLOT ( checkFiles() ));
431 mView->setModified( false ); 431 mView->setModified( false );
432 mBlockAtStartup = false; 432 mBlockAtStartup = false;
433 mView->setModified( false ); 433 mView->setModified( false );
434 connect(mView , SIGNAL( save() ), this, SLOT( save() ) ); 434 connect(mView , SIGNAL( save() ), this, SLOT( save() ) );
435 processIncidenceSelection( 0 ); 435 processIncidenceSelection( 0 );
436 connect( mView, SIGNAL( incidenceSelected( Incidence * ) ), 436 connect( mView, SIGNAL( incidenceSelected( Incidence * ) ),
437 SLOT( processIncidenceSelection( Incidence * ) ) ); 437 SLOT( processIncidenceSelection( Incidence * ) ) );
438 connect( mView, SIGNAL( modifiedChanged( bool ) ), 438 connect( mView, SIGNAL( modifiedChanged( bool ) ),
439 SLOT( slotModifiedChanged( bool ) ) ); 439 SLOT( slotModifiedChanged( bool ) ) );
440 440
441#ifndef DESKTOP_VERSION 441#ifndef DESKTOP_VERSION
442 connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); 442 connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
443 connect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(recieve( const QCString&, const QByteArray& ))); 443 connect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(recieve( const QCString&, const QByteArray& )));
444 disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart( const QCString&, const QByteArray& ))); 444 disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart( const QCString&, const QByteArray& )));
445 ((QPEApplication*) qApp)->showMainWidget( this );
445 if ( !mCStringMess.isEmpty() ) 446 if ( !mCStringMess.isEmpty() )
446 recieve( mCStringMess, mByteData ); 447 recieve( mCStringMess, mByteData );
447#endif 448#endif
448
449
450 QTimer::singleShot( 1000, mView, SLOT ( checkFiles() )); 449 QTimer::singleShot( 1000, mView, SLOT ( checkFiles() ));
451} 450}
452 451
453void MainWindow::slotResetFocus() 452void MainWindow::slotResetFocus()
454{ 453{
455 //qDebug(" CalendarView::slotResetFocus() %x %x %x %x", qApp->focusWidget(), menuBar1, mView,iconToolBar); 454 //qDebug(" CalendarView::slotResetFocus() %x %x %x %x", qApp->focusWidget(), menuBar1, mView,iconToolBar);
456 mFocusLoop = 3; 455 mFocusLoop = 3;
457 QTimer::singleShot( 0, this, SLOT(slotResetFocusLoop() )); 456 QTimer::singleShot( 0, this, SLOT(slotResetFocusLoop() ));
458} 457}
459void MainWindow::slotResetFocusLoop() 458void MainWindow::slotResetFocusLoop()
460{ 459{
461 --mFocusLoop; 460 --mFocusLoop;
462 QWidget* fw = mView->viewManager()->currentView(); 461 QWidget* fw = mView->viewManager()->currentView();
463 if ( fw ) { 462 if ( fw ) {
464 //qDebug("loop "); 463 //qDebug("loop ");
465 fw->setFocus(); 464 fw->setFocus();
@@ -2031,34 +2030,34 @@ void MainWindow::backupAllFiles()
2031 setCaption(i18n("Backup succesfully finished" )); 2030 setCaption(i18n("Backup succesfully finished" ));
2032 } else if ( retval == 2 ){ 2031 } else if ( retval == 2 ){
2033 setCaption(i18n("Backup globally disabled" )); 2032 setCaption(i18n("Backup globally disabled" ));
2034 qDebug("KO: Backup globally cancelled."); 2033 qDebug("KO: Backup globally cancelled.");
2035 // backup globally cancelled 2034 // backup globally cancelled
2036 KPimGlobalPrefs::instance()->mBackupEnabled = false; 2035 KPimGlobalPrefs::instance()->mBackupEnabled = false;
2037 } 2036 }
2038 // retval == 3: do nothing, try again later 2037 // retval == 3: do nothing, try again later
2039} 2038}
2040void MainWindow::save() 2039void MainWindow::save()
2041{ 2040{
2042 if ( mSaveDelay ) { 2041 if ( mSaveDelay ) {
2043 int elapsed = mSaveTimerStart.secsTo( QDateTime::currentDateTime() ); 2042 int elapsed = mSaveTimerStart.secsTo( QDateTime::currentDateTime() );
2044 if ( mSaveDelay < elapsed ) { 2043 if ( mSaveDelay < elapsed ) {
2045 qDebug("KO: Pending save after wakeup from suspend detected."); 2044 qDebug("KO: Pending save after wakeup from suspend detected.");
2046 qDebug("KO: Save delay %d sec. Elapsed save time %d sec.", mSaveDelay, elapsed ); 2045 qDebug("KO: Save delay %d sec. Elapsed save time %d sec.", mSaveDelay, elapsed );
2047 qDebug("KO: Restarting save timer to save in 15 sec."); 2046 qDebug("KO: Restarting save timer to save in 10 sec.");
2048 int msec = 15000; 2047 int msec = 10000;
2049 mSaveTimer.start( msec, true ); 2048 mSaveTimer.start( msec, true );
2050 mSaveTimerStart = QDateTime::currentDateTime(); 2049 mSaveTimerStart = QDateTime::currentDateTime();
2051 mSaveDelay = msec/1000; 2050 mSaveDelay = msec/1000;
2052 return; 2051 return;
2053 } 2052 }
2054 } 2053 }
2055 2054
2056 if ( mView->viewManager()->journalView() ) 2055 if ( mView->viewManager()->journalView() )
2057 mView->viewManager()->journalView()->checkModified(); 2056 mView->viewManager()->journalView()->checkModified();
2058 if ( !mCalendarModifiedFlag ) { 2057 if ( !mCalendarModifiedFlag ) {
2059 qDebug("KO: Calendar not modified. Nothing saved."); 2058 qDebug("KO: Calendar not modified. Nothing saved.");
2060 return; 2059 return;
2061 } 2060 }
2062 if ( mSyncManager->blockSave() ) { 2061 if ( mSyncManager->blockSave() ) {
2063 slotModifiedChanged( true ); 2062 slotModifiedChanged( true );
2064 return; 2063 return;