From 2ff60bb1b3f2de6e5a0da09cbe53fc72205fb640 Mon Sep 17 00:00:00 2001
From: Ken Moore <moorekou@gmail.com>
Date: Thu, 3 Dec 2015 11:29:04 -0500
Subject: Replace the "KeyCatch" dialog with a QKeySequenceEdit (added in Qt
 5.2). The keycatch dialog is still there in source (just commented out) until
 we can verify that the Qt widget picks up all the special keys properly.

---
 lumina-config/mainUI.ui | 131 ++++++++++++++++++++++++------------------------
 1 file changed, 66 insertions(+), 65 deletions(-)

(limited to 'lumina-config/mainUI.ui')

diff --git a/lumina-config/mainUI.ui b/lumina-config/mainUI.ui
index a8181487..463102af 100644
--- a/lumina-config/mainUI.ui
+++ b/lumina-config/mainUI.ui
@@ -109,7 +109,7 @@
        <enum>QFrame::StyledPanel</enum>
       </property>
       <property name="currentIndex">
-       <number>0</number>
+       <number>2</number>
       </property>
       <widget class="QWidget" name="page_desktop">
        <layout class="QVBoxLayout" name="verticalLayout_3">
@@ -666,8 +666,8 @@
                 <rect>
                  <x>0</x>
                  <y>0</y>
-                 <width>98</width>
-                 <height>28</height>
+                 <width>523</width>
+                 <height>304</height>
                 </rect>
                </property>
               </widget>
@@ -732,67 +732,68 @@
          </widget>
         </item>
         <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_15">
-          <item>
-           <spacer name="horizontalSpacer_10">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="QToolButton" name="tool_shortcut_clear">
-            <property name="text">
-             <string>Clear Shortcut</string>
-            </property>
-            <property name="toolButtonStyle">
-             <enum>Qt::ToolButtonTextBesideIcon</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer_12">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="QToolButton" name="tool_shortcut_set">
-            <property name="text">
-             <string>Change Shortcut</string>
-            </property>
-            <property name="toolButtonStyle">
-             <enum>Qt::ToolButtonTextBesideIcon</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer_11">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
+         <widget class="QGroupBox" name="group_shortcut_modify">
+          <property name="title">
+           <string>Modify Shortcut</string>
+          </property>
+          <layout class="QGridLayout" name="gridLayout_4">
+           <property name="leftMargin">
+            <number>3</number>
+           </property>
+           <property name="topMargin">
+            <number>3</number>
+           </property>
+           <property name="rightMargin">
+            <number>3</number>
+           </property>
+           <property name="bottomMargin">
+            <number>3</number>
+           </property>
+           <item row="0" column="3">
+            <widget class="QKeySequenceEdit" name="keyEdit_shortcut"/>
+           </item>
+           <item row="0" column="0">
+            <widget class="QToolButton" name="tool_shortcut_clear">
+             <property name="text">
+              <string>Clear Shortcut</string>
+             </property>
+             <property name="toolButtonStyle">
+              <enum>Qt::ToolButtonTextBesideIcon</enum>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="4">
+            <widget class="QToolButton" name="tool_shortcut_set">
+             <property name="text">
+              <string>Apply Change</string>
+             </property>
+             <property name="toolButtonStyle">
+              <enum>Qt::ToolButtonTextBesideIcon</enum>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="2">
+            <widget class="QLabel" name="label_32">
+             <property name="text">
+              <string>Change Key Binding:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <spacer name="horizontalSpacer_10">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
         </item>
         <item>
          <widget class="QLabel" name="label_11">
@@ -1549,7 +1550,7 @@
                     <x>0</x>
                     <y>0</y>
                     <width>121</width>
-                    <height>28</height>
+                    <height>19</height>
                    </rect>
                   </property>
                   <property name="sizePolicy">
-- 
cgit