Show 68 quoted lines
> From: Wang Zichong <wangzichong@deepin.org>
>
> As a dark-theme user, I use the Preferences dialog to set colors
> for gitk, the only color I cannot change via that dialog is the
> link foreground color, which will lead me to use the default link
> color on a dark background that make it not really readable.
>
> This patch makes the link foreground color also configurable in the
> Gitk Preferences dialog's Color tab, so user won't need to dig into
> the code/manual to know if the link color is configurable and can
> simply set the color there.
>
> CC: Mark Levedahl <mlevedahl@gmail.com>, Paul Mackerras <paulus@samba.org>
> Signed-off-by: Wang Zichong <wangzichong@deepin.org>
> ---
> gitk: support config the color of linkfgcolor via Gitk Preferences
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2217%2FBLumia%2Fgitk-linkfgcolor-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2217/BLumia/gitk-linkfgcolor-v1
> Pull-Request: https://github.com/git/git/pull/2217
>
> gitk-git/gitk | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/gitk-git/gitk b/gitk-git/gitk
> index cbaaee994e..b60f140636 100755
> --- a/gitk-git/gitk
> +++ b/gitk-git/gitk
> @@ -11796,7 +11796,7 @@ proc prefspage_general {notebook} {
>
> proc prefspage_colors {notebook} {
> global bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
> - global diffbgcolors
> + global diffbgcolors linkfgcolor
> global themeloader
>
> set page [create_prefs_page $notebook.colors]
> @@ -11873,6 +11873,11 @@ proc prefspage_colors {notebook} {
> -command [list choosecolor selectbgcolor {} $page [mc "background"]]
> grid x $page.selbgbut $page.selbgsep -sticky w
>
> + label $page.linkfg -padx 40 -relief sunk -background $linkfgcolor
> + ttk::button $page.linkfgbut -text [mc "Link color"] \
> + -command [list choosecolor linkfgcolor {} $page [mc "link color"]]
> + grid x $page.linkfgbut $page.linkfg -sticky w
> +
> grid columnconfigure $page 2 -weight 1
>
> return $page
> @@ -11880,7 +11885,7 @@ proc prefspage_colors {notebook} {
>
> proc prefspage_set_colorswatches {page} {
> global bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
> - global diffbgcolors
> + global diffbgcolors linkfgcolor
>
> $page.bg configure -background $bgcolor
> $page.fg configure -background $fgcolor
> @@ -11891,6 +11896,7 @@ proc prefspage_set_colorswatches {page} {
> $page.hunksep configure -background [lindex $diffcolors 2]
> $page.markbgsep configure -background $markbgcolor
> $page.selbgsep configure -background $selectbgcolor
> + $page.linkfg configure -background $linkfgcolor
> }
>
> proc prefspage_fonts {notebook} {
>
> base-commit: 7b2bccb0d58d4f24705bf985de1f4612e4cf06e5