CodeMirror/manuskript
1
0
Fork 0
mirror of https://github.com/olivierkes/manuskript.git synced 2024-05-04 04:52:33 +12:00
Code Issues Projects Releases Wiki Activity

Flatified a lot of buttons, and added some stylesheets

Browse source
This commit is contained in:
Olivier Keshavjee 2016-04-08 14:49:15 +02:00
parent 6fdfeaf6d0
commit f1d2b05a2e
14 changed files with 259 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
manuskript/mainWindow.py
View file

@ -756,6 +756,27 @@ class MainWindow(QMainWindow, Ui_MainWindow):
def setupMoreUi(self):
self.setStyleSheet("""
QMenuBar#menubar{border:none;}
QToolButton{
background: none;
border: none;
}
QPushButton:flat:hover, QToolButton:hover{
border: 1px solid darkgray;
border-radius: 3px;
background: darkgray;
}
""")
# Custon palette?
p = qApp.palette()
c = p.color(p.Window)
# p.setColor(p.Base, c.lighter(115))
qApp.setPalette(p)
# Tool bar on the right
self.toolbar = collapsibleDockWidgets(Qt.RightDockWidgetArea, self)
self.toolbar.addCustomWidget(self.tr("Book summary"), self.grpPlotSummary, self.TabPlots)

11
manuskript/ui/cheatSheet_ui.py
View file

@ -2,7 +2,8 @@
# Form implementation generated from reading ui file 'manuskript/ui/cheatSheet_ui.ui'
#
# Created by: PyQt5 UI code generator 5.4.2
# Created: Fri Apr 8 14:27:04 2016
# by: PyQt5 UI code generator 5.2.1
#
# WARNING! All changes made in this file will be lost!
@ -13,13 +14,14 @@ class Ui_cheatSheet(object):
cheatSheet.setObjectName("cheatSheet")
cheatSheet.resize(400, 344)
self.verticalLayout_2 = QtWidgets.QVBoxLayout(cheatSheet)
self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
self.verticalLayout_2.setSpacing(0)
self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
self.verticalLayout_2.setObjectName("verticalLayout_2")
self.horizontalLayout = QtWidgets.QHBoxLayout()
self.horizontalLayout.setSpacing(0)
self.horizontalLayout.setObjectName("horizontalLayout")
self.txtFilter = QtWidgets.QLineEdit(cheatSheet)
self.txtFilter.setStyleSheet("")
self.txtFilter.setFrame(False)
self.txtFilter.setClearButtonEnabled(True)
self.txtFilter.setObjectName("txtFilter")
@ -37,6 +39,7 @@ class Ui_cheatSheet(object):
self.line.setFrameShadow(QtWidgets.QFrame.Plain)
self.line.setLineWidth(0)
self.line.setFrameShape(QtWidgets.QFrame.HLine)
self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
self.line.setObjectName("line")
self.verticalLayout_2.addWidget(self.line)
self.splitter = QtWidgets.QSplitter(cheatSheet)
@ -56,11 +59,11 @@ class Ui_cheatSheet(object):
self.scrollArea.setWidgetResizable(True)
self.scrollArea.setObjectName("scrollArea")
self.scrollAreaWidgetContents = QtWidgets.QWidget()
self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 400, 70))
self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 400, 68))
self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
self.verticalLayout = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents)
self.verticalLayout.setContentsMargins(0, 0, 0, 0)
self.verticalLayout.setSpacing(0)
self.verticalLayout.setContentsMargins(0, 0, 0, 0)
self.verticalLayout.setObjectName("verticalLayout")
self.view = QtWidgets.QLabel(self.scrollAreaWidgetContents)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)

9
manuskript/ui/cheatSheet_ui.ui
View file

@ -36,6 +36,9 @@
</property>
<item>
<widget class="QLineEdit" name="txtFilter">
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="frame">
<bool>false</bool>
</property>
@ -53,7 +56,9 @@
<string/>
</property>
<property name="icon">
<iconset theme="go-bottom"/>
<iconset theme="go-bottom">
<normaloff/>
</iconset>
</property>
<property name="checkable">
<bool>true</bool>
@ -110,7 +115,7 @@
<x>0</x>
<y>0</y>
<width>400</width>
<height>70</height>
<height>68</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">

30
manuskript/ui/collapsibleDockWidgets.py
View file

@ -59,6 +59,17 @@ class collapsibleDockWidgets(QToolBar):
self.otherWidgets = []
self.currentGroup = None
self.setStyleSheet("""
QToolBar{
background:transparent;
border: none;
spacing: 0px;
}
QToolBar:separator{
border: none;
}
""")
def _dockWidgets(self):
mw = self.parent()
for w in mw.findChildren(QDockWidget, None):
@ -117,6 +128,25 @@ class verticalButton(QToolButton):
QToolButton.__init__(self, parent)
self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Minimum)
self.setStyleSheet("""
QToolButton{
border: none;
border-radius: 0px;
background: transparent;
margin: 0px;
padding: 3px;
}
QToolButton:checked{
border: 0px solid darkgray;
background: transparent;
color: darkblue;
}
QToolButton:hover{
border: 0px solid darkgray;
color: darkblue;
}
""")
def sizeHint(self):
return QToolButton.sizeHint(self).transposed()

6
manuskript/ui/editors/mainEditor_ui.py
View file

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'manuskript/ui/editors/mainEditor_ui.ui'
#
# Created: Mon Feb 8 08:54:11 2016
# Created: Fri Apr 8 13:43:25 2016
# by: PyQt5 UI code generator 5.2.1
#
# WARNING! All changes made in this file will be lost!
@ -27,6 +27,7 @@ class Ui_mainEditor(object):
self.horizontalLayout_19.setObjectName("horizontalLayout_19")
self.btnRedacFolderText = QtWidgets.QPushButton(mainEditor)
self.btnRedacFolderText.setCheckable(True)
self.btnRedacFolderText.setFlat(True)
self.btnRedacFolderText.setObjectName("btnRedacFolderText")
self.buttonGroup = QtWidgets.QButtonGroup(mainEditor)
self.buttonGroup.setObjectName("buttonGroup")
@ -35,11 +36,13 @@ class Ui_mainEditor(object):
self.btnRedacFolderCork = QtWidgets.QPushButton(mainEditor)
self.btnRedacFolderCork.setCheckable(True)
self.btnRedacFolderCork.setChecked(True)
self.btnRedacFolderCork.setFlat(True)
self.btnRedacFolderCork.setObjectName("btnRedacFolderCork")
self.buttonGroup.addButton(self.btnRedacFolderCork)
self.horizontalLayout_19.addWidget(self.btnRedacFolderCork)
self.btnRedacFolderOutline = QtWidgets.QPushButton(mainEditor)
self.btnRedacFolderOutline.setCheckable(True)
self.btnRedacFolderOutline.setFlat(True)
self.btnRedacFolderOutline.setObjectName("btnRedacFolderOutline")
self.buttonGroup.addButton(self.btnRedacFolderOutline)
self.horizontalLayout_19.addWidget(self.btnRedacFolderOutline)
@ -80,6 +83,7 @@ class Ui_mainEditor(object):
self.btnRedacFullscreen.setText("")
icon = QtGui.QIcon.fromTheme("view-fullscreen")
self.btnRedacFullscreen.setIcon(icon)
self.btnRedacFullscreen.setFlat(True)
self.btnRedacFullscreen.setObjectName("btnRedacFullscreen")
self.horizontalLayout_19.addWidget(self.btnRedacFullscreen)
self.verticalLayout.addLayout(self.horizontalLayout_19)

12
manuskript/ui/editors/mainEditor_ui.ui
View file

@ -55,6 +55,9 @@
<property name="checkable">
<bool>true</bool>
</property>
<property name="flat">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroup</string>
</attribute>
@ -71,6 +74,9 @@
<property name="checked">
<bool>true</bool>
</property>
<property name="flat">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroup</string>
</attribute>
@ -84,6 +90,9 @@
<property name="checkable">
<bool>true</bool>
</property>
<property name="flat">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroup</string>
</attribute>
@ -203,6 +212,9 @@
<property name="shortcut">
<string>F11</string>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
</layout>

52
manuskript/ui/mainWindow.py
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: Fri Apr 8 14:12:57 2016
# 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, 6, 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")
@ -348,12 +349,14 @@ class Ui_MainWindow(object):
self.btnAddPerso.setText("")
icon = QtGui.QIcon.fromTheme("list-add")
self.btnAddPerso.setIcon(icon)
self.btnAddPerso.setFlat(True)
self.btnAddPerso.setObjectName("btnAddPerso")
self.horizontalLayout_14.addWidget(self.btnAddPerso)
self.btnRmPerso = QtWidgets.QPushButton(self.groupBox)
self.btnRmPerso.setText("")
icon = QtGui.QIcon.fromTheme("list-remove")
self.btnRmPerso.setIcon(icon)
self.btnRmPerso.setFlat(True)
self.btnRmPerso.setObjectName("btnRmPerso")
self.horizontalLayout_14.addWidget(self.btnRmPerso)
self.txtPersosFilter = QtWidgets.QLineEdit(self.groupBox)
@ -399,6 +402,7 @@ class Ui_MainWindow(object):
self.btnStepFour = QtWidgets.QPushButton(self.infos)
icon = QtGui.QIcon.fromTheme("go-next")
self.btnStepFour.setIcon(icon)
self.btnStepFour.setFlat(True)
self.btnStepFour.setObjectName("btnStepFour")
self.horizontalLayout_21.addWidget(self.btnStepFour)
self.formLayout.setLayout(8, QtWidgets.QFormLayout.FieldRole, self.horizontalLayout_21)
@ -533,12 +537,14 @@ class Ui_MainWindow(object):
self.btnAddPlot.setText("")
icon = QtGui.QIcon.fromTheme("list-add")
self.btnAddPlot.setIcon(icon)
self.btnAddPlot.setFlat(True)
self.btnAddPlot.setObjectName("btnAddPlot")
self.horizontalLayout_15.addWidget(self.btnAddPlot)
self.btnRmPlot = QtWidgets.QPushButton(self.groupBox_2)
self.btnRmPlot.setText("")
icon = QtGui.QIcon.fromTheme("list-remove")
self.btnRmPlot.setIcon(icon)
self.btnRmPlot.setFlat(True)
self.btnRmPlot.setObjectName("btnRmPlot")
self.horizontalLayout_15.addWidget(self.btnRmPlot)
self.txtPlotFilter = QtWidgets.QLineEdit(self.groupBox_2)
@ -592,6 +598,7 @@ class Ui_MainWindow(object):
self.btnAddPlotPerso.setText("")
icon = QtGui.QIcon.fromTheme("list-add")
self.btnAddPlotPerso.setIcon(icon)
self.btnAddPlotPerso.setFlat(True)
self.btnAddPlotPerso.setObjectName("btnAddPlotPerso")
self.horizontalLayout_16.addWidget(self.btnAddPlotPerso)
self.btnRmPlotPerso = QtWidgets.QPushButton(self.infos_2)
@ -599,6 +606,7 @@ class Ui_MainWindow(object):
self.btnRmPlotPerso.setText("")
icon = QtGui.QIcon.fromTheme("list-remove")
self.btnRmPlotPerso.setIcon(icon)
self.btnRmPlotPerso.setFlat(True)
self.btnRmPlotPerso.setObjectName("btnRmPlotPerso")
self.horizontalLayout_16.addWidget(self.btnRmPlotPerso)
self.verticalLayout_12.addLayout(self.horizontalLayout_16)
@ -642,12 +650,14 @@ class Ui_MainWindow(object):
self.btnAddSubPlot.setText("")
icon = QtGui.QIcon.fromTheme("list-add")
self.btnAddSubPlot.setIcon(icon)
self.btnAddSubPlot.setFlat(True)
self.btnAddSubPlot.setObjectName("btnAddSubPlot")
self.horizontalLayout_17.addWidget(self.btnAddSubPlot)
self.btnRmSubPlot = QtWidgets.QPushButton(self.tab_15)
self.btnRmSubPlot.setText("")
icon = QtGui.QIcon.fromTheme("list-remove")
self.btnRmSubPlot.setIcon(icon)
self.btnRmSubPlot.setFlat(True)
self.btnRmSubPlot.setObjectName("btnRmSubPlot")
self.horizontalLayout_17.addWidget(self.btnRmSubPlot)
spacerItem14 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
@ -658,6 +668,7 @@ class Ui_MainWindow(object):
self.btnShowSubPlotSummary.setIcon(icon)
self.btnShowSubPlotSummary.setCheckable(True)
self.btnShowSubPlotSummary.setChecked(True)
self.btnShowSubPlotSummary.setFlat(True)
self.btnShowSubPlotSummary.setObjectName("btnShowSubPlotSummary")
self.horizontalLayout_17.addWidget(self.btnShowSubPlotSummary)
self.verticalLayout_28.addLayout(self.horizontalLayout_17)
@ -731,12 +742,14 @@ class Ui_MainWindow(object):
self.btnAddWorld.setText("")
icon = QtGui.QIcon.fromTheme("list-add")
self.btnAddWorld.setIcon(icon)
self.btnAddWorld.setFlat(True)
self.btnAddWorld.setObjectName("btnAddWorld")
self.horizontalLayout_19.addWidget(self.btnAddWorld)
self.btnRmWorld = QtWidgets.QPushButton(self.frame_3)
self.btnRmWorld.setText("")
icon = QtGui.QIcon.fromTheme("list-remove")
self.btnRmWorld.setIcon(icon)
self.btnRmWorld.setFlat(True)
self.btnRmWorld.setObjectName("btnRmWorld")
self.horizontalLayout_19.addWidget(self.btnRmWorld)
self.txtWorldFilter = QtWidgets.QLineEdit(self.frame_3)
@ -747,6 +760,7 @@ class Ui_MainWindow(object):
self.btnWorldEmptyData.setText("")
icon = QtGui.QIcon.fromTheme("emblem-favorite")
self.btnWorldEmptyData.setIcon(icon)
self.btnWorldEmptyData.setFlat(True)
self.btnWorldEmptyData.setObjectName("btnWorldEmptyData")
self.horizontalLayout_19.addWidget(self.btnWorldEmptyData)
self.verticalLayout_32.addLayout(self.horizontalLayout_19)
@ -808,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)
@ -835,18 +850,21 @@ class Ui_MainWindow(object):
self.btnOutlineAddFolder.setText("")
icon = QtGui.QIcon.fromTheme("folder-new")
self.btnOutlineAddFolder.setIcon(icon)
self.btnOutlineAddFolder.setFlat(True)
self.btnOutlineAddFolder.setObjectName("btnOutlineAddFolder")
self.horizontalLayout_18.addWidget(self.btnOutlineAddFolder)
self.btnOutlineAddText = QtWidgets.QPushButton(self.layoutWidget)
self.btnOutlineAddText.setText("")
icon = QtGui.QIcon.fromTheme("document-new")
self.btnOutlineAddText.setIcon(icon)
self.btnOutlineAddText.setFlat(True)
self.btnOutlineAddText.setObjectName("btnOutlineAddText")
self.horizontalLayout_18.addWidget(self.btnOutlineAddText)
self.btnOutlineRemoveItem = QtWidgets.QPushButton(self.layoutWidget)
self.btnOutlineRemoveItem.setText("")
icon = QtGui.QIcon.fromTheme("list-remove")
self.btnOutlineRemoveItem.setIcon(icon)
self.btnOutlineRemoveItem.setFlat(True)
self.btnOutlineRemoveItem.setObjectName("btnOutlineRemoveItem")
self.horizontalLayout_18.addWidget(self.btnOutlineRemoveItem)
spacerItem15 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
@ -857,6 +875,7 @@ class Ui_MainWindow(object):
self.btnPlanShowDetails.setIcon(icon)
self.btnPlanShowDetails.setCheckable(True)
self.btnPlanShowDetails.setChecked(True)
self.btnPlanShowDetails.setFlat(True)
self.btnPlanShowDetails.setObjectName("btnPlanShowDetails")
self.horizontalLayout_18.addWidget(self.btnPlanShowDetails)
self.verticalLayout_14.addLayout(self.horizontalLayout_18)
@ -891,18 +910,21 @@ class Ui_MainWindow(object):
self.btnRedacAddFolder.setText("")
icon = QtGui.QIcon.fromTheme("folder-new")
self.btnRedacAddFolder.setIcon(icon)
self.btnRedacAddFolder.setFlat(True)
self.btnRedacAddFolder.setObjectName("btnRedacAddFolder")
self.horizontalLayout_31.addWidget(self.btnRedacAddFolder)
self.btnRedacAddText = QtWidgets.QPushButton(self.treeRedacWidget)
self.btnRedacAddText.setText("")
icon = QtGui.QIcon.fromTheme("document-new")
self.btnRedacAddText.setIcon(icon)
self.btnRedacAddText.setFlat(True)
self.btnRedacAddText.setObjectName("btnRedacAddText")
self.horizontalLayout_31.addWidget(self.btnRedacAddText)
self.btnRedacRemoveItem = QtWidgets.QPushButton(self.treeRedacWidget)
self.btnRedacRemoveItem.setText("")
icon = QtGui.QIcon.fromTheme("list-remove")
self.btnRedacRemoveItem.setIcon(icon)
self.btnRedacRemoveItem.setFlat(True)
self.btnRedacRemoveItem.setObjectName("btnRedacRemoveItem")
self.horizontalLayout_31.addWidget(self.btnRedacRemoveItem)
spacerItem16 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
@ -994,7 +1016,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")
@ -1165,10 +1187,10 @@ class Ui_MainWindow(object):
self.retranslateUi(MainWindow)
self.stack.setCurrentIndex(1)
self.tabMain.setCurrentIndex(4)
self.tabMain.setCurrentIndex(6)
self.tabSummary.setCurrentIndex(0)
self.tabPersos.setCurrentIndex(0)
self.tabPlot.setCurrentIndex(0)
self.tabPlot.setCurrentIndex(1)
self.comboBox_2.setCurrentIndex(0)
self.stkPlotSummary.setCurrentIndex(0)
self.tabWorld.setCurrentIndex(0)
@ -1302,18 +1324,18 @@ class Ui_MainWindow(object):
self.actCompile.setShortcut(_translate("MainWindow", "F6"))
self.actToolFrequency.setText(_translate("MainWindow", "&Frequency Analyzer"))
from manuskript.ui.cheatSheet import cheatSheet
from manuskript.ui.editors.mainEditor import mainEditor
from manuskript.ui.search import search
from manuskript.ui.views.textEditView import textEditView
from manuskript.ui.views.storylineView import storylineView
from manuskript.ui.views.basicItemView import basicItemView
from manuskript.ui.views.outlineView import outlineView
from manuskript.ui.views.metadataView import metadataView
from manuskript.ui.cheatSheet import cheatSheet
from manuskript.ui.views.sldImportance import sldImportance
from manuskript.ui.editors.mainEditor import mainEditor
from manuskript.ui.views.textEditCompleter import textEditCompleter
from manuskript.ui.welcome import welcome
from manuskript.ui.views.characterTreeView import characterTreeView
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.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.search import search

68
manuskript/ui/mainWindow.ui
View file

@ -22,7 +22,7 @@
<number>0</number>
</property>
<property name="topMargin">
<number>6</number>
<number>1</number>
</property>
<property name="rightMargin">
<number>0</number>
@ -124,7 +124,7 @@
<enum>QTabWidget::Rounded</enum>
</property>
<property name="currentIndex">
<number>4</number>
<number>6</number>
</property>
<property name="documentMode">
<bool>true</bool>
@ -739,6 +739,9 @@
<iconset theme="list-add">
<normaloff>../../../../../../../.designer/backup</normaloff>../../../../../../../.designer/backup</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -750,6 +753,9 @@
<iconset theme="list-remove">
<normaloff>../../../../../../../.designer/backup</normaloff>../../../../../../../.designer/backup</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -858,6 +864,9 @@
<iconset theme="go-next">
<normaloff>../../../../../../../.designer/backup</normaloff>../../../../../../../.designer/backup</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
@ -1100,6 +1109,9 @@
<iconset theme="list-add">
<normaloff>../../../../../../../.designer/backup</normaloff>../../../../../../../.designer/backup</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -1111,6 +1123,9 @@
<iconset theme="list-remove">
<normaloff>../../../../../../../.designer/backup</normaloff>../../../../../../../.designer/backup</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -1129,7 +1144,7 @@
</widget>
<widget class="QTabWidget" name="tabPlot">
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<property name="documentMode">
<bool>true</bool>
@ -1222,6 +1237,9 @@
<iconset theme="list-add">
<normaloff>../../../../../../../.designer/backup</normaloff>../../../../../../../.designer/backup</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -1236,6 +1254,9 @@
<iconset theme="list-remove">
<normaloff>../../../../../../../.designer/backup</normaloff>../../../../../../../.designer/backup</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
@ -1301,6 +1322,9 @@
<iconset theme="list-add">
<normaloff>../../../../../../../.designer/backup</normaloff>../../../../../../../.designer/backup</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -1312,6 +1336,9 @@
<iconset theme="list-remove">
<normaloff>../../../../../../../.designer/backup</normaloff>../../../../../../../.designer/backup</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -1342,6 +1369,9 @@
<property name="checked">
<bool>true</bool>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
@ -1485,6 +1515,9 @@
<iconset theme="list-add">
<normaloff>../../../../../../../.designer/backup</normaloff>../../../../../../../.designer/backup</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -1496,6 +1529,9 @@
<iconset theme="list-remove">
<normaloff>../../../../../../../.designer/backup</normaloff>../../../../../../../.designer/backup</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -1524,6 +1560,9 @@
<normaloff/>
</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
@ -1690,6 +1729,9 @@
<iconset theme="folder-new">
<normaloff>../../../../../../../.designer/backup</normaloff>../../../../../../../.designer/backup</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -1701,6 +1743,9 @@
<iconset theme="document-new">
<normaloff>../../../../../../../.designer/backup</normaloff>../../../../../../../.designer/backup</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -1712,6 +1757,9 @@
<iconset theme="list-remove">
<normaloff>../../../../../../../.designer/backup</normaloff>../../../../../../../.designer/backup</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -1742,6 +1790,9 @@
<property name="checked">
<bool>true</bool>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
@ -1819,6 +1870,9 @@
<iconset theme="folder-new">
<normaloff>../../../../../../../.designer/backup</normaloff>../../../../../../../.designer/backup</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -1830,6 +1884,9 @@
<iconset theme="document-new">
<normaloff>../../../../../../../.designer/backup</normaloff>../../../../../../../.designer/backup</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -1841,6 +1898,9 @@
<iconset theme="list-remove">
<normaloff>../../../../../../../.designer/backup</normaloff>../../../../../../../.designer/backup</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -1979,7 +2039,7 @@
<x>0</x>
<y>0</y>
<width>1112</width>
<height>30</height>
<height>20</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">

11
manuskript/ui/revisions_ui.py
View file

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'manuskript/ui/revisions_ui.ui'
#
# Created: Wed Mar 2 00:30:17 2016
# Created: Fri Apr 8 14:30:44 2016
# by: PyQt5 UI code generator 5.2.1
#
# WARNING! All changes made in this file will be lost!
@ -25,14 +25,18 @@ class Ui_revisions(object):
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.list.sizePolicy().hasHeightForWidth())
self.list.setSizePolicy(sizePolicy)
self.list.setFrameShape(QtWidgets.QFrame.NoFrame)
self.list.setObjectName("list")
self.scrollArea = QtWidgets.QScrollArea(self.splitter)
self.scrollArea.setFrameShape(QtWidgets.QFrame.NoFrame)
self.scrollArea.setWidgetResizable(True)
self.scrollArea.setObjectName("scrollArea")
self.scrollAreaWidgetContents = QtWidgets.QWidget()
self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 394, 70))
self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 400, 68))
self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
self.verticalLayout = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents)
self.verticalLayout.setSpacing(0)
self.verticalLayout.setContentsMargins(0, 0, 0, 0)
self.verticalLayout.setObjectName("verticalLayout")
self.view = QtWidgets.QLabel(self.scrollAreaWidgetContents)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
@ -55,6 +59,7 @@ class Ui_revisions(object):
self.btnOptions = QtWidgets.QPushButton(self.layoutWidget)
icon = QtGui.QIcon.fromTheme("preferences-system-symbolic")
self.btnOptions.setIcon(icon)
self.btnOptions.setFlat(True)
self.btnOptions.setObjectName("btnOptions")
self.horizontalLayout_2.addWidget(self.btnOptions)
spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
@ -62,11 +67,13 @@ class Ui_revisions(object):
self.btnRestore = QtWidgets.QPushButton(self.layoutWidget)
icon = QtGui.QIcon.fromTheme("redo")
self.btnRestore.setIcon(icon)
self.btnRestore.setFlat(True)
self.btnRestore.setObjectName("btnRestore")
self.horizontalLayout_2.addWidget(self.btnRestore)
self.btnDelete = QtWidgets.QPushButton(self.layoutWidget)
icon = QtGui.QIcon.fromTheme("edit-delete")
self.btnDelete.setIcon(icon)
self.btnDelete.setFlat(True)
self.btnDelete.setObjectName("btnDelete")
self.horizontalLayout_2.addWidget(self.btnDelete)
self.verticalLayout_2.addWidget(self.splitter)

57
manuskript/ui/revisions_ui.ui
View file

@ -14,7 +14,16 @@
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="margin">
<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>
@ -29,8 +38,14 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
</widget>
<widget class="QScrollArea" name="scrollArea">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
@ -39,11 +54,26 @@
<rect>
<x>0</x>
<y>0</y>
<width>394</width>
<height>70</height>
<width>400</width>
<height>68</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<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="QLabel" name="view">
<property name="sizePolicy">
@ -77,7 +107,12 @@
<string>Options</string>
</property>
<property name="icon">
<iconset theme="preferences-system-symbolic"/>
<iconset theme="preferences-system-symbolic">
<normaloff/>
</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
@ -100,7 +135,12 @@
<string>Restore</string>
</property>
<property name="icon">
<iconset theme="redo"/>
<iconset theme="redo">
<normaloff/>
</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
@ -110,7 +150,12 @@
<string>Delete</string>
</property>
<property name="icon">
<iconset theme="edit-delete"/>
<iconset theme="edit-delete">
<normaloff/>
</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>

3
manuskript/ui/search_ui.py
View file

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'manuskript/ui/search_ui.ui'
#
# Created: Mon Feb 8 10:17:03 2016
# Created: Fri Apr 8 14:27:19 2016
# by: PyQt5 UI code generator 5.2.1
#
# WARNING! All changes made in this file will be lost!
@ -35,6 +35,7 @@ class Ui_search(object):
self.horizontalLayout.addWidget(self.btnOptions)
self.verticalLayout.addLayout(self.horizontalLayout)
self.result = QtWidgets.QListWidget(search)
self.result.setFrameShape(QtWidgets.QFrame.NoFrame)
self.result.setObjectName("result")
self.verticalLayout.addWidget(self.result)

6
manuskript/ui/search_ui.ui
View file

@ -65,7 +65,11 @@
</layout>
</item>
<item>
<widget class="QListWidget" name="result"/>
<widget class="QListWidget" name="result">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
</widget>
</item>
</layout>
</widget>

11
manuskript/ui/views/metadataView_ui.py
View file

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'manuskript/ui/views/metadataView_ui.ui'
#
# Created: Wed Mar 2 00:30:18 2016
# Created: Fri Apr 8 14:24:47 2016
# by: PyQt5 UI code generator 5.2.1
#
# WARNING! All changes made in this file will be lost!
@ -70,6 +70,7 @@ class Ui_metadataView(object):
self.horizontalLayout_29.setContentsMargins(0, 0, 0, 0)
self.horizontalLayout_29.setObjectName("horizontalLayout_29")
self.txtNotes = textEditCompleter(self.grpNotes)
self.txtNotes.setFrameShape(QtWidgets.QFrame.NoFrame)
self.txtNotes.setObjectName("txtNotes")
self.horizontalLayout_29.addWidget(self.txtNotes)
self.verticalLayout.addWidget(self.grpNotes)
@ -101,9 +102,9 @@ class Ui_metadataView(object):
self.txtNotes.setPlaceholderText(_translate("metadataView", "Notes / References"))
self.grpRevisions.setTitle(_translate("metadataView", "Revisions"))
from manuskript.ui.views.lineEditView import lineEditView
from manuskript.ui.views.propertiesView import propertiesView
from manuskript.ui.views.textEditCompleter import textEditCompleter
from manuskript.ui.views.textEditView import textEditView
from manuskript.ui.collapsibleGroupBox2 import collapsibleGroupBox2
from manuskript.ui.views.textEditView import textEditView
from manuskript.ui.views.textEditCompleter import textEditCompleter
from manuskript.ui.views.propertiesView import propertiesView
from manuskript.ui.views.lineEditView import lineEditView
from manuskript.ui.revisions import revisions

3
manuskript/ui/views/metadataView_ui.ui
View file

@ -173,6 +173,9 @@
</property>
<item>
<widget class="textEditCompleter" name="txtNotes">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="placeholderText">
<string>Notes / References</string>
</property>