about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaweł Jastrzębski <pawelj@iosphe.re>2015-08-28 19:33:40 +0200
committerPaweł Jastrzębski <pawelj@iosphe.re>2015-08-28 19:33:40 +0200
commitc991feb9ce36fa5ef710d5b0a857b7e8a205998e (patch)
treebfd99f1ab05ca1145bed2dca56db80023e32c743
parentSet proper User-Agent (diff)
downloadkcc-c991feb9ce36fa5ef710d5b0a857b7e8a205998e.tar.gz
kcc-c991feb9ce36fa5ef710d5b0a857b7e8a205998e.tar.bz2
kcc-c991feb9ce36fa5ef710d5b0a857b7e8a205998e.zip
GUI tweaks
-rw-r--r--gui/KCC-OSX.ui6
-rw-r--r--gui/KCC.ui6
-rw-r--r--gui/MetaEditor-OSX.ui3
-rw-r--r--kcc/KCC_MetaEditor_ui_osx.py1
-rw-r--r--kcc/KCC_gui.py6
-rw-r--r--kcc/KCC_ui.py2
-rw-r--r--kcc/KCC_ui_osx.py2
7 files changed, 26 insertions, 0 deletions
diff --git a/gui/KCC-OSX.ui b/gui/KCC-OSX.ui
index 19768ee..7000969 100644
--- a/gui/KCC-OSX.ui
+++ b/gui/KCC-OSX.ui
@@ -462,6 +462,12 @@
     <property name="selectionMode">
      <enum>QAbstractItemView::NoSelection</enum>
     </property>
+    <property name="verticalScrollMode">
+     <enum>QAbstractItemView::ScrollPerPixel</enum>
+    </property>
+    <property name="horizontalScrollMode">
+     <enum>QAbstractItemView::ScrollPerPixel</enum>
+    </property>
    </widget>
    <widget class="QPushButton" name="BasicModeButton">
     <property name="geometry">
diff --git a/gui/KCC.ui b/gui/KCC.ui
index 4cd08dc..67153f9 100644
--- a/gui/KCC.ui
+++ b/gui/KCC.ui
@@ -397,6 +397,12 @@
     <property name="selectionMode">
      <enum>QAbstractItemView::NoSelection</enum>
     </property>
+    <property name="verticalScrollMode">
+     <enum>QAbstractItemView::ScrollPerPixel</enum>
+    </property>
+    <property name="horizontalScrollMode">
+     <enum>QAbstractItemView::ScrollPerPixel</enum>
+    </property>
    </widget>
    <widget class="QPushButton" name="BasicModeButton">
     <property name="geometry">
diff --git a/gui/MetaEditor-OSX.ui b/gui/MetaEditor-OSX.ui
index 681e1c0..a81cacb 100644
--- a/gui/MetaEditor-OSX.ui
+++ b/gui/MetaEditor-OSX.ui
@@ -126,6 +126,9 @@
      </rect>
     </property>
     <layout class="QFormLayout" name="formLayout">
+     <property name="fieldGrowthPolicy">
+      <enum>QFormLayout::ExpandingFieldsGrow</enum>
+     </property>
      <item row="1" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
diff --git a/kcc/KCC_MetaEditor_ui_osx.py b/kcc/KCC_MetaEditor_ui_osx.py
index 3bcf74d..8561c55 100644
--- a/kcc/KCC_MetaEditor_ui_osx.py
+++ b/kcc/KCC_MetaEditor_ui_osx.py
@@ -76,6 +76,7 @@ class Ui_MetaEditorDialog(object):
         self.formLayoutWidget.setObjectName("formLayoutWidget")
         self.formLayout = QtWidgets.QFormLayout(self.formLayoutWidget)
         self.formLayout.setContentsMargins(0, 0, 0, 0)
+        self.formLayout.setFieldGrowthPolicy(QtWidgets.QFormLayout.ExpandingFieldsGrow)
         self.formLayout.setObjectName("formLayout")
         self.label = QtWidgets.QLabel(self.formLayoutWidget)
         self.label.setObjectName("label")
diff --git a/kcc/KCC_gui.py b/kcc/KCC_gui.py
index 8d403f0..a8a7fb3 100644
--- a/kcc/KCC_gui.py
+++ b/kcc/KCC_gui.py
@@ -1333,6 +1333,12 @@ class KCCGUI(KCC_ui.Ui_KCC):
         self.versionCheck.start()
         self.contentServer.start()
         self.tray.show()
+
+        # Linux hack as PyQt 5.5 not hit mainstream distributions yet
+        if sys.platform.startswith('linux') and StrictVersion(QtCore.qVersion()) > StrictVersion('5.4.9'):
+            self.JobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
+            self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
+
         MW.setWindowTitle("Kindle Comic Converter " + __version__)
         MW.show()
         MW.raise_()
diff --git a/kcc/KCC_ui.py b/kcc/KCC_ui.py
index 35d5ca8..a80e9bf 100644
--- a/kcc/KCC_ui.py
+++ b/kcc/KCC_ui.py
@@ -141,6 +141,8 @@ class Ui_KCC(object):
         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.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(10, 10, 141, 32))
diff --git a/kcc/KCC_ui_osx.py b/kcc/KCC_ui_osx.py
index 6184b04..55f1a19 100644
--- a/kcc/KCC_ui_osx.py
+++ b/kcc/KCC_ui_osx.py
@@ -188,6 +188,8 @@ class Ui_KCC(object):
         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.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))