From bd36011119a35220d5038e8ae80ba1da71bda48d Mon Sep 17 00:00:00 2001 From: ndwarshuis Date: Tue, 21 Jan 2020 23:58:31 -0500 Subject: [PATCH] ENH change color sheme --- core | 2 +- drawing/Graphics.lua | 12 ++++++------ drawing/Memory.lua | 4 ++-- drawing/Network.lua | 4 ++-- drawing/Pacman.lua | 2 +- drawing/Power.lua | 4 ++-- drawing/Processor.lua | 4 ++-- drawing/ReadWrite.lua | 4 ++-- drawing/System.lua | 4 ++-- schema/Patterns.lua | 19 +++++++++---------- 10 files changed, 29 insertions(+), 30 deletions(-) diff --git a/core b/core index 7962fea..6a6996e 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 7962fea2442ec51c1e1b30b2822b11959bbbf7d6 +Subproject commit 6a6996e3c02f8491132e91fe59d0e9dc5148358c diff --git a/drawing/Graphics.lua b/drawing/Graphics.lua index e2a99ed..6a1e6b1 100644 --- a/drawing/Graphics.lua +++ b/drawing/Graphics.lua @@ -36,7 +36,7 @@ local status = { x = _RIGHT_X_, y = header.bottom_y, x_align = 'right', - text_color = _G_Patterns_.BLUE, + text_color = _G_Patterns_.PURPLE, text = '' } } @@ -60,7 +60,7 @@ local internal_temp = { x = _RIGHT_X_, y = _INTERNAL_TEMP_Y_, x_align = 'right', - text_color = _G_Patterns_.BLUE, + text_color = _G_Patterns_.PURPLE, text = '' } } @@ -87,7 +87,7 @@ local clock_speed = { y = _CLOCK_SPEED_Y_, spacing = _TEXT_SPACING_, x_align = 'right', - text_color = _G_Patterns_.BLUE, + text_color = _G_Patterns_.PURPLE, num_rows = 2 } } @@ -111,7 +111,7 @@ local gpu_util = { x = _RIGHT_X_, y = _GPU_UTIL_Y_, x_align = 'right', - text_color = _G_Patterns_.BLUE, + text_color = _G_Patterns_.PURPLE, text = '' }, plot = _G_Widget_.LabelPlot{ @@ -134,7 +134,7 @@ local mem_util = { x = _RIGHT_X_, y = _MEM_UTIL_Y_, x_align = 'right', - text_color = _G_Patterns_.BLUE, + text_color = _G_Patterns_.PURPLE, text = '' }, plot = _G_Widget_.LabelPlot{ @@ -157,7 +157,7 @@ local vid_util = { x = _RIGHT_X_, y = _VID_UTIL_Y_, x_align = 'right', - text_color = _G_Patterns_.BLUE, + text_color = _G_Patterns_.PURPLE, text = '' }, plot = _G_Widget_.LabelPlot{ diff --git a/drawing/Memory.lua b/drawing/Memory.lua index 7b4b0d4..d0325dd 100644 --- a/drawing/Memory.lua +++ b/drawing/Memory.lua @@ -61,7 +61,7 @@ local cache_arc = _G_Widget_.Arc{ y = DIAL_Y, radius = DIAL_RADIUS, thickness = _DIAL_THICKNESS_, - arc_pattern = _G_Patterns_.PURPLE_ROUNDED + arc_pattern = _G_Patterns_.BLUE_ROUNDED } local total_used = _G_Widget_.CriticalText{ @@ -113,7 +113,7 @@ local cache = { y = _LINE_1_Y_ + _TEXT_SPACING_, x_align = 'right', append_end = ' %', - text_color = _G_Patterns_.PURPLE, + text_color = _G_Patterns_.BLUE, '', '', '' diff --git a/drawing/Network.lua b/drawing/Network.lua index 297a406..d94a90c 100644 --- a/drawing/Network.lua +++ b/drawing/Network.lua @@ -39,7 +39,7 @@ local dnload = { x = _RIGHT_X_, y = header.bottom_y, x_align = 'right', - text_color = _G_Patterns_.BLUE + text_color = _G_Patterns_.PURPLE }, plot = _G_Widget_.ScalePlot{ x = _G_INIT_DATA_.CENTER_RIGHT_X, @@ -62,7 +62,7 @@ local upload = { x = _RIGHT_X_, y = _UPLOAD_Y_, x_align = 'right', - text_color = _G_Patterns_.BLUE + text_color = _G_Patterns_.PURPLE }, plot = _G_Widget_.ScalePlot{ x = _G_INIT_DATA_.CENTER_RIGHT_X, diff --git a/drawing/Pacman.lua b/drawing/Pacman.lua index e6c90da..8454013 100644 --- a/drawing/Pacman.lua +++ b/drawing/Pacman.lua @@ -32,7 +32,7 @@ local info = _G_Widget_.TextColumn{ y = header.bottom_y, spacing = _TEXT_SPACING_, x_align = 'right', - text_color = _G_Patterns_.BLUE, + text_color = _G_Patterns_.PURPLE, num_rows = 5 } diff --git a/drawing/Power.lua b/drawing/Power.lua index a7d7999..0d3976a 100644 --- a/drawing/Power.lua +++ b/drawing/Power.lua @@ -41,7 +41,7 @@ local pkg0 = { x = _RIGHT_X_, y = header.bottom_y, x_align = 'right', - text_color = Patterns.BLUE, + text_color = Patterns.PURPLE, text = '', append_end = ' W', }, @@ -66,7 +66,7 @@ local dram = { x = _RIGHT_X_, y = _CORE_Y_, x_align = 'right', - text_color = _G_Patterns_.BLUE, + text_color = _G_Patterns_.PURPLE, text = '', append_end = ' W' }, diff --git a/drawing/Processor.lua b/drawing/Processor.lua index 3bba4f8..52f474e 100644 --- a/drawing/Processor.lua +++ b/drawing/Processor.lua @@ -115,7 +115,7 @@ local process = { x = _RIGHT_X_, y = _PROCESS_Y_, x_align = 'right', - text_color = _G_Patterns_.BLUE, + text_color = _G_Patterns_.PURPLE, text = ' | | | | ' } } @@ -132,7 +132,7 @@ local ave_freq = { x = _RIGHT_X_, y = _FREQ_Y_, x_align = 'right', - text_color = _G_Patterns_.BLUE, + text_color = _G_Patterns_.PURPLE, text = '' } } diff --git a/drawing/ReadWrite.lua b/drawing/ReadWrite.lua index 0d7067a..b58ac40 100644 --- a/drawing/ReadWrite.lua +++ b/drawing/ReadWrite.lua @@ -69,7 +69,7 @@ local reads = { y = header.bottom_y, x_align = 'right', append_end=' B/s', - text_color = _G_Patterns_.BLUE + text_color = _G_Patterns_.PURPLE }, plot = _G_Widget_.ScalePlot{ x = _G_INIT_DATA_.CENTER_LEFT_X, @@ -93,7 +93,7 @@ local writes = { y = _WRITE_Y_, x_align = 'right', append_end =' B/s', - text_color = _G_Patterns_.BLUE + text_color = _G_Patterns_.PURPLE }, plot = _G_Widget_.ScalePlot{ x = _G_INIT_DATA_.CENTER_LEFT_X, diff --git a/drawing/System.lua b/drawing/System.lua index 189be19..7bef480 100644 --- a/drawing/System.lua +++ b/drawing/System.lua @@ -30,14 +30,14 @@ local kernel = _G_Widget_.Text{ y = header.bottom_y, x_align = 'right', text = Util.conky('$kernel'), - text_color = _G_Patterns_.BLUE + text_color = _G_Patterns_.PURPLE } local info = _G_Widget_.TextColumn{ x = _G_INIT_DATA_.LEFT_X + _G_INIT_DATA_.SECTION_WIDTH, y = header.bottom_y + _TEXT_SPACING_, spacing = _TEXT_SPACING_, x_align = 'right', - text_color = _G_Patterns_.BLUE, + text_color = _G_Patterns_.PURPLE, '', '', '' diff --git a/schema/Patterns.lua b/schema/Patterns.lua index dc6b031..09ede58 100644 --- a/schema/Patterns.lua +++ b/schema/Patterns.lua @@ -10,11 +10,10 @@ M.LIGHT_GREY = Color.init{hex_rgba = 0xeeeeee} M.MID_GREY = Color.init{hex_rgba = 0xd6d6d6} M.DARK_GREY = Color.init{hex_rgba = 0x888888} -M.BLUE = Color.init{hex_rgba = 0xbfe1ff} +M.BLUE = Color.init{hex_rgba = 0x9ed2ff} M.RED = Color.init{hex_rgba = 0xff8282} -M.PURPLE = Color.init{hex_rgba = 0xcb91ff} -M.YELLOW = Color.init{hex_rgba = 0xefe7aa -} +M.PURPLE = Color.init{hex_rgba = 0xc7adff} +M.YELLOW = Color.init{hex_rgba = 0xefe7aa} -- arc patterns local GREY2 = 0xbfbfbf local GREY5 = 0x565656 @@ -40,8 +39,8 @@ M.RED_ROUNDED = Color.Gradient{ Color.ColorStop{hex_rgba = RED1, stop = 1.0} } -local PURPLE1 = 0xeecfff -local PURPLE3 = 0x9523ff +local PURPLE1 = 0xe0d1ff +local PURPLE3 = 0x6924ff M.PURPLE_ROUNDED = Color.Gradient{ Color.ColorStop{hex_rgba = PURPLE3, stop = 0.0}, Color.ColorStop{hex_rgba = PURPLE1, stop = 0.5}, @@ -68,10 +67,10 @@ M.PLOT_FILL_BLUE = Color.Gradient{ Color.ColorStop{hex_rgba = PLOT_BLUE4, stop = 1.0, alpha = 1.0} } -local PLOT_PURPLE1 = 0x3e0077 -local PLOT_PURPLE2 = 0x9523ff -local PLOT_PURPLE3 = 0x7a30a3 -local PLOT_PURPLE4 = 0xeac4ff +local PLOT_PURPLE1 = 0x250075 +local PLOT_PURPLE2 = 0x6924ff +local PLOT_PURPLE3 = 0x532fa2 +local PLOT_PURPLE4 = 0xd5c2ff M.PLOT_LINE_PURPLE = Color.Gradient{ Color.ColorStop{hex_rgba = PLOT_PURPLE1, stop = 0.0}, Color.ColorStop{hex_rgba = PLOT_PURPLE2, stop = 1.0}