Git commit 34d5735f214d219614041997c2a3af2a1c5b4bd5 by Montel Laurent.
Committed on 22/02/2012 at 17:51.
Pushed by mlaurent into branch 'master'.

More logical to use red color when broken and grey when offline

M +2 -2 kmail/configuredialog.cpp
M +6 -6 mailcommon/foldertreewidgetproxymodel.cpp

http://commits.kde.org/kdepim/34d5735f214d219614041997c2a3af2a1c5b4bd5

diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 533aa41..b1283ed 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -1043,8 +1043,8 @@ void AppearancePage::ColorsTab::loadColor( bool
loadFromConfig )
Qt::black, // colorbar plain fg
Qt::black, // colorbar html bg
Qt::white, // colorbar html fg
- scheme.foreground(KColorScheme::NegativeText).color(), //Offline Account
Color
- scheme.foreground(KColorScheme::InactiveText).color() //Broken Account
Color
+ scheme.foreground(KColorScheme::InactiveText).color(), //Offline Account
Color
+ scheme.foreground(KColorScheme::NegativeText).color() //Broken Account
Color
};

for ( int i = 0 ; i < numColorNames ; i++ ) {
diff --git a/mailcommon/foldertreewidgetproxymodel.cpp
b/mailcommon/foldertreewidgetproxymodel.cpp
index 2314987..f64d415 100644
--- a/mailcommon/foldertreewidgetproxymodel.cpp
+++ b/mailcommon/foldertreewidgetproxymodel.cpp
@@ -91,15 +91,15 @@ void FolderTreeWidgetProxyModel::readConfig()
KConfigGroup collectionFolderView( KernelIf->config(),
"CollectionFolderView" );
KColorScheme scheme( QPalette::Active, KColorScheme::View );
if ( MessageCore::GlobalSettings::self()->useDefaultColors() ) {
- d->offlineAccountColor = scheme.foreground( KColorScheme::NegativeText
).color();
- d->brokenAccountColor = scheme.foreground( KColorScheme::InactiveText
).color();
+ d->offlineAccountColor = scheme.foreground( KColorScheme::InactiveText
).color();
+ d->brokenAccountColor = scheme.foreground( KColorScheme::NegativeText
).color();
} else {
d->offlineAccountColor =
collectionFolderView.readEntry( "OfflineAccountColor",
- scheme.foreground(
KColorScheme::NegativeText ).color() );
+ scheme.foreground(
KColorScheme::InactiveText ).color() );
d->brokenAccountColor =
collectionFolderView.readEntry( "BrokenAccountColor",
- scheme.foreground(
KColorScheme::InactiveText ).color() );
+ scheme.foreground(
KColorScheme::NegativeText ).color() );
}
invalidate();
}
@@ -242,8 +242,8 @@ void FolderTreeWidgetProxyModel::updatePalette()
{
if ( MessageCore::GlobalSettings::self()->useDefaultColors() ) {
KColorScheme scheme( QPalette::Active, KColorScheme::View );
- d->offlineAccountColor = scheme.foreground( KColorScheme::NegativeText
).color();
- d->brokenAccountColor = scheme.foreground( KColorScheme::InactiveText
).color();
+ d->offlineAccountColor = scheme.foreground( KColorScheme::InactiveText
).color();
+ d->brokenAccountColor = scheme.foreground( KColorScheme::NegativeText
).color();
invalidate();
}
}