summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/multikey/configdlg.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp
index d29109a..3e39415 100644
--- a/inputmethods/multikey/configdlg.cpp
+++ b/inputmethods/multikey/configdlg.cpp
@@ -268,196 +268,193 @@ QStringList ConfigDlg::loadSw()
}
/* Update sw_maps from default_maps */
for (uint i = 0; i < d_maps.count(); ++i) {
if (s_maps.find(d_maps[i]) == s_maps.end()) {
s_maps.append(d_maps[i]);
}
}
/* Update sw_maps from custom_maps */
for (uint i = 0; i < c_maps.count(); ++i) {
if (s_maps.find(c_maps[i]) == s_maps.end()) {
s_maps.append(c_maps[i]);
}
}
}
return s_maps;
}
void ConfigDlg::accept()
{
/* Writing all stuffs to config */
Config *config = new Config("multikey");
config->setGroup("general");
config->writeEntry("usePickboard", pick_button->isChecked()); // default closed
config->writeEntry("useRepeat", repeat_button->isChecked()); // default closed
config->setGroup("keymaps");
config->writeEntry("sw", sw_maps, QChar('|'));
config->writeEntry("maps", custom_maps, QChar('|'));
delete config;
int index = keymaps->currentItem();
if (index == 0) {
remove_button->setDisabled(true);
emit setMapToDefault();
}
else if (default_maps.find(sw_maps[index-1]) != default_maps.end()) {
remove_button->setDisabled(true);
emit setMapToFile(QPEApplication::qpeDir() + "share/multikey/" + sw_maps[index - 1]);
} else {
remove_button->setEnabled(true);
emit setMapToFile(sw_maps[index - 1]);
}
emit pickboardToggled(pick_button->isChecked());
emit repeatToggled(repeat_button->isChecked());
emit reloadSw();
QDialog::accept();
emit configDlgClosed();
}
void ConfigDlg::moveSelectedUp()
{
int i = keymaps->currentItem();
/* Ignore Current Language */
if (i > 1) {
QString t = sw_maps[i-1];
sw_maps[i-1] = sw_maps[i-2];
sw_maps[i-2] = t;
QString item = keymaps->currentText();
keymaps->removeItem(i);
keymaps->insertItem(item, i-1);
keymaps->setCurrentItem(i-1);
}
}
void ConfigDlg::moveSelectedDown()
{
int i = keymaps->currentItem();
/* Ignore Current Language */
if (i > 0 && i < (int)keymaps->count() - 1) {
QString t = sw_maps[i-1];
sw_maps[i-1] = sw_maps[i];
sw_maps[i] = t;
QString item = keymaps->currentText();
keymaps->removeItem(i);
keymaps->insertItem(item, i+1);
keymaps->setCurrentItem(i+1);
}
}
void ConfigDlg::closeEvent(QCloseEvent *) {
// tell the parent it was closed, so delete me
emit configDlgClosed();
}
void ConfigDlg::setMap(int index) {
- if (index == 0) {
- remove_button->setDisabled(true);
- }
- else if (default_maps.find(sw_maps[index-1]) != default_maps.end()) {
+ if (index == 0 || default_maps.find(sw_maps[index-1]) != default_maps.end()) {
remove_button->setDisabled(true);
} else {
remove_button->setEnabled(true);
}
}
// ConfigDlg::addMap() {{{1
void ConfigDlg::addMap() {
QString map = OFileDialog::getOpenFileName(1, QDir::home().absPath());
if (map.isNull()) return;
Config config ("multikey");
config.setGroup("keymaps");
QStringList maps = config.readListEntry("maps", QChar('|'));
maps.append(map);
custom_maps.append(map);
if (sw_maps.find(map) == sw_maps.end())
sw_maps.append(map);
QFile map_file (map);
if (map_file.open(IO_ReadOnly)) {
QString line; bool found = 0;
map_file.readLine(line, 1024);
while (!map_file.atEnd()) {
if (line.find(QRegExp("^title\\s*=\\s*")) != -1) {
keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace());
found = 1;
break;
}
map_file.readLine(line, 1024);
}
if (!found) keymaps->insertItem(map);
map_file.close();
}
keymaps->setSelected(keymaps->count() - 1, true);
}
// ConfigDlg::removeMap() {{{1
void ConfigDlg::removeMap() {
// move selection up one
keymaps->setSelected(keymaps->currentItem() - 1, true);
// delete the next selected item cus you just moved it up
keymaps->removeItem(keymaps->currentItem() + 1);
custom_maps.remove(sw_maps[keymaps->currentItem()]);
sw_maps.remove(sw_maps.at(keymaps->currentItem()));
}
/* ConfigDlg::slots for the color buttons {{{1
*
* these four slots are almost the same, except for the names. i was thinking
* of making a map with pointers to the buttons and names of the configEntry
* so it could be one slot, but then there would be no way of telling which
* of the buttons was clicked if they all connect to the same slot.
*
*/
void ConfigDlg::keyColorClicked() {
Config config ("multikey");
config.setGroup ("colors");
QStringList color = config.readListEntry("keycolor", QChar(','));
QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
color[0].setNum(newcolor.red());
color[1].setNum(newcolor.green());
color[2].setNum(newcolor.blue());
config.writeEntry("keycolor", color, QChar(','));
config.write();
keycolor_button->setPalette(QPalette(newcolor));
emit reloadKeyboard();
}
void ConfigDlg::keyColorPressedClicked() {
Config config ("multikey");
config.setGroup ("colors");
QStringList color = config.readListEntry("keycolor_pressed", QChar(','));
QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
color[0].setNum(newcolor.red());
color[1].setNum(newcolor.green());