From: Tuomo Tanskanen Date: Wed, 16 Dec 2009 15:44:25 +0000 (+0200) Subject: rename some code, fix desktop file issue X-Git-Tag: v0.0.3~2 X-Git-Url: https://vcs.maemo.org/git/?p=cpumem-applet;a=commitdiff_plain;h=b37a158a7342ca0cdfe31a8ef38b61b6c81ed4bd rename some code, fix desktop file issue --- diff --git a/TODO b/TODO index 13d341f..0dafe91 100644 --- a/TODO +++ b/TODO @@ -1,11 +1,3 @@ TODO: * Apply better graphics with fine-grained visualization of cpu and mem - - - ---- OLD TODO FROM load-applet 0.46-1 --- - * Make nicer application manager icon - * Add process listing and killing again (use hildon button to launch it! not GTK buton) - * Prolly need to launch the process listing in own thread or process - else it blocks the main one and comes stacked wrong - * Add watermarking to the ximagewsrc, also fast scaling by factor of 2 diff --git a/data/Makefile.am b/data/Makefile.am index 59866bc..2f26917 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,6 +1,5 @@ install-data-local: - $(INSTALL_DATA) -D $(srcdir)/status_area_load_applet.desktop $(DESTDIR)/usr/share/applications/hildon-status-menu/status_area_load_applet.desktop - $(INSTALL_DATA) -D $(srcdir)/la_process.png $(DESTDIR)/usr/share/pixmaps/la_process.png + $(INSTALL_DATA) -D $(srcdir)/status_area_cpumem_applet.desktop $(DESTDIR)/usr/share/applications/hildon-status-menu/status_area_cpumem_applet.desktop diff --git a/data/la_process.png b/data/la_process.png deleted file mode 100644 index 9850c65..0000000 Binary files a/data/la_process.png and /dev/null differ diff --git a/data/status_area_cpumem_applet.desktop b/data/status_area_cpumem_applet.desktop new file mode 100644 index 0000000..3bbc114 --- /dev/null +++ b/data/status_area_cpumem_applet.desktop @@ -0,0 +1,4 @@ +[Desktop Entry] +Name=Cpu/Memory Applet for Maemo5 - status area plugin +Type=default +X-Path=status_area_cpumem_applet.so diff --git a/data/status_area_load_applet.desktop b/data/status_area_load_applet.desktop deleted file mode 100644 index 0db08d9..0000000 --- a/data/status_area_load_applet.desktop +++ /dev/null @@ -1,4 +0,0 @@ -[Desktop Entry] -Name=Cpu and Memory Applet for Maemo5 - status area plugin -Type=default -X-Path=status_area_cpumem_applet.so diff --git a/src/cpumem_status_area_item.c b/src/cpumem_status_area_item.c index 3925fd4..d9e3df3 100644 --- a/src/cpumem_status_area_item.c +++ b/src/cpumem_status_area_item.c @@ -1,5 +1,5 @@ /* - * Load applet - Maemo5 edition - status area plugin + * Cpumem-applet - status area plugin */ @@ -10,7 +10,7 @@ #include #include -#include "la_status_area_item.h" +#include "cpumem_status_area_item.h" #define LA_ICON_WIDTH 16 #define LA_ICON_HEIGHT 16 @@ -20,9 +20,9 @@ -#define LOAD_APPLET_STATUS_AREA_ITEM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE (obj, LOAD_APPLET_TYPE_STATUS_AREA_ITEM, LoadAppletStatusAreaItemPrivate)) +#define CPUMEM_APPLET_STATUS_AREA_ITEM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE (obj, CPUMEM_APPLET_TYPE_STATUS_AREA_ITEM, CpumemAppletStatusAreaItemPrivate)) -struct _LoadAppletStatusAreaItemPrivate { +struct _CpumemAppletStatusAreaItemPrivate { guint timeout_id; gint lastU, lastN, lastIO, lastI; guchar last_mem_level; @@ -35,14 +35,14 @@ struct _LoadAppletStatusAreaItemPrivate { gboolean red; }; -HD_DEFINE_PLUGIN_MODULE (LoadAppletStatusAreaItem, load_applet_status_area_item, HD_TYPE_STATUS_PLUGIN_ITEM); +HD_DEFINE_PLUGIN_MODULE (CpumemAppletStatusAreaItem, cpumem_applet_status_area_item, HD_TYPE_STATUS_PLUGIN_ITEM); /* * Read current MEM usage and return indicator between 5 and 1 - how many bars are "full" */ static guchar -la_check_mem (LoadAppletStatusAreaItemPrivate *priv) +la_check_mem (CpumemAppletStatusAreaItemPrivate *priv) { #define MEMFILE "/proc/meminfo" #define MAX_READ_CHARS 128 @@ -93,7 +93,7 @@ la_check_mem (LoadAppletStatusAreaItemPrivate *priv) * Read current CPU usage and return indicator between 5 and 1 - how many bars are "full" */ static guchar -la_check_cpu (LoadAppletStatusAreaItemPrivate *priv) +la_check_cpu (CpumemAppletStatusAreaItemPrivate *priv) { #define CPUFILE "/proc/stat" gint curU, curN, curIO, curI; @@ -151,7 +151,7 @@ la_check_cpu (LoadAppletStatusAreaItemPrivate *priv) * Compose and blit the current status of memory bars */ static void -la_blit_memory_bars (const guchar level, LoadAppletStatusAreaItemPrivate *priv) +la_blit_memory_bars (const guchar level, CpumemAppletStatusAreaItemPrivate *priv) { guint x, y; @@ -179,7 +179,7 @@ la_blit_memory_bars (const guchar level, LoadAppletStatusAreaItemPrivate *priv) * Compose and blit current status of CPU bars */ static void -la_blit_cpu_bars (const guchar level, LoadAppletStatusAreaItemPrivate *priv) +la_blit_cpu_bars (const guchar level, CpumemAppletStatusAreaItemPrivate *priv) { guint x, y; @@ -217,8 +217,8 @@ la_check_load (gpointer data) { guchar current_cpu_level; guchar current_mem_level; - LoadAppletStatusAreaItem *item = (LoadAppletStatusAreaItem*)data; - LoadAppletStatusAreaItemPrivate *priv = (LoadAppletStatusAreaItemPrivate*)item->priv; + CpumemAppletStatusAreaItem *item = (CpumemAppletStatusAreaItem*)data; + CpumemAppletStatusAreaItemPrivate *priv = (CpumemAppletStatusAreaItemPrivate*)item->priv; current_cpu_level = la_check_cpu(priv); current_mem_level = la_check_mem(priv); @@ -246,9 +246,9 @@ la_check_load (gpointer data) * Get callback when display state changes */ static void -load_applet_status_area_item_display_cb(osso_display_state_t state, gpointer user_data) +cpumem_applet_status_area_item_display_cb(osso_display_state_t state, gpointer user_data) { - LoadAppletStatusAreaItem *item = LOAD_APPLET_STATUS_AREA_ITEM(user_data); + CpumemAppletStatusAreaItem *item = CPUMEM_APPLET_STATUS_AREA_ITEM(user_data); g_return_if_fail (item != NULL && item->priv != NULL); @@ -257,15 +257,12 @@ load_applet_status_area_item_display_cb(osso_display_state_t state, gpointer use //Restart the updates, do one right away if (item->priv->timeout_id == -1) { - //g_debug("LOADAPPLET - restarting periodic updates"); item->priv->timeout_id = gtk_timeout_add(1000, la_check_load, item); } } else { //Suspend the updates - screen is off - //g_debug("LOADAPPLET - Turning updates off"); if (g_source_remove(item->priv->timeout_id) != TRUE) { - //g_error("LOADAPPLET - couldn't stop the updates!the timer still running ..."); } else { item->priv->timeout_id = -1; } @@ -280,27 +277,27 @@ load_applet_status_area_item_display_cb(osso_display_state_t state, gpointer use *****************************************************************************/ static void -load_applet_status_area_item_set_area_icon (LoadAppletStatusAreaItem *item) +cpumem_applet_status_area_item_set_area_icon (CpumemAppletStatusAreaItem *item) { - item->priv = LOAD_APPLET_STATUS_AREA_ITEM_GET_PRIVATE (item); + item->priv = CPUMEM_APPLET_STATUS_AREA_ITEM_GET_PRIVATE (item); hd_status_plugin_item_set_status_area_icon (HD_STATUS_PLUGIN_ITEM(item), item->priv->pixbuf); } static void -load_applet_status_area_item_class_finalize (LoadAppletStatusAreaItemClass *klass) +cpumem_applet_status_area_item_class_finalize (CpumemAppletStatusAreaItemClass *klass) { } static void -load_applet_status_area_item_finalize (GObject *object) +cpumem_applet_status_area_item_finalize (GObject *object) { - LoadAppletStatusAreaItemPrivate *priv = LOAD_APPLET_STATUS_AREA_ITEM(object)->priv; + CpumemAppletStatusAreaItemPrivate *priv = CPUMEM_APPLET_STATUS_AREA_ITEM(object)->priv; // Release and clean our stuff - G_OBJECT_CLASS (load_applet_status_area_item_parent_class)->finalize (object); + G_OBJECT_CLASS (cpumem_applet_status_area_item_parent_class)->finalize (object); if (priv->osso) { osso_deinitialize(priv->osso); @@ -312,20 +309,20 @@ load_applet_status_area_item_finalize (GObject *object) static void -load_applet_status_area_item_class_init (LoadAppletStatusAreaItemClass *klass) +cpumem_applet_status_area_item_class_init (CpumemAppletStatusAreaItemClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->finalize = load_applet_status_area_item_finalize; + object_class->finalize = cpumem_applet_status_area_item_finalize; - g_type_class_add_private (klass, sizeof (LoadAppletStatusAreaItemPrivate)); + g_type_class_add_private (klass, sizeof (CpumemAppletStatusAreaItemPrivate)); } static void -load_applet_status_area_item_init (LoadAppletStatusAreaItem *item) +cpumem_applet_status_area_item_init (CpumemAppletStatusAreaItem *item) { - item->priv = LOAD_APPLET_STATUS_AREA_ITEM_GET_PRIVATE (item); + item->priv = CPUMEM_APPLET_STATUS_AREA_ITEM_GET_PRIVATE (item); item->priv->last_mem_level = -1; item->priv->last_cpu_level = -1; @@ -339,10 +336,10 @@ load_applet_status_area_item_init (LoadAppletStatusAreaItem *item) gdk_pixbuf_fill(item->priv->pixbuf_red, 0xff0000ff); item->priv->pixbuf_off = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, LA_BOX_WIDTH, LA_BOX_HEIGHT); gdk_pixbuf_fill(item->priv->pixbuf_off, 0x777777ff); - load_applet_status_area_item_set_area_icon(item); + cpumem_applet_status_area_item_set_area_icon(item); item->priv->osso = osso_initialize ("cpumem_applet_status_area_item", "Maemo5", TRUE, NULL); item->priv->timeout_id = gtk_timeout_add(1000, la_check_load, item); - osso_hw_set_display_event_cb (item->priv->osso, load_applet_status_area_item_display_cb, item); + osso_hw_set_display_event_cb (item->priv->osso, cpumem_applet_status_area_item_display_cb, item); } diff --git a/src/cpumem_status_area_item.h b/src/cpumem_status_area_item.h index f95b19d..7cf0131 100644 --- a/src/cpumem_status_area_item.h +++ b/src/cpumem_status_area_item.h @@ -1,32 +1,32 @@ -#ifndef __LOAD_APPLET_STATUS_AREA_ITEM_H__ -#define __LOAD_APPLET_STATUS_AREA_ITEM_H__ +#ifndef __CPUMEM_APPLET_STATUS_AREA_ITEM_H__ +#define __CPUMEM_APPLET_STATUS_AREA_ITEM_H__ #include G_BEGIN_DECLS -#define LOAD_APPLET_TYPE_STATUS_AREA_ITEM (load_applet_status_area_item_get_type ()) -#define LOAD_APPLET_STATUS_AREA_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LOAD_APPLET_TYPE_STATUS_AREA_ITEM, LoadAppletStatusAreaItem)) -#define LOAD_APPLET_STATUS_AREA_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LOAD_APPLET_TYPE_STATUS_AREA_ITEM, LoadAppletStatusAreaItemClass)) -#define LOAD_APPLET_IS_STATUS_AREA_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LOAD_APPLET_TYPE_STATUS_AREA_ITEM)) -#define LOAD_APPLET_IS_STATUS_AREA_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LOAD_APPLET_TYPE_STATUS_AREA_ITEM)) -#define LOAD_APPLET_STATUS_AREA_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LOAD_APPLET_TYPE_STATUS_AREA_ITEM, LoadAppletStatusAreaItemClass)) +#define CPUMEM_APPLET_TYPE_STATUS_AREA_ITEM (cpumem_applet_status_area_item_get_type ()) +#define CPUMEM_APPLET_STATUS_AREA_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CPUMEM_APPLET_TYPE_STATUS_AREA_ITEM, CpumemAppletStatusAreaItem)) +#define CPUMEM_APPLET_STATUS_AREA_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CPUMEM_APPLET_TYPE_STATUS_AREA_ITEM, CpumemAppletStatusAreaItemClass)) +#define CPUMEM_APPLET_IS_STATUS_AREA_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CPUMEM_APPLET_TYPE_STATUS_AREA_ITEM)) +#define CPUMEM_APPLET_IS_STATUS_AREA_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CPUMEM_APPLET_TYPE_STATUS_AREA_ITEM)) +#define CPUMEM_APPLET_STATUS_AREA_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CPUMEM_APPLET_TYPE_STATUS_AREA_ITEM, CpumemAppletStatusAreaItemClass)) -typedef struct _LoadAppletStatusAreaItem LoadAppletStatusAreaItem; -typedef struct _LoadAppletStatusAreaItemClass LoadAppletStatusAreaItemClass; -typedef struct _LoadAppletStatusAreaItemPrivate LoadAppletStatusAreaItemPrivate; +typedef struct _CpumemAppletStatusAreaItem CpumemAppletStatusAreaItem; +typedef struct _CpumemAppletStatusAreaItemClass CpumemAppletStatusAreaItemClass; +typedef struct _CpumemAppletStatusAreaItemPrivate CpumemAppletStatusAreaItemPrivate; -struct _LoadAppletStatusAreaItem { +struct _CpumemAppletStatusAreaItem { HDStatusPluginItem parent; - LoadAppletStatusAreaItemPrivate *priv; + CpumemAppletStatusAreaItemPrivate *priv; }; -struct _LoadAppletStatusAreaItemClass { +struct _CpumemAppletStatusAreaItemClass { HDStatusPluginItemClass parent; }; -GType load_applet_status_area_item_get_type (void); +GType cpumem_applet_status_area_item_get_type (void); G_END_DECLS