Diffstat (limited to 'kaddressbook/viewmanager.cpp') (more/less context) (ignore whitespace changes)
-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 | |||
@@ -87,48 +87,50 @@ ViewManager::~ViewManager() | |||
87 | mViewFactoryDict.clear(); | 87 | mViewFactoryDict.clear(); |
88 | } | 88 | } |
89 | void ViewManager::scrollUP() | 89 | void ViewManager::scrollUP() |
90 | { | 90 | { |
91 | if ( mActiveView ) | 91 | if ( mActiveView ) |
92 | mActiveView->scrollUP(); | 92 | mActiveView->scrollUP(); |
93 | } | 93 | } |
94 | void ViewManager::scrollDOWN() | 94 | void ViewManager::scrollDOWN() |
95 | { | 95 | { |
96 | if ( mActiveView ) | 96 | if ( mActiveView ) |
97 | mActiveView->scrollDOWN(); | 97 | mActiveView->scrollDOWN(); |
98 | } | 98 | } |
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 | } |
123 | setActiveView( activeViewName ); | 125 | setActiveView( activeViewName ); |
124 | 126 | ||
125 | mActionDeleteView->setEnabled( mViewNameList.count() > 1 ); | 127 | mActionDeleteView->setEnabled( mViewNameList.count() > 1 ); |
126 | } | 128 | } |
127 | 129 | ||
128 | void ViewManager::saveSettings() | 130 | void ViewManager::saveSettings() |
129 | { | 131 | { |
130 | QString _oldgroup = mCore->config()->group(); | 132 | QString _oldgroup = mCore->config()->group(); |
131 | 133 | ||
132 | QDictIterator<KAddressBookView> it( mViewDict ); | 134 | QDictIterator<KAddressBookView> it( mViewDict ); |
133 | for ( it.toFirst(); it.current(); ++it ) { | 135 | for ( it.toFirst(); it.current(); ++it ) { |
134 | KConfigGroupSaver saver( mCore->config(), it.currentKey() ); | 136 | KConfigGroupSaver saver( mCore->config(), it.currentKey() ); |
@@ -583,48 +585,50 @@ void ViewManager::setActiveFilter( int index ) | |||
583 | 585 | ||
584 | // Check if we have a view. Since the filter combo is created before | 586 | // Check if we have a view. Since the filter combo is created before |
585 | // the view, this slot could be called before there is a valid view. | 587 | // the view, this slot could be called before there is a valid view. |
586 | if ( mActiveView ) { | 588 | if ( mActiveView ) { |
587 | mActiveView->setFilter( currentFilter ); | 589 | mActiveView->setFilter( currentFilter ); |
588 | mActiveView->refresh(); | 590 | mActiveView->refresh(); |
589 | emit selected( QString::null ); | 591 | emit selected( QString::null ); |
590 | } | 592 | } |
591 | } | 593 | } |
592 | 594 | ||
593 | void ViewManager::configureFilters() | 595 | void ViewManager::configureFilters() |
594 | { | 596 | { |
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 ) |
619 | names.append( (*it).name() ); | 623 | names.append( (*it).name() ); |
620 | 624 | ||
621 | return names; | 625 | return names; |
622 | } | 626 | } |
623 | Filter ViewManager::getFilterByName( const QString &name ) const | 627 | Filter ViewManager::getFilterByName( const QString &name ) const |
624 | { | 628 | { |
625 | Filter::List::ConstIterator it; | 629 | Filter::List::ConstIterator it; |
626 | for ( it = mFilterList.begin(); it != mFilterList.end(); ++it ) | 630 | for ( it = mFilterList.begin(); it != mFilterList.end(); ++it ) |
627 | if ( name == (*it).name() ) | 631 | if ( name == (*it).name() ) |
628 | return (*it); | 632 | return (*it); |
629 | 633 | ||
630 | return Filter(); | 634 | return Filter(); |