From: "Johannes Sixt via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: mark <mlevedahl@gmail.com>, Johannes Sixt <j6t@kdbg.org>,
Johannes Sixt <j6t@kdbg.org>
Subject: [PATCH v2 4/6] gitk: use more natural language for labels of color preferences
Date: Wed, 12 Aug 2026 13:16:19 +0000 [thread overview]
Message-ID: <45d5b05281cd4f3f43290d128d631a47975225f3.1786540582.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.2194.v2.git.1786540582.gitgitgadget@gmail.com>
From: Johannes Sixt <j6t@kdbg.org>
The labels used to be clickable buttons. These would have looked funny
if they carried long texts. For this reason, jargon and abbreviations
were used to keep them short. Since there is no button frame around the
labels anymore, the texts can become longer without becoming ugly.
Bring them closer to natural language.
Remove the prefix "Diff" from labels, because the remaining texts are
sufficiently unambiguous that they are about diff text.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
gitk-git/gitk | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/gitk-git/gitk b/gitk-git/gitk
index afc7c2d39d..c0ab55845b 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -11838,31 +11838,31 @@ proc prefspage_colors {notebook} {
[mc "Background"] \
[mc "background"] \
fg fgcolor {} \
- [mc "Foreground"] \
+ [mc "Main text"] \
[mc "foreground"] \
diffold diffcolors 0 \
- [mc "Diff: old lines"] \
+ [mc "Old line text"] \
[mc "diff old lines"] \
diffoldbg diffbgcolors 0 \
- [mc "Diff: old lines bg"] \
+ [mc "Old line background"] \
[mc "diff old lines bg"] \
diffnew diffcolors 1 \
- [mc "Diff: new lines"] \
+ [mc "New line text"] \
[mc "diff new lines"] \
diffnewbg diffbgcolors 1 \
- [mc "Diff: new lines bg"] \
+ [mc "New line background"] \
[mc "diff new lines bg"] \
hunksep diffcolors 2 \
- [mc "Diff: hunk header"] \
+ [mc "Hunk header text"] \
[mc "diff hunk header"] \
markbg markbgcolor {} \
- [mc "Marked line bg"] \
+ [mc "Marked line background"] \
[mc "marked line background"] \
selbg selectbgcolor {} \
- [mc "Select bg"] \
+ [mc "Selected text background"] \
[mc "background"] \
linkfg linkfgcolor {} \
- [mc "Link"] \
+ [mc "Link text"] \
[mc "link"] \
]
--
gitgitgadget
next prev parent reply other threads:[~2026-08-12 13:16 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-06 6:40 [PATCH 0/5] gitk: make color preferences visually more pleasing and better usable Johannes Sixt via GitGitGadget
2026-08-06 6:40 ` [PATCH 1/5] gitk: set intitial colors of swatches using the available helper Johannes Sixt via GitGitGadget
2026-08-07 14:36 ` mark
2026-08-06 6:40 ` [PATCH 2/5] gitk: condense repetitive code around color buttons into foreach loops Johannes Sixt via GitGitGadget
2026-08-07 14:37 ` mark
2026-08-06 6:40 ` [PATCH 3/5] gitk: show color preferences on the button instead of the label Johannes Sixt via GitGitGadget
2026-08-07 14:37 ` mark
2026-08-08 9:33 ` Johannes Sixt
2026-08-06 6:40 ` [PATCH 4/5] gitk: use more natural language for labels of color preferences Johannes Sixt via GitGitGadget
2026-08-06 6:40 ` [PATCH 5/5] gitk: avoid constructing dialog titles from text pieces Johannes Sixt via GitGitGadget
2026-08-07 14:37 ` mark
2026-08-08 10:00 ` Johannes Sixt
2026-08-08 14:55 ` Mark Levedahl
2026-08-09 7:27 ` Johannes Sixt
2026-08-08 16:32 ` Junio C Hamano
2026-08-09 7:04 ` Johannes Sixt
2026-08-12 13:16 ` [PATCH v2 0/6] gitk: make color preferences visually more pleasing and better usable Johannes Sixt via GitGitGadget
2026-08-12 13:16 ` [PATCH v2 1/6] gitk: set intitial colors of swatches using the available helper Johannes Sixt via GitGitGadget
2026-08-12 13:16 ` [PATCH v2 2/6] gitk: condense repetitive code around color buttons into foreach loops Johannes Sixt via GitGitGadget
2026-08-12 13:16 ` [PATCH v2 3/6] gitk: show color preferences on the button instead of the label Johannes Sixt via GitGitGadget
2026-08-12 13:16 ` Johannes Sixt via GitGitGadget [this message]
2026-08-12 13:16 ` [PATCH v2 5/6] gitk: avoid constructing dialog titles from text pieces Johannes Sixt via GitGitGadget
2026-08-12 13:16 ` [PATCH v2 6/6] gitk: move UI for generic colors above diff colors Johannes Sixt via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=45d5b05281cd4f3f43290d128d631a47975225f3.1786540582.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=mlevedahl@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox