[gnome-control-center] wacom: Split out the tablet page
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] wacom: Split out the tablet page
- Date: Thu, 24 Nov 2011 19:15:41 +0000 (UTC)
commit 46bfcd1bc3cd848453b2845b145c3105bbc4cb35
Author: Bastien Nocera <hadess hadess net>
Date: Thu Nov 24 15:34:52 2011 +0000
wacom: Split out the tablet page
So we can reuse it for separate tablet configurations.
panels/wacom/Makefile.am | 4 +-
panels/wacom/cc-wacom-page.c | 466 ++++++++++++++++++++++++++++++++
panels/wacom/cc-wacom-page.h | 74 +++++
panels/wacom/cc-wacom-panel.c | 346 ++----------------------
panels/wacom/cc-wacom-panel.h | 5 +-
panels/wacom/gnome-wacom-properties.ui | 2 +-
6 files changed, 567 insertions(+), 330 deletions(-)
---
diff --git a/panels/wacom/Makefile.am b/panels/wacom/Makefile.am
index a9ba8b7..87b4edf 100644
--- a/panels/wacom/Makefile.am
+++ b/panels/wacom/Makefile.am
@@ -17,7 +17,9 @@ ccpanels_LTLIBRARIES = libwacom-properties.la
libwacom_properties_la_SOURCES = \
wacom-module.c \
cc-wacom-panel.c \
- cc-wacom-panel.h
+ cc-wacom-panel.h \
+ cc-wacom-page.c \
+ cc-wacom-page.h
libwacom_properties_la_LIBADD = $(PANEL_LIBS) $(WACOM_PANEL_LIBS)
libwacom_properties_la_LDFLAGS = $(PANEL_LDFLAGS)
diff --git a/panels/wacom/cc-wacom-page.c b/panels/wacom/cc-wacom-page.c
new file mode 100644
index 0000000..61f05ce
--- /dev/null
+++ b/panels/wacom/cc-wacom-page.c
@@ -0,0 +1,466 @@
+/*
+ * Copyright  2011 Red Hat, Inc.
+ *
+ * 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.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Peter Hutterer <peter hutterer redhat com>
+ * Bastien Nocera <hadess hadess net>
+ *
+ */
+
+#include <config.h>
+
+#include "cc-wacom-page.h"
+#include <gtk/gtk.h>
+
+#include <string.h>
+
+#define WID(x) (GtkWidget *) gtk_builder_get_object (priv->builder, x)
+
+G_DEFINE_TYPE (CcWacomPage, cc_wacom_page, GTK_TYPE_BOX)
+
+#define WACOM_PAGE_PRIVATE(o) \
+ (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_WACOM_PAGE, CcWacomPagePrivate))
+
+#define WACOM_SCHEMA "org.gnome.settings-daemon.peripherals.wacom"
+#define WACOM_STYLUS_SCHEMA WACOM_SCHEMA ".stylus"
+#define WACOM_ERASER_SCHEMA WACOM_SCHEMA ".eraser"
+
+struct _CcWacomPagePrivate
+{
+ GtkBuilder *builder;
+ GSettings *wacom_settings;
+ GSettings *stylus_settings;
+ GSettings *eraser_settings;
+ /* The UI doesn't support cursor/pad at the moment */
+};
+
+/* Button combo box storage columns */
+enum {
+ BUTTONNUMBER_COLUMN,
+ BUTTONNAME_COLUMN,
+ N_BUTTONCOLUMNS
+};
+
+/* Tablet mode combo box storage columns */
+enum {
+ MODENUMBER_COLUMN,
+ MODELABEL_COLUMN,
+ N_MODECOLUMNS
+};
+
+/* Tablet mode options - keep in sync with .ui */
+enum {
+ MODE_ABSOLUTE, /* stylus + eraser absolute */
+ MODE_RELATIVE, /* stylus + eraser relative */
+};
+
+/* GSettings stores pressurecurve as 4 values like the driver. We map slider
+ * scale to these values given the array below. These settings were taken from
+ * wacomcpl, where they've been around for years.
+ */
+#define N_PRESSURE_CURVES 7
+static const gint32 PRESSURE_CURVES[N_PRESSURE_CURVES][4] = {
+ { 0, 75, 25, 100 }, /* soft */
+ { 0, 50, 50, 100 },
+ { 0, 25, 75, 100 },
+ { 0, 0, 100, 100 }, /* neutral */
+ { 25, 0, 100, 75 },
+ { 50, 0, 100, 50 },
+ { 75, 0, 100, 25 } /* firm */
+};
+
+static void
+set_pressurecurve (GtkRange *range, GSettings *settings)
+{
+ gint slider_val = gtk_range_get_value (range);
+ GVariant *values[4],
+ *array;
+ int i;
+
+ for (i = 0; i < G_N_ELEMENTS (values); i++)
+ values[i] = g_variant_new_int32 (PRESSURE_CURVES[slider_val][i]);
+
+ array = g_variant_new_array (G_VARIANT_TYPE_INT32, values, G_N_ELEMENTS (values));
+
+ g_settings_set_value (settings, "pressurecurve", array);
+
+ g_variant_unref (array);
+}
+
+static void
+tip_feel_value_changed_cb (GtkRange *range, gpointer user_data)
+{
+ set_pressurecurve (range, CC_WACOM_PAGE(user_data)->priv->stylus_settings);
+}
+
+static void
+eraser_feel_value_changed_cb (GtkRange *range, gpointer user_data)
+{
+ set_pressurecurve (range, CC_WACOM_PAGE(user_data)->priv->eraser_settings);
+}
+
+static void
+set_feel_from_gsettings (GtkAdjustment *adjustment, GSettings *settings)
+{
+ GVariant *variant;
+ const gint32 *values;
+ gsize nvalues;
+ int i;
+
+ variant = g_settings_get_value (settings, "pressurecurve");
+ values = g_variant_get_fixed_array (variant, &nvalues, sizeof (gint32));
+
+ if (nvalues != 4) {
+ g_warning ("Invalid pressure curve format, expected 4 values (got %ld)", nvalues);
+ return;
+ }
+
+ for (i = 0; i < N_PRESSURE_CURVES; i++) {
+ if (memcmp (PRESSURE_CURVES[i], values, sizeof (gint32) * 4) == 0) {
+ gtk_adjustment_set_value (adjustment, i);
+ break;
+ }
+ }
+}
+
+static void
+tabletmode_changed_cb (GtkComboBox *combo, gpointer user_data)
+{
+ CcWacomPagePrivate *priv = CC_WACOM_PAGE(user_data)->priv;
+ GtkListStore *liststore;
+ GtkTreeIter iter;
+ gint mode;
+ gboolean is_absolute;
+
+ if (!gtk_combo_box_get_active_iter (combo, &iter))
+ return;
+
+ liststore = GTK_LIST_STORE (WID ("liststore-tabletmode"));
+ gtk_tree_model_get (GTK_TREE_MODEL (liststore), &iter,
+ MODENUMBER_COLUMN, &mode,
+ -1);
+
+ is_absolute = (mode == MODE_ABSOLUTE);
+ g_settings_set_boolean (priv->wacom_settings, "is-absolute", is_absolute);
+}
+
+static void
+left_handed_toggled_cb (GtkSwitch *sw, GParamSpec *pspec, gpointer *user_data)
+{
+ CcWacomPagePrivate *priv = CC_WACOM_PAGE(user_data)->priv;
+ const gchar* rotation;
+
+ rotation = gtk_switch_get_active (sw) ? "half" : "none";
+
+ g_settings_set_string (priv->wacom_settings, "rotation", rotation);
+}
+
+static void
+set_left_handed_from_gsettings (CcWacomPage *page)
+{
+ CcWacomPagePrivate *priv = CC_WACOM_PAGE(page)->priv;
+ const gchar* rotation;
+
+ rotation = g_settings_get_string (priv->wacom_settings, "rotation");
+ if (strcmp (rotation, "half") == 0)
+ gtk_switch_set_active (GTK_SWITCH (WID ("switch-left-handed")), TRUE);
+}
+
+static void
+set_mode_from_gsettings (GtkComboBox *combo, CcWacomPage *page)
+{
+ CcWacomPagePrivate *priv = page->priv;
+ gboolean is_absolute;
+
+ is_absolute = g_settings_get_boolean (priv->wacom_settings, "is-absolute");
+
+ /* this must be kept in sync with the .ui file */
+ gtk_combo_box_set_active (combo, is_absolute ? MODE_ABSOLUTE : MODE_RELATIVE);
+}
+
+static void
+set_button_mapping_from_gsettings (GtkComboBox *combo, GSettings* settings, gint current_button)
+{
+ GVariant *current;
+ gsize nvalues;
+ const gint *values;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ gboolean valid;
+
+ current = g_settings_get_value (settings, "buttonmapping");
+ values = g_variant_get_fixed_array (current, &nvalues, sizeof (gint32));
+ model = gtk_combo_box_get_model (combo);
+ valid = gtk_tree_model_get_iter_first (model, &iter);
+
+ while (valid) {
+ gint button;
+
+ gtk_tree_model_get (model, &iter,
+ BUTTONNUMBER_COLUMN, &button,
+ -1);
+
+ /* Currently button values match logical X buttons. If we
+ * introduce things like double-click, this code must
+ * change. Recommendation: use negative buttons numbers for
+ * special ones.
+ */
+
+ /* 0 vs 1-indexed array/button numbers */
+ if (button == values[current_button - 1]) {
+ gtk_combo_box_set_active_iter (combo, &iter);
+ break;
+ }
+
+ valid = gtk_tree_model_iter_next (model, &iter);
+ }
+}
+
+static void
+map_button (GSettings *settings, int button2, int button3)
+{
+ GVariant *current; /* current mapping */
+ GVariant *array; /* new mapping */
+ GVariant **tmp;
+ gsize nvalues;
+ const gint *values;
+ gint i;
+
+ current = g_settings_get_value (settings, "buttonmapping");
+ values = g_variant_get_fixed_array (current, &nvalues, sizeof (gint32));
+
+ tmp = g_malloc (nvalues * sizeof (GVariant*));
+ for (i = 0; i < nvalues; i++) {
+ if (i == 1) /* zero indexed array vs one-indexed buttons */
+ tmp[i] = g_variant_new_int32 (button2);
+ else if (i == 2)
+ tmp[i] = g_variant_new_int32 (button3);
+ else
+ tmp[i] = g_variant_new_int32 (values[i]);
+ }
+
+ array = g_variant_new_array (G_VARIANT_TYPE_INT32, tmp, nvalues);
+ g_settings_set_value (settings, "buttonmapping", array);
+
+ g_free (tmp);
+ g_variant_unref (array);
+}
+
+static void
+button_changed_cb (GtkComboBox *combo, gpointer user_data)
+{
+ CcWacomPagePrivate *priv = CC_WACOM_PAGE(user_data)->priv;
+ GtkTreeIter iter;
+ GtkListStore *liststore;
+ gint mapping_b2,
+ mapping_b3;
+
+ if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (WID ("combo-bottombutton")), &iter))
+ return;
+
+ liststore = GTK_LIST_STORE (WID ("liststore-buttons"));
+ gtk_tree_model_get (GTK_TREE_MODEL (liststore), &iter,
+ BUTTONNUMBER_COLUMN, &mapping_b2,
+ -1);
+
+ if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (WID ("combo-topbutton")), &iter))
+ return;
+
+ gtk_tree_model_get (GTK_TREE_MODEL (liststore), &iter,
+ BUTTONNUMBER_COLUMN, &mapping_b3,
+ -1);
+
+ map_button (priv->stylus_settings, mapping_b2, mapping_b3);
+}
+
+static void
+combobox_text_cellrenderer (GtkComboBox *combo, int name_column)
+{
+ GtkCellRenderer *renderer;
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
+ gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
+ "text", BUTTONNAME_COLUMN, NULL);
+}
+
+/* Boilerplate code goes below */
+
+static void
+cc_wacom_page_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ switch (property_id)
+ {
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ }
+}
+
+static void
+cc_wacom_page_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ switch (property_id)
+ {
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ }
+}
+
+static void
+cc_wacom_page_dispose (GObject *object)
+{
+ CcWacomPagePrivate *priv = CC_WACOM_PAGE (object)->priv;
+
+ if (priv->builder)
+ {
+ g_object_unref (priv->builder);
+ priv->builder = NULL;
+ }
+
+ if (priv->wacom_settings)
+ {
+ g_object_unref (priv->wacom_settings);
+ priv->wacom_settings = NULL;
+ }
+
+ if (priv->stylus_settings)
+ {
+ g_object_unref (priv->stylus_settings);
+ priv->stylus_settings = NULL;
+ }
+
+ if (priv->eraser_settings)
+ {
+ g_object_unref (priv->eraser_settings);
+ priv->eraser_settings = NULL;
+ }
+
+ G_OBJECT_CLASS (cc_wacom_page_parent_class)->dispose (object);
+}
+
+static void
+cc_wacom_page_finalize (GObject *object)
+{
+ G_OBJECT_CLASS (cc_wacom_page_parent_class)->finalize (object);
+}
+
+static void
+cc_wacom_page_class_init (CcWacomPageClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ g_type_class_add_private (klass, sizeof (CcWacomPagePrivate));
+
+ object_class->get_property = cc_wacom_page_get_property;
+ object_class->set_property = cc_wacom_page_set_property;
+ object_class->dispose = cc_wacom_page_dispose;
+ object_class->finalize = cc_wacom_page_finalize;
+}
+
+static void
+cc_wacom_page_init (CcWacomPage *self)
+{
+ CcWacomPagePrivate *priv;
+ GError *error = NULL;
+ GtkComboBox *combo;
+ GtkWidget *box;
+ GtkSwitch *sw;
+ char *objects[] = {
+ "main-grid",
+ "liststore-tabletmode",
+ "liststore-buttons",
+ "adjustment-tip-feel",
+ "adjustment-eraser-feel",
+ NULL
+ };
+
+ priv = self->priv = WACOM_PAGE_PRIVATE (self);
+
+ priv->builder = gtk_builder_new ();
+
+ gtk_builder_add_objects_from_file (priv->builder,
+ GNOMECC_UI_DIR "/gnome-wacom-properties.ui",
+ objects,
+ &error);
+ if (error != NULL) {
+ g_warning ("Error loading UI file: %s", error->message);
+ g_object_unref (priv->builder);
+ g_error_free (error);
+ return;
+ }
+
+ box = WID ("main-grid");
+ gtk_container_add (GTK_CONTAINER (self), box);
+ gtk_widget_set_vexpand (GTK_WIDGET (box), TRUE);
+
+ g_signal_connect (WID ("scale-tip-feel"), "value-changed",
+ G_CALLBACK (tip_feel_value_changed_cb), self);
+ g_signal_connect (WID ("scale-eraser-feel"), "value-changed",
+ G_CALLBACK (eraser_feel_value_changed_cb), self);
+
+ combo = GTK_COMBO_BOX (WID ("combo-topbutton"));
+ combobox_text_cellrenderer (combo, BUTTONNAME_COLUMN);
+ g_signal_connect (G_OBJECT (combo), "changed",
+ G_CALLBACK (button_changed_cb), self);
+
+ combo = GTK_COMBO_BOX (WID ("combo-bottombutton"));
+ combobox_text_cellrenderer (combo, BUTTONNAME_COLUMN);
+ g_signal_connect (G_OBJECT (combo), "changed",
+ G_CALLBACK (button_changed_cb), self);
+
+ combo = GTK_COMBO_BOX (WID ("combo-tabletmode"));
+ combobox_text_cellrenderer (combo, MODELABEL_COLUMN);
+ g_signal_connect (G_OBJECT (combo), "changed",
+ G_CALLBACK (tabletmode_changed_cb), self);
+
+ sw = GTK_SWITCH (WID ("switch-left-handed"));
+ g_signal_connect (G_OBJECT (sw), "notify::active",
+ G_CALLBACK (left_handed_toggled_cb), self);
+
+ gtk_image_set_from_file (GTK_IMAGE (WID ("image-tablet")), PIXMAP_DIR "/wacom-tablet.svg");
+ gtk_image_set_from_file (GTK_IMAGE (WID ("image-stylus")), PIXMAP_DIR "/wacom-stylus.svg");
+}
+
+GtkWidget *
+cc_wacom_page_new (void)
+{
+ CcWacomPage *page;
+ CcWacomPagePrivate *priv;
+
+ page = g_object_new (CC_TYPE_WACOM_PAGE, NULL);
+
+ priv = page->priv;
+
+ /* FIXME move this to construct */
+ priv->wacom_settings = g_settings_new (WACOM_SCHEMA);
+ priv->stylus_settings = g_settings_new (WACOM_STYLUS_SCHEMA);
+ priv->eraser_settings = g_settings_new (WACOM_ERASER_SCHEMA);
+
+ set_button_mapping_from_gsettings (GTK_COMBO_BOX (WID ("combo-topbutton")), priv->stylus_settings, 3);
+ set_button_mapping_from_gsettings (GTK_COMBO_BOX (WID ("combo-bottombutton")), priv->stylus_settings, 2);
+ set_mode_from_gsettings (GTK_COMBO_BOX (WID ("combo-tabletmode")), page);
+ set_feel_from_gsettings (GTK_ADJUSTMENT (WID ("adjustment-tip-feel")), priv->stylus_settings);
+ set_feel_from_gsettings (GTK_ADJUSTMENT (WID ("adjustment-eraser-feel")), priv->eraser_settings);
+ set_left_handed_from_gsettings (page);
+
+ return GTK_WIDGET (page);
+}
diff --git a/panels/wacom/cc-wacom-page.h b/panels/wacom/cc-wacom-page.h
new file mode 100644
index 0000000..1618f8c
--- /dev/null
+++ b/panels/wacom/cc-wacom-page.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright  2011 Red Hat, Inc.
+ *
+ * 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.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Peter Hutterer <peter hutterer redhat com>
+ * Bastien Nocera <hadess hadess net>
+ */
+
+
+#ifndef _CC_WACOM_PAGE_H
+#define _CC_WACOM_PAGE_H
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define CC_TYPE_WACOM_PAGE cc_wacom_page_get_type()
+
+#define CC_WACOM_PAGE(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ CC_TYPE_WACOM_PAGE, CcWacomPage))
+
+#define CC_WACOM_PAGE_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), \
+ CC_TYPE_WACOM_PAGE, CcWacomPageClass))
+
+#define CC_IS_WACOM_PAGE(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+ CC_TYPE_WACOM_PAGE))
+
+#define CC_IS_WACOM_PAGE_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+ CC_TYPE_WACOM_PAGE))
+
+#define CC_WACOM_PAGE_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+ CC_TYPE_WACOM_PAGE, CcWacomPageClass))
+
+typedef struct _CcWacomPage CcWacomPage;
+typedef struct _CcWacomPageClass CcWacomPageClass;
+typedef struct _CcWacomPagePrivate CcWacomPagePrivate;
+
+struct _CcWacomPage
+{
+ GtkBox parent;
+
+ CcWacomPagePrivate *priv;
+};
+
+struct _CcWacomPageClass
+{
+ GtkBoxClass parent_class;
+};
+
+GType cc_wacom_page_get_type (void) G_GNUC_CONST;
+
+GtkWidget * cc_wacom_page_new (void);
+
+G_END_DECLS
+
+#endif /* _CC_WACOM_PAGE_H */
diff --git a/panels/wacom/cc-wacom-panel.c b/panels/wacom/cc-wacom-panel.c
index d4b817d..38e6862 100644
--- a/panels/wacom/cc-wacom-panel.c
+++ b/panels/wacom/cc-wacom-panel.c
@@ -16,15 +16,17 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Peter Hutterer <peter hutterer redhat com>
+ * Bastien Nocera <hadess hadess net>
*
*/
#include <config.h>
-#include "cc-wacom-panel.h"
+#include <string.h>
#include <gtk/gtk.h>
-#include <string.h>
+#include "cc-wacom-panel.h"
+#include "cc-wacom-page.h"
#define WID(x) (GtkWidget *) gtk_builder_get_object (priv->builder, x)
@@ -33,17 +35,10 @@ G_DEFINE_DYNAMIC_TYPE (CcWacomPanel, cc_wacom_panel, CC_TYPE_PANEL)
#define WACOM_PANEL_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_WACOM_PANEL, CcWacomPanelPrivate))
-#define WACOM_SCHEMA "org.gnome.settings-daemon.peripherals.wacom"
-#define WACOM_STYLUS_SCHEMA WACOM_SCHEMA ".stylus"
-#define WACOM_ERASER_SCHEMA WACOM_SCHEMA ".eraser"
-
struct _CcWacomPanelPrivate
{
GtkBuilder *builder;
GtkWidget *notebook;
- GSettings *wacom_settings;
- GSettings *stylus_settings;
- GSettings *eraser_settings;
/* The UI doesn't support cursor/pad at the moment */
GdkDeviceManager *manager;
guint device_added_id;
@@ -55,256 +50,6 @@ enum {
WACOM_PAGE
};
-/* Button combo box storage columns */
-enum {
- BUTTONNUMBER_COLUMN,
- BUTTONNAME_COLUMN,
- N_BUTTONCOLUMNS
-};
-
-/* Tablet mode combo box storage columns */
-enum {
- MODENUMBER_COLUMN,
- MODELABEL_COLUMN,
- N_MODECOLUMNS
-};
-
-/* Tablet mode options - keep in sync with .ui */
-enum {
- MODE_ABSOLUTE, /* stylus + eraser absolute */
- MODE_RELATIVE, /* stylus + eraser relative */
-};
-
-/* GSettings stores pressurecurve as 4 values like the driver. We map slider
- * scale to these values given the array below. These settings were taken from
- * wacomcpl, where they've been around for years.
- */
-#define N_PRESSURE_CURVES 7
-static const gint32 PRESSURE_CURVES[N_PRESSURE_CURVES][4] = {
- { 0, 75, 25, 100 }, /* soft */
- { 0, 50, 50, 100 },
- { 0, 25, 75, 100 },
- { 0, 0, 100, 100 }, /* neutral */
- { 25, 0, 100, 75 },
- { 50, 0, 100, 50 },
- { 75, 0, 100, 25 } /* firm */
-};
-
-static void
-set_pressurecurve (GtkRange *range, GSettings *settings)
-{
- gint slider_val = gtk_range_get_value (range);
- GVariant *values[4],
- *array;
- int i;
-
- for (i = 0; i < 4; i++)
- values[i] = g_variant_new_int32 (PRESSURE_CURVES[slider_val][i]);
-
- array = g_variant_new_array (G_VARIANT_TYPE_INT32, values, 4);
-
- g_settings_set_value (settings, "pressurecurve", array);
-
- g_variant_unref (array);
-}
-
-static void
-tip_feel_value_changed_cb (GtkRange *range, gpointer user_data)
-{
- set_pressurecurve (range, CC_WACOM_PANEL(user_data)->priv->stylus_settings);
-}
-
-static void
-eraser_feel_value_changed_cb (GtkRange *range, gpointer user_data)
-{
- set_pressurecurve (range, CC_WACOM_PANEL(user_data)->priv->eraser_settings);
-}
-
-static void
-set_feel_from_gsettings (GtkAdjustment *adjustment, GSettings *settings)
-{
- GVariant *variant;
- const gint32 *values;
- gsize nvalues;
- int i;
-
- variant = g_settings_get_value (settings, "pressurecurve");
- values = g_variant_get_fixed_array (variant, &nvalues, sizeof (gint32));
-
- if (nvalues != 4) {
- g_warning ("Invalid pressure curve format, expected 4 values (got %ld)", nvalues);
- return;
- }
-
- for (i = 0; i < N_PRESSURE_CURVES; i++) {
- if (memcmp (PRESSURE_CURVES[i], values, sizeof (gint32) * 4) == 0) {
- gtk_adjustment_set_value (adjustment, i);
- break;
- }
- }
-}
-
-static void
-tabletmode_changed_cb (GtkComboBox *combo, gpointer user_data)
-{
- CcWacomPanelPrivate *priv = CC_WACOM_PANEL(user_data)->priv;
- GtkListStore *liststore;
- GtkTreeIter iter;
- gint mode;
- gboolean is_absolute;
-
- if (!gtk_combo_box_get_active_iter (combo, &iter))
- return;
-
- liststore = GTK_LIST_STORE (WID ("liststore-tabletmode"));
- gtk_tree_model_get (GTK_TREE_MODEL (liststore), &iter,
- MODENUMBER_COLUMN, &mode,
- -1);
-
- is_absolute = (mode == MODE_ABSOLUTE);
- g_settings_set_boolean (priv->wacom_settings, "is-absolute", is_absolute);
-}
-
-static void
-left_handed_toggled_cb (GtkSwitch *sw, GParamSpec *pspec, gpointer *user_data)
-{
- CcWacomPanelPrivate *priv = CC_WACOM_PANEL(user_data)->priv;
- const gchar* rotation;
-
- rotation = gtk_switch_get_active (sw) ? "half" : "none";
-
- g_settings_set_string (priv->wacom_settings, "rotation", rotation);
-}
-
-static void
-set_left_handed_from_gsettings (CcWacomPanel *panel)
-{
- CcWacomPanelPrivate *priv = CC_WACOM_PANEL(panel)->priv;
- const gchar* rotation;
-
- rotation = g_settings_get_string (priv->wacom_settings, "rotation");
- if (strcmp (rotation, "half") == 0)
- gtk_switch_set_active (GTK_SWITCH (WID ("switch-left-handed")), TRUE);
-}
-
-static void
-set_mode_from_gsettings (GtkComboBox *combo, CcWacomPanel *panel)
-{
- CcWacomPanelPrivate *priv = CC_WACOM_PANEL(panel)->priv;
- gboolean is_absolute;
-
- is_absolute = g_settings_get_boolean (priv->wacom_settings, "is-absolute");
-
- /* this must be kept in sync with the .ui file */
- gtk_combo_box_set_active (combo, is_absolute ? MODE_ABSOLUTE : MODE_RELATIVE);
-}
-
-static void
-set_button_mapping_from_gsettings (GtkComboBox *combo, GSettings* settings, gint current_button)
-{
- GVariant *current;
- gsize nvalues;
- const gint *values;
- GtkTreeModel *model;
- GtkTreeIter iter;
- gboolean valid;
-
- current = g_settings_get_value (settings, "buttonmapping");
- values = g_variant_get_fixed_array (current, &nvalues, sizeof (gint32));
- model = gtk_combo_box_get_model (combo);
- valid = gtk_tree_model_get_iter_first (model, &iter);
-
- while (valid) {
- gint button;
-
- gtk_tree_model_get (model, &iter,
- BUTTONNUMBER_COLUMN, &button,
- -1);
-
- /* Currently button values match logical X buttons. If we
- * introduce things like double-click, this code must
- * change. Recommendation: use negative buttons numbers for
- * special ones.
- */
-
- /* 0 vs 1-indexed array/button numbers */
- if (button == values[current_button - 1]) {
- gtk_combo_box_set_active_iter (combo, &iter);
- break;
- }
-
- valid = gtk_tree_model_iter_next (model, &iter);
- }
-}
-
-static void
-map_button (GSettings *settings, int button2, int button3)
-{
- GVariant *current; /* current mapping */
- GVariant *array; /* new mapping */
- GVariant **tmp;
- gsize nvalues;
- const gint *values;
- gint i;
-
- current = g_settings_get_value (settings, "buttonmapping");
- values = g_variant_get_fixed_array (current, &nvalues, sizeof (gint32));
-
- tmp = g_malloc (nvalues * sizeof (GVariant*));
- for (i = 0; i < nvalues; i++) {
- if (i == 1) /* zero indexed array vs one-indexed buttons */
- tmp[i] = g_variant_new_int32 (button2);
- else if (i == 2)
- tmp[i] = g_variant_new_int32 (button3);
- else
- tmp[i] = g_variant_new_int32 (values[i]);
- }
-
- array = g_variant_new_array (G_VARIANT_TYPE_INT32, tmp, nvalues);
- g_settings_set_value (settings, "buttonmapping", array);
-
- g_free (tmp);
- g_variant_unref (array);
-}
-
-static void
-button_changed_cb (GtkComboBox *combo, gpointer user_data)
-{
- CcWacomPanelPrivate *priv = CC_WACOM_PANEL(user_data)->priv;
- GtkTreeIter iter;
- GtkListStore *liststore;
- gint mapping_b2,
- mapping_b3;
-
- if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (WID ("combo-bottombutton")), &iter))
- return;
-
- liststore = GTK_LIST_STORE (WID ("liststore-buttons"));
- gtk_tree_model_get (GTK_TREE_MODEL (liststore), &iter,
- BUTTONNUMBER_COLUMN, &mapping_b2,
- -1);
-
- if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (WID ("combo-topbutton")), &iter))
- return;
-
- gtk_tree_model_get (GTK_TREE_MODEL (liststore), &iter,
- BUTTONNUMBER_COLUMN, &mapping_b3,
- -1);
-
- map_button (priv->stylus_settings, mapping_b2, mapping_b3);
-}
-
-static void
-combobox_text_cellrenderer (GtkComboBox *combo, int name_column)
-{
- GtkCellRenderer *renderer;
-
- renderer = gtk_cell_renderer_text_new ();
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
- "text", BUTTONNAME_COLUMN, NULL);
-}
-
/* Boilerplate code goes below */
static void
@@ -344,24 +89,6 @@ cc_wacom_panel_dispose (GObject *object)
priv->builder = NULL;
}
- if (priv->wacom_settings)
- {
- g_object_unref (priv->wacom_settings);
- priv->wacom_settings = NULL;
- }
-
- if (priv->stylus_settings)
- {
- g_object_unref (priv->stylus_settings);
- priv->stylus_settings = NULL;
- }
-
- if (priv->eraser_settings)
- {
- g_object_unref (priv->eraser_settings);
- priv->eraser_settings = NULL;
- }
-
if (priv->manager)
{
g_signal_handler_disconnect (priv->manager, priv->device_added_id);
@@ -469,16 +196,11 @@ static void
cc_wacom_panel_init (CcWacomPanel *self)
{
CcWacomPanelPrivate *priv;
- GtkWidget *notebook;
+ GtkNotebook *notebook;
+ GtkWidget *widget, *wacom_page;
GError *error = NULL;
- GtkComboBox *combo;
- GtkSwitch *sw;
char *objects[] = {
- "main-notebook",
- "liststore-tabletmode",
- "liststore-buttons",
- "adjustment-tip-feel",
- "adjustment-eraser-feel",
+ "main-box",
NULL
};
@@ -498,49 +220,21 @@ cc_wacom_panel_init (CcWacomPanel *self)
return;
}
- notebook = WID ("main-notebook");
- gtk_container_add (GTK_CONTAINER (self), notebook);
+ notebook = GTK_NOTEBOOK (gtk_notebook_new ());
+ priv->notebook = GTK_WIDGET (notebook);
+ gtk_notebook_set_show_tabs (notebook, FALSE);
+ gtk_widget_show (priv->notebook);
+
+ widget = WID ("main-box");
+ gtk_notebook_append_page (notebook, widget, NULL);
+
+ wacom_page = cc_wacom_page_new ();
+ gtk_widget_show (wacom_page);
+ gtk_notebook_append_page (notebook, wacom_page, NULL);
+
+ gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (notebook));
gtk_widget_set_vexpand (GTK_WIDGET (notebook), TRUE);
gtk_container_set_border_width (GTK_CONTAINER (notebook), 24);
- priv->notebook = notebook;
-
- priv->wacom_settings = g_settings_new (WACOM_SCHEMA);
- priv->stylus_settings = g_settings_new (WACOM_STYLUS_SCHEMA);
- priv->eraser_settings = g_settings_new (WACOM_ERASER_SCHEMA);
-
- g_signal_connect (WID ("scale-tip-feel"), "value-changed",
- G_CALLBACK (tip_feel_value_changed_cb), self);
- g_signal_connect (WID ("scale-eraser-feel"), "value-changed",
- G_CALLBACK (eraser_feel_value_changed_cb), self);
-
- combo = GTK_COMBO_BOX (WID ("combo-topbutton"));
- combobox_text_cellrenderer (combo, BUTTONNAME_COLUMN);
- g_signal_connect (G_OBJECT (combo), "changed",
- G_CALLBACK (button_changed_cb), self);
-
- combo = GTK_COMBO_BOX (WID ("combo-bottombutton"));
- combobox_text_cellrenderer (combo, BUTTONNAME_COLUMN);
- g_signal_connect (G_OBJECT (combo), "changed",
- G_CALLBACK (button_changed_cb), self);
-
- combo = GTK_COMBO_BOX (WID ("combo-tabletmode"));
- combobox_text_cellrenderer (combo, MODELABEL_COLUMN);
- g_signal_connect (G_OBJECT (combo), "changed",
- G_CALLBACK (tabletmode_changed_cb), self);
-
- sw = GTK_SWITCH (WID ("switch-left-handed"));
- g_signal_connect (G_OBJECT (sw), "notify::active",
- G_CALLBACK (left_handed_toggled_cb), self);
-
- set_button_mapping_from_gsettings (GTK_COMBO_BOX (WID ("combo-topbutton")), priv->stylus_settings, 3);
- set_button_mapping_from_gsettings (GTK_COMBO_BOX (WID ("combo-bottombutton")), priv->stylus_settings, 2);
- set_mode_from_gsettings (GTK_COMBO_BOX (WID ("combo-tabletmode")), self);
- set_feel_from_gsettings (GTK_ADJUSTMENT (WID ("adjustment-tip-feel")), priv->stylus_settings);
- set_feel_from_gsettings (GTK_ADJUSTMENT (WID ("adjustment-eraser-feel")), priv->eraser_settings);
- set_left_handed_from_gsettings (self);
-
- gtk_image_set_from_file (GTK_IMAGE (WID ("image-tablet")), PIXMAP_DIR "/wacom-tablet.svg");
- gtk_image_set_from_file (GTK_IMAGE (WID ("image-stylus")), PIXMAP_DIR "/wacom-stylus.svg");
enbiggen_label (GTK_LABEL (WID ("advice-label1")));
priv->manager = gdk_display_get_device_manager (gdk_display_get_default ());
diff --git a/panels/wacom/cc-wacom-panel.h b/panels/wacom/cc-wacom-panel.h
index e219a37..09e0cec 100644
--- a/panels/wacom/cc-wacom-panel.h
+++ b/panels/wacom/cc-wacom-panel.h
@@ -1,5 +1,5 @@
/*
- * Copyright  Red Hat, Inc.
+ * Copyright  2011 Red Hat, Inc.
*
* 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
@@ -15,7 +15,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * Author: Peter Hutterer <peter hutterer redhat com>
+ * Authors: Peter Hutterer <peter hutterer redhat com>
+ * Bastien Nocera <hadess hadess net>
*/
diff --git a/panels/wacom/gnome-wacom-properties.ui b/panels/wacom/gnome-wacom-properties.ui
index 72b1391..f4613c6 100644
--- a/panels/wacom/gnome-wacom-properties.ui
+++ b/panels/wacom/gnome-wacom-properties.ui
@@ -145,7 +145,7 @@
<property name="vexpand">True</property>
<property name="show_tabs">False</property>
<child>
- <object class="GtkBox" id="box3">
+ <object class="GtkBox" id="main-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="vexpand">True</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
