Initial commit of new interface

Changes touching the build:
- Bumped version to 0.5.0.
- Removed dependency on Xfce libs (it only depends on GTK+-2.0.)
- Updated Makefile with new source files.
- Build ChangeLog through a script (remove it from source tree.)

More generally speaking, the interface is build on top of a GtkBuilder
UI definition, with a personal GtkTreeView and a Settings GObject to
update the information shown on the interface on changes. All the code
is being written with GObjects which will make it a lot easier to
separate GUI code and system code.
This commit is contained in:
Mike Massonnet
2010-04-28 17:40:54 +02:00
parent 32068500af
commit cc6dbd8373
14 changed files with 1280 additions and 290 deletions

445
src/process-window.c Normal file
View File

@@ -0,0 +1,445 @@
/*
* Copyright (c) 2010 Mike Massonnet, <mmassonnet@xfce.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <glib-object.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include "settings.h"
#include "process-window.h"
#include "process-window_ui.h"
#include "process-tree-view.h"
enum
{
PROP_CPU = 1,
PROP_MEMORY,
PROP_NUM_PROCESSES,
};
typedef struct _XtmProcessWindowClass XtmProcessWindowClass;
typedef struct _XtmProcessWindowPriv XtmProcessWindowPriv;
struct _XtmProcessWindowClass
{
GtkWidgetClass parent_class;
};
struct _XtmProcessWindow
{
GtkWidget parent;
/*<private>*/
XtmProcessWindowPriv * priv;
};
struct _XtmProcessWindowPriv
{
GtkBuilder * builder;
GtkWidget * window;
GtkWidget * treeview;
GtkWidget * statusbar;
guint statusbar_context_id;
gushort cpu;
guint64 memory;
guint num_processes;
XtmSettings * settings;
};
#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XTM_TYPE_PROCESS_WINDOW, XtmProcessWindowPriv))
G_DEFINE_TYPE (XtmProcessWindow, xtm_process_window, GTK_TYPE_WIDGET)
static void xtm_process_window_finalize (GObject *object);
static void xtm_process_window_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec);
static void xtm_process_window_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec);
static void xtm_process_window_show (GtkWidget *widget);
static void xtm_process_window_hide (GtkWidget *widget);
static void emit_destroy_signal (XtmProcessWindow *window);
static void show_menu_execute_task (XtmProcessWindow *window);
static void show_menu_information (XtmProcessWindow *window);
static void show_about_dialog (XtmProcessWindow *window);
static void update_status_bar (XtmProcessWindow *window);
static void
xtm_process_window_class_init (XtmProcessWindowClass *klass)
{
GObjectClass *class;
GtkWidgetClass *widget_class;
g_type_class_add_private (klass, sizeof (XtmProcessWindowPriv));
xtm_process_window_parent_class = g_type_class_peek_parent (klass);
class = G_OBJECT_CLASS (klass);
class->finalize = xtm_process_window_finalize;
widget_class = GTK_WIDGET_CLASS (klass);
widget_class->show = xtm_process_window_show;
widget_class->hide = xtm_process_window_hide;
class->get_property = xtm_process_window_get_property;
class->set_property = xtm_process_window_set_property;
g_object_class_install_property (class, PROP_CPU,
g_param_spec_uint ("cpu", "CPU", "CPU usage", 0, 100, 0, G_PARAM_CONSTRUCT|G_PARAM_WRITABLE));
g_object_class_install_property (class, PROP_MEMORY,
g_param_spec_uint64 ("memory", "Memory", "Memory usage", 0, G_MAXUINT64, 0, G_PARAM_CONSTRUCT|G_PARAM_WRITABLE));
g_object_class_install_property (class, PROP_NUM_PROCESSES,
g_param_spec_uint ("num-processes", "NumProcesses", "Number of processes", 0, G_MAXUINT, 0, G_PARAM_CONSTRUCT|G_PARAM_WRITABLE));
}
static void
xtm_process_window_init (XtmProcessWindow *window)
{
GtkWidget *button;
gint width, height;
window->priv = GET_PRIV (window);
window->priv->settings = xtm_settings_get_default ();
window->priv->builder = gtk_builder_new ();
gtk_builder_add_from_string (window->priv->builder, process_window_ui, process_window_ui_length, NULL);
window->priv->window = GTK_WIDGET (gtk_builder_get_object (window->priv->builder, "process-window"));
g_object_get (window->priv->settings, "window-width", &width, "window-height", &height, NULL);
if (width >= 1 && height >= 1)
gtk_window_resize (GTK_WINDOW (window->priv->window), width, height);
g_signal_connect_swapped (window->priv->window, "destroy", G_CALLBACK (emit_destroy_signal), window);
window->priv->treeview = xtm_process_tree_view_new ();
gtk_widget_show (window->priv->treeview);
gtk_container_add (GTK_CONTAINER (gtk_builder_get_object (window->priv->builder, "scrolledwindow")), window->priv->treeview);
window->priv->statusbar = GTK_WIDGET (gtk_builder_get_object (window->priv->builder, "process-statusbar"));
window->priv->statusbar_context_id = gtk_statusbar_get_context_id (GTK_STATUSBAR (window->priv->statusbar), "System information");
button = GTK_WIDGET (gtk_builder_get_object (window->priv->builder, "toolbutton-execute"));
g_signal_connect_swapped (button, "clicked", G_CALLBACK (show_menu_execute_task), window);
button = GTK_WIDGET (gtk_builder_get_object (window->priv->builder, "toolbutton-information"));
g_signal_connect_swapped (button, "clicked", G_CALLBACK (show_menu_information), window);
button = GTK_WIDGET (gtk_builder_get_object (window->priv->builder, "toolbutton-about"));
g_signal_connect_swapped (button, "clicked", G_CALLBACK (show_about_dialog), window);
button = GTK_WIDGET (gtk_builder_get_object (window->priv->builder, "toolbutton-quit"));
g_signal_connect_swapped (button, "clicked", G_CALLBACK (emit_destroy_signal), window);
g_object_unref (window->priv->builder);
window->priv->builder = NULL;
}
static void
xtm_process_window_finalize (GObject *object)
{
XtmProcessWindowPriv *priv = XTM_PROCESS_WINDOW (object)->priv;
if (GTK_IS_WINDOW (priv->window))
{
gint width, height;
guint sort_column_id;
GtkSortType sort_type;
gtk_window_get_size (GTK_WINDOW (priv->window), &width, &height);
gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview))),
&sort_column_id, &sort_type);
g_object_set (priv->settings, "window-width", width, "window-height", height,
"sort-column-id", sort_column_id, "sort-type", sort_type, NULL);
}
if (XTM_IS_SETTINGS (priv->settings))
{
g_object_unref (priv->settings);
}
}
static void
xtm_process_window_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
{
XtmProcessWindowPriv *priv = XTM_PROCESS_WINDOW (object)->priv;
switch (property_id)
{
case PROP_CPU:
g_value_set_uint (value, priv->cpu);
break;
case PROP_MEMORY:
g_value_set_uint64 (value, priv->memory);
break;
case PROP_NUM_PROCESSES:
g_value_set_uint (value, priv->num_processes);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
static void
xtm_process_window_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
{
XtmProcessWindowPriv *priv = XTM_PROCESS_WINDOW (object)->priv;
switch (property_id)
{
case PROP_CPU:
priv->cpu = g_value_get_uint (value);
// TODO update_cpu_monitor ();
update_status_bar (XTM_PROCESS_WINDOW (object));
break;
case PROP_MEMORY:
priv->memory = g_value_get_uint64 (value);
// TODO update_memory_monitor ();
update_status_bar (XTM_PROCESS_WINDOW (object));
break;
case PROP_NUM_PROCESSES:
priv->num_processes = g_value_get_uint (value);
update_status_bar (XTM_PROCESS_WINDOW (object));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
/**
* Helper functions
*/
static void
emit_destroy_signal (XtmProcessWindow *window)
{
g_signal_emit_by_name (window, "destroy", G_TYPE_NONE);
}
static void
execute_command (const gchar *command)
{
GError *error = NULL;
gdk_spawn_command_line_on_screen (gdk_screen_get_default (), command, &error);
if (error != NULL)
{
GtkWidget *dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
_("Execution error"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message);
gtk_window_set_title (GTK_WINDOW (dialog), _("Task Manager"));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
g_error_free (error);
}
}
static void
menu_execute_append_item (GtkMenu *menu, gchar *title, gchar *command, gchar *icon_name)
{
GtkWidget *mi;
GtkWidget *image;
image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
mi = gtk_image_menu_item_new_with_label (title);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), image);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
g_signal_connect_swapped (mi, "activate", G_CALLBACK (execute_command), command);
}
static void
show_menu_execute_task (XtmProcessWindow *window)
{
// TODO check if xfrun4, xfce4-appfinder, etc are installed and pull them in the menu
static GtkWidget *menu = NULL;
GtkWidget *mi;
if (menu == NULL)
{
menu = gtk_menu_new ();
menu_execute_append_item (GTK_MENU (menu), _("Run Program..."), "xfrun4", "system-run");
menu_execute_append_item (GTK_MENU (menu), _("Application Finder"), "xfce4-appfinder", "xfce4-appfinder");
menu_execute_append_item (GTK_MENU (menu), _("Terminal emulator"), "exo-open --launch TerminalEmulator", "terminal");
menu_execute_append_item (GTK_MENU (menu), _("XTerm"), "xterm -fg grey -bg black", "terminal");
gtk_widget_show_all (menu);
}
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time ());
}
static void
information_toggled (GtkCheckMenuItem *mi, XtmSettings *settings)
{
gchar *setting_name;
gboolean active;
active = gtk_check_menu_item_get_active (mi);
setting_name = g_object_get_data (G_OBJECT (mi), "setting-name");
g_object_set (settings, setting_name, active, NULL);
}
static void
menu_information_append_item (GtkMenu *menu, gchar *title, gchar *setting_name, XtmSettings *settings)
{
GtkWidget *mi;
gboolean active = FALSE;
g_object_get (settings, setting_name, &active, NULL);
mi = gtk_check_menu_item_new_with_label (title);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mi), active);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
g_object_set_data (G_OBJECT (mi), "setting-name", setting_name);
g_signal_connect (mi, "toggled", G_CALLBACK (information_toggled), settings);
}
static void
show_menu_information (XtmProcessWindow *window)
{
static GtkWidget *menu = NULL;
GtkWidget *mi;
if (menu != NULL)
{
gtk_widget_destroy (menu);
}
menu = gtk_menu_new ();
menu_information_append_item (GTK_MENU (menu), _("Show system processes"), "show-system-processes", window->priv->settings);
mi = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
menu_information_append_item (GTK_MENU (menu), _("PID"), "column-pid", window->priv->settings);
menu_information_append_item (GTK_MENU (menu), _("PPID"), "column-ppid", window->priv->settings);
menu_information_append_item (GTK_MENU (menu), _("State"), "column-state", window->priv->settings);
menu_information_append_item (GTK_MENU (menu), _("Virtual Bytes"), "column-vsz", window->priv->settings);
menu_information_append_item (GTK_MENU (menu), _("Private Bytes"), "column-rss", window->priv->settings);
menu_information_append_item (GTK_MENU (menu), _("UID"), "column-uid", window->priv->settings);
menu_information_append_item (GTK_MENU (menu), _("CPU"), "column-cpu", window->priv->settings);
menu_information_append_item (GTK_MENU (menu), _("Priority"), "column-priority", window->priv->settings);
gtk_widget_show_all (menu);
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time ());
}
#if !GTK_CHECK_VERSION(2,18,0)
static void
url_hook_about_dialog (GtkAboutDialog *dialog, const gchar *uri, gpointer user_data)
{
gchar *command = g_strdup_printf ("exo-open %s", uri);
if (!g_spawn_command_line_async (command, NULL))
{
g_free (command);
command = g_strdup_printf ("firefox %s", uri);
g_spawn_command_line_async (command, NULL);
}
g_free (command);
}
#endif
static void
show_about_dialog (XtmProcessWindow *window)
{
const gchar *authors[] = {
"(c) 2008-2010 Mike Massonnet",
"(c) 2005-2008 Johannes Zellner",
NULL };
const gchar *license =
"This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation; either version 2 of the License, or\n"
"(at your option) any later version.\n";
#if !GTK_CHECK_VERSION(2,18,0)
gtk_about_dialog_set_url_hook (url_hook_about_dialog, NULL, NULL);
#endif
gtk_show_about_dialog (GTK_WINDOW (window->priv->window),
"program-name", _("Task Manager"),
"version", PACKAGE_VERSION,
"copyright", "Copyright \302\251 2005-2010 The Xfce development team",
"logo-icon-name", "utilities-system-monitor",
"icon-name", GTK_STOCK_ABOUT,
"comments", _("Easy to use task manager"),
"license", license,
"authors", authors,
"translator-credits", _("translator-credits"),
"website", "http://goodies.xfce.org/projects/applications/xfce4-taskmanager",
"website-label", "goodies.xfce.org",
NULL);
}
static void
update_status_bar (XtmProcessWindow *window)
{
gchar *text = NULL;
text = g_strdup_printf (_("Processes: %d \t CPU: %d%% \t Memory: %d%%"),
window->priv->num_processes, window->priv->cpu, window->priv->memory);
gtk_statusbar_pop (GTK_STATUSBAR (window->priv->statusbar), window->priv->statusbar_context_id);
gtk_statusbar_push (GTK_STATUSBAR (window->priv->statusbar), window->priv->statusbar_context_id, text);
}
/**
* Class functions
*/
GtkWidget *
xtm_process_window_new ()
{
return g_object_new (XTM_TYPE_PROCESS_WINDOW, NULL);
}
static void
xtm_process_window_show (GtkWidget *widget)
{
g_return_if_fail (G_LIKELY (GTK_IS_WIDGET (widget)));
g_return_if_fail (G_LIKELY (GTK_IS_WIDGET (XTM_PROCESS_WINDOW (widget)->priv->window)));
gtk_widget_show (XTM_PROCESS_WINDOW (widget)->priv->window);
}
static void
xtm_process_window_hide (GtkWidget *widget)
{
g_return_if_fail (G_LIKELY (GTK_IS_WIDGET (widget)));
g_return_if_fail (G_LIKELY (GTK_IS_WIDGET (XTM_PROCESS_WINDOW (widget)->priv->window)));
gtk_widget_hide (XTM_PROCESS_WINDOW (widget)->priv->window);
}
void
xtm_process_window_set_model (XtmProcessWindow *window, GtkTreeModel *model)
{
g_return_if_fail (G_LIKELY (XTM_IS_PROCESS_WINDOW (window)));
g_return_if_fail (G_LIKELY (GTK_IS_TREE_VIEW (window->priv->treeview)));
gtk_tree_view_set_model (GTK_TREE_VIEW (window->priv->treeview), model);
}
GtkTreeModel *
xtm_process_window_get_model (XtmProcessWindow *window)
{
g_return_val_if_fail (G_LIKELY (XTM_IS_PROCESS_WINDOW (window)), NULL);
g_return_val_if_fail (G_LIKELY (GTK_IS_TREE_VIEW (window->priv->treeview)), NULL);
return gtk_tree_view_get_model (GTK_TREE_VIEW (window->priv->treeview));
}
void
xtm_process_window_set_system_info (XtmProcessWindow *window, guint num_processes, gushort cpu, guint64 memory)
{
g_return_if_fail (G_LIKELY (XTM_IS_PROCESS_WINDOW (window)));
g_return_if_fail (G_LIKELY (GTK_IS_STATUSBAR (window->priv->statusbar)));
g_object_set (window, "num-processes", num_processes, "cpu", cpu, "memory", memory, NULL);
}