From 8b69d90d3fbacd82efff43e5ecbe64fdb2c23882 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 21 Apr 2014 18:14:10 +0900 Subject: Added Meta key as Alt key option in Kcontrol/Konsole. This relates to bug 1026. Also improved options arrangement in the same configuration page. --- kcontrol/konsole/kcmkonsole.cpp | 3 ++ kcontrol/konsole/kcmkonsoledialog.ui | 69 +++++++++++++++++------------------- 2 files changed, 35 insertions(+), 37 deletions(-) (limited to 'kcontrol') diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp index 8c7892083..97d3d0db0 100644 --- a/kcontrol/konsole/kcmkonsole.cpp +++ b/kcontrol/konsole/kcmkonsole.cpp @@ -73,6 +73,7 @@ KCMKonsole::KCMKonsole(TQWidget * parent, const char *name, const TQStringList&) connect(dialog->matchTabWinTitleCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); connect(dialog->tabsCycleWheel,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); connect(dialog->menuAccelerators,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); + connect(dialog->metaAsAltModeCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); connect(dialog->silence_secondsSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() )); connect(dialog->word_connectorLE,TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT( changed() )); connect(dialog->SchemaEditor1, TQT_SIGNAL(changed()), TQT_SLOT( changed() )); @@ -110,6 +111,7 @@ void KCMKonsole::load(bool useDefaults) dialog->line_spacingSB->setValue(config.readUnsignedNumEntry( "LineSpacing", 0 )); dialog->silence_secondsSB->setValue(config.readUnsignedNumEntry( "SilenceSeconds", 10 )); dialog->word_connectorLE->setText(config.readEntry("wordseps",":@-./_~")); + dialog->metaAsAltModeCB->setChecked(config.readBoolEntry("metaAsAltMode",false)); dialog->SchemaEditor1->setSchema(config.readEntry("schema")); @@ -150,6 +152,7 @@ void KCMKonsole::save() config.writeEntry("LineSpacing" , dialog->line_spacingSB->value()); config.writeEntry("SilenceSeconds" , dialog->silence_secondsSB->value()); config.writeEntry("wordseps", dialog->word_connectorLE->text()); + config.writeEntry("metaAsAltMode", dialog->metaAsAltModeCB->isChecked()); config.writeEntry("schema", dialog->SchemaEditor1->schema()); diff --git a/kcontrol/konsole/kcmkonsoledialog.ui b/kcontrol/konsole/kcmkonsoledialog.ui index 1ce6b2f8f..6e06747c3 100644 --- a/kcontrol/konsole/kcmkonsoledialog.ui +++ b/kcontrol/konsole/kcmkonsoledialog.ui @@ -66,9 +66,6 @@ GroupBox2 - - Misc - unnamed @@ -186,7 +183,34 @@ Enable main menu accelerator keys - + + + metaAsAltModeCB + + + Handle Meta key as Alt Key + + + + + TextLabel1_4 + + + + 1 + 5 + 0 + 0 + + + + &Line spacing: + + + line_spacingSB + + + line_spacingSB @@ -205,25 +229,6 @@ 8 - - - TextLabel1_4 - - - - 1 - 5 - 0 - 0 - - - - &Line spacing: - - - line_spacingSB - - Spacer2 @@ -241,7 +246,7 @@ - + SilenceLabel @@ -260,7 +265,7 @@ silence_secondsSB - + silence_secondsSB @@ -276,20 +281,10 @@ 1 - - - - - GroupBox3 - - - Double Click - - unnamed - + TextLabel1_3 @@ -300,7 +295,7 @@ word_connectorLE - + word_connectorLE -- cgit v1.2.3 From 115138a5a0e7e00c2092345972d9a003384af8a7 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 21 Apr 2014 18:16:50 +0900 Subject: Renamed two check box objects in KControl/Konsole to maintain name consistency with other check boxes. --- kcontrol/konsole/kcmkonsole.cpp | 12 ++++++------ kcontrol/konsole/kcmkonsoledialog.ui | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'kcontrol') diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp index 97d3d0db0..e2b280dfa 100644 --- a/kcontrol/konsole/kcmkonsole.cpp +++ b/kcontrol/konsole/kcmkonsole.cpp @@ -71,8 +71,8 @@ KCMKonsole::KCMKonsole(TQWidget * parent, const char *name, const TQStringList&) connect(dialog->frameCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); connect(dialog->line_spacingSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() )); connect(dialog->matchTabWinTitleCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->tabsCycleWheel,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->menuAccelerators,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); + connect(dialog->tabsCycleWheelCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); + connect(dialog->menuAcceleratorsCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); connect(dialog->metaAsAltModeCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); connect(dialog->silence_secondsSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() )); connect(dialog->word_connectorLE,TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT( changed() )); @@ -98,8 +98,8 @@ void KCMKonsole::load(bool useDefaults) bidiOrig = config.readBoolEntry("EnableBidi",false); dialog->bidiCB->setChecked(bidiOrig); dialog->matchTabWinTitleCB->setChecked(config.readBoolEntry("MatchTabWinTitle",false)); - dialog->tabsCycleWheel->setChecked(config.readBoolEntry("TabsCycleWheel",true)); - dialog->menuAccelerators->setChecked(config.readBoolEntry("MenuAccelerators",false)); + dialog->tabsCycleWheelCB->setChecked(config.readBoolEntry("TabsCycleWheel",true)); + dialog->menuAcceleratorsCB->setChecked(config.readBoolEntry("MenuAccelerators",false)); dialog->warnCB->setChecked(config.readBoolEntry("WarnQuit",true)); dialog->ctrldragCB->setChecked(config.readBoolEntry("CtrlDrag",true)); dialog->cutToBeginningOfLineCB->setChecked(config.readBoolEntry("CutToBeginningOfLine",false)); @@ -139,8 +139,8 @@ void KCMKonsole::save() bool bidiNew = dialog->bidiCB->isChecked(); config.writeEntry("EnableBidi", bidiNew); config.writeEntry("MatchTabWinTitle", dialog->matchTabWinTitleCB->isChecked()); - config.writeEntry("TabsCycleWheel", dialog->tabsCycleWheel->isChecked()); - config.writeEntry("MenuAccelerators", dialog->menuAccelerators->isChecked()); + config.writeEntry("TabsCycleWheel", dialog->tabsCycleWheelCB->isChecked()); + config.writeEntry("MenuAccelerators", dialog->menuAcceleratorsCB->isChecked()); config.writeEntry("WarnQuit", dialog->warnCB->isChecked()); config.writeEntry("CtrlDrag", dialog->ctrldragCB->isChecked()); config.writeEntry("CutToBeginningOfLine", dialog->cutToBeginningOfLineCB->isChecked()); diff --git a/kcontrol/konsole/kcmkonsoledialog.ui b/kcontrol/konsole/kcmkonsoledialog.ui index 6e06747c3..ec01401cf 100644 --- a/kcontrol/konsole/kcmkonsoledialog.ui +++ b/kcontrol/konsole/kcmkonsoledialog.ui @@ -169,7 +169,7 @@ - tabsCycleWheel + tabsCycleWheelCB Cycle tabs with mouse wheel @@ -177,7 +177,7 @@ - menuAccelerators + menuAcceleratorsCB Enable main menu accelerator keys -- cgit v1.2.3 From c5a0a7cec07dee8b52c7add7822d25a137137df2 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 21 Apr 2014 18:22:55 +0900 Subject: Added explicit keyboard shortcuts to missing options in KControl/Konsole. --- kcontrol/konsole/kcmkonsoledialog.ui | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kcontrol') diff --git a/kcontrol/konsole/kcmkonsoledialog.ui b/kcontrol/konsole/kcmkonsoledialog.ui index ec01401cf..7b5894158 100644 --- a/kcontrol/konsole/kcmkonsoledialog.ui +++ b/kcontrol/konsole/kcmkonsoledialog.ui @@ -131,7 +131,7 @@ xonXoffCB - Use Ctrl+S/Ctrl+Q flow control + &Use Ctrl+S/Ctrl+Q flow control @@ -156,7 +156,7 @@ bidiCB - Enable bidirectional text rendering + E&nable bidirectional text rendering @@ -164,7 +164,7 @@ matchTabWinTitleCB - Set tab title to match window title + Set &tab title to match window title @@ -172,7 +172,7 @@ tabsCycleWheelCB - Cycle tabs with mouse wheel + Cycle tabs &with mouse wheel @@ -180,7 +180,7 @@ menuAcceleratorsCB - Enable main menu accelerator keys + Enable main &menu accelerator keys @@ -188,7 +188,7 @@ metaAsAltModeCB - Handle Meta key as Alt Key + Handle Meta &key as Alt Key -- cgit v1.2.3 From 4c12a981b01c2c40346b1ebf35ec82ff944b35e4 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 22 Apr 2014 16:38:41 +0900 Subject: Updated documentation for Konsole -> Settings -> General page. Several options were missing. This also relates to bugs 909, 1026 and 1701. --- kcontrol/konsole/kcmkonsoledialog.ui | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'kcontrol') diff --git a/kcontrol/konsole/kcmkonsoledialog.ui b/kcontrol/konsole/kcmkonsoledialog.ui index 7b5894158..5034b42c4 100644 --- a/kcontrol/konsole/kcmkonsoledialog.ui +++ b/kcontrol/konsole/kcmkonsoledialog.ui @@ -134,23 +134,6 @@ &Use Ctrl+S/Ctrl+Q flow control - - - Spacer3 - - - Horizontal - - - Expanding - - - - 20 - 20 - - - bidiCB @@ -210,6 +193,23 @@ line_spacingSB + + + Spacer3 + + + Horizontal + + + Expanding + + + + 20 + 20 + + + line_spacingSB -- cgit v1.2.3