diff -Naur mate-system-monitor-1.22.2/src/callbacks.cpp mate-system-monitor-1.22.2-a/src/callbacks.cpp --- mate-system-monitor-1.22.2/src/callbacks.cpp 2019-09-22 22:08:46.000000000 +0800 +++ mate-system-monitor-1.22.2-a/src/callbacks.cpp 2020-03-28 12:35:12.965853386 +0800 @@ -268,12 +268,14 @@ static void change_settings_color(GSettings *settings, const char *key, - GSMColorButton *cp) + GtkColorButton *cp) + //GSMColorButton *cp) { GdkRGBA c; char *color; - gsm_color_button_get_color(cp, &c); + //gsm_color_button_get_color(cp, &c); + gtk_color_button_get_rgba(cp, &c); color = gdk_rgba_to_string (&c); g_settings_set_string (settings, key, color); g_free (color); @@ -281,7 +283,8 @@ void -cb_cpu_color_changed (GSMColorButton *cp, gpointer data) +cb_cpu_color_changed (GtkColorButton *cp, gpointer data) +//cb_cpu_color_changed (GSMColorButton *cp, gpointer data) { char key[80]; gint i = GPOINTER_TO_INT (data); @@ -293,7 +296,8 @@ } void -cb_mem_color_changed (GSMColorButton *cp, gpointer data) +cb_mem_color_changed (GtkColorButton *cp, gpointer data) +//cb_mem_color_changed (GSMColorButton *cp, gpointer data) { ProcData * const procdata = static_cast(data); change_settings_color(procdata->settings, "mem-color", cp); @@ -301,21 +305,24 @@ void -cb_swap_color_changed (GSMColorButton *cp, gpointer data) +cb_swap_color_changed (GtkColorButton *cp, gpointer data) +//cb_swap_color_changed (GSMColorButton *cp, gpointer data) { ProcData * const procdata = static_cast(data); change_settings_color(procdata->settings, "swap-color", cp); } void -cb_net_in_color_changed (GSMColorButton *cp, gpointer data) +cb_net_in_color_changed (GtkColorButton *cp, gpointer data) +//cb_net_in_color_changed (GSMColorButton *cp, gpointer data) { ProcData * const procdata = static_cast(data); change_settings_color(procdata->settings, "net-in-color", cp); } void -cb_net_out_color_changed (GSMColorButton *cp, gpointer data) +cb_net_out_color_changed (GtkColorButton *cp, gpointer data) +//cb_net_out_color_changed (GSMColorButton *cp, gpointer data) { ProcData * const procdata = static_cast(data); change_settings_color(procdata->settings, "net-out-color", cp); diff -Naur mate-system-monitor-1.22.2/src/callbacks.h mate-system-monitor-1.22.2-a/src/callbacks.h --- mate-system-monitor-1.22.2/src/callbacks.h 2019-09-22 22:08:46.000000000 +0800 +++ mate-system-monitor-1.22.2-a/src/callbacks.h 2020-03-28 12:35:14.005900752 +0800 @@ -46,11 +46,16 @@ void cb_info_button_pressed (GtkButton *button, gpointer user_data); -void cb_cpu_color_changed (GSMColorButton *widget, gpointer user_data); -void cb_mem_color_changed (GSMColorButton *widget, gpointer user_data); -void cb_swap_color_changed (GSMColorButton *widget, gpointer user_data); -void cb_net_in_color_changed (GSMColorButton *widget, gpointer user_data); -void cb_net_out_color_changed (GSMColorButton *widget, gpointer user_data); +//void cb_cpu_color_changed (GSMColorButton *widget, gpointer user_data); +void cb_cpu_color_changed (GtkColorButton *widget, gpointer user_data); +//void cb_mem_color_changed (GSMColorButton *widget, gpointer user_data); +void cb_mem_color_changed (GtkColorButton *widget, gpointer user_data); +//void cb_swap_color_changed (GSMColorButton *widget, gpointer user_data); +void cb_swap_color_changed (GtkColorButton *widget, gpointer user_data); +//void cb_net_in_color_changed (GSMColorButton *widget, gpointer user_data); +void cb_net_in_color_changed (GtkColorButton *widget, gpointer user_data); +//void cb_net_out_color_changed (GSMColorButton *widget, gpointer user_data); +void cb_net_out_color_changed (GtkColorButton *widget, gpointer user_data); void cb_row_selected (GtkTreeSelection *selection, gpointer data); diff -Naur mate-system-monitor-1.22.2/src/interface.cpp mate-system-monitor-1.22.2-a/src/interface.cpp --- mate-system-monitor-1.22.2/src/interface.cpp 2019-09-22 22:08:46.000000000 +0800 +++ mate-system-monitor-1.22.2-a/src/interface.cpp 2020-03-28 12:34:11.383048754 +0800 @@ -269,6 +269,8 @@ GtkWidget *color_picker; GtkWidget *mem_legend_box, *net_legend_box; LoadGraph *cpu_graph, *mem_graph, *net_graph; + GtkWidget *scrolledWindow; + GtkWidget *vbox_top; gint i; gchar *title_text; @@ -278,7 +280,11 @@ // Translators: color picker title, %s is CPU, Memory, Swap, Receiving, Sending title_template = g_strdup(_("Pick a Color for '%s'")); + vbox_top = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18); + scrolledWindow = gtk_scrolled_window_new(NULL,NULL); + gtk_box_pack_start (GTK_BOX (vbox_top), scrolledWindow, TRUE, TRUE, 0); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18); + gtk_container_add(GTK_CONTAINER (scrolledWindow),vbox); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); @@ -324,7 +330,9 @@ gtk_grid_attach(GTK_GRID(cpu_grid), temp_hbox, i % 4, i / 4, 1, 1); - color_picker = gsm_color_button_new (&cpu_graph->colors.at(i), GSMCP_TYPE_CPU); + //color_picker = gsm_color_button_new (&cpu_graph->colors.at(i), GSMCP_TYPE_CPU); + //color_picker = gtk_color_button_new (); + color_picker = gtk_color_button_new_with_rgba(&cpu_graph->colors.at(i)); g_signal_connect (G_OBJECT (color_picker), "color_set", G_CALLBACK (cb_cpu_color_changed), GINT_TO_POINTER (i)); gtk_box_pack_start (GTK_BOX (temp_hbox), color_picker, FALSE, TRUE, 0); @@ -336,7 +344,8 @@ } title_text = g_strdup_printf(title_template, label_text); label = gtk_label_new (label_text); - gsm_color_button_set_title(GSM_COLOR_BUTTON(color_picker), title_text); + //gsm_color_button_set_title(GSM_COLOR_BUTTON(color_picker), title_text); + gtk_color_button_set_title(GTK_COLOR_BUTTON(color_picker), title_text); g_free(title_text); gtk_box_pack_start (GTK_BOX (temp_hbox), label, FALSE, FALSE, 6); g_free (label_text); @@ -346,6 +355,7 @@ gtk_box_pack_start (GTK_BOX (temp_hbox), cpu_label, TRUE, TRUE, 0); load_graph_get_labels(cpu_graph)->cpu[i] = cpu_label; + gtk_widget_show(color_picker); } @@ -548,7 +558,7 @@ procdata->net_graph = net_graph; g_free(title_template); - return vbox; + return vbox_top; } static void diff -Naur mate-system-monitor-1.22.2/src/org.mate.system-monitor.gschema.xml.in mate-system-monitor-1.22.2-a/src/org.mate.system-monitor.gschema.xml.in --- mate-system-monitor-1.22.2/src/org.mate.system-monitor.gschema.xml.in 2019-09-22 22:08:46.000000000 +0800 +++ mate-system-monitor-1.22.2-a/src/org.mate.system-monitor.gschema.xml.in 2020-03-28 12:52:44.965764307 +0800 @@ -117,69 +117,325 @@ Default graph CPU color - '#339999' + '#580606' Default graph CPU color - '#339999' + '#514C47' Default graph CPU color - '#339999' + '#F5881A' Default graph CPU color - '#339999' + '#BF6811' Default graph CPU color - '#339999' + '#5C3F21' Default graph CPU color - '#339999' + '#B6AA9E' Default graph CPU color - '#339999' + '#CCE041' Default graph CPU color - '#339999' + '#BAD30E' Default graph CPU color - '#339999' + '#90A118' Default graph CPU color - '#339999' + '#5F6A11' Default graph CPU color - '#339999' + '#DFE7A8' Default graph CPU color - '#339999' + '#95978E' Default graph CPU color - '#339999' + '#636656' Default graph CPU color - '#339999' + '#37F111' Default graph CPU color - '#339999' + '#97FB83' Default graph CPU color - '#339999' + '#1A7F07' Default graph CPU color + + '#5EA451' + Default graph CPU color + + + '#3B4738' + Default graph CPU color + + + '#88B193' + Default graph CPU color + + + '#5169C0' + Default graph CPU color + + + '#A6B2E1' + Default graph CPU color + + + '#0434F1' + Default graph CPU color + + + '#67729C' + Default graph CPU color + + + '#253987' + Default graph CPU color + + + '#7180BB' + Default graph CPU color + + + '#1F2641' + Default graph CPU color + + + '#C077C2' + Default graph CPU color + + + '#5D085F' + Default graph CPU color + + + '#735774' + Default graph CPU color + + + '#861C8A' + Default graph CPU color + + + '#968297' + Default graph CPU color + + + '#E8AEEB' + Default graph CPU color + + + '#9A03A2' + Default graph CPU color + + + '#6C316E' + Default graph CPU color + + + '#99369C' + Default graph CPU color + + + '#F70798' + Default graph CPU color + + + '#9E0C64' + Default graph CPU color + + + '#4B0A31' + Default graph CPU color + + + '#FA77C6' + Default graph CPU color + + + '#7B16E1' + Default graph CPU color + + + '#BF8EF1' + Default graph CPU color + + + '#5E516B' + Default graph CPU color + + + '#595A1E' + Default graph CPU color + + + '#A0A183' + Default graph CPU color + + + '#50524D' + Default graph CPU color + + + '#42640F' + Default graph CPU color + + + '#0C3534' + Default graph CPU color + + + '#5A8F89' + Default graph CPU color + + + '#C99EB1' + Default graph CPU color + + + '#B9A1AC' + Default graph CPU color + + + '#76931C' + Default graph CPU color + + + '#116461' + Default graph CPU color + + + '#3D5453' + Default graph CPU color + + + '#155867' + Default graph CPU color + + + '#3476B7' + Default graph CPU color + + + '#76B0EA' + Default graph CPU color + + + '#7704FC' + Default graph CPU color + + + '#A98C77' + Default graph CPU color + + + '#D0762D' + Default graph CPU color + + + '#020202' + Default graph CPU color + + + '#94905C' + Default graph CPU color + + + '#552235' + Default graph CPU color + + + '#6C5B61' + Default graph CPU color + + + '#AF875E' + Default graph CPU color + + + '#5D4F42' + Default graph CPU color + + + '#3E4B2A' + Default graph CPU color + + + '#7D7E7D' + Default graph CPU color + + + '#FE666E' + Default graph CPU color + + + '#0F3E35' + Default graph CPU color + + + '#677B76' + Default graph CPU color + + + '#8C899A' + Default graph CPU color + + + '#454D4E' + Default graph CPU color + + + '#CDDDD7' + Default graph CPU color + + + '#2C4422' + Default graph CPU color + + + '#DED0E2' + Default graph CPU color + + + '#A76E53' + Default graph CPU color + + + '#645258' + Default graph CPU color + + + '#FD0B69' + Default graph CPU color + + + '#CCCBEE' + Default graph CPU color + + + '#06FFDA' + Default graph CPU color + '#AB1852' Default graph memory color