author | zautrix <zautrix> | 2004-08-21 00:37:31 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-08-21 00:37:31 (UTC) |
commit | f7bf415be8c727c887ec01c2d8fb8f1c2f85d096 (patch) (side-by-side diff) | |
tree | 7ea53cea72a757bb57bef12ea9e20543f2e7dfa9 | |
parent | ab07441b413dff6d478e2c3a39b823b4269931c5 (diff) | |
download | kdepimpi-f7bf415be8c727c887ec01c2d8fb8f1c2f85d096.zip kdepimpi-f7bf415be8c727c887ec01c2d8fb8f1c2f85d096.tar.gz kdepimpi-f7bf415be8c727c887ec01c2d8fb8f1c2f85d096.tar.bz2 |
Some fixes of the icons
-rw-r--r-- | bin/kdepim/kaddressbook/icons22/listview.png | bin | 365 -> 657 bytes | |||
-rw-r--r-- | kaddressbook/kabcore.cpp | 4 |
2 files changed, 3 insertions, 1 deletions
diff --git a/bin/kdepim/kaddressbook/icons22/listview.png b/bin/kdepim/kaddressbook/icons22/listview.png Binary files differindex b19d9f8..7de6ba0 100644 --- a/bin/kdepim/kaddressbook/icons22/listview.png +++ b/bin/kdepim/kaddressbook/icons22/listview.png diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index cb9b992..f0f08f4 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -1291,49 +1291,51 @@ QString KABCore::getNameByPhone( const QString &phone ) qDebug("KABCore::getNameByPhone finsih method"); return ""; #endif //KAB_EMBEDDED } void KABCore::openConfigDialog() { KABPrefs* kab_prefs = KABPrefs::instance(); KPimGlobalPrefs* kpim_prefs = KPimGlobalPrefs::instance(); KCMultiDialog* ConfigureDialog = new KCMultiDialog( "PIM", this ,"kabconfigdialog", true ); KCMKabConfig* kabcfg = new KCMKabConfig( kab_prefs, ConfigureDialog->getNewVBoxPage(i18n( "Addressbook")) , "KCMKabConfig" ); ConfigureDialog->addModule(kabcfg ); KCMKdePimConfig* kdelibcfg = new KCMKdePimConfig( kpim_prefs, ConfigureDialog->getNewVBoxPage(i18n( "Global")) , "KCMKdeLibConfig" ); ConfigureDialog->addModule(kdelibcfg ); connect( ConfigureDialog, SIGNAL( applyClicked() ), this, SLOT( configurationChanged() ) ); connect( ConfigureDialog, SIGNAL( okClicked() ), this, SLOT( configurationChanged() ) ); saveSettings(); +#ifndef DESKTOP_VERSION ConfigureDialog->showMaximized(); +#endif if ( ConfigureDialog->exec() ) KMessageBox::information( this, i18n("Some changes are only\neffective after a restart!\n") ); delete ConfigureDialog; } void KABCore::openLDAPDialog() { #ifndef KAB_EMBEDDED if ( !mLdapSearchDialog ) { mLdapSearchDialog = new LDAPSearchDialog( mAddressBook, this ); connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), mViewManager, SLOT( refreshView() ) ); connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), this, SLOT( setModified() ) ); } else mLdapSearchDialog->restoreSettings(); if ( mLdapSearchDialog->isOK() ) mLdapSearchDialog->exec(); #else //KAB_EMBEDDED qDebug("KABCore::openLDAPDialog() finsih method"); #endif //KAB_EMBEDDED } @@ -1849,49 +1851,49 @@ void KABCore::addActionsManually() editMenu->insertSeparator(); mActionSelectAll->plug( editMenu ); mActionRemoveVoice->plug( changeMenu ); // settings menu //US special menuentry to configure the addressbook resources. On KDE // you do that through the control center !!! mActionConfigResources->plug( settingsMenu ); settingsMenu->insertSeparator(); mActionConfigKAddressbook->plug( settingsMenu ); if ( mIsPart ) { mActionConfigShortcuts->plug( settingsMenu ); mActionConfigureToolbars->plug( settingsMenu ); } else { mActionKeyBindings->plug( settingsMenu ); } settingsMenu->insertSeparator(); mActionJumpBar->plug( settingsMenu ); mActionDetails->plug( settingsMenu ); - if (!KABPrefs::instance()->mMultipleViewsAtOnce ) + if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) mActionDetails->plug( tb ); settingsMenu->insertSeparator(); mActionWhoAmI->plug( settingsMenu ); mActionCategories->plug( settingsMenu ); mActionLicence->plug( helpMenu ); mActionFaq->plug( helpMenu ); mActionAboutKAddressbook->plug( helpMenu ); if (KGlobal::getDesktopSize() > KGlobal::Small ) { mActionSave->plug( tb ); mViewManager->getFilterAction()->plug ( tb); if (KGlobal::getDesktopSize() == KGlobal::Desktop ) { mActionUndo->plug( tb ); mActionDelete->plug( tb ); mActionRedo->plug( tb ); } } //mActionQuit->plug ( tb ); // tb->insertWidget(-1, 0, mIncSearchWidget, 6); //US link the searchwidget first to this. |