[gnome-applets/wip/muktupavels/cpufreq] cpufreq: port to libgnome-panel
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-applets/wip/muktupavels/cpufreq] cpufreq: port to libgnome-panel
- Date: Sun, 29 Mar 2020 23:30:12 +0000 (UTC)
commit 346fba2eb299531647f2e2426737632f1fab379f
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Mon Mar 30 02:29:25 2020 +0300
cpufreq: port to libgnome-panel
Makefile.am | 6 -
configure.ac | 11 +-
cpufreq/Makefile.am | 36 ---
cpufreq/cpufreq-applet-menu.xml | 14 --
....gnome.applets.CPUFreqApplet.panel-applet.in.in | 15 --
cpufreq/pixmaps/Makefile.am | 15 --
data/schemas/Makefile.am | 2 +-
gnome-applets/Makefile.am | 37 ++++
{cpufreq/src => gnome-applets/cpufreq}/Makefile.am | 30 +--
gnome-applets/cpufreq/cpufreq-applet-menu.xml | 18 ++
.../src => gnome-applets/cpufreq}/cpufreq-applet.c | 246 +++++++++------------
.../src => gnome-applets/cpufreq}/cpufreq-applet.h | 15 +-
.../cpufreq}/cpufreq-monitor.c | 0
.../cpufreq}/cpufreq-monitor.h | 0
.../src => gnome-applets/cpufreq}/cpufreq-popup.c | 0
.../src => gnome-applets/cpufreq}/cpufreq-popup.h | 0
.../cpufreq}/cpufreq-preferences.ui | 0
.../src => gnome-applets/cpufreq}/cpufreq-prefs.c | 3 +-
.../src => gnome-applets/cpufreq}/cpufreq-prefs.h | 0
.../cpufreq}/cpufreq-selector/Makefile.am | 47 ++--
.../cpufreq-selector/cpufreq-selector-service.c | 0
.../cpufreq-selector/cpufreq-selector-service.h | 0
.../cpufreq}/cpufreq-selector/cpufreq-selector.c | 0
.../cpufreq}/cpufreq-selector/cpufreq-selector.h | 0
.../cpufreq}/cpufreq-selector/main.c | 0
.../org.gnome.CPUFreqSelector.conf | 0
.../org.gnome.CPUFreqSelector.service.in | 0
.../org.gnome.cpufreqselector.policy.in | 0
.../src => gnome-applets/cpufreq}/cpufreq-utils.c | 0
.../src => gnome-applets/cpufreq}/cpufreq-utils.h | 0
.../cpufreq/icons}/cpufreq-100.png | Bin
.../cpufreq/icons}/cpufreq-25.png | Bin
.../cpufreq/icons}/cpufreq-50.png | Bin
.../cpufreq/icons}/cpufreq-75.png | Bin
.../cpufreq/icons}/cpufreq-na.png | Bin
.../cpufreq}/org.gnome.CPUFreqSelector.xml | 0
gnome-applets/ga-module.c | 19 ++
po/POTFILES.in | 13 +-
po/POTFILES.skip | 1 -
39 files changed, 232 insertions(+), 296 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 033e20249..71d448372 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,10 +4,6 @@ if APPLET_ACCESSX
accessx_status_SUBDIR = accessx-status
endif
-if BUILD_CPUFREQ_APPLET
-cpufreq_SUBDIR = cpufreq
-endif
-
if HAVE_TRACKER_SEARCH_BAR
tracker_search_bar_SUBDIR = tracker-search-bar
endif
@@ -32,7 +28,6 @@ SUBDIRS = \
$(always_built_SUBDIRS) \
$(vfs_SUBDIRS) \
$(accessx_status_SUBDIR)\
- $(cpufreq_SUBDIR) \
$(tracker_search_bar_SUBDIR) \
$(NULL)
@@ -48,7 +43,6 @@ DIST_SUBDIRS = \
multiload \
accessx-status \
sticky-notes \
- cpufreq \
window-buttons \
window-title \
inhibit \
diff --git a/configure.ac b/configure.ac
index 439242f11..fd0ee1812 100644
--- a/configure.ac
+++ b/configure.ac
@@ -277,6 +277,10 @@ AS_IF([test "x$disable_cpufreq" = "xno"], [
esac
], [build_cpufreq_applet=no])
+AS_IF([test "x$build_cpufreq_applet" = "xyes"], [
+ AC_DEFINE([BUILD_CPUFREQ_APPLET], [1], [Define to 1 if building cpufreq applet])
+])
+
AM_CONDITIONAL(BUILD_CPUFREQ_APPLET, test x$build_cpufreq_applet = xyes)
AM_CONDITIONAL(BUILD_CPUFREQ_SELECTOR, test x$enable_selector = xyes)
@@ -347,6 +351,8 @@ AC_CONFIG_FILES([
gnome-applets/battstat/Makefile
gnome-applets/brightness/Makefile
gnome-applets/command/Makefile
+ gnome-applets/cpufreq/Makefile
+ gnome-applets/cpufreq/cpufreq-selector/Makefile
gnome-applets/gweather/Makefile
gnome-applets/netspeed/Makefile
gnome-applets/timer/Makefile
@@ -376,11 +382,6 @@ AC_CONFIG_FILES([
charpick/Makefile
charpick/src/Makefile
- cpufreq/Makefile
- cpufreq/pixmaps/Makefile
- cpufreq/src/cpufreq-selector/Makefile
- cpufreq/src/Makefile
-
drivemount/Makefile
drivemount/src/Makefile
diff --git a/data/schemas/Makefile.am b/data/schemas/Makefile.am
index a04c6ea5f..a1cacf0f1 100644
--- a/data/schemas/Makefile.am
+++ b/data/schemas/Makefile.am
@@ -25,7 +25,7 @@ gsettings_schemas_in_in += \
org.gnome.gnome-applets.cpufreq.gschema.xml.in.in \
$(NULL)
gsettings_ENUM_FILES += \
- $(top_srcdir)/cpufreq/src/cpufreq-applet.h \
+ $(top_srcdir)/gnome-applets/cpufreq/cpufreq-applet.h \
$(NULL)
endif
diff --git a/gnome-applets/Makefile.am b/gnome-applets/Makefile.am
index f07aff8e7..02fa6e10a 100644
--- a/gnome-applets/Makefile.am
+++ b/gnome-applets/Makefile.am
@@ -4,6 +4,7 @@ SUBDIRS = \
battstat \
brightness \
command \
+ cpufreq \
gweather \
netspeed \
timer \
@@ -44,11 +45,30 @@ org_gnome_gnome_applets_la_LIBADD = \
$(GNOME_PANEL_LIBS) \
$(NULL)
+if BUILD_CPUFREQ_APPLET
+org_gnome_gnome_applets_la_LIBADD += \
+ $(top_builddir)/gnome-applets/cpufreq/libcpu-frequency-applet.la \
+ $(NULL)
+endif
+
org_gnome_gnome_applets_la_LDFLAGS = \
-module -avoid-version \
$(AM_LDFLAGS) \
$(NULL)
+cpufreq_icon_files = \
+ cpufreq/icons/cpufreq-100.png \
+ cpufreq/icons/cpufreq-75.png \
+ cpufreq/icons/cpufreq-50.png \
+ cpufreq/icons/cpufreq-25.png \
+ cpufreq/icons/cpufreq-na.png \
+ $(NULL)
+
+cpufreq_ui_files = \
+ cpufreq/cpufreq-applet-menu.xml \
+ cpufreq/cpufreq-preferences.ui \
+ $(NULL)
+
icon_files = \
window-picker/wp-about-logo.png \
$(NULL)
@@ -67,6 +87,16 @@ ui_files = \
window-picker/wp-preferences-dialog.ui \
$(NULL)
+if BUILD_CPUFREQ_APPLET
+icon_files += \
+ $(cpufreq_icon_files) \
+ $(NULL)
+
+ui_files += \
+ $(cpufreq_ui_files) \
+ $(NULL)
+endif
+
gnome-applets.gresource.xml: Makefile
$(AM_V_GEN) echo '<?xml version="1.0" encoding="UTF-8"?>' > $@; \
echo '<gresources>' >> $@; \
@@ -115,4 +145,11 @@ EXTRA_DIST = \
$(ui_files) \
$(NULL)
+if !BUILD_CPUFREQ_APPLET
+EXTRA_DIST += \
+ $(cpufreq_icon_files) \
+ $(cpufreq_ui_files) \
+ $(NULL)
+endif
+
-include $(top_srcdir)/git.mk
diff --git a/cpufreq/src/Makefile.am b/gnome-applets/cpufreq/Makefile.am
similarity index 68%
rename from cpufreq/src/Makefile.am
rename to gnome-applets/cpufreq/Makefile.am
index 0f33f7d01..4fe929993 100644
--- a/cpufreq/src/Makefile.am
+++ b/gnome-applets/cpufreq/Makefile.am
@@ -1,27 +1,18 @@
NULL =
-if BUILD_CPUFREQ_SELECTOR
-selector_SUBDIR = cpufreq-selector
-endif
-
-SUBDIRS = $(selector_SUBDIR)
+SUBDIRS = cpufreq-selector
-cpu_frequency_applet_libdir = $(pkglibdir)
-cpu_frequency_applet_lib_LTLIBRARIES = libcpu-frequency-applet.la
+if BUILD_CPUFREQ_APPLET
+noinst_LTLIBRARIES = libcpu-frequency-applet.la
libcpu_frequency_applet_la_CPPFLAGS = \
- -DCPUFREQ_MENU_UI_DIR=\""$(pkgdatadir)/ui"\" \
- -DGNOMELOCALEDIR=\""$(localedir)"\" \
- -DCPUFREQ_PIXMAPS_DIR=\""$(pkgdatadir)/cpufreq-applet/pixmaps"\" \
- -DGTK_BUILDERDIR=\""$(pkgdatadir)/builder"\" \
-DG_LOG_DOMAIN=\"org.gnome.gnome-applets.cpu-frequency\" \
-DG_LOG_USE_STRUCTURED=1 \
$(NULL)
libcpu_frequency_applet_la_CFLAGS = \
- $(GNOME_APPLETS_CFLAGS) \
+ $(GNOME_PANEL_CFLAGS) \
$(GIO_UNIX_CFLAGS) \
- $(LIBGLADE_CFLAGS) \
$(WARN_CFLAGS) \
$(AM_CFLAGS) \
$(NULL)
@@ -41,15 +32,13 @@ libcpu_frequency_applet_la_SOURCES = \
$(NULL)
libcpu_frequency_applet_la_LDFLAGS = \
- -avoid-version \
$(WARN_LDFLAGS) \
$(AM_LDFLAGS) \
$(NULL)
libcpu_frequency_applet_la_LIBADD = \
- $(GNOME_APPLETS_LIBS) \
+ $(GNOME_PANEL_LIBS) \
$(GIO_UNIX_LIBS) \
- $(LIBGLADE_LIBS) \
$(LIBCPUFREQ_LIBS) \
$(NULL)
@@ -64,12 +53,13 @@ BUILT_SOURCES = \
cpufreq-selector-gen.h \
$(NULL)
-EXTRA_DIST = \
- org.gnome.CPUFreqSelector.xml \
- $(NULL)
-
CLEANFILES = \
$(BUILT_SOURCES) \
$(NULL)
+endif
+
+EXTRA_DIST = \
+ org.gnome.CPUFreqSelector.xml \
+ $(NULL)
-include $(top_srcdir)/git.mk
diff --git a/gnome-applets/cpufreq/cpufreq-applet-menu.xml b/gnome-applets/cpufreq/cpufreq-applet-menu.xml
new file mode 100644
index 000000000..f094dd117
--- /dev/null
+++ b/gnome-applets/cpufreq/cpufreq-applet-menu.xml
@@ -0,0 +1,18 @@
+<interface>
+ <menu id="cpufreq-menu">
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Preferences</attribute>
+ <attribute name="action">cpufreq.preferences</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <attribute name="action">cpufreq.help</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_About</attribute>
+ <attribute name="action">cpufreq.about</attribute>
+ </item>
+ </section>
+ </menu>
+</interface>
diff --git a/cpufreq/src/cpufreq-applet.c b/gnome-applets/cpufreq/cpufreq-applet.c
similarity index 85%
rename from cpufreq/src/cpufreq-applet.c
rename to gnome-applets/cpufreq/cpufreq-applet.c
index 8a27daf51..fe46e4616 100644
--- a/cpufreq/src/cpufreq-applet.c
+++ b/gnome-applets/cpufreq/cpufreq-applet.c
@@ -1,5 +1,4 @@
/*
- * GNOME CPUFreq Applet
* Copyright (C) 2004 Carlos Garcia Campos <carlosgc gnome org>
*
* This library is free software; you can redistribute it and/or
@@ -18,18 +17,15 @@
* Authors : Carlos García Campos <carlosgc gnome org>
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
+#include "cpufreq-applet.h"
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#include <panel-applet.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <stdlib.h>
#include <string.h>
-#include "cpufreq-applet.h"
#include "cpufreq-prefs.h"
#include "cpufreq-popup.h"
#include "cpufreq-monitor.h"
@@ -38,7 +34,7 @@
#define SPACING 2
struct _CPUFreqApplet {
- PanelApplet base;
+ GpApplet parent;
/* Visibility */
CPUFreqShowMode show_mode;
@@ -50,7 +46,6 @@ struct _CPUFreqApplet {
CPUFreqMonitor *monitor;
- PanelAppletOrient orient;
gint size;
GtkWidget *box;
@@ -71,9 +66,9 @@ struct _CPUFreqApplet {
CPUFreqPopup *popup;
};
-struct _CPUFreqAppletClass {
- PanelAppletClass parent_class;
-};
+static void queue_refresh (CPUFreqApplet *applet);
+
+static void cpufreq_applet_setup (CPUFreqApplet *applet);
static void cpufreq_applet_preferences_cb (GSimpleAction *action,
GVariant *parameter,
@@ -99,25 +94,24 @@ static void cpufreq_applet_size_allocate (GtkWidget *widget,
static void cpufreq_applet_get_preferred_width (GtkWidget *widget,
gint *minimum_width,
gint *natural_width);
-static void cpufreq_applet_change_orient (PanelApplet *pa,
- PanelAppletOrient orient);
static const gchar *const cpufreq_icons[] = {
- CPUFREQ_PIXMAPS_DIR "/cpufreq-25.png",
- CPUFREQ_PIXMAPS_DIR "/cpufreq-50.png",
- CPUFREQ_PIXMAPS_DIR "/cpufreq-75.png",
- CPUFREQ_PIXMAPS_DIR "/cpufreq-100.png",
- CPUFREQ_PIXMAPS_DIR "/cpufreq-na.png",
+ GRESOURCE_PREFIX "/icons/cpufreq-25.png",
+ GRESOURCE_PREFIX "/icons/cpufreq-50.png",
+ GRESOURCE_PREFIX "/icons/cpufreq-75.png",
+ GRESOURCE_PREFIX "/icons/cpufreq-100.png",
+ GRESOURCE_PREFIX "/icons/cpufreq-na.png",
NULL
};
static const GActionEntry cpufreq_applet_menu_actions [] = {
{ "preferences", cpufreq_applet_preferences_cb, NULL, NULL, NULL },
{ "help", cpufreq_applet_help_cb, NULL, NULL, NULL },
- { "about", cpufreq_applet_about_cb, NULL, NULL, NULL }
+ { "about", cpufreq_applet_about_cb, NULL, NULL, NULL },
+ { NULL }
};
-G_DEFINE_TYPE (CPUFreqApplet, cpufreq_applet, PANEL_TYPE_APPLET)
+G_DEFINE_TYPE (CPUFreqApplet, cpufreq_applet, GP_TYPE_APPLET)
/* Enum Types */
GType
@@ -181,28 +175,18 @@ cpufreq_applet_init (CPUFreqApplet *applet)
applet->show_mode = CPUFREQ_MODE_BOTH;
applet->show_text_mode = CPUFREQ_MODE_TEXT_FREQUENCY_UNIT;
- panel_applet_set_flags (PANEL_APPLET (applet), PANEL_APPLET_EXPAND_MINOR);
-
- applet->orient = panel_applet_get_orient (PANEL_APPLET (applet));
+ gp_applet_set_flags (GP_APPLET (applet), GP_APPLET_FLAGS_EXPAND_MINOR);
applet->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, SPACING);
gtk_container_add (GTK_CONTAINER (applet), applet->box);
gtk_widget_set_valign (applet->box, GTK_ALIGN_CENTER);
gtk_widget_show (applet->box);
- switch (applet->orient) {
- case PANEL_APPLET_ORIENT_LEFT:
- case PANEL_APPLET_ORIENT_RIGHT:
- gtk_widget_set_halign (applet->box, GTK_ALIGN_CENTER);
- break;
- case PANEL_APPLET_ORIENT_UP:
- case PANEL_APPLET_ORIENT_DOWN:
- gtk_widget_set_halign (applet->box, GTK_ALIGN_START);
- break;
- default:
- g_assert_not_reached ();
- break;
- }
+ if (gp_applet_get_orientation (GP_APPLET (applet)) == GTK_ORIENTATION_VERTICAL) {
+ gtk_widget_set_halign (applet->box, GTK_ALIGN_CENTER);
+ } else {
+ gtk_widget_set_halign (applet->box, GTK_ALIGN_START);
+ }
applet->icon = gtk_image_new ();
gtk_box_pack_start (GTK_BOX (applet->box), applet->icon, FALSE, FALSE, 0);
@@ -221,21 +205,64 @@ cpufreq_applet_init (CPUFreqApplet *applet)
}
static void
-cpufreq_applet_class_init (CPUFreqAppletClass *klass)
+cpufreq_applet_constructed (GObject *object)
{
- PanelAppletClass *applet_class = PANEL_APPLET_CLASS (klass);
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+ G_OBJECT_CLASS (cpufreq_applet_parent_class)->constructed (object);
+ cpufreq_applet_setup (CPUFREQ_APPLET (object));
+}
- gobject_class->dispose = cpufreq_applet_dispose;
+static void
+cpufreq_applet_placement_changed (GpApplet *applet,
+ GtkOrientation orientation,
+ GtkPositionType position)
+{
+ CPUFreqApplet *self;
+ GtkAllocation allocation;
+ gint size;
+
+ self = CPUFREQ_APPLET (applet);
+
+ gtk_widget_get_allocation (GTK_WIDGET (self), &allocation);
+
+ if (orientation == GTK_ORIENTATION_VERTICAL)
+ {
+ size = allocation.width;
+ gtk_widget_set_halign (self->box, GTK_ALIGN_CENTER);
+ }
+ else
+ {
+ size = allocation.height;
+ gtk_widget_set_halign (self->box, GTK_ALIGN_START);
+ }
+
+ if (self->size != size)
+ {
+ self->size = size;
+ queue_refresh (self);
+ }
+}
- widget_class->size_allocate = cpufreq_applet_size_allocate;
- widget_class->style_updated = cpufreq_applet_style_updated;
- widget_class->get_preferred_width = cpufreq_applet_get_preferred_width;
- widget_class->button_press_event = cpufreq_applet_button_press;
- widget_class->key_press_event = cpufreq_applet_key_press;
+static void
+cpufreq_applet_class_init (CPUFreqAppletClass *self_class)
+{
+ GObjectClass *object_class;
+ GtkWidgetClass *widget_class;
+ GpAppletClass *applet_class;
+
+ object_class = G_OBJECT_CLASS (self_class);
+ widget_class = GTK_WIDGET_CLASS (self_class);
+ applet_class = GP_APPLET_CLASS (self_class);
+
+ object_class->constructed = cpufreq_applet_constructed;
+ object_class->dispose = cpufreq_applet_dispose;
+
+ widget_class->size_allocate = cpufreq_applet_size_allocate;
+ widget_class->style_updated = cpufreq_applet_style_updated;
+ widget_class->get_preferred_width = cpufreq_applet_get_preferred_width;
+ widget_class->button_press_event = cpufreq_applet_button_press;
+ widget_class->key_press_event = cpufreq_applet_key_press;
- applet_class->change_orient = cpufreq_applet_change_orient;
+ applet_class->placement_changed = cpufreq_applet_placement_changed;
}
static void
@@ -309,13 +336,11 @@ cpufreq_applet_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
GTK_WIDGET_CLASS (cpufreq_applet_parent_class)->size_allocate (widget, allocation);
- switch (applet->orient) {
- case PANEL_APPLET_ORIENT_LEFT:
- case PANEL_APPLET_ORIENT_RIGHT:
+ switch (gp_applet_get_orientation (GP_APPLET (applet))) {
+ case GTK_ORIENTATION_VERTICAL:
size = allocation->width;
break;
- case PANEL_APPLET_ORIENT_UP:
- case PANEL_APPLET_ORIENT_DOWN:
+ case GTK_ORIENTATION_HORIZONTAL:
size = allocation->height;
break;
default:
@@ -422,8 +447,7 @@ cpufreq_applet_get_preferred_width (GtkWidget *widget,
minimum_width,
natural_width);
- if (applet->orient == PANEL_APPLET_ORIENT_LEFT ||
- applet->orient == PANEL_APPLET_ORIENT_RIGHT)
+ if (gp_applet_get_orientation (GP_APPLET (applet)) == GTK_ORIENTATION_VERTICAL)
return;
icon_width = 0;
@@ -470,6 +494,7 @@ cpufreq_applet_menu_popup (CPUFreqApplet *applet,
GdkEvent *event)
{
GtkWidget *menu;
+ GtkPositionType position;
GdkGravity widget_anchor;
GdkGravity menu_anchor;
@@ -486,16 +511,18 @@ cpufreq_applet_menu_popup (CPUFreqApplet *applet,
if (!menu)
return;
- if (applet->orient == PANEL_APPLET_ORIENT_DOWN) {
+ position = gp_applet_get_position (GP_APPLET (applet));
+
+ if (position == GTK_POS_TOP) {
widget_anchor = GDK_GRAVITY_SOUTH_WEST;
menu_anchor = GDK_GRAVITY_NORTH_WEST;
- } else if (applet->orient == PANEL_APPLET_ORIENT_RIGHT) {
+ } else if (position == GTK_POS_LEFT) {
widget_anchor = GDK_GRAVITY_NORTH_EAST;
menu_anchor = GDK_GRAVITY_NORTH_WEST;
- } else if (applet->orient == PANEL_APPLET_ORIENT_LEFT) {
+ } else if (position == GTK_POS_RIGHT) {
widget_anchor = GDK_GRAVITY_NORTH_WEST;
menu_anchor = GDK_GRAVITY_NORTH_EAST;
- } else if (applet->orient == PANEL_APPLET_ORIENT_UP) {
+ } else if (position == GTK_POS_BOTTOM) {
widget_anchor = GDK_GRAVITY_NORTH_WEST;
menu_anchor = GDK_GRAVITY_SOUTH_WEST;
} else {
@@ -554,34 +581,6 @@ cpufreq_applet_key_press (GtkWidget *widget, GdkEventKey *event)
return FALSE;
}
-static void
-cpufreq_applet_change_orient (PanelApplet *pa, PanelAppletOrient orient)
-{
- CPUFreqApplet *applet;
- GtkAllocation allocation;
- gint size;
-
- applet = CPUFREQ_APPLET (pa);
-
- applet->orient = orient;
-
- gtk_widget_get_allocation (GTK_WIDGET (applet), &allocation);
-
- if ((orient == PANEL_APPLET_ORIENT_LEFT) ||
- (orient == PANEL_APPLET_ORIENT_RIGHT)) {
- size = allocation.width;
- gtk_widget_set_halign (applet->box, GTK_ALIGN_CENTER);
- } else {
- size = allocation.height;
- gtk_widget_set_halign (applet->box, GTK_ALIGN_START);
- }
-
- if (size != applet->size) {
- applet->size = size;
- queue_refresh (applet);
- }
-}
-
static void
cpufreq_applet_preferences_cb (GSimpleAction *action,
GVariant *parameter,
@@ -665,8 +664,11 @@ cpufreq_applet_pixmap_set_image (CPUFreqApplet *applet, gint perc)
image = 4;
if (applet->pixbufs[image] == NULL) {
- applet->pixbufs[image] = gdk_pixbuf_new_from_file_at_size (cpufreq_icons[image],
- 24, 24, NULL);
+ applet->pixbufs[image] = gdk_pixbuf_new_from_resource_at_scale (cpufreq_icons[image],
+ 24,
+ 24,
+ TRUE,
+ NULL);
}
gtk_image_set_from_pixbuf (GTK_IMAGE (applet->icon), applet->pixbufs[image]);
@@ -837,16 +839,14 @@ cpufreq_applet_get_widget_size (CPUFreqApplet *applet,
if (!gtk_widget_get_visible (widget))
return 0;
-
+
gtk_widget_get_preferred_size (widget, &req, NULL);
-
- switch (applet->orient) {
- case PANEL_APPLET_ORIENT_LEFT:
- case PANEL_APPLET_ORIENT_RIGHT:
+
+ switch (gp_applet_get_orientation (GP_APPLET (applet))) {
+ case GTK_ORIENTATION_VERTICAL:
size = req.width;
break;
- case PANEL_APPLET_ORIENT_UP:
- case PANEL_APPLET_ORIENT_DOWN:
+ case GTK_ORIENTATION_HORIZONTAL:
size = req.height;
break;
default:
@@ -866,9 +866,8 @@ cpufreq_applet_refresh (CPUFreqApplet *applet)
panel_size = applet->size - 1; /* 1 pixel margin */
- horizontal = (applet->orient == PANEL_APPLET_ORIENT_UP ||
- applet->orient == PANEL_APPLET_ORIENT_DOWN);
-
+ horizontal = (gp_applet_get_orientation (GP_APPLET (applet)) == GTK_ORIENTATION_HORIZONTAL);
+
/* We want a fixed label size, the biggest */
if (horizontal)
label_size = cpufreq_applet_get_widget_size (applet, applet->label);
@@ -951,17 +950,12 @@ cpufreq_applet_prefs_show_mode_changed (CPUFreqPrefs *prefs,
static void
cpufreq_applet_setup (CPUFreqApplet *applet)
{
- GSimpleActionGroup *action_group;
+ const char *menu_resource;
GAction *action;
- gchar *ui_path;
AtkObject *atk_obj;
GSettings *settings;
- /* Preferences */
- if (applet->prefs)
- g_object_unref (applet->prefs);
-
- settings = panel_applet_settings_new (PANEL_APPLET (applet), "org.gnome.gnome-applets.cpufreq");
+ settings = gp_applet_settings_new (GP_APPLET (applet), "org.gnome.gnome-applets.cpufreq");
applet->prefs = cpufreq_prefs_new (settings);
g_signal_connect (G_OBJECT (applet->prefs),
@@ -985,26 +979,15 @@ cpufreq_applet_setup (CPUFreqApplet *applet)
(gpointer) applet);
/* Setup the menus */
- action_group = g_simple_action_group_new ();
- g_action_map_add_action_entries (G_ACTION_MAP (action_group),
- cpufreq_applet_menu_actions,
- G_N_ELEMENTS (cpufreq_applet_menu_actions),
- applet);
- ui_path = g_build_filename (CPUFREQ_MENU_UI_DIR, "cpufreq-applet-menu.xml", NULL);
- panel_applet_setup_menu_from_file (PANEL_APPLET (applet),
- ui_path, action_group,
- GETTEXT_PACKAGE);
- g_free (ui_path);
-
- gtk_widget_insert_action_group (GTK_WIDGET (applet), "cpufreq",
- G_ACTION_GROUP (action_group));
-
- action = g_action_map_lookup_action (G_ACTION_MAP (action_group), "preferences");
+ menu_resource = GRESOURCE_PREFIX "/ui/cpufreq-applet-menu.xml";
+ gp_applet_setup_menu_from_resource (GP_APPLET (applet),
+ menu_resource,
+ cpufreq_applet_menu_actions);
+
+ action = gp_applet_menu_lookup_action (GP_APPLET (applet), "preferences");
g_object_bind_property (applet, "locked-down", action, "enabled",
G_BINDING_DEFAULT|G_BINDING_INVERT_BOOLEAN|G_BINDING_SYNC_CREATE);
- g_object_unref (action_group);
-
atk_obj = gtk_widget_get_accessible (GTK_WIDGET (applet));
if (GTK_IS_ACCESSIBLE (atk_obj)) {
@@ -1016,22 +999,3 @@ cpufreq_applet_setup (CPUFreqApplet *applet)
gtk_widget_show (GTK_WIDGET (applet));
}
-
-static gboolean
-cpufreq_applet_factory (CPUFreqApplet *applet, const gchar *iid, gpointer gdata)
-{
- gboolean retval = FALSE;
-
- if (!strcmp (iid, "CPUFreqApplet")) {
- cpufreq_applet_setup (applet);
-
- retval = TRUE;
- }
-
- return retval;
-}
-
-PANEL_APPLET_IN_PROCESS_FACTORY ("CPUFreqAppletFactory",
- CPUFREQ_TYPE_APPLET,
- (PanelAppletFactoryCallback) cpufreq_applet_factory,
- NULL)
diff --git a/cpufreq/src/cpufreq-applet.h b/gnome-applets/cpufreq/cpufreq-applet.h
similarity index 64%
rename from cpufreq/src/cpufreq-applet.h
rename to gnome-applets/cpufreq/cpufreq-applet.h
index 461c70145..2ad7f3e36 100644
--- a/cpufreq/src/cpufreq-applet.h
+++ b/gnome-applets/cpufreq/cpufreq-applet.h
@@ -21,23 +21,16 @@
#ifndef CPUFREQ_APPLET_H
#define CPUFREQ_APPLET_H
-#include <glib-object.h>
+#include <libgnome-panel/gp-applet.h>
G_BEGIN_DECLS
-#define CPUFREQ_TYPE_APPLET (cpufreq_applet_get_type ())
-#define CPUFREQ_APPLET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CPUFREQ_TYPE_APPLET,
CPUFreqApplet))
-#define CPUFREQ_APPLET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), CPUFREQ_TYPE_APPLET,
CPUFreqAppletClass))
-#define CPUFREQ_IS_APPLET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CPUFREQ_TYPE_APPLET))
-#define CPUFREQ_IS_APPLET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CPUFREQ_TYPE_APPLET))
-#define CPUFREQ_APPLET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CPUFREQ_TYPE_APPLET,
CPUFreqAppletClass))
+#define CPUFREQ_TYPE_APPLET (cpufreq_applet_get_type ())
+G_DECLARE_FINAL_TYPE (CPUFreqApplet, cpufreq_applet, CPUFREQ, APPLET, GpApplet)
#define CPUFREQ_TYPE_SHOW_MODE (cpufreq_applet_show_mode_get_type ())
#define CPUFREQ_TYPE_SHOW_TEXT_MODE (cpufreq_applet_show_text_mode_get_type ())
-typedef struct _CPUFreqApplet CPUFreqApplet;
-typedef struct _CPUFreqAppletClass CPUFreqAppletClass;
-
typedef enum {
CPUFREQ_MODE_GRAPHIC,
CPUFREQ_MODE_TEXT,
@@ -50,8 +43,6 @@ typedef enum {
CPUFREQ_MODE_TEXT_PERCENTAGE
} CPUFreqShowTextMode;
-GType cpufreq_applet_get_type (void) G_GNUC_CONST;
-
GType cpufreq_applet_show_mode_get_type (void) G_GNUC_CONST;
GType cpufreq_applet_show_text_mode_get_type (void) G_GNUC_CONST;
diff --git a/cpufreq/src/cpufreq-monitor.c b/gnome-applets/cpufreq/cpufreq-monitor.c
similarity index 100%
rename from cpufreq/src/cpufreq-monitor.c
rename to gnome-applets/cpufreq/cpufreq-monitor.c
diff --git a/cpufreq/src/cpufreq-monitor.h b/gnome-applets/cpufreq/cpufreq-monitor.h
similarity index 100%
rename from cpufreq/src/cpufreq-monitor.h
rename to gnome-applets/cpufreq/cpufreq-monitor.h
diff --git a/cpufreq/src/cpufreq-popup.c b/gnome-applets/cpufreq/cpufreq-popup.c
similarity index 100%
rename from cpufreq/src/cpufreq-popup.c
rename to gnome-applets/cpufreq/cpufreq-popup.c
diff --git a/cpufreq/src/cpufreq-popup.h b/gnome-applets/cpufreq/cpufreq-popup.h
similarity index 100%
rename from cpufreq/src/cpufreq-popup.h
rename to gnome-applets/cpufreq/cpufreq-popup.h
diff --git a/cpufreq/cpufreq-preferences.ui b/gnome-applets/cpufreq/cpufreq-preferences.ui
similarity index 100%
rename from cpufreq/cpufreq-preferences.ui
rename to gnome-applets/cpufreq/cpufreq-preferences.ui
diff --git a/cpufreq/src/cpufreq-prefs.c b/gnome-applets/cpufreq/cpufreq-prefs.c
similarity index 99%
rename from cpufreq/src/cpufreq-prefs.c
rename to gnome-applets/cpufreq/cpufreq-prefs.c
index b8bd83b85..e37d9eb5c 100644
--- a/cpufreq/src/cpufreq-prefs.c
+++ b/gnome-applets/cpufreq/cpufreq-prefs.c
@@ -523,8 +523,7 @@ cpufreq_prefs_dialog_create (CPUFreqPrefs *prefs)
{
GtkBuilder *builder;
- builder = gtk_builder_new ();
- gtk_builder_add_from_file (builder, GTK_BUILDERDIR "/cpufreq-preferences.ui", NULL);
+ builder = gtk_builder_new_from_resource (GRESOURCE_PREFIX "/ui/cpufreq-preferences.ui");
prefs->priv->dialog = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_dialog"));
diff --git a/cpufreq/src/cpufreq-prefs.h b/gnome-applets/cpufreq/cpufreq-prefs.h
similarity index 100%
rename from cpufreq/src/cpufreq-prefs.h
rename to gnome-applets/cpufreq/cpufreq-prefs.h
diff --git a/cpufreq/src/cpufreq-selector/Makefile.am b/gnome-applets/cpufreq/cpufreq-selector/Makefile.am
similarity index 83%
rename from cpufreq/src/cpufreq-selector/Makefile.am
rename to gnome-applets/cpufreq/cpufreq-selector/Makefile.am
index b32055a0a..238dbd10b 100644
--- a/cpufreq/src/cpufreq-selector/Makefile.am
+++ b/gnome-applets/cpufreq/cpufreq-selector/Makefile.am
@@ -1,6 +1,11 @@
NULL =
-cpufreqselectordir = $(bindir)
+dbus_services_in_files = org.gnome.CPUFreqSelector.service.in
+dbus_conf_files = org.gnome.CPUFreqSelector.conf
+polkit_in_files = org.gnome.cpufreqselector.policy.in
+
+if BUILD_CPUFREQ_SELECTOR
+bin_PROGRAMS = cpufreq-selector
cpufreq_selector_CFLAGS = \
$(CPUFREQ_SELECTOR_CFLAGS) \
@@ -8,8 +13,6 @@ cpufreq_selector_CFLAGS = \
$(AM_CFLAGS) \
$(NULL)
-bin_PROGRAMS = cpufreq-selector
-
cpufreq_selector_SOURCES = \
cpufreq-selector.c \
cpufreq-selector.h \
@@ -30,12 +33,19 @@ cpufreq_selector_LDFLAGS = \
$(AM_LDFLAGS) \
$(NULL)
-dbus_services_in_files = org.gnome.CPUFreqSelector.service.in
-polkit_in_files = org.gnome.cpufreqselector.policy.in
-
dbus_servicesdir = $(datadir)/dbus-1/system-services
+dbus_services_DATA = $(dbus_services_in_files:.service.in=.service)
+
+$(dbus_services_DATA): $(dbus_services_in_files)
+ sed -e "s|\@BINDIR\@|$(DESTDIR)$(bindir)|" $< > $@
+
dbus_confdir = $(sysconfdir)/dbus-1/system.d
+dbus_conf_DATA = $(dbus_conf_files)
+
polkitdir = $(datadir)/polkit-1/actions
+polkit_DATA = $(polkit_in_files:.policy.in=.policy)
+
+@INTLTOOL_POLICY_RULE@
cpufreq-selector-gen.h:
cpufreq-selector-gen.c: ../org.gnome.CPUFreqSelector.xml
@@ -48,22 +58,17 @@ BUILT_SOURCES = \
cpufreq-selector-gen.h \
$(NULL)
-dbus_services_DATA = $(dbus_services_in_files:.service.in=.service)
-$(dbus_services_DATA): $(dbus_services_in_files)
- sed -e "s|\@BINDIR\@|$(DESTDIR)$(bindir)|" $< > $@
-dbus_conf_DATA = org.gnome.CPUFreqSelector.conf
-
-@INTLTOOL_POLICY_RULE@
-polkit_DATA = $(polkit_in_files:.policy.in=.policy)
+CLEANFILES = \
+ $(BUILT_SOURCES) \
+ $(dbus_services_DATA) \
+ $(polkit_DATA) \
+ $(NULL)
+endif
EXTRA_DIST = \
- $(dbus_services_in_files) \
- org.gnome.CPUFreqSelector.conf \
- $(polkit_in_files)
-
-CLEANFILES = \
- $(BUILT_SOURCES) \
- $(dbus_services_DATA) \
- $(polkit_DATA)
+ $(dbus_services_in_files) \
+ $(dbus_conf_files) \
+ $(polkit_in_files) \
+ $(NULL)
-include $(top_srcdir)/git.mk
diff --git a/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c
b/gnome-applets/cpufreq/cpufreq-selector/cpufreq-selector-service.c
similarity index 100%
rename from cpufreq/src/cpufreq-selector/cpufreq-selector-service.c
rename to gnome-applets/cpufreq/cpufreq-selector/cpufreq-selector-service.c
diff --git a/cpufreq/src/cpufreq-selector/cpufreq-selector-service.h
b/gnome-applets/cpufreq/cpufreq-selector/cpufreq-selector-service.h
similarity index 100%
rename from cpufreq/src/cpufreq-selector/cpufreq-selector-service.h
rename to gnome-applets/cpufreq/cpufreq-selector/cpufreq-selector-service.h
diff --git a/cpufreq/src/cpufreq-selector/cpufreq-selector.c
b/gnome-applets/cpufreq/cpufreq-selector/cpufreq-selector.c
similarity index 100%
rename from cpufreq/src/cpufreq-selector/cpufreq-selector.c
rename to gnome-applets/cpufreq/cpufreq-selector/cpufreq-selector.c
diff --git a/cpufreq/src/cpufreq-selector/cpufreq-selector.h
b/gnome-applets/cpufreq/cpufreq-selector/cpufreq-selector.h
similarity index 100%
rename from cpufreq/src/cpufreq-selector/cpufreq-selector.h
rename to gnome-applets/cpufreq/cpufreq-selector/cpufreq-selector.h
diff --git a/cpufreq/src/cpufreq-selector/main.c b/gnome-applets/cpufreq/cpufreq-selector/main.c
similarity index 100%
rename from cpufreq/src/cpufreq-selector/main.c
rename to gnome-applets/cpufreq/cpufreq-selector/main.c
diff --git a/cpufreq/src/cpufreq-selector/org.gnome.CPUFreqSelector.conf
b/gnome-applets/cpufreq/cpufreq-selector/org.gnome.CPUFreqSelector.conf
similarity index 100%
rename from cpufreq/src/cpufreq-selector/org.gnome.CPUFreqSelector.conf
rename to gnome-applets/cpufreq/cpufreq-selector/org.gnome.CPUFreqSelector.conf
diff --git a/cpufreq/src/cpufreq-selector/org.gnome.CPUFreqSelector.service.in
b/gnome-applets/cpufreq/cpufreq-selector/org.gnome.CPUFreqSelector.service.in
similarity index 100%
rename from cpufreq/src/cpufreq-selector/org.gnome.CPUFreqSelector.service.in
rename to gnome-applets/cpufreq/cpufreq-selector/org.gnome.CPUFreqSelector.service.in
diff --git a/cpufreq/src/cpufreq-selector/org.gnome.cpufreqselector.policy.in
b/gnome-applets/cpufreq/cpufreq-selector/org.gnome.cpufreqselector.policy.in
similarity index 100%
rename from cpufreq/src/cpufreq-selector/org.gnome.cpufreqselector.policy.in
rename to gnome-applets/cpufreq/cpufreq-selector/org.gnome.cpufreqselector.policy.in
diff --git a/cpufreq/src/cpufreq-utils.c b/gnome-applets/cpufreq/cpufreq-utils.c
similarity index 100%
rename from cpufreq/src/cpufreq-utils.c
rename to gnome-applets/cpufreq/cpufreq-utils.c
diff --git a/cpufreq/src/cpufreq-utils.h b/gnome-applets/cpufreq/cpufreq-utils.h
similarity index 100%
rename from cpufreq/src/cpufreq-utils.h
rename to gnome-applets/cpufreq/cpufreq-utils.h
diff --git a/cpufreq/pixmaps/cpufreq-100.png b/gnome-applets/cpufreq/icons/cpufreq-100.png
similarity index 100%
rename from cpufreq/pixmaps/cpufreq-100.png
rename to gnome-applets/cpufreq/icons/cpufreq-100.png
diff --git a/cpufreq/pixmaps/cpufreq-25.png b/gnome-applets/cpufreq/icons/cpufreq-25.png
similarity index 100%
rename from cpufreq/pixmaps/cpufreq-25.png
rename to gnome-applets/cpufreq/icons/cpufreq-25.png
diff --git a/cpufreq/pixmaps/cpufreq-50.png b/gnome-applets/cpufreq/icons/cpufreq-50.png
similarity index 100%
rename from cpufreq/pixmaps/cpufreq-50.png
rename to gnome-applets/cpufreq/icons/cpufreq-50.png
diff --git a/cpufreq/pixmaps/cpufreq-75.png b/gnome-applets/cpufreq/icons/cpufreq-75.png
similarity index 100%
rename from cpufreq/pixmaps/cpufreq-75.png
rename to gnome-applets/cpufreq/icons/cpufreq-75.png
diff --git a/cpufreq/pixmaps/cpufreq-na.png b/gnome-applets/cpufreq/icons/cpufreq-na.png
similarity index 100%
rename from cpufreq/pixmaps/cpufreq-na.png
rename to gnome-applets/cpufreq/icons/cpufreq-na.png
diff --git a/cpufreq/src/org.gnome.CPUFreqSelector.xml b/gnome-applets/cpufreq/org.gnome.CPUFreqSelector.xml
similarity index 100%
rename from cpufreq/src/org.gnome.CPUFreqSelector.xml
rename to gnome-applets/cpufreq/org.gnome.CPUFreqSelector.xml
diff --git a/gnome-applets/ga-module.c b/gnome-applets/ga-module.c
index dfc0eb9bc..019cfb05c 100644
--- a/gnome-applets/ga-module.c
+++ b/gnome-applets/ga-module.c
@@ -24,6 +24,9 @@
#include "battstat/battstat-applet.h"
#include "brightness/brightness-applet.h"
#include "command/command-applet.h"
+#ifdef BUILD_CPUFREQ_APPLET
+#include "cpufreq/cpufreq-applet.h"
+#endif
#include "gweather/gweather-applet.h"
#include "netspeed/netspeed-applet.h"
#include "timer/timer-applet.h"
@@ -60,6 +63,15 @@ ga_get_applet_info (const char *id)
description = _("Shows the output of a command");
icon_name = "utilities-terminal";
}
+#ifdef BUILD_CPUFREQ_APPLET
+ else if (g_strcmp0 (id, "cpufreq") == 0)
+ {
+ type_func = cpufreq_applet_get_type;
+ name = _("CPU Frequency Scaling Monitor");
+ description = _("Monitor the CPU Frequency Scaling");
+ icon_name = "gnome-cpu-frequency-applet";
+ }
+#endif
else if (g_strcmp0 (id, "gweather") == 0)
{
type_func = gweather_applet_get_type;
@@ -115,6 +127,10 @@ ga_get_applet_id_from_iid (const char *iid)
return "brightness";
else if (g_strcmp0 (iid, "CommandAppletFactory::CommandApplet") == 0)
return "command";
+#ifdef BUILD_CPUFREQ_APPLET
+ else if (g_strcmp0 (iid, "CPUFreqAppletFactory::CPUFreqApplet") == 0)
+ return "cpufreq";
+#endif
else if (g_strcmp0 (iid, "GWeatherAppletFactory::GWeatherApplet") == 0)
return "gweather";
else if (g_strcmp0 (iid, "NetspeedAppletFactory::NetspeedApplet") == 0)
@@ -146,6 +162,9 @@ gp_module_load (GpModule *module)
"battstat",
"brightness",
"command",
+#ifdef BUILD_CPUFREQ_APPLET
+ "cpufreq",
+#endif
"gweather",
"netspeed",
"timer",
diff --git a/po/POTFILES.in b/po/POTFILES.in
index dc53f2295..52a2304c6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,13 +9,6 @@ accessx-status/src/applet.c
[type: gettext/ini]charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in
charpick/src/charpick.c
charpick/src/properties.c
-[type: gettext/glade]cpufreq/cpufreq-applet-menu.xml
-[type: gettext/glade]cpufreq/cpufreq-preferences.ui
-[type: gettext/ini]cpufreq/org.gnome.applets.CPUFreqApplet.panel-applet.in.in
-cpufreq/src/cpufreq-applet.c
-cpufreq/src/cpufreq-popup.c
-cpufreq/src/cpufreq-prefs.c
-cpufreq/src/cpufreq-selector/org.gnome.cpufreqselector.policy.in
data/schemas/org.gnome.gnome-applets.battstat.gschema.xml.in.in
data/schemas/org.gnome.gnome-applets.charpick.gschema.xml.in.in
data/schemas/org.gnome.gnome-applets.command.gschema.xml.in.in
@@ -46,6 +39,12 @@ gnome-applets/battstat/properties.c
gnome-applets/brightness/brightness-applet.c
[type: gettext/glade]gnome-applets/command/command-applet-menu.xml
gnome-applets/command/command-applet.c
+[type: gettext/glade]gnome-applets/cpufreq/cpufreq-applet-menu.xml
+[type: gettext/glade]gnome-applets/cpufreq/cpufreq-preferences.ui
+gnome-applets/cpufreq/cpufreq-applet.c
+gnome-applets/cpufreq/cpufreq-popup.c
+gnome-applets/cpufreq/cpufreq-prefs.c
+gnome-applets/cpufreq/cpufreq-selector/org.gnome.cpufreqselector.policy.in
gnome-applets/ga-module.c
[type: gettext/glade]gnome-applets/gweather/gweather-applet-menu.xml
gnome-applets/gweather/gweather-applet.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 852d1f53a..97405e45a 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -5,7 +5,6 @@
#
accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in
charpick/org.gnome.applets.CharpickerApplet.panel-applet.in
-cpufreq/org.gnome.applets.CPUFreqApplet.panel-applet.in
data/schemas/org.gnome.gnome-applets.battstat.gschema.xml.in
data/schemas/org.gnome.gnome-applets.charpick.gschema.xml.in
data/schemas/org.gnome.gnome-applets.command.gschema.xml.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
