CodeMirror/manuskript
1
0
Fork 0
mirror of https://github.com/olivierkes/manuskript.git synced 2024-05-04 04:52:33 +12:00
Code Issues Projects Releases Wiki Activity

Fix type conversions, replace potentially deprecated function usage and center dialog

Browse source 
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
This commit is contained in:
TheJackiMonster 2022-12-10 18:05:41 +01:00
parent 0a81ff4960
commit 00aca6a0e1
No known key found for this signature in database
GPG key ID: D850A5F772E880F9
3 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
manuskript/mainWindow.py
View file

@ -30,7 +30,7 @@ from manuskript.ui.exporters.exporter import exporterDialog
from manuskript.ui.helpLabel import helpLabel
from manuskript.ui.mainWindow import Ui_MainWindow
from manuskript.ui.tools.frequencyAnalyzer import frequencyAnalyzer
from manuskript.ui.tools.targets import targetsDialog
from manuskript.ui.tools.targets import TargetsDialog
from manuskript.ui.views.outlineDelegates import outlineCharacterDelegate
from manuskript.ui.views.plotDelegate import plotDelegate
from manuskript.ui.views.MDEditView import MDEditView
@ -655,7 +655,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
item = self.mdlOutline.rootItem
wc = item.data(Outline.wordCount)
self.sessionStartWordCount = wc
self.sessionStartWordCount = int(wc) if wc != "" else 0
# Add project name to Window's name
self.setWindowTitle(self.projectName() + " - " + self.tr("Manuskript"))
@ -1508,8 +1508,9 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.centerChildWindow(self.fw)
def sessionTargets(self):
self.td = targetsDialog(self)
self.td = TargetsDialog(self)
self.td.show()
self.centerChildWindow(self.td)
###############################################################################
# VIEW MENU

4
manuskript/models/characterModel.py
View file

@ -278,11 +278,11 @@ class Character(searchableItem):
def index(self, column=0):
return self._model.indexFromItem(self, column)
def data(self, column):
def data(self, column, role=Qt.DisplayRole):
if column == "Info":
return self.infos
else:
return self._data.get(column, None)
return self._data.get(column, role)
def assignRandomColor(self):
"""

25
manuskript/ui/tools/targets.py
View file

@ -8,7 +8,9 @@ from manuskript.enums import Outline
from manuskript.functions import appPath
from manuskript.ui.tools.targets_ui import Ui_targets
class targetsDialog(QWidget, Ui_targets):
class TargetsDialog(QWidget, Ui_targets):
def __init__(self, parent=None, mw=None):
QWidget.__init__(self)
self.mw = parent
@ -26,10 +28,16 @@ class targetsDialog(QWidget, Ui_targets):
def getDraftStats(self):
item = self.mw.mdlOutline.rootItem
wc = item.data(Outline.wordCount)
goal = item.data(Outline.goal)
progress = item.data(Outline.goalPercentage)
return (wc, goal, progress)
return (
int(wc) if wc != "" else 0,
int(goal) if goal != "" else 0,
float(progress) if progress != "" else 0.0
)
def resetSession(self):
wc, _, _ = self.getDraftStats()
@ -38,18 +46,19 @@ class targetsDialog(QWidget, Ui_targets):
@staticmethod
def progress_bar_value(value):
return min(max(float(value) * 100, 0), 100)
return int(min(max(float(value) * 100, 0), 100))
def tick(self):
wc, goal, progress = self.getDraftStats()
self.draft_wc_label.setText(locale.format("%d", wc, grouping=True))
self.draft_goal_label.setText(locale.format("%d", goal, grouping=True))
self.draft_wc_label.setText(locale.format_string("%d", wc, grouping=True))
self.draft_goal_label.setText(locale.format_string("%d", goal, grouping=True))
# limit to 0-100 for display
self.draft_progress_bar.setValue(self.progress_bar_value(progress))
self.draft_progress_bar.setValue(self.progress_bar_value(progress))
session_wc = wc - self.mw.sessionStartWordCount
self.session_wc_label.setText(locale.format("%d", session_wc, grouping=True))
session_wc = wc - int(self.mw.sessionStartWordCount)
self.session_wc_label.setText(locale.format_string("%d", session_wc, grouping=True))
if self.session_target.value() == 0:
self.session_progress_bar.setValue(0)
else: