mirror of
https://github.com/olivierkes/manuskript.git
synced 2024-05-17 11:22:28 +12:00
Some more tweaks
This commit is contained in:
parent
47fb043197
commit
de425cd06a
|
@ -4,7 +4,7 @@ import imp
|
|||
import os
|
||||
|
||||
from PyQt5.QtCore import pyqtSignal, QSignalMapper, QTimer, QSettings, Qt, QRegExp, QUrl, QSize
|
||||
from PyQt5.QtGui import QStandardItemModel, QIcon
|
||||
from PyQt5.QtGui import QStandardItemModel, QIcon, QColor
|
||||
from PyQt5.QtWidgets import QMainWindow, QHeaderView, qApp, QMenu, QActionGroup, QAction, QStyle, QListWidgetItem, \
|
||||
QLabel
|
||||
|
||||
|
@ -768,14 +768,28 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
border-radius: 3px;
|
||||
background: darkgray;
|
||||
}
|
||||
|
||||
""")
|
||||
|
||||
# Custon palette?
|
||||
p = qApp.palette()
|
||||
c = p.color(p.Window)
|
||||
# p.setColor(p.Base, c.lighter(115))
|
||||
p.setColor(p.Base, QColor("#EEE"))
|
||||
qApp.setPalette(p)
|
||||
|
||||
p = self.treeRedacOutline.palette()
|
||||
c = p.color(p.Window)
|
||||
# p.setBrush(p.Base, Qt.red) # That doesn't work, why?
|
||||
# p.setBrush(p.Window, Qt.green)
|
||||
# self.treeRedacOutline.setPalette(p)
|
||||
# self.treeRedacOutline.setStyleSheet("background: {};".format(c.name()))
|
||||
self.treeRedacOutline.setStyleSheet("""
|
||||
QTreeView{
|
||||
background: transparent;
|
||||
margin-top: 30px;
|
||||
}
|
||||
""")
|
||||
|
||||
# Tool bar on the right
|
||||
self.toolbar = collapsibleDockWidgets(Qt.RightDockWidgetArea, self)
|
||||
|
|
|
@ -136,7 +136,7 @@ class verticalButton(QToolButton):
|
|||
margin: 0px;
|
||||
padding: 3px;
|
||||
}
|
||||
QToolButton:checked{
|
||||
/*QToolButton:checked{
|
||||
border: 0px solid darkgray;
|
||||
background: transparent;
|
||||
color: darkblue;
|
||||
|
@ -144,7 +144,16 @@ class verticalButton(QToolButton):
|
|||
QToolButton:hover{
|
||||
border: 0px solid darkgray;
|
||||
color: darkblue;
|
||||
}*/
|
||||
QToolButton:checked{
|
||||
border: 0px solid darkgray;
|
||||
background: #bbbbbb;
|
||||
}
|
||||
QToolButton:hover{
|
||||
border: 0px solid darkgray;
|
||||
background: #cccccc;
|
||||
}
|
||||
|
||||
""")
|
||||
|
||||
def sizeHint(self):
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python
|
||||
# --!-- coding: utf8 --!--
|
||||
from PyQt5.QtCore import Qt
|
||||
from PyQt5.QtWidgets import QWidget, QFrame, QPushButton, QVBoxLayout, QSizePolicy
|
||||
from PyQt5.QtWidgets import QWidget, QFrame, QPushButton, QVBoxLayout, QSizePolicy, qApp
|
||||
|
||||
from manuskript.functions import lightBlue
|
||||
|
||||
|
@ -16,7 +16,8 @@ class collapsibleGroupBox2(QWidget):
|
|||
self.switched = False
|
||||
self.vPolicy = None
|
||||
# self.button.setStyleSheet("background-color: lightBlue;")
|
||||
self.button.setStyleSheet("""
|
||||
|
||||
s1 = """
|
||||
QPushButton{
|
||||
background-color: #BBB;
|
||||
border: none;
|
||||
|
@ -25,7 +26,25 @@ class collapsibleGroupBox2(QWidget):
|
|||
QPushButton:checked, QPushButton:hover{
|
||||
font-style:italic;
|
||||
background-color:lightBlue;
|
||||
}""")
|
||||
}"""
|
||||
|
||||
# p = qApp.palette()
|
||||
# c = p.color(p.Window)
|
||||
|
||||
s2 = """
|
||||
QPushButton{
|
||||
background-color: transparent;
|
||||
border: none;
|
||||
border-top: 1px solid darkgray;
|
||||
padding: 4px 0px;
|
||||
font-weight: bold;
|
||||
}
|
||||
QPushButton:hover{
|
||||
background-color:#cccccc;
|
||||
}
|
||||
"""
|
||||
|
||||
self.button.setStyleSheet(s2)
|
||||
|
||||
def resizeEvent(self, event):
|
||||
if not self.switched:
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# Form implementation generated from reading ui file 'manuskript/ui/compileDialog_ui.ui'
|
||||
#
|
||||
# Created: Wed Mar 2 00:30:17 2016
|
||||
# Created: Fri Apr 8 18:15:48 2016
|
||||
# by: PyQt5 UI code generator 5.2.1
|
||||
#
|
||||
# WARNING! All changes made in this file will be lost!
|
||||
|
|
|
@ -2,7 +2,8 @@
|
|||
|
||||
# Form implementation generated from reading ui file 'manuskript/ui/editors/editorWidget_ui.ui'
|
||||
#
|
||||
# Created by: PyQt5 UI code generator 5.4.2
|
||||
# Created: Fri Apr 8 20:03:08 2016
|
||||
# by: PyQt5 UI code generator 5.2.1
|
||||
#
|
||||
# WARNING! All changes made in this file will be lost!
|
||||
|
||||
|
@ -23,21 +24,23 @@ class Ui_editorWidget_ui(object):
|
|||
self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0)
|
||||
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
|
||||
self.txtRedacText = textEditView(self.text)
|
||||
self.txtRedacText.setFrameShape(QtWidgets.QFrame.NoFrame)
|
||||
self.txtRedacText.setObjectName("txtRedacText")
|
||||
self.horizontalLayout_2.addWidget(self.txtRedacText)
|
||||
self.stack.addWidget(self.text)
|
||||
self.folder = QtWidgets.QWidget()
|
||||
self.folder.setObjectName("folder")
|
||||
self.verticalLayout = QtWidgets.QVBoxLayout(self.folder)
|
||||
self.verticalLayout.setContentsMargins(0, 0, 0, 0)
|
||||
self.verticalLayout.setSpacing(0)
|
||||
self.verticalLayout.setContentsMargins(0, 0, 0, 0)
|
||||
self.verticalLayout.setObjectName("verticalLayout")
|
||||
self.scroll = QtWidgets.QScrollArea(self.folder)
|
||||
self.scroll.setAutoFillBackground(True)
|
||||
self.scroll.setFrameShape(QtWidgets.QFrame.NoFrame)
|
||||
self.scroll.setWidgetResizable(True)
|
||||
self.scroll.setObjectName("scroll")
|
||||
self.scrollAreaWidgetContents = QtWidgets.QWidget()
|
||||
self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 96, 26))
|
||||
self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 400, 300))
|
||||
self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
|
||||
self.scroll.setWidget(self.scrollAreaWidgetContents)
|
||||
self.verticalLayout.addWidget(self.scroll)
|
||||
|
@ -48,6 +51,7 @@ class Ui_editorWidget_ui(object):
|
|||
self.horizontalLayout_3.setContentsMargins(0, 0, 0, 0)
|
||||
self.horizontalLayout_3.setObjectName("horizontalLayout_3")
|
||||
self.corkView = corkView(self.cork)
|
||||
self.corkView.setFrameShape(QtWidgets.QFrame.NoFrame)
|
||||
self.corkView.setObjectName("corkView")
|
||||
self.horizontalLayout_3.addWidget(self.corkView)
|
||||
self.stack.addWidget(self.cork)
|
||||
|
@ -57,19 +61,20 @@ class Ui_editorWidget_ui(object):
|
|||
self.verticalLayout_3.setContentsMargins(0, 0, 0, 0)
|
||||
self.verticalLayout_3.setObjectName("verticalLayout_3")
|
||||
self.outlineView = outlineView(self.outline)
|
||||
self.outlineView.setFrameShape(QtWidgets.QFrame.NoFrame)
|
||||
self.outlineView.setObjectName("outlineView")
|
||||
self.verticalLayout_3.addWidget(self.outlineView)
|
||||
self.stack.addWidget(self.outline)
|
||||
self.verticalLayout_2.addWidget(self.stack)
|
||||
|
||||
self.retranslateUi(editorWidget_ui)
|
||||
self.stack.setCurrentIndex(0)
|
||||
self.stack.setCurrentIndex(3)
|
||||
QtCore.QMetaObject.connectSlotsByName(editorWidget_ui)
|
||||
|
||||
def retranslateUi(self, editorWidget_ui):
|
||||
_translate = QtCore.QCoreApplication.translate
|
||||
editorWidget_ui.setWindowTitle(_translate("editorWidget_ui", "Form"))
|
||||
|
||||
from manuskript.ui.views.corkView import corkView
|
||||
from manuskript.ui.views.outlineView import outlineView
|
||||
from manuskript.ui.views.textEditView import textEditView
|
||||
from manuskript.ui.views.corkView import corkView
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
<item>
|
||||
<widget class="QStackedWidget" name="stack">
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
<number>3</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="text">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
|
@ -46,7 +46,11 @@
|
|||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="textEditView" name="txtRedacText"/>
|
||||
<widget class="textEditView" name="txtRedacText">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
|
@ -72,6 +76,9 @@
|
|||
<property name="autoFillBackground">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
<property name="widgetResizable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
|
@ -80,8 +87,8 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>96</width>
|
||||
<height>26</height>
|
||||
<width>400</width>
|
||||
<height>300</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
|
@ -104,7 +111,11 @@
|
|||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="corkView" name="corkView"/>
|
||||
<widget class="corkView" name="corkView">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
|
@ -123,7 +134,11 @@
|
|||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="outlineView" name="outlineView"/>
|
||||
<widget class="outlineView" name="outlineView">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
|
|
|
@ -50,28 +50,35 @@ class mainEditor(QWidget, Ui_mainEditor):
|
|||
self.btnRedacFullscreen.clicked.connect(
|
||||
self.showFullScreen, AUC)
|
||||
|
||||
# FIXME: can we do something that looks good?
|
||||
# How to remove the line under the tabs?
|
||||
# self.setStyleSheet("""
|
||||
# QTabWidget::tab-bar{
|
||||
# border:none;
|
||||
# }
|
||||
# QTabBar::tab{
|
||||
# padding: 2px 10px;
|
||||
# margin: 2px;
|
||||
# border-top: none;
|
||||
# border-radius: 1px;
|
||||
# background: transparent;
|
||||
# }
|
||||
#
|
||||
# QTabBar::tab:selected{
|
||||
# border-top: 3px solid orange;
|
||||
# border-radius: 3px;
|
||||
# }
|
||||
# QTabBar::tab:hover{
|
||||
# background: darkgray;
|
||||
# }
|
||||
# """)
|
||||
self.tab.setDocumentMode(False)
|
||||
self.tab.setStyleSheet("""
|
||||
QTabWidget::pane{
|
||||
margin-top: -1px;
|
||||
border: 1px solid #999;
|
||||
}
|
||||
QTabWidget::tab-bar{
|
||||
left:10px;
|
||||
}
|
||||
QTabBar{
|
||||
background: transparent;
|
||||
border-radius: 0;
|
||||
border: 0px;
|
||||
}
|
||||
QTabBar::tab{
|
||||
margin: 2px 0 0 0;
|
||||
padding: 2px 9px;
|
||||
border: 1px solid #999;
|
||||
border-bottom: 0px;
|
||||
margin-top: 3px;
|
||||
}
|
||||
QTabBar::tab:selected{
|
||||
border: 1px solid #999;
|
||||
background: white;
|
||||
border-bottom: 0px;
|
||||
margin-top: 0px;
|
||||
}
|
||||
|
||||
""")
|
||||
|
||||
###############################################################################
|
||||
# TABS
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# Form implementation generated from reading ui file 'manuskript/ui/editors/mainEditor_ui.ui'
|
||||
#
|
||||
# Created: Fri Apr 8 13:43:25 2016
|
||||
# Created: Fri Apr 8 18:15:49 2016
|
||||
# by: PyQt5 UI code generator 5.2.1
|
||||
#
|
||||
# WARNING! All changes made in this file will be lost!
|
||||
|
|
|
@ -2,7 +2,8 @@
|
|||
|
||||
# Form implementation generated from reading ui file 'manuskript/ui/editors/textFormat_ui.ui'
|
||||
#
|
||||
# Created by: PyQt5 UI code generator 5.4.1
|
||||
# Created: Fri Apr 8 18:15:49 2016
|
||||
# by: PyQt5 UI code generator 5.2.1
|
||||
#
|
||||
# WARNING! All changes made in this file will be lost!
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# Form implementation generated from reading ui file 'manuskript/ui/mainWindow.ui'
|
||||
#
|
||||
# Created: Fri Apr 8 14:12:57 2016
|
||||
# Created: Fri Apr 8 18:22:09 2016
|
||||
# by: PyQt5 UI code generator 5.2.1
|
||||
#
|
||||
# WARNING! All changes made in this file will be lost!
|
||||
|
@ -900,6 +900,8 @@ class Ui_MainWindow(object):
|
|||
self.verticalLayout_30.setContentsMargins(0, 0, 0, 0)
|
||||
self.verticalLayout_30.setObjectName("verticalLayout_30")
|
||||
self.treeRedacOutline = treeView(self.treeRedacWidget)
|
||||
self.treeRedacOutline.setAutoFillBackground(True)
|
||||
self.treeRedacOutline.setFrameShape(QtWidgets.QFrame.NoFrame)
|
||||
self.treeRedacOutline.setEditTriggers(QtWidgets.QAbstractItemView.EditKeyPressed)
|
||||
self.treeRedacOutline.setObjectName("treeRedacOutline")
|
||||
self.treeRedacOutline.header().setVisible(False)
|
||||
|
@ -1324,18 +1326,18 @@ class Ui_MainWindow(object):
|
|||
self.actCompile.setShortcut(_translate("MainWindow", "F6"))
|
||||
self.actToolFrequency.setText(_translate("MainWindow", "&Frequency Analyzer"))
|
||||
|
||||
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.plotTreeView import plotTreeView
|
||||
from manuskript.ui.views.treeView import treeView
|
||||
from manuskript.ui.views.sldImportance import sldImportance
|
||||
from manuskript.ui.views.metadataView import metadataView
|
||||
from manuskript.ui.search import search
|
||||
from manuskript.ui.views.lineEditView import lineEditView
|
||||
from manuskript.ui.views.basicItemView import basicItemView
|
||||
from manuskript.ui.views.textEditView import textEditView
|
||||
from manuskript.ui.welcome import welcome
|
||||
from manuskript.ui.editors.mainEditor import mainEditor
|
||||
from manuskript.ui.views.storylineView import storylineView
|
||||
from manuskript.ui.views.textEditCompleter import textEditCompleter
|
||||
from manuskript.ui.views.treeView import treeView
|
||||
from manuskript.ui.views.characterTreeView import characterTreeView
|
||||
from manuskript.ui.views.outlineView import outlineView
|
||||
from manuskript.ui.cheatSheet import cheatSheet
|
||||
|
|
|
@ -1851,6 +1851,12 @@
|
|||
</property>
|
||||
<item>
|
||||
<widget class="treeView" name="treeRedacOutline">
|
||||
<property name="autoFillBackground">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
<property name="editTriggers">
|
||||
<set>QAbstractItemView::EditKeyPressed</set>
|
||||
</property>
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# Form implementation generated from reading ui file 'manuskript/ui/search_ui.ui'
|
||||
#
|
||||
# Created: Fri Apr 8 14:27:19 2016
|
||||
# Created: Fri Apr 8 18:15:49 2016
|
||||
# by: PyQt5 UI code generator 5.2.1
|
||||
#
|
||||
# WARNING! All changes made in this file will be lost!
|
||||
|
|
Loading…
Reference in a new issue