| -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() KToolBar* tb = mMainWindow->toolBar(); - +#ifndef DESKTOP_VERSION if ( KABPrefs::instance()->mFullMenuBarVisible ) { +#endif QMenuBar* mb = mMainWindow->menuBar(); //US setup menubar. @@ -1949,7 +1950,7 @@ void KABCore::addActionsManually() mb->insertItem( "&Help", helpMenu ); mIncSearchWidget = new IncSearchWidget( tb ); // tb->insertWidget(-1, 0, mIncSearchWidget); - +#ifndef DESKTOP_VERSION } else { //US setup toolbar QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); @@ -1971,6 +1972,7 @@ void KABCore::addActionsManually() // mViewManager->getFilterAction()->plug ( tb); } } +#endif // mActionQuit->plug ( mMainWindow->toolBar()); 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() mFilterList = Filter::restore( mCore->config(), "Filter" ); mActionSelectFilter->setItems( filterNames() ); mActionSelectFilter->setCurrentItem( KABPrefs::instance()->mCurrentFilter ); - mActionSelectFilter->setComboWidth( 100 ); + mActionSelectFilter->setComboWidth( 150 ); // Tell the views to reread their config, since they may have // been modified by global settings QString _oldgroup = mCore->config()->group(); @@ -597,7 +597,7 @@ void ViewManager::configureFilters() mActionSelectFilter->setItems( filterNames() ); mActionSelectFilter->setCurrentItem( pos ); setActiveFilter( pos ); - //mActionSelectFilter->setComboWidth( 150 ); + mActionSelectFilter->setComboWidth( 150 ); } QStringList ViewManager::filterNames() const |