From 8b69d90d3fbacd82efff43e5ecbe64fdb2c23882 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
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(-)

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 @@
                         <property name="name">
                             <cstring>GroupBox2</cstring>
                         </property>
-                        <property name="title">
-                            <string>Misc</string>
-                        </property>
                         <grid>
                             <property name="name">
                                 <cstring>unnamed</cstring>
@@ -186,7 +183,34 @@
                                     <string>Enable main menu accelerator keys</string>
                                 </property>
                             </widget>
-                            <widget class="KIntNumInput" row="12" column="2">
+                            <widget class="TQCheckBox" row="12" column="0" rowspan="1" colspan="3">
+                              <property name="name">
+                                <cstring>metaAsAltModeCB</cstring>
+                              </property>
+                              <property name="text">
+                                <string>Handle Meta key as Alt Key</string>
+                              </property>
+                            </widget>
+                            <widget class="TQLabel" row="13" column="0" rowspan="1" colspan="2">
+                              <property name="name">
+                                <cstring>TextLabel1_4</cstring>
+                              </property>
+                              <property name="sizePolicy">
+                                <sizepolicy>
+                                  <hsizetype>1</hsizetype>
+                                  <vsizetype>5</vsizetype>
+                                  <horstretch>0</horstretch>
+                                  <verstretch>0</verstretch>
+                                </sizepolicy>
+                              </property>
+                              <property name="text">
+                                <string>&amp;Line spacing:</string>
+                              </property>
+                              <property name="buddy" stdset="0">
+                                <cstring>line_spacingSB</cstring>
+                              </property>
+                            </widget>
+                            <widget class="KIntNumInput" row="13" column="2">
                                 <property name="name">
                                     <cstring>line_spacingSB</cstring>
                                 </property>
@@ -205,25 +229,6 @@
                                     <number>8</number>
                                 </property>
                             </widget>
-                            <widget class="TQLabel" row="12" column="0" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>TextLabel1_4</cstring>
-                                </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>1</hsizetype>
-                                        <vsizetype>5</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;Line spacing:</string>
-                                </property>
-                                <property name="buddy" stdset="0">
-                                    <cstring>line_spacingSB</cstring>
-                                </property>
-                            </widget>
                             <spacer row="12" column="3">
                                 <property name="name">
                                     <cstring>Spacer2</cstring>
@@ -241,7 +246,7 @@
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="TQLabel" row="13" column="0">
+                            <widget class="TQLabel" row="14" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>SilenceLabel</cstring>
                                 </property>
@@ -260,7 +265,7 @@
                                     <cstring>silence_secondsSB</cstring>
                                 </property>
                             </widget>
-                            <widget class="KIntNumInput" row="13" column="1" rowspan="1" colspan="2">
+                            <widget class="KIntNumInput" row="14" column="2">
                                 <property name="name">
                                     <cstring>silence_secondsSB</cstring>
                                 </property>
@@ -276,20 +281,10 @@
                                     <number>1</number>
                                 </property>
                             </widget>
-                        </grid>
-                    </widget>
-                    <widget class="TQGroupBox" row="1" column="0">
-                        <property name="name">
-                            <cstring>GroupBox3</cstring>
-                        </property>
-                        <property name="title">
-                            <string>Double Click</string>
-                        </property>
-                        <grid>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="TQLabel" row="0" column="0">
+                            <widget class="TQLabel" row="15" column="0" colspan="3">
                                 <property name="name">
                                     <cstring>TextLabel1_3</cstring>
                                 </property>
@@ -300,7 +295,7 @@
                                     <cstring>word_connectorLE</cstring>
                                 </property>
                             </widget>
-                            <widget class="TQLineEdit" row="1" column="0">
+                            <widget class="TQLineEdit" row="16" column="0" colspan="3">
                                 <property name="name">
                                     <cstring>word_connectorLE</cstring>
                                 </property>
-- 
cgit v1.2.1