From aadaa66d0b92ce7e97e3303e3152a2dda6d320e9 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Fri, 3 Apr 2015 19:44:09 +1300
Subject: console: tune and re-enable palettes

---
 libmproxy/console/palettes.py | 46 ++++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/libmproxy/console/palettes.py b/libmproxy/console/palettes.py
index 98a1e042..b55a34aa 100644
--- a/libmproxy/console/palettes.py
+++ b/libmproxy/console/palettes.py
@@ -66,6 +66,9 @@ class LowDark(Palette):
 
         # Options
         option_selected = ('light gray', 'dark blue'),
+        option_selected_key = ('light cyan', 'dark blue'),
+        option_active = ('light red', 'default'),
+        option_active_selected = ('light red', 'dark blue'),
 
         # List and Connections
         method = ('dark cyan', 'default'),
@@ -107,23 +110,23 @@ class LowLight(Palette):
         Low-color light background
     """
     low = dict(
-        title = ('dark magenta,bold', 'light blue'),
+        title = ('dark magenta', 'default'),
 
         # Status bar & heading
-        heading = ('light gray', 'dark blue'),
-        heading_key = ('light cyan', 'dark blue'),
+        heading = ('white', 'black'),
+        heading_key = ('dark blue', 'black'),
         heading_inactive = ('black', 'light gray'),
 
         # Help
-        key = ('dark blue,bold', 'default'),
-        head = ('black,bold', 'default'),
+        key = ('dark blue', 'default'),
+        head = ('black', 'default'),
         text = ('dark gray', 'default'),
 
         # Options
-        option_selected = ('light gray', 'dark blue'),
-        option_selected_key = ('dark blue,bold', 'dark blue'),
+        option_selected = ('black', 'light gray'),
+        option_selected_key = ('dark blue', 'light gray'),
         option_active = ('light red', 'default'),
-        option_active_selected = ('light red', 'dark blue'),
+        option_active_selected = ('light red', 'light gray'),
 
         # List and Connections
         method = ('dark cyan', 'default'),
@@ -195,10 +198,10 @@ class SolarizedLight(LowLight):
         head = (sol_base00, 'default'),
 
         # Options
-        option_selected = (sol_base2, sol_base02),
-        option_selected_key = (sol_blue, sol_base02),
+        option_selected = (sol_base03, sol_base2),
+        option_selected_key = (sol_blue, sol_base2),
         option_active = (sol_orange, 'default'),
-        option_active_selected = (sol_orange, sol_base02),
+        option_active_selected = (sol_orange, sol_base2),
 
         # List and Connections
         method = (sol_cyan, 'default'),
@@ -231,19 +234,22 @@ class SolarizedLight(LowLight):
 class SolarizedDark(LowDark):
     high = dict(
         title = (sol_blue, 'default'),
-        text = (sol_base0, 'default'),
+        text = (sol_base1, 'default'),
 
         # Status bar & heading
-        heading = (sol_base03, sol_base1),
-        heading_key = (sol_blue+",bold", sol_base1),
+        heading = (sol_base2, sol_base01),
+        heading_key = (sol_blue+",bold", sol_base01),
         heading_inactive = (sol_base1, sol_base02),
 
         # Help
         key = (sol_blue, 'default',),
-        head = (sol_base00, 'default'),
+        head = (sol_base2, 'default'),
 
         # Options
-        option_selected = (sol_base03, sol_base01),
+        option_selected = (sol_base03, sol_base00),
+        option_selected_key = (sol_blue, sol_base00),
+        option_active = (sol_orange, 'default'),
+        option_active_selected = (sol_orange, sol_base00),
 
         # List and Connections
         method = (sol_cyan, 'default'),
@@ -275,9 +281,9 @@ class SolarizedDark(LowDark):
 
 palettes = {
     "lowlight": LowLight(),
-    #"lowdark": LowDark(),
-    #"light": Light(),
-    #"dark": Dark(),
+    "lowdark": LowDark(),
+    "light": Light(),
+    "dark": Dark(),
     "solarized_light": SolarizedLight(),
-    #"solarized_dark": SolarizedDark(),
+    "solarized_dark": SolarizedDark(),
 }
-- 
cgit v1.2.3