diff options
| author | Paweł Jastrzębski <[email protected]> | 2015-10-28 19:18:06 +0100 |
|---|---|---|
| committer | Paweł Jastrzębski <[email protected]> | 2015-10-28 19:18:06 +0100 |
| commit | 72b5027021c9409954aaca204fc15aa111187eed (patch) | |
| tree | f5d489ec932da0a210ce445fd00b71487dd49d21 | |
| parent | Miscellaneous tweaks (diff) | |
| download | kcc-72b5027021c9409954aaca204fc15aa111187eed.tar.gz kcc-72b5027021c9409954aaca204fc15aa111187eed.tar.bz2 kcc-72b5027021c9409954aaca204fc15aa111187eed.zip | |
OS X: GUI update
| -rw-r--r-- | gui/KCC-OSX.ui | 855 | ||||
| -rw-r--r-- | kcc/KCC_ui_osx.py | 365 |
2 files changed, 466 insertions, 754 deletions
diff --git a/gui/KCC-OSX.ui b/gui/KCC-OSX.ui index 3ad0af7..797e17b 100644 --- a/gui/KCC-OSX.ui +++ b/gui/KCC-OSX.ui @@ -7,24 +7,24 @@ <x>0</x> <y>0</y> <width>420</width> - <height>397</height> + <height>390</height> </rect> </property> <property name="minimumSize"> <size> <width>420</width> - <height>397</height> + <height>390</height> </size> </property> <property name="maximumSize"> <size> <width>420</width> - <height>397</height> + <height>390</height> </size> </property> <property name="font"> <font> - <pointsize>9</pointsize> + <pointsize>11</pointsize> </font> </property> <property name="windowTitle"> @@ -38,159 +38,17 @@ <locale language="C" country="AnyCountry"/> </property> <widget class="QWidget" name="Form"> - <widget class="QFrame" name="OptionsAdvanced"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="geometry"> - <rect> - <x>4</x> - <y>253</y> - <width>421</width> - <height>61</height> - </rect> - </property> - <property name="font"> - <font> - <family>Lucida Grande</family> - <pointsize>9</pointsize> - </font> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="1" column="0"> - <widget class="QCheckBox" name="ProcessingBox"> - <property name="font"> - <font> - <family>Lucida Grande</family> - <pointsize>12</pointsize> - </font> - </property> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> - </property> - <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Disable image optimizations.<br/><span style=" font-weight:600;">Input images must be already resized.</span></p></body></html></string> - </property> - <property name="text"> - <string>No optimisation</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QCheckBox" name="UpscaleBox"> - <property name="font"> - <font> - <family>Lucida Grande</family> - <pointsize>12</pointsize> - </font> - </property> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> - </property> - <property name="toolTip"> - <string><html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Unchecked - Nothing<br/></span>Images smaller than device resolution will not be resized.</p><p><span style=" font-weight:600; text-decoration: underline;">Indeterminate - Stretching<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be not preserved.</p><p><span style=" font-weight:600; text-decoration: underline;">Checked - Upscaling<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be preserved.</p></body></html></string> - </property> - <property name="text"> - <string>Stretch/Upscale</string> - </property> - <property name="tristate"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QCheckBox" name="WebtoonBox"> - <property name="font"> - <font> - <family>Lucida Grande</family> - <pointsize>12</pointsize> - </font> - </property> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> - </property> - <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Enable special parsing mode for WebToons.</p></body></html></string> - </property> - <property name="text"> - <string>Webtoon mode</string> - </property> - </widget> - </item> - <item row="3" column="2"> - <widget class="QCheckBox" name="NoDitheringBox"> - <property name="font"> - <font> - <family>Lucida Grande</family> - <pointsize>12</pointsize> - </font> - </property> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> - </property> - <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Create PNG files instead JPEG.<br/>Quality increase is not noticeable on most of devices.<br/>Output files <span style=" font-weight:600;">might</span> be smaller.<br/><span style=" font-weight:600;">MOBI conversion will be much slower.</span></p></body></html></string> - </property> - <property name="text"> - <string>PNG output</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QCheckBox" name="BorderBox"> - <property name="font"> - <font> - <family>Lucida Grande</family> - <pointsize>12</pointsize> - </font> - </property> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> - </property> - <property name="toolTip"> - <string><html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Unchecked - Autodetection<br/></span>Color of margins fill will be detected automatically.</p><p><span style=" font-weight:600; text-decoration: underline;">Indeterminate - White<br/></span>Margins will be filled with white color.</p><p><span style=" font-weight:600; text-decoration: underline;">Checked - Black<br/></span>Margins will be filled with black color.</p></body></html></string> - </property> - <property name="text"> - <string>W/B margins</string> - </property> - <property name="tristate"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="1" column="2"> - <widget class="QCheckBox" name="NoRotateBox"> - <property name="font"> - <font> - <family>Lucida Grande</family> - <pointsize>12</pointsize> - </font> - </property> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> - </property> - <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Disable page splitting and rotation.</p></body></html></string> - </property> - <property name="text"> - <string>No split/rotate</string> - </property> - </widget> - </item> - </layout> - </widget> <widget class="QComboBox" name="DeviceBox"> <property name="geometry"> <rect> <x>8</x> - <y>206</y> + <y>204</y> <width>151</width> <height>26</height> </rect> </property> <property name="font"> <font> - <family>Lucida Grande</family> <pointsize>11</pointsize> </font> </property> @@ -200,25 +58,18 @@ <property name="toolTip"> <string><html><head/><body><p style='white-space:pre'>Target device.</p></body></html></string> </property> - <property name="iconSize"> - <size> - <width>15</width> - <height>15</height> - </size> - </property> </widget> <widget class="QComboBox" name="FormatBox"> <property name="geometry"> <rect> - <x>263</x> - <y>206</y> - <width>152</width> + <x>264</x> + <y>204</y> + <width>150</width> <height>26</height> </rect> </property> <property name="font"> <font> - <family>Lucida Grande</family> <pointsize>11</pointsize> </font> </property> @@ -228,25 +79,18 @@ <property name="toolTip"> <string><html><head/><body><p style='white-space:pre'>Output format.</p></body></html></string> </property> - <property name="iconSize"> - <size> - <width>15</width> - <height>15</height> - </size> - </property> </widget> <widget class="QPushButton" name="ConvertButton"> <property name="geometry"> <rect> - <x>160</x> + <x>159</x> <y>200</y> - <width>101</width> + <width>104</width> <height>41</height> </rect> </property> <property name="font"> <font> - <family>Lucida Grande</family> <pointsize>11</pointsize> <weight>75</weight> <bold>true</bold> @@ -269,15 +113,14 @@ <widget class="QPushButton" name="DirectoryButton"> <property name="geometry"> <rect> - <x>5</x> + <x>4</x> <y>160</y> - <width>156</width> + <width>158</width> <height>41</height> </rect> </property> <property name="font"> <font> - <family>Lucida Grande</family> <pointsize>11</pointsize> </font> </property> @@ -306,7 +149,6 @@ </property> <property name="font"> <font> - <family>Lucida Grande</family> <pointsize>11</pointsize> </font> </property> @@ -327,15 +169,14 @@ <widget class="QPushButton" name="ClearButton"> <property name="geometry"> <rect> - <x>160</x> + <x>159</x> <y>160</y> - <width>101</width> + <width>104</width> <height>41</height> </rect> </property> <property name="font"> <font> - <family>Lucida Grande</family> <pointsize>11</pointsize> </font> </property> @@ -350,102 +191,166 @@ <normaloff>:/Other/icons/clear.png</normaloff>:/Other/icons/clear.png</iconset> </property> </widget> - <widget class="QFrame" name="OptionsBasic"> + <widget class="QFrame" name="Options"> <property name="geometry"> <rect> - <x>5</x> - <y>233</y> - <width>421</width> - <height>41</height> + <x>10</x> + <y>237</y> + <width>401</width> + <height>70</height> </rect> </property> <property name="font"> <font> - <family>Lucida Grande</family> - <pointsize>12</pointsize> + <pointsize>11</pointsize> </font> </property> - <widget class="QCheckBox" name="MangaBox"> - <property name="geometry"> - <rect> - <x>9</x> - <y>10</y> - <width>130</width> - <height>18</height> - </rect> - </property> - <property name="font"> - <font> - <family>Lucida Grande</family> - <pointsize>12</pointsize> - </font> + <layout class="QGridLayout" name="gridLayout" columnstretch="0,0,0"> + <property name="leftMargin"> + <number>0</number> </property> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> + <property name="topMargin"> + <number>0</number> </property> - <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Enable right-to-left reading.</p></body></html></string> + <property name="rightMargin"> + <number>0</number> </property> - <property name="text"> - <string>Manga mode</string> + <property name="bottomMargin"> + <number>0</number> </property> - </widget> - <widget class="QCheckBox" name="QualityBox"> - <property name="geometry"> - <rect> - <x>282</x> - <y>10</y> - <width>135</width> - <height>18</height> - </rect> + <property name="horizontalSpacing"> + <number>31</number> </property> - <property name="font"> - <font> - <family>Lucida Grande</family> - <pointsize>12</pointsize> - </font> - </property> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> - </property> - <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Quality of Panel View/zoom. Highly impact size of output file.<br/><span style=" font-weight:600;">This option control only quality of magnification!</span></p></body></html></string> - </property> - <property name="text"> - <string>High/Ultra quality</string> - </property> - <property name="tristate"> - <bool>true</bool> - </property> - </widget> - <widget class="QCheckBox" name="RotateBox"> - <property name="geometry"> - <rect> - <x>145</x> - <y>10</y> - <width>130</width> - <height>18</height> - </rect> - </property> - <property name="font"> - <font> - <family>Lucida Grande</family> - <pointsize>12</pointsize> - </font> - </property> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> - </property> - <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Disable splitting of two-page spreads.<br/>They will be rotated instead.</p></body></html></string> - </property> - <property name="text"> - <string>Horizontal mode</string> + <property name="verticalSpacing"> + <number>5</number> </property> - </widget> - <zorder>RotateBox</zorder> - <zorder>MangaBox</zorder> - <zorder>QualityBox</zorder> + <item row="2" column="0"> + <widget class="QCheckBox" name="MangaBox"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="toolTip"> + <string><html><head/><body><p style='white-space:pre'>Enable right-to-left reading.</p></body></html></string> + </property> + <property name="text"> + <string>Manga mode</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QCheckBox" name="RotateBox"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="toolTip"> + <string><html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Unchecked - Split<br/></span>Double page spreads will be cut into two separate pages.</p><p><span style=" font-weight:600; text-decoration: underline;">Indeterminate - Rotate and split<br/></span>Double page spreads will be displayed twice. First rotated and then split. </p><p><span style=" font-weight:600; text-decoration: underline;">Checked - Rotate<br/></span>Double page spreads will be rotated.</p></body></html></string> + </property> + <property name="text"> + <string>Spread splitter</string> + </property> + <property name="tristate"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QCheckBox" name="QualityBox"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="toolTip"> + <string><html><head/><body><p style='white-space:pre'>High quality Panel View.<br/>Require source files with bigger resolution than target device.<br/><span style=" font-weight:600;">Highly impact size of output file!</span></p></body></html></string> + </property> + <property name="text"> + <string>HQ zoom</string> + </property> + </widget> + </item> + <item row="4" column="2"> + <widget class="QCheckBox" name="GammaBox"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="toolTip"> + <string><html><head/><body><p style='white-space:pre'>Disable automatic gamma correction.</p></body></html></string> + </property> + <property name="text"> + <string>Custom gamma</string> + </property> + </widget> + </item> + <item row="5" column="1"> + <widget class="QCheckBox" name="NoDitheringBox"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="toolTip"> + <string><html><head/><body><p style='white-space:pre'>Create PNG files instead JPEG.<br/>Quality increase is not noticeable on most of devices.<br/>Output files <span style=" font-weight:600;">might</span> be smaller.<br/><span style=" font-weight:600;">MOBI conversion will be much slower.</span></p></body></html></string> + </property> + <property name="text"> + <string>PNG output</string> + </property> + </widget> + </item> + <item row="5" column="2"> + <widget class="QCheckBox" name="ColorBox"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="toolTip"> + <string><html><head/><body><p style='white-space:pre'>Disable conversion to grayscale.</p></body></html></string> + </property> + <property name="text"> + <string>Color mode</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QCheckBox" name="UpscaleBox"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="toolTip"> + <string><html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Unchecked - Nothing<br/></span>Images smaller than device resolution will not be resized.</p><p><span style=" font-weight:600; text-decoration: underline;">Indeterminate - Stretching<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be not preserved.</p><p><span style=" font-weight:600; text-decoration: underline;">Checked - Upscaling<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be preserved.</p></body></html></string> + </property> + <property name="text"> + <string>Stretch/Upscale</string> + </property> + <property name="tristate"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="QCheckBox" name="WebtoonBox"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="toolTip"> + <string><html><head/><body><p style='white-space:pre'>Enable special parsing mode for Korean Webtoons.</p></body></html></string> + </property> + <property name="text"> + <string>Webtoon mode</string> + </property> + </widget> + </item> + <item row="5" column="0"> + <widget class="QCheckBox" name="BorderBox"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="toolTip"> + <string><html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Unchecked - Autodetection<br/></span>Color of margins fill will be detected automatically.</p><p><span style=" font-weight:600; text-decoration: underline;">Indeterminate - White<br/></span>Margins will be filled with white color.</p><p><span style=" font-weight:600; text-decoration: underline;">Checked - Black<br/></span>Margins will be filled with black color.</p></body></html></string> + </property> + <property name="text"> + <string>W/B margins</string> + </property> + <property name="tristate"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> </widget> <widget class="QListWidget" name="JobList"> <property name="geometry"> @@ -458,7 +363,6 @@ </property> <property name="font"> <font> - <family>Lucida Grande</family> <pointsize>11</pointsize> </font> </property> @@ -474,6 +378,12 @@ <property name="selectionMode"> <enum>QAbstractItemView::NoSelection</enum> </property> + <property name="iconSize"> + <size> + <width>15</width> + <height>15</height> + </size> + </property> <property name="verticalScrollMode"> <enum>QAbstractItemView::ScrollPerPixel</enum> </property> @@ -481,120 +391,63 @@ <enum>QAbstractItemView::ScrollPerPixel</enum> </property> </widget> - <widget class="QPushButton" name="BasicModeButton"> - <property name="geometry"> - <rect> - <x>5</x> - <y>10</y> - <width>156</width> - <height>41</height> - </rect> - </property> - <property name="font"> - <font> - <family>Lucida Grande</family> - <pointsize>12</pointsize> - <weight>50</weight> - <bold>false</bold> - </font> - </property> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> - </property> - <property name="text"> - <string>Basic</string> - </property> - </widget> - <widget class="QPushButton" name="AdvModeButton"> - <property name="geometry"> - <rect> - <x>260</x> - <y>10</y> - <width>156</width> - <height>41</height> - </rect> - </property> - <property name="font"> - <font> - <family>Lucida Grande</family> - <pointsize>12</pointsize> - <weight>50</weight> - <bold>false</bold> - </font> - </property> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> - </property> - <property name="text"> - <string>Advanced</string> - </property> - </widget> - <widget class="QFrame" name="OptionsAdvancedGamma"> + <widget class="QFrame" name="OptionsGamma"> <property name="enabled"> <bool>true</bool> </property> <property name="geometry"> <rect> - <x>5</x> - <y>303</y> + <x>10</x> + <y>305</y> <width>401</width> - <height>41</height> + <height>35</height> </rect> </property> <property name="font"> <font> - <family>Lucida Grande</family> - <pointsize>9</pointsize> + <pointsize>11</pointsize> </font> </property> - <widget class="QLabel" name="GammaLabel"> - <property name="geometry"> - <rect> - <x>20</x> - <y>0</y> - <width>100</width> - <height>40</height> - </rect> - </property> - <property name="font"> - <font> - <family>Lucida Grande</family> - <pointsize>12</pointsize> - <weight>50</weight> - <bold>false</bold> - </font> - </property> - <property name="text"> - <string>Gamma: Auto</string> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="spacing"> + <number>15</number> </property> - </widget> - <widget class="QSlider" name="GammaSlider"> - <property name="geometry"> - <rect> - <x>110</x> - <y>10</y> - <width>290</width> - <height>22</height> - </rect> + <property name="leftMargin"> + <number>0</number> </property> - <property name="font"> - <font> - <family>Lucida Grande</family> - </font> + <property name="topMargin"> + <number>0</number> </property> - <property name="focusPolicy"> - <enum>Qt::ClickFocus</enum> + <property name="rightMargin"> + <number>0</number> </property> - <property name="maximum"> - <number>500</number> + <property name="bottomMargin"> + <number>0</number> </property> - <property name="singleStep"> - <number>5</number> - </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> + <item> + <widget class="QLabel" name="GammaLabel"> + <property name="text"> + <string>Gamma: Auto</string> + </property> + </widget> + </item> + <item> + <widget class="QSlider" name="GammaSlider"> + <property name="focusPolicy"> + <enum>Qt::ClickFocus</enum> + </property> + <property name="maximum"> + <number>500</number> + </property> + <property name="singleStep"> + <number>5</number> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + </layout> </widget> <widget class="QProgressBar" name="ProgressBar"> <property name="geometry"> @@ -602,13 +455,12 @@ <x>10</x> <y>10</y> <width>401</width> - <height>29</height> + <height>31</height> </rect> </property> <property name="font"> <font> - <family>Lucida Grande</family> - <pointsize>10</pointsize> + <pointsize>11</pointsize> <weight>75</weight> <bold>true</bold> </font> @@ -623,187 +475,120 @@ <string/> </property> </widget> - <widget class="QFrame" name="OptionsExpert"> + <widget class="QFrame" name="OptionsCustom"> <property name="geometry"> <rect> - <x>5</x> - <y>335</y> - <width>421</width> - <height>41</height> + <x>10</x> + <y>337</y> + <width>401</width> + <height>25</height> </rect> </property> <property name="font"> <font> - <family>Lucida Grande</family> - <pointsize>9</pointsize> + <pointsize>11</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> - <family>Lucida Grande</family> - <pointsize>12</pointsize> - </font> - </property> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="spacing"> + <number>5</number> </property> - <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Don't convert images to grayscale.</p></body></html></string> + <property name="leftMargin"> + <number>0</number> </property> - <property name="text"> - <string>Color mode</string> + <property name="topMargin"> + <number>0</number> </property> - </widget> - <widget class="QFrame" name="OptionsExpertInternal"> - <property name="geometry"> - <rect> - <x>95</x> - <y>0</y> - <width>315</width> - <height>40</height> - </rect> + <property name="rightMargin"> + <number>0</number> </property> - <property name="font"> - <font> - <family>Lucida Grande</family> - </font> + <property name="bottomMargin"> + <number>0</number> </property> - <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0"> - <widget class="QLabel" name="wLabel"> - <property name="font"> - <font> - <family>Lucida Grande</family> - <pointsize>12</pointsize> - <weight>50</weight> - <bold>false</bold> - </font> - </property> - <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html></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> - <family>Lucida Grande</family> - <pointsize>12</pointsize> - </font> - </property> - <property name="focusPolicy"> - <enum>Qt::ClickFocus</enum> - </property> - <property name="acceptDrops"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html></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> - <family>Lucida Grande</family> - <pointsize>12</pointsize> - <weight>50</weight> - <bold>false</bold> - </font> - </property> - <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html></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> - <family>Lucida Grande</family> - <pointsize>12</pointsize> - </font> - </property> - <property name="focusPolicy"> - <enum>Qt::ClickFocus</enum> - </property> - <property name="acceptDrops"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html></string> - </property> - <property name="inputMask"> - <string>0000</string> - </property> - <property name="maxLength"> - <number>4</number> - </property> - </widget> - </item> - </layout> - </widget> + <item> + <widget class="QLabel" name="wLabel"> + <property name="toolTip"> + <string><html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html></string> + </property> + <property name="text"> + <string>Custom width: </string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="customWidth"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="focusPolicy"> + <enum>Qt::ClickFocus</enum> + </property> + <property name="acceptDrops"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string><html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html></string> + </property> + <property name="inputMask"> + <string>0000</string> + </property> + <property name="maxLength"> + <number>4</number> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="hLabel"> + <property name="toolTip"> + <string><html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html></string> + </property> + <property name="text"> + <string>Custom height: </string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="customHeight"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="focusPolicy"> + <enum>Qt::ClickFocus</enum> + </property> + <property name="acceptDrops"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string><html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html></string> + </property> + <property name="inputMask"> + <string>0000</string> + </property> + <property name="maxLength"> + <number>4</number> + </property> + </widget> + </item> + </layout> </widget> <widget class="QPushButton" name="EditorButton"> <property name="geometry"> <rect> - <x>160</x> + <x>4</x> <y>10</y> - <width>101</width> + <width>210</width> <height>41</height> </rect> </property> <property name="font"> <font> - <family>Lucida Grande</family> - <pointsize>12</pointsize> + <pointsize>11</pointsize> </font> </property> <property name="focusPolicy"> @@ -817,27 +602,49 @@ <normaloff>:/Other/icons/editor.png</normaloff>:/Other/icons/editor.png</iconset> </property> </widget> - <zorder>BasicModeButton</zorder> - <zorder>AdvModeButton</zorder> - <zorder>JobList</zorder> - <zorder>OptionsAdvanced</zorder> + <widget class="QPushButton" name="WikiButton"> + <property name="geometry"> + <rect> + <x>207</x> + <y>10</y> + <width>210</width> + <height>41</height> + </rect> + </property> + <property name="font"> + <font> + <pointsize>11</pointsize> + </font> + </property> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="text"> + <string>Wiki</string> + </property> + <property name="icon"> + <iconset resource="KCC.qrc"> + <normaloff>:/Other/icons/wiki.png</normaloff>:/Other/icons/wiki.png</iconset> + </property> + </widget> <zorder>DeviceBox</zorder> <zorder>FormatBox</zorder> <zorder>ConvertButton</zorder> <zorder>DirectoryButton</zorder> <zorder>FileButton</zorder> <zorder>ClearButton</zorder> - <zorder>OptionsBasic</zorder> - <zorder>OptionsAdvancedGamma</zorder> - <zorder>OptionsExpert</zorder> + <zorder>Options</zorder> + <zorder>JobList</zorder> + <zorder>OptionsGamma</zorder> + <zorder>OptionsCustom</zorder> <zorder>EditorButton</zorder> + <zorder>WikiButton</zorder> <zorder>ProgressBar</zorder> </widget> <widget class="QStatusBar" name="statusBar"> <property name="font"> <font> - <family>Aharoni</family> - <pointsize>8</pointsize> + <pointsize>11</pointsize> </font> </property> <property name="sizeGripEnabled"> @@ -856,7 +663,7 @@ </property> <property name="font"> <font> - <pointsize>9</pointsize> + <pointsize>11</pointsize> </font> </property> </action> diff --git a/kcc/KCC_ui_osx.py b/kcc/KCC_ui_osx.py index 9e3b070..ec94274 100644 --- a/kcc/KCC_ui_osx.py +++ b/kcc/KCC_ui_osx.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '/Users/pawelj/Documents/KCC/gui/KCC-OSX.ui' +# Form implementation generated from reading ui file 'KCC-OSX.ui' # -# Created: Sun Feb 8 12:37:33 2015 -# by: PyQt5 UI code generator 5.4 +# Created by: PyQt5 UI code generator 5.5.1 # # WARNING! All changes made in this file will be lost! @@ -12,11 +11,11 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_KCC(object): def setupUi(self, KCC): KCC.setObjectName("KCC") - KCC.resize(420, 397) - KCC.setMinimumSize(QtCore.QSize(420, 397)) - KCC.setMaximumSize(QtCore.QSize(420, 397)) + KCC.resize(420, 390) + KCC.setMinimumSize(QtCore.QSize(420, 390)) + KCC.setMaximumSize(QtCore.QSize(420, 390)) font = QtGui.QFont() - font.setPointSize(9) + font.setPointSize(11) KCC.setFont(font) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) @@ -24,88 +23,23 @@ class Ui_KCC(object): KCC.setLocale(QtCore.QLocale(QtCore.QLocale.C, QtCore.QLocale.AnyCountry)) self.Form = QtWidgets.QWidget(KCC) self.Form.setObjectName("Form") - self.OptionsAdvanced = QtWidgets.QFrame(self.Form) - self.OptionsAdvanced.setEnabled(True) - self.OptionsAdvanced.setGeometry(QtCore.QRect(4, 253, 421, 61)) - font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(9) - self.OptionsAdvanced.setFont(font) - self.OptionsAdvanced.setObjectName("OptionsAdvanced") - self.gridLayout = QtWidgets.QGridLayout(self.OptionsAdvanced) - self.gridLayout.setObjectName("gridLayout") - self.ProcessingBox = QtWidgets.QCheckBox(self.OptionsAdvanced) - font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(12) - self.ProcessingBox.setFont(font) - self.ProcessingBox.setFocusPolicy(QtCore.Qt.NoFocus) - self.ProcessingBox.setObjectName("ProcessingBox") - self.gridLayout.addWidget(self.ProcessingBox, 1, 0, 1, 1) - self.UpscaleBox = QtWidgets.QCheckBox(self.OptionsAdvanced) - font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(12) - self.UpscaleBox.setFont(font) - self.UpscaleBox.setFocusPolicy(QtCore.Qt.NoFocus) - self.UpscaleBox.setTristate(True) - self.UpscaleBox.setObjectName("UpscaleBox") - self.gridLayout.addWidget(self.UpscaleBox, 1, 1, 1, 1) - self.WebtoonBox = QtWidgets.QCheckBox(self.OptionsAdvanced) - font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(12) - self.WebtoonBox.setFont(font) - self.WebtoonBox.setFocusPolicy(QtCore.Qt.NoFocus) - self.WebtoonBox.setObjectName("WebtoonBox") - self.gridLayout.addWidget(self.WebtoonBox, 3, 1, 1, 1) - self.NoDitheringBox = QtWidgets.QCheckBox(self.OptionsAdvanced) - font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(12) - self.NoDitheringBox.setFont(font) - self.NoDitheringBox.setFocusPolicy(QtCore.Qt.NoFocus) - self.NoDitheringBox.setObjectName("NoDitheringBox") - self.gridLayout.addWidget(self.NoDitheringBox, 3, 2, 1, 1) - self.BorderBox = QtWidgets.QCheckBox(self.OptionsAdvanced) - font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(12) - self.BorderBox.setFont(font) - self.BorderBox.setFocusPolicy(QtCore.Qt.NoFocus) - self.BorderBox.setTristate(True) - self.BorderBox.setObjectName("BorderBox") - self.gridLayout.addWidget(self.BorderBox, 3, 0, 1, 1) - self.NoRotateBox = QtWidgets.QCheckBox(self.OptionsAdvanced) - font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(12) - self.NoRotateBox.setFont(font) - self.NoRotateBox.setFocusPolicy(QtCore.Qt.NoFocus) - self.NoRotateBox.setObjectName("NoRotateBox") - self.gridLayout.addWidget(self.NoRotateBox, 1, 2, 1, 1) self.DeviceBox = QtWidgets.QComboBox(self.Form) - self.DeviceBox.setGeometry(QtCore.QRect(8, 206, 151, 26)) + self.DeviceBox.setGeometry(QtCore.QRect(8, 204, 151, 26)) font = QtGui.QFont() - font.setFamily("Lucida Grande") font.setPointSize(11) self.DeviceBox.setFont(font) self.DeviceBox.setFocusPolicy(QtCore.Qt.NoFocus) self.DeviceBox.setObjectName("DeviceBox") - self.DeviceBox.setIconSize(QtCore.QSize(15, 15)) self.FormatBox = QtWidgets.QComboBox(self.Form) - self.FormatBox.setGeometry(QtCore.QRect(263, 206, 152, 26)) + self.FormatBox.setGeometry(QtCore.QRect(264, 204, 150, 26)) font = QtGui.QFont() - font.setFamily("Lucida Grande") font.setPointSize(11) self.FormatBox.setFont(font) self.FormatBox.setFocusPolicy(QtCore.Qt.NoFocus) self.FormatBox.setObjectName("FormatBox") - self.FormatBox.setIconSize(QtCore.QSize(15, 15)) self.ConvertButton = QtWidgets.QPushButton(self.Form) - self.ConvertButton.setGeometry(QtCore.QRect(160, 200, 101, 41)) + self.ConvertButton.setGeometry(QtCore.QRect(159, 200, 104, 41)) font = QtGui.QFont() - font.setFamily("Lucida Grande") font.setPointSize(11) font.setBold(True) font.setWeight(75) @@ -116,9 +50,8 @@ class Ui_KCC(object): self.ConvertButton.setIcon(icon1) self.ConvertButton.setObjectName("ConvertButton") self.DirectoryButton = QtWidgets.QPushButton(self.Form) - self.DirectoryButton.setGeometry(QtCore.QRect(5, 160, 156, 41)) + self.DirectoryButton.setGeometry(QtCore.QRect(4, 160, 158, 41)) font = QtGui.QFont() - font.setFamily("Lucida Grande") font.setPointSize(11) self.DirectoryButton.setFont(font) self.DirectoryButton.setFocusPolicy(QtCore.Qt.NoFocus) @@ -129,7 +62,6 @@ class Ui_KCC(object): self.FileButton = QtWidgets.QPushButton(self.Form) self.FileButton.setGeometry(QtCore.QRect(260, 160, 157, 41)) font = QtGui.QFont() - font.setFamily("Lucida Grande") font.setPointSize(11) self.FileButton.setFont(font) self.FileButton.setFocusPolicy(QtCore.Qt.NoFocus) @@ -138,9 +70,8 @@ class Ui_KCC(object): self.FileButton.setIcon(icon3) self.FileButton.setObjectName("FileButton") self.ClearButton = QtWidgets.QPushButton(self.Form) - self.ClearButton.setGeometry(QtCore.QRect(160, 160, 101, 41)) + self.ClearButton.setGeometry(QtCore.QRect(159, 160, 104, 41)) font = QtGui.QFont() - font.setFamily("Lucida Grande") font.setPointSize(11) self.ClearButton.setFont(font) self.ClearButton.setFocusPolicy(QtCore.Qt.NoFocus) @@ -148,103 +79,94 @@ class Ui_KCC(object): icon4.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.ClearButton.setIcon(icon4) self.ClearButton.setObjectName("ClearButton") - self.OptionsBasic = QtWidgets.QFrame(self.Form) - self.OptionsBasic.setGeometry(QtCore.QRect(5, 233, 421, 41)) - font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(12) - self.OptionsBasic.setFont(font) - self.OptionsBasic.setObjectName("OptionsBasic") - self.MangaBox = QtWidgets.QCheckBox(self.OptionsBasic) - self.MangaBox.setGeometry(QtCore.QRect(9, 10, 130, 18)) + self.Options = QtWidgets.QFrame(self.Form) + self.Options.setGeometry(QtCore.QRect(10, 237, 401, 70)) font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(12) - self.MangaBox.setFont(font) + font.setPointSize(11) + self.Options.setFont(font) + self.Options.setObjectName("Options") + self.gridLayout = QtWidgets.QGridLayout(self.Options) + self.gridLayout.setContentsMargins(0, 0, 0, 0) + self.gridLayout.setHorizontalSpacing(31) + self.gridLayout.setVerticalSpacing(5) + self.gridLayout.setObjectName("gridLayout") + self.MangaBox = QtWidgets.QCheckBox(self.Options) self.MangaBox.setFocusPolicy(QtCore.Qt.NoFocus) self.MangaBox.setObjectName("MangaBox") - self.QualityBox = QtWidgets.QCheckBox(self.OptionsBasic) - self.QualityBox.setGeometry(QtCore.QRect(282, 10, 135, 18)) - font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(12) - self.QualityBox.setFont(font) - self.QualityBox.setFocusPolicy(QtCore.Qt.NoFocus) - self.QualityBox.setTristate(True) - self.QualityBox.setObjectName("QualityBox") - self.RotateBox = QtWidgets.QCheckBox(self.OptionsBasic) - self.RotateBox.setGeometry(QtCore.QRect(145, 10, 130, 18)) - font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(12) - self.RotateBox.setFont(font) + self.gridLayout.addWidget(self.MangaBox, 2, 0, 1, 1) + self.RotateBox = QtWidgets.QCheckBox(self.Options) self.RotateBox.setFocusPolicy(QtCore.Qt.NoFocus) + self.RotateBox.setTristate(True) self.RotateBox.setObjectName("RotateBox") + self.gridLayout.addWidget(self.RotateBox, 2, 1, 1, 1) + self.QualityBox = QtWidgets.QCheckBox(self.Options) + self.QualityBox.setFocusPolicy(QtCore.Qt.NoFocus) + self.QualityBox.setObjectName("QualityBox") + self.gridLayout.addWidget(self.QualityBox, 2, 2, 1, 1) + self.GammaBox = QtWidgets.QCheckBox(self.Options) + self.GammaBox.setFocusPolicy(QtCore.Qt.NoFocus) + self.GammaBox.setObjectName("GammaBox") + self.gridLayout.addWidget(self.GammaBox, 4, 2, 1, 1) + self.NoDitheringBox = QtWidgets.QCheckBox(self.Options) + self.NoDitheringBox.setFocusPolicy(QtCore.Qt.NoFocus) + self.NoDitheringBox.setObjectName("NoDitheringBox") + self.gridLayout.addWidget(self.NoDitheringBox, 5, 1, 1, 1) + self.ColorBox = QtWidgets.QCheckBox(self.Options) + self.ColorBox.setFocusPolicy(QtCore.Qt.NoFocus) + self.ColorBox.setObjectName("ColorBox") + self.gridLayout.addWidget(self.ColorBox, 5, 2, 1, 1) + self.UpscaleBox = QtWidgets.QCheckBox(self.Options) + self.UpscaleBox.setFocusPolicy(QtCore.Qt.NoFocus) + self.UpscaleBox.setTristate(True) + self.UpscaleBox.setObjectName("UpscaleBox") + self.gridLayout.addWidget(self.UpscaleBox, 4, 1, 1, 1) + self.WebtoonBox = QtWidgets.QCheckBox(self.Options) + self.WebtoonBox.setFocusPolicy(QtCore.Qt.NoFocus) + self.WebtoonBox.setObjectName("WebtoonBox") + self.gridLayout.addWidget(self.WebtoonBox, 4, 0, 1, 1) + self.BorderBox = QtWidgets.QCheckBox(self.Options) + self.BorderBox.setFocusPolicy(QtCore.Qt.NoFocus) + self.BorderBox.setTristate(True) + self.BorderBox.setObjectName("BorderBox") + self.gridLayout.addWidget(self.BorderBox, 5, 0, 1, 1) self.JobList = QtWidgets.QListWidget(self.Form) self.JobList.setGeometry(QtCore.QRect(10, 50, 401, 101)) font = QtGui.QFont() - font.setFamily("Lucida Grande") font.setPointSize(11) self.JobList.setFont(font) self.JobList.setFocusPolicy(QtCore.Qt.NoFocus) self.JobList.setStyleSheet("QListWidget#JobList {background:#ffffff;background-image:url(:/Other/icons/list_background.png);background-position:center center;background-repeat:no-repeat;}QScrollBar:vertical{border:1px solid #999;background:#FFF;width:5px;margin:0}QScrollBar::handle:vertical{background:DarkGray;min-height:0}QScrollBar::add-line:vertical{height:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:vertical{height:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}QScrollBar:horizontal{border:1px solid #999;background:#FFF;height:5px;margin:0}QScrollBar::handle:horizontal{background:DarkGray;min-width:0}QScrollBar::add-line:horizontal{width:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:horizontal{width:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}") self.JobList.setProperty("showDropIndicator", False) self.JobList.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection) + self.JobList.setIconSize(QtCore.QSize(15, 15)) self.JobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) self.JobList.setObjectName("JobList") - self.BasicModeButton = QtWidgets.QPushButton(self.Form) - self.BasicModeButton.setGeometry(QtCore.QRect(5, 10, 156, 41)) - font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(12) - font.setBold(False) - font.setWeight(50) - self.BasicModeButton.setFont(font) - self.BasicModeButton.setFocusPolicy(QtCore.Qt.NoFocus) - self.BasicModeButton.setObjectName("BasicModeButton") - self.AdvModeButton = QtWidgets.QPushButton(self.Form) - self.AdvModeButton.setGeometry(QtCore.QRect(260, 10, 156, 41)) - font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(12) - font.setBold(False) - font.setWeight(50) - self.AdvModeButton.setFont(font) - self.AdvModeButton.setFocusPolicy(QtCore.Qt.NoFocus) - self.AdvModeButton.setObjectName("AdvModeButton") - self.OptionsAdvancedGamma = QtWidgets.QFrame(self.Form) - self.OptionsAdvancedGamma.setEnabled(True) - self.OptionsAdvancedGamma.setGeometry(QtCore.QRect(5, 303, 401, 41)) + self.OptionsGamma = QtWidgets.QFrame(self.Form) + self.OptionsGamma.setEnabled(True) + self.OptionsGamma.setGeometry(QtCore.QRect(10, 305, 401, 35)) font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(9) - self.OptionsAdvancedGamma.setFont(font) - self.OptionsAdvancedGamma.setObjectName("OptionsAdvancedGamma") - self.GammaLabel = QtWidgets.QLabel(self.OptionsAdvancedGamma) - self.GammaLabel.setGeometry(QtCore.QRect(20, 0, 100, 40)) - font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(12) - font.setBold(False) - font.setWeight(50) - self.GammaLabel.setFont(font) + font.setPointSize(11) + self.OptionsGamma.setFont(font) + self.OptionsGamma.setObjectName("OptionsGamma") + self.horizontalLayout = QtWidgets.QHBoxLayout(self.OptionsGamma) + self.horizontalLayout.setContentsMargins(0, 0, 0, 0) + self.horizontalLayout.setSpacing(15) + self.horizontalLayout.setObjectName("horizontalLayout") + self.GammaLabel = QtWidgets.QLabel(self.OptionsGamma) self.GammaLabel.setObjectName("GammaLabel") - self.GammaSlider = QtWidgets.QSlider(self.OptionsAdvancedGamma) - self.GammaSlider.setGeometry(QtCore.QRect(110, 10, 290, 22)) - font = QtGui.QFont() - font.setFamily("Lucida Grande") - self.GammaSlider.setFont(font) + self.horizontalLayout.addWidget(self.GammaLabel) + self.GammaSlider = QtWidgets.QSlider(self.OptionsGamma) self.GammaSlider.setFocusPolicy(QtCore.Qt.ClickFocus) self.GammaSlider.setMaximum(500) self.GammaSlider.setSingleStep(5) self.GammaSlider.setOrientation(QtCore.Qt.Horizontal) self.GammaSlider.setObjectName("GammaSlider") + self.horizontalLayout.addWidget(self.GammaSlider) self.ProgressBar = QtWidgets.QProgressBar(self.Form) - self.ProgressBar.setGeometry(QtCore.QRect(10, 10, 401, 29)) + self.ProgressBar.setGeometry(QtCore.QRect(10, 10, 401, 31)) font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(10) + font.setPointSize(11) font.setBold(True) font.setWeight(75) self.ProgressBar.setFont(font) @@ -252,95 +174,81 @@ class Ui_KCC(object): self.ProgressBar.setAlignment(QtCore.Qt.AlignJustify|QtCore.Qt.AlignVCenter) self.ProgressBar.setFormat("") self.ProgressBar.setObjectName("ProgressBar") - self.OptionsExpert = QtWidgets.QFrame(self.Form) - self.OptionsExpert.setGeometry(QtCore.QRect(5, 335, 421, 41)) - font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(9) - self.OptionsExpert.setFont(font) - self.OptionsExpert.setObjectName("OptionsExpert") - self.ColorBox = QtWidgets.QCheckBox(self.OptionsExpert) - self.ColorBox.setGeometry(QtCore.QRect(9, 11, 130, 18)) + self.OptionsCustom = QtWidgets.QFrame(self.Form) + self.OptionsCustom.setGeometry(QtCore.QRect(10, 337, 401, 25)) font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(12) - self.ColorBox.setFont(font) - self.ColorBox.setFocusPolicy(QtCore.Qt.NoFocus) - self.ColorBox.setObjectName("ColorBox") - self.OptionsExpertInternal = QtWidgets.QFrame(self.OptionsExpert) - self.OptionsExpertInternal.setGeometry(QtCore.QRect(95, 0, 315, 40)) - font = QtGui.QFont() - font.setFamily("Lucida Grande") - self.OptionsExpertInternal.setFont(font) - self.OptionsExpertInternal.setObjectName("OptionsExpertInternal") - self.gridLayout_2 = QtWidgets.QGridLayout(self.OptionsExpertInternal) - self.gridLayout_2.setObjectName("gridLayout_2") - self.wLabel = QtWidgets.QLabel(self.OptionsExpertInternal) - font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(12) - font.setBold(False) - font.setWeight(50) - self.wLabel.setFont(font) + font.setPointSize(11) + self.OptionsCustom.setFont(font) + self.OptionsCustom.setObjectName("OptionsCustom") + self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.OptionsCustom) + self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0) + self.horizontalLayout_2.setSpacing(5) + self.horizontalLayout_2.setObjectName("horizontalLayout_2") + self.wLabel = QtWidgets.QLabel(self.OptionsCustom) self.wLabel.setObjectName("wLabel") - self.gridLayout_2.addWidget(self.wLabel, 0, 0, 1, 1) - self.customWidth = QtWidgets.QLineEdit(self.OptionsExpertInternal) + self.horizontalLayout_2.addWidget(self.wLabel) + self.customWidth = QtWidgets.QLineEdit(self.OptionsCustom) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.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.setFamily("Lucida Grande") - font.setPointSize(12) - self.customWidth.setFont(font) self.customWidth.setFocusPolicy(QtCore.Qt.ClickFocus) self.customWidth.setAcceptDrops(False) self.customWidth.setMaxLength(4) self.customWidth.setObjectName("customWidth") - self.gridLayout_2.addWidget(self.customWidth, 0, 1, 1, 1) - self.hLabel = QtWidgets.QLabel(self.OptionsExpertInternal) - font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(12) - font.setBold(False) - font.setWeight(50) - self.hLabel.setFont(font) + self.horizontalLayout_2.addWidget(self.customWidth) + self.hLabel = QtWidgets.QLabel(self.OptionsCustom) self.hLabel.setObjectName("hLabel") - self.gridLayout_2.addWidget(self.hLabel, 0, 2, 1, 1) - self.customHeight = QtWidgets.QLineEdit(self.OptionsExpertInternal) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed) + self.horizontalLayout_2.addWidget(self.hLabel) + self.customHeight = QtWidgets.QLineEdit(self.OptionsCustom) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.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.setFamily("Lucida Grande") - font.setPointSize(12) - self.customHeight.setFont(font) self.customHeight.setFocusPolicy(QtCore.Qt.ClickFocus) self.customHeight.setAcceptDrops(False) self.customHeight.setMaxLength(4) self.customHeight.setObjectName("customHeight") - self.gridLayout_2.addWidget(self.customHeight, 0, 3, 1, 1) + self.horizontalLayout_2.addWidget(self.customHeight) self.EditorButton = QtWidgets.QPushButton(self.Form) - self.EditorButton.setGeometry(QtCore.QRect(160, 10, 101, 41)) + self.EditorButton.setGeometry(QtCore.QRect(4, 10, 210, 41)) font = QtGui.QFont() - font.setFamily("Lucida Grande") - font.setPointSize(12) + font.setPointSize(11) self.EditorButton.setFont(font) self.EditorButton.setFocusPolicy(QtCore.Qt.NoFocus) icon5 = QtGui.QIcon() icon5.addPixmap(QtGui.QPixmap(":/Other/icons/editor.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.EditorButton.setIcon(icon5) self.EditorButton.setObjectName("EditorButton") + self.WikiButton = QtWidgets.QPushButton(self.Form) + self.WikiButton.setGeometry(QtCore.QRect(207, 10, 210, 41)) + font = QtGui.QFont() + font.setPointSize(11) + self.WikiButton.setFont(font) + self.WikiButton.setFocusPolicy(QtCore.Qt.NoFocus) + icon6 = QtGui.QIcon() + icon6.addPixmap(QtGui.QPixmap(":/Other/icons/wiki.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.WikiButton.setIcon(icon6) + self.WikiButton.setObjectName("WikiButton") + self.DeviceBox.raise_() + self.FormatBox.raise_() + self.ConvertButton.raise_() + self.DirectoryButton.raise_() + self.FileButton.raise_() + self.ClearButton.raise_() + self.Options.raise_() + self.JobList.raise_() + self.OptionsGamma.raise_() + self.OptionsCustom.raise_() + self.EditorButton.raise_() + self.WikiButton.raise_() + self.ProgressBar.raise_() KCC.setCentralWidget(self.Form) self.statusBar = QtWidgets.QStatusBar(KCC) font = QtGui.QFont() - font.setFamily("Aharoni") - font.setPointSize(8) + font.setPointSize(11) self.statusBar.setFont(font) self.statusBar.setSizeGripEnabled(False) self.statusBar.setObjectName("statusBar") @@ -349,7 +257,7 @@ class Ui_KCC(object): self.ActionBasic.setCheckable(True) self.ActionBasic.setChecked(False) font = QtGui.QFont() - font.setPointSize(9) + font.setPointSize(11) self.ActionBasic.setFont(font) self.ActionBasic.setObjectName("ActionBasic") self.ActionAdvanced = QtWidgets.QAction(KCC) @@ -365,18 +273,6 @@ class Ui_KCC(object): def retranslateUi(self, KCC): _translate = QtCore.QCoreApplication.translate KCC.setWindowTitle(_translate("KCC", "Kindle Comic Converter")) - self.ProcessingBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable image optimizations.<br/><span style=\" font-weight:600;\">Input images must be already resized.</span></p></body></html>")) - self.ProcessingBox.setText(_translate("KCC", "No optimisation")) - self.UpscaleBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Nothing<br/></span>Images smaller than device resolution will not be resized.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Stretching<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be not preserved.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Upscaling<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be preserved.</p></body></html>")) - self.UpscaleBox.setText(_translate("KCC", "Stretch/Upscale")) - self.WebtoonBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable special parsing mode for WebToons.</p></body></html>")) - self.WebtoonBox.setText(_translate("KCC", "Webtoon mode")) - self.NoDitheringBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Create PNG files instead JPEG.<br/>Quality increase is not noticeable on most of devices.<br/>Output files <span style=\" font-weight:600;\">might</span> be smaller.<br/><span style=\" font-weight:600;\">MOBI conversion will be much slower.</span></p></body></html>")) - self.NoDitheringBox.setText(_translate("KCC", "PNG output")) - self.BorderBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Autodetection<br/></span>Color of margins fill will be detected automatically.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - White<br/></span>Margins will be filled with white color.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Black<br/></span>Margins will be filled with black color.</p></body></html>")) - self.BorderBox.setText(_translate("KCC", "W/B margins")) - self.NoRotateBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable page splitting and rotation.</p></body></html>")) - self.NoRotateBox.setText(_translate("KCC", "No split/rotate")) self.DeviceBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Target device.</p></body></html>")) self.FormatBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Output format.</p></body></html>")) self.ConvertButton.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Shift+Click to select the output directory.</p></body></html>")) @@ -388,15 +284,23 @@ class Ui_KCC(object): self.ClearButton.setText(_translate("KCC", "Clear list")) self.MangaBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable right-to-left reading.</p></body></html>")) self.MangaBox.setText(_translate("KCC", "Manga mode")) - self.QualityBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Quality of Panel View/zoom. Highly impact size of output file.<br/><span style=\" font-weight:600;\">This option control only quality of magnification!</span></p></body></html>")) - self.QualityBox.setText(_translate("KCC", "High/Ultra quality")) - self.RotateBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable splitting of two-page spreads.<br/>They will be rotated instead.</p></body></html>")) - self.RotateBox.setText(_translate("KCC", "Horizontal mode")) - self.BasicModeButton.setText(_translate("KCC", "Basic")) - self.AdvModeButton.setText(_translate("KCC", "Advanced")) - self.GammaLabel.setText(_translate("KCC", "Gamma: Auto")) - self.ColorBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Don\'t convert images to grayscale.</p></body></html>")) + self.RotateBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Split<br/></span>Double page spreads will be cut into two separate pages.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Rotate and split<br/></span>Double page spreads will be displayed twice. First rotated and then split. </p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Rotate<br/></span>Double page spreads will be rotated.</p></body></html>")) + self.RotateBox.setText(_translate("KCC", "Spread splitter")) + self.QualityBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>High quality Panel View.<br/>Require source files with bigger resolution than target device.<br/><span style=\" font-weight:600;\">Highly impact size of output file!</span></p></body></html>")) + self.QualityBox.setText(_translate("KCC", "HQ zoom")) + self.GammaBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable automatic gamma correction.</p></body></html>")) + self.GammaBox.setText(_translate("KCC", "Custom gamma")) + self.NoDitheringBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Create PNG files instead JPEG.<br/>Quality increase is not noticeable on most of devices.<br/>Output files <span style=\" font-weight:600;\">might</span> be smaller.<br/><span style=\" font-weight:600;\">MOBI conversion will be much slower.</span></p></body></html>")) + self.NoDitheringBox.setText(_translate("KCC", "PNG output")) + self.ColorBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable conversion to grayscale.</p></body></html>")) self.ColorBox.setText(_translate("KCC", "Color mode")) + self.UpscaleBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Nothing<br/></span>Images smaller than device resolution will not be resized.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Stretching<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be not preserved.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Upscaling<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be preserved.</p></body></html>")) + self.UpscaleBox.setText(_translate("KCC", "Stretch/Upscale")) + self.WebtoonBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable special parsing mode for Korean Webtoons.</p></body></html>")) + self.WebtoonBox.setText(_translate("KCC", "Webtoon mode")) + self.BorderBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Autodetection<br/></span>Color of margins fill will be detected automatically.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - White<br/></span>Margins will be filled with white color.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Black<br/></span>Margins will be filled with black color.</p></body></html>")) + self.BorderBox.setText(_translate("KCC", "W/B margins")) + self.GammaLabel.setText(_translate("KCC", "Gamma: Auto")) self.wLabel.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Resolution of target device.</p></body></html>")) self.wLabel.setText(_translate("KCC", "Custom width: ")) self.customWidth.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Resolution of target device.</p></body></html>")) @@ -406,6 +310,7 @@ class Ui_KCC(object): self.customHeight.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Resolution of target device.</p></body></html>")) self.customHeight.setInputMask(_translate("KCC", "0000")) self.EditorButton.setText(_translate("KCC", "Editor")) + self.WikiButton.setText(_translate("KCC", "Wiki")) self.ActionBasic.setText(_translate("KCC", "Basic")) self.ActionAdvanced.setText(_translate("KCC", "Advanced")) |