From c244bac1537175f6219fa778a13acfedeaf8b304 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sat, 16 Nov 2013 15:46:35 +0100
Subject: Add option to enable accelerators in Konsole menu bar Add default
 shortcut for show/hide Konsole menu bar This resolves Bug 1701

---
 kcontrol/konsole/kcmkonsole.cpp      |  3 +++
 kcontrol/konsole/kcmkonsoledialog.ui | 18 +++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'kcontrol/konsole')

diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp
index 275f06aa2..8c7892083 100644
--- a/kcontrol/konsole/kcmkonsole.cpp
+++ b/kcontrol/konsole/kcmkonsole.cpp
@@ -72,6 +72,7 @@ KCMKonsole::KCMKonsole(TQWidget * parent, const char *name, const TQStringList&)
     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->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() ));
@@ -97,6 +98,7 @@ void KCMKonsole::load(bool useDefaults)
     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->warnCB->setChecked(config.readBoolEntry("WarnQuit",true));
     dialog->ctrldragCB->setChecked(config.readBoolEntry("CtrlDrag",true));
     dialog->cutToBeginningOfLineCB->setChecked(config.readBoolEntry("CutToBeginningOfLine",false));
@@ -136,6 +138,7 @@ void KCMKonsole::save()
     config.writeEntry("EnableBidi", bidiNew);
     config.writeEntry("MatchTabWinTitle", dialog->matchTabWinTitleCB->isChecked());
     config.writeEntry("TabsCycleWheel", dialog->tabsCycleWheel->isChecked());
+    config.writeEntry("MenuAccelerators", dialog->menuAccelerators->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 b4f698c49..1ce6b2f8f 100644
--- a/kcontrol/konsole/kcmkonsoledialog.ui
+++ b/kcontrol/konsole/kcmkonsoledialog.ui
@@ -178,7 +178,15 @@
                                     <string>Cycle tabs with mouse wheel</string>
                                 </property>
                             </widget>
-                            <widget class="KIntNumInput" row="11" column="2">
+                            <widget class="TQCheckBox" row="11" column="0" rowspan="1" colspan="3">
+                                <property name="name">
+                                    <cstring>menuAccelerators</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Enable main menu accelerator keys</string>
+                                </property>
+                            </widget>
+                            <widget class="KIntNumInput" row="12" column="2">
                                 <property name="name">
                                     <cstring>line_spacingSB</cstring>
                                 </property>
@@ -197,7 +205,7 @@
                                     <number>8</number>
                                 </property>
                             </widget>
-                            <widget class="TQLabel" row="11" column="0" rowspan="1" colspan="2">
+                            <widget class="TQLabel" row="12" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>TextLabel1_4</cstring>
                                 </property>
@@ -216,7 +224,7 @@
                                     <cstring>line_spacingSB</cstring>
                                 </property>
                             </widget>
-                            <spacer row="11" column="3">
+                            <spacer row="12" column="3">
                                 <property name="name">
                                     <cstring>Spacer2</cstring>
                                 </property>
@@ -233,7 +241,7 @@
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="TQLabel" row="12" column="0">
+                            <widget class="TQLabel" row="13" column="0">
                                 <property name="name">
                                     <cstring>SilenceLabel</cstring>
                                 </property>
@@ -252,7 +260,7 @@
                                     <cstring>silence_secondsSB</cstring>
                                 </property>
                             </widget>
-                            <widget class="KIntNumInput" row="12" column="1" rowspan="1" colspan="2">
+                            <widget class="KIntNumInput" row="13" column="1" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>silence_secondsSB</cstring>
                                 </property>
-- 
cgit v1.2.1