GNOME.org
 

gpointing-device-settings r134 - in trunk: . data modules modules/gnome-settings-daemon-plugins

Author: hiikezoe
Date: Fri Mar  6 14:48:02 2009
New Revision: 134
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=134&view=rev

Log:
trackpoint -> mouse.
trackpoint -> mouse-extension for gnome-settings-daemon.

Added:
   trunk/data/mouse.png
      - copied, changed from r133, /trunk/data/trackpoint.png
   trunk/data/mouse.ui.in
      - copied, changed from r133, /trunk/data/trackpoint.ui.in
   trunk/modules/gnome-settings-daemon-plugins/gsd-mouse-extension-manager.c
      - copied, changed from r133, /trunk/modules/gnome-settings-daemon-plugins/gsd-trackpoint-manager.c
   trunk/modules/gnome-settings-daemon-plugins/gsd-mouse-extension-manager.h
   trunk/modules/gnome-settings-daemon-plugins/gsd-mouse-extension-plugin.c
   trunk/modules/gnome-settings-daemon-plugins/mouse-extension.gnome-settings-plugin.in
   trunk/modules/gpds-mouse-ui.c
      - copied, changed from r133, /trunk/modules/gpds-trackpoint-ui.c
Removed:
   trunk/data/trackpoint.png
   trunk/data/trackpoint.ui.in
   trunk/modules/gnome-settings-daemon-plugins/gsd-trackpoint-manager.c
   trunk/modules/gnome-settings-daemon-plugins/gsd-trackpoint-manager.h
   trunk/modules/gnome-settings-daemon-plugins/gsd-trackpoint-plugin.c
   trunk/modules/gnome-settings-daemon-plugins/trackpoint.gnome-settings-plugin.in
   trunk/modules/gpds-trackpoint-ui.c
Modified:
   trunk/.gitignore
   trunk/configure.ac
   trunk/data/Makefile.am
   trunk/modules/Makefile.am
   trunk/modules/gnome-settings-daemon-plugins/Makefile.am

Modified: trunk/.gitignore
==============================================================================
--- trunk/.gitignore	(original)
+++ trunk/.gitignore	Fri Mar  6 14:48:02 2009
@@ -25,7 +25,7 @@
 *.gcno
 *.gcda
 data/touchpad.ui
-data/trackpoint.ui
+data/mouse.ui
 data/gnome-settings-daemon.schemas
 po/Makefile.in.in
 po/POTFILES
@@ -34,4 +34,4 @@
 po/.intltool-merge-cache
 src/gpointing-device-settings
 modules/gnome-settings-daemon-plugins/touchpad.gnome-settings-plugin
-modules/gnome-settings-daemon-plugins/trackpoint.gnome-settings-plugin
+modules/gnome-settings-daemon-plugins/mouse-extension.gnome-settings-plugin

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Mar  6 14:48:02 2009
@@ -156,7 +156,7 @@
 modules/common/Makefile
 modules/gnome-settings-daemon-plugins/Makefile
 data/Makefile
-data/trackpoint.ui
+data/mouse.ui
 data/touchpad.ui
 test/Makefile
 po/Makefile.in

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Fri Mar  6 14:48:02 2009
@@ -1,9 +1,9 @@
 gpds_ui_DATA = 		\
-	trackpoint.ui	\
+	mouse.ui	\
 	touchpad.ui
 
 gpds_icon_DATA = 	\
-	trackpoint.png	\
+	mouse.png	\
 	touchpad.png
 
 @INTLTOOL_SCHEMAS_RULE@
@@ -15,7 +15,7 @@
 schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
 
 EXTRA_DIST = 			\
-	trackpoint.ui.in	\
+	mouse.ui.in	        \
 	touchpad.ui.in		\
 	$(gpds_icon_DATA)	\
 	$(schemas_in_files)

Copied: trunk/data/mouse.png (from r133, /trunk/data/trackpoint.png)
==============================================================================

Copied: trunk/data/mouse.ui.in (from r133, /trunk/data/trackpoint.ui.in)
==============================================================================
--- /trunk/data/trackpoint.ui.in	(original)
+++ trunk/data/mouse.ui.in	Fri Mar  6 14:48:02 2009
@@ -5,7 +5,7 @@
     <child>
       <object class="GtkImage" id ="main-widget-label-icon">
         <property name="visible">True</property>
-        <property name="file">@prefix@/share/gpointing-device-settings/icon/trackpoint.png</property>
+        <property name="file">@prefix@/share/gpointing-device-settings/icon/mouse.png</property>
       </object>
     </child>
     <child>

Modified: trunk/modules/Makefile.am
==============================================================================
--- trunk/modules/Makefile.am	(original)
+++ trunk/modules/Makefile.am	Fri Mar  6 14:48:02 2009
@@ -17,7 +17,7 @@
   	-export-dynamic $(LIBTOOL_EXPORT_OPTIONS)
 
 gpds_module_LTLIBRARIES = 	\
-	trackpoint.la		\
+	mouse.la		\
 	touchpad.la
 
 LIBS =					\
@@ -26,10 +26,10 @@
 	$(GCONF2_LIBS)			\
 	$(GNOME_SETTINGS_DAEMON_LIBS)
 
-trackpoint_la_SOURCES = 		\
-	gpds-trackpoint-ui.c
+mouse_la_SOURCES = 		\
+	gpds-mouse-ui.c
 
-trackpoint_la_LIBADD = $(top_builddir)/modules/common/libmouse_common.la
+mouse_la_LIBADD = $(top_builddir)/modules/common/libmouse_common.la
 
 touchpad_la_SOURCES = 			\
 	gpds-touchpad-ui.c

Modified: trunk/modules/gnome-settings-daemon-plugins/Makefile.am
==============================================================================
--- trunk/modules/gnome-settings-daemon-plugins/Makefile.am	(original)
+++ trunk/modules/gnome-settings-daemon-plugins/Makefile.am	Fri Mar  6 14:48:02 2009
@@ -22,8 +22,8 @@
 	$(GCONF2_LIBS)			\
 	$(GNOME_SETTINGS_DAEMON_LIBS)
 
-gsd_plugin_LTLIBRARIES =	\
-	libtrackpoint.la	\
+gsd_plugin_LTLIBRARIES =	        \
+	libmouse-extension.la           \
 	libtouchpad.la
 
 gsd_plugin_CFLAGS =					\
@@ -31,13 +31,13 @@
 	$(GNOME_SETTINGS_DAEMON_CFLAGS)			\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(localedir)"\"
 
-libtrackpoint_la_CFLAGS = $(gsd_plugin_CFLAGS)
-libtrackpoint_la_SOURCES = 		\
-	gsd-trackpoint-plugin.c		\
-	gsd-trackpoint-manager.h	\
-	gsd-trackpoint-manager.c
+libmouse_extension_la_CFLAGS = $(gsd_plugin_CFLAGS)
+libmouse_extension_la_SOURCES = 		\
+	gsd-mouse-extension-plugin.c	\
+	gsd-mouse-extension-manager.h	\
+	gsd-mouse-extension-manager.c
 
-libtrackpoint_la_LIBADD = $(top_builddir)/modules/common/libmouse_common.la
+libmouse_extension_la_LIBADD = $(top_builddir)/modules/common/libmouse_common.la
 
 libtouchpad_la_CFLAGS = $(gsd_plugin_CFLAGS)
 libtouchpad_la_SOURCES = 		\
@@ -47,8 +47,8 @@
 
 libtouchpad_la_LIBADD = $(top_builddir)/modules/common/libtouchpad_common.la
 
-gsd_plugin_in_files =	 			\
-	trackpoint.gnome-settings-plugin.in	\
+gsd_plugin_in_files =	 			        \
+	mouse-extension.gnome-settings-plugin.in	\
 	touchpad.gnome-settings-plugin.in
 
 gsd_plugin_DATA = $(gsd_plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)

Copied: trunk/modules/gnome-settings-daemon-plugins/gsd-mouse-extension-manager.c (from r133, /trunk/modules/gnome-settings-daemon-plugins/gsd-trackpoint-manager.c)
==============================================================================
--- /trunk/modules/gnome-settings-daemon-plugins/gsd-trackpoint-manager.c	(original)
+++ trunk/modules/gnome-settings-daemon-plugins/gsd-mouse-extension-manager.c	Fri Mar  6 14:48:02 2009
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include "gsd-trackpoint-manager.h"
+#include "gsd-mouse-extension-manager.h"
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 #include <gpds-xinput.h>
@@ -30,49 +30,49 @@
 #include "gpds-mouse-definitions.h"
 #include "gpds-mouse-xinput.h"
 
-#define GSD_TRACK_POINT_MANAGER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), GSD_TYPE_TRACK_POINT_MANAGER, GsdTrackPointManagerPrivate))
+#define GSD_MOUSE_EXTENSION_MANAGER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), GSD_TYPE_MOUSE_EXTENSION_MANAGER, GsdMouseExtensionManagerPrivate))
 
-typedef struct _GsdTrackPointManagerPrivate  GsdTrackPointManagerPrivate;
-struct _GsdTrackPointManagerPrivate
+typedef struct _GsdMouseExtensionManagerPrivate  GsdMouseExtensionManagerPrivate;
+struct _GsdMouseExtensionManagerPrivate
 {
     GConfClient *gconf;
     guint notify_id;
 };
 
-G_DEFINE_TYPE (GsdTrackPointManager, gsd_track_point_manager, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GsdMouseExtensionManager, gsd_mouse_extension_manager, G_TYPE_OBJECT)
 
 static gpointer manager_object = NULL;
 
 static void
-gsd_track_point_manager_init (GsdTrackPointManager *manager)
+gsd_mouse_extension_manager_init (GsdMouseExtensionManager *manager)
 {
-    GsdTrackPointManagerPrivate *priv;
+    GsdMouseExtensionManagerPrivate *priv;
 
-    priv = GSD_TRACK_POINT_MANAGER_GET_PRIVATE(manager);
+    priv = GSD_MOUSE_EXTENSION_MANAGER_GET_PRIVATE(manager);
 
     priv->gconf = NULL;
     priv->notify_id = 0;
 }
 
 static void
-gsd_track_point_manager_class_init (GsdTrackPointManagerClass *klass)
+gsd_mouse_extension_manager_class_init (GsdMouseExtensionManagerClass *klass)
 {
     GObjectClass   *gobject_class = G_OBJECT_CLASS(klass);
 
-    g_type_class_add_private(gobject_class, sizeof(GsdTrackPointManagerPrivate));
+    g_type_class_add_private(gobject_class, sizeof(GsdMouseExtensionManagerPrivate));
 }
 
-GsdTrackPointManager *
-gsd_track_point_manager_new (void)
+GsdMouseExtensionManager *
+gsd_mouse_extension_manager_new (void)
 {
     if (manager_object != NULL) {
         g_object_ref(manager_object);
     } else {
-        manager_object = g_object_new(GSD_TYPE_TRACK_POINT_MANAGER, NULL);
+        manager_object = g_object_new(GSD_TYPE_MOUSE_EXTENSION_MANAGER, NULL);
         g_object_add_weak_pointer(manager_object, (gpointer *)&manager_object);
     }
 
-    return GSD_TRACK_POINT_MANAGER(manager_object);
+    return GSD_MOUSE_EXTENSION_MANAGER(manager_object);
 }
 
 static void
@@ -181,26 +181,36 @@
     g_object_unref(xinput);
 }
 
+static gchar *
+build_gconf_dir (const gchar *device_name)
+{
+    gchar *escaped_device_name;
+    gchar *gconf_dir;
+
+    escaped_device_name = gconf_escape_key(device_name, -1);
+    gconf_dir = g_strdup_printf("%s/%s",
+                                GPDS_MOUSE_GCONF_DIR,
+                                escaped_device_name);
+    g_free(escaped_device_name);
+    return gconf_dir;
+}
+
 gboolean
-gsd_track_point_manager_start (GsdTrackPointManager *manager,
-                               GError              **error)
+gsd_mouse_extension_manager_start (GsdMouseExtensionManager *manager,
+                                   GError              **error)
 {
-    GsdTrackPointManagerPrivate *priv;
+    GsdMouseExtensionManagerPrivate *priv;
     gchar *gconf_dir;
     const gchar *device_name;
-    gchar *escaped_device_name;
-
-    priv = GSD_TRACK_POINT_MANAGER_GET_PRIVATE(manager);
-    priv->gconf = gconf_client_get_default();
 
     device_name = gpds_mouse_xinput_find_device_name();
     if (!device_name)
         return FALSE;
 
-    escaped_device_name = gconf_escape_key(device_name, -1);
-    gconf_dir = g_strdup_printf("%s/%s",
-                                GPDS_MOUSE_GCONF_DIR,
-                                escaped_device_name);
+    priv = GSD_MOUSE_EXTENSION_MANAGER_GET_PRIVATE(manager);
+    priv->gconf = gconf_client_get_default();
+
+    gconf_dir = build_gconf_dir(device_name);
     gconf_client_add_dir(priv->gconf,
                          gconf_dir,
                          GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
@@ -210,23 +220,30 @@
                                               manager,
                                               NULL,
                                               NULL);
-    g_free(escaped_device_name);
     g_free(gconf_dir);
 
     return TRUE;
 }
 
 void
-gsd_track_point_manager_stop (GsdTrackPointManager *manager)
+gsd_mouse_extension_manager_stop (GsdMouseExtensionManager *manager)
 {
-    GsdTrackPointManagerPrivate *priv;
+    GsdMouseExtensionManagerPrivate *priv;
 
-    priv = GSD_TRACK_POINT_MANAGER_GET_PRIVATE(manager);
+    priv = GSD_MOUSE_EXTENSION_MANAGER_GET_PRIVATE(manager);
 
     if (priv->notify_id) {
-        gconf_client_remove_dir(priv->gconf,
-                                GPDS_MOUSE_GCONF_DIR,
-                                NULL);
+        const gchar *device_name;
+
+        device_name = gpds_mouse_xinput_find_device_name();
+        if (device_name) {
+            gchar *gconf_dir;
+            gconf_dir = build_gconf_dir(device_name);
+            gconf_client_remove_dir(priv->gconf,
+                                    GPDS_MOUSE_GCONF_DIR,
+                                    NULL);
+            g_free(gconf_dir);
+        }
         gconf_client_notify_remove(priv->gconf, priv->notify_id);
         priv->notify_id = 0;
     }

Added: trunk/modules/gnome-settings-daemon-plugins/gsd-mouse-extension-manager.h
==============================================================================
--- (empty file)
+++ trunk/modules/gnome-settings-daemon-plugins/gsd-mouse-extension-manager.h	Fri Mar  6 14:48:02 2009
@@ -0,0 +1,59 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ *  Copyright (C) 2009 Hiroyuki Ikezoe  <poincare ikezoe net>
+ *
+ *  This library is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef __GSD_MOUSE_EXTENSION_MANAGER_H__
+#define __GSD_MOUSE_EXTENSION_MANAGER_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define GSD_TYPE_MOUSE_EXTENSION_MANAGER            (gsd_mouse_extension_manager_get_type ())
+#define GSD_MOUSE_EXTENSION_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_MOUSE_EXTENSION_MANAGER, GsdMouseExtensionManager))
+#define GSD_MOUSE_EXTENSION_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GSD_TYPE_MOUSE_EXTENSION_MANAGER, GsdTracklassPointManagerClass))
+#define GSD_IS_MOUSE_EXTENSION_MANAGER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSD_TYPE_MOUSE_EXTENSION_MANAGER))
+#define GSD_IS_MOUSE_EXTENSION_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSD_TYPE_MOUSE_EXTENSION_MANAGER))
+#define GSD_MOUSE_EXTENSION_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GSD_TYPE_MOUSE_EXTENSION_MANAGER, GsdTracklassPointManagerClass))
+
+typedef struct _GsdMouseExtensionManager GsdMouseExtensionManager;
+typedef struct _GsdMouseExtensionManagerClass GsdMouseExtensionManagerClass;
+
+struct _GsdMouseExtensionManager
+{
+    GObject parent;
+};
+
+struct _GsdMouseExtensionManagerClass
+{
+    GObjectClass parent_class;
+}; 
+
+GType gsd_mouse_extension_manager_get_type (void) G_GNUC_CONST;
+
+GsdMouseExtensionManager *gsd_mouse_extension_manager_new   (void);
+gboolean                  gsd_mouse_extension_manager_start (GsdMouseExtensionManager *manager,
+                                                             GError                  **error);
+void                      gsd_mouse_extension_manager_stop  (GsdMouseExtensionManager *manager);
+
+G_END_DECLS
+
+#endif /* __GSD_MOUSE_EXTENSION_MANAGER_H__ */
+/*
+vi:ts=4:nowrap:ai:expandtab:sw=4
+*/

Added: trunk/modules/gnome-settings-daemon-plugins/gsd-mouse-extension-plugin.c
==============================================================================
--- (empty file)
+++ trunk/modules/gnome-settings-daemon-plugins/gsd-mouse-extension-plugin.c	Fri Mar  6 14:48:02 2009
@@ -0,0 +1,95 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ *  Copyright (C) 2009 Hiroyuki Ikezoe  <poincare ikezoe net>
+ *
+ *  This library is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+/* #include <gnome-settings-daemon/gnome-settings-plugin.h> */
+#include "gnome-settings-plugin.h"
+#include <glib/gi18n.h>
+
+#include "gsd-mouse-extension-manager.h"
+
+#define GSD_TYPE_MOUSE_EXTENSION_PLUGIN            (gsd_mouse_extension_plugin_get_type ())
+#define GSD_MOUSE_EXTENSION_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_MOUSE_EXTENSION_PLUGIN, GsdMouseExtensionPlugin))
+#define GSD_MOUSE_EXTENSION_PLUGIN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GSD_TYPE_MOUSE_EXTENSION_PLUGIN, GsdTracklassPointPluginClass))
+#define GSD_IS_MOUSE_EXTENSION_PLUGIN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSD_TYPE_MOUSE_EXTENSION_PLUGIN))
+#define GSD_IS_MOUSE_EXTENSION_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSD_TYPE_MOUSE_EXTENSION_PLUGIN))
+#define GSD_MOUSE_EXTENSION_PLUGIN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GSD_TYPE_MOUSE_EXTENSION_PLUGIN, GsdTracklassPointPluginClass))
+
+typedef struct _GsdMouseExtensionPlugin GsdMouseExtensionPlugin;
+typedef struct _GsdMouseExtensionPluginClass GsdMouseExtensionPluginClass;
+
+struct _GsdMouseExtensionPlugin
+{
+    GnomeSettingsPlugin parent;
+    GsdMouseExtensionManager *manager;
+};
+
+struct _GsdMouseExtensionPluginClass
+{
+    GnomeSettingsPluginClass parent_class;
+}; 
+
+GType gsd_mouse_extension_plugin_get_type (void) G_GNUC_CONST;
+G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module);
+
+GNOME_SETTINGS_PLUGIN_REGISTER(GsdMouseExtensionPlugin, gsd_mouse_extension_plugin)
+
+static void
+gsd_mouse_extension_plugin_init (GsdMouseExtensionPlugin *plugin)
+{
+    plugin->manager = NULL;
+}
+
+static void
+activate (GnomeSettingsPlugin *plugin)
+{
+    GsdMouseExtensionPlugin *mouse_extension_plugin;
+
+    mouse_extension_plugin = GSD_MOUSE_EXTENSION_PLUGIN(plugin); 
+    mouse_extension_plugin->manager = gsd_mouse_extension_manager_new();
+    gsd_mouse_extension_manager_start(mouse_extension_plugin->manager, NULL);
+}
+
+static void
+deactivate (GnomeSettingsPlugin *plugin)
+{
+    GsdMouseExtensionPlugin *mouse_extension_plugin;
+
+    mouse_extension_plugin = GSD_MOUSE_EXTENSION_PLUGIN(plugin); 
+    if (mouse_extension_plugin->manager) {
+        gsd_mouse_extension_manager_stop(mouse_extension_plugin->manager);
+        g_object_unref(mouse_extension_plugin->manager);
+        mouse_extension_plugin->manager = NULL;
+    }
+}
+
+static void
+gsd_mouse_extension_plugin_class_init (GsdMouseExtensionPluginClass *klass)
+{
+    GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS(klass);
+
+    plugin_class->activate = activate;
+    plugin_class->deactivate = deactivate;
+}
+/*
+vi:ts=4:nowrap:ai:expandtab:sw=4
+*/

Added: trunk/modules/gnome-settings-daemon-plugins/mouse-extension.gnome-settings-plugin.in
==============================================================================
--- (empty file)
+++ trunk/modules/gnome-settings-daemon-plugins/mouse-extension.gnome-settings-plugin.in	Fri Mar  6 14:48:02 2009
@@ -0,0 +1,8 @@
+[GNOME Settings Plugin]
+Module=mouse-extension
+IAge=0
+_Name=MouseExtension
+_Description=MouseExtension plugin
+Authors=
+Copyright=Copyright  2009
+Website=

Copied: trunk/modules/gpds-mouse-ui.c (from r133, /trunk/modules/gpds-trackpoint-ui.c)
==============================================================================
--- /trunk/modules/gpds-trackpoint-ui.c	(original)
+++ trunk/modules/gpds-mouse-ui.c	Fri Mar  6 14:48:02 2009
@@ -30,17 +30,17 @@
 #include "gpds-mouse-definitions.h"
 #include "gpds-mouse-xinput.h"
 
-#define GPDS_TYPE_TRACK_POINT_UI            (gpds_track_point_ui_get_type())
-#define GPDS_TRACK_POINT_UI(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GPDS_TYPE_TRACK_POINT_UI, GpdsTrackPointUI))
-#define GPDS_TRACK_POINT_UI_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GPDS_TYPE_TRACK_POINT_UI, GpdsTrackPointUIClass))
-#define G_IS_TRACK_POINT_UI(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GPDS_TYPE_TRACK_POINT_UI))
-#define G_IS_TRACK_POINT_UI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GPDS_TYPE_TRACK_POINT_UI))
-#define GPDS_TRACK_POINT_UI_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GPDS_TYPE_TRACK_POINT_UI, GpdsTrackPointUIClass))
+#define GPDS_TYPE_MOUSE_UI            (gpds_mouse_ui_get_type())
+#define GPDS_MOUSE_UI(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GPDS_TYPE_MOUSE_UI, GpdsMouseUI))
+#define GPDS_MOUSE_UI_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GPDS_TYPE_MOUSE_UI, GpdsMouseUIClass))
+#define G_IS_MOUSE_UI(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GPDS_TYPE_MOUSE_UI))
+#define G_IS_MOUSE_UI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GPDS_TYPE_MOUSE_UI))
+#define GPDS_MOUSE_UI_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GPDS_TYPE_MOUSE_UI, GpdsMouseUIClass))
 
-typedef struct _GpdsTrackPointUI GpdsTrackPointUI;
-typedef struct _GpdsTrackPointUIClass GpdsTrackPointUIClass;
+typedef struct _GpdsMouseUI GpdsMouseUI;
+typedef struct _GpdsMouseUIClass GpdsMouseUIClass;
 
-struct _GpdsTrackPointUI
+struct _GpdsMouseUI
 {
     GpdsUI parent;
     GpdsXInput *xinput;
@@ -49,12 +49,12 @@
     gchar *device_name;
 };
 
-struct _GpdsTrackPointUIClass
+struct _GpdsMouseUIClass
 {
     GpdsUIClass parent_class;
 };
 
-GType gpds_track_point_ui_get_type (void) G_GNUC_CONST;
+GType gpds_mouse_ui_get_type (void) G_GNUC_CONST;
 
 static void       dispose            (GObject *object);
 static gboolean   is_available       (GpdsUI  *ui, GError **error);
@@ -62,10 +62,10 @@
 static GtkWidget *get_content_widget (GpdsUI  *ui, GError **error);
 static GtkWidget *get_label_widget   (GpdsUI  *ui, GError **error);
 
-G_DEFINE_DYNAMIC_TYPE(GpdsTrackPointUI, gpds_track_point_ui, GPDS_TYPE_UI)
+G_DEFINE_DYNAMIC_TYPE(GpdsMouseUI, gpds_mouse_ui, GPDS_TYPE_UI)
 
 static void
-gpds_track_point_ui_class_init (GpdsTrackPointUIClass *klass)
+gpds_mouse_ui_class_init (GpdsMouseUIClass *klass)
 {
     GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
     GpdsUIClass *ui_class = GPDS_UI_CLASS(klass);
@@ -79,7 +79,7 @@
 }
 
 static void
-gpds_track_point_ui_class_finalize (GpdsTrackPointUIClass *klass)
+gpds_mouse_ui_class_finalize (GpdsMouseUIClass *klass)
 {
 }
 
@@ -93,11 +93,11 @@
 }
 
 static void
-gpds_track_point_ui_init (GpdsTrackPointUI *ui)
+gpds_mouse_ui_init (GpdsMouseUI *ui)
 {
     ui->xinput = NULL;
     ui->ui_file_path = g_build_filename(get_ui_file_directory(),
-                                        "trackpoint.ui",
+                                        "mouse.ui",
                                         NULL);
     ui->gconf = gconf_client_get_default();
     ui->device_name = NULL;
@@ -106,7 +106,7 @@
 G_MODULE_EXPORT void
 GPDS_MODULE_IMPL_INIT (GTypeModule *type_module)
 {
-    gpds_track_point_ui_register_type(type_module);
+    gpds_mouse_ui_register_type(type_module);
 }
 
 G_MODULE_EXPORT void
@@ -117,13 +117,13 @@
 G_MODULE_EXPORT GObject *
 GPDS_MODULE_IMPL_INSTANTIATE (void)
 {
-    return g_object_new(GPDS_TYPE_TRACK_POINT_UI, NULL);
+    return g_object_new(GPDS_TYPE_MOUSE_UI, NULL);
 }
 
 static void
 dispose (GObject *object)
 {
-    GpdsTrackPointUI *ui = GPDS_TRACK_POINT_UI(object);
+    GpdsMouseUI *ui = GPDS_MOUSE_UI(object);
 
     if (ui->xinput) {
         g_object_unref(ui->xinput);
@@ -138,12 +138,12 @@
     g_free(ui->ui_file_path);
     g_free(ui->device_name);
 
-    if (G_OBJECT_CLASS(gpds_track_point_ui_parent_class)->dispose)
-        G_OBJECT_CLASS(gpds_track_point_ui_parent_class)->dispose(object);
+    if (G_OBJECT_CLASS(gpds_mouse_ui_parent_class)->dispose)
+        G_OBJECT_CLASS(gpds_mouse_ui_parent_class)->dispose(object);
 }
 
 static gchar *
-build_gconf_key (GpdsTrackPointUI *ui, const gchar *key)
+build_gconf_key (GpdsMouseUI *ui, const gchar *key)
 {
     gchar *gconf_key;
     gchar *device_name;
@@ -232,7 +232,7 @@
 }
 
 static gboolean
-exist_gconf_dir (GpdsTrackPointUI *ui)
+exist_gconf_dir (GpdsMouseUI *ui)
 {
     gboolean exist;
     gchar *dir;
@@ -248,7 +248,7 @@
 }
 
 static void
-set_gconf_bool (GpdsTrackPointUI *ui, const gchar *key, gboolean value)
+set_gconf_bool (GpdsMouseUI *ui, const gchar *key, gboolean value)
 {
     gchar *gconf_key;
 
@@ -258,7 +258,7 @@
 }
 
 static gboolean
-get_gconf_bool (GpdsTrackPointUI *ui, const gchar *key)
+get_gconf_bool (GpdsMouseUI *ui, const gchar *key)
 {
     gchar *gconf_key;
     gboolean value;
@@ -270,7 +270,7 @@
 }
 
 static void
-set_gconf_int (GpdsTrackPointUI *ui, const gchar *key, gint value)
+set_gconf_int (GpdsMouseUI *ui, const gchar *key, gint value)
 {
     gchar *gconf_key;
 
@@ -280,7 +280,7 @@
 }
 
 static gint
-get_gconf_int (GpdsTrackPointUI *ui, const gchar *key)
+get_gconf_int (GpdsMouseUI *ui, const gchar *key)
 {
     gchar *gconf_key;
     gint value;
@@ -294,7 +294,7 @@
 static void
 cb_middle_button_emulation_toggled (GtkToggleButton *button, gpointer user_data)
 {
-    GpdsTrackPointUI *ui = GPDS_TRACK_POINT_UI(user_data);
+    GpdsMouseUI *ui = GPDS_MOUSE_UI(user_data);
     GtkBuilder *builder;
     gboolean enable;
 
@@ -310,7 +310,7 @@
 static void
 cb_wheel_emulation_toggled (GtkToggleButton *button, gpointer user_data)
 {
-    GpdsTrackPointUI *ui = GPDS_TRACK_POINT_UI(user_data);
+    GpdsMouseUI *ui = GPDS_MOUSE_UI(user_data);
     GtkBuilder *builder;
     gboolean enable;
 
@@ -324,7 +324,7 @@
 }
 
 static void
-set_scroll_axes_property (GpdsTrackPointUI *ui)
+set_scroll_axes_property (GpdsMouseUI *ui)
 {
     GtkBuilder *builder;
     GtkToggleButton *button;
@@ -375,7 +375,7 @@
 cb_wheel_emulation_vertical_toggled (GtkToggleButton *button, gpointer user_data)
 {
     gboolean enable;
-    GpdsTrackPointUI *ui = GPDS_TRACK_POINT_UI(user_data);
+    GpdsMouseUI *ui = GPDS_MOUSE_UI(user_data);
     set_scroll_axes_property(ui);
 
     enable = gtk_toggle_button_get_active(button);
@@ -386,7 +386,7 @@
 cb_wheel_emulation_horizontal_toggled (GtkToggleButton *button, gpointer user_data)
 {
     gboolean enable;
-    GpdsTrackPointUI *ui = GPDS_TRACK_POINT_UI(user_data);
+    GpdsMouseUI *ui = GPDS_MOUSE_UI(user_data);
     set_scroll_axes_property(ui);
 
     enable = gtk_toggle_button_get_active(button);
@@ -397,7 +397,7 @@
 cb_wheel_emulation_timeout_value_changed (GtkSpinButton *button, gpointer user_data)
 {
     gdouble time;
-    GpdsTrackPointUI *ui = GPDS_TRACK_POINT_UI(user_data);
+    GpdsMouseUI *ui = GPDS_MOUSE_UI(user_data);
     set_spin_property(ui->xinput, button, GPDS_MOUSE_WHEEL_EMULATION_TIMEOUT);
 
     time = gtk_spin_button_get_value(button);
@@ -408,7 +408,7 @@
 cb_wheel_emulation_inertia_value_changed (GtkSpinButton *button, gpointer user_data)
 {
     gdouble inertia;
-    GpdsTrackPointUI *ui = GPDS_TRACK_POINT_UI(user_data);
+    GpdsMouseUI *ui = GPDS_MOUSE_UI(user_data);
     set_spin_property(ui->xinput, button, GPDS_MOUSE_WHEEL_EMULATION_INERTIA);
 
     inertia = gtk_spin_button_get_value(button);
@@ -419,7 +419,7 @@
 cb_middle_button_timeout_value_changed (GtkSpinButton *button, gpointer user_data)
 {
     gdouble time;
-    GpdsTrackPointUI *ui = GPDS_TRACK_POINT_UI(user_data);
+    GpdsMouseUI *ui = GPDS_MOUSE_UI(user_data);
     set_spin_property(ui->xinput, button, GPDS_MOUSE_MIDDLE_BUTTON_TIMEOUT);
 
     time = gtk_spin_button_get_value(button);
@@ -470,7 +470,7 @@
 }
 
 static void
-set_integer_property_from_preference (GpdsTrackPointUI *ui,
+set_integer_property_from_preference (GpdsMouseUI *ui,
                                       GpdsMouseProperty property,
                                       const gchar *gconf_key_name,
                                       GtkBuilder *builder,
@@ -502,7 +502,7 @@
 }
 
 static void
-set_boolean_property_from_preference (GpdsTrackPointUI *ui,
+set_boolean_property_from_preference (GpdsMouseUI *ui,
                                       GpdsMouseProperty property,
                                       const gchar *gconf_key_name,
                                       GtkBuilder *builder,
@@ -538,7 +538,7 @@
 }
 
 static void
-set_scroll_axes_property_from_preference (GpdsTrackPointUI *ui,
+set_scroll_axes_property_from_preference (GpdsMouseUI *ui,
                                           GtkBuilder *builder)
 {
     GObject *object;
@@ -576,35 +576,35 @@
 static void
 setup_current_values (GpdsUI *ui, GtkBuilder *builder)
 {
-    GpdsTrackPointUI *track_point_ui = GPDS_TRACK_POINT_UI(ui);
+    GpdsMouseUI *mouse_ui = GPDS_MOUSE_UI(ui);
 
-    set_boolean_property_from_preference(track_point_ui,
+    set_boolean_property_from_preference(mouse_ui,
                                          GPDS_MOUSE_MIDDLE_BUTTON_EMULATION,
                                          GPDS_MOUSE_MIDDLE_BUTTON_EMULATION_KEY,
                                          builder,
                                          "middle_button_emulation");
-    set_boolean_property_from_preference(track_point_ui,
+    set_boolean_property_from_preference(mouse_ui,
                                          GPDS_MOUSE_WHEEL_EMULATION,
                                          GPDS_MOUSE_WHEEL_EMULATION_KEY,
                                          builder,
                                          "wheel_emulation");
-    set_integer_property_from_preference(track_point_ui,
+    set_integer_property_from_preference(mouse_ui,
                                          GPDS_MOUSE_MIDDLE_BUTTON_TIMEOUT,
                                          GPDS_MOUSE_MIDDLE_BUTTON_TIMEOUT_KEY,
                                          builder,
                                          "middle_button_timeout");
-    set_integer_property_from_preference(track_point_ui,
+    set_integer_property_from_preference(mouse_ui,
                                          GPDS_MOUSE_WHEEL_EMULATION_TIMEOUT,
                                          GPDS_MOUSE_WHEEL_EMULATION_TIMEOUT_KEY,
                                          builder,
                                          "wheel_emulation_timeout");
-    set_integer_property_from_preference(track_point_ui,
+    set_integer_property_from_preference(mouse_ui,
                                          GPDS_MOUSE_WHEEL_EMULATION_INERTIA,
                                          GPDS_MOUSE_WHEEL_EMULATION_INERTIA_KEY,
                                          builder,
                                          "wheel_emulation_inertia");
 
-    set_scroll_axes_property_from_preference(track_point_ui,
+    set_scroll_axes_property_from_preference(mouse_ui,
                                              builder);
 }
 
@@ -618,21 +618,21 @@
         g_set_error(error,
                     GPDS_XINPUT_ERROR,
                     GPDS_XINPUT_ERROR_NO_DEVICE,
-                    _("No TrackPoint device found."));
+                    _("No Mouse device found."));
         return FALSE;
     }
 
-    if (!g_file_test(GPDS_TRACK_POINT_UI(ui)->ui_file_path,
+    if (!g_file_test(GPDS_MOUSE_UI(ui)->ui_file_path,
                      G_FILE_TEST_EXISTS)) {
         g_set_error(error,
                     GPDS_UI_ERROR,
                     GPDS_UI_ERROR_NO_UI_FILE,
                     _("%s did not find."),
-                    GPDS_TRACK_POINT_UI(ui)->ui_file_path);
+                    GPDS_MOUSE_UI(ui)->ui_file_path);
         return FALSE;
     }
 
-    GPDS_TRACK_POINT_UI(ui)->device_name = g_strdup(device_name);
+    GPDS_MOUSE_UI(ui)->device_name = g_strdup(device_name);
 
     return TRUE;
 }
@@ -645,12 +645,12 @@
     builder = gpds_ui_get_builder(ui);
 
     if (!gtk_builder_add_from_file(builder, 
-                                   GPDS_TRACK_POINT_UI(ui)->ui_file_path,
+                                   GPDS_MOUSE_UI(ui)->ui_file_path,
                                    error)) {
         return FALSE;
     }
 
-    GPDS_TRACK_POINT_UI(ui)->xinput = gpds_xinput_new(GPDS_TRACK_POINT_UI(ui)->device_name);
+    GPDS_MOUSE_UI(ui)->xinput = gpds_xinput_new(GPDS_MOUSE_UI(ui)->device_name);
 
     setup_current_values(ui, builder);
     setup_signals(ui, builder);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]