Merge pull request #746 from TheJackiMonster/charcount

Added char-count with settings to enable/disable it.
2024-06-01 10:39:34 +12:00 · 2021-02-19 15:09:02 +01:00 · 2021-02-19 15:09:02 +01:00 · dffa9dbd8b
parent 0de131f392 1b62288982
commit dffa9dbd8b
8 changed files with 449 additions and 181 deletions
--- a/manuskript/functions/init.py
+++ b/manuskript/functions/init.py
@ -23,6 +23,14 @@ def wordCount(text):
    t = [l for l in t if l]
    return len(t)

+def charCount(text, use_spaces = True):
+    t = text.strip()
+
+    if not use_spaces:
+        t = t.replace(" ", "")
+
+    return len(t)
+
 validate_ok = lambda *args, **kwargs: True
 def uiParse(input, default, converter, validator=validate_ok):
    """
--- a/manuskript/models/outlineItem.py
+++ b/manuskript/models/outlineItem.py
@ -92,6 +92,9 @@ class outlineItem(abstractItem):
            )

    __repr__ = __str__
+    
+    def charCount(self):
+        return self._data.get(self.enum.charCount, 0)

    #######################################################################
    # Data
@ -122,7 +125,7 @@ class outlineItem(abstractItem):

        elif role == Qt.FontRole:
            f = QFont()
-            if column == E.wordCount and self.isFolder():
+            if (column == E.wordCount or column == E.charCount) and self.isFolder():
                f.setItalic(True)
            elif column == E.goal and self.isFolder() and not self.data(E.setGoal):
                f.setItalic(True)
@ -143,7 +146,7 @@ class outlineItem(abstractItem):

        # Checking if we will have to recount words
        updateWordCount = False
-        if column in [E.wordCount, E.goal, E.setGoal]:
+        if column in [E.wordCount, E.charCount, E.goal, E.setGoal]:
            updateWordCount = not column in self._data or self._data[column] != data

        # Stuff to do before
@ -156,8 +159,9 @@ class outlineItem(abstractItem):
        # Stuff to do afterwards
        if column == E.text:
            wc = F.wordCount(data)
+            cc = F.charCount(data, settings.countSpaces)
            self.setData(E.wordCount, wc)
-            self.setData(E.charCount, len(data)) 
+            self.setData(E.charCount, cc)

        if column == E.compile:
            # Title changes when compile changes
@ -225,7 +229,8 @@ class outlineItem(abstractItem):
                self.setData(self.enum.goalPercentage, "")

        self.emitDataChanged([self.enum.goal, self.enum.setGoal,
-                              self.enum.wordCount, self.enum.goalPercentage])
+                              self.enum.wordCount, self.enum.charCount,
+                              self.enum.goalPercentage])

        if self.parent():
            self.parent().updateWordCount()
--- a/manuskript/settings.py
+++ b/manuskript/settings.py
@ -47,6 +47,8 @@ corkSizeFactor = 100
 folderView = "cork"
 lastTab = 0
 openIndexes = [""]
+progressChars = False
+countSpaces = True
 autoSave = False
 autoSaveDelay = 5
 autoSaveNoChanges = True
@ -123,7 +125,7 @@ def initDefaultValues():
 def save(filename=None, protocol=None):

    global spellcheck, dict, corkSliderFactor, viewSettings, corkSizeFactor, folderView, lastTab, openIndexes, \
-           autoSave, autoSaveDelay, saveOnQuit, autoSaveNoChanges, autoSaveNoChangesDelay, outlineViewColumns, \
+           progressChars, autoSave, autoSaveDelay, saveOnQuit, autoSaveNoChanges, autoSaveNoChangesDelay, outlineViewColumns, \
           corkBackground, corkStyle, fullScreenTheme, defaultTextType, textEditor, revisions, frequencyAnalyzer, viewMode, \
           saveToZip, dontShowDeleteWarning, fullscreenSettings

@ -136,6 +138,8 @@ def save(filename=None, protocol=None):
        "folderView": folderView,
        "lastTab": lastTab,
        "openIndexes": openIndexes,
+        "progressChars": progressChars,
+        "countSpaces": countSpaces,
        "autoSave":autoSave,
        "autoSaveDelay":autoSaveDelay,
        # TODO: Settings Cleanup Task -- Rename saveOnQuit to saveOnProjectClose -- see PR #615
@ -235,6 +239,14 @@ def load(string, fromString=False, protocol=None):
        global openIndexes
        openIndexes = allSettings["openIndexes"]

+    if "progressChars" in allSettings:
+        global progressChars
+        progressChars = allSettings["progressChars"]
+
+    if "countSpaces" in allSettings:
+        global countSpaces
+        countSpaces = allSettings["countSpaces"]
+
    if "autoSave" in allSettings:
        global autoSave
        autoSave = allSettings["autoSave"]
--- a/manuskript/settingsWindow.py
+++ b/manuskript/settingsWindow.py
@ -111,6 +111,9 @@ class settingsWindow(QWidget, Ui_Settings):
        self.spnGeneralFontSize.setValue(f.pointSize())
        self.spnGeneralFontSize.valueChanged.connect(self.setAppFontSize)

+        self.chkProgressChars.setChecked(settings.progressChars);
+        self.chkProgressChars.stateChanged.connect(self.charSettingsChanged)
+
        self.txtAutoSave.setValidator(QIntValidator(0, 999, self))
        self.txtAutoSaveNoChanges.setValidator(QIntValidator(0, 999, self))
        self.chkAutoSave.setChecked(settings.autoSave)
@ -164,10 +167,12 @@ class settingsWindow(QWidget, Ui_Settings):
        for item, what, value in [
            (self.rdoTreeItemCount, "InfoFolder", "Count"),
            (self.rdoTreeWC, "InfoFolder", "WC"),
+            (self.rdoTreeCC, "InfoFolder", "CC"),
            (self.rdoTreeProgress, "InfoFolder", "Progress"),
            (self.rdoTreeSummary, "InfoFolder", "Summary"),
            (self.rdoTreeNothing, "InfoFolder", "Nothing"),
            (self.rdoTreeTextWC, "InfoText", "WC"),
+            (self.rdoTreeTextCC, "InfoText", "CC"),
            (self.rdoTreeTextProgress, "InfoText", "Progress"),
            (self.rdoTreeTextSummary, "InfoText", "Summary"),
            (self.rdoTreeTextNothing, "InfoText", "Nothing"),
@ -180,6 +185,9 @@ class settingsWindow(QWidget, Ui_Settings):
            lambda v: self.lblTreeIconSize.setText("{}x{}".format(v, v)))
        self.sldTreeIconSize.setValue(settings.viewSettings["Tree"]["iconSize"])

+        self.chkCountSpaces.setChecked(settings.countSpaces);
+        self.chkCountSpaces.stateChanged.connect(self.countSpacesChanged)
+
        self.rdoCorkOldStyle.setChecked(settings.corkStyle == "old")
        self.rdoCorkNewStyle.setChecked(settings.corkStyle == "new")
        self.rdoCorkNewStyle.toggled.connect(self.setCorkStyle)
@ -338,6 +346,11 @@ class settingsWindow(QWidget, Ui_Settings):
        sttgs = QSettings(qApp.organizationName(), qApp.applicationName())
        sttgs.setValue("appFontSize", val)

+    def charSettingsChanged(self):
+        settings.progressChars = True if self.chkProgressChars.checkState() else False
+
+        self.mw.mainEditor.updateStats()
+
    def saveSettingsChanged(self):
        if self.txtAutoSave.text() in ["", "0"]:
            self.txtAutoSave.setText("1")
@ -427,10 +440,12 @@ class settingsWindow(QWidget, Ui_Settings):
        for item, what, value in [
            (self.rdoTreeItemCount, "InfoFolder", "Count"),
            (self.rdoTreeWC, "InfoFolder", "WC"),
+            (self.rdoTreeCC, "InfoFolder", "CC"),
            (self.rdoTreeProgress, "InfoFolder", "Progress"),
            (self.rdoTreeSummary, "InfoFolder", "Summary"),
            (self.rdoTreeNothing, "InfoFolder", "Nothing"),
            (self.rdoTreeTextWC, "InfoText", "WC"),
+            (self.rdoTreeTextCC, "InfoText", "CC"),
            (self.rdoTreeTextProgress, "InfoText", "Progress"),
            (self.rdoTreeTextSummary, "InfoText", "Summary"),
            (self.rdoTreeTextNothing, "InfoText", "Nothing"),
@ -445,6 +460,11 @@ class settingsWindow(QWidget, Ui_Settings):

        self.mw.treeRedacOutline.viewport().update()

+    def countSpacesChanged(self):
+        settings.countSpaces = True if self.chkCountSpaces.checkState() else False
+
+        self.mw.mainEditor.updateStats()
+
    def setCorkColor(self):
        color = QColor(settings.corkBackground["color"])
        self.colorDialog = QColorDialog(color, self)
--- a/manuskript/ui/editors/mainEditor.py
+++ b/manuskript/ui/editors/mainEditor.py
@ -292,6 +292,7 @@ class mainEditor(QWidget, Ui_mainEditor):
            return

        index = self.currentEditor().currentIndex
+        
        if index.isValid():
            item = index.internalPointer()
        else:
@ -300,6 +301,7 @@ class mainEditor(QWidget, Ui_mainEditor):
        if not item:
            item = self.mw.mdlOutline.rootItem

+        cc = item.data(Outline.charCount)
        wc = item.data(Outline.wordCount)
        goal = item.data(Outline.goal)
        chars = item.data(Outline.charCount) # len(item.data(Outline.text)) 
@ -308,10 +310,12 @@ class mainEditor(QWidget, Ui_mainEditor):
        goal = uiParse(goal, None, int, lambda x: x>=0)
        progress = uiParse(progress, 0.0, float)

-        if not chars:
-            chars = 0
+        if not cc:
+            cc = 0
+        
        if not wc:
            wc = 0
+
        if goal:
            self.lblRedacProgress.show()
            rect = self.lblRedacProgress.geometry()
@ -322,15 +326,31 @@ class mainEditor(QWidget, Ui_mainEditor):
            drawProgress(p, rect, progress, 2)
            del p
            self.lblRedacProgress.setPixmap(self.px)
-            self.lblRedacWC.setText(self.tr("({} chars) {}  words / {} ").format(
-                    locale.format("%d", chars, grouping=True),
-                    locale.format("%d", wc, grouping=True),
-                    locale.format("%d", goal, grouping=True)))
+
+            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)))
+                self.lblRedacWC.setToolTip("")
+            else:
+                self.lblRedacWC.setText(self.tr("{}  words / {} ").format(
+                        locale.format("%d", wc, grouping=True),
+                        locale.format("%d", goal, grouping=True)))
+                self.lblRedacWC.setToolTip(self.tr("{} chars").format(
+                        locale.format("%d", cc, grouping=True)))
        else:
            self.lblRedacProgress.hide()
-            self.lblRedacWC.setText(self.tr("({} chars) {} words ").format(
-                    locale.format("%d", chars, grouping=True),
-                    locale.format("%d", wc, grouping=True)))
+
+            if settings.progressChars:
+                self.lblRedacWC.setText(self.tr("{} chars ").format(
+                        locale.format("%d", cc, grouping=True)))
+                self.lblRedacWC.setToolTip("")
+            else:
+                self.lblRedacWC.setText(self.tr("{} words ").format(
+                        locale.format("%d", wc, grouping=True)))
+                self.lblRedacWC.setToolTip(self.tr("{} chars").format(
+                        locale.format("%d", cc, grouping=True)))

    ###############################################################################
    # VIEWS
--- a/manuskript/ui/settings_ui.py
+++ b/manuskript/ui/settings_ui.py
@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-

-# Form implementation generated from reading ui file 'manuskript/ui/settings_ui.ui'
+# Form implementation generated from reading ui file 'settings_ui.ui'
 #
-# Created by: PyQt5 UI code generator 5.13.0
+# Created by: PyQt5 UI code generator 5.15.0
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# run again.  Do not edit this file unless you know what you are doing.


 from PyQt5 import QtCore, QtGui, QtWidgets
@ -13,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_Settings(object):
    def setupUi(self, Settings):
        Settings.setObjectName("Settings")
-        Settings.resize(658, 598)
+        Settings.resize(681, 598)
        self.horizontalLayout_8 = QtWidgets.QHBoxLayout(Settings)
        self.horizontalLayout_8.setObjectName("horizontalLayout_8")
        self.lstMenu = QtWidgets.QListWidget(Settings)
@ -55,50 +56,9 @@ class Ui_Settings(object):
        self.groupBox_2.setFont(font)
        self.groupBox_2.setObjectName("groupBox_2")
        self.formLayout_13 = QtWidgets.QFormLayout(self.groupBox_2)
-        self.formLayout_13.setFieldGrowthPolicy(QtWidgets.QFormLayout.FieldsStayAtSizeHint)
        self.formLayout_13.setObjectName("formLayout_13")
-        self.label_56 = QtWidgets.QLabel(self.groupBox_2)
-        font = QtGui.QFont()
-        font.setBold(False)
-        font.setWeight(50)
-        self.label_56.setFont(font)
-        self.label_56.setObjectName("label_56")
-        self.formLayout_13.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_56)
-        self.cmbStyle = QtWidgets.QComboBox(self.groupBox_2)
-        font = QtGui.QFont()
-        font.setBold(False)
-        font.setWeight(50)
-        self.cmbStyle.setFont(font)
-        self.cmbStyle.setObjectName("cmbStyle")
-        self.formLayout_13.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.cmbStyle)
-        self.label_57 = QtWidgets.QLabel(self.groupBox_2)
-        font = QtGui.QFont()
-        font.setBold(False)
-        font.setWeight(50)
-        self.label_57.setFont(font)
-        self.label_57.setObjectName("label_57")
-        self.formLayout_13.setWidget(6, QtWidgets.QFormLayout.LabelRole, self.label_57)
-        self.cmbTranslation = QtWidgets.QComboBox(self.groupBox_2)
-        font = QtGui.QFont()
-        font.setBold(False)
-        font.setWeight(50)
-        self.cmbTranslation.setFont(font)
-        self.cmbTranslation.setObjectName("cmbTranslation")
-        self.formLayout_13.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.cmbTranslation)
-        self.label_58 = QtWidgets.QLabel(self.groupBox_2)
-        font = QtGui.QFont()
-        font.setBold(False)
-        font.setWeight(50)
-        self.label_58.setFont(font)
-        self.label_58.setObjectName("label_58")
-        self.formLayout_13.setWidget(7, QtWidgets.QFormLayout.LabelRole, self.label_58)
-        self.spnGeneralFontSize = QtWidgets.QSpinBox(self.groupBox_2)
-        font = QtGui.QFont()
-        font.setBold(False)
-        font.setWeight(50)
-        self.spnGeneralFontSize.setFont(font)
-        self.spnGeneralFontSize.setObjectName("spnGeneralFontSize")
-        self.formLayout_13.setWidget(7, QtWidgets.QFormLayout.FieldRole, self.spnGeneralFontSize)
+        self.gridLayout_4 = QtWidgets.QGridLayout()
+        self.gridLayout_4.setObjectName("gridLayout_4")
        self.label_2 = QtWidgets.QLabel(self.groupBox_2)
        font = QtGui.QFont()
        font.setBold(False)
@ -106,7 +66,70 @@ class Ui_Settings(object):
        self.label_2.setFont(font)
        self.label_2.setWordWrap(True)
        self.label_2.setObjectName("label_2")
-        self.formLayout_13.setWidget(2, QtWidgets.QFormLayout.SpanningRole, self.label_2)
+        self.gridLayout_4.addWidget(self.label_2, 0, 0, 1, 1)
+        self.horizontalLayout_12 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_12.setSizeConstraint(QtWidgets.QLayout.SetDefaultConstraint)
+        self.horizontalLayout_12.setObjectName("horizontalLayout_12")
+        self.formLayout_14 = QtWidgets.QFormLayout()
+        self.formLayout_14.setFieldGrowthPolicy(QtWidgets.QFormLayout.AllNonFixedFieldsGrow)
+        self.formLayout_14.setObjectName("formLayout_14")
+        self.label_56 = QtWidgets.QLabel(self.groupBox_2)
+        font = QtGui.QFont()
+        font.setBold(False)
+        font.setWeight(50)
+        self.label_56.setFont(font)
+        self.label_56.setObjectName("label_56")
+        self.formLayout_14.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_56)
+        self.cmbStyle = QtWidgets.QComboBox(self.groupBox_2)
+        font = QtGui.QFont()
+        font.setBold(False)
+        font.setWeight(50)
+        self.cmbStyle.setFont(font)
+        self.cmbStyle.setObjectName("cmbStyle")
+        self.formLayout_14.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.cmbStyle)
+        self.label_57 = QtWidgets.QLabel(self.groupBox_2)
+        font = QtGui.QFont()
+        font.setBold(False)
+        font.setWeight(50)
+        self.label_57.setFont(font)
+        self.label_57.setObjectName("label_57")
+        self.formLayout_14.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_57)
+        self.cmbTranslation = QtWidgets.QComboBox(self.groupBox_2)
+        font = QtGui.QFont()
+        font.setBold(False)
+        font.setWeight(50)
+        self.cmbTranslation.setFont(font)
+        self.cmbTranslation.setObjectName("cmbTranslation")
+        self.formLayout_14.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.cmbTranslation)
+        self.label_58 = QtWidgets.QLabel(self.groupBox_2)
+        font = QtGui.QFont()
+        font.setBold(False)
+        font.setWeight(50)
+        self.label_58.setFont(font)
+        self.label_58.setObjectName("label_58")
+        self.formLayout_14.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_58)
+        self.spnGeneralFontSize = QtWidgets.QSpinBox(self.groupBox_2)
+        font = QtGui.QFont()
+        font.setBold(False)
+        font.setWeight(50)
+        self.spnGeneralFontSize.setFont(font)
+        self.spnGeneralFontSize.setObjectName("spnGeneralFontSize")
+        self.formLayout_14.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.spnGeneralFontSize)
+        self.horizontalLayout_12.addLayout(self.formLayout_14)
+        self.formLayout_15 = QtWidgets.QFormLayout()
+        self.formLayout_15.setObjectName("formLayout_15")
+        self.chkProgressChars = QtWidgets.QCheckBox(self.groupBox_2)
+        font = QtGui.QFont()
+        font.setBold(False)
+        font.setWeight(50)
+        self.chkProgressChars.setFont(font)
+        self.chkProgressChars.setObjectName("chkProgressChars")
+        self.formLayout_15.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.chkProgressChars)
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.formLayout_15.setItem(0, QtWidgets.QFormLayout.LabelRole, spacerItem)
+        self.horizontalLayout_12.addLayout(self.formLayout_15)
+        self.gridLayout_4.addLayout(self.horizontalLayout_12, 1, 0, 1, 1)
+        self.formLayout_13.setLayout(0, QtWidgets.QFormLayout.SpanningRole, self.gridLayout_4)
        self.verticalLayout_7.addWidget(self.groupBox_2)
        self.groupBox_10 = QtWidgets.QGroupBox(self.stackedWidgetPage1)
        font = QtGui.QFont()
@ -166,8 +189,8 @@ class Ui_Settings(object):
        self.label.setFont(font)
        self.label.setObjectName("label")
        self.horizontalLayout_5.addWidget(self.label)
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_5.addItem(spacerItem)
+        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_5.addItem(spacerItem1)
        self.verticalLayout_6.addLayout(self.horizontalLayout_5)
        self.horizontalLayout_7 = QtWidgets.QHBoxLayout()
        self.horizontalLayout_7.setObjectName("horizontalLayout_7")
@ -202,8 +225,8 @@ class Ui_Settings(object):
        self.label_14.setFont(font)
        self.label_14.setObjectName("label_14")
        self.horizontalLayout_7.addWidget(self.label_14)
-        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_7.addItem(spacerItem1)
+        spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_7.addItem(spacerItem2)
        self.verticalLayout_6.addLayout(self.horizontalLayout_7)
        self.chkSaveOnQuit = QtWidgets.QCheckBox(self.groupBox)
        font = QtGui.QFont()
@ -223,8 +246,8 @@ class Ui_Settings(object):
        self.chkSaveToZip.setObjectName("chkSaveToZip")
        self.verticalLayout_6.addWidget(self.chkSaveToZip)
        self.verticalLayout_7.addWidget(self.groupBox)
-        spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_7.addItem(spacerItem2)
+        spacerItem3 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_7.addItem(spacerItem3)
        self.stack.addWidget(self.stackedWidgetPage1)
        self.page_3 = QtWidgets.QWidget()
        self.page_3.setObjectName("page_3")
@ -388,8 +411,8 @@ class Ui_Settings(object):
        self.label_51.setObjectName("label_51")
        self.gridLayout_2.addWidget(self.label_51, 6, 1, 1, 1)
        self.verticalLayout.addWidget(self.chkRevisionRemove)
-        spacerItem3 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout.addItem(spacerItem3)
+        spacerItem4 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout.addItem(spacerItem4)
        self.label_revisionDeprecation = QtWidgets.QLabel(self.page_3)
        self.label_revisionDeprecation.setWordWrap(True)
        self.label_revisionDeprecation.setOpenExternalLinks(True)
@ -524,6 +547,25 @@ class Ui_Settings(object):
        self.sldTreeIconSize.setObjectName("sldTreeIconSize")
        self.horizontalLayout_11.addWidget(self.sldTreeIconSize)
        self.verticalLayout_17.addWidget(self.groupBox_16)
+        self.horizontalGroupBox = QtWidgets.QGroupBox(self.tab)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.horizontalGroupBox.setFont(font)
+        self.horizontalGroupBox.setObjectName("horizontalGroupBox")
+        self.horizontalLayout_13 = QtWidgets.QHBoxLayout(self.horizontalGroupBox)
+        self.horizontalLayout_13.setContentsMargins(9, 9, 9, 9)
+        self.horizontalLayout_13.setObjectName("horizontalLayout_13")
+        self.chkCountSpaces = QtWidgets.QCheckBox(self.horizontalGroupBox)
+        font = QtGui.QFont()
+        font.setBold(False)
+        font.setWeight(50)
+        self.chkCountSpaces.setFont(font)
+        self.chkCountSpaces.setObjectName("chkCountSpaces")
+        self.horizontalLayout_13.addWidget(self.chkCountSpaces)
+        spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_13.addItem(spacerItem5)
+        self.verticalLayout_17.addWidget(self.horizontalGroupBox)
        self.horizontalLayout_9 = QtWidgets.QHBoxLayout()
        self.horizontalLayout_9.setObjectName("horizontalLayout_9")
        self.groupBox_8 = QtWidgets.QGroupBox(self.tab)
@ -548,6 +590,13 @@ class Ui_Settings(object):
        self.rdoTreeWC.setFont(font)
        self.rdoTreeWC.setObjectName("rdoTreeWC")
        self.verticalLayout_15.addWidget(self.rdoTreeWC)
+        self.rdoTreeCC = QtWidgets.QRadioButton(self.groupBox_8)
+        font = QtGui.QFont()
+        font.setBold(False)
+        font.setWeight(50)
+        self.rdoTreeCC.setFont(font)
+        self.rdoTreeCC.setObjectName("rdoTreeCC")
+        self.verticalLayout_15.addWidget(self.rdoTreeCC)
        self.rdoTreeProgress = QtWidgets.QRadioButton(self.groupBox_8)
        font = QtGui.QFont()
        font.setBold(False)
@ -586,6 +635,13 @@ class Ui_Settings(object):
        self.rdoTreeTextWC.setFont(font)
        self.rdoTreeTextWC.setObjectName("rdoTreeTextWC")
        self.verticalLayout_16.addWidget(self.rdoTreeTextWC)
+        self.rdoTreeTextCC = QtWidgets.QRadioButton(self.groupBox_9)
+        font = QtGui.QFont()
+        font.setBold(False)
+        font.setWeight(50)
+        self.rdoTreeTextCC.setFont(font)
+        self.rdoTreeTextCC.setObjectName("rdoTreeTextCC")
+        self.verticalLayout_16.addWidget(self.rdoTreeTextCC)
        self.rdoTreeTextProgress = QtWidgets.QRadioButton(self.groupBox_9)
        font = QtGui.QFont()
        font.setBold(False)
@ -607,12 +663,17 @@ class Ui_Settings(object):
        self.rdoTreeTextNothing.setFont(font)
        self.rdoTreeTextNothing.setObjectName("rdoTreeTextNothing")
        self.verticalLayout_16.addWidget(self.rdoTreeTextNothing)
-        spacerItem4 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_16.addItem(spacerItem4)
+        spacerItem6 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_16.addItem(spacerItem6)
+        self.rdoTreeTextCC.raise_()
+        self.rdoTreeTextWC.raise_()
+        self.rdoTreeTextProgress.raise_()
+        self.rdoTreeTextSummary.raise_()
+        self.rdoTreeTextNothing.raise_()
        self.horizontalLayout_9.addWidget(self.groupBox_9)
        self.verticalLayout_17.addLayout(self.horizontalLayout_9)
-        spacerItem5 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_17.addItem(spacerItem5)
+        spacerItem7 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_17.addItem(spacerItem7)
        icon = QtGui.QIcon.fromTheme("view-list-tree")
        self.tabViews.addTab(self.tab, icon, "")
        self.tab_2 = QtWidgets.QWidget()
@ -774,8 +835,8 @@ class Ui_Settings(object):
        self.chkOutlineTitle.setObjectName("chkOutlineTitle")
        self.gridLayout.addWidget(self.chkOutlineTitle, 3, 0, 1, 1)
        self.verticalLayout_11.addWidget(self.groupBox_6)
-        spacerItem6 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_11.addItem(spacerItem6)
+        spacerItem8 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_11.addItem(spacerItem8)
        icon = QtGui.QIcon.fromTheme("view-outline")
        self.tabViews.addTab(self.tab_2, icon, "")
        self.tab_3 = QtWidgets.QWidget()
@ -821,8 +882,8 @@ class Ui_Settings(object):
        self.cmbCorkImage.setFont(font)
        self.cmbCorkImage.setObjectName("cmbCorkImage")
        self.verticalLayout_8.addWidget(self.cmbCorkImage)
-        spacerItem7 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_8.addItem(spacerItem7)
+        spacerItem9 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_8.addItem(spacerItem9)
        self.gridLayout_3.addWidget(self.groupBox_7, 1, 1, 1, 1)
        self.groupBox_11 = QtWidgets.QGroupBox(self.tab_3)
        font = QtGui.QFont()
@ -1380,8 +1441,8 @@ class Ui_Settings(object):
        self.btnLabelColor.setIconSize(QtCore.QSize(64, 64))
        self.btnLabelColor.setObjectName("btnLabelColor")
        self.verticalLayout_2.addWidget(self.btnLabelColor)
-        spacerItem8 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_2.addItem(spacerItem8)
+        spacerItem10 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_2.addItem(spacerItem10)
        self.horizontalLayout_2.addLayout(self.verticalLayout_2)
        self.verticalLayout_3.addLayout(self.horizontalLayout_2)
        self.horizontalLayout = QtWidgets.QHBoxLayout()
@ -1398,8 +1459,8 @@ class Ui_Settings(object):
        self.btnLabelRemove.setIcon(icon)
        self.btnLabelRemove.setObjectName("btnLabelRemove")
        self.horizontalLayout.addWidget(self.btnLabelRemove)
-        spacerItem9 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem9)
+        spacerItem11 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem11)
        self.verticalLayout_3.addLayout(self.horizontalLayout)
        self.stack.addWidget(self.stackedWidgetPage3)
        self.stackedWidgetPage4 = QtWidgets.QWidget()
@ -1433,8 +1494,8 @@ class Ui_Settings(object):
        self.btnStatusRemove.setIcon(icon)
        self.btnStatusRemove.setObjectName("btnStatusRemove")
        self.horizontalLayout_3.addWidget(self.btnStatusRemove)
-        spacerItem10 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_3.addItem(spacerItem10)
+        spacerItem12 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_3.addItem(spacerItem12)
        self.verticalLayout_4.addLayout(self.horizontalLayout_3)
        self.stack.addWidget(self.stackedWidgetPage4)
        self.page = QtWidgets.QWidget()
@ -1482,8 +1543,8 @@ class Ui_Settings(object):
        self.btnThemeRemove.setIcon(icon)
        self.btnThemeRemove.setObjectName("btnThemeRemove")
        self.horizontalLayout_6.addWidget(self.btnThemeRemove)
-        spacerItem11 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_6.addItem(spacerItem11)
+        spacerItem13 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_6.addItem(spacerItem13)
        self.verticalLayout_12.addLayout(self.horizontalLayout_6)
        self.themeStack.addWidget(self.stackedWidgetPage1_3)
        self.stackedWidgetPage2_3 = QtWidgets.QWidget()
@ -1823,9 +1884,9 @@ class Ui_Settings(object):
        self.horizontalLayout_8.addWidget(self.stack)

        self.retranslateUi(Settings)
-        self.stack.setCurrentIndex(2)
-        self.tabViews.setCurrentIndex(3)
-        self.themeStack.setCurrentIndex(1)
+        self.stack.setCurrentIndex(0)
+        self.tabViews.setCurrentIndex(0)
+        self.themeStack.setCurrentIndex(0)
        self.themeEditStack.setCurrentIndex(3)
        self.lstMenu.currentRowChanged['int'].connect(self.stack.setCurrentIndex)
        self.chkRevisionsKeep.toggled['bool'].connect(self.chkRevisionRemove.setEnabled)
@ -1851,10 +1912,12 @@ class Ui_Settings(object):
        self.lstMenu.setSortingEnabled(__sortingEnabled)
        self.lblTitleGeneral.setText(_translate("Settings", "General settings"))
        self.groupBox_2.setTitle(_translate("Settings", "Application settings"))
+        self.label_2.setText(_translate("Settings", "Restarting Manuskript ensures all settings take effect."))
        self.label_56.setText(_translate("Settings", "Style:"))
        self.label_57.setText(_translate("Settings", "Language:"))
        self.label_58.setText(_translate("Settings", "Font size:"))
-        self.label_2.setText(_translate("Settings", "Restarting Manuskript ensures all settings take effect."))
+        self.chkProgressChars.setText(_translate("Settings", "Show progress in chars next\n"
+" to words"))
        self.groupBox_10.setTitle(_translate("Settings", "Loading"))
        self.chkAutoLoad.setText(_translate("Settings", "Automatically load last project on startup"))
        self.groupBox.setTitle(_translate("Settings", "Saving"))
@ -1899,14 +1962,18 @@ class Ui_Settings(object):
        self.cmbTreeBackground.setItemText(4, _translate("Settings", "Compile"))
        self.groupBox_16.setTitle(_translate("Settings", "Icon Size"))
        self.lblTreeIconSize.setText(_translate("Settings", "TextLabel"))
+        self.horizontalGroupBox.setTitle(_translate("Settings", "Char/Word Counter"))
+        self.chkCountSpaces.setText(_translate("Settings", "Count spaces as chars"))
        self.groupBox_8.setTitle(_translate("Settings", "Folders"))
        self.rdoTreeItemCount.setText(_translate("Settings", "Show ite&m count"))
        self.rdoTreeWC.setText(_translate("Settings", "Show &word count"))
+        self.rdoTreeCC.setText(_translate("Settings", "Show char c&ount"))
        self.rdoTreeProgress.setText(_translate("Settings", "S&how progress"))
        self.rdoTreeSummary.setText(_translate("Settings", "Show summar&y"))
        self.rdoTreeNothing.setText(_translate("Settings", "&Nothing"))
        self.groupBox_9.setTitle(_translate("Settings", "Text"))
        self.rdoTreeTextWC.setText(_translate("Settings", "&Show word count"))
+        self.rdoTreeTextCC.setText(_translate("Settings", "Sho&w char count"))
        self.rdoTreeTextProgress.setText(_translate("Settings", "Show p&rogress"))
        self.rdoTreeTextSummary.setText(_translate("Settings", "Show summary"))
        self.rdoTreeTextNothing.setText(_translate("Settings", "Nothing"))
--- a/manuskript/ui/settings_ui.ui
+++ b/manuskript/ui/settings_ui.ui
@ -6,7 +6,7 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>658</width>
+    <width>681</width>
    <height>598</height>
   </rect>
  </property>
@ -54,7 +54,7 @@
   <item>
    <widget class="QStackedWidget" name="stack">
     <property name="currentIndex">
-      <number>2</number>
+      <number>0</number>
     </property>
     <widget class="QWidget" name="stackedWidgetPage1">
      <layout class="QVBoxLayout" name="verticalLayout_7">
@ -98,93 +98,139 @@
          <string>Application settings</string>
         </property>
         <layout class="QFormLayout" name="formLayout_13">
-          <property name="fieldGrowthPolicy">
-           <enum>QFormLayout::FieldsStayAtSizeHint</enum>
-          </property>
-          <item row="3" column="0">
-           <widget class="QLabel" name="label_56">
-            <property name="font">
-             <font>
-              <weight>50</weight>
-              <bold>false</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string>Style:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="QComboBox" name="cmbStyle">
-            <property name="font">
-             <font>
-              <weight>50</weight>
-              <bold>false</bold>
-             </font>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="0">
-           <widget class="QLabel" name="label_57">
-            <property name="font">
-             <font>
-              <weight>50</weight>
-              <bold>false</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string>Language:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="1">
-           <widget class="QComboBox" name="cmbTranslation">
-            <property name="font">
-             <font>
-              <weight>50</weight>
-              <bold>false</bold>
-             </font>
-            </property>
-           </widget>
-          </item>
-          <item row="7" column="0">
-           <widget class="QLabel" name="label_58">
-            <property name="font">
-             <font>
-              <weight>50</weight>
-              <bold>false</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string>Font size:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="7" column="1">
-           <widget class="QSpinBox" name="spnGeneralFontSize">
-            <property name="font">
-             <font>
-              <weight>50</weight>
-              <bold>false</bold>
-             </font>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0" colspan="2">
-           <widget class="QLabel" name="label_2">
-            <property name="font">
-             <font>
-              <weight>50</weight>
-              <bold>false</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string>Restarting Manuskript ensures all settings take effect.</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
+          <item row="0" column="0" colspan="2">
+           <layout class="QGridLayout" name="gridLayout_4">
+            <item row="0" column="0">
+             <widget class="QLabel" name="label_2">
+              <property name="font">
+               <font>
+                <weight>50</weight>
+                <bold>false</bold>
+               </font>
+              </property>
+              <property name="text">
+               <string>Restarting Manuskript ensures all settings take effect.</string>
+              </property>
+              <property name="wordWrap">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <layout class="QHBoxLayout" name="horizontalLayout_12">
+              <property name="sizeConstraint">
+               <enum>QLayout::SetDefaultConstraint</enum>
+              </property>
+              <item>
+               <layout class="QFormLayout" name="formLayout_14">
+                <property name="fieldGrowthPolicy">
+                 <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+                </property>
+                <item row="0" column="0">
+                 <widget class="QLabel" name="label_56">
+                  <property name="font">
+                   <font>
+                    <weight>50</weight>
+                    <bold>false</bold>
+                   </font>
+                  </property>
+                  <property name="text">
+                   <string>Style:</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="1">
+                 <widget class="QComboBox" name="cmbStyle">
+                  <property name="font">
+                   <font>
+                    <weight>50</weight>
+                    <bold>false</bold>
+                   </font>
+                  </property>
+                 </widget>
+                </item>
+                <item row="1" column="0">
+                 <widget class="QLabel" name="label_57">
+                  <property name="font">
+                   <font>
+                    <weight>50</weight>
+                    <bold>false</bold>
+                   </font>
+                  </property>
+                  <property name="text">
+                   <string>Language:</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="1" column="1">
+                 <widget class="QComboBox" name="cmbTranslation">
+                  <property name="font">
+                   <font>
+                    <weight>50</weight>
+                    <bold>false</bold>
+                   </font>
+                  </property>
+                 </widget>
+                </item>
+                <item row="2" column="0">
+                 <widget class="QLabel" name="label_58">
+                  <property name="font">
+                   <font>
+                    <weight>50</weight>
+                    <bold>false</bold>
+                   </font>
+                  </property>
+                  <property name="text">
+                   <string>Font size:</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="2" column="1">
+                 <widget class="QSpinBox" name="spnGeneralFontSize">
+                  <property name="font">
+                   <font>
+                    <weight>50</weight>
+                    <bold>false</bold>
+                   </font>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <layout class="QFormLayout" name="formLayout_15">
+                <item row="0" column="1">
+                 <widget class="QCheckBox" name="chkProgressChars">
+                  <property name="font">
+                   <font>
+                    <weight>50</weight>
+                    <bold>false</bold>
+                   </font>
+                  </property>
+                  <property name="text">
+                   <string>Show progress in chars next
+ to words</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="0">
+                 <spacer name="horizontalSpacer_6">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </item>
+           </layout>
          </item>
         </layout>
        </widget>
@ -817,7 +863,7 @@
       <item>
        <widget class="QTabWidget" name="tabViews">
         <property name="currentIndex">
-          <number>3</number>
+          <number>0</number>
         </property>
         <widget class="QWidget" name="tab">
          <attribute name="icon">
@ -1055,6 +1101,59 @@
             </layout>
            </widget>
           </item>
+           <item>
+            <widget class="QGroupBox" name="horizontalGroupBox">
+             <property name="font">
+              <font>
+               <weight>75</weight>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="title">
+              <string>Char/Word Counter</string>
+             </property>
+             <layout class="QHBoxLayout" name="horizontalLayout_13">
+              <property name="leftMargin">
+               <number>9</number>
+              </property>
+              <property name="topMargin">
+               <number>9</number>
+              </property>
+              <property name="rightMargin">
+               <number>9</number>
+              </property>
+              <property name="bottomMargin">
+               <number>9</number>
+              </property>
+              <item>
+               <widget class="QCheckBox" name="chkCountSpaces">
+                <property name="font">
+                 <font>
+                  <weight>50</weight>
+                  <bold>false</bold>
+                 </font>
+                </property>
+                <property name="text">
+                 <string>Count spaces as chars</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer_7">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </widget>
+           </item>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_9">
             <item>
@ -1095,6 +1194,19 @@
                  </property>
                 </widget>
                </item>
+                <item>
+                 <widget class="QRadioButton" name="rdoTreeCC">
+                  <property name="font">
+                   <font>
+                    <weight>50</weight>
+                    <bold>false</bold>
+                   </font>
+                  </property>
+                  <property name="text">
+                   <string>Show char c&amp;ount</string>
+                  </property>
+                 </widget>
+                </item>
                <item>
                 <widget class="QRadioButton" name="rdoTreeProgress">
                  <property name="font">
@ -1165,6 +1277,19 @@
                  </property>
                 </widget>
                </item>
+                <item>
+                 <widget class="QRadioButton" name="rdoTreeTextCC">
+                  <property name="font">
+                   <font>
+                    <weight>50</weight>
+                    <bold>false</bold>
+                   </font>
+                  </property>
+                  <property name="text">
+                   <string>Sho&amp;w char count</string>
+                  </property>
+                 </widget>
+                </item>
                <item>
                 <widget class="QRadioButton" name="rdoTreeTextProgress">
                  <property name="font">
@ -1224,6 +1349,11 @@
                 </spacer>
                </item>
               </layout>
+               <zorder>rdoTreeTextCC</zorder>
+               <zorder>rdoTreeTextWC</zorder>
+               <zorder>rdoTreeTextProgress</zorder>
+               <zorder>rdoTreeTextSummary</zorder>
+               <zorder>rdoTreeTextNothing</zorder>
              </widget>
             </item>
            </layout>
@ -2974,7 +3104,7 @@
       <item>
        <widget class="QStackedWidget" name="themeStack">
         <property name="currentIndex">
-          <number>1</number>
+          <number>0</number>
         </property>
         <widget class="QWidget" name="stackedWidgetPage1_3">
          <layout class="QVBoxLayout" name="verticalLayout_12">
--- a/manuskript/ui/views/treeDelegates.py
+++ b/manuskript/ui/views/treeDelegates.py
@ -111,6 +111,9 @@ class treeTitleDelegate(QStyledItemDelegate):
                elif settings.viewSettings["Tree"]["InfoFolder"] == "WC":
                    extraText = item.wordCount()
                    extraText = " ({})".format(extraText)
+                elif settings.viewSettings["Tree"]["InfoFolder"] == "CC":
+                    extraText = item.charCount()
+                    extraText = " ({})".format(extraText)
                elif settings.viewSettings["Tree"]["InfoFolder"] == "Progress":
                    extraText = int(toFloat(item.data(Outline.goalPercentage)) * 100)
                    if extraText:
@ -124,6 +127,9 @@ class treeTitleDelegate(QStyledItemDelegate):
                if settings.viewSettings["Tree"]["InfoText"] == "WC":
                    extraText = item.wordCount()
                    extraText = " ({})".format(extraText)
+                elif settings.viewSettings["Tree"]["InfoText"] == "CC":
+                    extraText = item.charCount()
+                    extraText = " ({})".format(extraText)
                elif settings.viewSettings["Tree"]["InfoText"] == "Progress":
                    extraText = int(toFloat(item.data(Outline.goalPercentage)) * 100)
                    if extraText: