diff --git a/novelwriter/config.py b/novelwriter/config.py index c8ff11ae..ad39b218 100644 --- a/novelwriter/config.py +++ b/novelwriter/config.py @@ -150,9 +150,6 @@ class Config: self.autoScrollPos = 30 # Start point for typewriter-like scrolling self.scrollPastEnd = True # Scroll past end of document, and centre cursor - self.wordCountTimer = 5.0 # Interval for word count update in seconds - self.incNotesWCount = True # The status bar word count includes notes - self.highlightQuotes = True # Highlight text in quotes self.allowOpenSQuote = False # Allow open-ended single quotes self.allowOpenDQuote = True # Allow open-ended double quotes @@ -160,6 +157,7 @@ class Config: self.stopWhenIdle = True # Stop the status bar clock when the user is idle self.userIdleTime = 300 # Time of inactivity to consider user idle + self.incNotesWCount = True # The status bar word count includes notes # User-Selected Symbol Settings self.fmtApostrophe = nwUnicode.U_RSQUO @@ -591,7 +589,6 @@ class Config: self.showTabsNSpaces = conf.rdBool(sec, "showtabsnspaces", self.showTabsNSpaces) self.showLineEndings = conf.rdBool(sec, "showlineendings", self.showLineEndings) self.showMultiSpaces = conf.rdBool(sec, "showmultispaces", self.showMultiSpaces) - self.wordCountTimer = conf.rdFlt(sec, "wordcounttimer", self.wordCountTimer) self.incNotesWCount = conf.rdBool(sec, "incnoteswcount", self.incNotesWCount) self.showFullPath = conf.rdBool(sec, "showfullpath", self.showFullPath) self.highlightQuotes = conf.rdBool(sec, "highlightquotes", self.highlightQuotes) @@ -698,7 +695,6 @@ class Config: "showtabsnspaces": str(self.showTabsNSpaces), "showlineendings": str(self.showLineEndings), "showmultispaces": str(self.showMultiSpaces), - "wordcounttimer": str(self.wordCountTimer), "incnoteswcount": str(self.incNotesWCount), "showfullpath": str(self.showFullPath), "highlightquotes": str(self.highlightQuotes), diff --git a/novelwriter/gui/doceditor.py b/novelwriter/gui/doceditor.py index 7cecb546..d7bedf8a 100644 --- a/novelwriter/gui/doceditor.py +++ b/novelwriter/gui/doceditor.py @@ -187,13 +187,12 @@ class GuiDocEditor(QPlainTextEdit): # Set Up Document Word Counter self.wcTimerDoc = QTimer() self.wcTimerDoc.timeout.connect(self._runDocCounter) + self.wcTimerDoc.setInterval(5000) self.wCounterDoc = BackgroundWordCounter(self) self.wCounterDoc.setAutoDelete(False) self.wCounterDoc.signals.countsReady.connect(self._updateDocCounts) - self.wcInterval = CONFIG.wordCountTimer - # Set Up Selection Word Counter self.wcTimerSel = QTimer() self.wcTimerSel.timeout.connect(self._runSelCounter) @@ -359,10 +358,6 @@ class GuiDocEditor(QPlainTextEdit): # Refresh the tab stops self.setTabStopDistance(CONFIG.getTabWidth()) - # Configure word count timer - self.wcInterval = CONFIG.wordCountTimer - self.wcTimerDoc.setInterval(int(self.wcInterval*1000)) - # If we have a document open, we should reload it in case the # font changed, otherwise we just clear the editor entirely, # which makes it read only. @@ -1190,7 +1185,7 @@ class GuiDocEditor(QPlainTextEdit): logger.debug("Word counter is busy") return - if time() - self._lastEdit < 5.0 * self.wcInterval: + if time() - self._lastEdit < 25.0: logger.debug("Running word counter") SHARED.runInThreadPool(self.wCounterDoc)