mirror of
https://github.com/olivierkes/manuskript.git
synced 2024-06-01 18:49:38 +12:00
fullscreen: Add a auto-show/hide progress setting.
Realizing that the show/hide progress was being ignored if we navigate to a scene without a goal set. Also, if we go fullscreen on a scene without a goal then navigate to a scene with one, the progress wouldn't get shown. Adding the "Auto Show/Hide" setting fixes the issue with all use cases.
This commit is contained in:
parent
8900a0ed3f
commit
156e2d0067
|
@ -165,6 +165,7 @@ class fullScreenEditor(QWidget):
|
||||||
self.bottomPanel.addDisplay(self.tr("Theme selector"), 'bottom-theme', (self.lstThemes, themeLabel))
|
self.bottomPanel.addDisplay(self.tr("Theme selector"), 'bottom-theme', (self.lstThemes, themeLabel))
|
||||||
self.bottomPanel.addDisplay(self.tr("Word count"), 'bottom-wc', (self.lblWC, ))
|
self.bottomPanel.addDisplay(self.tr("Word count"), 'bottom-wc', (self.lblWC, ))
|
||||||
self.bottomPanel.addDisplay(self.tr("Progress"), 'bottom-progress', (self.lblProgress, ))
|
self.bottomPanel.addDisplay(self.tr("Progress"), 'bottom-progress', (self.lblProgress, ))
|
||||||
|
self.bottomPanel.addSetting(self.tr("Progress: Auto Show/Hide"), 'progress-auto-show', True)
|
||||||
self.bottomPanel.addDisplay(self.tr("Clock"), 'bottom-clock', (self.lblClock, ))
|
self.bottomPanel.addDisplay(self.tr("Clock"), 'bottom-clock', (self.lblClock, ))
|
||||||
self.bottomPanel.addSetting(self.tr("Clock: Show Seconds"), 'clock-show-seconds', True)
|
self.bottomPanel.addSetting(self.tr("Clock: Show Seconds"), 'clock-show-seconds', True)
|
||||||
self.bottomPanel.setAutoHideVariable('autohide-bottom')
|
self.bottomPanel.setAutoHideVariable('autohide-bottom')
|
||||||
|
@ -357,18 +358,22 @@ class fullScreenEditor(QWidget):
|
||||||
pg = item.data(Outline.goalPercentage)
|
pg = item.data(Outline.goalPercentage)
|
||||||
|
|
||||||
if goal:
|
if goal:
|
||||||
rect = self.lblProgress.geometry()
|
if settings.fullscreenSettings.get("progress-auto-show", True):
|
||||||
rect = QRect(QPoint(0, 0), rect.size())
|
self.lblProgress.show()
|
||||||
self.px = QPixmap(rect.size())
|
|
||||||
self.px.fill(Qt.transparent)
|
|
||||||
p = QPainter(self.px)
|
|
||||||
drawProgress(p, rect, pg, 2)
|
|
||||||
p.end()
|
|
||||||
self.lblProgress.setPixmap(self.px)
|
|
||||||
self.lblWC.setText(self.tr("{} words / {}").format(wc, goal))
|
self.lblWC.setText(self.tr("{} words / {}").format(wc, goal))
|
||||||
else:
|
else:
|
||||||
self.lblProgress.hide()
|
if settings.fullscreenSettings.get("progress-auto-show", True):
|
||||||
|
self.lblProgress.hide()
|
||||||
self.lblWC.setText(self.tr("{} words").format(wc))
|
self.lblWC.setText(self.tr("{} words").format(wc))
|
||||||
|
pg = 0
|
||||||
|
rect = self.lblProgress.geometry()
|
||||||
|
rect = QRect(QPoint(0, 0), rect.size())
|
||||||
|
self.px = QPixmap(rect.size())
|
||||||
|
self.px.fill(Qt.transparent)
|
||||||
|
p = QPainter(self.px)
|
||||||
|
drawProgress(p, rect, pg, 2)
|
||||||
|
p.end()
|
||||||
|
self.lblProgress.setPixmap(self.px)
|
||||||
|
|
||||||
self.locker.setWordCount(wc)
|
self.locker.setWordCount(wc)
|
||||||
# If there's a goal, then we update the locker target's number of word accordingly
|
# If there's a goal, then we update the locker target's number of word accordingly
|
||||||
|
|
Loading…
Reference in a new issue