[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE_3_2_BRANCH: kdepim/kmail
From: Ingo Klöcker <kloecker () kde ! org>
Date: 2004-05-15 15:57:21
Message-ID: 20040515155721.4847F1730 () office ! kde ! org
[Download RAW message or body]
CVS commit by kloecker:
Backport: Fix wrong initialization of the View->Unread Count actions.
M +5 -5 kmmainwidget.cpp 1.132.2.8
--- kdepim/kmail/kmmainwidget.cpp #1.132.2.7:1.132.2.8
@@ -294,6 +294,6 @@ void KMMainWidget::readConfig(void)
* it's better to manage these here */
// The columns are shown by default.
- int unreadColumn = config->readNumEntry("UnreadColumn", -1);
- int totalColumn = config->readNumEntry("TotalColumn", -1);
+ const int unreadColumn = config->readNumEntry("UnreadColumn", 1);
+ const int totalColumn = config->readNumEntry("TotalColumn", 2);
/* we need to _activate_ them in the correct order
@@ -307,4 +307,7 @@ void KMMainWidget::readConfig(void)
if (unreadColumn != -1 && unreadColumn > totalColumn)
mFolderTree->toggleColumn(KMFolderTree::unread);
+ mUnreadColumnToggle->setChecked( mFolderTree->isUnreadActive() );
+ mUnreadTextToggle->setChecked( !mFolderTree->isUnreadActive() );
+ mTotalColumnToggle->setChecked( mFolderTree->isTotalActive() );
}
@@ -2547,5 +2550,4 @@ void KMMainWidget::setupActions()
actionCollection(), "view_unread_column" );
mUnreadColumnToggle->setExclusiveGroup( "view_unread_group" );
- mUnreadColumnToggle->setChecked( mFolderTree->isUnreadActive() );
unreadMenu->insert( mUnreadColumnToggle );
@@ -2554,5 +2556,4 @@ void KMMainWidget::setupActions()
actionCollection(), "view_unread_text" );
mUnreadTextToggle->setExclusiveGroup( "view_unread_group" );
- mUnreadTextToggle->setChecked( !mFolderTree->isUnreadActive() );
unreadMenu->insert( mUnreadTextToggle );
@@ -2563,5 +2564,4 @@ void KMMainWidget::setupActions()
mTotalColumnToggle->setToolTip( i18n("Toggle display of column showing the "
"total number of messages in folders.") );
- mTotalColumnToggle->setChecked( mFolderTree->isTotalActive() );
(void)new KAction( KGuiItem( i18n("View->","&Expand Thread"), QString::null,
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic