author | zautrix <zautrix> | 2004-10-14 19:29:13 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-14 19:29:13 (UTC) |
commit | 5fc6dcc1e688d7c68789847d224a39703acad68d (patch) (unidiff) | |
tree | 58cc64e6118e82b827a1a460f199e0c823b307e1 | |
parent | de9086e84ab6ae88e4c05a015ce053f195733875 (diff) | |
download | kdepimpi-5fc6dcc1e688d7c68789847d224a39703acad68d.zip kdepimpi-5fc6dcc1e688d7c68789847d224a39703acad68d.tar.gz kdepimpi-5fc6dcc1e688d7c68789847d224a39703acad68d.tar.bz2 |
receive IR fix
-rw-r--r-- | kaddressbook/kabcore.cpp | 1 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 3ab06c4..2e408b7 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -321,32 +321,33 @@ KABCore::~KABCore() | |||
321 | //saveSettings(); | 321 | //saveSettings(); |
322 | //KABPrefs::instance()->writeConfig(); | 322 | //KABPrefs::instance()->writeConfig(); |
323 | delete AddresseeConfig::instance(); | 323 | delete AddresseeConfig::instance(); |
324 | mAddressBook = 0; | 324 | mAddressBook = 0; |
325 | KABC::StdAddressBook::close(); | 325 | KABC::StdAddressBook::close(); |
326 | 326 | ||
327 | delete syncManager; | 327 | delete syncManager; |
328 | 328 | ||
329 | } | 329 | } |
330 | 330 | ||
331 | void KABCore::recieve( QString fn ) | 331 | void KABCore::recieve( QString fn ) |
332 | { | 332 | { |
333 | //qDebug("KABCore::recieve "); | 333 | //qDebug("KABCore::recieve "); |
334 | int count = mAddressBook->importFromFile( fn, true ); | 334 | int count = mAddressBook->importFromFile( fn, true ); |
335 | mViewManager->refreshView(); | 335 | mViewManager->refreshView(); |
336 | message(i18n("%1 contact(s) received!").arg( count )); | 336 | message(i18n("%1 contact(s) received!").arg( count )); |
337 | topLevelWidget()->showMaximized(); | ||
337 | topLevelWidget()->raise(); | 338 | topLevelWidget()->raise(); |
338 | } | 339 | } |
339 | void KABCore::restoreSettings() | 340 | void KABCore::restoreSettings() |
340 | { | 341 | { |
341 | mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce; | 342 | mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce; |
342 | 343 | ||
343 | bool state; | 344 | bool state; |
344 | 345 | ||
345 | if (mMultipleViewsAtOnce) | 346 | if (mMultipleViewsAtOnce) |
346 | state = KABPrefs::instance()->mDetailsPageVisible; | 347 | state = KABPrefs::instance()->mDetailsPageVisible; |
347 | else | 348 | else |
348 | state = false; | 349 | state = false; |
349 | 350 | ||
350 | mActionDetails->setChecked( state ); | 351 | mActionDetails->setChecked( state ); |
351 | setDetailsVisible( state ); | 352 | setDetailsVisible( state ); |
352 | 353 | ||
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 58d8d34..30c0d2f 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -326,33 +326,35 @@ void MainWindow::closeEvent( QCloseEvent* ce ) | |||
326 | 326 | ||
327 | 327 | ||
328 | } | 328 | } |
329 | 329 | ||
330 | void MainWindow::recieve( const QCString& cmsg, const QByteArray& data ) | 330 | void MainWindow::recieve( const QCString& cmsg, const QByteArray& data ) |
331 | { | 331 | { |
332 | QDataStream stream( data, IO_ReadOnly ); | 332 | QDataStream stream( data, IO_ReadOnly ); |
333 | // QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" ); | 333 | // QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" ); |
334 | //QString datamess; | 334 | //QString datamess; |
335 | //qDebug("message "); | 335 | //qDebug("message "); |
336 | qDebug("KO: QCOP message received: %s ", cmsg.data() ); | 336 | qDebug("KO: QCOP message received: %s ", cmsg.data() ); |
337 | 337 | ||
338 | if ( cmsg == "setDocument(QString)" ) { | 338 | if ( cmsg == "setDocument(QString)" ) { |
339 | QDataStream stream( data, IO_ReadOnly ); | 339 | QDataStream stream( data, IO_ReadOnly ); |
340 | QString fileName; | 340 | QString fileName; |
341 | stream >> fileName; | 341 | stream >> fileName; |
342 | qDebug("filename %s ", fileName.latin1()); | 342 | //qDebug("filename %s ", fileName.latin1()); |
343 | showMaximized(); | ||
344 | raise(); | ||
343 | KOPrefs::instance()->mLastSyncedLocalFile = fileName ; | 345 | KOPrefs::instance()->mLastSyncedLocalFile = fileName ; |
344 | mSyncManager->slotSyncMenu( 1002 ); | 346 | mSyncManager->slotSyncMenu( 1002 ); |
345 | return; | 347 | return; |
346 | } | 348 | } |
347 | 349 | ||
348 | if ( cmsg == "-writeFile" ) { | 350 | if ( cmsg == "-writeFile" ) { |
349 | // I made from the "-writeFile" an "-writeAlarm" | 351 | // I made from the "-writeFile" an "-writeAlarm" |
350 | mView->viewManager()->showWhatsNextView(); | 352 | mView->viewManager()->showWhatsNextView(); |
351 | mCalendar->checkAlarmForIncidence( 0, true); | 353 | mCalendar->checkAlarmForIncidence( 0, true); |
352 | showMaximized(); | 354 | showMaximized(); |
353 | raise(); | 355 | raise(); |
354 | return; | 356 | return; |
355 | 357 | ||
356 | } | 358 | } |
357 | if ( cmsg == "-writeFileSilent" ) { | 359 | if ( cmsg == "-writeFileSilent" ) { |
358 | // I made from the "-writeFile" an "-writeAlarm" | 360 | // I made from the "-writeFile" an "-writeAlarm" |