about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--KCC-OSX.ui259
-rw-r--r--kcc/KCC_ui_osx.py71
2 files changed, 210 insertions, 120 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">
diff --git a/kcc/KCC_ui_osx.py b/kcc/KCC_ui_osx.py
index 077348e..45ca8cf 100644
--- a/kcc/KCC_ui_osx.py
+++ b/kcc/KCC_ui_osx.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'KCC-OSX.ui'
 #
-# Created: Fri Jun 14 15:04:32 2013
+# Created: Sun Jun 16 23:28:28 2013
 #      by: PyQt4 UI code generator 4.10.1
 #
 # WARNING! All changes made in this file will be lost!
@@ -211,13 +211,13 @@ class Ui_KCC(object):
         self.ExpertModeButton.setObjectName(_fromUtf8("ExpertModeButton"))
         self.OptionsAdvancedGamma = QtGui.QFrame(self.Form)
         self.OptionsAdvancedGamma.setEnabled(True)
-        self.OptionsAdvancedGamma.setGeometry(QtCore.QRect(10, 305, 401, 41))
+        self.OptionsAdvancedGamma.setGeometry(QtCore.QRect(10, 303, 401, 41))
         font = QtGui.QFont()
         font.setPointSize(9)
         self.OptionsAdvancedGamma.setFont(font)
         self.OptionsAdvancedGamma.setObjectName(_fromUtf8("OptionsAdvancedGamma"))
         self.GammaLabel = QtGui.QLabel(self.OptionsAdvancedGamma)
-        self.GammaLabel.setGeometry(QtCore.QRect(8, 0, 100, 40))
+        self.GammaLabel.setGeometry(QtCore.QRect(20, 0, 100, 40))
         font = QtGui.QFont()
         font.setPointSize(12)
         font.setBold(False)
@@ -225,18 +225,43 @@ class Ui_KCC(object):
         self.GammaLabel.setFont(font)
         self.GammaLabel.setObjectName(_fromUtf8("GammaLabel"))
         self.GammaSlider = QtGui.QSlider(self.OptionsAdvancedGamma)
-        self.GammaSlider.setGeometry(QtCore.QRect(110, 10, 271, 22))
+        self.GammaSlider.setGeometry(QtCore.QRect(110, 10, 280, 22))
         self.GammaSlider.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.GammaSlider.setMaximum(500)
         self.GammaSlider.setSingleStep(5)
         self.GammaSlider.setOrientation(QtCore.Qt.Horizontal)
         self.GammaSlider.setObjectName(_fromUtf8("GammaSlider"))
+        self.ProgressBar = QtGui.QProgressBar(self.Form)
+        self.ProgressBar.setGeometry(QtCore.QRect(10, 10, 401, 35))
+        font = QtGui.QFont()
+        font.setPointSize(10)
+        font.setBold(True)
+        font.setWeight(75)
+        self.ProgressBar.setFont(font)
+        self.ProgressBar.setAutoFillBackground(True)
+        self.ProgressBar.setProperty("value", 0)
+        self.ProgressBar.setAlignment(QtCore.Qt.AlignJustify|QtCore.Qt.AlignVCenter)
+        self.ProgressBar.setFormat(_fromUtf8(""))
+        self.ProgressBar.setObjectName(_fromUtf8("ProgressBar"))
         self.OptionsExpert = QtGui.QFrame(self.Form)
-        self.OptionsExpert.setGeometry(QtCore.QRect(20, 340, 381, 40))
+        self.OptionsExpert.setGeometry(QtCore.QRect(10, 335, 421, 41))
+        font = QtGui.QFont()
+        font.setPointSize(9)
+        self.OptionsExpert.setFont(font)
         self.OptionsExpert.setObjectName(_fromUtf8("OptionsExpert"))
-        self.gridLayout_2 = QtGui.QGridLayout(self.OptionsExpert)
+        self.ColorBox = QtGui.QCheckBox(self.OptionsExpert)
+        self.ColorBox.setGeometry(QtCore.QRect(9, 11, 130, 18))
+        font = QtGui.QFont()
+        font.setPointSize(11)
+        self.ColorBox.setFont(font)
+        self.ColorBox.setFocusPolicy(QtCore.Qt.NoFocus)
+        self.ColorBox.setObjectName(_fromUtf8("ColorBox"))
+        self.OptionsExpertInternal = QtGui.QFrame(self.OptionsExpert)
+        self.OptionsExpertInternal.setGeometry(QtCore.QRect(90, 0, 315, 40))
+        self.OptionsExpertInternal.setObjectName(_fromUtf8("OptionsExpertInternal"))
+        self.gridLayout_2 = QtGui.QGridLayout(self.OptionsExpertInternal)
         self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
-        self.wLabel = QtGui.QLabel(self.OptionsExpert)
+        self.wLabel = QtGui.QLabel(self.OptionsExpertInternal)
         font = QtGui.QFont()
         font.setPointSize(12)
         font.setBold(False)
@@ -244,7 +269,13 @@ class Ui_KCC(object):
         self.wLabel.setFont(font)
         self.wLabel.setObjectName(_fromUtf8("wLabel"))
         self.gridLayout_2.addWidget(self.wLabel, 0, 0, 1, 1)
-        self.customWidth = QtGui.QLineEdit(self.OptionsExpert)
+        self.customWidth = QtGui.QLineEdit(self.OptionsExpertInternal)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.customWidth.sizePolicy().hasHeightForWidth())
+        self.customWidth.setSizePolicy(sizePolicy)
+        self.customWidth.setMaximumSize(QtCore.QSize(45, 16777215))
         font = QtGui.QFont()
         font.setPointSize(12)
         self.customWidth.setFont(font)
@@ -253,7 +284,7 @@ class Ui_KCC(object):
         self.customWidth.setMaxLength(4)
         self.customWidth.setObjectName(_fromUtf8("customWidth"))
         self.gridLayout_2.addWidget(self.customWidth, 0, 1, 1, 1)
-        self.hLabel = QtGui.QLabel(self.OptionsExpert)
+        self.hLabel = QtGui.QLabel(self.OptionsExpertInternal)
         font = QtGui.QFont()
         font.setPointSize(12)
         font.setBold(False)
@@ -261,7 +292,13 @@ class Ui_KCC(object):
         self.hLabel.setFont(font)
         self.hLabel.setObjectName(_fromUtf8("hLabel"))
         self.gridLayout_2.addWidget(self.hLabel, 0, 2, 1, 1)
-        self.customHeight = QtGui.QLineEdit(self.OptionsExpert)
+        self.customHeight = QtGui.QLineEdit(self.OptionsExpertInternal)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.customHeight.sizePolicy().hasHeightForWidth())
+        self.customHeight.setSizePolicy(sizePolicy)
+        self.customHeight.setMaximumSize(QtCore.QSize(45, 16777215))
         font = QtGui.QFont()
         font.setPointSize(12)
         self.customHeight.setFont(font)
@@ -270,18 +307,6 @@ class Ui_KCC(object):
         self.customHeight.setMaxLength(4)
         self.customHeight.setObjectName(_fromUtf8("customHeight"))
         self.gridLayout_2.addWidget(self.customHeight, 0, 3, 1, 1)
-        self.ProgressBar = QtGui.QProgressBar(self.Form)
-        self.ProgressBar.setGeometry(QtCore.QRect(10, 10, 401, 35))
-        font = QtGui.QFont()
-        font.setPointSize(10)
-        font.setBold(True)
-        font.setWeight(75)
-        self.ProgressBar.setFont(font)
-        self.ProgressBar.setAutoFillBackground(True)
-        self.ProgressBar.setProperty("value", 0)
-        self.ProgressBar.setAlignment(QtCore.Qt.AlignJustify|QtCore.Qt.AlignVCenter)
-        self.ProgressBar.setFormat(_fromUtf8(""))
-        self.ProgressBar.setObjectName(_fromUtf8("ProgressBar"))
         KCC.setCentralWidget(self.Form)
         self.ActionBasic = QtGui.QAction(KCC)
         self.ActionBasic.setCheckable(True)
@@ -332,6 +357,8 @@ class Ui_KCC(object):
         self.GammaLabel.setToolTip(_translate("KCC", "When converting color images setting this option to 1.0 MIGHT improve readability.", None))
         self.GammaLabel.setText(_translate("KCC", "Gamma: Auto", None))
         self.GammaSlider.setToolTip(_translate("KCC", "<html><head/><body><p>When converting color images setting this option to 1.0 <span style=\" font-weight:600;\">might</span> improve readability.</p></body></html>", None))
+        self.ColorBox.setToolTip(_translate("KCC", "Do not convert images to grayscale.", None))
+        self.ColorBox.setText(_translate("KCC", "Color mode", None))
         self.wLabel.setToolTip(_translate("KCC", "Device profile width will be overwritten by this value.", None))
         self.wLabel.setText(_translate("KCC", "Custom width: ", None))
         self.customWidth.setToolTip(_translate("KCC", "Device profile width will be overwritten by this value.", None))