Compare commits
No commits in common. "08203cb5d77d20faf39de95af4b836627701d099" and "8ff4ac1af6278151b9daf3cd6d3f50666e8b5dc0" have entirely different histories.
08203cb5d7
...
8ff4ac1af6
@ -1,160 +0,0 @@
|
|||||||
From 886647b9f8d0454caacb6c548bdd5a88bfd3d958 Mon Sep 17 00:00:00 2001
|
|
||||||
From: root <root@localhost.localdomain>
|
|
||||||
Date: Thu, 14 Jul 2022 05:14:44 -0400
|
|
||||||
Subject: [PATCH] fix(*):add cpu-color key to 127 for solve the quit bug when
|
|
||||||
change the color of cpu when cpu>95
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
- 增加cpu-color key到127,解决cpu>95个情况下切换cpu显示颜色闪退问题
|
|
||||||
|
|
||||||
Related #45073
|
|
||||||
---
|
|
||||||
src/org.mate.system-monitor.gschema.xml.in | 130 ++++++++++++++++++++-
|
|
||||||
1 file changed, 129 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/org.mate.system-monitor.gschema.xml.in b/src/org.mate.system-monitor.gschema.xml.in
|
|
||||||
index 1183469..3879b54 100644
|
|
||||||
--- a/src/org.mate.system-monitor.gschema.xml.in
|
|
||||||
+++ b/src/org.mate.system-monitor.gschema.xml.in
|
|
||||||
@@ -435,7 +435,135 @@
|
|
||||||
<key name="cpu-color95" type="s">
|
|
||||||
<default>'#06FFDA'</default>
|
|
||||||
<summary>Default graph CPU color</summary>
|
|
||||||
- </key>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color96" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color97" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color98" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color99" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color100" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color101" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color102" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color103" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color104" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color105" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color106" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color107" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color108" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color109" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color110" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color111" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color112" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color113" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color114" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color115" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color116" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color117" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color118" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color119" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color120" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color121" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color122" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color123" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color124" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color125" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color126" type="s">
|
|
||||||
+ <default>'#06FFDA'</default>
|
|
||||||
+ <summary>Default graph CPU color</summary>
|
|
||||||
+ </key>
|
|
||||||
+ <key name="cpu-color127" 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>
|
|
||||||
--
|
|
||||||
2.33.0
|
|
||||||
|
|
||||||
@ -1,616 +0,0 @@
|
|||||||
From 023e9c8907b96c4bab49fd2e1f6c0bef485bf8b9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: root <root@localhost.localdomain>
|
|
||||||
Date: Thu, 4 Aug 2022 15:25:07 +0800
|
|
||||||
Subject: [PATCH] fix(resource):fix resource page too large and add cpu color
|
|
||||||
in gschema.xml when system has too many cpus
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
- 修改当系统cpu过多时资源页面显示不全问题,在gschema.xml文件中添加cpu颜色
|
|
||||||
|
|
||||||
fix I5H529
|
|
||||||
---
|
|
||||||
src/callbacks.cpp | 21 +-
|
|
||||||
src/callbacks.h | 15 +-
|
|
||||||
src/gsm_color_button.c | 8 +-
|
|
||||||
src/interface.cpp | 16 +-
|
|
||||||
src/load-graph.cpp | 11 +-
|
|
||||||
src/org.mate.system-monitor.gschema.xml.in | 288 +++++++++++++++++++--
|
|
||||||
6 files changed, 313 insertions(+), 46 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/callbacks.cpp b/src/callbacks.cpp
|
|
||||||
index 149e955..e05fab8 100644
|
|
||||||
--- a/src/callbacks.cpp
|
|
||||||
+++ b/src/callbacks.cpp
|
|
||||||
@@ -268,12 +268,14 @@ cb_end_process_button_pressed (GtkButton *button, gpointer data)
|
|
||||||
|
|
||||||
|
|
||||||
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 @@ static void change_settings_color(GSettings *settings, const char *key,
|
|
||||||
|
|
||||||
|
|
||||||
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 @@ cb_cpu_color_changed (GSMColorButton *cp, gpointer data)
|
|
||||||
}
|
|
||||||
|
|
||||||
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 @@ cb_mem_color_changed (GSMColorButton *cp, gpointer data)
|
|
||||||
|
|
||||||
|
|
||||||
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 --git a/src/callbacks.h b/src/callbacks.h
|
|
||||||
index 69f5056..3e5c9f4 100644
|
|
||||||
--- a/src/callbacks.h
|
|
||||||
+++ b/src/callbacks.h
|
|
||||||
@@ -46,11 +46,16 @@ void cb_logout (GtkButton *button, gpointer data);
|
|
||||||
|
|
||||||
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 --git a/src/gsm_color_button.c b/src/gsm_color_button.c
|
|
||||||
index 3148c34..35d2710 100644
|
|
||||||
--- a/src/gsm_color_button.c
|
|
||||||
+++ b/src/gsm_color_button.c
|
|
||||||
@@ -227,7 +227,7 @@ fill_image_buffer_from_file (cairo_t *cr, const char *filePath)
|
|
||||||
|
|
||||||
|
|
||||||
static void
|
|
||||||
-render (GtkWidget * widget)
|
|
||||||
+render (GtkWidget * widget, cairo_t *cr)
|
|
||||||
{
|
|
||||||
GSMColorButtonPrivate *priv;
|
|
||||||
GSMColorButton *color_button = GSM_COLOR_BUTTON (widget);
|
|
||||||
@@ -236,7 +236,6 @@ render (GtkWidget * widget)
|
|
||||||
GdkRGBA *color;
|
|
||||||
GdkRGBA tmp_color = priv->color;
|
|
||||||
color = &tmp_color;
|
|
||||||
- cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
|
|
||||||
cairo_path_t *path = NULL;
|
|
||||||
gint width, height;
|
|
||||||
gdouble radius, arc_start, arc_end;
|
|
||||||
@@ -405,13 +404,12 @@ render (GtkWidget * widget)
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
- cairo_destroy (cr);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Handle exposure events for the color picker's drawing area */
|
|
||||||
static gboolean draw (GtkWidget * widget, cairo_t * cr, gpointer data)
|
|
||||||
{
|
|
||||||
- render (GTK_WIDGET (data));
|
|
||||||
+ render (GTK_WIDGET (data), cr);
|
|
||||||
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
@@ -420,7 +418,7 @@ static void
|
|
||||||
gsm_color_button_realize (GtkWidget * widget)
|
|
||||||
{
|
|
||||||
GTK_WIDGET_CLASS (gsm_color_button_parent_class)->realize (widget);
|
|
||||||
- render (widget);
|
|
||||||
+ gtk_widget_queue_draw(widget);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void gsm_color_button_get_preferred_width (GtkWidget * widget, gint * minimum_width, gint * natural_width)
|
|
||||||
diff --git a/src/interface.cpp b/src/interface.cpp
|
|
||||||
index f7dbe84..2a5cbbf 100644
|
|
||||||
--- a/src/interface.cpp
|
|
||||||
+++ b/src/interface.cpp
|
|
||||||
@@ -269,6 +269,8 @@ create_sys_view (ProcData *procdata)
|
|
||||||
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 @@ create_sys_view (ProcData *procdata)
|
|
||||||
// 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 @@ create_sys_view (ProcData *procdata)
|
|
||||||
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 @@ create_sys_view (ProcData *procdata)
|
|
||||||
}
|
|
||||||
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 @@ create_sys_view (ProcData *procdata)
|
|
||||||
|
|
||||||
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 @@ create_sys_view (ProcData *procdata)
|
|
||||||
procdata->net_graph = net_graph;
|
|
||||||
g_free(title_template);
|
|
||||||
|
|
||||||
- return vbox;
|
|
||||||
+ return vbox_top;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
diff --git a/src/load-graph.cpp b/src/load-graph.cpp
|
|
||||||
index b24f977..2e294b9 100644
|
|
||||||
--- a/src/load-graph.cpp
|
|
||||||
+++ b/src/load-graph.cpp
|
|
||||||
@@ -220,7 +220,7 @@ load_graph_configure (GtkWidget *widget,
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static gboolean load_graph_draw (GtkWidget *widget, cairo_t *context, gpointer data_ptr)
|
|
||||||
+static gboolean load_graph_draw (GtkWidget *widget, cairo_t *cr, gpointer data_ptr)
|
|
||||||
{
|
|
||||||
LoadGraph * const graph = static_cast<LoadGraph*>(data_ptr);
|
|
||||||
GdkWindow *window;
|
|
||||||
@@ -239,10 +239,6 @@ static gboolean load_graph_draw (GtkWidget *widget, cairo_t *context, gpointer d
|
|
||||||
x_offset += graph->rmargin - ((sample_width / graph->frames_per_unit) * graph->render_counter);
|
|
||||||
|
|
||||||
/* draw the graph */
|
|
||||||
- cairo_t* cr;
|
|
||||||
-
|
|
||||||
- cr = gdk_cairo_create (window);
|
|
||||||
-
|
|
||||||
if (graph->background == NULL) {
|
|
||||||
draw_background(graph);
|
|
||||||
}
|
|
||||||
@@ -252,9 +248,6 @@ static gboolean load_graph_draw (GtkWidget *widget, cairo_t *context, gpointer d
|
|
||||||
cairo_set_line_width (cr, 1);
|
|
||||||
cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
|
|
||||||
cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
|
|
||||||
- cairo_rectangle (cr, graph->rmargin + graph->indent + FRAME_WIDTH + 1, FRAME_WIDTH - 1,
|
|
||||||
- graph->draw_width - graph->rmargin - graph->indent - 1, graph->real_draw_height + FRAME_WIDTH - 1);
|
|
||||||
- cairo_clip(cr);
|
|
||||||
|
|
||||||
for (j = 0; j < graph->n; ++j) {
|
|
||||||
cairo_move_to (cr, x_offset, (1.0f - graph->data[0][j]) * graph->real_draw_height);
|
|
||||||
@@ -275,8 +268,6 @@ static gboolean load_graph_draw (GtkWidget *widget, cairo_t *context, gpointer d
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
- cairo_destroy (cr);
|
|
||||||
-
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/src/org.mate.system-monitor.gschema.xml.in b/src/org.mate.system-monitor.gschema.xml.in
|
|
||||||
index 703923d..1183469 100644
|
|
||||||
--- a/src/org.mate.system-monitor.gschema.xml.in
|
|
||||||
+++ b/src/org.mate.system-monitor.gschema.xml.in
|
|
||||||
@@ -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>
|
|
||||||
--
|
|
||||||
2.33.0
|
|
||||||
|
|
||||||
@ -1,53 +0,0 @@
|
|||||||
From ac0e4fe10113a41df45530b8f151b97b8411078c Mon Sep 17 00:00:00 2001
|
|
||||||
From: mazhiguo <mazhiguo@kylinos.com.cn>
|
|
||||||
Date: Thu, 5 Sep 2019 08:34:22 -0400
|
|
||||||
Subject: [PATCH] kylin modify desktop
|
|
||||||
|
|
||||||
---
|
|
||||||
mate-system-monitor.desktop.in | 2 +-
|
|
||||||
mate-system-monitor.desktop.in.in | 2 +-
|
|
||||||
po/zh_CN.po | 2 +-
|
|
||||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/mate-system-monitor.desktop.in b/mate-system-monitor.desktop.in
|
|
||||||
index 27a9e11..483b18c 100644
|
|
||||||
--- a/mate-system-monitor.desktop.in
|
|
||||||
+++ b/mate-system-monitor.desktop.in
|
|
||||||
@@ -8,7 +8,7 @@ Icon=utilities-system-monitor
|
|
||||||
Terminal=false
|
|
||||||
Type=Application
|
|
||||||
StartupNotify=true
|
|
||||||
-Categories=GTK;System;Monitor;
|
|
||||||
+Categories=GTK;System;Monitor;X-Common-Features;X-System-Server;
|
|
||||||
Keywords=MATE;system;monitor;process;list;view;current;resources;
|
|
||||||
OnlyShowIn=MATE;
|
|
||||||
X-MATE-Bugzilla-Bugzilla=MATE
|
|
||||||
diff --git a/mate-system-monitor.desktop.in.in b/mate-system-monitor.desktop.in.in
|
|
||||||
index 6085693..afebdcb 100644
|
|
||||||
--- a/mate-system-monitor.desktop.in.in
|
|
||||||
+++ b/mate-system-monitor.desktop.in.in
|
|
||||||
@@ -8,7 +8,7 @@ Icon=utilities-system-monitor
|
|
||||||
Terminal=false
|
|
||||||
Type=Application
|
|
||||||
StartupNotify=true
|
|
||||||
-Categories=GTK;System;Monitor;
|
|
||||||
+Categories=GTK;System;Monitor;X-Common-Features;X-System-Server;
|
|
||||||
Keywords=MATE;system;monitor;process;list;view;current;resources;
|
|
||||||
OnlyShowIn=MATE;
|
|
||||||
X-MATE-Bugzilla-Bugzilla=MATE
|
|
||||||
diff --git a/po/zh_CN.po b/po/zh_CN.po
|
|
||||||
index a21f198..90565a9 100644
|
|
||||||
--- a/po/zh_CN.po
|
|
||||||
+++ b/po/zh_CN.po
|
|
||||||
@@ -45,7 +45,7 @@ msgstr ""
|
|
||||||
|
|
||||||
#: ../mate-system-monitor.desktop.in.in.h:1
|
|
||||||
msgid "MATE System Monitor"
|
|
||||||
-msgstr "MATE 系统监视器"
|
|
||||||
+msgstr "系统监视器"
|
|
||||||
|
|
||||||
#: ../mate-system-monitor.desktop.in.in.h:2 ../src/callbacks.cpp:203
|
|
||||||
#: ../src/interface.cpp:625 ../src/procman.cpp:713
|
|
||||||
--
|
|
||||||
2.18.1
|
|
||||||
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
From 3a6a8d78d2848b971ccc1994279474248e285b41 Mon Sep 17 00:00:00 2001
|
|
||||||
From: root <root@localhost.localdomain>
|
|
||||||
Date: Mon, 20 Jul 2020 17:13:24 +0800
|
|
||||||
Subject: [PATCH 1/2] modify mate-system-monitor.desktop.in.in
|
|
||||||
|
|
||||||
---
|
|
||||||
mate-system-monitor.desktop.in.in | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/mate-system-monitor.desktop.in.in b/mate-system-monitor.desktop.in.in
|
|
||||||
index afebdcb..f1c9986 100644
|
|
||||||
--- a/mate-system-monitor.desktop.in.in
|
|
||||||
+++ b/mate-system-monitor.desktop.in.in
|
|
||||||
@@ -15,4 +15,4 @@ X-MATE-Bugzilla-Bugzilla=MATE
|
|
||||||
X-MATE-Bugzilla-Product=system-monitor
|
|
||||||
X-MATE-Bugzilla-Component=general
|
|
||||||
X-MATE-Bugzilla-Version=@VERSION@
|
|
||||||
-
|
|
||||||
+X-KIRAN-NoDisplay=true
|
|
||||||
--
|
|
||||||
2.18.1
|
|
||||||
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
From a58f28475ce48c4da54d7e1027a887e077a6d494 Mon Sep 17 00:00:00 2001
|
|
||||||
From: root <root@localhost.localdomain>
|
|
||||||
Date: Mon, 20 Jul 2020 17:14:12 +0800
|
|
||||||
Subject: [PATCH 2/2] modify mate-system-monitor.desktop.in
|
|
||||||
|
|
||||||
---
|
|
||||||
mate-system-monitor.desktop.in | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/mate-system-monitor.desktop.in b/mate-system-monitor.desktop.in
|
|
||||||
index 483b18c..8024100 100644
|
|
||||||
--- a/mate-system-monitor.desktop.in
|
|
||||||
+++ b/mate-system-monitor.desktop.in
|
|
||||||
@@ -15,4 +15,4 @@ X-MATE-Bugzilla-Bugzilla=MATE
|
|
||||||
X-MATE-Bugzilla-Product=system-monitor
|
|
||||||
X-MATE-Bugzilla-Component=general
|
|
||||||
X-MATE-Bugzilla-Version=1.22.2
|
|
||||||
-
|
|
||||||
+X-KIRAN-NoDisplay=true
|
|
||||||
--
|
|
||||||
2.18.1
|
|
||||||
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
From 109131eb4925a9c5da7a260d0f223ffd438b203c Mon Sep 17 00:00:00 2001
|
|
||||||
From: yuanxing <yuanxing@kylinos.com.cn>
|
|
||||||
Date: Wed, 20 Oct 2021 14:26:34 +0800
|
|
||||||
Subject: [PATCH 1006/1006] fix(*):get pcpu with double to solve the cpu% don't
|
|
||||||
changed bug
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
- 将获取的pcpu的值定义为double类型解决cpu%不变化的问题
|
|
||||||
|
|
||||||
Related #45071
|
|
||||||
---
|
|
||||||
src/proctable.cpp | 9 ++++++---
|
|
||||||
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/proctable.cpp b/src/proctable.cpp
|
|
||||||
index f2eb3b5..6601cc6 100644
|
|
||||||
--- a/src/proctable.cpp
|
|
||||||
+++ b/src/proctable.cpp
|
|
||||||
@@ -804,12 +804,15 @@ update_info (ProcData *procdata, ProcInfo *info)
|
|
||||||
guint64 difference = proctime.rtime - info->cpu_time;
|
|
||||||
if (difference > 0)
|
|
||||||
info->status = GLIBTOP_PROCESS_RUNNING;
|
|
||||||
- info->pcpu = difference * 100 / procdata->cpu_total_time;
|
|
||||||
- info->pcpu = MIN(info->pcpu, 100);
|
|
||||||
+
|
|
||||||
+ double pcpu = difference * 100.0 / procdata->cpu_total_time * 1.0;
|
|
||||||
+ if(pcpu >100)
|
|
||||||
+ pcpu = 100;
|
|
||||||
|
|
||||||
if (not procdata->config.solaris_mode)
|
|
||||||
- info->pcpu *= procdata->config.num_cpus;
|
|
||||||
+ pcpu *= procdata->config.num_cpus;
|
|
||||||
|
|
||||||
+ info->pcpu = int(pcpu);
|
|
||||||
ProcInfo::cpu_times[info->pid] = info->cpu_time = proctime.rtime;
|
|
||||||
info->nice = procuid.nice;
|
|
||||||
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
From e6a061774882cff2e7d31e54828af78e605a65c3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: longcheng <longcheng@kylinos.com.cn>
|
|
||||||
Date: Fri, 14 Jan 2022 14:29:21 +0800
|
|
||||||
Subject: [PATCH] fix(control center): fix mate system monitor is not displayed
|
|
||||||
in the control panel
|
|
||||||
|
|
||||||
---
|
|
||||||
mate-system-monitor.desktop.in | 1 -
|
|
||||||
mate-system-monitor.desktop.in.in | 1 -
|
|
||||||
2 files changed, 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/mate-system-monitor.desktop.in b/mate-system-monitor.desktop.in
|
|
||||||
index 8024100..c967fbc 100644
|
|
||||||
--- a/mate-system-monitor.desktop.in
|
|
||||||
+++ b/mate-system-monitor.desktop.in
|
|
||||||
@@ -10,7 +10,6 @@ Type=Application
|
|
||||||
StartupNotify=true
|
|
||||||
Categories=GTK;System;Monitor;X-Common-Features;X-System-Server;
|
|
||||||
Keywords=MATE;system;monitor;process;list;view;current;resources;
|
|
||||||
-OnlyShowIn=MATE;
|
|
||||||
X-MATE-Bugzilla-Bugzilla=MATE
|
|
||||||
X-MATE-Bugzilla-Product=system-monitor
|
|
||||||
X-MATE-Bugzilla-Component=general
|
|
||||||
diff --git a/mate-system-monitor.desktop.in.in b/mate-system-monitor.desktop.in.in
|
|
||||||
index f1c9986..a0b4f9f 100644
|
|
||||||
--- a/mate-system-monitor.desktop.in.in
|
|
||||||
+++ b/mate-system-monitor.desktop.in.in
|
|
||||||
@@ -10,7 +10,6 @@ Type=Application
|
|
||||||
StartupNotify=true
|
|
||||||
Categories=GTK;System;Monitor;X-Common-Features;X-System-Server;
|
|
||||||
Keywords=MATE;system;monitor;process;list;view;current;resources;
|
|
||||||
-OnlyShowIn=MATE;
|
|
||||||
X-MATE-Bugzilla-Bugzilla=MATE
|
|
||||||
X-MATE-Bugzilla-Product=system-monitor
|
|
||||||
X-MATE-Bugzilla-Component=general
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
From 9e756f149a2c06dfcd37505b4fd35b6b64f77ab8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: rbuj <robert.buj@gmail.com>
|
|
||||||
Date: Sun, 15 Nov 2020 17:01:23 +0100
|
|
||||||
Subject: [PATCH] sysinfo: avoid adding a device more than once such as for
|
|
||||||
brtfs
|
|
||||||
|
|
||||||
---
|
|
||||||
src/sysinfo.cpp | 10 +++++++++-
|
|
||||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/sysinfo.cpp b/src/sysinfo.cpp
|
|
||||||
index 4ef988e..0db9cc8 100644
|
|
||||||
--- a/src/sysinfo.cpp
|
|
||||||
+++ b/src/sysinfo.cpp
|
|
||||||
@@ -271,11 +271,12 @@ namespace {
|
|
||||||
|
|
||||||
void load_disk_info()
|
|
||||||
{
|
|
||||||
+ GHashTable *devices;
|
|
||||||
glibtop_mountentry *entries;
|
|
||||||
glibtop_mountlist mountlist;
|
|
||||||
|
|
||||||
entries = glibtop_get_mountlist(&mountlist, 0);
|
|
||||||
-
|
|
||||||
+ devices = g_hash_table_new(g_str_hash, g_str_equal);
|
|
||||||
this->free_space_bytes = 0;
|
|
||||||
|
|
||||||
for (guint i = 0; i != mountlist.number; ++i) {
|
|
||||||
@@ -294,11 +295,18 @@ namespace {
|
|
||||||
if (string(entries[i].mountdir).find("/media/") == 0)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
+ /* avoid adding a device more than once such as for btrfs filesystem */
|
|
||||||
+ if (g_hash_table_contains (devices, entries[i].devname))
|
|
||||||
+ continue;
|
|
||||||
+ else
|
|
||||||
+ g_hash_table_insert (devices, entries[i].devname, entries[i].mountdir);
|
|
||||||
+
|
|
||||||
glibtop_fsusage usage;
|
|
||||||
glibtop_get_fsusage(&usage, entries[i].mountdir);
|
|
||||||
this->free_space_bytes += usage.bavail * usage.block_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ g_hash_table_destroy (devices);
|
|
||||||
g_free(entries);
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
||||||
Binary file not shown.
Binary file not shown.
@ -1,274 +0,0 @@
|
|||||||
Name: mate-system-monitor
|
|
||||||
Version: 1.22.2
|
|
||||||
Release: 7
|
|
||||||
Summary: Process and resource monitor
|
|
||||||
License: GPLv2+
|
|
||||||
URL: http://mate-desktop.org
|
|
||||||
Source0: http://pub.mate-desktop.org/releases/1.22/%{name}-%{version}.tar.xz
|
|
||||||
|
|
||||||
Patch1001: 0001-kylin-modify-desktop.patch
|
|
||||||
Patch1002: 0001-modify-mate-system-monitor.desktop.in.in.patch
|
|
||||||
Patch1003: 0002-modify-mate-system-monitor.desktop.in.patch
|
|
||||||
Patch1004: 0001-fix-resource-fix-resource-page-too-large-and-add-cpu.patch
|
|
||||||
Patch1005: 0001-fix-add-cpu-color-key-to-127-for-solve-the-quit-bug-.patch
|
|
||||||
Patch1006: 1006-fix-get-pcpu-with-double-to-solve-the-cpu-don-t-chan-109131eb.patch
|
|
||||||
Patch1007: 1007-fix-control-center-fix-mate-system-monitor-is-not-di-e6a06177.patch
|
|
||||||
Patch1008: 1008-sysinfo-avoid-adding-a-device-more-than-once-such-as-9e756f14.patch
|
|
||||||
|
|
||||||
|
|
||||||
BuildRequires: gcc-c++
|
|
||||||
BuildRequires: dbus-glib-devel
|
|
||||||
BuildRequires: desktop-file-utils
|
|
||||||
BuildRequires: gtk3-devel
|
|
||||||
BuildRequires: gtkmm30-devel
|
|
||||||
BuildRequires: libgtop2-devel
|
|
||||||
BuildRequires: librsvg2-devel
|
|
||||||
BuildRequires: libwnck3-devel
|
|
||||||
BuildRequires: libxml2-devel
|
|
||||||
BuildRequires: mate-common
|
|
||||||
BuildRequires: pkgconfig(libsystemd)
|
|
||||||
|
|
||||||
Requires: mate-desktop
|
|
||||||
|
|
||||||
%description
|
|
||||||
mate-system-monitor allows to graphically view and manipulate the running
|
|
||||||
processes on your system. It also provides an overview of available resources
|
|
||||||
such as CPU and memory.
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%autosetup -p1
|
|
||||||
|
|
||||||
%build
|
|
||||||
%configure \
|
|
||||||
--disable-static \
|
|
||||||
--disable-schemas-compile \
|
|
||||||
--enable-systemd
|
|
||||||
|
|
||||||
make %{?_smp_mflags} V=1
|
|
||||||
|
|
||||||
|
|
||||||
%install
|
|
||||||
%{make_install}
|
|
||||||
|
|
||||||
desktop-file-install --delete-original \
|
|
||||||
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
|
|
||||||
$RPM_BUILD_ROOT%{_datadir}/applications/mate-system-monitor.desktop
|
|
||||||
|
|
||||||
%find_lang %{name} --with-gnome --all-name
|
|
||||||
|
|
||||||
|
|
||||||
%files -f %{name}.lang
|
|
||||||
%doc AUTHORS NEWS COPYING README
|
|
||||||
%{_bindir}/mate-system-monitor
|
|
||||||
%{_libexecdir}/mate-system-monitor/
|
|
||||||
%{_datadir}/polkit-1/actions/org.mate.mate-system-monitor.policy
|
|
||||||
%{_datadir}/metainfo/mate-system-monitor.appdata.xml
|
|
||||||
%{_datadir}/applications/mate-system-monitor.desktop
|
|
||||||
%{_datadir}/pixmaps/mate-system-monitor/
|
|
||||||
%{_datadir}/glib-2.0/schemas/org.mate.system-monitor.*.xml
|
|
||||||
%{_mandir}/man1/*
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Thu Aug 04 2022 yuanxing <yuanxing@kylinos.com.cn> - 1.22.2-7
|
|
||||||
- KYOS-F: remove "add cpuinfo" patch to get correct cpu info
|
|
||||||
|
|
||||||
* Thu Aug 04 2022 yuanxing <yuanxing@kylinos.com.cn> - 1.22.2-6
|
|
||||||
- KYOS-F: merge two patch of fix resource page too large and add cpu color in gschema.xml when system has too many cpus
|
|
||||||
|
|
||||||
* Thu Jul 14 2022 longcheng <longcheng@kylinos.com.cn> - 1.22.2-5
|
|
||||||
- kylin modify desktop
|
|
||||||
- KYOS-F: add X-KIRAN-NoDisplay=true in mate-system-monitor.desktop.in.in and mate-system-monitor.desktop.in (#28092)
|
|
||||||
- KYOS-F: Fix resource page too large for lots of cpus (#23924)
|
|
||||||
- KYOS-F: add cpu-color key to 127 for solve the quit bug when change the color of cpu when cpu>32 (#45073)
|
|
||||||
- KYOS-F: get pcpu with double to solve the cpu% don't changed bug (#45071)
|
|
||||||
- KYOS-F: fix mate-system-monitor is not displayed in the control panel (#48482)
|
|
||||||
- KYOS-F: fix the problem of calculating available disk space multiple times for the same device (#53204)
|
|
||||||
|
|
||||||
* Mon Jun 13 2022 qiaoyujie <qiaoyujie@kylinos.cn> - 1.22.2-4
|
|
||||||
- remove %{dist} from spec file
|
|
||||||
|
|
||||||
* Sun Sep 22 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.2-1
|
|
||||||
- update to 1.22.2
|
|
||||||
|
|
||||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.1-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Apr 25 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.1-1
|
|
||||||
- update to 1.22.1
|
|
||||||
|
|
||||||
* Wed Apr 03 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.0-2
|
|
||||||
- fix unowned directory, rhbz (#1695490)
|
|
||||||
|
|
||||||
* Mon Mar 04 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.0-1
|
|
||||||
- update to 1.22.0
|
|
||||||
|
|
||||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.2-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Dec 24 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.20.2-1
|
|
||||||
- update to 1.20.2 release
|
|
||||||
|
|
||||||
* Fri Jul 20 2018 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.20.1-3
|
|
||||||
- add BuildRequires gcc-c++
|
|
||||||
|
|
||||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.1-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jun 18 2018 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.20.1-1
|
|
||||||
- update to 1.20.1 release
|
|
||||||
|
|
||||||
* Sun Feb 11 2018 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.20.0-1
|
|
||||||
- update to 1.20.0 release
|
|
||||||
- drop GSettings Schema rpm scriplet
|
|
||||||
- switch to autosetup
|
|
||||||
|
|
||||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jan 01 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.19.1-1
|
|
||||||
- update to 1.19.1
|
|
||||||
|
|
||||||
* Sat Nov 04 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.19.0-2
|
|
||||||
- add https://github.com/mate-desktop/mate-system-monitor/commit/cd5b3a0
|
|
||||||
|
|
||||||
* Wed Oct 11 2017 Wolfgang Ulbrich <fedora@raveit.de> - 1.19.0-1
|
|
||||||
- update to 1.19.0
|
|
||||||
|
|
||||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jun 13 2017 Kalev Lember <klember@redhat.com> - 1.18.0-2
|
|
||||||
- Rebuilt for libgtop2 soname bump
|
|
||||||
|
|
||||||
* Tue Mar 14 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.18.0-1
|
|
||||||
- update to 1.18.0 release
|
|
||||||
|
|
||||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Nov 17 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.17.0-1
|
|
||||||
- update to 1.17.0 release
|
|
||||||
|
|
||||||
* Wed Sep 21 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.16.0-1
|
|
||||||
- update to 1.16.0 release
|
|
||||||
|
|
||||||
* Thu Jun 09 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.15.0-1
|
|
||||||
- update to 1.15.0 release
|
|
||||||
|
|
||||||
* Tue Apr 05 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.14.0-1
|
|
||||||
- update to 1.14.0 release
|
|
||||||
- build with systemd support
|
|
||||||
|
|
||||||
* Wed Mar 16 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.13.2-1
|
|
||||||
- update to 1.13.2 release
|
|
||||||
|
|
||||||
* Mon Feb 22 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.13.1-1
|
|
||||||
- update to 1.13.1 release
|
|
||||||
|
|
||||||
* Sun Feb 07 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.13.0-1
|
|
||||||
- update to 1.13.0 release
|
|
||||||
|
|
||||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.1-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Dec 04 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> 1.12.1-1
|
|
||||||
- update to 1.12.1 release
|
|
||||||
- use deprecated patches
|
|
||||||
|
|
||||||
* Fri Nov 06 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.12.0-1
|
|
||||||
- update to 1.12.0 release
|
|
||||||
- build against gtk3
|
|
||||||
|
|
||||||
* Wed Oct 21 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.11.0-1
|
|
||||||
- update to 1.11.0 release
|
|
||||||
|
|
||||||
* Tue Jul 14 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.1.1
|
|
||||||
- update to 1.10.1 release
|
|
||||||
|
|
||||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10.0-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue May 05 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.0-1
|
|
||||||
- update to 1.10.0 release
|
|
||||||
|
|
||||||
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.9.90-2
|
|
||||||
- Rebuilt for GCC 5 C++11 ABI change
|
|
||||||
|
|
||||||
* Sat Apr 04 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.9.90-1
|
|
||||||
- update to 1.9.90 release
|
|
||||||
|
|
||||||
* Thu Jan 22 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.9.2-1
|
|
||||||
- update to 1.9.2 release
|
|
||||||
|
|
||||||
* Sun Nov 23 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.9.1-1
|
|
||||||
- update to 1.9.1 release
|
|
||||||
|
|
||||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.0-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jul 15 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.9.0-1
|
|
||||||
- update to 1.9.0 release
|
|
||||||
- drop runtime require mate-desktop, no need of it
|
|
||||||
|
|
||||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.0-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Apr 30 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.0-2
|
|
||||||
- rebuild for libgtop2 soname bump
|
|
||||||
|
|
||||||
* Wed Mar 05 2014 Dan Mashal <dan.mashal@fedoraproject.org> - 1.8.0-1
|
|
||||||
- Update to 1.8.0
|
|
||||||
|
|
||||||
* Wed Feb 19 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.7.90-1
|
|
||||||
- update to 1.7.90
|
|
||||||
|
|
||||||
* Sun Feb 09 2014 Dan Mashal <dan.mashal@fedoraproject.org> - 1.7.1-1
|
|
||||||
- Update to 1.7.1
|
|
||||||
|
|
||||||
* Thu Jan 16 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.7.0-1
|
|
||||||
- update to 1.7.0 release
|
|
||||||
- add --with-gnome --all-name for find language
|
|
||||||
- re-worked BR's
|
|
||||||
- re-worked configure flags
|
|
||||||
- re-worked file section
|
|
||||||
- remove usage of hardlink, no need anymore
|
|
||||||
|
|
||||||
* Fri Aug 02 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.6.1-1
|
|
||||||
- Bump to 1.6.1
|
|
||||||
- Drop unused patches
|
|
||||||
- Add disable-schemas-compile configure flag
|
|
||||||
- Update man page in directive in files section
|
|
||||||
|
|
||||||
* Fri Jul 26 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.0-2
|
|
||||||
- add upstream patch to fix rhbz (#888696)
|
|
||||||
- add upstream patch to add manpages
|
|
||||||
- clean up BRs
|
|
||||||
- use hardlink to save space by linking identical images in translated docs
|
|
||||||
- remove --with-gnome find language flag
|
|
||||||
- remove needless gsettings convert file
|
|
||||||
|
|
||||||
* Wed Apr 03 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.6.0-1
|
|
||||||
- Update to latest 1.6.0 stable release.
|
|
||||||
|
|
||||||
* Sun Mar 03 2013 Dan Mashal <dan.mashal@fedoraproject.org> 1.5.1-1
|
|
||||||
- Latest upstream release
|
|
||||||
|
|
||||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.0-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Nov 26 2012 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.0-2
|
|
||||||
- drop deprecated mate-vfs BR
|
|
||||||
|
|
||||||
* Thu Nov 08 2012 Leigh Scott <leigh123linux@googlemail.com> - 1.5.0-1
|
|
||||||
- update to 1.5.0 release
|
|
||||||
|
|
||||||
* Fri Oct 19 2012 Leigh Scott <leigh123linux@googlemail.com> - 1.4.0-2
|
|
||||||
- add build requires libxml2-devel
|
|
||||||
|
|
||||||
* Thu Oct 18 2012 Leigh Scott <leigh123linux@googlemail.com> - 1.4.0-1
|
|
||||||
- Initial build
|
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user