Commit Diff

Commit:
90985bcf8a9ca17e826250929e02175e107e92a5
From:
Oliver Lowe <o@olowe.co>
Date:
Message:
gtk: hardcode log status colours Don't need to customise this; international standards like traffic lights already exist
Actions:
Patch | Tree
commit - aaa234c961c0deba340b5d07a9cf3715ba7dfe17
commit + 90985bcf8a9ca17e826250929e02175e107e92a5
blob - 358476b305bf279649a0a6daf28b4818173e60ee
blob + 096cdd59205b19c5e130b709fbf3c2479380130a
--- src/gtk/logwindow.c
+++ src/gtk/logwindow.c
@@ -140,8 +140,6 @@ LogWindow *log_window_create(LogInstance instance)
 	return logwin;
 }
 
-#define LOG_COLORS 8
-
 void log_window_init(LogWindow *logwin)
 {
 	GtkTextBuffer *buffer;
@@ -151,9 +149,9 @@ void log_window_init(LogWindow *logwin)
 	logwin->error_color = &prefs_common.color[COL_LOG_ERROR];
 	logwin->in_color = &prefs_common.color[COL_LOG_IN];
 	logwin->out_color = &prefs_common.color[COL_LOG_OUT];
-	logwin->status_ok_color = &prefs_common.color[COL_LOG_STATUS_OK];
-	logwin->status_nok_color = &prefs_common.color[COL_LOG_STATUS_NOK];
-	logwin->status_skip_color = &prefs_common.color[COL_LOG_STATUS_SKIP];
+	logwin->status_ok_color = "#00af00"; // green
+	logwin->status_nok_color = "#0000af"; // blue
+	logwin->status_skip_color = "#aa00aa"; // purple
 
 	buffer = logwin->buffer;
 	gtk_text_buffer_create_tag(buffer, "message",
@@ -182,8 +180,6 @@ void log_window_init(LogWindow *logwin)
 				   NULL);
 }
 
-#undef LOG_COLORS
-
 void log_window_show(LogWindow *logwin)
 {
 	GtkTextView *text = GTK_TEXT_VIEW(logwin->text);
blob - 2dc00742eb567ad7ffc86d9e31000f28ae8da901
blob + c4df5b30783b4811f3fe4fe70b8d0471199343a2
--- src/prefs_common.c
+++ src/prefs_common.c
@@ -640,12 +640,6 @@ static PrefParam param[] = {
 	 P_COLOR, NULL, NULL, NULL},
 	{"log_out_color", "#0000ef", &prefs_common.color[COL_LOG_OUT],
 	 P_COLOR, NULL, NULL, NULL},
-	{"log_status_ok_color", "#00af00", &prefs_common.color[COL_LOG_STATUS_OK],
-	 P_COLOR, NULL, NULL, NULL},
-	{"log_status_nok_color", "#0000af", &prefs_common.color[COL_LOG_STATUS_NOK],
-	 P_COLOR, NULL, NULL, NULL},
-	{"log_status_skip_color", "#aa00aa", &prefs_common.color[COL_LOG_STATUS_SKIP],
-	 P_COLOR, NULL, NULL, NULL},
 
 	{"gtk_enable_accels", "TRUE", &prefs_common.gtk_enable_accels, P_BOOL,
 	 NULL, NULL, NULL},