Adds: custom item sizes in Tree View

This commit is contained in:
Olivier Keshavjee 2017-10-23 14:40:55 +02:00
parent 40cc136836
commit 583734512b
5 changed files with 146 additions and 52 deletions

View file

@ -404,6 +404,8 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.updateMenuDict()
self.setDictionary()
iconSize = settings.viewSettings["Tree"]["iconSize"]
self.treeRedacOutline.setIconSize(QSize(iconSize, iconSize))
self.mainEditor.setFolderView(settings.folderView)
self.mainEditor.updateFolderViewButtons(settings.folderView)
self.mainEditor.tabSplitter.updateStyleSheet()

View file

@ -18,6 +18,7 @@ viewSettings = {
"Background": "Nothing",
"InfoFolder": "Nothing",
"InfoText": "Nothing",
"iconSize": 24,
},
"Cork": {
"Icon": "Nothing",
@ -168,6 +169,12 @@ def load(string, fromString=False, protocol=None):
global viewSettings
viewSettings = allSettings["viewSettings"]
for cat, name, default in [
("Tree", "iconSize", 24), # Added in 0.6.0
]:
if not name in viewSettings[cat]:
viewSettings[cat][name] = default
if "dict" in allSettings:
global dict
dict = allSettings["dict"]

View file

@ -136,6 +136,11 @@ class settingsWindow(QWidget, Ui_Settings):
item.setChecked(settings.viewSettings["Tree"][what] == value)
item.toggled.connect(self.treeViewSettignsChanged)
self.sldTreeIconSize.valueChanged.connect(self.treeViewSettignsChanged)
self.sldTreeIconSize.valueChanged.connect(
lambda v: self.lblTreeIconSize.setText("{}x{}".format(v, v)))
self.sldTreeIconSize.setValue(settings.viewSettings["Tree"]["iconSize"])
self.rdoCorkOldStyle.setChecked(settings.corkStyle == "old")
self.rdoCorkNewStyle.setChecked(settings.corkStyle == "new")
self.rdoCorkNewStyle.toggled.connect(self.setCorkStyle)
@ -349,6 +354,11 @@ class settingsWindow(QWidget, Ui_Settings):
if item.isChecked():
settings.viewSettings["Tree"][what] = value
iconSize = self.sldTreeIconSize.value()
if iconSize != settings.viewSettings["Tree"]["iconSize"]:
settings.viewSettings["Tree"]["iconSize"] = iconSize
self.mw.treeRedacOutline.setIconSize(QSize(iconSize, iconSize))
self.mw.treeRedacOutline.viewport().update()
def setCorkColor(self):

View file

@ -494,6 +494,32 @@ class Ui_Settings(object):
self.cmbTreeBackground.addItem("")
self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.cmbTreeBackground)
self.verticalLayout_17.addWidget(self.groupBox_3)
self.groupBox_16 = QtWidgets.QGroupBox(self.tab)
font = QtGui.QFont()
font.setBold(True)
font.setWeight(75)
self.groupBox_16.setFont(font)
self.groupBox_16.setObjectName("groupBox_16")
self.horizontalLayout_11 = QtWidgets.QHBoxLayout(self.groupBox_16)
self.horizontalLayout_11.setObjectName("horizontalLayout_11")
self.lblTreeIconSize = QtWidgets.QLabel(self.groupBox_16)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.lblTreeIconSize.setFont(font)
self.lblTreeIconSize.setObjectName("lblTreeIconSize")
self.horizontalLayout_11.addWidget(self.lblTreeIconSize)
self.sldTreeIconSize = QtWidgets.QSlider(self.groupBox_16)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.sldTreeIconSize.setFont(font)
self.sldTreeIconSize.setMinimum(16)
self.sldTreeIconSize.setMaximum(128)
self.sldTreeIconSize.setOrientation(QtCore.Qt.Horizontal)
self.sldTreeIconSize.setObjectName("sldTreeIconSize")
self.horizontalLayout_11.addWidget(self.sldTreeIconSize)
self.verticalLayout_17.addWidget(self.groupBox_16)
self.horizontalLayout_9 = QtWidgets.QHBoxLayout()
self.horizontalLayout_9.setObjectName("horizontalLayout_9")
self.groupBox_8 = QtWidgets.QGroupBox(self.tab)
@ -1709,7 +1735,7 @@ class Ui_Settings(object):
self.retranslateUi(Settings)
self.stack.setCurrentIndex(2)
self.tabViews.setCurrentIndex(3)
self.tabViews.setCurrentIndex(0)
self.themeStack.setCurrentIndex(1)
self.themeEditStack.setCurrentIndex(3)
self.lstMenu.currentRowChanged['int'].connect(self.stack.setCurrentIndex)
@ -1780,6 +1806,8 @@ 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_16.setTitle(_translate("Settings", "Icon Size"))
self.lblTreeIconSize.setText(_translate("Settings", "TextLabel"))
self.groupBox_8.setTitle(_translate("Settings", "Folders"))
self.rdoTreeItemCount.setText(_translate("Settings", "Show ite&m count"))
self.rdoTreeWC.setText(_translate("Settings", "Show wordcount"))

View file

@ -792,7 +792,7 @@ text-align:center;</string>
<item>
<widget class="QTabWidget" name="tabViews">
<property name="currentIndex">
<number>3</number>
<number>0</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="icon">
@ -984,6 +984,53 @@ text-align:center;</string>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_16">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="title">
<string>Icon Size</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_11">
<item>
<widget class="QLabel" name="lblTreeIconSize">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item>
<widget class="QSlider" name="sldTreeIconSize">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="minimum">
<number>16</number>
</property>
<property name="maximum">
<number>128</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>