| -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 @@ -1920,5 +1920,6 @@ void KABCore::addActionsManually() KToolBar* tb = mMainWindow->toolBar(); -#ifdef DESKTOP_VERSION + + if ( KABPrefs::instance()->mFullMenuBarVisible ) { QMenuBar* mb = mMainWindow->menuBar(); @@ -1935,5 +1936,5 @@ void KABCore::addActionsManually() // tb->insertWidget(-1, 0, mIncSearchWidget); -#else + } else { //US setup toolbar QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); @@ -1955,5 +1956,5 @@ void KABCore::addActionsManually() // mViewManager->getFilterAction()->plug ( tb); } -#endif + } // mActionQuit->plug ( mMainWindow->toolBar()); @@ -1969,6 +1970,6 @@ 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 ); @@ -2022,5 +2023,5 @@ void KABCore::addActionsManually() mActionJumpBar->plug( settingsMenu ); mActionDetails->plug( settingsMenu ); - if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) + //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) mActionDetails->plug( tb ); settingsMenu->insertSeparator(); @@ -2048,6 +2049,6 @@ void KABCore::addActionsManually() } } else { - if (KABPrefs::instance()->mMultipleViewsAtOnce ) mActionSave->plug( tb ); + tb->enableMoving(false); } //mActionQuit->plug ( tb ); |