Put software version in one sigle label to allow easier copy/pasting

manuskript/ui/about.py

@@ -7,7 +7,6 @@ from PyQt5.QtWidgets import QWidget
 from platform import python_version
 
 from manuskript.functions import appPath
-from manuskript.ui import about
 from manuskript.ui.about_ui import Ui_about
 from manuskript.version import getVersion
 
@@ -26,23 +25,28 @@ class aboutDialog(QWidget, Ui_about):
         logoPic = QPixmap(appPath("icons/Manuskript/logo-400x104.png"))
         self.labelLogo.setPixmap(logoPic)
 
-        self.labelManuskriptVersion.setText(self.tr("Version") + " " + getVersion())
-
-        self.labelWebsite.setText(
-               "<a href=\"http://www.theologeek.ch/manuskript/\">" \
-             + "http://www.theologeek.ch/manuskript/" \
-             + "</a>" )
-        self.labelWebsite.setOpenExternalLinks(True)
-
-        self.labelLicense.setText( \
-               "<a href=\"https://www.gnu.org/licenses/gpl-3.0.en.html\">" \
-             + self.tr("GNU General Public License Version 3") \
-             + "</a>" )
-        self.labelLicense.setOpenExternalLinks(True)
-
-        self.labelPythonVersion.setText(self.tr("Python") + " " + python_version())
-        self.labelPyQtVersion.setText(self.tr("PyQt") + " " + PYQT_VERSION_STR)
-        self.labelQtVersion.setText(self.tr("Qt") + " " + QT_VERSION_STR)
+        self.labelManuskriptVersion.setText(
+              "<b>" + self.tr("Version") + " " + getVersion() + "</b><br>"
+            + "&nbsp;"*5 + """<a href="http://www.theologeek.ch/manuskript/">
+                                http://www.theologeek.ch/manuskript/
+                               </a><br>"""
+            + "&nbsp;"*5 + "Copyright © 2015-2017 Olivier Keshavjee<br>"
+            + "&nbsp;"*5 + """<a href="https://www.gnu.org/licenses/gpl-3.0.en.html">
+                                GNU General Public License Version 3
+                            </a><br>"""
+            )
+        
+        self.labelManuskriptVersion.setOpenExternalLinks(True)
+        
+        self.labelSoftwareVersion.setText(
+              "<b>" + self.tr("Software Versions in Use:") + "</b><br>"
+            + "&nbsp;"*5 + self.tr("Python") + " " + python_version() + "<br>"
+            + "&nbsp;"*5 + self.tr("PyQt") + " " + PYQT_VERSION_STR + "<br>"
+            + "&nbsp;"*5 + self.tr("Qt") + " " + QT_VERSION_STR
+            )
+        #self.labelPythonVersion.setText()
+        #self.labelPyQtVersion.setText()
+        #self.labelQtVersion.setText()
 
     def accept(self):
         self.close()

manuskript/ui/about_ui.py

@@ -2,7 +2,8 @@
 
 # Form implementation generated from reading ui file 'manuskript/ui/about_ui.ui'
 #
-# Created by: PyQt5 UI code generator 5.5.1
+# Created: Wed Oct 11 08:28:24 2017
+#      by: PyQt5 UI code generator 5.2.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -16,64 +17,31 @@ class Ui_about(object):
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap("../../icons/Manuskript/icon-64px.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         about.setWindowIcon(icon)
-        self.buttonBox = QtWidgets.QDialogButtonBox(about)
-        self.buttonBox.setGeometry(QtCore.QRect(20, 320, 391, 30))
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName("buttonBox")
-        self.labelLogo = QtWidgets.QLabel(about)
-        self.labelLogo.setGeometry(QtCore.QRect(30, 20, 381, 111))
-        self.labelLogo.setText("")
-        self.labelLogo.setPixmap(QtGui.QPixmap("../../icons/Manuskript/logo-400x104.png"))
-        self.labelLogo.setObjectName("labelLogo")
-        self.labelCopyright = QtWidgets.QLabel(about)
-        self.labelCopyright.setGeometry(QtCore.QRect(70, 180, 361, 21))
-        self.labelCopyright.setText("Copyright © 2015-2017 Olivier Keshavjee")
-        self.labelCopyright.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
-        self.labelCopyright.setObjectName("labelCopyright")
-        self.labelLicense = QtWidgets.QLabel(about)
-        self.labelLicense.setGeometry(QtCore.QRect(70, 200, 361, 20))
-        self.labelLicense.setText("GNU General Public License Version 3")
-        self.labelLicense.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
-        self.labelLicense.setObjectName("labelLicense")
+        self.gridLayout = QtWidgets.QGridLayout(about)
+        self.gridLayout.setObjectName("gridLayout")
         self.labelManuskriptVersion = QtWidgets.QLabel(about)
-        self.labelManuskriptVersion.setGeometry(QtCore.QRect(130, 130, 301, 20))
-        font = QtGui.QFont()
-        font.setBold(True)
-        font.setWeight(75)
-        self.labelManuskriptVersion.setFont(font)
         self.labelManuskriptVersion.setText("Version")
         self.labelManuskriptVersion.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
         self.labelManuskriptVersion.setObjectName("labelManuskriptVersion")
-        self.labelSoftwareHeading = QtWidgets.QLabel(about)
-        self.labelSoftwareHeading.setGeometry(QtCore.QRect(40, 240, 391, 20))
-        font = QtGui.QFont()
-        font.setBold(True)
-        font.setWeight(75)
-        self.labelSoftwareHeading.setFont(font)
-        self.labelSoftwareHeading.setText("Software Versions in Use:")
-        self.labelSoftwareHeading.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
-        self.labelSoftwareHeading.setObjectName("labelSoftwareHeading")
-        self.labelPythonVersion = QtWidgets.QLabel(about)
-        self.labelPythonVersion.setGeometry(QtCore.QRect(70, 270, 361, 18))
-        self.labelPythonVersion.setText("Python Version")
-        self.labelPythonVersion.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
-        self.labelPythonVersion.setObjectName("labelPythonVersion")
-        self.labelQtVersion = QtWidgets.QLabel(about)
-        self.labelQtVersion.setGeometry(QtCore.QRect(70, 310, 361, 18))
-        self.labelQtVersion.setText("Qt Version")
-        self.labelQtVersion.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
-        self.labelQtVersion.setObjectName("labelQtVersion")
-        self.labelPyQtVersion = QtWidgets.QLabel(about)
-        self.labelPyQtVersion.setGeometry(QtCore.QRect(70, 290, 361, 18))
-        self.labelPyQtVersion.setText("PyQt Version")
-        self.labelPyQtVersion.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
-        self.labelPyQtVersion.setObjectName("labelPyQtVersion")
-        self.labelWebsite = QtWidgets.QLabel(about)
-        self.labelWebsite.setGeometry(QtCore.QRect(130, 150, 301, 20))
-        self.labelWebsite.setText("http://www.theologeek.ch/manuskript/")
-        self.labelWebsite.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
-        self.labelWebsite.setObjectName("labelWebsite")
+        self.gridLayout.addWidget(self.labelManuskriptVersion, 2, 0, 1, 2)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.gridLayout.addItem(spacerItem, 5, 0, 1, 1)
+        self.labelLogo = QtWidgets.QLabel(about)
+        self.labelLogo.setText("")
+        self.labelLogo.setPixmap(QtGui.QPixmap("../../icons/Manuskript/logo-400x104.png"))
+        self.labelLogo.setObjectName("labelLogo")
+        self.gridLayout.addWidget(self.labelLogo, 0, 0, 1, 2)
+        self.labelSoftwareVersion = QtWidgets.QLabel(about)
+        self.labelSoftwareVersion.setText("Software Versions in Use:")
+        self.labelSoftwareVersion.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
+        self.labelSoftwareVersion.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
+        self.labelSoftwareVersion.setObjectName("labelSoftwareVersion")
+        self.gridLayout.addWidget(self.labelSoftwareVersion, 4, 0, 1, 1)
+        self.buttonBox = QtWidgets.QDialogButtonBox(about)
+        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setObjectName("buttonBox")
+        self.gridLayout.addWidget(self.buttonBox, 7, 0, 1, 1)
 
         self.retranslateUi(about)
         self.buttonBox.accepted.connect(about.accept)

manuskript/ui/about_ui.ui

@@ -20,181 +20,67 @@
    <iconset>
     <normaloff>../../icons/Manuskript/icon-64px.png</normaloff>../../icons/Manuskript/icon-64px.png</iconset>
   </property>
-  <widget class="QDialogButtonBox" name="buttonBox">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>320</y>
-     <width>391</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-   <property name="standardButtons">
-    <set>QDialogButtonBox::Ok</set>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelLogo">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>20</y>
-     <width>381</width>
-     <height>111</height>
-    </rect>
-   </property>
-   <property name="toolTip">
-    <string>Manuskript</string>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="pixmap">
-    <pixmap>../../icons/Manuskript/logo-400x104.png</pixmap>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelCopyright">
-   <property name="geometry">
-    <rect>
-     <x>70</x>
-     <y>180</y>
-     <width>361</width>
-     <height>21</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string notr="true">Copyright © 2015-2017 Olivier Keshavjee</string>
-   </property>
-   <property name="textInteractionFlags">
-    <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelLicense">
-   <property name="geometry">
-    <rect>
-     <x>70</x>
-     <y>200</y>
-     <width>361</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string notr="true">GNU General Public License Version 3</string>
-   </property>
-   <property name="textInteractionFlags">
-    <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelManuskriptVersion">
-   <property name="geometry">
-    <rect>
-     <x>130</x>
-     <y>130</y>
-     <width>301</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <weight>75</weight>
-     <bold>true</bold>
-    </font>
-   </property>
-   <property name="text">
-    <string notr="true">Version</string>
-   </property>
-   <property name="textInteractionFlags">
-    <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelSoftwareHeading">
-   <property name="geometry">
-    <rect>
-     <x>40</x>
-     <y>240</y>
-     <width>391</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <weight>75</weight>
-     <bold>true</bold>
-    </font>
-   </property>
-   <property name="text">
-    <string notr="true">Software Versions in Use:</string>
-   </property>
-   <property name="textInteractionFlags">
-    <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelPythonVersion">
-   <property name="geometry">
-    <rect>
-     <x>70</x>
-     <y>270</y>
-     <width>361</width>
-     <height>18</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string notr="true">Python Version</string>
-   </property>
-   <property name="textInteractionFlags">
-    <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelQtVersion">
-   <property name="geometry">
-    <rect>
-     <x>70</x>
-     <y>310</y>
-     <width>361</width>
-     <height>18</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string notr="true">Qt Version</string>
-   </property>
-   <property name="textInteractionFlags">
-    <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelPyQtVersion">
-   <property name="geometry">
-    <rect>
-     <x>70</x>
-     <y>290</y>
-     <width>361</width>
-     <height>18</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string notr="true">PyQt Version</string>
-   </property>
-   <property name="textInteractionFlags">
-    <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelWebsite">
-   <property name="geometry">
-    <rect>
-     <x>130</x>
-     <y>150</y>
-     <width>301</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string notr="true">http://www.theologeek.ch/manuskript/</string>
-   </property>
-   <property name="textInteractionFlags">
-    <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-   </property>
-  </widget>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="2" column="0" colspan="2">
+    <widget class="QLabel" name="labelManuskriptVersion">
+     <property name="text">
+      <string notr="true">Version</string>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="labelLogo">
+     <property name="toolTip">
+      <string>Manuskript</string>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="pixmap">
+      <pixmap>../../icons/Manuskript/logo-400x104.png</pixmap>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="labelSoftwareVersion">
+     <property name="text">
+      <string notr="true">Software Versions in Use:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
  </widget>
  <resources/>
  <connections>

manuskript/ui/mainWindow.py

@@ -2,7 +2,8 @@
 
 # Form implementation generated from reading ui file 'manuskript/ui/mainWindow.ui'
 #
-# Created by: PyQt5 UI code generator 5.5.1
+# Created: Wed Oct 11 08:10:56 2017
+#      by: PyQt5 UI code generator 5.2.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -16,8 +17,8 @@ class Ui_MainWindow(object):
         self.centralwidget = QtWidgets.QWidget(MainWindow)
         self.centralwidget.setObjectName("centralwidget")
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.centralwidget)
-        self.horizontalLayout_2.setContentsMargins(0, 1, 0, 0)
         self.horizontalLayout_2.setSpacing(0)
+        self.horizontalLayout_2.setContentsMargins(0, 1, 0, 0)
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
         self.stack = QtWidgets.QStackedWidget(self.centralwidget)
         self.stack.setObjectName("stack")
@@ -821,6 +822,7 @@ class Ui_MainWindow(object):
         self.layoutWidget = QtWidgets.QWidget(self.splitterOutlineH)
         self.layoutWidget.setObjectName("layoutWidget")
         self.verticalLayout_14 = QtWidgets.QVBoxLayout(self.layoutWidget)
+        self.verticalLayout_14.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout_14.setObjectName("verticalLayout_14")
         self.splitterOutlineV = QtWidgets.QSplitter(self.layoutWidget)
         self.splitterOutlineV.setOrientation(QtCore.Qt.Vertical)
@@ -1329,18 +1331,18 @@ class Ui_MainWindow(object):
         self.actAbout.setText(_translate("MainWindow", "&About"))
         self.actAbout.setToolTip(_translate("MainWindow", "About Manuskript"))
 
-from manuskript.ui.cheatSheet import cheatSheet
-from manuskript.ui.editors.mainEditor import mainEditor
-from manuskript.ui.search import search
-from manuskript.ui.views.basicItemView import basicItemView
-from manuskript.ui.views.characterTreeView import characterTreeView
 from manuskript.ui.views.lineEditView import lineEditView
-from manuskript.ui.views.metadataView import metadataView
+from manuskript.ui.search import search
+from manuskript.ui.views.textEditView import textEditView
+from manuskript.ui.views.textEditCompleter import textEditCompleter
+from manuskript.ui.cheatSheet import cheatSheet
+from manuskript.ui.views.sldImportance import sldImportance
+from manuskript.ui.views.characterTreeView import characterTreeView
 from manuskript.ui.views.outlineView import outlineView
 from manuskript.ui.views.plotTreeView import plotTreeView
-from manuskript.ui.views.sldImportance import sldImportance
-from manuskript.ui.views.storylineView import storylineView
-from manuskript.ui.views.textEditCompleter import textEditCompleter
-from manuskript.ui.views.textEditView import textEditView
-from manuskript.ui.views.treeView import treeView
 from manuskript.ui.welcome import welcome
+from manuskript.ui.views.treeView import treeView
+from manuskript.ui.views.metadataView import metadataView
+from manuskript.ui.views.basicItemView import basicItemView
+from manuskript.ui.editors.mainEditor import mainEditor
+from manuskript.ui.views.storylineView import storylineView