Updated GUI - Windows/Linux

2026-01-07 13:59:34 +00:00 · 2013-06-16 23:05:18 +02:00
parent 860673bb0e
commit dc9dbed683
3 changed files with 190 additions and 99 deletions
--- a/KCC.ui
+++ b/KCC.ui
@@ -466,7 +466,7 @@
    <widget class="QLabel" name="GammaLabel">
     <property name="geometry">
      <rect>
-       <x>8</x>
+       <x>15</x>
       <y>0</y>
       <width>100</width>
       <height>40</height>
@@ -484,7 +484,7 @@
      <rect>
       <x>110</x>
       <y>10</y>
-       <width>271</width>
+       <width>270</width>
       <height>22</height>
      </rect>
     </property>
@@ -505,76 +505,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="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="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="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="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>
@@ -601,6 +531,134 @@
     <string/>
    </property>
   </widget>
+   <widget class="QFrame" name="OptionsExpert">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>337</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="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>100</x>
+       <y>0</y>
+       <width>295</width>
+       <height>40</height>
+      </rect>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="wLabel">
+        <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>40</width>
+          <height>16777215</height>
+         </size>
+        </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="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="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>40</width>
+          <height>16777215</height>
+         </size>
+        </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>
  </widget>
  <action name="ActionBasic">
   <property name="checkable">
--- a/kcc/KCC_gui.py
+++ b/kcc/KCC_gui.py
@@ -116,6 +116,8 @@ class WorkerThread(QtCore.QThread):
            argv.append("--customwidth=" + str(GUI.customWidth.text()))
        if str(GUI.customHeight.text()) != '':
            argv.append("--customheight=" + str(GUI.customHeight.text()))
+        if GUI.ColorBox.isChecked():
+            argv.append("--forcecolor")
        for i in range(GUI.JobList.count()):
            currentJobs.append(str(GUI.JobList.item(i).text()))
        GUI.JobList.clear()
@@ -263,6 +265,7 @@ class Ui_KCC(object):
        GUI.GammaSlider.setValue(0)
        GUI.customWidth.setText('')
        GUI.customHeight.setText('')
+        GUI.ColorBox.setChecked(False)

    def modeAdvanced(self):
        self.currentMode = 2
@@ -281,9 +284,9 @@ class Ui_KCC(object):
        GUI.OptionsExpert.setEnabled(False)
        GUI.customWidth.setText('')
        GUI.customHeight.setText('')
+        GUI.ColorBox.setChecked(False)

    def modeExpert(self):
-        self.modeAdvanced()
        self.currentMode = 3
        MainWindow.setMinimumSize(QtCore.QSize(420, 380))
        MainWindow.setMaximumSize(QtCore.QSize(420, 380))
@@ -291,6 +294,12 @@ class Ui_KCC(object):
        GUI.BasicModeButton.setStyleSheet('font-weight:Normal;')
        GUI.AdvModeButton.setStyleSheet('font-weight:Normal;')
        GUI.ExpertModeButton.setStyleSheet('font-weight:Bold;')
+        GUI.FormatBox.setEnabled(True)
+        GUI.ProcessingBox.show()
+        GUI.UpscaleBox.show()
+        GUI.NoRotateBox.show()
+        GUI.OptionsAdvancedGamma.setEnabled(True)
+        GUI.OptionsAdvanced.setEnabled(True)
        GUI.OptionsExpert.setEnabled(True)

    def modeConvert(self, enable):
--- a/kcc/KCC_ui.py
+++ b/kcc/KCC_ui.py
@@ -2,7 +2,7 @@

 # Form implementation generated from reading ui file 'KCC.ui'
 #
-# Created: Fri Jun 14 15:02:30 2013
+# Created: Sun Jun 16 23:04:29 2013
 #      by: PyQt4 UI code generator 4.10.1
 #
 # WARNING! All changes made in this file will be lost!
@@ -183,38 +183,15 @@ class Ui_KCC(object):
        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(15, 0, 100, 40))
        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, 270, 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.OptionsExpert = QtGui.QFrame(self.Form)
-        self.OptionsExpert.setGeometry(QtCore.QRect(20, 340, 381, 40))
-        self.OptionsExpert.setObjectName(_fromUtf8("OptionsExpert"))
-        self.gridLayout_2 = QtGui.QGridLayout(self.OptionsExpert)
-        self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
-        self.wLabel = QtGui.QLabel(self.OptionsExpert)
-        self.wLabel.setObjectName(_fromUtf8("wLabel"))
-        self.gridLayout_2.addWidget(self.wLabel, 0, 0, 1, 1)
-        self.customWidth = QtGui.QLineEdit(self.OptionsExpert)
-        self.customWidth.setFocusPolicy(QtCore.Qt.ClickFocus)
-        self.customWidth.setAcceptDrops(False)
-        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.setObjectName(_fromUtf8("hLabel"))
-        self.gridLayout_2.addWidget(self.hLabel, 0, 2, 1, 1)
-        self.customHeight = QtGui.QLineEdit(self.OptionsExpert)
-        self.customHeight.setFocusPolicy(QtCore.Qt.ClickFocus)
-        self.customHeight.setAcceptDrops(False)
-        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, 31))
        font = QtGui.QFont()
@@ -226,6 +203,51 @@ class Ui_KCC(object):
        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(10, 337, 421, 41))
+        font = QtGui.QFont()
+        font.setPointSize(9)
+        self.OptionsExpert.setFont(font)
+        self.OptionsExpert.setObjectName(_fromUtf8("OptionsExpert"))
+        self.ColorBox = QtGui.QCheckBox(self.OptionsExpert)
+        self.ColorBox.setGeometry(QtCore.QRect(9, 11, 130, 18))
+        self.ColorBox.setFocusPolicy(QtCore.Qt.NoFocus)
+        self.ColorBox.setObjectName(_fromUtf8("ColorBox"))
+        self.OptionsExpertInternal = QtGui.QFrame(self.OptionsExpert)
+        self.OptionsExpertInternal.setGeometry(QtCore.QRect(100, 0, 295, 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.OptionsExpertInternal)
+        self.wLabel.setObjectName(_fromUtf8("wLabel"))
+        self.gridLayout_2.addWidget(self.wLabel, 0, 0, 1, 1)
+        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(40, 16777215))
+        self.customWidth.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.customWidth.setAcceptDrops(False)
+        self.customWidth.setMaxLength(4)
+        self.customWidth.setObjectName(_fromUtf8("customWidth"))
+        self.gridLayout_2.addWidget(self.customWidth, 0, 1, 1, 1)
+        self.hLabel = QtGui.QLabel(self.OptionsExpertInternal)
+        self.hLabel.setObjectName(_fromUtf8("hLabel"))
+        self.gridLayout_2.addWidget(self.hLabel, 0, 2, 1, 1)
+        self.customHeight = QtGui.QLineEdit(self.OptionsExpertInternal)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.customHeight.sizePolicy().hasHeightForWidth())
+        self.customHeight.setSizePolicy(sizePolicy)
+        self.customHeight.setMaximumSize(QtCore.QSize(40, 16777215))
+        self.customHeight.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.customHeight.setAcceptDrops(False)
+        self.customHeight.setMaxLength(4)
+        self.customHeight.setObjectName(_fromUtf8("customHeight"))
+        self.gridLayout_2.addWidget(self.customHeight, 0, 3, 1, 1)
        KCC.setCentralWidget(self.Form)
        self.ActionBasic = QtGui.QAction(KCC)
        self.ActionBasic.setCheckable(True)
@@ -276,6 +298,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))