author | zautrix <zautrix> | 2005-01-27 17:15:25 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-27 17:15:25 (UTC) |
commit | 1c32caad4bf20d169203d05f9dbcac1d90402969 (patch) (unidiff) | |
tree | 8960a18919924f62cc3483e01b686d26bf359d66 /kaddressbook | |
parent | 5daf7a5bcdd729862de5bbe95ab2c88ed6de2b78 (diff) | |
download | kdepimpi-1c32caad4bf20d169203d05f9dbcac1d90402969.zip kdepimpi-1c32caad4bf20d169203d05f9dbcac1d90402969.tar.gz kdepimpi-1c32caad4bf20d169203d05f9dbcac1d90402969.tar.bz2 |
another fix
-rw-r--r-- | kaddressbook/kabcore.cpp | 8 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index e34a7d3..e2e3a66 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1393,49 +1393,53 @@ void KABCore::save() | |||
1393 | } | 1393 | } |
1394 | #endif //KAB_EMBEDDED | 1394 | #endif //KAB_EMBEDDED |
1395 | 1395 | ||
1396 | message(i18n("Addressbook saved!")); | 1396 | message(i18n("Addressbook saved!")); |
1397 | setModified( false ); | 1397 | setModified( false ); |
1398 | syncManager->setBlockSave(false); | 1398 | syncManager->setBlockSave(false); |
1399 | } | 1399 | } |
1400 | 1400 | ||
1401 | 1401 | ||
1402 | void KABCore::undo() | 1402 | void KABCore::undo() |
1403 | { | 1403 | { |
1404 | UndoStack::instance()->undo(); | 1404 | UndoStack::instance()->undo(); |
1405 | 1405 | ||
1406 | // Refresh the view | 1406 | // Refresh the view |
1407 | mViewManager->refreshView(); | 1407 | mViewManager->refreshView(); |
1408 | } | 1408 | } |
1409 | 1409 | ||
1410 | void KABCore::redo() | 1410 | void KABCore::redo() |
1411 | { | 1411 | { |
1412 | RedoStack::instance()->redo(); | 1412 | RedoStack::instance()->redo(); |
1413 | 1413 | ||
1414 | // Refresh the view | 1414 | // Refresh the view |
1415 | mViewManager->refreshView(); | 1415 | mViewManager->refreshView(); |
1416 | } | 1416 | } |
1417 | 1417 | void KABCore::setJumpButtonBar( bool visible ) | |
1418 | { | ||
1419 | setJumpButtonBarVisible(visible ); | ||
1420 | saveSettings(); | ||
1421 | } | ||
1418 | void KABCore::setJumpButtonBarVisible( bool visible ) | 1422 | void KABCore::setJumpButtonBarVisible( bool visible ) |
1419 | { | 1423 | { |
1420 | if (mMultipleViewsAtOnce) | 1424 | if (mMultipleViewsAtOnce) |
1421 | { | 1425 | { |
1422 | if ( visible ) | 1426 | if ( visible ) |
1423 | mJumpButtonBar->show(); | 1427 | mJumpButtonBar->show(); |
1424 | else | 1428 | else |
1425 | mJumpButtonBar->hide(); | 1429 | mJumpButtonBar->hide(); |
1426 | } | 1430 | } |
1427 | else | 1431 | else |
1428 | { | 1432 | { |
1429 | // show the jumpbar only if "the details are hidden" == "viewmanager are shown" | 1433 | // show the jumpbar only if "the details are hidden" == "viewmanager are shown" |
1430 | if (mViewManager->isVisible()) | 1434 | if (mViewManager->isVisible()) |
1431 | { | 1435 | { |
1432 | if ( visible ) | 1436 | if ( visible ) |
1433 | mJumpButtonBar->show(); | 1437 | mJumpButtonBar->show(); |
1434 | else | 1438 | else |
1435 | mJumpButtonBar->hide(); | 1439 | mJumpButtonBar->hide(); |
1436 | } | 1440 | } |
1437 | else | 1441 | else |
1438 | { | 1442 | { |
1439 | mJumpButtonBar->hide(); | 1443 | mJumpButtonBar->hide(); |
1440 | } | 1444 | } |
1441 | } | 1445 | } |
@@ -1983,49 +1987,49 @@ void KABCore::initActions() | |||
1983 | 1987 | ||
1984 | if ( mIsPart ) { | 1988 | if ( mIsPart ) { |
1985 | mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this, | 1989 | mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this, |
1986 | SLOT( openConfigDialog() ), actionCollection(), | 1990 | SLOT( openConfigDialog() ), actionCollection(), |
1987 | "kaddressbook_configure" ); | 1991 | "kaddressbook_configure" ); |
1988 | 1992 | ||
1989 | //US not implemented yet | 1993 | //US not implemented yet |
1990 | //mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0, | 1994 | //mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0, |
1991 | // this, SLOT( configureKeyBindings() ), actionCollection(), | 1995 | // this, SLOT( configureKeyBindings() ), actionCollection(), |
1992 | // "kaddressbook_configure_shortcuts" ); | 1996 | // "kaddressbook_configure_shortcuts" ); |
1993 | #ifdef KAB_EMBEDDED | 1997 | #ifdef KAB_EMBEDDED |
1994 | mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() ); | 1998 | mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() ); |
1995 | mActionConfigureToolbars->setEnabled( false ); | 1999 | mActionConfigureToolbars->setEnabled( false ); |
1996 | #endif //KAB_EMBEDDED | 2000 | #endif //KAB_EMBEDDED |
1997 | 2001 | ||
1998 | } else { | 2002 | } else { |
1999 | mActionConfigKAddressbook = KStdAction::preferences( this, SLOT( openConfigDialog() ), actionCollection() ); | 2003 | mActionConfigKAddressbook = KStdAction::preferences( this, SLOT( openConfigDialog() ), actionCollection() ); |
2000 | 2004 | ||
2001 | //US not implemented yet | 2005 | //US not implemented yet |
2002 | //mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() ); | 2006 | //mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() ); |
2003 | } | 2007 | } |
2004 | 2008 | ||
2005 | mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0, | 2009 | mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0, |
2006 | actionCollection(), "options_show_jump_bar" ); | 2010 | actionCollection(), "options_show_jump_bar" ); |
2007 | connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBarVisible( bool ) ) ); | 2011 | connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBar( bool ) ) ); |
2008 | 2012 | ||
2009 | mActionDetails = new KToggleAction( i18n( "Show Details" ), "listview", 0, | 2013 | mActionDetails = new KToggleAction( i18n( "Show Details" ), "listview", 0, |
2010 | actionCollection(), "options_show_details" ); | 2014 | actionCollection(), "options_show_details" ); |
2011 | connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) ); | 2015 | connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) ); |
2012 | 2016 | ||
2013 | 2017 | ||
2014 | mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this, | 2018 | mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this, |
2015 | SLOT( toggleBeamReceive() ), actionCollection(), | 2019 | SLOT( toggleBeamReceive() ), actionCollection(), |
2016 | "kaddressbook_beam_rec" ); | 2020 | "kaddressbook_beam_rec" ); |
2017 | 2021 | ||
2018 | 2022 | ||
2019 | // misc | 2023 | // misc |
2020 | // only enable LDAP lookup if we can handle the protocol | 2024 | // only enable LDAP lookup if we can handle the protocol |
2021 | #ifndef KAB_EMBEDDED | 2025 | #ifndef KAB_EMBEDDED |
2022 | if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) { | 2026 | if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) { |
2023 | new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0, | 2027 | new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0, |
2024 | this, SLOT( openLDAPDialog() ), actionCollection(), | 2028 | this, SLOT( openLDAPDialog() ), actionCollection(), |
2025 | "ldap_lookup" ); | 2029 | "ldap_lookup" ); |
2026 | } | 2030 | } |
2027 | #else //KAB_EMBEDDED | 2031 | #else //KAB_EMBEDDED |
2028 | //qDebug("KABCore::initActions() LDAP has to be implemented"); | 2032 | //qDebug("KABCore::initActions() LDAP has to be implemented"); |
2029 | #endif //KAB_EMBEDDED | 2033 | #endif //KAB_EMBEDDED |
2030 | 2034 | ||
2031 | 2035 | ||
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index 786549a..c185117 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -345,48 +345,49 @@ class KABCore : public QWidget, public KSyncInterface | |||
345 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid); | 345 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid); |
346 | void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid); | 346 | void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid); |
347 | void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid); | 347 | void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid); |
348 | 348 | ||
349 | 349 | ||
350 | signals: | 350 | signals: |
351 | void contactSelected( const QString &name ); | 351 | void contactSelected( const QString &name ); |
352 | void contactSelected( const QPixmap &pixmap ); | 352 | void contactSelected( const QPixmap &pixmap ); |
353 | public slots: | 353 | public slots: |
354 | void recieve(QString cmsg ); | 354 | void recieve(QString cmsg ); |
355 | void getFile( bool success ); | 355 | void getFile( bool success ); |
356 | void syncFileRequest(); | 356 | void syncFileRequest(); |
357 | void setDetailsVisible( bool visible ); | 357 | void setDetailsVisible( bool visible ); |
358 | void setDetailsToState(); | 358 | void setDetailsToState(); |
359 | 359 | ||
360 | void saveSettings(); | 360 | void saveSettings(); |
361 | 361 | ||
362 | private slots: | 362 | private slots: |
363 | void updateToolBar(); | 363 | void updateToolBar(); |
364 | void updateMainWindow(); | 364 | void updateMainWindow(); |
365 | void receive( const QCString& cmsg, const QByteArray& data ); | 365 | void receive( const QCString& cmsg, const QByteArray& data ); |
366 | void toggleBeamReceive( ); | 366 | void toggleBeamReceive( ); |
367 | void disableBR(bool); | 367 | void disableBR(bool); |
368 | void setJumpButtonBarVisible( bool visible ); | 368 | void setJumpButtonBarVisible( bool visible ); |
369 | void setJumpButtonBar( bool visible ); | ||
369 | void setCaptionBack(); | 370 | void setCaptionBack(); |
370 | void importFromOL(); | 371 | void importFromOL(); |
371 | void extensionModified( const KABC::Addressee::List &list ); | 372 | void extensionModified( const KABC::Addressee::List &list ); |
372 | void extensionChanged( int id ); | 373 | void extensionChanged( int id ); |
373 | void clipboardDataChanged(); | 374 | void clipboardDataChanged(); |
374 | void updateActionMenu(); | 375 | void updateActionMenu(); |
375 | void configureKeyBindings(); | 376 | void configureKeyBindings(); |
376 | void removeVoice(); | 377 | void removeVoice(); |
377 | void setFormattedName(); | 378 | void setFormattedName(); |
378 | #ifdef KAB_EMBEDDED | 379 | #ifdef KAB_EMBEDDED |
379 | void configureResources(); | 380 | void configureResources(); |
380 | #endif //KAB_EMBEDDED | 381 | #endif //KAB_EMBEDDED |
381 | 382 | ||
382 | void slotEditorDestroyed( const QString &uid ); | 383 | void slotEditorDestroyed( const QString &uid ); |
383 | void configurationChanged(); | 384 | void configurationChanged(); |
384 | void addressBookChanged(); | 385 | void addressBookChanged(); |
385 | 386 | ||
386 | private: | 387 | private: |
387 | void resizeEvent(QResizeEvent* e ); | 388 | void resizeEvent(QResizeEvent* e ); |
388 | bool mBRdisabled; | 389 | bool mBRdisabled; |
389 | #ifndef DESKTOP_VERSION | 390 | #ifndef DESKTOP_VERSION |
390 | QCopChannel* infrared; | 391 | QCopChannel* infrared; |
391 | #endif | 392 | #endif |
392 | QTimer *mMessageTimer; | 393 | QTimer *mMessageTimer; |