Updated GUI - OSX

1 files changed, 161 insertions, 98 deletions

diff --git a/KCC-OSX.ui b/KCC-OSX.ui
index 35c58a7..d169ae0 100644
--- a/KCC-OSX.ui
+++ b/KCC-OSX.ui
@@ -507,7 +507,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>305</y>
+      <y>303</y>
       <width>401</width>
       <height>41</height>
      </rect>
@@ -520,7 +520,7 @@
     <widget class="QLabel" name="GammaLabel">
      <property name="geometry">
       <rect>
-       <x>8</x>
+       <x>20</x>
        <y>0</y>
        <width>100</width>
        <height>40</height>
@@ -545,7 +545,7 @@
       <rect>
        <x>110</x>
        <y>10</y>
-       <width>271</width>
+       <width>280</width>
        <height>22</height>
       </rect>
      </property>
@@ -566,100 +566,6 @@
      </property>
     </widget>
    </widget>
-   <widget class="QFrame" name="OptionsExpert">
-    <property name="geometry">
-     <rect>
-      <x>20</x>
-      <y>340</y>
-      <width>381</width>
-      <height>40</height>
-     </rect>
-    </property>
-    <layout class="QGridLayout" name="gridLayout_2">
-     <item row="0" column="0">
-      <widget class="QLabel" name="wLabel">
-       <property name="font">
-        <font>
-         <pointsize>12</pointsize>
-         <weight>50</weight>
-         <bold>false</bold>
-        </font>
-       </property>
-       <property name="toolTip">
-        <string>Device profile width will be overwritten by this value.</string>
-       </property>
-       <property name="text">
-        <string>Custom width: </string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QLineEdit" name="customWidth">
-       <property name="font">
-        <font>
-         <pointsize>12</pointsize>
-        </font>
-       </property>
-       <property name="focusPolicy">
-        <enum>Qt::ClickFocus</enum>
-       </property>
-       <property name="acceptDrops">
-        <bool>false</bool>
-       </property>
-       <property name="toolTip">
-        <string>Device profile width will be overwritten by this value.</string>
-       </property>
-       <property name="inputMask">
-        <string>0000; </string>
-       </property>
-       <property name="maxLength">
-        <number>4</number>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="2">
-      <widget class="QLabel" name="hLabel">
-       <property name="font">
-        <font>
-         <pointsize>12</pointsize>
-         <weight>50</weight>
-         <bold>false</bold>
-        </font>
-       </property>
-       <property name="toolTip">
-        <string>Device profile height will be overwritten by this value.</string>
-       </property>
-       <property name="text">
-        <string>Custom height: </string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="3">
-      <widget class="QLineEdit" name="customHeight">
-       <property name="font">
-        <font>
-         <pointsize>12</pointsize>
-        </font>
-       </property>
-       <property name="focusPolicy">
-        <enum>Qt::ClickFocus</enum>
-       </property>
-       <property name="acceptDrops">
-        <bool>false</bool>
-       </property>
-       <property name="toolTip">
-        <string>Device profile height will be overwritten by this value.</string>
-       </property>
-       <property name="inputMask">
-        <string>0000; </string>
-       </property>
-       <property name="maxLength">
-        <number>4</number>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </widget>
    <widget class="QProgressBar" name="ProgressBar">
     <property name="geometry">
      <rect>
@@ -689,6 +595,163 @@
      <string/>
     </property>
    </widget>
+   <widget class="QFrame" name="OptionsExpert">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>335</y>
+      <width>421</width>
+      <height>41</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <pointsize>9</pointsize>
+     </font>
+    </property>
+    <widget class="QCheckBox" name="ColorBox">
+     <property name="geometry">
+      <rect>
+       <x>9</x>
+       <y>11</y>
+       <width>130</width>
+       <height>18</height>
+      </rect>
+     </property>
+     <property name="font">
+      <font>
+       <pointsize>11</pointsize>
+      </font>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+     <property name="toolTip">
+      <string>Do not convert images to grayscale.</string>
+     </property>
+     <property name="text">
+      <string>Color mode</string>
+     </property>
+    </widget>
+    <widget class="QFrame" name="OptionsExpertInternal">
+     <property name="geometry">
+      <rect>
+       <x>90</x>
+       <y>0</y>
+       <width>315</width>
+       <height>40</height>
+      </rect>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="wLabel">
+        <property name="font">
+         <font>
+          <pointsize>12</pointsize>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="toolTip">
+         <string>Device profile width will be overwritten by this value.</string>
+        </property>
+        <property name="text">
+         <string>Custom width: </string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="customWidth">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>45</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="font">
+         <font>
+          <pointsize>12</pointsize>
+         </font>
+        </property>
+        <property name="focusPolicy">
+         <enum>Qt::ClickFocus</enum>
+        </property>
+        <property name="acceptDrops">
+         <bool>false</bool>
+        </property>
+        <property name="toolTip">
+         <string>Device profile width will be overwritten by this value.</string>
+        </property>
+        <property name="inputMask">
+         <string>0000; </string>
+        </property>
+        <property name="maxLength">
+         <number>4</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QLabel" name="hLabel">
+        <property name="font">
+         <font>
+          <pointsize>12</pointsize>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="toolTip">
+         <string>Device profile height will be overwritten by this value.</string>
+        </property>
+        <property name="text">
+         <string>Custom height: </string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QLineEdit" name="customHeight">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>45</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="font">
+         <font>
+          <pointsize>12</pointsize>
+         </font>
+        </property>
+        <property name="focusPolicy">
+         <enum>Qt::ClickFocus</enum>
+        </property>
+        <property name="acceptDrops">
+         <bool>false</bool>
+        </property>
+        <property name="toolTip">
+         <string>Device profile height will be overwritten by this value.</string>
+        </property>
+        <property name="inputMask">
+         <string>0000; </string>
+        </property>
+        <property name="maxLength">
+         <number>4</number>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </widget>
    <zorder>BasicModeButton</zorder>
    <zorder>ExpertModeButton</zorder>
    <zorder>AdvModeButton</zorder>
@@ -702,8 +765,8 @@
    <zorder>ClearButton</zorder>
    <zorder>OptionsBasic</zorder>
    <zorder>OptionsAdvancedGamma</zorder>
-   <zorder>OptionsExpert</zorder>
    <zorder>ProgressBar</zorder>
+   <zorder>OptionsExpert</zorder>
   </widget>
   <action name="ActionBasic">
    <property name="checkable">