packages/mate-system-monitor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mate-system-monitor/mate-system-monitor-change-cpu-too-much-and-color.patch
hostfj df78991605 modify contest
2020-08-27 17:50:28 +08:00

501 lines
18 KiB
Diff
Raw Blame History

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<ProcData*>(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<ProcData*>(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<ProcData*>(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<ProcData*>(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 @@
<summary>Default graph CPU color</summary>
</key>
<key name="cpu-color16" type="s">
- <default>'#339999'</default>
+ <default>'#580606'</default>
<summary>Default graph CPU color</summary>
</key>
<key name="cpu-color17" type="s">
- <default>'#339999'</default>
+ <default>'#514C47'</default>
<summary>Default graph CPU color</summary>
</key>
<key name="cpu-color18" type="s">
- <default>'#339999'</default>
+ <default>'#F5881A'</default>
<summary>Default graph CPU color</summary>
</key>
<key name="cpu-color19" type="s">
- <default>'#339999'</default>
+ <default>'#BF6811'</default>
<summary>Default graph CPU color</summary>
</key>
<key name="cpu-color20" type="s">
- <default>'#339999'</default>
+ <default>'#5C3F21'</default>
<summary>Default graph CPU color</summary>
</key>
<key name="cpu-color21" type="s">
- <default>'#339999'</default>
+ <default>'#B6AA9E'</default>
<summary>Default graph CPU color</summary>
</key>
<key name="cpu-color22" type="s">
- <default>'#339999'</default>
+ <default>'#CCE041'</default>
<summary>Default graph CPU color</summary>
</key>
<key name="cpu-color23" type="s">
- <default>'#339999'</default>
+ <default>'#BAD30E'</default>
<summary>Default graph CPU color</summary>
</key>
<key name="cpu-color24" type="s">
- <default>'#339999'</default>
+ <default>'#90A118'</default>
<summary>Default graph CPU color</summary>
</key>
<key name="cpu-color25" type="s">
- <default>'#339999'</default>
+ <default>'#5F6A11'</default>
<summary>Default graph CPU color</summary>
</key>
<key name="cpu-color26" type="s">
- <default>'#339999'</default>
+ <default>'#DFE7A8'</default>
<summary>Default graph CPU color</summary>
</key>
<key name="cpu-color27" type="s">
- <default>'#339999'</default>
+ <default>'#95978E'</default>
<summary>Default graph CPU color</summary>
</key>
<key name="cpu-color28" type="s">
- <default>'#339999'</default>
+ <default>'#636656'</default>
<summary>Default graph CPU color</summary>
</key>
<key name="cpu-color29" type="s">
- <default>'#339999'</default>
+ <default>'#37F111'</default>
<summary>Default graph CPU color</summary>
</key>
<key name="cpu-color30" type="s">
- <default>'#339999'</default>
+ <default>'#97FB83'</default>
<summary>Default graph CPU color</summary>
</key>
<key name="cpu-color31" type="s">
- <default>'#339999'</default>
+ <default>'#1A7F07'</default>
<summary>Default graph CPU color</summary>
</key>
+ <key name="cpu-color32" type="s">
+ <default>'#5EA451'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color33" type="s">
+ <default>'#3B4738'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color34" type="s">
+ <default>'#88B193'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color35" type="s">
+ <default>'#5169C0'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color36" type="s">
+ <default>'#A6B2E1'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color37" type="s">
+ <default>'#0434F1'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color38" type="s">
+ <default>'#67729C'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color39" type="s">
+ <default>'#253987'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color40" type="s">
+ <default>'#7180BB'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color41" type="s">
+ <default>'#1F2641'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color42" type="s">
+ <default>'#C077C2'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color43" type="s">
+ <default>'#5D085F'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color44" type="s">
+ <default>'#735774'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color45" type="s">
+ <default>'#861C8A'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color46" type="s">
+ <default>'#968297'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color47" type="s">
+ <default>'#E8AEEB'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color48" type="s">
+ <default>'#9A03A2'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color49" type="s">
+ <default>'#6C316E'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color50" type="s">
+ <default>'#99369C'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color51" type="s">
+ <default>'#F70798'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color52" type="s">
+ <default>'#9E0C64'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color53" type="s">
+ <default>'#4B0A31'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color54" type="s">
+ <default>'#FA77C6'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color55" type="s">
+ <default>'#7B16E1'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color56" type="s">
+ <default>'#BF8EF1'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color57" type="s">
+ <default>'#5E516B'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color58" type="s">
+ <default>'#595A1E'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color59" type="s">
+ <default>'#A0A183'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color60" type="s">
+ <default>'#50524D'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color61" type="s">
+ <default>'#42640F'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color62" type="s">
+ <default>'#0C3534'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color63" type="s">
+ <default>'#5A8F89'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color64" type="s">
+ <default>'#C99EB1'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color65" type="s">
+ <default>'#B9A1AC'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color66" type="s">
+ <default>'#76931C'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color67" type="s">
+ <default>'#116461'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color68" type="s">
+ <default>'#3D5453'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color69" type="s">
+ <default>'#155867'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color70" type="s">
+ <default>'#3476B7'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color71" type="s">
+ <default>'#76B0EA'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color72" type="s">
+ <default>'#7704FC'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color73" type="s">
+ <default>'#A98C77'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color74" type="s">
+ <default>'#D0762D'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color75" type="s">
+ <default>'#020202'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color76" type="s">
+ <default>'#94905C'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color77" type="s">
+ <default>'#552235'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color78" type="s">
+ <default>'#6C5B61'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color79" type="s">
+ <default>'#AF875E'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color80" type="s">
+ <default>'#5D4F42'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color81" type="s">
+ <default>'#3E4B2A'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color82" type="s">
+ <default>'#7D7E7D'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color83" type="s">
+ <default>'#FE666E'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color84" type="s">
+ <default>'#0F3E35'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color85" type="s">
+ <default>'#677B76'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color86" type="s">
+ <default>'#8C899A'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color87" type="s">
+ <default>'#454D4E'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color88" type="s">
+ <default>'#CDDDD7'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color89" type="s">
+ <default>'#2C4422'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color90" type="s">
+ <default>'#DED0E2'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color91" type="s">
+ <default>'#A76E53'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color92" type="s">
+ <default>'#645258'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color93" type="s">
+ <default>'#FD0B69'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color94" type="s">
+ <default>'#CCCBEE'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
+ <key name="cpu-color95" type="s">
+ <default>'#06FFDA'</default>
+ <summary>Default graph CPU color</summary>
+ </key>
<key name="mem-color" type="s">
<default>'#AB1852'</default>
<summary>Default graph memory color</summary>
Reference in New Issue View Git Blame Copy Permalink