Bug fixing and UI tweaking

This commit is contained in:
Olivier Keshavjee 2016-02-08 09:04:24 +01:00
parent d92c800f7b
commit b1f5c17497
5 changed files with 84 additions and 19 deletions

View file

@ -28,6 +28,12 @@ class mainEditor(QWidget, Ui_mainEditor):
self.tab.tabCloseRequested.connect(self.closeTab)
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 --------------------------------------------------------
self.sldCorkSizeFactor.valueChanged.connect(

View file

@ -2,7 +2,8 @@
# 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!
@ -19,7 +20,7 @@ class Ui_mainEditor(object):
self.tab.setDocumentMode(True)
self.tab.setTabsClosable(True)
self.tab.setMovable(True)
self.tab.setTabBarAutoHide(True)
self.tab.setProperty("tabBarAutoHide", False)
self.tab.setObjectName("tab")
self.verticalLayout.addWidget(self.tab)
self.horizontalLayout_19 = QtWidgets.QHBoxLayout()

View file

@ -40,8 +40,8 @@
<property name="movable">
<bool>true</bool>
</property>
<property name="tabBarAutoHide">
<bool>true</bool>
<property name="tabBarAutoHide" stdset="0">
<bool>false</bool>
</property>
</widget>
</item>

View file

@ -2,7 +2,8 @@
# 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!
@ -16,6 +17,7 @@ class Ui_MainWindow(object):
self.centralwidget = QtWidgets.QWidget(MainWindow)
self.centralwidget.setObjectName("centralwidget")
self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.centralwidget)
self.horizontalLayout_2.setSpacing(0)
self.horizontalLayout_2.setContentsMargins(0, 6, 0, 0)
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
self.stack = QtWidgets.QStackedWidget(self.centralwidget)
@ -40,6 +42,7 @@ class Ui_MainWindow(object):
self.page_4 = QtWidgets.QWidget()
self.page_4.setObjectName("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.tabMain = QtWidgets.QTabWidget(self.page_4)
self.tabMain.setTabPosition(QtWidgets.QTabWidget.North)
@ -806,6 +809,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)
@ -985,7 +989,7 @@ class Ui_MainWindow(object):
self.horizontalLayout_2.addWidget(self.stack)
MainWindow.setCentralWidget(self.centralwidget)
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.menuFile = QtWidgets.QMenu(self.menubar)
self.menuFile.setObjectName("menuFile")
@ -1012,6 +1016,7 @@ class Ui_MainWindow(object):
self.dockWidgetContents_5 = QtWidgets.QWidget()
self.dockWidgetContents_5.setObjectName("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.cheatSheet = cheatSheet(self.dockWidgetContents_5)
font = QtGui.QFont()
@ -1027,6 +1032,7 @@ class Ui_MainWindow(object):
self.dockWidgetContents_6 = QtWidgets.QWidget()
self.dockWidgetContents_6.setObjectName("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.widget = search(self.dockWidgetContents_6)
font = QtGui.QFont()
@ -1043,6 +1049,7 @@ class Ui_MainWindow(object):
self.dockWidgetContents = QtWidgets.QWidget()
self.dockWidgetContents.setObjectName("dockWidgetContents")
self.verticalLayout_16 = QtWidgets.QVBoxLayout(self.dockWidgetContents)
self.verticalLayout_16.setContentsMargins(0, 0, 0, 0)
self.verticalLayout_16.setObjectName("verticalLayout_16")
self.lstTabs = QtWidgets.QListWidget(self.dockWidgetContents)
self.lstTabs.setStyleSheet("QListView {\n"
@ -1285,17 +1292,17 @@ class Ui_MainWindow(object):
self.actCompile.setText(_translate("MainWindow", "Co&mpile"))
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.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.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

View file

@ -15,6 +15,9 @@
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
@ -100,6 +103,18 @@
</widget>
<widget class="QWidget" name="page_4">
<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>
<widget class="QTabWidget" name="tabMain">
<property name="tabPosition">
@ -1952,7 +1967,7 @@
<x>0</x>
<y>0</y>
<width>1112</width>
<height>30</height>
<height>20</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@ -2029,6 +2044,18 @@
</attribute>
<widget class="QWidget" name="dockWidgetContents_5">
<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>
<widget class="cheatSheet" name="cheatSheet" native="true">
<property name="font">
@ -2051,6 +2078,18 @@
</attribute>
<widget class="QWidget" name="dockWidgetContents_6">
<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>
<widget class="search" name="widget" native="true">
<property name="font">
@ -2076,6 +2115,18 @@
</attribute>
<widget class="QWidget" name="dockWidgetContents">
<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>
<widget class="QListWidget" name="lstTabs">
<property name="styleSheet">