-rw-r--r-- | kaddressbook/kabcore.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index cb9b992..f0f08f4 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1311,9 +1311,11 @@ void KABCore::openConfigDialog() | |||
1311 | this, SLOT( configurationChanged() ) ); | 1311 | this, SLOT( configurationChanged() ) ); |
1312 | connect( ConfigureDialog, SIGNAL( okClicked() ), | 1312 | connect( ConfigureDialog, SIGNAL( okClicked() ), |
1313 | this, SLOT( configurationChanged() ) ); | 1313 | this, SLOT( configurationChanged() ) ); |
1314 | saveSettings(); | 1314 | saveSettings(); |
1315 | #ifndef DESKTOP_VERSION | ||
1315 | ConfigureDialog->showMaximized(); | 1316 | ConfigureDialog->showMaximized(); |
1317 | #endif | ||
1316 | if ( ConfigureDialog->exec() ) | 1318 | if ( ConfigureDialog->exec() ) |
1317 | KMessageBox::information( this, i18n("Some changes are only\neffective after a restart!\n") ); | 1319 | KMessageBox::information( this, i18n("Some changes are only\neffective after a restart!\n") ); |
1318 | delete ConfigureDialog; | 1320 | delete ConfigureDialog; |
1319 | } | 1321 | } |
@@ -1869,9 +1871,9 @@ void KABCore::addActionsManually() | |||
1869 | settingsMenu->insertSeparator(); | 1871 | settingsMenu->insertSeparator(); |
1870 | 1872 | ||
1871 | mActionJumpBar->plug( settingsMenu ); | 1873 | mActionJumpBar->plug( settingsMenu ); |
1872 | mActionDetails->plug( settingsMenu ); | 1874 | mActionDetails->plug( settingsMenu ); |
1873 | if (!KABPrefs::instance()->mMultipleViewsAtOnce ) | 1875 | if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) |
1874 | mActionDetails->plug( tb ); | 1876 | mActionDetails->plug( tb ); |
1875 | settingsMenu->insertSeparator(); | 1877 | settingsMenu->insertSeparator(); |
1876 | 1878 | ||
1877 | mActionWhoAmI->plug( settingsMenu ); | 1879 | mActionWhoAmI->plug( settingsMenu ); |