mirror of
https://github.com/olivierkes/manuskript.git
synced 2024-07-01 04:30:22 +12:00
Merge branch 'develop'
This commit is contained in:
commit
53ebecb4a1
|
@ -280,9 +280,13 @@ class fullScreenEditor(QWidget):
|
||||||
self.lblWC.setText(self.tr("{} words").format(wc))
|
self.lblWC.setText(self.tr("{} words").format(wc))
|
||||||
|
|
||||||
self.locker.setWordCount(wc)
|
self.locker.setWordCount(wc)
|
||||||
|
# If there's a goal, then we update the locker target's number of word accordingly
|
||||||
|
# (also if there is a word count, we deduce it.
|
||||||
if goal and not self.locker.isLocked():
|
if goal and not self.locker.isLocked():
|
||||||
if goal - wc > 0:
|
if wc and goal - wc > 0:
|
||||||
self.locker.spnWordTarget.setValue(goal - wc)
|
self.locker.spnWordTarget.setValue(goal - wc)
|
||||||
|
elif not wc:
|
||||||
|
self.locker.spnWordTarget.setValue(goal)
|
||||||
|
|
||||||
|
|
||||||
class myScrollBar(QScrollBar):
|
class myScrollBar(QScrollBar):
|
||||||
|
|
Loading…
Reference in a new issue