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

UI tweaks

Browse source
This commit is contained in:
Olivier Keshavjee 2016-02-08 10:30:32 +01:00
parent b1f5c17497
commit c7a4ae6072
9 changed files with 260 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
manuskript/mainWindow.py
View file

@ -795,7 +795,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
# Custom "tab" bar on the left
self.lstTabs.setIconSize(QSize(48, 48))
self.dckNavigation.setTitleBarWidget(QLabel())
for i in range(self.tabMain.count()):
icons = ["general-128px.png",
"summary-128px.png",

24
manuskript/ui/cheatSheet_ui.py
View file

@ -2,23 +2,33 @@
# Form implementation generated from reading ui file 'manuskript/ui/cheatSheet_ui.ui'
#
# Created by: PyQt5 UI code generator 5.4.1
# Created: Mon Feb 8 10:28:58 2016
# by: PyQt5 UI code generator 5.2.1
#
# WARNING! All changes made in this file will be lost!
from PyQt5 import QtCore, QtWidgets
from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_cheatSheet(object):
def setupUi(self, cheatSheet):
cheatSheet.setObjectName("cheatSheet")
cheatSheet.resize(400, 344)
self.verticalLayout_2 = QtWidgets.QVBoxLayout(cheatSheet)
self.verticalLayout_2.setSpacing(0)
self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
self.verticalLayout_2.setObjectName("verticalLayout_2")
self.txtFilter = QtWidgets.QLineEdit(cheatSheet)
self.txtFilter.setProperty("clearButtonEnabled", True)
self.txtFilter.setFrame(False)
self.txtFilter.setClearButtonEnabled(True)
self.txtFilter.setObjectName("txtFilter")
self.verticalLayout_2.addWidget(self.txtFilter)
self.line = QtWidgets.QFrame(cheatSheet)
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)
self.splitter.setOrientation(QtCore.Qt.Vertical)
self.splitter.setObjectName("splitter")
@ -28,14 +38,19 @@ class Ui_cheatSheet(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.setLineWidth(0)
self.scrollArea.setWidgetResizable(True)
self.scrollArea.setObjectName("scrollArea")
self.scrollAreaWidgetContents = QtWidgets.QWidget()
self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 396, 119))
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)
@ -43,6 +58,7 @@ class Ui_cheatSheet(object):
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.view.sizePolicy().hasHeightForWidth())
self.view.setSizePolicy(sizePolicy)
self.view.setLineWidth(0)
self.view.setText("")
self.view.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
self.view.setWordWrap(True)

63
manuskript/ui/cheatSheet_ui.ui
View file

@ -14,19 +14,47 @@
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="margin">
<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="QLineEdit" name="txtFilter">
<property name="frame">
<bool>false</bool>
</property>
<property name="placeholderText">
<string>Filter</string>
</property>
<property name="clearButtonEnabled" stdset="0">
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line">
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QSplitter" name="splitter">
<property name="orientation">
@ -39,8 +67,17 @@
<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="lineWidth">
<number>0</number>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
@ -49,11 +86,26 @@
<rect>
<x>0</x>
<y>0</y>
<width>396</width>
<height>119</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">
@ -62,6 +114,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<property name="text">
<string/>
</property>

15
manuskript/ui/collapsibleDockWidgets.py
View file

@ -2,7 +2,7 @@
# --!-- coding: utf8 --!--
from PyQt5.QtCore import Qt
from PyQt5.QtWidgets import QToolBar, QDockWidget, QAction, QToolButton, QSizePolicy, QStylePainter, \
QStyleOptionButton, QStyle
QStyleOptionButton, QStyle, QLabel
class collapsibleDockWidgets(QToolBar):
@ -35,6 +35,19 @@ class collapsibleDockWidgets(QToolBar):
for d in self._dockWidgets():
b = verticalButton(self)
b.setDefaultAction(d.toggleViewAction())
# d.setStyleSheet("QDockWidget::title{background-color: red;}")
# d.setTitleBarWidget(QLabel(d.windowTitle()))
d.setStyleSheet("""
QDockWidget::title {
text-align: left; /* align the text to the left */
background: lightBlue;
padding: 5px;
}
QDockWidget::close-button, QDockWidget::float-button {
background: lightBlue;
}
""")
self.addWidget(b)
self.addSeparator()

18
manuskript/ui/collapsibleGroupBox2.py
View file

@ -3,6 +3,8 @@
from PyQt5.QtCore import Qt
from PyQt5.QtWidgets import QWidget, QFrame, QPushButton, QVBoxLayout, QSizePolicy
from manuskript.functions import lightBlue
class collapsibleGroupBox2(QWidget):
def __init__(self, parent=None):
@ -13,7 +15,17 @@ class collapsibleGroupBox2(QWidget):
self.button.setChecked(True)
self.switched = False
self.vPolicy = None
self.button.setStyleSheet("background: lightBlue;")
# self.button.setStyleSheet("background-color: lightBlue;")
self.button.setStyleSheet("""
QPushButton{
background-color: #BBB;
border: none;
padding: 2px;
}
QPushButton:checked, QPushButton:hover{
font-style:italic;
background-color:lightBlue;
}""")
def resizeEvent(self, event):
if not self.switched:
@ -24,10 +36,12 @@ class collapsibleGroupBox2(QWidget):
self.frame.setLayout(self.layout())
self.wLayout = QVBoxLayout(self)
self.wLayout.setContentsMargins(0, 0, 0, 0)
self.wLayout.setSpacing(0)
self.wLayout.addWidget(self.button)
self.wLayout.addWidget(self.frame)
self.button.toggled.connect(self.setExpanded)
self.frame.layout().setContentsMargins(5, 0, 5, 0)
self.frame.layout().setContentsMargins(0, 0, 0, 4)
self.frame.layout().setSpacing(0)
self.switched = True
self.vPolicy = self.sizePolicy().verticalPolicy()

9
manuskript/ui/search_ui.py
View file

@ -2,7 +2,8 @@
# Form implementation generated from reading ui file 'manuskript/ui/search_ui.ui'
#
# Created by: PyQt5 UI code generator 5.4.1
# Created: Mon Feb 8 10:17:03 2016
# by: PyQt5 UI code generator 5.2.1
#
# WARNING! All changes made in this file will be lost!
@ -13,12 +14,15 @@ class Ui_search(object):
search.setObjectName("search")
search.resize(400, 300)
self.verticalLayout = QtWidgets.QVBoxLayout(search)
self.verticalLayout.setSpacing(0)
self.verticalLayout.setContentsMargins(0, 0, 0, 0)
self.verticalLayout.setObjectName("verticalLayout")
self.horizontalLayout = QtWidgets.QHBoxLayout()
self.horizontalLayout.setSpacing(0)
self.horizontalLayout.setObjectName("horizontalLayout")
self.text = QtWidgets.QLineEdit(search)
self.text.setProperty("clearButtonEnabled", True)
self.text.setFrame(False)
self.text.setClearButtonEnabled(True)
self.text.setObjectName("text")
self.horizontalLayout.addWidget(self.text)
self.btnOptions = QtWidgets.QPushButton(search)
@ -26,6 +30,7 @@ class Ui_search(object):
icon = QtGui.QIcon.fromTheme("edit-find")
self.btnOptions.setIcon(icon)
self.btnOptions.setCheckable(True)
self.btnOptions.setFlat(True)
self.btnOptions.setObjectName("btnOptions")
self.horizontalLayout.addWidget(self.btnOptions)
self.verticalLayout.addLayout(self.horizontalLayout)

29
manuskript/ui/search_ui.ui
View file

@ -14,14 +14,32 @@
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<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>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QLineEdit" name="text">
<property name="clearButtonEnabled" stdset="0">
<property name="frame">
<bool>false</bool>
</property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
@ -32,11 +50,16 @@
<string/>
</property>
<property name="icon">
<iconset theme="edit-find"/>
<iconset theme="edit-find">
<normaloff/>
</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
</layout>

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

@ -2,7 +2,8 @@
# Form implementation generated from reading ui file 'manuskript/ui/views/metadataView_ui.ui'
#
# Created by: PyQt5 UI code generator 5.4.2
# Created: Mon Feb 8 09:48:05 2016
# by: PyQt5 UI code generator 5.2.1
#
# WARNING! All changes made in this file will be lost!
@ -13,6 +14,7 @@ class Ui_metadataView(object):
metadataView.setObjectName("metadataView")
metadataView.resize(400, 537)
self.verticalLayout = QtWidgets.QVBoxLayout(metadataView)
self.verticalLayout.setSpacing(0)
self.verticalLayout.setContentsMargins(0, 0, 0, 0)
self.verticalLayout.setObjectName("verticalLayout")
self.grpProperties = collapsibleGroupBox2(metadataView)
@ -25,6 +27,7 @@ class Ui_metadataView(object):
self.grpProperties.setCheckable(True)
self.grpProperties.setObjectName("grpProperties")
self.verticalLayout_28 = QtWidgets.QVBoxLayout(self.grpProperties)
self.verticalLayout_28.setSpacing(0)
self.verticalLayout_28.setContentsMargins(0, 0, 0, 0)
self.verticalLayout_28.setObjectName("verticalLayout_28")
self.properties = propertiesView(self.grpProperties)
@ -37,13 +40,24 @@ class Ui_metadataView(object):
self.grpSummary.setCheckable(True)
self.grpSummary.setObjectName("grpSummary")
self.verticalLayout_22 = QtWidgets.QVBoxLayout(self.grpSummary)
self.verticalLayout_22.setSpacing(0)
self.verticalLayout_22.setContentsMargins(0, 0, 0, 0)
self.verticalLayout_22.setObjectName("verticalLayout_22")
self.txtSummarySentance = lineEditView(self.grpSummary)
self.txtSummarySentance.setInputMask("")
self.txtSummarySentance.setFrame(False)
self.txtSummarySentance.setObjectName("txtSummarySentance")
self.verticalLayout_22.addWidget(self.txtSummarySentance)
self.line = QtWidgets.QFrame(self.grpSummary)
self.line.setFrameShadow(QtWidgets.QFrame.Plain)
self.line.setLineWidth(0)
self.line.setMidLineWidth(0)
self.line.setFrameShape(QtWidgets.QFrame.HLine)
self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
self.line.setObjectName("line")
self.verticalLayout_22.addWidget(self.line)
self.txtSummaryFull = textEditView(self.grpSummary)
self.txtSummaryFull.setFrameShape(QtWidgets.QFrame.NoFrame)
self.txtSummaryFull.setObjectName("txtSummaryFull")
self.verticalLayout_22.addWidget(self.txtSummaryFull)
self.verticalLayout.addWidget(self.grpSummary)
@ -52,6 +66,7 @@ class Ui_metadataView(object):
self.grpNotes.setCheckable(True)
self.grpNotes.setObjectName("grpNotes")
self.horizontalLayout_29 = QtWidgets.QHBoxLayout(self.grpNotes)
self.horizontalLayout_29.setSpacing(0)
self.horizontalLayout_29.setContentsMargins(0, 0, 0, 0)
self.horizontalLayout_29.setObjectName("horizontalLayout_29")
self.txtNotes = textEditCompleter(self.grpNotes)
@ -63,6 +78,7 @@ class Ui_metadataView(object):
self.grpRevisions.setCheckable(True)
self.grpRevisions.setObjectName("grpRevisions")
self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.grpRevisions)
self.verticalLayout_2.setSpacing(0)
self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
self.verticalLayout_2.setObjectName("verticalLayout_2")
self.revisions = revisions(self.grpRevisions)
@ -80,12 +96,14 @@ class Ui_metadataView(object):
self.grpProperties.setTitle(_translate("metadataView", "Properties"))
self.grpSummary.setTitle(_translate("metadataView", "Summary"))
self.txtSummarySentance.setPlaceholderText(_translate("metadataView", "One line summary"))
self.txtSummaryFull.setPlaceholderText(_translate("metadataView", "Full summary"))
self.grpNotes.setTitle(_translate("metadataView", "Notes / References"))
self.txtNotes.setPlaceholderText(_translate("metadataView", "Notes / References"))
self.grpRevisions.setTitle(_translate("metadataView", "Revisions"))
from manuskript.ui.collapsibleGroupBox2 import collapsibleGroupBox2
from manuskript.ui.revisions import 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.views.lineEditView import lineEditView
from manuskript.ui.collapsibleGroupBox2 import collapsibleGroupBox2

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

@ -14,7 +14,19 @@
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<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>
@ -35,7 +47,19 @@
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_28">
<property name="margin">
<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>
@ -63,7 +87,19 @@
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_22">
<property name="margin">
<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>
@ -71,13 +107,39 @@
<property name="inputMask">
<string/>
</property>
<property name="frame">
<bool>false</bool>
</property>
<property name="placeholderText">
<string>One line summary</string>
</property>
</widget>
</item>
<item>
<widget class="textEditView" name="txtSummaryFull"/>
<widget class="Line" name="line">
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<property name="midLineWidth">
<number>0</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="textEditView" name="txtSummaryFull">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="placeholderText">
<string>Full summary</string>
</property>
</widget>
</item>
</layout>
</widget>
@ -94,11 +156,27 @@
<bool>true</bool>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_29">
<property name="margin">
<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="textEditCompleter" name="txtNotes"/>
<widget class="textEditCompleter" name="txtNotes">
<property name="placeholderText">
<string>Notes / References</string>
</property>
</widget>
</item>
</layout>
</widget>
@ -115,7 +193,19 @@
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="margin">
<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>