Merge branch 'master' into gui_tweaks

nw/gui/statusbar.py

@@ -57,10 +57,6 @@ class GuiMainStatus(QStatusBar):
         self.projWords = 0
         self.sessWords = 0
 
-        self.fntFixed = QFont()
-        self.fntFixed.setFamily("Monospace")
-        self.fntFixed.setPointSizeF(0.95*self.theTheme.fontPointSize)
-
         colNone  = QColor(*self.theTheme.statNone)
         colTrue  = QColor(*self.theTheme.statUnsaved)
         colFalse = QColor(*self.theTheme.statSaved)
@@ -105,12 +101,12 @@ class GuiMainStatus(QStatusBar):
         self.addPermanentWidget(self.statsText)
 
         ## The Session Clock
+        ### Set the mimimum width so the label doesn't rescale every second
         self.timeIcon = QLabel()
         self.timeText = QLabel("")
         self.timeIcon.setPixmap(self.theTheme.getPixmap("status_time", (iPx, iPx)))
         self.timeText.setToolTip("Session Time")
-        self.timeText.setAlignment(Qt.AlignVCenter | Qt.AlignRight)
-        self.timeText.setFont(self.fntFixed)
+        self.timeText.setMinimumWidth(self.theTheme.getTextWidth("00:00:00:"))
         self.timeIcon.setContentsMargins(0, 0, 0, 0)
         self.timeText.setContentsMargins(0, 0, 0, 0)
         self.addPermanentWidget(self.timeIcon)