Merge changes related to bug1026 from local branch

2 files changed, 65 insertions, 67 deletions

diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp
index 8c7892083..e2b280dfa 100644
--- a/kcontrol/konsole/kcmkonsole.cpp
+++ b/kcontrol/konsole/kcmkonsole.cpp
@@ -71,8 +71,9 @@ 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() ));
     connect(dialog->SchemaEditor1, TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
@@ -97,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));
@@ -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"));
 
@@ -137,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());
@@ -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..5034b42c4 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>
@@ -134,32 +131,15 @@
                                     <cstring>xonXoffCB</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Use Ctrl+S/Ctrl+Q flow control</string>
+                                  <string>&amp;Use Ctrl+S/Ctrl+Q flow control</string>
                                 </property>
                             </widget>
-                            <spacer row="12" column="3">
-                                <property name="name">
-                                    <cstring>Spacer3</cstring>
-                                </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property name="sizeType">
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property name="sizeHint">
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
                             <widget class="TQCheckBox" row="8" column="0" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>bidiCB</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Enable bidirectional text rendering</string>
+                                  <string>E&amp;nable bidirectional text rendering</string>
                                 </property>
                             </widget>
                             <widget class="TQCheckBox" row="9" column="0" rowspan="1" colspan="4">
@@ -167,26 +147,70 @@
                                     <cstring>matchTabWinTitleCB</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Set tab title to match window title</string>
+                                  <string>Set &amp;tab title to match window title</string>
                                 </property>
                             </widget>
                             <widget class="TQCheckBox" row="10" column="0" rowspan="1" colspan="3">
                                 <property name="name">
-                                    <cstring>tabsCycleWheel</cstring>
+                                    <cstring>tabsCycleWheelCB</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Cycle tabs with mouse wheel</string>
+                                  <string>Cycle tabs &amp;with mouse wheel</string>
                                 </property>
                             </widget>
                             <widget class="TQCheckBox" row="11" column="0" rowspan="1" colspan="3">
                                 <property name="name">
-                                    <cstring>menuAccelerators</cstring>
+                                    <cstring>menuAcceleratorsCB</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Enable main menu accelerator keys</string>
+                                  <string>Enable main &amp;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 &amp;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>
+                            <spacer row="12" column="3">
+                              <property name="name">
+                                <cstring>Spacer3</cstring>
+                              </property>
+                              <property name="orientation">
+                                <enum>Horizontal</enum>
+                              </property>
+                              <property name="sizeType">
+                                <enum>Expanding</enum>
+                              </property>
+                              <property name="sizeHint">
+                                <size>
+                                  <width>20</width>
+                                  <height>20</height>
+                                </size>
+                              </property>
+                            </spacer>
+                            <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>