author | zautrix <zautrix> | 2005-04-22 18:54:01 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-22 18:54:01 (UTC) |
commit | 3fa082fb01716c63546df5d753c1b677e54c59ce (patch) (unidiff) | |
tree | f19e79e515174aab2cea0e8016eb9aa59bcc5095 /kaddressbook/viewmanager.cpp | |
parent | e6feb1ca0c45397ba7b922198c87fe9b95b7d872 (diff) | |
download | kdepimpi-3fa082fb01716c63546df5d753c1b677e54c59ce.zip kdepimpi-3fa082fb01716c63546df5d753c1b677e54c59ce.tar.gz kdepimpi-3fa082fb01716c63546df5d753c1b677e54c59ce.tar.bz2 |
fixxx
-rw-r--r-- | kaddressbook/viewmanager.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 0614d06..c738ad8 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp | |||
@@ -99,24 +99,26 @@ void ViewManager::scrollDOWN() | |||
99 | void ViewManager::restoreSettings() | 99 | void ViewManager::restoreSettings() |
100 | { | 100 | { |
101 | mViewNameList = KABPrefs::instance()->mViewNames; | 101 | mViewNameList = KABPrefs::instance()->mViewNames; |
102 | QString activeViewName = KABPrefs::instance()->mCurrentView; | 102 | QString activeViewName = KABPrefs::instance()->mCurrentView; |
103 | 103 | ||
104 | mActionSelectView->setItems( mViewNameList ); | 104 | mActionSelectView->setItems( mViewNameList ); |
105 | 105 | ||
106 | // Filter | 106 | // Filter |
107 | mFilterList = Filter::restore( mCore->config(), "Filter" ); | 107 | mFilterList = Filter::restore( mCore->config(), "Filter" ); |
108 | mActionSelectFilter->setItems( filterNames() ); | 108 | mActionSelectFilter->setItems( filterNames() ); |
109 | mActionSelectFilter->setCurrentItem( KABPrefs::instance()->mCurrentFilter ); | 109 | mActionSelectFilter->setCurrentItem( KABPrefs::instance()->mCurrentFilter ); |
110 | int cw = 150; | 110 | int cw = 150; |
111 | if ( QApplication::desktop()->width() >= 800 ) | ||
112 | cw = 200; | ||
111 | if (QApplication::desktop()->width() == 480 && !KABPrefs::instance()->mHideSearchOnSwitch) | 113 | if (QApplication::desktop()->width() == 480 && !KABPrefs::instance()->mHideSearchOnSwitch) |
112 | cw = 0; | 114 | cw = 0; |
113 | mActionSelectFilter->setComboWidth( cw ); | 115 | mActionSelectFilter->setComboWidth( cw ); |
114 | // Tell the views to reread their config, since they may have | 116 | // Tell the views to reread their config, since they may have |
115 | // been modified by global settings | 117 | // been modified by global settings |
116 | QString _oldgroup = mCore->config()->group(); | 118 | QString _oldgroup = mCore->config()->group(); |
117 | 119 | ||
118 | QDictIterator<KAddressBookView> it( mViewDict ); | 120 | QDictIterator<KAddressBookView> it( mViewDict ); |
119 | for ( it.toFirst(); it.current(); ++it ) { | 121 | for ( it.toFirst(); it.current(); ++it ) { |
120 | KConfigGroupSaver saver( mCore->config(), it.currentKey() ); | 122 | KConfigGroupSaver saver( mCore->config(), it.currentKey() ); |
121 | it.current()->readConfig( mCore->config() ); | 123 | it.current()->readConfig( mCore->config() ); |
122 | } | 124 | } |
@@ -595,24 +597,26 @@ void ViewManager::configureFilters() | |||
595 | FilterDialog dlg( this ); | 597 | FilterDialog dlg( this ); |
596 | 598 | ||
597 | dlg.setFilters( mFilterList ); | 599 | dlg.setFilters( mFilterList ); |
598 | 600 | ||
599 | if ( dlg.exec() ) | 601 | if ( dlg.exec() ) |
600 | mFilterList = dlg.filters(); | 602 | mFilterList = dlg.filters(); |
601 | 603 | ||
602 | uint pos = mActionSelectFilter->currentItem(); | 604 | uint pos = mActionSelectFilter->currentItem(); |
603 | mActionSelectFilter->setItems( filterNames() ); | 605 | mActionSelectFilter->setItems( filterNames() ); |
604 | mActionSelectFilter->setCurrentItem( pos ); | 606 | mActionSelectFilter->setCurrentItem( pos ); |
605 | setActiveFilter( pos ); | 607 | setActiveFilter( pos ); |
606 | int cw = 150; | 608 | int cw = 150; |
609 | if ( QApplication::desktop()->width() >= 800 ) | ||
610 | cw = 200; | ||
607 | if (QApplication::desktop()->width() == 480 && !KABPrefs::instance()->mHideSearchOnSwitch) | 611 | if (QApplication::desktop()->width() == 480 && !KABPrefs::instance()->mHideSearchOnSwitch) |
608 | cw = 0; | 612 | cw = 0; |
609 | mActionSelectFilter->setComboWidth( cw ); | 613 | mActionSelectFilter->setComboWidth( cw ); |
610 | saveSettings(); | 614 | saveSettings(); |
611 | } | 615 | } |
612 | 616 | ||
613 | QStringList ViewManager::filterNames() const | 617 | QStringList ViewManager::filterNames() const |
614 | { | 618 | { |
615 | QStringList names( i18n( "No Filter" ) ); | 619 | QStringList names( i18n( "No Filter" ) ); |
616 | 620 | ||
617 | Filter::List::ConstIterator it; | 621 | Filter::List::ConstIterator it; |
618 | for ( it = mFilterList.begin(); it != mFilterList.end(); ++it ) | 622 | for ( it = mFilterList.begin(); it != mFilterList.end(); ++it ) |