-rw-r--r-- | kaddressbook/kabcore.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 79f897b..3b1a0c1 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2102,65 +2102,64 @@ void KABCore::addActionsManually() | |||
2102 | QPopupMenu *helpMenu = new QPopupMenu( this ); | 2102 | QPopupMenu *helpMenu = new QPopupMenu( this ); |
2103 | 2103 | ||
2104 | KToolBar* tb = mMainWindow->toolBar(); | 2104 | KToolBar* tb = mMainWindow->toolBar(); |
2105 | 2105 | ||
2106 | #ifndef DESKTOP_VERSION | 2106 | #ifndef DESKTOP_VERSION |
2107 | if ( KABPrefs::instance()->mFullMenuBarVisible ) { | 2107 | if ( KABPrefs::instance()->mFullMenuBarVisible ) { |
2108 | #endif | 2108 | #endif |
2109 | QMenuBar* mb = mMainWindow->menuBar(); | 2109 | QMenuBar* mb = mMainWindow->menuBar(); |
2110 | 2110 | ||
2111 | //US setup menubar. | 2111 | //US setup menubar. |
2112 | //Disable the following block if you do not want to have a menubar. | 2112 | //Disable the following block if you do not want to have a menubar. |
2113 | mb->insertItem( i18n("&File"), fileMenu ); | 2113 | mb->insertItem( i18n("&File"), fileMenu ); |
2114 | mb->insertItem( i18n("&Edit"), editMenu ); | 2114 | mb->insertItem( i18n("&Edit"), editMenu ); |
2115 | mb->insertItem( i18n("&View"), viewMenu ); | 2115 | mb->insertItem( i18n("&View"), viewMenu ); |
2116 | mb->insertItem( i18n("&Settings"), settingsMenu ); | 2116 | mb->insertItem( i18n("&Settings"), settingsMenu ); |
2117 | #ifdef DESKTOP_VERSION | 2117 | #ifdef DESKTOP_VERSION |
2118 | mb->insertItem( i18n("Synchronize"), syncMenu ); | 2118 | mb->insertItem( i18n("Synchronize"), syncMenu ); |
2119 | #else | 2119 | #else |
2120 | mb->insertItem( i18n("Sync"), syncMenu ); | 2120 | mb->insertItem( i18n("Sync"), syncMenu ); |
2121 | #endif | 2121 | #endif |
2122 | //mb->insertItem( i18n("&Change"), changeMenu ); | 2122 | //mb->insertItem( i18n("&Change"), changeMenu ); |
2123 | mb->insertItem( i18n("&Help"), helpMenu ); | 2123 | mb->insertItem( i18n("&Help"), helpMenu ); |
2124 | mIncSearchWidget = new IncSearchWidget( tb ); | 2124 | mIncSearchWidget = new IncSearchWidget( tb ); |
2125 | // tb->insertWidget(-1, 0, mIncSearchWidget); | 2125 | // tb->insertWidget(-1, 0, mIncSearchWidget); |
2126 | #ifndef DESKTOP_VERSION | 2126 | #ifndef DESKTOP_VERSION |
2127 | } else { | 2127 | } else { |
2128 | //US setup toolbar | 2128 | //US setup toolbar |
2129 | QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); | 2129 | QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); |
2130 | QPopupMenu *popupBarTB = new QPopupMenu( this ); | 2130 | QPopupMenu *popupBarTB = new QPopupMenu( this ); |
2131 | menuBarTB->insertItem( SmallIcon( "z_menu" ) , popupBarTB); | 2131 | menuBarTB->insertItem( SmallIcon( "z_menu" ) , popupBarTB); |
2132 | tb->insertWidget(-1, 0, menuBarTB); | 2132 | tb->insertWidget(-1, 0, menuBarTB); |
2133 | mIncSearchWidget = new IncSearchWidget( tb ); | 2133 | mIncSearchWidget = new IncSearchWidget( tb ); |
2134 | |||
2135 | tb->enableMoving(false); | 2134 | tb->enableMoving(false); |
2136 | popupBarTB->insertItem( i18n("&File"), fileMenu ); | 2135 | popupBarTB->insertItem( i18n("&File"), fileMenu ); |
2137 | popupBarTB->insertItem( i18n("&Edit"), editMenu ); | 2136 | popupBarTB->insertItem( i18n("&Edit"), editMenu ); |
2138 | popupBarTB->insertItem( i18n("&View"), viewMenu ); | 2137 | popupBarTB->insertItem( i18n("&View"), viewMenu ); |
2139 | popupBarTB->insertItem( i18n("&Settings"), settingsMenu ); | 2138 | popupBarTB->insertItem( i18n("&Settings"), settingsMenu ); |
2140 | popupBarTB->insertItem( i18n("Synchronize"), syncMenu ); | 2139 | popupBarTB->insertItem( i18n("Synchronize"), syncMenu ); |
2141 | mViewManager->getFilterAction()->plug ( popupBarTB); | 2140 | mViewManager->getFilterAction()->plug ( popupBarTB); |
2142 | //popupBarTB->insertItem( i18n("&Change selected"), changeMenu ); | 2141 | //popupBarTB->insertItem( i18n("&Change selected"), changeMenu ); |
2143 | popupBarTB->insertItem( i18n("&Help"), helpMenu ); | 2142 | popupBarTB->insertItem( i18n("&Help"), helpMenu ); |
2144 | if (QApplication::desktop()->width() > 320 ) { | 2143 | if (QApplication::desktop()->width() > 320 ) { |
2145 | // mViewManager->getFilterAction()->plug ( tb); | 2144 | // mViewManager->getFilterAction()->plug ( tb); |
2146 | } | 2145 | } |
2147 | } | 2146 | } |
2148 | #endif | 2147 | #endif |
2149 | // mActionQuit->plug ( mMainWindow->toolBar()); | 2148 | // mActionQuit->plug ( mMainWindow->toolBar()); |
2150 | 2149 | ||
2151 | 2150 | ||
2152 | 2151 | ||
2153 | //US Now connect the actions with the menue entries. | 2152 | //US Now connect the actions with the menue entries. |
2154 | #ifdef DESKTOP_VERSION | 2153 | #ifdef DESKTOP_VERSION |
2155 | mActionPrint->plug( fileMenu ); | 2154 | mActionPrint->plug( fileMenu ); |
2156 | mActionPrintDetails->plug( fileMenu ); | 2155 | mActionPrintDetails->plug( fileMenu ); |
2157 | fileMenu->insertSeparator(); | 2156 | fileMenu->insertSeparator(); |
2158 | #endif | 2157 | #endif |
2159 | mActionMail->plug( fileMenu ); | 2158 | mActionMail->plug( fileMenu ); |
2160 | fileMenu->insertSeparator(); | 2159 | fileMenu->insertSeparator(); |
2161 | 2160 | ||
2162 | mActionNewContact->plug( fileMenu ); | 2161 | mActionNewContact->plug( fileMenu ); |
2163 | mActionNewContact->plug( tb ); | 2162 | mActionNewContact->plug( tb ); |
2164 | 2163 | ||
2165 | mActionEditAddressee->plug( fileMenu ); | 2164 | mActionEditAddressee->plug( fileMenu ); |
2166 | // if ((KGlobal::getDesktopSize() > KGlobal::Small ) || | 2165 | // if ((KGlobal::getDesktopSize() > KGlobal::Small ) || |