Some further text, icon and column size tweaks.

nw/gui/elements/docdetails.py

@@ -29,7 +29,7 @@ import logging
 import nw
 
 from PyQt5.QtCore import Qt
-from PyQt5.QtGui import QFont, QIcon, QPixmap
+from PyQt5.QtGui import QFont, QIcon, QPixmap, QFontMetrics
 from PyQt5.QtWidgets import QFrame, QGridLayout, QLabel
 
 from nw.constants import (
@@ -77,7 +77,6 @@ class GuiDocDetails(QFrame):
         self.labelName.setAlignment(Qt.AlignLeft | Qt.AlignBaseline)
 
         self.labelFlag = QLabel("")
-        # self.labelFlag.setFont(self.fntFixed)
         self.labelFlag.setAlignment(Qt.AlignRight | Qt.AlignBaseline)
 
         self.labelData = QLabel("")
@@ -178,7 +177,12 @@ class GuiDocDetails(QFrame):
         self.mainBox.setColumnStretch(2,1)
         self.mainBox.setColumnStretch(3,0)
         self.mainBox.setColumnStretch(4,0)
-        self.mainBox.setColumnMinimumWidth(1, 20)
+
+        # Make sure the columns for flags and counts don't resize too often
+        flagWidth = QFontMetrics(self.fntFixed).boundingRect("Mm").width()
+        countWidth = QFontMetrics(self.fntValue).boundingRect("99,999").width()
+        self.mainBox.setColumnMinimumWidth(1, flagWidth)
+        self.mainBox.setColumnMinimumWidth(4, countWidth)
 
         logger.debug("DocDetails initialisation complete")
 

nw/gui/elements/doctree.py

@@ -65,11 +65,12 @@ class GuiDocTree(QTreeWidget):
         self.clearTree()
 
         # Build GUI
-        self.setIconSize(QSize(13, 13))
+        iPx = self.theTheme.textIconSize
+        self.setIconSize(QSize(iPx, iPx))
         self.setExpandsOnDoubleClick(True)
-        self.setIndentation(13)
+        self.setIndentation(iPx)
         self.setColumnCount(5)
-        self.setHeaderLabels(["Label","Words","Inc","Flags","Handle"])
+        self.setHeaderLabels(["Label", "Words", "Inc", "Flags", "Handle"])
         self.hideColumn(self.C_HANDLE)
 
         treeHead = self.headerItem()
@@ -92,8 +93,8 @@ class GuiDocTree(QTreeWidget):
         # self.setSelectionMode(QAbstractItemView.ExtendedSelection)
         # self.setSelectionBehavior(QAbstractItemView.SelectRows)
 
-        for colN in range(len(self.mainConf.treeColWidth)):
-            self.setColumnWidth(colN, self.mainConf.treeColWidth[colN])
+        for colN, colW in enumerate(self.mainConf.treeColWidth):
+            self.setColumnWidth(colN, colW)
 
         self.resizeColumnToContents(self.C_EXPORT)
         self.resizeColumnToContents(self.C_FLAGS)