diff --git a/resources/backgrounds/spacedreams.jpg b/resources/backgrounds/spacedreams.jpg new file mode 100644 index 0000000..26cd14f Binary files /dev/null and b/resources/backgrounds/spacedreams.jpg differ diff --git a/resources/backgrounds/writingdesk.jpg b/resources/backgrounds/writingdesk.jpg new file mode 100644 index 0000000..836ade7 Binary files /dev/null and b/resources/backgrounds/writingdesk.jpg differ diff --git a/src/mainWindow.py b/src/mainWindow.py index c6c562b..1b4051d 100644 --- a/src/mainWindow.py +++ b/src/mainWindow.py @@ -389,6 +389,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.btnRedacFolderOutline.setChecked(True) self.tabMain.setCurrentIndex(settings.lastTab) self.treeRedacOutline.setCurrentIndex(self.mdlOutline.indexFromPath(settings.lastIndex)) + self.redacEditor.corkView.updateBackground() # Set autosave self.saveTimer = QTimer() @@ -640,10 +641,10 @@ class MainWindow(QMainWindow, Ui_MainWindow): #################################################################################################### def settingsLabel(self): - self.settingsWindow(2) + self.settingsWindow("Labels") def settingsStatus(self): - self.settingsWindow(3) + self.settingsWindow("Status") def settingsWindow(self, tab=None): self.sw = settingsWindow(self) @@ -654,7 +655,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): r2 = self.geometry() self.sw.move(r2.center() - r.center()) if tab: - self.sw.tabWidget.setCurrentIndex(tab) + self.sw.setTab(tab) self.sw.show() #################################################################################################### diff --git a/src/settings.py b/src/settings.py index fa06c74..99abbfc 100644 --- a/src/settings.py +++ b/src/settings.py @@ -38,11 +38,16 @@ saveOnQuit = True outlineViewColumns = [Outline.title.value, Outline.POV.value, Outline.status.value, Outline.compile.value, Outline.wordCount.value, Outline.goal.value, Outline.goalPercentage.value, Outline.label.value] +corkBackground = { + "color": "#926239", + "image": "" + } def save(filename=None): global spellcheck, dict, corkSliderFactor, viewSettings, corkSizeFactor, folderView, lastTab, lastIndex, \ - autoSave, autoSaveDelay, saveOnQuit, autoSaveNoChanges, autoSaveNoChangesDelay, outlineViewColumns + autoSave, autoSaveDelay, saveOnQuit, autoSaveNoChanges, autoSaveNoChangesDelay, outlineViewColumns, \ + corkBackground allSettings = { "viewSettings": viewSettings, @@ -58,6 +63,7 @@ def save(filename=None): "autoSaveNoChanges":autoSaveNoChanges, "autoSaveNoChangesDelay":autoSaveNoChangesDelay, "outlineViewColumns":outlineViewColumns, + "corkBackground":corkBackground, } #pp=pprint.PrettyPrinter(indent=4, compact=False) @@ -141,4 +147,7 @@ def load(string, fromString=False): if "outlineViewColumns" in allSettings: global outlineViewColumns outlineViewColumns = allSettings["outlineViewColumns"] - \ No newline at end of file + + if "corkBackground" in allSettings: + global corkBackground + corkBackground = allSettings["corkBackground"] \ No newline at end of file diff --git a/src/settingsWindow.py b/src/settingsWindow.py index aef06c7..be8cffa 100644 --- a/src/settingsWindow.py +++ b/src/settingsWindow.py @@ -7,6 +7,8 @@ from ui.settings import * from enums import * from functions import * import settings +import os + # Spell checker support try: import enchant @@ -18,9 +20,14 @@ class settingsWindow(QWidget, Ui_Settings): def __init__(self, mainWindow): QWidget.__init__(self) self.setupUi(self) - self.mw = mainWindow + # UI + for i in range(self.lstMenu.count()): + item = self.lstMenu.item(i) + item.setSizeHint(QSize(item.sizeHint().width(), 42)) + item.setTextAlignment(Qt.AlignCenter) + # General self.cmbStyle.addItems(list(QStyleFactory.keys())) self.cmbStyle.setCurrentIndex([i.lower() for i in list(QStyleFactory.keys())].index(qApp.style().objectName())) @@ -40,6 +47,7 @@ class settingsWindow(QWidget, Ui_Settings): self.txtAutoSaveNoChanges.textEdited.connect(self.saveSettingsChanged) # Views + self.tabViews.setCurrentIndex(0) lst = ["Nothing", "POV", "Label", "Progress", "Compile"] for cmb in self.viewSettingsDatas(): item, part = self.viewSettingsDatas()[cmb] @@ -50,6 +58,11 @@ class settingsWindow(QWidget, Ui_Settings): col = self.outlineColumnsData()[chk] chk.setChecked(col in settings.outlineViewColumns) chk.stateChanged.connect(self.outlineColumnsChanged) + + self.populatesCorkBackgrounds() + self.updateCorkColor() + self.cmbCorkImage.currentIndexChanged.connect(self.setCorkBackground) + self.btnCorkColor.clicked.connect(self.setCorkColor) # Labels self.lstLabels.setModel(self.mw.mdlLabels) @@ -65,6 +78,19 @@ class settingsWindow(QWidget, Ui_Settings): self.btnStatusAdd.clicked.connect(self.addStatus) self.btnStatusRemove.clicked.connect(self.removeStatus) + def setTab(self, tab): + + tabs = { + "General":0, + "Views":1, + "Labels":2, + "Status":3, + } + + if tab in tabs: + self.lstMenu.setCurrentRow(tabs[tab]) + else: + self.lstMenu.setCurrentRow(tab) #################################################################################################### # GENERAL # #################################################################################################### @@ -140,6 +166,46 @@ class settingsWindow(QWidget, Ui_Settings): self.mw.redacEditor.outlineView.hideColumns() self.mw.treePlanOutline.hideColumns() + def setCorkColor(self): + color = QColor(settings.corkBackground["color"]) + self.colorDialog = QColorDialog(color, self) + color = self.colorDialog.getColor(color) + settings.corkBackground["color"] = color.name() + self.updateCorkColor() + # Update Cork view + self.mw.redacEditor.corkView.updateBackground() + + def updateCorkColor(self): + self.btnCorkColor.setStyleSheet("background:{};".format(settings.corkBackground["color"])) + + def setCorkBackground(self, i): + img = self.cmbCorkImage.itemData(i) + if img: + settings.corkBackground["image"] = os.path.join("resources/backgrounds", img) + else: + settings.corkBackground["image"] = "" + # Update Cork view + self.mw.redacEditor.corkView.updateBackground() + + def populatesCorkBackgrounds(self): + #self.cmbDelegate = cmbPixmapDelegate() + #self.cmbCorkImage.setItemDelegate(self.cmbDelegate) + + path = "resources/backgrounds" + lst = os.listdir(path) + self.cmbCorkImage.addItem(QIcon.fromTheme("list-remove"), "", "") + for l in lst: + if l.lower()[-4:] in [".jpg", ".png"] or \ + l.lower()[-5:] in [".jpeg"]: + px = QPixmap(os.path.join(path, l)).scaled(128, 64, Qt.KeepAspectRatio) + self.cmbCorkImage.addItem(QIcon(px), "", l) + + self.cmbCorkImage.setIconSize(QSize(128, 64)) + + if settings.corkBackground["image"] != "": + i = self.cmbCorkImage.findData(settings.corkBackground["image"]) + if i != -1: + self.cmbCorkImage.setCurrentIndex(i) #################################################################################################### # STATUS # @@ -151,16 +217,17 @@ class settingsWindow(QWidget, Ui_Settings): def removeStatus(self): for i in self.lstStatus.selectedIndexes(): self.mw.mdlStatus.removeRows(i.row(), 1) - - def updateLabelColor(self, index): - px = QPixmap(64, 64) - px.fill(iconColor(self.mw.mdlLabels.item(index.row()).icon())) - self.btnLabelColor.setIcon(QIcon(px)) - self.btnLabelColor.setEnabled(True) #################################################################################################### # LABELS # #################################################################################################### + + def updateLabelColor(self, index): + #px = QPixmap(64, 64) + #px.fill(iconColor(self.mw.mdlLabels.item(index.row()).icon())) + #self.btnLabelColor.setIcon(QIcon(px)) + self.btnLabelColor.setStyleSheet("background:{};".format(iconColor(self.mw.mdlLabels.item(index.row()).icon()).name())) + self.btnLabelColor.setEnabled(True) def addLabel(self): px = QPixmap(32, 32) @@ -179,4 +246,4 @@ class settingsWindow(QWidget, Ui_Settings): px = QPixmap(32, 32) px.fill(color) self.mw.mdlLabels.item(index.row()).setIcon(QIcon(px)) - \ No newline at end of file + self.updateLabelColor(index) \ No newline at end of file diff --git a/src/ui/mainWindow.py b/src/ui/mainWindow.py index 3be8ac0..a076e18 100644 --- a/src/ui/mainWindow.py +++ b/src/ui/mainWindow.py @@ -1234,7 +1234,7 @@ class Ui_MainWindow(object): self.actShowHelp.setText(_translate("MainWindow", "Show help texts")) self.actShowHelp.setShortcut(_translate("MainWindow", "Ctrl+Shift+B")) self.actSpellcheck.setText(_translate("MainWindow", "Spellcheck")) - self.actSpellcheck.setShortcut(_translate("MainWindow", "F8")) + self.actSpellcheck.setShortcut(_translate("MainWindow", "F9")) self.actLabels.setText(_translate("MainWindow", "Labels...")) self.actStatus.setText(_translate("MainWindow", "Status...")) self.actViewTree.setText(_translate("MainWindow", "Tree")) @@ -1244,12 +1244,13 @@ class Ui_MainWindow(object): self.actViewCork.setText(_translate("MainWindow", "Index cards")) self.actViewOutline.setText(_translate("MainWindow", "Outline")) self.actSettings.setText(_translate("MainWindow", "Settings")) + self.actSettings.setShortcut(_translate("MainWindow", "F8")) -from ui.views.treeView import treeView -from ui.views.lineEditView import lineEditView from ui.sldImportance import sldImportance from ui.editors.editorWidget import editorWidget -from ui.views.textEditView import textEditView -from ui.views.basicItemView import basicItemView -from ui.views.outlineView import outlineView from ui.views.metadataView import metadataView +from ui.views.outlineView import outlineView +from ui.views.lineEditView import lineEditView +from ui.views.treeView import treeView +from ui.views.basicItemView import basicItemView +from ui.views.textEditView import textEditView diff --git a/src/ui/mainWindow.ui b/src/ui/mainWindow.ui index c954fcc..16c5da2 100644 --- a/src/ui/mainWindow.ui +++ b/src/ui/mainWindow.ui @@ -2043,7 +2043,7 @@ Spellcheck - F8 + F9 @@ -2100,11 +2100,16 @@ - + + + Settings + + F8 + diff --git a/src/ui/settings.py b/src/ui/settings.py index fc97466..1ba72f2 100644 --- a/src/ui/settings.py +++ b/src/ui/settings.py @@ -11,34 +11,81 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_Settings(object): def setupUi(self, Settings): Settings.setObjectName("Settings") - Settings.resize(485, 585) - self.verticalLayout = QtWidgets.QVBoxLayout(Settings) - self.verticalLayout.setObjectName("verticalLayout") - self.tabWidget = QtWidgets.QTabWidget(Settings) - self.tabWidget.setDocumentMode(True) - self.tabWidget.setObjectName("tabWidget") - self.tab_3 = QtWidgets.QWidget() - self.tab_3.setObjectName("tab_3") - self.verticalLayout_7 = QtWidgets.QVBoxLayout(self.tab_3) + Settings.resize(551, 378) + self.horizontalLayout_8 = QtWidgets.QHBoxLayout(Settings) + self.horizontalLayout_8.setObjectName("horizontalLayout_8") + self.lstMenu = QtWidgets.QListWidget(Settings) + self.lstMenu.setObjectName("lstMenu") + item = QtWidgets.QListWidgetItem() + self.lstMenu.addItem(item) + item = QtWidgets.QListWidgetItem() + self.lstMenu.addItem(item) + item = QtWidgets.QListWidgetItem() + self.lstMenu.addItem(item) + item = QtWidgets.QListWidgetItem() + self.lstMenu.addItem(item) + self.horizontalLayout_8.addWidget(self.lstMenu) + self.stack = QtWidgets.QStackedWidget(Settings) + self.stack.setObjectName("stack") + self.stackedWidgetPage1 = QtWidgets.QWidget() + self.stackedWidgetPage1.setObjectName("stackedWidgetPage1") + self.verticalLayout_7 = QtWidgets.QVBoxLayout(self.stackedWidgetPage1) + self.verticalLayout_7.setContentsMargins(0, 0, 0, 0) self.verticalLayout_7.setObjectName("verticalLayout_7") - self.groupBox_2 = QtWidgets.QGroupBox(self.tab_3) + self.lblTitleGeneral = QtWidgets.QLabel(self.stackedWidgetPage1) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.lblTitleGeneral.sizePolicy().hasHeightForWidth()) + self.lblTitleGeneral.setSizePolicy(sizePolicy) + self.lblTitleGeneral.setStyleSheet("background-color:lightBlue;\n" +"border:none;\n" +"padding:10px;\n" +"color:darkBlue;\n" +"font-size:16px;\n" +"font-weight:bold;\n" +"text-align:center;") + self.lblTitleGeneral.setAlignment(QtCore.Qt.AlignCenter) + self.lblTitleGeneral.setObjectName("lblTitleGeneral") + self.verticalLayout_7.addWidget(self.lblTitleGeneral) + self.groupBox_2 = QtWidgets.QGroupBox(self.stackedWidgetPage1) + font = QtGui.QFont() + font.setBold(True) + font.setWeight(75) + self.groupBox_2.setFont(font) self.groupBox_2.setObjectName("groupBox_2") self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.groupBox_2) self.verticalLayout_5.setObjectName("verticalLayout_5") self.label_2 = QtWidgets.QLabel(self.groupBox_2) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.label_2.setFont(font) self.label_2.setObjectName("label_2") self.verticalLayout_5.addWidget(self.label_2) self.cmbStyle = QtWidgets.QComboBox(self.groupBox_2) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.cmbStyle.setFont(font) self.cmbStyle.setObjectName("cmbStyle") self.verticalLayout_5.addWidget(self.cmbStyle) self.verticalLayout_7.addWidget(self.groupBox_2) - self.groupBox = QtWidgets.QGroupBox(self.tab_3) + self.groupBox = QtWidgets.QGroupBox(self.stackedWidgetPage1) + font = QtGui.QFont() + font.setBold(True) + font.setWeight(75) + self.groupBox.setFont(font) self.groupBox.setObjectName("groupBox") self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.groupBox) self.verticalLayout_6.setObjectName("verticalLayout_6") self.horizontalLayout_5 = QtWidgets.QHBoxLayout() self.horizontalLayout_5.setObjectName("horizontalLayout_5") self.chkAutoSave = QtWidgets.QCheckBox(self.groupBox) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.chkAutoSave.setFont(font) self.chkAutoSave.setChecked(True) self.chkAutoSave.setObjectName("chkAutoSave") self.horizontalLayout_5.addWidget(self.chkAutoSave) @@ -49,12 +96,20 @@ class Ui_Settings(object): sizePolicy.setHeightForWidth(self.txtAutoSave.sizePolicy().hasHeightForWidth()) self.txtAutoSave.setSizePolicy(sizePolicy) self.txtAutoSave.setMaximumSize(QtCore.QSize(50, 16777215)) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.txtAutoSave.setFont(font) self.txtAutoSave.setStyleSheet("border-radius: 6px;") self.txtAutoSave.setMaxLength(3) self.txtAutoSave.setAlignment(QtCore.Qt.AlignCenter) self.txtAutoSave.setObjectName("txtAutoSave") self.horizontalLayout_5.addWidget(self.txtAutoSave) self.label = QtWidgets.QLabel(self.groupBox) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.label.setFont(font) self.label.setObjectName("label") self.horizontalLayout_5.addWidget(self.label) spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) @@ -63,6 +118,10 @@ class Ui_Settings(object): self.horizontalLayout_7 = QtWidgets.QHBoxLayout() self.horizontalLayout_7.setObjectName("horizontalLayout_7") self.chkAutoSaveNoChanges = QtWidgets.QCheckBox(self.groupBox) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.chkAutoSaveNoChanges.setFont(font) self.chkAutoSaveNoChanges.setChecked(True) self.chkAutoSaveNoChanges.setObjectName("chkAutoSaveNoChanges") self.horizontalLayout_7.addWidget(self.chkAutoSaveNoChanges) @@ -73,39 +132,90 @@ class Ui_Settings(object): sizePolicy.setHeightForWidth(self.txtAutoSaveNoChanges.sizePolicy().hasHeightForWidth()) self.txtAutoSaveNoChanges.setSizePolicy(sizePolicy) self.txtAutoSaveNoChanges.setMaximumSize(QtCore.QSize(50, 16777215)) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.txtAutoSaveNoChanges.setFont(font) self.txtAutoSaveNoChanges.setStyleSheet("border-radius: 6px;") self.txtAutoSaveNoChanges.setMaxLength(3) self.txtAutoSaveNoChanges.setAlignment(QtCore.Qt.AlignCenter) self.txtAutoSaveNoChanges.setObjectName("txtAutoSaveNoChanges") self.horizontalLayout_7.addWidget(self.txtAutoSaveNoChanges) self.label_14 = QtWidgets.QLabel(self.groupBox) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.label_14.setFont(font) self.label_14.setObjectName("label_14") self.horizontalLayout_7.addWidget(self.label_14) spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout_7.addItem(spacerItem1) self.verticalLayout_6.addLayout(self.horizontalLayout_7) self.chkSaveOnQuit = QtWidgets.QCheckBox(self.groupBox) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.chkSaveOnQuit.setFont(font) self.chkSaveOnQuit.setChecked(True) self.chkSaveOnQuit.setObjectName("chkSaveOnQuit") self.verticalLayout_6.addWidget(self.chkSaveOnQuit) self.verticalLayout_7.addWidget(self.groupBox) spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) self.verticalLayout_7.addItem(spacerItem2) - self.tabWidget.addTab(self.tab_3, "") - self.tab_4 = QtWidgets.QWidget() - self.tab_4.setObjectName("tab_4") - self.verticalLayout_9 = QtWidgets.QVBoxLayout(self.tab_4) + self.stack.addWidget(self.stackedWidgetPage1) + self.stackedWidgetPage2 = QtWidgets.QWidget() + self.stackedWidgetPage2.setObjectName("stackedWidgetPage2") + self.verticalLayout_9 = QtWidgets.QVBoxLayout(self.stackedWidgetPage2) + self.verticalLayout_9.setContentsMargins(0, 0, 0, 0) self.verticalLayout_9.setObjectName("verticalLayout_9") - self.horizontalLayout_6 = QtWidgets.QHBoxLayout() - self.horizontalLayout_6.setObjectName("horizontalLayout_6") - self.groupBox_3 = QtWidgets.QGroupBox(self.tab_4) + self.lblTitleViews = QtWidgets.QLabel(self.stackedWidgetPage2) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.lblTitleViews.sizePolicy().hasHeightForWidth()) + self.lblTitleViews.setSizePolicy(sizePolicy) + self.lblTitleViews.setStyleSheet("background-color:lightBlue;\n" +"border:none;\n" +"padding:10px;\n" +"color:darkBlue;\n" +"font-size:16px;\n" +"font-weight:bold;\n" +"text-align:center;") + self.lblTitleViews.setAlignment(QtCore.Qt.AlignCenter) + self.lblTitleViews.setObjectName("lblTitleViews") + self.verticalLayout_9.addWidget(self.lblTitleViews) + self.tabViews = QtWidgets.QTabWidget(self.stackedWidgetPage2) + self.tabViews.setObjectName("tabViews") + self.tab = QtWidgets.QWidget() + self.tab.setObjectName("tab") + self.verticalLayout = QtWidgets.QVBoxLayout(self.tab) + self.verticalLayout.setObjectName("verticalLayout") + self.groupBox_3 = QtWidgets.QGroupBox(self.tab) + font = QtGui.QFont() + font.setBold(True) + font.setWeight(75) + self.groupBox_3.setFont(font) self.groupBox_3.setObjectName("groupBox_3") self.formLayout = QtWidgets.QFormLayout(self.groupBox_3) + self.formLayout.setFieldGrowthPolicy(QtWidgets.QFormLayout.ExpandingFieldsGrow) self.formLayout.setObjectName("formLayout") self.label_3 = QtWidgets.QLabel(self.groupBox_3) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.label_3.setFont(font) self.label_3.setObjectName("label_3") self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_3) self.cmbTreeIcon = QtWidgets.QComboBox(self.groupBox_3) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cmbTreeIcon.sizePolicy().hasHeightForWidth()) + self.cmbTreeIcon.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.cmbTreeIcon.setFont(font) self.cmbTreeIcon.setObjectName("cmbTreeIcon") self.cmbTreeIcon.addItem("") self.cmbTreeIcon.addItem("") @@ -114,9 +224,22 @@ class Ui_Settings(object): self.cmbTreeIcon.addItem("") self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.cmbTreeIcon) self.label_4 = QtWidgets.QLabel(self.groupBox_3) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.label_4.setFont(font) self.label_4.setObjectName("label_4") self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_4) self.cmbTreeText = QtWidgets.QComboBox(self.groupBox_3) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cmbTreeText.sizePolicy().hasHeightForWidth()) + self.cmbTreeText.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.cmbTreeText.setFont(font) self.cmbTreeText.setObjectName("cmbTreeText") self.cmbTreeText.addItem("") self.cmbTreeText.addItem("") @@ -125,9 +248,22 @@ class Ui_Settings(object): self.cmbTreeText.addItem("") self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.cmbTreeText) self.label_5 = QtWidgets.QLabel(self.groupBox_3) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.label_5.setFont(font) self.label_5.setObjectName("label_5") self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_5) self.cmbTreeBackground = QtWidgets.QComboBox(self.groupBox_3) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cmbTreeBackground.sizePolicy().hasHeightForWidth()) + self.cmbTreeBackground.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.cmbTreeBackground.setFont(font) self.cmbTreeBackground.setObjectName("cmbTreeBackground") self.cmbTreeBackground.addItem("") self.cmbTreeBackground.addItem("") @@ -135,78 +271,40 @@ class Ui_Settings(object): self.cmbTreeBackground.addItem("") self.cmbTreeBackground.addItem("") self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.cmbTreeBackground) - self.horizontalLayout_6.addWidget(self.groupBox_3) - self.groupBox_5 = QtWidgets.QGroupBox(self.tab_4) - self.groupBox_5.setObjectName("groupBox_5") - self.formLayout_2 = QtWidgets.QFormLayout(self.groupBox_5) - self.formLayout_2.setObjectName("formLayout_2") - self.label_9 = QtWidgets.QLabel(self.groupBox_5) - self.label_9.setObjectName("label_9") - self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_9) - self.cmbCorkIcon = QtWidgets.QComboBox(self.groupBox_5) - self.cmbCorkIcon.setObjectName("cmbCorkIcon") - self.cmbCorkIcon.addItem("") - self.cmbCorkIcon.addItem("") - self.cmbCorkIcon.addItem("") - self.cmbCorkIcon.addItem("") - self.cmbCorkIcon.addItem("") - self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.cmbCorkIcon) - self.label_10 = QtWidgets.QLabel(self.groupBox_5) - self.label_10.setObjectName("label_10") - self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_10) - self.cmbCorkText = QtWidgets.QComboBox(self.groupBox_5) - self.cmbCorkText.setObjectName("cmbCorkText") - self.cmbCorkText.addItem("") - self.cmbCorkText.addItem("") - self.cmbCorkText.addItem("") - self.cmbCorkText.addItem("") - self.cmbCorkText.addItem("") - self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.cmbCorkText) - self.label_11 = QtWidgets.QLabel(self.groupBox_5) - self.label_11.setObjectName("label_11") - self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_11) - self.cmbCorkBackground = QtWidgets.QComboBox(self.groupBox_5) - self.cmbCorkBackground.setObjectName("cmbCorkBackground") - self.cmbCorkBackground.addItem("") - self.cmbCorkBackground.addItem("") - self.cmbCorkBackground.addItem("") - self.cmbCorkBackground.addItem("") - self.cmbCorkBackground.addItem("") - self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.cmbCorkBackground) - self.label_12 = QtWidgets.QLabel(self.groupBox_5) - self.label_12.setObjectName("label_12") - self.formLayout_2.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_12) - self.cmbCorkBorder = QtWidgets.QComboBox(self.groupBox_5) - self.cmbCorkBorder.setObjectName("cmbCorkBorder") - self.cmbCorkBorder.addItem("") - self.cmbCorkBorder.addItem("") - self.cmbCorkBorder.addItem("") - self.cmbCorkBorder.addItem("") - self.cmbCorkBorder.addItem("") - self.formLayout_2.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.cmbCorkBorder) - self.label_13 = QtWidgets.QLabel(self.groupBox_5) - self.label_13.setObjectName("label_13") - self.formLayout_2.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_13) - self.cmbCorkCorner = QtWidgets.QComboBox(self.groupBox_5) - self.cmbCorkCorner.setObjectName("cmbCorkCorner") - self.cmbCorkCorner.addItem("") - self.cmbCorkCorner.addItem("") - self.cmbCorkCorner.addItem("") - self.cmbCorkCorner.addItem("") - self.cmbCorkCorner.addItem("") - self.formLayout_2.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.cmbCorkCorner) - self.horizontalLayout_6.addWidget(self.groupBox_5) - self.verticalLayout_9.addLayout(self.horizontalLayout_6) - self.groupBox_4 = QtWidgets.QGroupBox(self.tab_4) + self.verticalLayout.addWidget(self.groupBox_3) + spacerItem3 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.verticalLayout.addItem(spacerItem3) + self.tabViews.addTab(self.tab, "") + self.tab_2 = QtWidgets.QWidget() + self.tab_2.setObjectName("tab_2") + self.verticalLayout_11 = QtWidgets.QVBoxLayout(self.tab_2) + self.verticalLayout_11.setObjectName("verticalLayout_11") + self.groupBox_4 = QtWidgets.QGroupBox(self.tab_2) + font = QtGui.QFont() + font.setBold(True) + font.setWeight(75) + self.groupBox_4.setFont(font) self.groupBox_4.setObjectName("groupBox_4") - self.horizontalLayout_4 = QtWidgets.QHBoxLayout(self.groupBox_4) - self.horizontalLayout_4.setObjectName("horizontalLayout_4") - self.formLayout_3 = QtWidgets.QFormLayout() + self.formLayout_3 = QtWidgets.QFormLayout(self.groupBox_4) + self.formLayout_3.setFieldGrowthPolicy(QtWidgets.QFormLayout.ExpandingFieldsGrow) self.formLayout_3.setObjectName("formLayout_3") self.label_6 = QtWidgets.QLabel(self.groupBox_4) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.label_6.setFont(font) self.label_6.setObjectName("label_6") self.formLayout_3.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_6) self.cmbOutlineIcon = QtWidgets.QComboBox(self.groupBox_4) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cmbOutlineIcon.sizePolicy().hasHeightForWidth()) + self.cmbOutlineIcon.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.cmbOutlineIcon.setFont(font) self.cmbOutlineIcon.setObjectName("cmbOutlineIcon") self.cmbOutlineIcon.addItem("") self.cmbOutlineIcon.addItem("") @@ -215,9 +313,22 @@ class Ui_Settings(object): self.cmbOutlineIcon.addItem("") self.formLayout_3.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.cmbOutlineIcon) self.label_7 = QtWidgets.QLabel(self.groupBox_4) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.label_7.setFont(font) self.label_7.setObjectName("label_7") self.formLayout_3.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_7) self.cmbOutlineText = QtWidgets.QComboBox(self.groupBox_4) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cmbOutlineText.sizePolicy().hasHeightForWidth()) + self.cmbOutlineText.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.cmbOutlineText.setFont(font) self.cmbOutlineText.setObjectName("cmbOutlineText") self.cmbOutlineText.addItem("") self.cmbOutlineText.addItem("") @@ -225,10 +336,16 @@ class Ui_Settings(object): self.cmbOutlineText.addItem("") self.cmbOutlineText.addItem("") self.formLayout_3.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.cmbOutlineText) - self.label_8 = QtWidgets.QLabel(self.groupBox_4) - self.label_8.setObjectName("label_8") - self.formLayout_3.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_8) self.cmbOutlineBackground = QtWidgets.QComboBox(self.groupBox_4) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cmbOutlineBackground.sizePolicy().hasHeightForWidth()) + self.cmbOutlineBackground.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.cmbOutlineBackground.setFont(font) self.cmbOutlineBackground.setObjectName("cmbOutlineBackground") self.cmbOutlineBackground.addItem("") self.cmbOutlineBackground.addItem("") @@ -236,61 +353,273 @@ class Ui_Settings(object): self.cmbOutlineBackground.addItem("") self.cmbOutlineBackground.addItem("") self.formLayout_3.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.cmbOutlineBackground) - self.horizontalLayout_4.addLayout(self.formLayout_3) - self.line = QtWidgets.QFrame(self.groupBox_4) - self.line.setFrameShape(QtWidgets.QFrame.VLine) - self.line.setFrameShadow(QtWidgets.QFrame.Sunken) - self.line.setObjectName("line") - self.horizontalLayout_4.addWidget(self.line) - self.verticalLayout_8 = QtWidgets.QVBoxLayout() - self.verticalLayout_8.setObjectName("verticalLayout_8") - self.chkOutlineTitle = QtWidgets.QCheckBox(self.groupBox_4) - self.chkOutlineTitle.setChecked(True) - self.chkOutlineTitle.setObjectName("chkOutlineTitle") - self.verticalLayout_8.addWidget(self.chkOutlineTitle) - self.chkOutlinePOV = QtWidgets.QCheckBox(self.groupBox_4) - self.chkOutlinePOV.setChecked(True) - self.chkOutlinePOV.setObjectName("chkOutlinePOV") - self.verticalLayout_8.addWidget(self.chkOutlinePOV) - self.chkOutlineLabel = QtWidgets.QCheckBox(self.groupBox_4) - self.chkOutlineLabel.setChecked(True) - self.chkOutlineLabel.setObjectName("chkOutlineLabel") - self.verticalLayout_8.addWidget(self.chkOutlineLabel) - self.chkOutlineStatus = QtWidgets.QCheckBox(self.groupBox_4) - self.chkOutlineStatus.setChecked(True) - self.chkOutlineStatus.setObjectName("chkOutlineStatus") - self.verticalLayout_8.addWidget(self.chkOutlineStatus) - self.chkOutlineCompile = QtWidgets.QCheckBox(self.groupBox_4) - self.chkOutlineCompile.setChecked(True) - self.chkOutlineCompile.setObjectName("chkOutlineCompile") - self.verticalLayout_8.addWidget(self.chkOutlineCompile) - self.chkOutlineWordCount = QtWidgets.QCheckBox(self.groupBox_4) - self.chkOutlineWordCount.setChecked(True) - self.chkOutlineWordCount.setObjectName("chkOutlineWordCount") - self.verticalLayout_8.addWidget(self.chkOutlineWordCount) - self.chkOutlineGoal = QtWidgets.QCheckBox(self.groupBox_4) + self.label_8 = QtWidgets.QLabel(self.groupBox_4) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.label_8.setFont(font) + self.label_8.setObjectName("label_8") + self.formLayout_3.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_8) + self.verticalLayout_11.addWidget(self.groupBox_4) + self.groupBox_6 = QtWidgets.QGroupBox(self.tab_2) + font = QtGui.QFont() + font.setBold(True) + font.setWeight(75) + self.groupBox_6.setFont(font) + self.groupBox_6.setObjectName("groupBox_6") + self.gridLayout = QtWidgets.QGridLayout(self.groupBox_6) + self.gridLayout.setObjectName("gridLayout") + self.chkOutlineGoal = QtWidgets.QCheckBox(self.groupBox_6) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.chkOutlineGoal.setFont(font) self.chkOutlineGoal.setChecked(True) self.chkOutlineGoal.setObjectName("chkOutlineGoal") - self.verticalLayout_8.addWidget(self.chkOutlineGoal) - self.chkOutlinePercentage = QtWidgets.QCheckBox(self.groupBox_4) + self.gridLayout.addWidget(self.chkOutlineGoal, 4, 2, 1, 1) + self.chkOutlineWordCount = QtWidgets.QCheckBox(self.groupBox_6) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.chkOutlineWordCount.setFont(font) + self.chkOutlineWordCount.setChecked(True) + self.chkOutlineWordCount.setObjectName("chkOutlineWordCount") + self.gridLayout.addWidget(self.chkOutlineWordCount, 4, 1, 1, 1) + self.chkOutlinePercentage = QtWidgets.QCheckBox(self.groupBox_6) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.chkOutlinePercentage.setFont(font) self.chkOutlinePercentage.setChecked(True) self.chkOutlinePercentage.setObjectName("chkOutlinePercentage") - self.verticalLayout_8.addWidget(self.chkOutlinePercentage) - self.horizontalLayout_4.addLayout(self.verticalLayout_8) - self.verticalLayout_9.addWidget(self.groupBox_4) - self.tabWidget.addTab(self.tab_4, "") - self.tab = QtWidgets.QWidget() - self.tab.setObjectName("tab") - self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.tab) + self.gridLayout.addWidget(self.chkOutlinePercentage, 4, 3, 1, 1) + self.chkOutlineCompile = QtWidgets.QCheckBox(self.groupBox_6) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.chkOutlineCompile.setFont(font) + self.chkOutlineCompile.setChecked(True) + self.chkOutlineCompile.setObjectName("chkOutlineCompile") + self.gridLayout.addWidget(self.chkOutlineCompile, 4, 0, 1, 1) + self.chkOutlineStatus = QtWidgets.QCheckBox(self.groupBox_6) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.chkOutlineStatus.setFont(font) + self.chkOutlineStatus.setChecked(True) + self.chkOutlineStatus.setObjectName("chkOutlineStatus") + self.gridLayout.addWidget(self.chkOutlineStatus, 3, 3, 1, 1) + self.chkOutlineLabel = QtWidgets.QCheckBox(self.groupBox_6) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.chkOutlineLabel.setFont(font) + self.chkOutlineLabel.setChecked(True) + self.chkOutlineLabel.setObjectName("chkOutlineLabel") + self.gridLayout.addWidget(self.chkOutlineLabel, 3, 2, 1, 1) + self.chkOutlinePOV = QtWidgets.QCheckBox(self.groupBox_6) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.chkOutlinePOV.setFont(font) + self.chkOutlinePOV.setChecked(True) + self.chkOutlinePOV.setObjectName("chkOutlinePOV") + self.gridLayout.addWidget(self.chkOutlinePOV, 3, 1, 1, 1) + self.chkOutlineTitle = QtWidgets.QCheckBox(self.groupBox_6) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.chkOutlineTitle.setFont(font) + self.chkOutlineTitle.setChecked(True) + self.chkOutlineTitle.setObjectName("chkOutlineTitle") + self.gridLayout.addWidget(self.chkOutlineTitle, 3, 0, 1, 1) + self.verticalLayout_11.addWidget(self.groupBox_6) + spacerItem4 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.verticalLayout_11.addItem(spacerItem4) + self.tabViews.addTab(self.tab_2, "") + self.tab_3 = QtWidgets.QWidget() + self.tab_3.setObjectName("tab_3") + self.horizontalLayout_4 = QtWidgets.QHBoxLayout(self.tab_3) + self.horizontalLayout_4.setObjectName("horizontalLayout_4") + self.groupBox_5 = QtWidgets.QGroupBox(self.tab_3) + font = QtGui.QFont() + font.setBold(True) + font.setWeight(75) + self.groupBox_5.setFont(font) + self.groupBox_5.setObjectName("groupBox_5") + self.formLayout_2 = QtWidgets.QFormLayout(self.groupBox_5) + self.formLayout_2.setFieldGrowthPolicy(QtWidgets.QFormLayout.ExpandingFieldsGrow) + self.formLayout_2.setObjectName("formLayout_2") + self.label_9 = QtWidgets.QLabel(self.groupBox_5) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.label_9.setFont(font) + self.label_9.setObjectName("label_9") + self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_9) + self.cmbCorkIcon = QtWidgets.QComboBox(self.groupBox_5) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.cmbCorkIcon.setFont(font) + self.cmbCorkIcon.setObjectName("cmbCorkIcon") + self.cmbCorkIcon.addItem("") + self.cmbCorkIcon.addItem("") + self.cmbCorkIcon.addItem("") + self.cmbCorkIcon.addItem("") + self.cmbCorkIcon.addItem("") + self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.cmbCorkIcon) + self.label_10 = QtWidgets.QLabel(self.groupBox_5) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.label_10.setFont(font) + self.label_10.setObjectName("label_10") + self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_10) + self.cmbCorkText = QtWidgets.QComboBox(self.groupBox_5) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.cmbCorkText.setFont(font) + self.cmbCorkText.setObjectName("cmbCorkText") + self.cmbCorkText.addItem("") + self.cmbCorkText.addItem("") + self.cmbCorkText.addItem("") + self.cmbCorkText.addItem("") + self.cmbCorkText.addItem("") + self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.cmbCorkText) + self.label_11 = QtWidgets.QLabel(self.groupBox_5) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.label_11.setFont(font) + self.label_11.setObjectName("label_11") + self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_11) + self.cmbCorkBackground = QtWidgets.QComboBox(self.groupBox_5) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.cmbCorkBackground.setFont(font) + self.cmbCorkBackground.setObjectName("cmbCorkBackground") + self.cmbCorkBackground.addItem("") + self.cmbCorkBackground.addItem("") + self.cmbCorkBackground.addItem("") + self.cmbCorkBackground.addItem("") + self.cmbCorkBackground.addItem("") + self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.cmbCorkBackground) + self.label_12 = QtWidgets.QLabel(self.groupBox_5) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.label_12.setFont(font) + self.label_12.setObjectName("label_12") + self.formLayout_2.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_12) + self.cmbCorkBorder = QtWidgets.QComboBox(self.groupBox_5) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.cmbCorkBorder.setFont(font) + self.cmbCorkBorder.setObjectName("cmbCorkBorder") + self.cmbCorkBorder.addItem("") + self.cmbCorkBorder.addItem("") + self.cmbCorkBorder.addItem("") + self.cmbCorkBorder.addItem("") + self.cmbCorkBorder.addItem("") + self.formLayout_2.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.cmbCorkBorder) + self.label_13 = QtWidgets.QLabel(self.groupBox_5) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.label_13.setFont(font) + self.label_13.setObjectName("label_13") + self.formLayout_2.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_13) + self.cmbCorkCorner = QtWidgets.QComboBox(self.groupBox_5) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.cmbCorkCorner.setFont(font) + self.cmbCorkCorner.setObjectName("cmbCorkCorner") + self.cmbCorkCorner.addItem("") + self.cmbCorkCorner.addItem("") + self.cmbCorkCorner.addItem("") + self.cmbCorkCorner.addItem("") + self.cmbCorkCorner.addItem("") + self.formLayout_2.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.cmbCorkCorner) + self.horizontalLayout_4.addWidget(self.groupBox_5) + self.groupBox_7 = QtWidgets.QGroupBox(self.tab_3) + font = QtGui.QFont() + font.setBold(True) + font.setWeight(75) + self.groupBox_7.setFont(font) + self.groupBox_7.setObjectName("groupBox_7") + self.verticalLayout_8 = QtWidgets.QVBoxLayout(self.groupBox_7) + self.verticalLayout_8.setObjectName("verticalLayout_8") + self.label_15 = QtWidgets.QLabel(self.groupBox_7) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.label_15.setFont(font) + self.label_15.setObjectName("label_15") + self.verticalLayout_8.addWidget(self.label_15) + self.btnCorkColor = QtWidgets.QPushButton(self.groupBox_7) + self.btnCorkColor.setMaximumSize(QtCore.QSize(16777215, 32)) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.btnCorkColor.setFont(font) + self.btnCorkColor.setText("") + self.btnCorkColor.setIconSize(QtCore.QSize(64, 64)) + self.btnCorkColor.setObjectName("btnCorkColor") + self.verticalLayout_8.addWidget(self.btnCorkColor) + self.label_16 = QtWidgets.QLabel(self.groupBox_7) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.label_16.setFont(font) + self.label_16.setObjectName("label_16") + self.verticalLayout_8.addWidget(self.label_16) + self.cmbCorkImage = QtWidgets.QComboBox(self.groupBox_7) + font = QtGui.QFont() + font.setBold(False) + font.setWeight(50) + self.cmbCorkImage.setFont(font) + self.cmbCorkImage.setObjectName("cmbCorkImage") + self.verticalLayout_8.addWidget(self.cmbCorkImage) + spacerItem5 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.verticalLayout_8.addItem(spacerItem5) + self.horizontalLayout_4.addWidget(self.groupBox_7) + self.tabViews.addTab(self.tab_3, "") + self.verticalLayout_9.addWidget(self.tabViews) + self.stack.addWidget(self.stackedWidgetPage2) + self.stackedWidgetPage3 = QtWidgets.QWidget() + self.stackedWidgetPage3.setObjectName("stackedWidgetPage3") + self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.stackedWidgetPage3) + self.verticalLayout_3.setContentsMargins(0, 0, 0, 0) self.verticalLayout_3.setObjectName("verticalLayout_3") + self.lblTitleLabels = QtWidgets.QLabel(self.stackedWidgetPage3) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.lblTitleLabels.sizePolicy().hasHeightForWidth()) + self.lblTitleLabels.setSizePolicy(sizePolicy) + self.lblTitleLabels.setStyleSheet("background-color:lightBlue;\n" +"border:none;\n" +"padding:10px;\n" +"color:darkBlue;\n" +"font-size:16px;\n" +"font-weight:bold;\n" +"text-align:center;") + self.lblTitleLabels.setAlignment(QtCore.Qt.AlignCenter) + self.lblTitleLabels.setObjectName("lblTitleLabels") + self.verticalLayout_3.addWidget(self.lblTitleLabels) self.horizontalLayout_2 = QtWidgets.QHBoxLayout() self.horizontalLayout_2.setObjectName("horizontalLayout_2") - self.lstLabels = QtWidgets.QListView(self.tab) + self.lstLabels = QtWidgets.QListView(self.stackedWidgetPage3) self.lstLabels.setObjectName("lstLabels") self.horizontalLayout_2.addWidget(self.lstLabels) self.verticalLayout_2 = QtWidgets.QVBoxLayout() self.verticalLayout_2.setObjectName("verticalLayout_2") - self.btnLabelColor = QtWidgets.QPushButton(self.tab) + self.btnLabelColor = QtWidgets.QPushButton(self.stackedWidgetPage3) self.btnLabelColor.setEnabled(False) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) @@ -303,62 +632,93 @@ class Ui_Settings(object): self.btnLabelColor.setIconSize(QtCore.QSize(64, 64)) self.btnLabelColor.setObjectName("btnLabelColor") self.verticalLayout_2.addWidget(self.btnLabelColor) - spacerItem3 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.verticalLayout_2.addItem(spacerItem3) + spacerItem6 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.verticalLayout_2.addItem(spacerItem6) self.horizontalLayout_2.addLayout(self.verticalLayout_2) self.verticalLayout_3.addLayout(self.horizontalLayout_2) self.horizontalLayout = QtWidgets.QHBoxLayout() self.horizontalLayout.setObjectName("horizontalLayout") - self.btnLabelAdd = QtWidgets.QPushButton(self.tab) + self.btnLabelAdd = QtWidgets.QPushButton(self.stackedWidgetPage3) self.btnLabelAdd.setText("") icon = QtGui.QIcon.fromTheme("list-add") self.btnLabelAdd.setIcon(icon) self.btnLabelAdd.setObjectName("btnLabelAdd") self.horizontalLayout.addWidget(self.btnLabelAdd) - self.btnLabelRemove = QtWidgets.QPushButton(self.tab) + self.btnLabelRemove = QtWidgets.QPushButton(self.stackedWidgetPage3) self.btnLabelRemove.setText("") icon = QtGui.QIcon.fromTheme("list-remove") self.btnLabelRemove.setIcon(icon) self.btnLabelRemove.setObjectName("btnLabelRemove") self.horizontalLayout.addWidget(self.btnLabelRemove) - spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout.addItem(spacerItem4) + spacerItem7 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.horizontalLayout.addItem(spacerItem7) self.verticalLayout_3.addLayout(self.horizontalLayout) - self.tabWidget.addTab(self.tab, "") - self.tab_2 = QtWidgets.QWidget() - self.tab_2.setObjectName("tab_2") - self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.tab_2) + self.stack.addWidget(self.stackedWidgetPage3) + self.stackedWidgetPage4 = QtWidgets.QWidget() + self.stackedWidgetPage4.setObjectName("stackedWidgetPage4") + self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.stackedWidgetPage4) + self.verticalLayout_4.setContentsMargins(0, 0, 0, 0) self.verticalLayout_4.setObjectName("verticalLayout_4") - self.lstStatus = QtWidgets.QListView(self.tab_2) + self.lblTitleStatus = QtWidgets.QLabel(self.stackedWidgetPage4) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.lblTitleStatus.sizePolicy().hasHeightForWidth()) + self.lblTitleStatus.setSizePolicy(sizePolicy) + self.lblTitleStatus.setStyleSheet("background-color:lightBlue;\n" +"border:none;\n" +"padding:10px;\n" +"color:darkBlue;\n" +"font-size:16px;\n" +"font-weight:bold;\n" +"text-align:center;") + self.lblTitleStatus.setAlignment(QtCore.Qt.AlignCenter) + self.lblTitleStatus.setObjectName("lblTitleStatus") + self.verticalLayout_4.addWidget(self.lblTitleStatus) + self.lstStatus = QtWidgets.QListView(self.stackedWidgetPage4) self.lstStatus.setObjectName("lstStatus") self.verticalLayout_4.addWidget(self.lstStatus) self.horizontalLayout_3 = QtWidgets.QHBoxLayout() self.horizontalLayout_3.setObjectName("horizontalLayout_3") - self.btnStatusAdd = QtWidgets.QPushButton(self.tab_2) + self.btnStatusAdd = QtWidgets.QPushButton(self.stackedWidgetPage4) self.btnStatusAdd.setText("") icon = QtGui.QIcon.fromTheme("list-add") self.btnStatusAdd.setIcon(icon) self.btnStatusAdd.setObjectName("btnStatusAdd") self.horizontalLayout_3.addWidget(self.btnStatusAdd) - self.btnStatusRemove = QtWidgets.QPushButton(self.tab_2) + self.btnStatusRemove = QtWidgets.QPushButton(self.stackedWidgetPage4) self.btnStatusRemove.setText("") icon = QtGui.QIcon.fromTheme("list-remove") self.btnStatusRemove.setIcon(icon) self.btnStatusRemove.setObjectName("btnStatusRemove") self.horizontalLayout_3.addWidget(self.btnStatusRemove) - spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout_3.addItem(spacerItem5) + spacerItem8 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.horizontalLayout_3.addItem(spacerItem8) self.verticalLayout_4.addLayout(self.horizontalLayout_3) - self.tabWidget.addTab(self.tab_2, "") - self.verticalLayout.addWidget(self.tabWidget) + self.stack.addWidget(self.stackedWidgetPage4) + self.horizontalLayout_8.addWidget(self.stack) self.retranslateUi(Settings) - self.tabWidget.setCurrentIndex(1) + self.stack.setCurrentIndex(1) + self.tabViews.setCurrentIndex(0) + self.lstMenu.currentRowChanged['int'].connect(self.stack.setCurrentIndex) QtCore.QMetaObject.connectSlotsByName(Settings) def retranslateUi(self, Settings): _translate = QtCore.QCoreApplication.translate Settings.setWindowTitle(_translate("Settings", "Form")) + __sortingEnabled = self.lstMenu.isSortingEnabled() + self.lstMenu.setSortingEnabled(False) + item = self.lstMenu.item(0) + item.setText(_translate("Settings", "General")) + item = self.lstMenu.item(1) + item.setText(_translate("Settings", "Views")) + item = self.lstMenu.item(2) + item.setText(_translate("Settings", "Labels")) + item = self.lstMenu.item(3) + item.setText(_translate("Settings", "Status")) + self.lstMenu.setSortingEnabled(__sortingEnabled) + self.lblTitleGeneral.setText(_translate("Settings", "General settings")) self.groupBox_2.setTitle(_translate("Settings", "Application style")) self.label_2.setText(_translate("Settings", "You might need to restart the app in order to avoid some visual issues.")) self.groupBox.setTitle(_translate("Settings", "Saving")) @@ -367,8 +727,8 @@ class Ui_Settings(object): self.chkAutoSaveNoChanges.setText(_translate("Settings", "If no changes during")) self.label_14.setText(_translate("Settings", "seconds.")) self.chkSaveOnQuit.setText(_translate("Settings", "Save on quit")) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), _translate("Settings", "General")) - self.groupBox_3.setTitle(_translate("Settings", "Tree")) + self.lblTitleViews.setText(_translate("Settings", "Views settings")) + self.groupBox_3.setTitle(_translate("Settings", "Colors")) self.label_3.setText(_translate("Settings", "Icon color:")) self.cmbTreeIcon.setItemText(0, _translate("Settings", "Nothing")) self.cmbTreeIcon.setItemText(1, _translate("Settings", "POV")) @@ -387,7 +747,37 @@ class Ui_Settings(object): self.cmbTreeBackground.setItemText(2, _translate("Settings", "Label")) self.cmbTreeBackground.setItemText(3, _translate("Settings", "Progress")) self.cmbTreeBackground.setItemText(4, _translate("Settings", "Compile")) - self.groupBox_5.setTitle(_translate("Settings", "Index cards")) + self.tabViews.setTabText(self.tabViews.indexOf(self.tab), _translate("Settings", "Tree")) + self.groupBox_4.setTitle(_translate("Settings", "Colors")) + self.label_6.setText(_translate("Settings", "Icon color:")) + self.cmbOutlineIcon.setItemText(0, _translate("Settings", "Nothing")) + self.cmbOutlineIcon.setItemText(1, _translate("Settings", "POV")) + self.cmbOutlineIcon.setItemText(2, _translate("Settings", "Label")) + self.cmbOutlineIcon.setItemText(3, _translate("Settings", "Progress")) + self.cmbOutlineIcon.setItemText(4, _translate("Settings", "Compile")) + self.label_7.setText(_translate("Settings", "Text color:")) + self.cmbOutlineText.setItemText(0, _translate("Settings", "Nothing")) + self.cmbOutlineText.setItemText(1, _translate("Settings", "POV")) + self.cmbOutlineText.setItemText(2, _translate("Settings", "Label")) + self.cmbOutlineText.setItemText(3, _translate("Settings", "Progress")) + self.cmbOutlineText.setItemText(4, _translate("Settings", "Compile")) + self.cmbOutlineBackground.setItemText(0, _translate("Settings", "Nothing")) + self.cmbOutlineBackground.setItemText(1, _translate("Settings", "POV")) + self.cmbOutlineBackground.setItemText(2, _translate("Settings", "Label")) + self.cmbOutlineBackground.setItemText(3, _translate("Settings", "Progress")) + self.cmbOutlineBackground.setItemText(4, _translate("Settings", "Compile")) + self.label_8.setText(_translate("Settings", "Background color:")) + self.groupBox_6.setTitle(_translate("Settings", "Visible columns")) + self.chkOutlineGoal.setText(_translate("Settings", "Goal")) + self.chkOutlineWordCount.setText(_translate("Settings", "Word count")) + self.chkOutlinePercentage.setText(_translate("Settings", "Percentage")) + self.chkOutlineCompile.setText(_translate("Settings", "Compile")) + self.chkOutlineStatus.setText(_translate("Settings", "Status")) + self.chkOutlineLabel.setText(_translate("Settings", "Label")) + self.chkOutlinePOV.setText(_translate("Settings", "POV")) + self.chkOutlineTitle.setText(_translate("Settings", "Title")) + self.tabViews.setTabText(self.tabViews.indexOf(self.tab_2), _translate("Settings", "Outline")) + self.groupBox_5.setTitle(_translate("Settings", "Item colors")) self.label_9.setText(_translate("Settings", "Icon color:")) self.cmbCorkIcon.setItemText(0, _translate("Settings", "Nothing")) self.cmbCorkIcon.setItemText(1, _translate("Settings", "POV")) @@ -418,35 +808,12 @@ class Ui_Settings(object): self.cmbCorkCorner.setItemText(2, _translate("Settings", "Label")) self.cmbCorkCorner.setItemText(3, _translate("Settings", "Progress")) self.cmbCorkCorner.setItemText(4, _translate("Settings", "Compile")) - self.groupBox_4.setTitle(_translate("Settings", "Outline")) - self.label_6.setText(_translate("Settings", "Icon color:")) - self.cmbOutlineIcon.setItemText(0, _translate("Settings", "Nothing")) - self.cmbOutlineIcon.setItemText(1, _translate("Settings", "POV")) - self.cmbOutlineIcon.setItemText(2, _translate("Settings", "Label")) - self.cmbOutlineIcon.setItemText(3, _translate("Settings", "Progress")) - self.cmbOutlineIcon.setItemText(4, _translate("Settings", "Compile")) - self.label_7.setText(_translate("Settings", "Text color:")) - self.cmbOutlineText.setItemText(0, _translate("Settings", "Nothing")) - self.cmbOutlineText.setItemText(1, _translate("Settings", "POV")) - self.cmbOutlineText.setItemText(2, _translate("Settings", "Label")) - self.cmbOutlineText.setItemText(3, _translate("Settings", "Progress")) - self.cmbOutlineText.setItemText(4, _translate("Settings", "Compile")) - self.label_8.setText(_translate("Settings", "Background color:")) - self.cmbOutlineBackground.setItemText(0, _translate("Settings", "Nothing")) - self.cmbOutlineBackground.setItemText(1, _translate("Settings", "POV")) - self.cmbOutlineBackground.setItemText(2, _translate("Settings", "Label")) - self.cmbOutlineBackground.setItemText(3, _translate("Settings", "Progress")) - self.cmbOutlineBackground.setItemText(4, _translate("Settings", "Compile")) - self.chkOutlineTitle.setText(_translate("Settings", "Title")) - self.chkOutlinePOV.setText(_translate("Settings", "POV")) - self.chkOutlineLabel.setText(_translate("Settings", "Label")) - self.chkOutlineStatus.setText(_translate("Settings", "Status")) - self.chkOutlineCompile.setText(_translate("Settings", "Compile")) - self.chkOutlineWordCount.setText(_translate("Settings", "Word count")) - self.chkOutlineGoal.setText(_translate("Settings", "Goal")) - self.chkOutlinePercentage.setText(_translate("Settings", "Percentage")) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_4), _translate("Settings", "Views")) + self.groupBox_7.setTitle(_translate("Settings", "Background")) + self.label_15.setText(_translate("Settings", "Color:")) + self.btnCorkColor.setShortcut(_translate("Settings", "Ctrl+S")) + self.label_16.setText(_translate("Settings", "Image:")) + self.tabViews.setTabText(self.tabViews.indexOf(self.tab_3), _translate("Settings", "Index cards")) + self.lblTitleLabels.setText(_translate("Settings", "Labels")) self.btnLabelColor.setShortcut(_translate("Settings", "Ctrl+S")) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("Settings", "Labels")) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("Settings", "Status")) + self.lblTitleStatus.setText(_translate("Settings", "Status")) diff --git a/src/ui/settings.ui b/src/ui/settings.ui index 4afa7d3..5aa62a6 100644 --- a/src/ui/settings.ui +++ b/src/ui/settings.ui @@ -6,48 +6,119 @@ 0 0 - 485 - 585 + 551 + 378 Form - + - + + + + General + + + + + Views + + + + + Labels + + + + + Status + + + + + + 1 - - true - - - - General - + + + 0 + + + + + + 0 + 0 + + + + background-color:lightBlue; +border:none; +padding:10px; +color:darkBlue; +font-size:16px; +font-weight:bold; +text-align:center; + + + General settings + + + Qt::AlignCenter + + + + + + 75 + true + + Application style + + + 50 + false + + You might need to restart the app in order to avoid some visual issues. - + + + + 50 + false + + + + + + 75 + true + + Saving @@ -56,6 +127,12 @@ + + + 50 + false + + Automatically save every @@ -78,6 +155,12 @@ 16777215 + + + 50 + false + + border-radius: 6px; @@ -91,6 +174,12 @@ + + + 50 + false + + minutes. @@ -98,6 +187,12 @@ + + + 50 + false + + Qt::Horizontal @@ -115,6 +210,12 @@ + + + 50 + false + + If no changes during @@ -137,6 +238,12 @@ 16777215 + + + 50 + false + + border-radius: 6px; @@ -150,6 +257,12 @@ + + + 50 + false + + seconds. @@ -157,6 +270,12 @@ + + + 50 + false + + Qt::Horizontal @@ -172,6 +291,12 @@ + + + 50 + false + + Save on quit @@ -198,540 +323,975 @@ - - - Views - + + + 0 + - - - - - Tree - - - - - - Icon color: - - - - - - - - Nothing - - - - - POV - - - - - Label - - - - - Progress - - - - - Compile - - - - - - - - Text color: - - - - - - - - Nothing - - - - - POV - - - - - Label - - - - - Progress - - - - - Compile - - - - - - - - Background color: - - - - - - - - Nothing - - - - - POV - - - - - Label - - - - - Progress - - - - - Compile - - - - - - - - - - - Index cards - - - - - - Icon color: - - - - - - - - Nothing - - - - - POV - - - - - Label - - - - - Progress - - - - - Compile - - - - - - - - Text color: - - - - - - - - Nothing - - - - - POV - - - - - Label - - - - - Progress - - - - - Compile - - - - - - - - Background color: - - - - - - - - Nothing - - - - - POV - - - - - Label - - - - - Progress - - - - - Compile - - - - - - - - Border color: - - - - - - - - Nothing - - - - - POV - - - - - Label - - - - - Progress - - - - - Compile - - - - - - - - Corner color: - - - - - - - - Nothing - - - - - POV - - - - - Label - - - - - Progress - - - - - Compile - - - - - - - - + + + + 0 + 0 + + + + background-color:lightBlue; +border:none; +padding:10px; +color:darkBlue; +font-size:16px; +font-weight:bold; +text-align:center; + + + Views settings + + + Qt::AlignCenter + + - - - Outline + + + 0 - - - - - - - Icon color: + + + Tree + + + + + + + 75 + true + + + + Colors + + + + QFormLayout::ExpandingFieldsGrow - - - - + + + + + 50 + false + + + + Icon color: + + + + + + + + 0 + 0 + + + + + 50 + false + + + + + Nothing + + + + + POV + + + + + Label + + + + + Progress + + + + + Compile + + + + + + + + + 50 + false + + + + Text color: + + + + + + + + 0 + 0 + + + + + 50 + false + + + + + Nothing + + + + + POV + + + + + Label + + + + + Progress + + + + + Compile + + + + + + + + + 50 + false + + + + Background color: + + + + + + + + 0 + 0 + + + + + 50 + false + + + + + Nothing + + + + + POV + + + + + Label + + + + + Progress + + + + + Compile + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Outline + + + + + + + 75 + true + + + + Colors + + + + QFormLayout::ExpandingFieldsGrow + + + + + + 50 + false + + + + Icon color: + + + + + + + + 0 + 0 + + + + + 50 + false + + + + + Nothing + + + + + POV + + + + + Label + + + + + Progress + + + + + Compile + + + + + + + + + 50 + false + + + + Text color: + + + + + + + + 0 + 0 + + + + + 50 + false + + + + + Nothing + + + + + POV + + + + + Label + + + + + Progress + + + + + Compile + + + + + + + + + 0 + 0 + + + + + 50 + false + + + + + Nothing + + + + + POV + + + + + Label + + + + + Progress + + + + + Compile + + + + + + + + + 50 + false + + + + Background color: + + + + + + + + + + + 75 + true + + + + Visible columns + + + + + + + 50 + false + + + + Goal + + + true + + + + + + + + 50 + false + + + + Word count + + + true + + + + + + + + 50 + false + + + + Percentage + + + true + + + + + + + + 50 + false + + + + Compile + + + true + + + + + + + + 50 + false + + + + Status + + + true + + + + + + + + 50 + false + + + + Label + + + true + + + + + + + + 50 + false + + + + POV + + + true + + + + + + + + 50 + false + + + + Title + + + true + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Index cards + + + + + + + 75 + true + + + + Item colors + + + + QFormLayout::ExpandingFieldsGrow + + + + + + 50 + false + + + + Icon color: + + + + + + + + 50 + false + + + + + Nothing + + + + + POV + + + + + Label + + + + + Progress + + + + + Compile + + + + + + + + + 50 + false + + + + Text color: + + + + + + + + 50 + false + + + + + Nothing + + + + + POV + + + + + Label + + + + + Progress + + + + + Compile + + + + + + + + + 50 + false + + + + Background color: + + + + + + + + 50 + false + + + + + Nothing + + + + + POV + + + + + Label + + + + + Progress + + + + + Compile + + + + + + + + + 50 + false + + + + Border color: + + + + + + + + 50 + false + + + + + Nothing + + + + + POV + + + + + Label + + + + + Progress + + + + + Compile + + + + + + + + + 50 + false + + + + Corner color: + + + + + + + + 50 + false + + + + + Nothing + + + + + POV + + + + + Label + + + + + Progress + + + + + Compile + + + + + + + + + + + + 75 + true + + + + Background + + - - Nothing - + + + + 50 + false + + + + Color: + + - - POV - + + + + 16777215 + 32 + + + + + 50 + false + + + + + + + + 64 + 64 + + + + Ctrl+S + + - - Label - + + + + 50 + false + + + + Image: + + - - Progress - + + + + 50 + false + + + - - Compile - + + + Qt::Vertical + + + + 20 + 40 + + + - - - - - - Text color: - - - - - - - - Nothing - - - - - POV - - - - - Label - - - - - Progress - - - - - Compile - - - - - - - - Background color: - - - - - - - - Nothing - - - - - POV - - - - - Label - - - - - Progress - - - - - Compile - - - - - - - - - - Qt::Vertical - - - - - - - - - Title - - - true - - - - - - - POV - - - true - - - - - - - Label - - - true - - - - - - - Status - - - true - - - - - - - Compile - - - true - - - - - - - Word count - - - true - - - - - - - Goal - - - true - - - - - - - Percentage - - - true - - - - - - + + + + + - - - Labels - + + + 0 + + + + + + 0 + 0 + + + + background-color:lightBlue; +border:none; +padding:10px; +color:darkBlue; +font-size:16px; +font-weight:bold; +text-align:center; + + + Labels + + + Qt::AlignCenter + + + @@ -836,11 +1396,36 @@ - - - Status - + + + 0 + + + + + + 0 + 0 + + + + background-color:lightBlue; +border:none; +padding:10px; +color:darkBlue; +font-size:16px; +font-weight:bold; +text-align:center; + + + Status + + + Qt::AlignCenter + + + @@ -892,5 +1477,22 @@ - + + + lstMenu + currentRowChanged(int) + stack + setCurrentIndex(int) + + + 96 + 19 + + + 361 + 321 + + + + diff --git a/src/ui/views/corkView.py b/src/ui/views/corkView.py index 0912304..71bdbea 100644 --- a/src/ui/views/corkView.py +++ b/src/ui/views/corkView.py @@ -1,15 +1,13 @@ #!/usr/bin/env python #--!-- coding: utf8 --!-- - - - from qt import * from enums import * from functions import * from ui.views.corkDelegate import * from ui.views.dndView import * from ui.views.outlineBasics import * +import settings class corkView(QListView, dndView, outlineBasics): @@ -22,12 +20,19 @@ class corkView(QListView, dndView, outlineBasics): self.setWrapping(True) self.setItemDelegate(corkDelegate()) self.setSpacing(5) - self.setStyleSheet("""QListView { - background:#926239; - }""") self.setVerticalScrollMode(self.ScrollPerPixel) self.setFlow(self.LeftToRight) self.setSelectionBehavior(self.SelectRows) + self.updateBackground() + + def updateBackground(self): + self.setStyleSheet("""QListView {{ + background:{color}; + background-image: url({url}); + }}""".format( + color=settings.corkBackground["color"], + url=settings.corkBackground["image"] + )) def dragMoveEvent(self, event): dndView.dragMoveEvent(self, event)