From 5ee9e058caadc46ab0a1d4ab1d5a4a8fb23618a9 Mon Sep 17 00:00:00 2001 From: Morten Enemark Lund Date: Tue, 1 Nov 2016 18:45:56 +0100 Subject: [PATCH 1/5] Do not modify if we use ansicolors --- xonsh/pyghooks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xonsh/pyghooks.py b/xonsh/pyghooks.py index 69fb2bc8a..b24af85f8 100644 --- a/xonsh/pyghooks.py +++ b/xonsh/pyghooks.py @@ -452,8 +452,8 @@ class XonshStyle(Style): if 'CONEMUANSI' not in env: # Auto suggest needs to be a darker shade to be distinguishable # from the default color - self.styles[Token.AutoSuggestion] = '#444444' - self._smap.update(expand_gray_colors_for_cmd_exe(self._smap)) + if not hasattr(pygments.style, 'ansicolors'): + self.styles[Token.AutoSuggestion] = '#444444' if env.get('INTENSIFY_COLORS_ON_WIN', False): has_ansi = hasattr(pygments.style, 'ansicolors') newcolors = intensify_colors_for_cmd_exe(self._smap, ansi=has_ansi) From 4c3183edb70c60fc78f81b3df180419d8b484000 Mon Sep 17 00:00:00 2001 From: Morten Enemark Lund Date: Thu, 3 Nov 2016 14:02:33 +0100 Subject: [PATCH 2/5] Update better windows console colors --- docs/_static/console_colors.reg | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/_static/console_colors.reg b/docs/_static/console_colors.reg index edaf74a0a..1e0d9c440 100644 --- a/docs/_static/console_colors.reg +++ b/docs/_static/console_colors.reg @@ -9,14 +9,14 @@ Windows Registry Editor Version 5.00 ; -- ------- ------ --------- ------- -------- ; 00 Black 000000 00000000 #0A0A0A 000A0A0A ; 01 Blue 000080 00800000 #4080D6 00D68040 -; 02 Green 008000 00008000 #00CD00 0000CD00 +; 02 Green 008000 00008000 #00BB00 0000BB00 ; 03 Aqua 008080 00808000 #00CDCD 00CDCD00 ; 04 Red 800000 00000080 #CD0000 000000CD ; 05 Purple 800080 00800080 #CD00CD 00CD00CD -; 06 Yellow 808000 00008080 #CDCD00 0000CDCD +; 06 Yellow 808000 00008080 #BEBE28 0028BEBE ; 07 White C0C0C0 00C0C0C0 #C8C8C8 00C8C8C8 ; 08 Gray 808080 00808080 #7F7F7F 007F7F7F -; 09 LightBlue 0000FF 00FF0000 #40A0FF 00FFA040 +; 09 LightBlue 0000FF 00FF0000 #46AAFF 00FFAA46 ; 10 LightGreen 00FF00 0000FF00 #00FF00 0000FF00 ; 11 LightAqua 00FFFF 00FFFF00 #00FFFF 00FFFF00 ; 12 LightRed FF0000 000000FF #FF0000 000000FF @@ -28,14 +28,14 @@ Windows Registry Editor Version 5.00 [HKEY_CURRENT_USER\Console] "ColorTable00"=dword:000A0A0A "ColorTable01"=dword:00D68040 -"ColorTable02"=dword:0000CD00 +"ColorTable02"=dword:0000BB00 "ColorTable03"=dword:00CDCD00 "ColorTable04"=dword:000000CD "ColorTable05"=dword:00CD00CD -"ColorTable06"=dword:0000CDCD +"ColorTable06"=dword:0028BEBE "ColorTable07"=dword:00C8C8C8 "ColorTable08"=dword:007F7F7F -"ColorTable09"=dword:00FFA040 +"ColorTable09"=dword:00FFAA46 "ColorTable10"=dword:0000FF00 "ColorTable11"=dword:00FFFF00 "ColorTable12"=dword:000000FF @@ -46,20 +46,20 @@ Windows Registry Editor Version 5.00 "PopupColors" =dword:000000f8 "FontFamily" =dword:00000036 "FontSize" =dword:00100000 -"FontWeight" =dword:000002BC +"FontWeight" =dword:00000400 "FaceName" ="Consolas" [HKEY_CURRENT_USER\Console\%SystemRoot%_cmd.exe] "ColorTable00"=dword:000A0A0A "ColorTable01"=dword:00D68040 -"ColorTable02"=dword:0000CD00 +"ColorTable02"=dword:0000BB00 "ColorTable03"=dword:00CDCD00 "ColorTable04"=dword:000000CD "ColorTable05"=dword:00CD00CD -"ColorTable06"=dword:0000CDCD +"ColorTable06"=dword:0028BEBE "ColorTable07"=dword:00C8C8C8 "ColorTable08"=dword:007F7F7F -"ColorTable09"=dword:00FFA040 +"ColorTable09"=dword:00FFAA46 "ColorTable10"=dword:0000FF00 "ColorTable11"=dword:00FFFF00 "ColorTable12"=dword:000000FF @@ -70,5 +70,5 @@ Windows Registry Editor Version 5.00 "PopupColors"=dword: 000000f8 "FontFamily" =dword:00000036 "FontSize" =dword:00100000 -"FontWeight" =dword:000002BC +"FontWeight" =dword:00000400 "FaceName" ="Consolas" From ca84ed0e01f1f729e071012ff782c3b18a56515e Mon Sep 17 00:00:00 2001 From: Morten Enemark Lund Date: Thu, 3 Nov 2016 13:59:32 +0100 Subject: [PATCH 3/5] Update ptk styles with gray completion menues. --- xonsh/pyghooks.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/xonsh/pyghooks.py b/xonsh/pyghooks.py index b24af85f8..303a51787 100644 --- a/xonsh/pyghooks.py +++ b/xonsh/pyghooks.py @@ -476,21 +476,25 @@ def xonsh_style_proxy(styler): if hasattr(pygments.style, 'ansicolors'): PTK_STYLE = { - Token.Menu.Completions.Completion.Current: 'bg:#ansiturquoise #ansiblack', - Token.Menu.Completions.Completion: 'bg:#ansiteal #ansiwhite', - Token.Menu.Completions.ProgressButton: 'bg:#ansidarkgray', - Token.Menu.Completions.ProgressBar: 'bg:#ansiturquoise', + Token.Menu.Completions: 'bg:#ansilightgray #ansiblack', + Token.Menu.Completions.Completion: '', + Token.Menu.Completions.Completion.Current: 'bg:#ansidarkgray #ansiwhite', + Token.Scrollbar: 'bg:#ansidarkgray', + Token.Scrollbar.Button: 'bg:#ansiblack', + Token.Scrollbar.Arrow: 'bg:#ansiblack #ansiwhite bold', Token.AutoSuggestion: '#ansidarkgray', - Token.Aborted: '#ansilightgray', + Token.Aborted: '#ansidarkgray', } else: PTK_STYLE = { - Token.Menu.Completions.Completion.Current: 'bg:#00aaaa #000000', - Token.Menu.Completions.Completion: 'bg:#008888 #ffffff', - Token.Menu.Completions.ProgressButton: 'bg:#003333', - Token.Menu.Completions.ProgressBar: 'bg:#00aaaa', + Token.Menu.Completions: 'bg:#888888 #000000', + Token.Menu.Completions.Completion: '', + Token.Menu.Completions.Completion.Current: 'bg:#555555 #ffffff', + Token.Scrollbar: 'bg:#555555', + Token.Scrollbar.Button: 'bg:#000000', + Token.Scrollbar.Arrow: 'bg:#000000 #ffffff bold', Token.AutoSuggestion: '#666666', - Token.Aborted: '#888888', + Token.Aborted: '#666666', } if hasattr(pygments.style, 'ansicolors'): From 55b47bcbb4f71d80a0e0da8acde62024ab4a3f17 Mon Sep 17 00:00:00 2001 From: Morten Enemark Lund Date: Sat, 5 Nov 2016 22:29:47 +0100 Subject: [PATCH 4/5] add change log --- news/ptk_menu.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 news/ptk_menu.rst diff --git a/news/ptk_menu.rst b/news/ptk_menu.rst new file mode 100644 index 000000000..5b9100cae --- /dev/null +++ b/news/ptk_menu.rst @@ -0,0 +1,15 @@ +**Added:** None + +**Changed:** + +* The style for the prompt toolkit completion menu is now lightgray/darkgray instead of turquoise/teal + +**Deprecated:** None + +**Removed:** None + +**Fixed:** + +* The scroll bars in the PTK completions menus are back. + +**Security:** None From 1439f7379315229713b74c9af99c70f4e3248c45 Mon Sep 17 00:00:00 2001 From: Morten Enemark Lund Date: Sat, 5 Nov 2016 22:52:00 +0100 Subject: [PATCH 5/5] Line removed by accident. Adding it back --- xonsh/pyghooks.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xonsh/pyghooks.py b/xonsh/pyghooks.py index 303a51787..cb3607671 100644 --- a/xonsh/pyghooks.py +++ b/xonsh/pyghooks.py @@ -450,10 +450,11 @@ class XonshStyle(Style): env = builtins.__xonsh_env__ # Ensure we are not using ConEmu if 'CONEMUANSI' not in env: - # Auto suggest needs to be a darker shade to be distinguishable - # from the default color if not hasattr(pygments.style, 'ansicolors'): + # Auto suggest needs to be a darker shade to be distinguishable + # from the default color self.styles[Token.AutoSuggestion] = '#444444' + self._smap.update(expand_gray_colors_for_cmd_exe(self._smap)) if env.get('INTENSIFY_COLORS_ON_WIN', False): has_ansi = hasattr(pygments.style, 'ansicolors') newcolors = intensify_colors_for_cmd_exe(self._smap, ansi=has_ansi)