Miscellaneous tweaks

7 files changed, 89 insertions, 78 deletions

diff --git a/gui/KCC.ui b/gui/KCC.ui
index 7359c79..062e5a5 100644
--- a/gui/KCC.ui
+++ b/gui/KCC.ui
@@ -355,7 +355,7 @@
       <property name="visible">
        <bool>false</bool>
       </property>
-      <layout class="QFormLayout" name="formLayout">
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
        <property name="leftMargin">
         <number>0</number>
        </property>
@@ -368,14 +368,14 @@
        <property name="bottomMargin">
         <number>0</number>
        </property>
-       <item row="0" column="0">
+       <item>
         <widget class="QLabel" name="gammaLabel">
          <property name="text">
           <string>Gamma: Auto</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="1">
+       <item>
         <widget class="QSlider" name="gammaSlider">
          <property name="maximum">
           <number>250</number>
diff --git a/gui/MetaEditor.ui b/gui/MetaEditor.ui
index 016b668..8f1a991 100644
--- a/gui/MetaEditor.ui
+++ b/gui/MetaEditor.ui
@@ -16,12 +16,6 @@
     <height>260</height>
    </size>
   </property>
-  <property name="maximumSize">
-   <size>
-    <width>400</width>
-    <height>260</height>
-   </size>
-  </property>
   <property name="windowTitle">
    <string>Metadata editor</string>
   </property>
@@ -35,7 +29,7 @@
    </property>
    <item>
     <widget class="QWidget" name="editorWidget" native="true">
-     <layout class="QFormLayout" name="formLayout">
+     <layout class="QGridLayout" name="gridLayout">
       <property name="leftMargin">
        <number>0</number>
       </property>
@@ -58,27 +52,6 @@
       <item row="0" column="1">
        <widget class="QLineEdit" name="seriesLine"/>
       </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="volumeLine"/>
-      </item>
-      <item row="2" column="1">
-       <widget class="QLineEdit" name="numberLine"/>
-      </item>
-      <item row="3" column="1">
-       <widget class="QLineEdit" name="writerLine"/>
-      </item>
-      <item row="4" column="1">
-       <widget class="QLineEdit" name="pencillerLine"/>
-      </item>
-      <item row="5" column="1">
-       <widget class="QLineEdit" name="inkerLine"/>
-      </item>
-      <item row="6" column="1">
-       <widget class="QLineEdit" name="coloristLine"/>
-      </item>
-      <item row="7" column="1">
-       <widget class="QLineEdit" name="muidLine"/>
-      </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
@@ -86,6 +59,9 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="volumeLine"/>
+      </item>
       <item row="2" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
@@ -93,6 +69,9 @@
         </property>
        </widget>
       </item>
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="numberLine"/>
+      </item>
       <item row="3" column="0">
        <widget class="QLabel" name="label_4">
         <property name="text">
@@ -100,6 +79,9 @@
         </property>
        </widget>
       </item>
+      <item row="3" column="1">
+       <widget class="QLineEdit" name="writerLine"/>
+      </item>
       <item row="4" column="0">
        <widget class="QLabel" name="label_5">
         <property name="text">
@@ -107,6 +89,9 @@
         </property>
        </widget>
       </item>
+      <item row="4" column="1">
+       <widget class="QLineEdit" name="pencillerLine"/>
+      </item>
       <item row="5" column="0">
        <widget class="QLabel" name="label_6">
         <property name="text">
@@ -114,6 +99,9 @@
         </property>
        </widget>
       </item>
+      <item row="5" column="1">
+       <widget class="QLineEdit" name="inkerLine"/>
+      </item>
       <item row="6" column="0">
        <widget class="QLabel" name="label_7">
         <property name="text">
@@ -121,6 +109,9 @@
         </property>
        </widget>
       </item>
+      <item row="6" column="1">
+       <widget class="QLineEdit" name="coloristLine"/>
+      </item>
       <item row="7" column="0">
        <widget class="QLabel" name="label_8">
         <property name="text">
@@ -131,6 +122,9 @@
         </property>
        </widget>
       </item>
+      <item row="7" column="1">
+       <widget class="QLineEdit" name="muidLine"/>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/kcc/KCC_gui.py b/kcc/KCC_gui.py
index f7ab992..06bddf0 100644
--- a/kcc/KCC_gui.py
+++ b/kcc/KCC_gui.py
@@ -873,12 +873,24 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
         self.currentMode = 1
         self.targetDirectory = ''
         self.sentry = Client(release=__version__)
-        # Decrease priority to increase system responsiveness during conversion
         if sys.platform.startswith('win'):
             from psutil import BELOW_NORMAL_PRIORITY_CLASS
             self.p = Process(os.getpid())
             self.p.nice(BELOW_NORMAL_PRIORITY_CLASS)
             self.p.ionice(1)
+        elif sys.platform.startswith('linux'):
+            APP.setStyle('fusion')
+            if self.windowSize == '0x0':
+                MW.resize(500, 500)
+        elif sys.platform.startswith('darwin'):
+            GUI.deviceBox.setMinimumSize(QtCore.QSize(0, 0))
+            GUI.formatBox.setMinimumSize(QtCore.QSize(0, 0))
+            GUI.directoryButton.setMinimumSize(QtCore.QSize(190, 0))
+            GUI.fileButton.setMinimumSize(QtCore.QSize(190, 0))
+            GUI.gridLayout.setContentsMargins(-1, -1, -1, -1)
+            GUI.toolWidget.setMinimumSize(QtCore.QSize(0, 0))
+            if self.windowSize == '0x0':
+                MW.resize(500, 500)
 
         self.profiles = {
             "Kindle Oasis": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
@@ -921,12 +933,12 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             "Kindle PW 1/2",
             "Kindle",
             "Separator",
-            "Kobo Mini/Touch",
-            "Kobo Glo",
-            "Kobo Glo HD",
-            "Kobo Aura",
-            "Kobo Aura HD",
             "Kobo Aura H2O",
+            "Kobo Aura HD",
+            "Kobo Aura",
+            "Kobo Glo HD",
+            "Kobo Glo",
+            "Kobo Mini/Touch",
             "Separator",
             "Other",
             "Separator",
@@ -1101,3 +1113,9 @@ class KCCGUI_MetaEditor(KCC_ui_editor.Ui_editorDialog):
         self.ui.setWindowFlags(self.ui.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
         self.okButton.clicked.connect(self.saveData)
         self.cancelButton.clicked.connect(self.ui.close)
+        if sys.platform.startswith('linux'):
+            self.ui.resize(450, 260)
+            self.ui.setMinimumSize(QtCore.QSize(450, 260))
+        elif sys.platform.startswith('darwin'):
+            self.ui.resize(450, 310)
+            self.ui.setMinimumSize(QtCore.QSize(450, 310))
diff --git a/kcc/KCC_ui.py b/kcc/KCC_ui.py
index 4f5db8f..dacb740 100644
--- a/kcc/KCC_ui.py
+++ b/kcc/KCC_ui.py
@@ -144,18 +144,18 @@ class Ui_mainWindow(object):
         self.gammaWidget = QtWidgets.QWidget(self.centralWidget)
         self.gammaWidget.setVisible(False)
         self.gammaWidget.setObjectName("gammaWidget")
-        self.formLayout = QtWidgets.QFormLayout(self.gammaWidget)
-        self.formLayout.setContentsMargins(0, 0, 0, 0)
-        self.formLayout.setObjectName("formLayout")
+        self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.gammaWidget)
+        self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0)
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
         self.gammaLabel = QtWidgets.QLabel(self.gammaWidget)
         self.gammaLabel.setObjectName("gammaLabel")
-        self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.gammaLabel)
+        self.horizontalLayout_2.addWidget(self.gammaLabel)
         self.gammaSlider = QtWidgets.QSlider(self.gammaWidget)
         self.gammaSlider.setMaximum(250)
         self.gammaSlider.setSingleStep(5)
         self.gammaSlider.setOrientation(QtCore.Qt.Horizontal)
         self.gammaSlider.setObjectName("gammaSlider")
-        self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.gammaSlider)
+        self.horizontalLayout_2.addWidget(self.gammaSlider)
         self.gridLayout.addWidget(self.gammaWidget, 6, 0, 1, 3)
         self.toolWidget = QtWidgets.QWidget(self.centralWidget)
         self.toolWidget.setObjectName("toolWidget")
diff --git a/kcc/KCC_ui_editor.py b/kcc/KCC_ui_editor.py
index 3144911..56dc07d 100644
--- a/kcc/KCC_ui_editor.py
+++ b/kcc/KCC_ui_editor.py
@@ -13,7 +13,6 @@ class Ui_editorDialog(object):
         editorDialog.setObjectName("editorDialog")
         editorDialog.resize(400, 260)
         editorDialog.setMinimumSize(QtCore.QSize(400, 260))
-        editorDialog.setMaximumSize(QtCore.QSize(400, 260))
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         editorDialog.setWindowIcon(icon)
@@ -22,58 +21,58 @@ class Ui_editorDialog(object):
         self.verticalLayout.setObjectName("verticalLayout")
         self.editorWidget = QtWidgets.QWidget(editorDialog)
         self.editorWidget.setObjectName("editorWidget")
-        self.formLayout = QtWidgets.QFormLayout(self.editorWidget)
-        self.formLayout.setContentsMargins(0, 0, 0, 0)
-        self.formLayout.setObjectName("formLayout")
+        self.gridLayout = QtWidgets.QGridLayout(self.editorWidget)
+        self.gridLayout.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout.setObjectName("gridLayout")
         self.label_1 = QtWidgets.QLabel(self.editorWidget)
         self.label_1.setObjectName("label_1")
-        self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_1)
+        self.gridLayout.addWidget(self.label_1, 0, 0, 1, 1)
         self.seriesLine = QtWidgets.QLineEdit(self.editorWidget)
         self.seriesLine.setObjectName("seriesLine")
-        self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.seriesLine)
-        self.volumeLine = QtWidgets.QLineEdit(self.editorWidget)
-        self.volumeLine.setObjectName("volumeLine")
-        self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.volumeLine)
-        self.numberLine = QtWidgets.QLineEdit(self.editorWidget)
-        self.numberLine.setObjectName("numberLine")
-        self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.numberLine)
-        self.writerLine = QtWidgets.QLineEdit(self.editorWidget)
-        self.writerLine.setObjectName("writerLine")
-        self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.writerLine)
-        self.pencillerLine = QtWidgets.QLineEdit(self.editorWidget)
-        self.pencillerLine.setObjectName("pencillerLine")
-        self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.pencillerLine)
-        self.inkerLine = QtWidgets.QLineEdit(self.editorWidget)
-        self.inkerLine.setObjectName("inkerLine")
-        self.formLayout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.inkerLine)
-        self.coloristLine = QtWidgets.QLineEdit(self.editorWidget)
-        self.coloristLine.setObjectName("coloristLine")
-        self.formLayout.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.coloristLine)
-        self.muidLine = QtWidgets.QLineEdit(self.editorWidget)
-        self.muidLine.setObjectName("muidLine")
-        self.formLayout.setWidget(7, QtWidgets.QFormLayout.FieldRole, self.muidLine)
+        self.gridLayout.addWidget(self.seriesLine, 0, 1, 1, 1)
         self.label_2 = QtWidgets.QLabel(self.editorWidget)
         self.label_2.setObjectName("label_2")
-        self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_2)
+        self.gridLayout.addWidget(self.label_2, 1, 0, 1, 1)
+        self.volumeLine = QtWidgets.QLineEdit(self.editorWidget)
+        self.volumeLine.setObjectName("volumeLine")
+        self.gridLayout.addWidget(self.volumeLine, 1, 1, 1, 1)
         self.label_3 = QtWidgets.QLabel(self.editorWidget)
         self.label_3.setObjectName("label_3")
-        self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_3)
+        self.gridLayout.addWidget(self.label_3, 2, 0, 1, 1)
+        self.numberLine = QtWidgets.QLineEdit(self.editorWidget)
+        self.numberLine.setObjectName("numberLine")
+        self.gridLayout.addWidget(self.numberLine, 2, 1, 1, 1)
         self.label_4 = QtWidgets.QLabel(self.editorWidget)
         self.label_4.setObjectName("label_4")
-        self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_4)
+        self.gridLayout.addWidget(self.label_4, 3, 0, 1, 1)
+        self.writerLine = QtWidgets.QLineEdit(self.editorWidget)
+        self.writerLine.setObjectName("writerLine")
+        self.gridLayout.addWidget(self.writerLine, 3, 1, 1, 1)
         self.label_5 = QtWidgets.QLabel(self.editorWidget)
         self.label_5.setObjectName("label_5")
-        self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_5)
+        self.gridLayout.addWidget(self.label_5, 4, 0, 1, 1)
+        self.pencillerLine = QtWidgets.QLineEdit(self.editorWidget)
+        self.pencillerLine.setObjectName("pencillerLine")
+        self.gridLayout.addWidget(self.pencillerLine, 4, 1, 1, 1)
         self.label_6 = QtWidgets.QLabel(self.editorWidget)
         self.label_6.setObjectName("label_6")
-        self.formLayout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.label_6)
+        self.gridLayout.addWidget(self.label_6, 5, 0, 1, 1)
+        self.inkerLine = QtWidgets.QLineEdit(self.editorWidget)
+        self.inkerLine.setObjectName("inkerLine")
+        self.gridLayout.addWidget(self.inkerLine, 5, 1, 1, 1)
         self.label_7 = QtWidgets.QLabel(self.editorWidget)
         self.label_7.setObjectName("label_7")
-        self.formLayout.setWidget(6, QtWidgets.QFormLayout.LabelRole, self.label_7)
+        self.gridLayout.addWidget(self.label_7, 6, 0, 1, 1)
+        self.coloristLine = QtWidgets.QLineEdit(self.editorWidget)
+        self.coloristLine.setObjectName("coloristLine")
+        self.gridLayout.addWidget(self.coloristLine, 6, 1, 1, 1)
         self.label_8 = QtWidgets.QLabel(self.editorWidget)
         self.label_8.setOpenExternalLinks(True)
         self.label_8.setObjectName("label_8")
-        self.formLayout.setWidget(7, QtWidgets.QFormLayout.LabelRole, self.label_8)
+        self.gridLayout.addWidget(self.label_8, 7, 0, 1, 1)
+        self.muidLine = QtWidgets.QLineEdit(self.editorWidget)
+        self.muidLine.setObjectName("muidLine")
+        self.gridLayout.addWidget(self.muidLine, 7, 1, 1, 1)
         self.verticalLayout.addWidget(self.editorWidget)
         self.optionWidget = QtWidgets.QWidget(editorDialog)
         self.optionWidget.setObjectName("optionWidget")
diff --git a/kcc/comic2ebook.py b/kcc/comic2ebook.py
index 38cb968..a881e96 100755
--- a/kcc/comic2ebook.py
+++ b/kcc/comic2ebook.py
@@ -1232,7 +1232,7 @@ def makeMOBIWorker(item):
     try:
         if os.path.getsize(item) < 629145600:
             output = Popen('kindlegen -dont_append_source -locale en "' + item + '"',
-                           stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=False)
+                           stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
             for line in output.stdout:
                 line = line.decode('utf-8')
                 # ERROR: Generic error
diff --git a/setup.py b/setup.py
index accb440..a1f1b73 100755
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,7 @@ class BuildBinaryCommand(distutils.cmd.Command):
         elif sys.platform == 'win32':
             os.system('pyinstaller -y -F -i icons\comic2ebook.ico -n KCC -w --noupx kcc.py')
             if os.path.isfile('setup.bat'):
-                os.system('setup.bat ' + VERSION)
+                os.system('setup.bat')
             exit(0)
         else:
             if self.pyz: