From 17117a914c55fe0c0c6ebad5ea150d64ac3be83e Mon Sep 17 00:00:00 2001 From: petrucci4prez Date: Wed, 19 Jul 2017 00:27:37 -0400 Subject: [PATCH] forgto to rename these colors --- core | 2 +- module/Graphics.lua | 14 +++++++------- module/Memory.lua | 2 +- module/Network.lua | 4 ++-- module/Pacman.lua | 2 +- module/Power.lua | 6 +++--- module/Processor.lua | 2 +- module/ReadWrite.lua | 4 ++-- module/System.lua | 2 +- module/Weather.lua | 16 ++++++++-------- schema/default_patterns.lua | 6 +++--- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/core b/core index 4c481f8..9a3912c 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 4c481f811ab7107883dc9ada123652574a8575f6 +Subproject commit 9a3912cc2879099d154ec6e267106db885e0fd7f diff --git a/module/Graphics.lua b/module/Graphics.lua index 3c1ea04..ec1d677 100644 --- a/module/Graphics.lua +++ b/module/Graphics.lua @@ -36,7 +36,7 @@ local status = { x = _RIGHT_X_, y = header.bottom_y, x_align = 'right', - text_color = schema.blue, + text_color = schema.BLUE, text = '' } } @@ -60,7 +60,7 @@ local internal_temp = { x = _RIGHT_X_, y = _INTERNAL_TEMP_Y_, x_align = 'right', - text_color = schema.blue, + text_color = schema.BLUE, text = '' } } @@ -77,7 +77,7 @@ local pci_util = { x = _RIGHT_X_, y = _PCI_UTIL_Y_, x_align = 'right', - text_color = schema.blue, + text_color = schema.BLUE, text = '' } } @@ -104,7 +104,7 @@ local clock_speed = { y = _CLOCK_SPEED_Y_, spacing = _TEXT_SPACING_, x_align = 'right', - text_color = schema.blue, + text_color = schema.BLUE, num_rows = 2 } } @@ -128,7 +128,7 @@ local gpu_util = { x = _RIGHT_X_, y = _GPU_UTIL_Y_, x_align = 'right', - text_color = schema.blue, + text_color = schema.BLUE, text = '' }, plot = Widget.LabelPlot{ @@ -151,7 +151,7 @@ local mem_util = { x = _RIGHT_X_, y = _MEM_UTIL_Y_, x_align = 'right', - text_color = schema.blue, + text_color = schema.BLUE, text = '' }, plot = Widget.LabelPlot{ @@ -174,7 +174,7 @@ local vid_util = { x = _RIGHT_X_, y = _VID_UTIL_Y_, x_align = 'right', - text_color = schema.blue, + text_color = schema.BLUE, text = '' }, plot = Widget.LabelPlot{ diff --git a/module/Memory.lua b/module/Memory.lua index 9d56a05..5e7cee7 100644 --- a/module/Memory.lua +++ b/module/Memory.lua @@ -119,7 +119,7 @@ local cache = { y = _LINE_1_Y_ + _TEXT_SPACING_, x_align = 'right', append_end = ' %', - text_color = schema.purple, + text_color = schema.PURPLE, '', '', '' diff --git a/module/Network.lua b/module/Network.lua index bb13e98..7bec7e0 100644 --- a/module/Network.lua +++ b/module/Network.lua @@ -39,7 +39,7 @@ local dnload = { x = _RIGHT_X_, y = header.bottom_y, x_align = 'right', - text_color = schema.blue + text_color = schema.BLUE }, plot = 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 = schema.blue + text_color = schema.BLUE }, plot = Widget.ScalePlot{ x = _G_INIT_DATA_.CENTER_RIGHT_X, diff --git a/module/Pacman.lua b/module/Pacman.lua index 0ad06ee..172a902 100644 --- a/module/Pacman.lua +++ b/module/Pacman.lua @@ -37,7 +37,7 @@ local info = Widget.TextColumn{ y = header.bottom_y, spacing = _TEXT_SPACING_, x_align = 'right', - text_color = schema.blue, + text_color = schema.BLUE, num_rows = 5 } diff --git a/module/Power.lua b/module/Power.lua index eb262ad..5dfd9e4 100644 --- a/module/Power.lua +++ b/module/Power.lua @@ -44,7 +44,7 @@ local pp01 = { y = header.bottom_y, spacing = _TEXT_SPACING_, x_align = 'right', - text_color = schema.blue, + text_color = schema.BLUE, append_end = ' W', num_rows = 2 } @@ -69,7 +69,7 @@ local pkg0 = { x = _RIGHT_X_, y = _PKG0_Y_, x_align = 'right', - text_color = schema.blue, + text_color = schema.BLUE, text = '', append_end = ' W' }, @@ -94,7 +94,7 @@ local dram = { x = _RIGHT_X_, y = _DRAM_Y_, x_align = 'right', - text_color = schema.blue, + text_color = schema.BLUE, text = '', append_end = ' W' }, diff --git a/module/Processor.lua b/module/Processor.lua index 3b24bfa..3b1929b 100644 --- a/module/Processor.lua +++ b/module/Processor.lua @@ -109,7 +109,7 @@ local process = { x = _RIGHT_X_, y = _PROCESS_Y_, x_align = 'right', - text_color = schema.blue, + text_color = schema.BLUE, text = '' } } diff --git a/module/ReadWrite.lua b/module/ReadWrite.lua index 116eff6..0b8a9db 100644 --- a/module/ReadWrite.lua +++ b/module/ReadWrite.lua @@ -69,7 +69,7 @@ local reads = { y = header.bottom_y, x_align = 'right', append_end=' B/s', - text_color = schema.blue + text_color = schema.BLUE }, plot = 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 = schema.blue + text_color = schema.BLUE }, plot = Widget.ScalePlot{ x = _G_INIT_DATA_.CENTER_LEFT_X, diff --git a/module/System.lua b/module/System.lua index fac0814..8ffe085 100644 --- a/module/System.lua +++ b/module/System.lua @@ -35,7 +35,7 @@ local info = Widget.TextColumn{ y = header.bottom_y, spacing = _TEXT_SPACING_, x_align = 'right', - text_color = schema.blue, + text_color = schema.BLUE, util.conky('$kernel'), '', '', diff --git a/module/Weather.lua b/module/Weather.lua index 26c1c95..3311bdc 100644 --- a/module/Weather.lua +++ b/module/Weather.lua @@ -39,14 +39,14 @@ local create_side_rows = function(side_rows_x, side_rows_y, side_rows_tbl) current_row.desc = Widget.Text{ x = side_rows_x, y = current_row_y, - text_color = schema.blue, + text_color = schema.BLUE, } current_row.period = Widget.Text{ x = side_rows_x + _G_INIT_DATA_.SECTION_WIDTH, y = current_row_y, x_align = 'right', - text_color = schema.blue + text_color = schema.BLUE } current_row.icon = Widget.ScaledImage{ @@ -61,7 +61,7 @@ local create_side_rows = function(side_rows_x, side_rows_y, side_rows_tbl) y = current_row_y + _HEADER_PAD_ + 25, x_align = 'center', font_size = 28, - text_color = schema.blue + text_color = schema.BLUE } current_row.temp2 = Widget.Text{ @@ -85,7 +85,7 @@ local create_side_rows = function(side_rows_x, side_rows_y, side_rows_tbl) y = current_row_y + _HEADER_PAD_ + 15, spacing = _SPACING_, x_align = 'right', - text_color = schema.blue, + text_color = schema.BLUE, num_rows = 3 } @@ -131,7 +131,7 @@ center.header = Widget.Header{ center.current_desc = Widget.Text{ x = _G_INIT_DATA_.CENTER_LEFT_X, y = center.header.bottom_y + 8, - text_color = schema.blue, + text_color = schema.BLUE, font_size = 24 } @@ -153,7 +153,7 @@ center.current_temp = Widget.Text{ y = _INFO_Y_, x_align = 'center', font_size = 48, - text_color = schema.blue + text_color = schema.BLUE } center.obs_time = Widget.Text{ @@ -191,7 +191,7 @@ center.info_column_1 = Widget.TextColumn{ x = _G_INIT_DATA_.CENTER_RIGHT_X + (_G_INIT_DATA_.SECTION_WIDTH - _COLUMN_PADDING_) / 2, y = center.header.bottom_y, x_align = 'right', - text_color = schema.blue, + text_color = schema.BLUE, spacing = _CENTER_SPACING_, font_size = 14, num_rows = 7 @@ -215,7 +215,7 @@ center.info_column_2 = Widget.TextColumn{ x = _G_INIT_DATA_.CENTER_RIGHT_X + _G_INIT_DATA_.SECTION_WIDTH, y = center.header.bottom_y, x_align = 'right', - text_color = schema.blue, + text_color = schema.BLUE, spacing = _CENTER_SPACING_, font_size = 14, num_rows = 7 diff --git a/schema/default_patterns.lua b/schema/default_patterns.lua index 64cbb73..e209d03 100644 --- a/schema/default_patterns.lua +++ b/schema/default_patterns.lua @@ -30,9 +30,9 @@ M.LIGHT_GREY = Color.init{hex_rgba = GREY1} M.MID_GREY = Color.init{hex_rgba = GREY3} M.DARK_GREY = Color.init{hex_rgba = GREY4} -M.blue = Color.init{hex_rgba = BLUE2} -M.red = Color.init{hex_rgba = RED2} -M.purple = Color.init{hex_rgba = PURPLE2} +M.BLUE = Color.init{hex_rgba = BLUE2} +M.RED = Color.init{hex_rgba = RED2} +M.PURPLE = Color.init{hex_rgba = PURPLE2} M.GREY_ROUNDED = Color.Gradient{ Color.ColorStop{hex_rgba = GREY5, stop = 0.0},