mirror of
https://github.com/olivierkes/manuskript.git
synced 2024-06-29 03:31:03 +12:00
Bug fixing and UI tweaking
This commit is contained in:
parent
d92c800f7b
commit
b1f5c17497
|
@ -28,6 +28,12 @@ class mainEditor(QWidget, Ui_mainEditor):
|
||||||
self.tab.tabCloseRequested.connect(self.closeTab)
|
self.tab.tabCloseRequested.connect(self.closeTab)
|
||||||
self.tab.currentChanged.connect(self.tabChanged)
|
self.tab.currentChanged.connect(self.tabChanged)
|
||||||
|
|
||||||
|
# UI
|
||||||
|
try:
|
||||||
|
self.tab.setTabBarAutoHide(True)
|
||||||
|
except AttributeError:
|
||||||
|
print("Info: install Qt 5.4 or higher to use tabbar auto-hide in editor.")
|
||||||
|
|
||||||
# Connections --------------------------------------------------------
|
# Connections --------------------------------------------------------
|
||||||
|
|
||||||
self.sldCorkSizeFactor.valueChanged.connect(
|
self.sldCorkSizeFactor.valueChanged.connect(
|
||||||
|
|
|
@ -2,7 +2,8 @@
|
||||||
|
|
||||||
# Form implementation generated from reading ui file 'manuskript/ui/editors/mainEditor_ui.ui'
|
# Form implementation generated from reading ui file 'manuskript/ui/editors/mainEditor_ui.ui'
|
||||||
#
|
#
|
||||||
# Created by: PyQt5 UI code generator 5.4.2
|
# Created: Mon Feb 8 08:54:11 2016
|
||||||
|
# by: PyQt5 UI code generator 5.2.1
|
||||||
#
|
#
|
||||||
# WARNING! All changes made in this file will be lost!
|
# WARNING! All changes made in this file will be lost!
|
||||||
|
|
||||||
|
@ -19,7 +20,7 @@ class Ui_mainEditor(object):
|
||||||
self.tab.setDocumentMode(True)
|
self.tab.setDocumentMode(True)
|
||||||
self.tab.setTabsClosable(True)
|
self.tab.setTabsClosable(True)
|
||||||
self.tab.setMovable(True)
|
self.tab.setMovable(True)
|
||||||
self.tab.setTabBarAutoHide(True)
|
self.tab.setProperty("tabBarAutoHide", False)
|
||||||
self.tab.setObjectName("tab")
|
self.tab.setObjectName("tab")
|
||||||
self.verticalLayout.addWidget(self.tab)
|
self.verticalLayout.addWidget(self.tab)
|
||||||
self.horizontalLayout_19 = QtWidgets.QHBoxLayout()
|
self.horizontalLayout_19 = QtWidgets.QHBoxLayout()
|
||||||
|
|
|
@ -40,8 +40,8 @@
|
||||||
<property name="movable">
|
<property name="movable">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
<property name="tabBarAutoHide">
|
<property name="tabBarAutoHide" stdset="0">
|
||||||
<bool>true</bool>
|
<bool>false</bool>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|
|
@ -2,7 +2,8 @@
|
||||||
|
|
||||||
# Form implementation generated from reading ui file 'manuskript/ui/mainWindow.ui'
|
# Form implementation generated from reading ui file 'manuskript/ui/mainWindow.ui'
|
||||||
#
|
#
|
||||||
# Created by: PyQt5 UI code generator 5.4.2
|
# Created: Mon Feb 8 09:02:57 2016
|
||||||
|
# by: PyQt5 UI code generator 5.2.1
|
||||||
#
|
#
|
||||||
# WARNING! All changes made in this file will be lost!
|
# WARNING! All changes made in this file will be lost!
|
||||||
|
|
||||||
|
@ -16,6 +17,7 @@ class Ui_MainWindow(object):
|
||||||
self.centralwidget = QtWidgets.QWidget(MainWindow)
|
self.centralwidget = QtWidgets.QWidget(MainWindow)
|
||||||
self.centralwidget.setObjectName("centralwidget")
|
self.centralwidget.setObjectName("centralwidget")
|
||||||
self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.centralwidget)
|
self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.centralwidget)
|
||||||
|
self.horizontalLayout_2.setSpacing(0)
|
||||||
self.horizontalLayout_2.setContentsMargins(0, 6, 0, 0)
|
self.horizontalLayout_2.setContentsMargins(0, 6, 0, 0)
|
||||||
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
|
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
|
||||||
self.stack = QtWidgets.QStackedWidget(self.centralwidget)
|
self.stack = QtWidgets.QStackedWidget(self.centralwidget)
|
||||||
|
@ -40,6 +42,7 @@ class Ui_MainWindow(object):
|
||||||
self.page_4 = QtWidgets.QWidget()
|
self.page_4 = QtWidgets.QWidget()
|
||||||
self.page_4.setObjectName("page_4")
|
self.page_4.setObjectName("page_4")
|
||||||
self.horizontalLayout_33 = QtWidgets.QHBoxLayout(self.page_4)
|
self.horizontalLayout_33 = QtWidgets.QHBoxLayout(self.page_4)
|
||||||
|
self.horizontalLayout_33.setContentsMargins(0, 0, 0, 0)
|
||||||
self.horizontalLayout_33.setObjectName("horizontalLayout_33")
|
self.horizontalLayout_33.setObjectName("horizontalLayout_33")
|
||||||
self.tabMain = QtWidgets.QTabWidget(self.page_4)
|
self.tabMain = QtWidgets.QTabWidget(self.page_4)
|
||||||
self.tabMain.setTabPosition(QtWidgets.QTabWidget.North)
|
self.tabMain.setTabPosition(QtWidgets.QTabWidget.North)
|
||||||
|
@ -806,6 +809,7 @@ class Ui_MainWindow(object):
|
||||||
self.layoutWidget = QtWidgets.QWidget(self.splitterOutlineH)
|
self.layoutWidget = QtWidgets.QWidget(self.splitterOutlineH)
|
||||||
self.layoutWidget.setObjectName("layoutWidget")
|
self.layoutWidget.setObjectName("layoutWidget")
|
||||||
self.verticalLayout_14 = QtWidgets.QVBoxLayout(self.layoutWidget)
|
self.verticalLayout_14 = QtWidgets.QVBoxLayout(self.layoutWidget)
|
||||||
|
self.verticalLayout_14.setContentsMargins(0, 0, 0, 0)
|
||||||
self.verticalLayout_14.setObjectName("verticalLayout_14")
|
self.verticalLayout_14.setObjectName("verticalLayout_14")
|
||||||
self.splitterOutlineV = QtWidgets.QSplitter(self.layoutWidget)
|
self.splitterOutlineV = QtWidgets.QSplitter(self.layoutWidget)
|
||||||
self.splitterOutlineV.setOrientation(QtCore.Qt.Vertical)
|
self.splitterOutlineV.setOrientation(QtCore.Qt.Vertical)
|
||||||
|
@ -985,7 +989,7 @@ class Ui_MainWindow(object):
|
||||||
self.horizontalLayout_2.addWidget(self.stack)
|
self.horizontalLayout_2.addWidget(self.stack)
|
||||||
MainWindow.setCentralWidget(self.centralwidget)
|
MainWindow.setCentralWidget(self.centralwidget)
|
||||||
self.menubar = QtWidgets.QMenuBar(MainWindow)
|
self.menubar = QtWidgets.QMenuBar(MainWindow)
|
||||||
self.menubar.setGeometry(QtCore.QRect(0, 0, 1112, 30))
|
self.menubar.setGeometry(QtCore.QRect(0, 0, 1112, 20))
|
||||||
self.menubar.setObjectName("menubar")
|
self.menubar.setObjectName("menubar")
|
||||||
self.menuFile = QtWidgets.QMenu(self.menubar)
|
self.menuFile = QtWidgets.QMenu(self.menubar)
|
||||||
self.menuFile.setObjectName("menuFile")
|
self.menuFile.setObjectName("menuFile")
|
||||||
|
@ -1012,6 +1016,7 @@ class Ui_MainWindow(object):
|
||||||
self.dockWidgetContents_5 = QtWidgets.QWidget()
|
self.dockWidgetContents_5 = QtWidgets.QWidget()
|
||||||
self.dockWidgetContents_5.setObjectName("dockWidgetContents_5")
|
self.dockWidgetContents_5.setObjectName("dockWidgetContents_5")
|
||||||
self.verticalLayout_39 = QtWidgets.QVBoxLayout(self.dockWidgetContents_5)
|
self.verticalLayout_39 = QtWidgets.QVBoxLayout(self.dockWidgetContents_5)
|
||||||
|
self.verticalLayout_39.setContentsMargins(0, 0, 0, 0)
|
||||||
self.verticalLayout_39.setObjectName("verticalLayout_39")
|
self.verticalLayout_39.setObjectName("verticalLayout_39")
|
||||||
self.cheatSheet = cheatSheet(self.dockWidgetContents_5)
|
self.cheatSheet = cheatSheet(self.dockWidgetContents_5)
|
||||||
font = QtGui.QFont()
|
font = QtGui.QFont()
|
||||||
|
@ -1027,6 +1032,7 @@ class Ui_MainWindow(object):
|
||||||
self.dockWidgetContents_6 = QtWidgets.QWidget()
|
self.dockWidgetContents_6 = QtWidgets.QWidget()
|
||||||
self.dockWidgetContents_6.setObjectName("dockWidgetContents_6")
|
self.dockWidgetContents_6.setObjectName("dockWidgetContents_6")
|
||||||
self.verticalLayout_40 = QtWidgets.QVBoxLayout(self.dockWidgetContents_6)
|
self.verticalLayout_40 = QtWidgets.QVBoxLayout(self.dockWidgetContents_6)
|
||||||
|
self.verticalLayout_40.setContentsMargins(0, 0, 0, 0)
|
||||||
self.verticalLayout_40.setObjectName("verticalLayout_40")
|
self.verticalLayout_40.setObjectName("verticalLayout_40")
|
||||||
self.widget = search(self.dockWidgetContents_6)
|
self.widget = search(self.dockWidgetContents_6)
|
||||||
font = QtGui.QFont()
|
font = QtGui.QFont()
|
||||||
|
@ -1043,6 +1049,7 @@ class Ui_MainWindow(object):
|
||||||
self.dockWidgetContents = QtWidgets.QWidget()
|
self.dockWidgetContents = QtWidgets.QWidget()
|
||||||
self.dockWidgetContents.setObjectName("dockWidgetContents")
|
self.dockWidgetContents.setObjectName("dockWidgetContents")
|
||||||
self.verticalLayout_16 = QtWidgets.QVBoxLayout(self.dockWidgetContents)
|
self.verticalLayout_16 = QtWidgets.QVBoxLayout(self.dockWidgetContents)
|
||||||
|
self.verticalLayout_16.setContentsMargins(0, 0, 0, 0)
|
||||||
self.verticalLayout_16.setObjectName("verticalLayout_16")
|
self.verticalLayout_16.setObjectName("verticalLayout_16")
|
||||||
self.lstTabs = QtWidgets.QListWidget(self.dockWidgetContents)
|
self.lstTabs = QtWidgets.QListWidget(self.dockWidgetContents)
|
||||||
self.lstTabs.setStyleSheet("QListView {\n"
|
self.lstTabs.setStyleSheet("QListView {\n"
|
||||||
|
@ -1285,17 +1292,17 @@ class Ui_MainWindow(object):
|
||||||
self.actCompile.setText(_translate("MainWindow", "Co&mpile"))
|
self.actCompile.setText(_translate("MainWindow", "Co&mpile"))
|
||||||
self.actCompile.setShortcut(_translate("MainWindow", "F6"))
|
self.actCompile.setShortcut(_translate("MainWindow", "F6"))
|
||||||
|
|
||||||
from manuskript.ui.cheatSheet import cheatSheet
|
|
||||||
from manuskript.ui.editors.mainEditor import mainEditor
|
|
||||||
from manuskript.ui.search import search
|
|
||||||
from manuskript.ui.sldImportance import sldImportance
|
|
||||||
from manuskript.ui.views.basicItemView import basicItemView
|
|
||||||
from manuskript.ui.views.lineEditView import lineEditView
|
|
||||||
from manuskript.ui.views.metadataView import metadataView
|
|
||||||
from manuskript.ui.views.outlineView import outlineView
|
|
||||||
from manuskript.ui.views.persoTreeView import persoTreeView
|
|
||||||
from manuskript.ui.views.plotTreeView import plotTreeView
|
|
||||||
from manuskript.ui.views.textEditCompleter import textEditCompleter
|
|
||||||
from manuskript.ui.views.textEditView import textEditView
|
from manuskript.ui.views.textEditView import textEditView
|
||||||
from manuskript.ui.views.treeView import treeView
|
from manuskript.ui.views.persoTreeView import persoTreeView
|
||||||
|
from manuskript.ui.views.basicItemView import basicItemView
|
||||||
|
from manuskript.ui.cheatSheet import cheatSheet
|
||||||
|
from manuskript.ui.views.lineEditView import lineEditView
|
||||||
from manuskript.ui.welcome import welcome
|
from manuskript.ui.welcome import welcome
|
||||||
|
from manuskript.ui.sldImportance import sldImportance
|
||||||
|
from manuskript.ui.views.outlineView import outlineView
|
||||||
|
from manuskript.ui.search import search
|
||||||
|
from manuskript.ui.views.textEditCompleter import textEditCompleter
|
||||||
|
from manuskript.ui.views.plotTreeView import plotTreeView
|
||||||
|
from manuskript.ui.views.treeView import treeView
|
||||||
|
from manuskript.ui.editors.mainEditor import mainEditor
|
||||||
|
from manuskript.ui.views.metadataView import metadataView
|
||||||
|
|
|
@ -15,6 +15,9 @@
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="centralwidget">
|
<widget class="QWidget" name="centralwidget">
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||||
|
<property name="spacing">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
<property name="leftMargin">
|
<property name="leftMargin">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
|
@ -100,6 +103,18 @@
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QWidget" name="page_4">
|
<widget class="QWidget" name="page_4">
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_33">
|
<layout class="QHBoxLayout" name="horizontalLayout_33">
|
||||||
|
<property name="leftMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QTabWidget" name="tabMain">
|
<widget class="QTabWidget" name="tabMain">
|
||||||
<property name="tabPosition">
|
<property name="tabPosition">
|
||||||
|
@ -1952,7 +1967,7 @@
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>1112</width>
|
<width>1112</width>
|
||||||
<height>30</height>
|
<height>20</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QMenu" name="menuFile">
|
<widget class="QMenu" name="menuFile">
|
||||||
|
@ -2029,6 +2044,18 @@
|
||||||
</attribute>
|
</attribute>
|
||||||
<widget class="QWidget" name="dockWidgetContents_5">
|
<widget class="QWidget" name="dockWidgetContents_5">
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_39">
|
<layout class="QVBoxLayout" name="verticalLayout_39">
|
||||||
|
<property name="leftMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="cheatSheet" name="cheatSheet" native="true">
|
<widget class="cheatSheet" name="cheatSheet" native="true">
|
||||||
<property name="font">
|
<property name="font">
|
||||||
|
@ -2051,6 +2078,18 @@
|
||||||
</attribute>
|
</attribute>
|
||||||
<widget class="QWidget" name="dockWidgetContents_6">
|
<widget class="QWidget" name="dockWidgetContents_6">
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_40">
|
<layout class="QVBoxLayout" name="verticalLayout_40">
|
||||||
|
<property name="leftMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="search" name="widget" native="true">
|
<widget class="search" name="widget" native="true">
|
||||||
<property name="font">
|
<property name="font">
|
||||||
|
@ -2076,6 +2115,18 @@
|
||||||
</attribute>
|
</attribute>
|
||||||
<widget class="QWidget" name="dockWidgetContents">
|
<widget class="QWidget" name="dockWidgetContents">
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_16">
|
<layout class="QVBoxLayout" name="verticalLayout_16">
|
||||||
|
<property name="leftMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QListWidget" name="lstTabs">
|
<widget class="QListWidget" name="lstTabs">
|
||||||
<property name="styleSheet">
|
<property name="styleSheet">
|
||||||
|
|
Loading…
Reference in a new issue