Multiple UI improvements

resources/raw/settings.ui

@@ -63,35 +63,15 @@
              </widget>
             </item>
             <item>
-             <widget class="QCheckBox" name="autoTags">
+             <widget class="QCheckBox" name="performCulling">
+              <property name="toolTip">
+               <string>Enabling reduces startup time and memory usage</string>
+              </property>
               <property name="text">
-               <string>Generate tags from files</string>
+               <string>Load covers only when needed</string>
               </property>
              </widget>
             </item>
-            <item>
-             <layout class="QHBoxLayout" name="horizontalLayout_3">
-              <item>
-               <widget class="QLabel" name="languageLabel">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string>Dictionary:</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QComboBox" name="languageBox"/>
-              </item>
-             </layout>
-            </item>
            </layout>
           </item>
          </layout>
@@ -106,12 +86,9 @@
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="performCulling">
-            <property name="toolTip">
-             <string>Enabling reduces startup time and memory usage</string>
-            </property>
+           <widget class="QCheckBox" name="autoTags">
             <property name="text">
-             <string>Load covers only when needed</string>
+             <string>Generate tags from files</string>
             </property>
            </widget>
           </item>
@@ -125,12 +102,50 @@
             </property>
            </widget>
           </item>
+         </layout>
+        </item>
+        <item row="2" column="0">
+         <layout class="QHBoxLayout" name="horizontalLayout_6">
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_3">
+            <item>
+             <widget class="QLabel" name="languageLabel">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Dictionary:</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="languageBox"/>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="hideScrollBars">
+            <property name="toolTip">
+             <string>Horizontal scrolling with Alt + Scroll
+Reopen book to see changes</string>
+            </property>
+            <property name="text">
+             <string>Hide scrollbars when reading</string>
+            </property>
+           </widget>
+          </item>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_5">
             <item>
              <widget class="QLabel" name="label">
               <property name="toolTip">
-               <string>Restart to see changes</string>
+               <string>Restart application to see changes</string>
               </property>
               <property name="text">
                <string>Icon theme: </string>
@@ -140,7 +155,7 @@
             <item>
              <widget class="QRadioButton" name="darkIconsRadio">
               <property name="toolTip">
-               <string>Restart to see changes</string>
+               <string>Restart application to see changes</string>
               </property>
               <property name="text">
                <string>Dar&amp;k</string>
@@ -150,7 +165,7 @@
             <item>
              <widget class="QRadioButton" name="lightIconsRadio">
               <property name="toolTip">
-               <string>Restart to see changes</string>
+               <string>Restart application to see changes</string>
               </property>
               <property name="text">
                <string>&amp;Light</string>

resources/settingswindow.py

@@ -43,9 +43,25 @@ class Ui_Dialog(object):
         self.fileRemember = QtWidgets.QCheckBox(self.groupBox)
         self.fileRemember.setObjectName("fileRemember")
         self.horizontalLayout_4.addWidget(self.fileRemember)
+        self.performCulling = QtWidgets.QCheckBox(self.groupBox)
+        self.performCulling.setObjectName("performCulling")
+        self.horizontalLayout_4.addWidget(self.performCulling)
+        self.verticalLayout.addLayout(self.horizontalLayout_4)
+        self.gridLayout.addLayout(self.verticalLayout, 0, 0, 1, 1)
+        self.horizontalLayout = QtWidgets.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.coverShadows = QtWidgets.QCheckBox(self.groupBox)
+        self.coverShadows.setObjectName("coverShadows")
+        self.horizontalLayout.addWidget(self.coverShadows)
         self.autoTags = QtWidgets.QCheckBox(self.groupBox)
         self.autoTags.setObjectName("autoTags")
-        self.horizontalLayout_4.addWidget(self.autoTags)
+        self.horizontalLayout.addWidget(self.autoTags)
+        self.cachingEnabled = QtWidgets.QCheckBox(self.groupBox)
+        self.cachingEnabled.setObjectName("cachingEnabled")
+        self.horizontalLayout.addWidget(self.cachingEnabled)
+        self.gridLayout.addLayout(self.horizontalLayout, 1, 0, 1, 1)
+        self.horizontalLayout_6 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_6.setObjectName("horizontalLayout_6")
         self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_3.setObjectName("horizontalLayout_3")
         self.languageLabel = QtWidgets.QLabel(self.groupBox)
@@ -60,20 +76,10 @@ class Ui_Dialog(object):
         self.languageBox = QtWidgets.QComboBox(self.groupBox)
         self.languageBox.setObjectName("languageBox")
         self.horizontalLayout_3.addWidget(self.languageBox)
-        self.horizontalLayout_4.addLayout(self.horizontalLayout_3)
-        self.verticalLayout.addLayout(self.horizontalLayout_4)
-        self.gridLayout.addLayout(self.verticalLayout, 0, 0, 1, 1)
-        self.horizontalLayout = QtWidgets.QHBoxLayout()
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.coverShadows = QtWidgets.QCheckBox(self.groupBox)
-        self.coverShadows.setObjectName("coverShadows")
-        self.horizontalLayout.addWidget(self.coverShadows)
-        self.performCulling = QtWidgets.QCheckBox(self.groupBox)
-        self.performCulling.setObjectName("performCulling")
-        self.horizontalLayout.addWidget(self.performCulling)
-        self.cachingEnabled = QtWidgets.QCheckBox(self.groupBox)
-        self.cachingEnabled.setObjectName("cachingEnabled")
-        self.horizontalLayout.addWidget(self.cachingEnabled)
+        self.horizontalLayout_6.addLayout(self.horizontalLayout_3)
+        self.hideScrollBars = QtWidgets.QCheckBox(self.groupBox)
+        self.hideScrollBars.setObjectName("hideScrollBars")
+        self.horizontalLayout_6.addWidget(self.hideScrollBars)
         self.horizontalLayout_5 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_5.setObjectName("horizontalLayout_5")
         self.label = QtWidgets.QLabel(self.groupBox)
@@ -85,8 +91,8 @@ class Ui_Dialog(object):
         self.lightIconsRadio = QtWidgets.QRadioButton(self.groupBox)
         self.lightIconsRadio.setObjectName("lightIconsRadio")
         self.horizontalLayout_5.addWidget(self.lightIconsRadio)
-        self.horizontalLayout.addLayout(self.horizontalLayout_5)
-        self.gridLayout.addLayout(self.horizontalLayout, 1, 0, 1, 1)
+        self.horizontalLayout_6.addLayout(self.horizontalLayout_5)
+        self.gridLayout.addLayout(self.horizontalLayout_6, 2, 0, 1, 1)
         self.verticalLayout_2.addWidget(self.groupBox)
         self.gridLayout_3.addLayout(self.verticalLayout_2, 0, 0, 1, 1)
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
@@ -113,18 +119,21 @@ class Ui_Dialog(object):
         self.groupBox.setTitle(_translate("Dialog", "Switches"))
         self.refreshLibrary.setText(_translate("Dialog", "Startup: Refresh library"))
         self.fileRemember.setText(_translate("Dialog", "Remember open files"))
-        self.autoTags.setText(_translate("Dialog", "Generate tags from files"))
-        self.languageLabel.setText(_translate("Dialog", "Dictionary:"))
-        self.coverShadows.setText(_translate("Dialog", "Cover shadows"))
         self.performCulling.setToolTip(_translate("Dialog", "Enabling reduces startup time and memory usage"))
         self.performCulling.setText(_translate("Dialog", "Load covers only when needed"))
+        self.coverShadows.setText(_translate("Dialog", "Cover shadows"))
+        self.autoTags.setText(_translate("Dialog", "Generate tags from files"))
         self.cachingEnabled.setToolTip(_translate("Dialog", "Greatly reduces page transition time at the cost of more memory"))
         self.cachingEnabled.setText(_translate("Dialog", "Cache comic / pdf pages"))
-        self.label.setToolTip(_translate("Dialog", "Restart to see changes"))
+        self.languageLabel.setText(_translate("Dialog", "Dictionary:"))
+        self.hideScrollBars.setToolTip(_translate("Dialog", "Horizontal scrolling with Alt + Scroll\n"
+"Reopen book to see changes"))
+        self.hideScrollBars.setText(_translate("Dialog", "Hide scrollbars when reading"))
+        self.label.setToolTip(_translate("Dialog", "Restart application to see changes"))
         self.label.setText(_translate("Dialog", "Icon theme: "))
-        self.darkIconsRadio.setToolTip(_translate("Dialog", "Restart to see changes"))
+        self.darkIconsRadio.setToolTip(_translate("Dialog", "Restart application to see changes"))
         self.darkIconsRadio.setText(_translate("Dialog", "Dar&k"))
-        self.lightIconsRadio.setToolTip(_translate("Dialog", "Restart to see changes"))
+        self.lightIconsRadio.setToolTip(_translate("Dialog", "Restart application to see changes"))
         self.lightIconsRadio.setText(_translate("Dialog", "&Light"))
         self.okButton.setText(_translate("Dialog", "Scan Library"))
         self.cancelButton.setText(_translate("Dialog", "Close"))