From 4e428e11c5858b5a2485af135cbb2fabd8a3522f Mon Sep 17 00:00:00 2001
From: Mavridis Philippe <mavridisf@gmail.com>
Date: Thu, 1 Jun 2023 12:53:38 +0300
Subject: kxkb: re-add custom TDE switching shortcut

This commit fixes issue #342.

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
(cherry picked from commit 22bb398b3ba83142bf49f6abf47081e5e9e11bef)
---
 kxkb/kcmlayoutwidget.ui | 84 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 55 insertions(+), 29 deletions(-)

(limited to 'kxkb/kcmlayoutwidget.ui')

diff --git a/kxkb/kcmlayoutwidget.ui b/kxkb/kcmlayoutwidget.ui
index aab21c2cf..c35df0921 100644
--- a/kxkb/kcmlayoutwidget.ui
+++ b/kxkb/kcmlayoutwidget.ui
@@ -76,7 +76,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2">
+                            <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>textLabel1_4</cstring>
                                 </property>
@@ -92,33 +92,6 @@
                                     <string>Active layouts:</string>
                                 </property>
                             </widget>
-                            <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>labelHotkey</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Key combination to &amp;switch layout:</string>
-                                </property>
-                                <property name="buddy" stdset="0">
-                                    <cstring>comboHotkey</cstring>
-                                </property>
-                            </widget>
-                            <widget class="TQComboBox" row="1" column="0" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>comboHotkey</cstring>
-                                </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>7</hsizetype>
-                                        <vsizetype>0</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>Here you can choose the key combination you want to use to switch to the next layout. This list includes only the most common variants. If you choose "Other...", then you will be redirected to the "Options" tab where you can pick from all the available variants. Note that if you have selected Append Mode in the Xkb Options tab this option is not available; you have to use the Xkb Options tab instead.</string>
-                                </property>
-                            </widget>
                             <widget class="TQLabel" row="0" column="2" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>labelModel</cstring>
@@ -282,7 +255,7 @@
                                     <cstring>editCmdLine</cstring>
                                 </property>
                             </widget>
-                            <widget class="TQListView" row="3" column="0" rowspan="5" colspan="2">
+                            <widget class="TQListView" row="1" column="0" rowspan="6" colspan="2">
                                 <column>
                                     <property name="text">
                                         <string></string>
@@ -423,6 +396,59 @@
                     </widget>
                 </grid>
             </widget>
+            <widget class="TQWidget">
+                <property name="name">
+                    <cstring>tabShortcuts</cstring>
+                </property>
+                <attribute name="title">
+                    <string>Keyboard Shortcuts</string>
+                </attribute>
+                <vbox>
+                    <widget class="TQLabel">
+                        <property name="name">
+                            <cstring>labelHotkey</cstring>
+                        </property>
+                        <property name="text">
+                            <string>&lt;qt&gt;&lt;b&gt;Key combination to switch layout (X11):&lt;/b&gt;&lt;/qt&gt;</string>
+                        </property>
+                        <property name="buddy" stdset="0">
+                            <cstring>comboHotkey</cstring>
+                        </property>
+                    </widget>
+                    <widget class="TQComboBox">
+                        <property name="name">
+                            <cstring>comboHotkey</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>7</hsizetype>
+                                <vsizetype>0</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="whatsThis" stdset="0">
+                            <string>Here you can choose the key combination you want to use to switch to the next layout. This list includes only the most common variants. If you choose "Other...", then you will be redirected to the "Options" tab where you can pick from all the available variants. Note that if you have selected Append Mode in the Xkb Options tab this option is not available; you have to use the Xkb Options tab instead.</string>
+                        </property>
+                    </widget>
+                    <widget class="KSeparator">
+                        <property name="name">
+                            <cstring>switchingGrpSeparator</cstring>
+                        </property>
+                    </widget>
+                    <widget class="TQLabel">
+                        <property name="name">
+                            <cstring>labelHotkey</cstring>
+                        </property>
+                        <property name="text">
+                            <string>&lt;qt&gt;&lt;b&gt;TDE shortcuts to switch layout:&lt;/b&gt;&lt;/qt&gt;</string>
+                        </property>
+                        <property name="buddy" stdset="0">
+                            <cstring>comboHotkey</cstring>
+                        </property>
+                    </widget>
+                </vbox>
+            </widget>
             <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
-- 
cgit v1.2.1