author | zautrix <zautrix> | 2004-10-28 07:46:21 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-28 07:46:21 (UTC) |
commit | aada2527dee908aa96bfc16f5faddd3b29372bee (patch) (unidiff) | |
tree | 7ca9bbe5dc64684ec94110becf63d80ae9ad0edd /kaddressbook | |
parent | 2fe1a56682ef4dc1fa0a30f764c7313b583631c5 (diff) | |
download | kdepimpi-aada2527dee908aa96bfc16f5faddd3b29372bee.zip kdepimpi-aada2527dee908aa96bfc16f5faddd3b29372bee.tar.gz kdepimpi-aada2527dee908aa96bfc16f5faddd3b29372bee.tar.bz2 |
compile fixes
-rw-r--r-- | kaddressbook/kabcore.cpp | 6 | ||||
-rw-r--r-- | kaddressbook/viewmanager.cpp | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 638abc9..5ebd3a4 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1934,8 +1934,9 @@ void KABCore::addActionsManually() | |||
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. |
@@ -1949,7 +1950,7 @@ void KABCore::addActionsManually() | |||
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 ); |
@@ -1971,6 +1972,7 @@ void KABCore::addActionsManually() | |||
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 | ||
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 3d0c275..0d91c12 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp | |||
@@ -106,7 +106,7 @@ void ViewManager::restoreSettings() | |||
106 | mFilterList = Filter::restore( mCore->config(), "Filter" ); | 106 | mFilterList = Filter::restore( mCore->config(), "Filter" ); |
107 | mActionSelectFilter->setItems( filterNames() ); | 107 | mActionSelectFilter->setItems( filterNames() ); |
108 | mActionSelectFilter->setCurrentItem( KABPrefs::instance()->mCurrentFilter ); | 108 | mActionSelectFilter->setCurrentItem( KABPrefs::instance()->mCurrentFilter ); |
109 | mActionSelectFilter->setComboWidth( 100 ); | 109 | mActionSelectFilter->setComboWidth( 150 ); |
110 | // Tell the views to reread their config, since they may have | 110 | // Tell the views to reread their config, since they may have |
111 | // been modified by global settings | 111 | // been modified by global settings |
112 | QString _oldgroup = mCore->config()->group(); | 112 | QString _oldgroup = mCore->config()->group(); |
@@ -597,7 +597,7 @@ void ViewManager::configureFilters() | |||
597 | mActionSelectFilter->setItems( filterNames() ); | 597 | mActionSelectFilter->setItems( filterNames() ); |
598 | mActionSelectFilter->setCurrentItem( pos ); | 598 | mActionSelectFilter->setCurrentItem( pos ); |
599 | setActiveFilter( pos ); | 599 | setActiveFilter( pos ); |
600 | //mActionSelectFilter->setComboWidth( 150 ); | 600 | mActionSelectFilter->setComboWidth( 150 ); |
601 | } | 601 | } |
602 | 602 | ||
603 | QStringList ViewManager::filterNames() const | 603 | QStringList ViewManager::filterNames() const |