summaryrefslogtreecommitdiffabout
path: root/kaddressbook/kabcore.cpp
Unidiff
Diffstat (limited to 'kaddressbook/kabcore.cpp') (more/less context) (show whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 638abc9..5ebd3a4 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1931,14 +1931,15 @@ void KABCore::addActionsManually()
1931 QPopupMenu *fileMenu = new QPopupMenu( this ); 1931 QPopupMenu *fileMenu = new QPopupMenu( this );
1932 QPopupMenu *editMenu = new QPopupMenu( this ); 1932 QPopupMenu *editMenu = new QPopupMenu( this );
1933 QPopupMenu *helpMenu = new QPopupMenu( this ); 1933 QPopupMenu *helpMenu = new QPopupMenu( this );
1934 1934
1935 KToolBar* tb = mMainWindow->toolBar(); 1935 KToolBar* tb = mMainWindow->toolBar();
1936 1936
1937 1937#ifndef DESKTOP_VERSION
1938 if ( KABPrefs::instance()->mFullMenuBarVisible ) { 1938 if ( KABPrefs::instance()->mFullMenuBarVisible ) {
1939#endif
1939 QMenuBar* mb = mMainWindow->menuBar(); 1940 QMenuBar* mb = mMainWindow->menuBar();
1940 1941
1941 //US setup menubar. 1942 //US setup menubar.
1942 //Disable the following block if you do not want to have a menubar. 1943 //Disable the following block if you do not want to have a menubar.
1943 mb->insertItem( "&File", fileMenu ); 1944 mb->insertItem( "&File", fileMenu );
1944 mb->insertItem( "&Edit", editMenu ); 1945 mb->insertItem( "&Edit", editMenu );
@@ -1946,13 +1947,13 @@ void KABCore::addActionsManually()
1946 mb->insertItem( "&Settings", settingsMenu ); 1947 mb->insertItem( "&Settings", settingsMenu );
1947 mb->insertItem( i18n("Synchronize"), syncMenu ); 1948 mb->insertItem( i18n("Synchronize"), syncMenu );
1948 mb->insertItem( "&Change selected", changeMenu ); 1949 mb->insertItem( "&Change selected", changeMenu );
1949 mb->insertItem( "&Help", helpMenu ); 1950 mb->insertItem( "&Help", helpMenu );
1950 mIncSearchWidget = new IncSearchWidget( tb ); 1951 mIncSearchWidget = new IncSearchWidget( tb );
1951 // tb->insertWidget(-1, 0, mIncSearchWidget); 1952 // tb->insertWidget(-1, 0, mIncSearchWidget);
1952 1953#ifndef DESKTOP_VERSION
1953 } else { 1954 } else {
1954 //US setup toolbar 1955 //US setup toolbar
1955 QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); 1956 QPEMenuBar *menuBarTB = new QPEMenuBar( tb );
1956 QPopupMenu *popupBarTB = new QPopupMenu( this ); 1957 QPopupMenu *popupBarTB = new QPopupMenu( this );
1957 menuBarTB->insertItem( "ME", popupBarTB); 1958 menuBarTB->insertItem( "ME", popupBarTB);
1958 tb->insertWidget(-1, 0, menuBarTB); 1959 tb->insertWidget(-1, 0, menuBarTB);
@@ -1968,12 +1969,13 @@ void KABCore::addActionsManually()
1968 popupBarTB->insertItem( "&Change selected", changeMenu ); 1969 popupBarTB->insertItem( "&Change selected", changeMenu );
1969 popupBarTB->insertItem( "&Help", helpMenu ); 1970 popupBarTB->insertItem( "&Help", helpMenu );
1970 if (QApplication::desktop()->width() > 320 ) { 1971 if (QApplication::desktop()->width() > 320 ) {
1971 // mViewManager->getFilterAction()->plug ( tb); 1972 // mViewManager->getFilterAction()->plug ( tb);
1972 } 1973 }
1973 } 1974 }
1975#endif
1974 // mActionQuit->plug ( mMainWindow->toolBar()); 1976 // mActionQuit->plug ( mMainWindow->toolBar());
1975 1977
1976 1978
1977 1979
1978 //US Now connect the actions with the menue entries. 1980 //US Now connect the actions with the menue entries.
1979 mActionPrint->plug( fileMenu ); 1981 mActionPrint->plug( fileMenu );