| -rw-r--r-- | kaddressbook/kabcore.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index b0cb986..4964a6c 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -1921,3 +1921,4 @@ void KABCore::addActionsManually() -#ifdef DESKTOP_VERSION + + if ( KABPrefs::instance()->mFullMenuBarVisible ) { QMenuBar* mb = mMainWindow->menuBar(); @@ -1936,3 +1937,3 @@ void KABCore::addActionsManually() -#else + } else { //US setup toolbar @@ -1956,3 +1957,3 @@ void KABCore::addActionsManually() } -#endif + } // mActionQuit->plug ( mMainWindow->toolBar()); @@ -1970,4 +1971,4 @@ void KABCore::addActionsManually() mActionEditAddressee->plug( fileMenu ); - if ((KGlobal::getDesktopSize() > KGlobal::Small ) || - (!KABPrefs::instance()->mMultipleViewsAtOnce )) + // if ((KGlobal::getDesktopSize() > KGlobal::Small ) || + // (!KABPrefs::instance()->mMultipleViewsAtOnce )) mActionEditAddressee->plug( tb ); @@ -2023,3 +2024,3 @@ void KABCore::addActionsManually() mActionDetails->plug( settingsMenu ); - if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) + //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) mActionDetails->plug( tb ); @@ -2049,4 +2050,4 @@ void KABCore::addActionsManually() } else { - if (KABPrefs::instance()->mMultipleViewsAtOnce ) mActionSave->plug( tb ); + tb->enableMoving(false); } |