diff --git a/manuskript/ui/about.py b/manuskript/ui/about.py
index aecb936..0d598c7 100644
--- a/manuskript/ui/about.py
+++ b/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(
- "" \
- + "http://www.theologeek.ch/manuskript/" \
- + "" )
- self.labelWebsite.setOpenExternalLinks(True)
-
- self.labelLicense.setText( \
- "" \
- + self.tr("GNU General Public License Version 3") \
- + "" )
- 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(
+ "" + self.tr("Version") + " " + getVersion() + "
"
+ + " "*5 + """
+ http://www.theologeek.ch/manuskript/
+
"""
+ + " "*5 + "Copyright © 2015-2017 Olivier Keshavjee
"
+ + " "*5 + """
+ GNU General Public License Version 3
+
"""
+ )
+
+ self.labelManuskriptVersion.setOpenExternalLinks(True)
+
+ self.labelSoftwareVersion.setText(
+ "" + self.tr("Software Versions in Use:") + "
"
+ + " "*5 + self.tr("Python") + " " + python_version() + "
"
+ + " "*5 + self.tr("PyQt") + " " + PYQT_VERSION_STR + "
"
+ + " "*5 + self.tr("Qt") + " " + QT_VERSION_STR
+ )
+ #self.labelPythonVersion.setText()
+ #self.labelPyQtVersion.setText()
+ #self.labelQtVersion.setText()
def accept(self):
self.close()
diff --git a/manuskript/ui/about_ui.py b/manuskript/ui/about_ui.py
index e399ce3..e9b46e9 100644
--- a/manuskript/ui/about_ui.py
+++ b/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)
diff --git a/manuskript/ui/about_ui.ui b/manuskript/ui/about_ui.ui
index dcf10b7..25aaf7c 100644
--- a/manuskript/ui/about_ui.ui
+++ b/manuskript/ui/about_ui.ui
@@ -20,181 +20,67 @@
../../icons/Manuskript/icon-64px.png../../icons/Manuskript/icon-64px.png
-
-
-
- 20
- 320
- 391
- 30
-
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Ok
-
-
-
-
-
- 30
- 20
- 381
- 111
-
-
-
- Manuskript
-
-
-
-
-
- ../../icons/Manuskript/logo-400x104.png
-
-
-
-
-
- 70
- 180
- 361
- 21
-
-
-
- Copyright © 2015-2017 Olivier Keshavjee
-
-
- Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse
-
-
-
-
-
- 70
- 200
- 361
- 20
-
-
-
- GNU General Public License Version 3
-
-
- Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse
-
-
-
-
-
- 130
- 130
- 301
- 20
-
-
-
-
- 75
- true
-
-
-
- Version
-
-
- Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse
-
-
-
-
-
- 40
- 240
- 391
- 20
-
-
-
-
- 75
- true
-
-
-
- Software Versions in Use:
-
-
- Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse
-
-
-
-
-
- 70
- 270
- 361
- 18
-
-
-
- Python Version
-
-
- Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse
-
-
-
-
-
- 70
- 310
- 361
- 18
-
-
-
- Qt Version
-
-
- Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse
-
-
-
-
-
- 70
- 290
- 361
- 18
-
-
-
- PyQt Version
-
-
- Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse
-
-
-
-
-
- 130
- 150
- 301
- 20
-
-
-
- http://www.theologeek.ch/manuskript/
-
-
- Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse
-
-
+
+ -
+
+
+ Version
+
+
+ Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ Manuskript
+
+
+
+
+
+ ../../icons/Manuskript/logo-400x104.png
+
+
+
+ -
+
+
+ Software Versions in Use:
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+ Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Ok
+
+
+
+
diff --git a/manuskript/ui/mainWindow.py b/manuskript/ui/mainWindow.py
index a10ce6d..9fc96ba 100644
--- a/manuskript/ui/mainWindow.py
+++ b/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