summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/multikey/configdlg.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp
index 9ea59a4..9576579 100644
--- a/inputmethods/multikey/configdlg.cpp
+++ b/inputmethods/multikey/configdlg.cpp
@@ -151,56 +151,56 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
151 config.setGroup("colors"); 151 config.setGroup("colors");
152 152
153 label = new QLabel(tr("Key Color"), color_box); 153 label = new QLabel(tr("Key Color"), color_box);
154 keycolor_button = new QPushButton(color_box); 154 keycolor_button = new QPushButton(color_box);
155 connect(keycolor_button, SIGNAL(clicked()), SLOT(keyColorClicked())); 155 connect(keycolor_button, SIGNAL(clicked()), SLOT(keyColorClicked()));
156 keycolor_button->setFlat((bool)1); 156 keycolor_button->setFlat((bool)1);
157 color = config.readListEntry("keycolor", QChar(',')); 157 color = config.readListEntry("keycolor", QChar(','));
158 /* 158 /*
159 * hopefully not required 159 * hopefully not required
160 160
161 if (color.isEmpty()) { 161 if (color.isEmpty()) {
162 color = QStringList::split(",", "240,240,240"); 162 color = QStringList::split(",", "240,240,240");
163 config.writeEntry("keycolor", color.join(",")); 163 config.writeEntry("keycolor", color.join(","));
164 164
165 } 165 }
166 */ 166 */
167 keycolor_button->setBackgroundColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); 167 keycolor_button->setPalette(QPalette(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())));
168 168
169 169
170 label = new QLabel(tr("Key Pressed Color"), color_box); 170 label = new QLabel(tr("Key Pressed Color"), color_box);
171 keycolor_pressed_button = new QPushButton(color_box); 171 keycolor_pressed_button = new QPushButton(color_box);
172 connect(keycolor_pressed_button, SIGNAL(clicked()), SLOT(keyColorPressedClicked())); 172 connect(keycolor_pressed_button, SIGNAL(clicked()), SLOT(keyColorPressedClicked()));
173 keycolor_pressed_button->setFlat((bool)1); 173 keycolor_pressed_button->setFlat((bool)1);
174 color = config.readListEntry("keycolor_pressed", QChar(',')); 174 color = config.readListEntry("keycolor_pressed", QChar(','));
175 keycolor_pressed_button->setBackgroundColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); 175 keycolor_pressed_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()))));
176 176
177 label = new QLabel(tr("Line Color"), color_box); 177 label = new QLabel(tr("Line Color"), color_box);
178 keycolor_lines_button = new QPushButton(color_box); 178 keycolor_lines_button = new QPushButton(color_box);
179 connect(keycolor_lines_button, SIGNAL(clicked()), SLOT(keyColorLinesClicked())); 179 connect(keycolor_lines_button, SIGNAL(clicked()), SLOT(keyColorLinesClicked()));
180 keycolor_lines_button->setFlat((bool)1); 180 keycolor_lines_button->setFlat((bool)1);
181 color = config.readListEntry("keycolor_lines", QChar(',')); 181 color = config.readListEntry("keycolor_lines", QChar(','));
182 keycolor_lines_button->setBackgroundColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); 182 keycolor_lines_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()))));
183 183
184 184
185 label = new QLabel(tr("Text Color"), color_box); 185 label = new QLabel(tr("Text Color"), color_box);
186 textcolor_button = new QPushButton(color_box); 186 textcolor_button = new QPushButton(color_box);
187 connect(textcolor_button, SIGNAL(clicked()), SLOT(textColorClicked())); 187 connect(textcolor_button, SIGNAL(clicked()), SLOT(textColorClicked()));
188 textcolor_button->setFlat((bool)1); 188 textcolor_button->setFlat((bool)1);
189 color = config.readListEntry("textcolor", QChar(',')); 189 color = config.readListEntry("textcolor", QChar(','));
190 textcolor_button->setBackgroundColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); 190 textcolor_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()))));
191 191
192 192
193 label = new QLabel("", color_box); // a spacer so the above buttons dont expand 193 label = new QLabel("", color_box); // a spacer so the above buttons dont expand
194 label->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); 194 label->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
195 195
196} 196}
197 197
198void ConfigDlg::pickTog() { 198void ConfigDlg::pickTog() {
199 199
200 Config config ("multikey"); 200 Config config ("multikey");
201 config.setGroup ("general"); 201 config.setGroup ("general");
202 config.writeEntry ("usePickboard", pick_button->isChecked()); // default closed 202 config.writeEntry ("usePickboard", pick_button->isChecked()); // default closed
203 203
204 emit pickboardToggled(pick_button->isChecked()); 204 emit pickboardToggled(pick_button->isChecked());
205} 205}
206 206