FOSS/xfce4-taskmanager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'hjudt/save-handle-position'

Browse Source
This commit is contained in:
Landry Breuil
2014-12-19 22:24:41 +01:00
parent 799cb8f17a a91e05fb73
commit d0cf233ea6
4 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/process-window-gtk3.ui
View File

@@ -111,7 +111,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkPaned" id="paned1"> <object class="GtkPaned" id="mainview-vpaned">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>

24
src/process-window.c
View File

@@ -50,6 +50,7 @@ struct _XtmProcessWindow
GtkWidget * filter_entry; GtkWidget * filter_entry;
GtkWidget * cpu_monitor; GtkWidget * cpu_monitor;
GtkWidget * mem_monitor; GtkWidget * mem_monitor;
GtkWidget * vpaned;
GtkWidget * treeview; GtkWidget * treeview;
GtkWidget * statusbar; GtkWidget * statusbar;
GtkWidget * exec_button; GtkWidget * exec_button;
@@ -147,8 +148,16 @@ xtm_process_window_init (XtmProcessWindow *window)
{ {
GtkWidget *toolitem; GtkWidget *toolitem;
guint refresh_rate; guint refresh_rate;
gint handle_position;
g_object_get (window->settings, "refresh-rate", &refresh_rate, NULL); g_object_get (window->settings,
"refresh-rate", &refresh_rate,
"handle-position", &handle_position,
NULL);
window->vpaned = GTK_WIDGET (gtk_builder_get_object (window->builder, "mainview-vpaned"));
if (handle_position > -1)
gtk_paned_set_position (GTK_PANED (window->vpaned), handle_position);
toolitem = GTK_WIDGET (gtk_builder_get_object (window->builder, "graph-cpu")); toolitem = GTK_WIDGET (gtk_builder_get_object (window->builder, "graph-cpu"));
window->cpu_monitor = xtm_process_monitor_new (); window->cpu_monitor = xtm_process_monitor_new ();
@@ -217,15 +226,22 @@ xtm_process_window_finalize (GObject *object)
if (GTK_IS_WINDOW (window->window)) if (GTK_IS_WINDOW (window->window))
{ {
gint width, height; gint width, height, handle_position;
guint sort_column_id; guint sort_column_id;
GtkSortType sort_type; GtkSortType sort_type;
gtk_window_get_size (GTK_WINDOW (window->window), &width, &height); gtk_window_get_size (GTK_WINDOW (window->window), &width, &height);
xtm_process_tree_view_get_sort_column_id (XTM_PROCESS_TREE_VIEW (window->treeview), (gint*)&sort_column_id, &sort_type); xtm_process_tree_view_get_sort_column_id (XTM_PROCESS_TREE_VIEW (window->treeview), (gint*)&sort_column_id, &sort_type);
g_object_set (window->settings, "window-width", width, "window-height", height, handle_position = gtk_paned_get_position (GTK_PANED (window->vpaned));
"sort-column-id", sort_column_id, "sort-type", sort_type, NULL);
g_object_set (window->settings,
"window-width", width,
"window-height", height,
"sort-column-id", sort_column_id,
"sort-type", sort_type,
"handle-position", handle_position,
NULL);
} }
if (GTK_IS_TREE_VIEW (window->treeview)) if (GTK_IS_TREE_VIEW (window->treeview))

2
src/process-window.ui
View File

@@ -113,7 +113,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkVPaned" id="vpaned1"> <object class="GtkVPaned" id="mainview-vpaned">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="position">100</property> <property name="position">100</property>

3
src/settings.c
View File

@@ -55,6 +55,7 @@ enum
PROP_SORT_TYPE, PROP_SORT_TYPE,
PROP_WINDOW_WIDTH, PROP_WINDOW_WIDTH,
PROP_WINDOW_HEIGHT, PROP_WINDOW_HEIGHT,
PROP_HANDLE_POSITION,
PROP_PROCESS_TREE, PROP_PROCESS_TREE,
N_PROPS, N_PROPS,
}; };
@@ -133,6 +134,8 @@ xtm_settings_class_init (XtmSettingsClass *klass)
g_param_spec_int ("window-width", "WindowWidth", "Window width", -1, G_MAXINT, -1, G_PARAM_READWRITE)); g_param_spec_int ("window-width", "WindowWidth", "Window width", -1, G_MAXINT, -1, G_PARAM_READWRITE));
g_object_class_install_property (class, PROP_WINDOW_HEIGHT, g_object_class_install_property (class, PROP_WINDOW_HEIGHT,
g_param_spec_int ("window-height", "WindowHeight", "Window height", -1, G_MAXINT, -1, G_PARAM_READWRITE)); g_param_spec_int ("window-height", "WindowHeight", "Window height", -1, G_MAXINT, -1, G_PARAM_READWRITE));
g_object_class_install_property (class, PROP_HANDLE_POSITION,
g_param_spec_int ("handle-position", "HandlePosition", "Handle position", -1, G_MAXINT, -1, G_PARAM_READWRITE));
g_object_class_install_property (class, PROP_PROCESS_TREE, g_object_class_install_property (class, PROP_PROCESS_TREE,
g_param_spec_boolean ("process-tree", "ProcessTreeView", "Process tree", FALSE, G_PARAM_READWRITE)); g_param_spec_boolean ("process-tree", "ProcessTreeView", "Process tree", FALSE, G_PARAM_READWRITE));
} }