Merge pull request #751 from mwerle/feature/editor-show-whitespace

feat: add an option to render whitespace in the diff and editor views
Murmele · May 12, 2024 · 39ccb26 · 39ccb26
2 parents 67a358f + 37c8034
commit 39ccb26
Show file tree

Hide file tree

Showing 14 changed files with 3,304 additions and 3,049 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,4 @@ build
 .idea/
 .venv
 compile_commands.json
-
+tags
diff --git a/conf/editor.lua b/conf/editor.lua
@@ -14,6 +14,9 @@ return {
     family = family,
     size = size
   },
+  view = {
+    showWhitespace = false
+  },
   indent = {
     tabs = true,
     width = 4,

diff --git a/l10n/gittyup_de.ts b/l10n/gittyup_de.ts
diff --git a/l10n/gittyup_en.ts b/l10n/gittyup_en.ts
diff --git a/l10n/gittyup_es.ts b/l10n/gittyup_es.ts
diff --git a/l10n/gittyup_ja.ts b/l10n/gittyup_ja.ts
diff --git a/l10n/gittyup_pt.ts b/l10n/gittyup_pt.ts
diff --git a/l10n/gittyup_pt_BR.ts b/l10n/gittyup_pt_BR.ts
diff --git a/l10n/gittyup_ru.ts b/l10n/gittyup_ru.ts
diff --git a/l10n/gittyup_zh_CN.ts b/l10n/gittyup_zh_CN.ts
diff --git a/src/conf/Setting.cpp b/src/conf/Setting.cpp
@@ -12,6 +12,7 @@ void Setting::initialize(QMap<Id, QString> &keys) {
   keys[Id::IndentWidth] = "editor/indent/width";
   keys[Id::TabWidth] = "editor/indent/tabwidth";
   keys[Id::ShowHeatmapInBlameMargin] = "editor/blame/heatmap";
+  keys[Id::ShowWhitespaceInEditor] = "editor/view/showWhitespace";
   keys[Id::ColorTheme] = "window/theme";
   keys[Id::ShowFullRepoPath] = "window/path/full";
   keys[Id::HideLogAutomatically] = "window/log/hide";

diff --git a/src/conf/Setting.h b/src/conf/Setting.h
@@ -36,6 +36,7 @@ class Setting : public SettingsTempl<Setting> {
     IndentWidth,
     TabWidth,
     ShowHeatmapInBlameMargin,
+    ShowWhitespaceInEditor,
     ColorTheme,
     ShowFullRepoPath,
     HideLogAutomatically,

diff --git a/src/dialogs/SettingsDialog.cpp b/src/dialogs/SettingsDialog.cpp
@@ -661,6 +661,14 @@ class EditorPanel : public QWidget {
       Settings::instance()->setValue(Setting::Id::FontSize, i);
     });
 
+    QCheckBox *showWhitespace = new QCheckBox(tr("Show whitespace"), this);
+    showWhitespace->setChecked(
+        settings->value(Setting::Id::ShowWhitespaceInEditor).toBool());
+    connect(showWhitespace, &QCheckBox::toggled, [](bool checked) {
+      Settings::instance()->setValue(Setting::Id::ShowWhitespaceInEditor,
+                                     checked);
+    });
+
     QComboBox *indent = new QComboBox(this);
     indent->addItem(tr("Tabs"));
     indent->addItem(tr("Spaces"));
@@ -695,6 +703,7 @@ class EditorPanel : public QWidget {
     QFormLayout *layout = new QFormLayout(this);
     layout->addRow(tr("Font:"), font);
     layout->addRow(tr("Font size:"), fontSize);
+    layout->addRow(tr("Whitespace:"), showWhitespace);
     layout->addRow(tr("Indent using:"), indent);
     layout->addRow(tr("Indent width:"), indentWidth);
     layout->addRow(tr("Tab width:"), tabWidth);

diff --git a/src/editor/TextEditor.cpp b/src/editor/TextEditor.cpp
@@ -182,6 +182,7 @@ void TextEditor::applySettings() {
   setUseTabs(settings->value(Setting::Id::UseTabsForIndent).toBool());
   setIndent(settings->value(Setting::Id::IndentWidth).toInt());
   setTabWidth(settings->value(Setting::Id::TabWidth).toInt());
+  setViewWS(settings->value(Setting::Id::ShowWhitespaceInEditor).toBool());
 
   if (Settings::instance()->isTextEditorWrapLines()) {
     setWrapMode(SC_WRAP_WORD);
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,4 +10,4 @@ build @@
     .idea/
     .venv
     compile_commands.json
+    tags