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

Cleanup code

Browse source 
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
This commit is contained in:
TheJackiMonster 2023-01-30 23:19:33 +01:00
parent acd23e9651
commit 414cd0f8a3
No known key found for this signature in database
GPG key ID: D850A5F772E880F9
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
manuskript/ui/editors/mainEditor.py
View file

@ -337,28 +337,28 @@ class mainEditor(QWidget, Ui_mainEditor):
if settings.progressChars:
self.lblRedacWC.setText(self.tr("({} chars) {} words / {} ").format(
locale.format("%d", cc, grouping=True),
locale.format("%d", wc, grouping=True),
locale.format("%d", goal, grouping=True)))
locale.format_string("%d", cc, grouping=True),
locale.format_string("%d", wc, grouping=True),
locale.format_string("%d", goal, grouping=True)))
self.lblRedacWC.setToolTip("")
else:
self.lblRedacWC.setText(self.tr("{} words / {} ").format(
locale.format("%d", wc, grouping=True),
locale.format("%d", goal, grouping=True)))
locale.format_string("%d", wc, grouping=True),
locale.format_string("%d", goal, grouping=True)))
self.lblRedacWC.setToolTip(self.tr("{} chars").format(
locale.format("%d", cc, grouping=True)))
locale.format_string("%d", cc, grouping=True)))
else:
self.lblRedacProgress.hide()
if settings.progressChars:
self.lblRedacWC.setText(self.tr("{} chars ").format(
locale.format("%d", cc, grouping=True)))
locale.format_string("%d", cc, grouping=True)))
self.lblRedacWC.setToolTip("")
else:
self.lblRedacWC.setText(self.tr("{} words ").format(
locale.format("%d", wc, grouping=True)))
locale.format_string("%d", wc, grouping=True)))
self.lblRedacWC.setToolTip(self.tr("{} chars").format(
locale.format("%d", cc, grouping=True)))
locale.format_string("%d", cc, grouping=True)))
###############################################################################
# VIEWS

16
manuskript/ui/views/textEditView.py
View file

@ -569,7 +569,7 @@ class textEditView(QTextEdit):
suggestions = []
# Check for any suggestions for corrections at the cursors position
if self._dict != None:
if self._dict is not None:
text = self.toPlainText()
suggestions = self._dict.findSuggestions(text, cursor.selectionStart(), cursor.selectionEnd())
@ -598,7 +598,7 @@ class textEditView(QTextEdit):
popup_menu = self.appendContextMenuEntriesForWord(popup_menu, selectedWord)
if len(suggestions) > 0 or selectedWord != None:
if len(suggestions) > 0 or selectedWord is not None:
valid = len(suggestions) == 0
if not valid:
@ -611,7 +611,7 @@ class textEditView(QTextEdit):
spell_menu = QMenu(self.tr('Spelling Suggestions'), self)
spell_menu.setIcon(F.themeIcon("spelling"))
if (match.end > match.start and selectedWord == None):
if match.end > match.start and selectedWord is None:
# Select the actual area of the match
cursor = self.textCursor()
cursor.setPosition(match.start, QTextCursor.MoveAnchor);
@ -642,7 +642,7 @@ class textEditView(QTextEdit):
correct_menu = None
correct_action = None
if (len(match.replacements) > 0 and match.end > match.start):
if len(match.replacements) > 0 and match.end > match.start:
# Select the actual area of the match
cursor = self.textCursor()
cursor.setPosition(match.start, QTextCursor.MoveAnchor);
@ -658,7 +658,7 @@ class textEditView(QTextEdit):
action.correct.connect(self.correctWord)
correct_menu.addAction(action)
if correct_menu == None:
if correct_menu is None:
correct_action = QAction(self.tr('&Correction Suggestion'), popup_menu)
correct_action.setIcon(F.themeIcon("spelling"))
correct_action.setEnabled(False)
@ -670,10 +670,10 @@ class textEditView(QTextEdit):
for i in range(0, len(msg_lines)):
popup_menu.insertSection(popup_menu.actions()[0], msg_lines[len(msg_lines) - (i + 1)])
if correct_menu != None:
popup_menu.insertMenu(popup_menu.actions()[0], correct_menu)
else:
if correct_menu is None:
popup_menu.insertAction(popup_menu.actions()[0], correct_action)
else:
popup_menu.insertMenu(popup_menu.actions()[0], correct_menu)
# If word was added to custom dict, give the possibility to remove it
elif self._dict.isCustomWord(selectedWord):