summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/views/configurecardviewdialog.cpp1
-rw-r--r--kaddressbook/views/configuretableviewdialog.cpp4
2 files changed, 4 insertions, 1 deletions
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index d518cf7..366e54c 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -102,24 +102,25 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config )
102{ 102{
103 // colors 103 // colors
104 cbEnableCustomColors->setChecked( config->readBoolEntry( "EnableCustomColors", false ) ); 104 cbEnableCustomColors->setChecked( config->readBoolEntry( "EnableCustomColors", false ) );
105 QColor c; 105 QColor c;
106qDebug("CardViewLookNFeelPage::restoreSettings make base color configurable"); 106qDebug("CardViewLookNFeelPage::restoreSettings make base color configurable");
107 107
108#ifndef KAB_EMBEDDED 108#ifndef KAB_EMBEDDED
109 c = KGlobalSettings::baseColor(); 109 c = KGlobalSettings::baseColor();
110#else //KAB_EMBEDDED 110#else //KAB_EMBEDDED
111 c = QColor(0,0,0); 111 c = QColor(0,0,0);
112#endif //KAB_EMBEDDED 112#endif //KAB_EMBEDDED
113 113
114 c = colorGroup().background();
114 lbColors->insertItem( new ColorListItem( i18n("Background Color"), 115 lbColors->insertItem( new ColorListItem( i18n("Background Color"),
115 config->readColorEntry( "BackgroundColor", &c ) ) ); 116 config->readColorEntry( "BackgroundColor", &c ) ) );
116 c = colorGroup().foreground(); 117 c = colorGroup().foreground();
117 lbColors->insertItem( new ColorListItem( i18n("Text Color"), 118 lbColors->insertItem( new ColorListItem( i18n("Text Color"),
118 config->readColorEntry( "TextColor", &c ) ) ); 119 config->readColorEntry( "TextColor", &c ) ) );
119 c = colorGroup().button(); 120 c = colorGroup().button();
120 lbColors->insertItem( new ColorListItem( i18n("Header, Border and Separator Color"), 121 lbColors->insertItem( new ColorListItem( i18n("Header, Border and Separator Color"),
121 config->readColorEntry( "HeaderColor", &c ) ) ); 122 config->readColorEntry( "HeaderColor", &c ) ) );
122 c = colorGroup().buttonText(); 123 c = colorGroup().buttonText();
123 lbColors->insertItem( new ColorListItem( i18n("Header Text Color"), 124 lbColors->insertItem( new ColorListItem( i18n("Header Text Color"),
124 config->readColorEntry( "HeaderTextColor", &c ) ) ); 125 config->readColorEntry( "HeaderTextColor", &c ) ) );
125 c = colorGroup().highlight(); 126 c = colorGroup().highlight();
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index cd09bcf..8bcceb2 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -106,24 +106,25 @@ void LookAndFeelPage::restoreSettings( KConfig *config )
106 106
107 // colors 107 // colors
108 cbEnableCustomColors->setChecked( config->readBoolEntry( "EnableCustomColors", false ) ); 108 cbEnableCustomColors->setChecked( config->readBoolEntry( "EnableCustomColors", false ) );
109 QColor c; 109 QColor c;
110qDebug("LookAndFeelPage::restoreSettings make base color configurable"); 110qDebug("LookAndFeelPage::restoreSettings make base color configurable");
111 111
112#ifndef KAB_EMBEDDED 112#ifndef KAB_EMBEDDED
113 c = KGlobalSettings::baseColor(); 113 c = KGlobalSettings::baseColor();
114#else //KAB_EMBEDDED 114#else //KAB_EMBEDDED
115 c = QColor(0,0,0); 115 c = QColor(0,0,0);
116#endif //KAB_EMBEDDED 116#endif //KAB_EMBEDDED
117 117
118 c = colorGroup().background();
118 lbColors->insertItem( new ColorListItem( i18n("Background Color"), 119 lbColors->insertItem( new ColorListItem( i18n("Background Color"),
119 config->readColorEntry( "BackgroundColor", &c ) ) ); 120 config->readColorEntry( "BackgroundColor", &c ) ) );
120 c = colorGroup().foreground(); 121 c = colorGroup().foreground();
121 lbColors->insertItem( new ColorListItem( i18n("Text Color"), 122 lbColors->insertItem( new ColorListItem( i18n("Text Color"),
122 config->readColorEntry( "TextColor", &c ) ) ); 123 config->readColorEntry( "TextColor", &c ) ) );
123 c = colorGroup().button(); 124 c = colorGroup().button();
124 lbColors->insertItem( new ColorListItem( i18n("Header Background Color"), 125 lbColors->insertItem( new ColorListItem( i18n("Header Background Color"),
125 config->readColorEntry( "HeaderBackgroundColor", &c ) ) ); 126 config->readColorEntry( "HeaderBackgroundColor", &c ) ) );
126 c = colorGroup().buttonText(); 127 c = colorGroup().buttonText();
127 lbColors->insertItem( new ColorListItem( i18n("Header Text Color"), 128 lbColors->insertItem( new ColorListItem( i18n("Header Text Color"),
128 config->readColorEntry( "HeaderTextColor", &c ) ) ); 129 config->readColorEntry( "HeaderTextColor", &c ) ) );
129 c = colorGroup().highlight(); 130 c = colorGroup().highlight();
@@ -232,25 +233,26 @@ void LookAndFeelPage::initGUI()
232 QButtonGroup *group = new QButtonGroup(1, Qt::Horizontal, 233 QButtonGroup *group = new QButtonGroup(1, Qt::Horizontal,
233 i18n("Row Separator"), generalTab); 234 i18n("Row Separator"), generalTab);
234 235
235 mAlternateButton = new QRadioButton(i18n("Alternating backgrounds"), 236 mAlternateButton = new QRadioButton(i18n("Alternating backgrounds"),
236 group, "mAlternateButton"); 237 group, "mAlternateButton");
237 mLineButton = new QRadioButton(i18n("Single line"), group, "mLineButton"); 238 mLineButton = new QRadioButton(i18n("Single line"), group, "mLineButton");
238 mNoneButton = new QRadioButton(i18n("None"), group, "mNoneButton"); 239 mNoneButton = new QRadioButton(i18n("None"), group, "mNoneButton");
239 240
240 mBackgroundBox = new QCheckBox(i18n("Enable background image:"), generalTab, 241 mBackgroundBox = new QCheckBox(i18n("Enable background image:"), generalTab,
241 "mBackgroundBox"); 242 "mBackgroundBox");
242 connect(mBackgroundBox, SIGNAL(toggled(bool)), 243 connect(mBackgroundBox, SIGNAL(toggled(bool)),
243 SLOT(enableBackgroundToggled(bool))); 244 SLOT(enableBackgroundToggled(bool)));
244 245 // LR image not implemented
246 mBackgroundBox->setEnabled( false );
245 mBackgroundName = new KURLRequester(generalTab, "mBackgroundName"); 247 mBackgroundName = new KURLRequester(generalTab, "mBackgroundName");
246#ifndef KAB_EMBEDDED 248#ifndef KAB_EMBEDDED
247 mBackgroundName->setMode(KFile::File | KFile::ExistingOnly | 249 mBackgroundName->setMode(KFile::File | KFile::ExistingOnly |
248 KFile::LocalOnly); 250 KFile::LocalOnly);
249 mBackgroundName->setFilter(KImageIO::pattern(KImageIO::Reading)); 251 mBackgroundName->setFilter(KImageIO::pattern(KImageIO::Reading));
250#endif //KAB_EMBEDDED 252#endif //KAB_EMBEDDED
251 253
252 // ToolTip Checkbox 254 // ToolTip Checkbox
253 mToolTipBox = new QCheckBox(i18n("Enable contact tooltips"), generalTab, 255 mToolTipBox = new QCheckBox(i18n("Enable contact tooltips"), generalTab,
254 "mToolTipBox"); 256 "mToolTipBox");
255 257
256 tabs->addTab( generalTab, i18n("&General") ); 258 tabs->addTab( generalTab, i18n("&General") );