Merge lp:~robert-ancell/unity-control-center/wacom-panel-3.8 into lp:unity-control-center

[Robert Ancell]

Backport Wacom panel from GNOME Control Center 3.8

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:12711
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/22/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/22/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/22
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/23/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/22/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:12711
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/25

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/24/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks, updating looks fine on principle to me, I'm unsure if the settings daemon code needs to be kept in sync though. I've no wacom hardware to test there, but let's try to get that in, it's easy enough to revert the changeset if it turns out to be an issue

review: Approve

[Robert Ancell (robert-ancell)]

I have a Wacom device which I tested it with. We already have g-s-d 3.8 so it should match.

=== modified file 'configure.ac'
--- configure.ac	2014-02-17 23:33:18 +0000
+++ configure.ac	2014-02-19 03:07:54 +0000
@@ -112,7 +112,7 @@
 LIBNOTIFY_REQUIRED_VERSION=0.7.3
 GNOME_DESKTOP_REQUIRED_VERSION=3.5.91
 SCHEMAS_REQUIRED_VERSION=3.7.2.2
-LIBWACOM_REQUIRED_VERSION=0.6
+LIBWACOM_REQUIRED_VERSION=0.7
 CLUTTER_REQUIRED_VERSION=1.11.3
 GOA_REQUIRED_VERSION=3.5.90
 
@@ -246,6 +246,7 @@
                         gnome-settings-daemon >= $GSD_REQUIRED_VERSION
                         xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
                         gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
+      AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
       have_wacom=yes
     fi
     ;;

=== modified file 'debian/control'
--- debian/control	2014-02-17 17:40:21 +0000
+++ debian/control	2014-02-19 03:07:54 +0000
@@ -42,7 +42,7 @@
                libupower-glib-dev (>= 0.9.1),
                libsystemd-login-dev,
                libtimezonemap1-dev,
-               libwacom-dev (>= 0.6),
+               libwacom-dev (>= 0.7),
                libx11-dev,
                libxft-dev (>= 2.1.2),
                libxkbfile-dev,

=== modified file 'panels/wacom/Makefile.am'
--- panels/wacom/Makefile.am	2013-11-29 06:28:37 +0000
+++ panels/wacom/Makefile.am	2014-02-19 03:07:54 +0000
@@ -8,15 +8,18 @@
 	$(WACOM_PANEL_CFLAGS)				\
 	-I$(srcdir)/calibrator				\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
-	-DGNOMECC_UI_DIR="\"$(uidir)\""			\
 	$(NULL)
 
-
 ccpanelsdir = $(PANELS_DIR)
 ccpanels_LTLIBRARIES = libwacom-properties.la
 
+
+BUILT_SOURCES =			\
+	cc-wacom-resources.c	\
+	cc-wacom-resources.h
+
 libwacom_properties_la_SOURCES =	\
+	$(BUILT_SOURCES)		\
 	wacom-module.c			\
 	cc-wacom-panel.c		\
 	cc-wacom-panel.h		\
@@ -40,6 +43,7 @@
 noinst_PROGRAMS = test-wacom
 
 test_wacom_SOURCES =			\
+	$(BUILT_SOURCES)		\
 	test-wacom.c			\
 	cc-wacom-page.c			\
 	cc-wacom-page.h			\
@@ -58,22 +62,14 @@
 test_wacom_CPPFLAGS = $(INCLUDES)
 test_wacom_LDADD = $(PANEL_LIBS) $(WACOM_PANEL_LIBS) $(builddir)/calibrator/libwacom-calibrator.la
 
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/wacom.gresource.xml)
+cc-wacom-resources.c: wacom.gresource.xml $(resource_files)
+	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_wacom $<
+cc-wacom-resources.h: wacom.gresource.xml $(resource_files)
+	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_wacom $<
+
 @INTLTOOL_DESKTOP_RULE@
 
-pixmapdir = $(pkgdatadir)/ui
-pixmap_DATA =				\
-	wacom-tablet.svg		\
-	wacom-stylus.svg		\
-	wacom-stylus-airbrush.svg	\
-	wacom-stylus-inking.svg		\
-	wacom-stylus-art-pen.svg	\
-	wacom-stylus-classic.svg	\
-	wacom-tablet-cintiq.svg		\
-	wacom-tablet-pc.svg
-
-uidir   = $(pkgdatadir)/ui
-ui_DATA = gnome-wacom-properties.ui wacom-stylus-page.ui button-mapping.ui
-
 desktopdir = $(datadir)/applications
 desktop_in_files = unity-wacom-panel.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -87,7 +83,7 @@
 	FILES="$(COMMONFILES)" DIR="$(COMMONDIR)" $(top_srcdir)/update-from-gsd.sh && changed=true ; \
 	git commit -m "wacom: Update from gnome-settings-daemon" $(WACOMFILES) $(COMMONFILES)
 
-CLEANFILES = $(Desktop_in_files) $(desktop_DATA)
-EXTRA_DIST = $(ui_DATA) $(pixmap_DATA)
+CLEANFILES = $(Desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
+EXTRA_DIST = $(resource_files) wacom.gresource.xml
 
 -include $(top_srcdir)/git.mk

=== modified file 'panels/wacom/calibrator/Makefile.am'
--- panels/wacom/calibrator/Makefile.am	2013-11-29 06:28:37 +0000
+++ panels/wacom/calibrator/Makefile.am	2014-02-19 03:07:54 +0000
@@ -5,9 +5,6 @@
 	$(PANEL_CFLAGS)					\
 	$(WACOM_PANEL_CFLAGS)				\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
-	-DGNOMECC_UI_DIR="\"$(uidir)\""			\
-	-DPIXMAP_DIR=\""$(datadir)/unity-control-center/pixmaps"\"	\
 	$(NULL)
 
 

=== modified file 'panels/wacom/cc-wacom-nav-button.c'
--- panels/wacom/cc-wacom-nav-button.c	2012-02-27 16:51:36 +0000
+++ panels/wacom/cc-wacom-nav-button.c	2014-02-19 03:07:54 +0000
@@ -211,6 +211,9 @@
 	CcWacomNavButtonPrivate *priv;
 	GtkStyleContext *context;
 	GtkWidget *image, *box;
+	gboolean rtl;
+
+	rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);
 
 	priv = self->priv = WACOM_NAV_BUTTON_PRIVATE (self);
 
@@ -228,7 +231,8 @@
 
 	/* Prev button */
 	priv->prev = gtk_button_new ();
-	image = gtk_image_new_from_icon_name ("go-previous-symbolic", GTK_ICON_SIZE_MENU);
+	image = gtk_image_new_from_icon_name (rtl ? "go-previous-rtl-symbolic" : "go-previous-symbolic",
+					      GTK_ICON_SIZE_MENU);
 	gtk_container_add (GTK_CONTAINER (priv->prev), image);
 	g_signal_connect (G_OBJECT (priv->prev), "clicked",
 			  G_CALLBACK (prev_clicked), self);
@@ -236,7 +240,8 @@
 
 	/* Next button */
 	priv->next = gtk_button_new ();
-	image = gtk_image_new_from_icon_name ("go-next-symbolic", GTK_ICON_SIZE_MENU);
+	image = gtk_image_new_from_icon_name (rtl ? "go-next-rtl-symbolic" : "go-next-symbolic",
+					      GTK_ICON_SIZE_MENU);
 	gtk_container_add (GTK_CONTAINER (priv->next), image);
 	g_signal_connect (G_OBJECT (priv->next), "clicked",
 			  G_CALLBACK (next_clicked), self);

=== modified file 'panels/wacom/cc-wacom-page.c'
--- panels/wacom/cc-wacom-page.c	2014-02-18 03:09:04 +0000
+++ panels/wacom/cc-wacom-page.c	2014-02-19 03:07:54 +0000
@@ -117,7 +117,8 @@
 } action_table[] = {
        { GSD_WACOM_ACTION_TYPE_NONE,           NC_("Wacom action-type", "None")                },
        { GSD_WACOM_ACTION_TYPE_CUSTOM,         NC_("Wacom action-type", "Send Keystroke")      },
-       { GSD_WACOM_ACTION_TYPE_SWITCH_MONITOR, NC_("Wacom action-type", "Switch Monitor")      }
+       { GSD_WACOM_ACTION_TYPE_SWITCH_MONITOR, NC_("Wacom action-type", "Switch Monitor")      },
+       { GSD_WACOM_ACTION_TYPE_HELP,           NC_("Wacom action-type", "Show On-Screen Help") }
 };
 
 #define WACOM_C(x) g_dpgettext2(NULL, "Wacom action-type", x)
@@ -185,11 +186,11 @@
 		cal[2] = axis.x_max;
 		cal[3] = axis.y_max;
 
-		set_calibration(cal, 4, page->priv->wacom_settings);
+		set_calibration(cal, 4, priv->wacom_settings);
 	}
 
 	calib_area_free (area);
-	page->priv->area = NULL;
+	priv->area = NULL;
 	gtk_widget_set_sensitive (WID ("button-calibrate"), TRUE);
 }
 
@@ -218,14 +219,14 @@
 	else
 		device_id = -1;
 
-	page->priv->area = calib_area_new (NULL,
-					   monitor,
-					   device_id,
-					   finish_calibration,
-					   page,
-					   &old_axis,
-					   THRESHOLD_MISCLICK,
-					   THRESHOLD_DOUBLECLICK);
+	priv->area = calib_area_new (NULL,
+				     monitor,
+				     device_id,
+				     finish_calibration,
+				     page,
+				     &old_axis,
+				     THRESHOLD_MISCLICK,
+				     THRESHOLD_DOUBLECLICK);
 
 	return FALSE;
 }
@@ -276,6 +277,17 @@
 	gtk_widget_set_sensitive (GTK_WIDGET (button), FALSE);
 }
 
+/* This avoids us crashing when a newer version of
+ * gnome-control-center has been used, and we load up an
+ * old one, as the action type if unknown to the old g-c-c */
+static gboolean
+action_type_is_valid (GsdWacomActionType type)
+{
+	if (type >= G_N_ELEMENTS(action_table))
+		return FALSE;
+	return TRUE;
+}
+
 static char *
 get_elevator_shortcut_string (GSettings        *settings,
 			      GtkDirectionType  dir)
@@ -356,7 +368,8 @@
 		return;
 	}
 
-	if (button->type == WACOM_TABLET_BUTTON_TYPE_ELEVATOR)
+	if (button->type == WACOM_TABLET_BUTTON_TYPE_STRIP ||
+	    button->type == WACOM_TABLET_BUTTON_TYPE_RING)
 		str = get_elevator_shortcut_string (button->settings, dir);
 	else
 		str = g_settings_get_string (button->settings, CUSTOM_ACTION_KEY);
@@ -499,7 +512,8 @@
 
   str = gtk_accelerator_name (keyval, mask);
 
-  if (button->type == WACOM_TABLET_BUTTON_TYPE_ELEVATOR) {
+  if (button->type == WACOM_TABLET_BUTTON_TYPE_STRIP ||
+      button->type == WACOM_TABLET_BUTTON_TYPE_RING) {
     char *strs[3];
     char **strv;
 
@@ -556,7 +570,8 @@
     return;
 
   /* Unset the key */
-  if (button->type == WACOM_TABLET_BUTTON_TYPE_ELEVATOR) {
+  if (button->type == WACOM_TABLET_BUTTON_TYPE_STRIP ||
+      button->type == WACOM_TABLET_BUTTON_TYPE_RING) {
     char *strs[3];
     char **strv;
 
@@ -596,15 +611,20 @@
 	char *dir_name;
 
 	if (dir == GTK_DIR_UP || dir == GTK_DIR_DOWN) {
-		dir_name = g_strdup_printf ("%s (%s)",
-					    button->name,
-					    dir == GTK_DIR_UP ? _("Up") : _("Down"));
+		if (button->type == WACOM_TABLET_BUTTON_TYPE_RING) {
+			dir_name = g_strdup_printf ("%s (%s)",
+						    button->name,
+						    dir == GTK_DIR_UP ? "↺" : "↻");
+		} else {
+			dir_name = g_strdup_printf ("%s (%s)",
+						    button->name,
+						    dir == GTK_DIR_UP ? C_("Wacom tablet button", "Up") : C_("Wacom tablet button", "Down"));
+		}
 	} else {
 		dir_name = NULL;
 	}
 
-	/* Sanity check */
-	if (type >= G_N_ELEMENTS(action_table))
+	if (action_type_is_valid (type) == FALSE)
 		type = GSD_WACOM_ACTION_TYPE_NONE;
 
 	gtk_list_store_append (model, &new_row);
@@ -644,7 +664,8 @@
 		return;
 	}
 
-	if (button->type == WACOM_TABLET_BUTTON_TYPE_ELEVATOR) {
+	if (button->type == WACOM_TABLET_BUTTON_TYPE_STRIP ||
+	    button->type == WACOM_TABLET_BUTTON_TYPE_RING) {
 		g_object_set (cell,
 			      "visible", TRUE,
 			      "editable", FALSE,
@@ -660,8 +681,7 @@
 	}
 
 	type = g_settings_get_enum (button->settings, ACTION_TYPE_KEY);
-	/* Sanity check */
-	if (type >= G_N_ELEMENTS(action_table))
+	if (action_type_is_valid (type) == FALSE)
 		type = GSD_WACOM_ACTION_TYPE_NONE;
 
 	g_object_set (cell,
@@ -746,6 +766,11 @@
 		    gsd_wacom_device_is_screen_tablet (priv->stylus))
 			continue;
 
+		/* Do not list on-screen help if libwacom do no provide a layout */
+		if (action_table[i].action_type == GSD_WACOM_ACTION_TYPE_HELP &&
+		    gsd_wacom_device_get_layout_path (priv->stylus) == NULL)
+			continue;
+
 		gtk_list_store_append (priv->action_store, &iter);
 		gtk_list_store_set (priv->action_store, &iter,
 		                    ACTION_NAME_COLUMN, WACOM_C(action_table[i].action_name),
@@ -793,7 +818,7 @@
 	gtk_tree_view_set_model (treeview, GTK_TREE_MODEL (model));
 
 	/* Fill it up! */
-	list = gsd_wacom_device_get_buttons (page->priv->pad);
+	list = gsd_wacom_device_get_buttons (priv->pad);
 	for (l = list; l != NULL; l = l->next) {
 		GsdWacomTabletButton *button = l->data;
 		GsdWacomActionType type = GSD_WACOM_ACTION_TYPE_NONE;
@@ -801,7 +826,8 @@
 		if (button->settings)
 			type = g_settings_get_enum (button->settings, ACTION_TYPE_KEY);
 
-		if (button->type == WACOM_TABLET_BUTTON_TYPE_ELEVATOR) {
+		if (button->type == WACOM_TABLET_BUTTON_TYPE_STRIP ||
+		    button->type == WACOM_TABLET_BUTTON_TYPE_RING) {
 			add_button_to_store (model, button, GTK_DIR_UP, GSD_WACOM_ACTION_TYPE_CUSTOM);
 			add_button_to_store (model, button, GTK_DIR_DOWN, GSD_WACOM_ACTION_TYPE_CUSTOM);
 		} else {
@@ -821,8 +847,8 @@
 
 	priv = page->priv;
 	gtk_widget_destroy (MWID ("button-mapping-dialog"));
-	g_object_unref (page->priv->mapping_builder);
-	page->priv->mapping_builder = NULL;
+	g_object_unref (priv->mapping_builder);
+	priv->mapping_builder = NULL;
 }
 
 static void
@@ -838,9 +864,9 @@
 
 	g_assert (priv->mapping_builder == NULL);
 	priv->mapping_builder = gtk_builder_new ();
-	gtk_builder_add_from_file (priv->mapping_builder,
-				   GNOMECC_UI_DIR "/button-mapping.ui",
-				   &error);
+	gtk_builder_add_from_resource (priv->mapping_builder,
+                                       "/org/gnome/control-center/wacom/button-mapping.ui",
+                                       &error);
 
 	if (error != NULL) {
 		g_warning ("Error loading UI file: %s", error->message);
@@ -1098,10 +1124,10 @@
 
 	priv->builder = gtk_builder_new ();
 
-	gtk_builder_add_objects_from_file (priv->builder,
-					   GNOMECC_UI_DIR "/gnome-wacom-properties.ui",
-					   objects,
-					   &error);
+	gtk_builder_add_objects_from_resource (priv->builder,
+                                               "/org/gnome/control-center/wacom/gnome-wacom-properties.ui",
+                                               objects,
+                                               &error);
 	if (error != NULL) {
 		g_warning ("Error loading UI file: %s", error->message);
 		g_object_unref (priv->builder);
@@ -1147,16 +1173,13 @@
 	       const char  *icon_name)
 {
 	CcWacomPagePrivate *priv;
-	char *filename, *path;
+	char *resource;
 
 	priv = page->priv;
 
-	filename = g_strdup_printf ("%s.svg", icon_name);
-	path = g_build_filename (GNOMECC_UI_DIR, filename, NULL);
-	g_free (filename);
-
-	gtk_image_set_from_file (GTK_IMAGE (WID (widget_name)), path);
-	g_free (path);
+	resource = g_strdup_printf ("/org/gnome/control-center/wacom/%s.svg", icon_name);
+	gtk_image_set_from_resource (GTK_IMAGE (WID (widget_name)), resource);
+	g_free (resource);
 }
 
 typedef struct {
@@ -1262,21 +1285,21 @@
 
 	switch (layout) {
 	case LAYOUT_NORMAL:
-		remove_left_handed (page->priv);
-		remove_display_link (page->priv);
+		remove_left_handed (priv);
+		remove_display_link (priv);
 		break;
 	case LAYOUT_REVERSIBLE:
-		remove_display_link (page->priv);
+		remove_display_link (priv);
 		break;
 	case LAYOUT_SCREEN:
-		remove_left_handed (page->priv);
+		remove_left_handed (priv);
 
 		gtk_widget_destroy (WID ("combo-tabletmode"));
 		gtk_widget_destroy (WID ("label-trackingmode"));
 		gtk_widget_destroy (WID ("display-mapping-button"));
 
 		gtk_widget_show (WID ("button-calibrate"));
-		if (gsd_wacom_device_get_display_monitor (page->priv->stylus) >= 0)
+		if (gsd_wacom_device_get_display_monitor (priv->stylus) >= 0)
 			has_monitor = TRUE;
 		gtk_widget_set_sensitive (WID ("button-calibrate"), has_monitor);
 		gtk_widget_show (WID ("display-link"));

=== modified file 'panels/wacom/cc-wacom-panel.c'
--- panels/wacom/cc-wacom-panel.c	2013-11-28 04:32:11 +0000
+++ panels/wacom/cc-wacom-panel.c	2014-02-19 03:07:54 +0000
@@ -27,6 +27,7 @@
 
 #include "cc-wacom-panel.h"
 #include "cc-wacom-page.h"
+#include "cc-wacom-resources.h"
 #include "gsd-wacom-device.h"
 
 #define WID(x) (GtkWidget *) gtk_builder_get_object (priv->builder, x)
@@ -337,13 +338,14 @@
 	};
 
 	priv = self->priv = WACOM_PANEL_PRIVATE (self);
+        g_resources_register (cc_wacom_get_resource ());
 
 	priv->builder = gtk_builder_new ();
 
-	gtk_builder_add_objects_from_file (priv->builder,
-					   GNOMECC_UI_DIR "/gnome-wacom-properties.ui",
-					   objects,
-					   &error);
+	gtk_builder_add_objects_from_resource (priv->builder,
+                                               "/org/gnome/control-center/wacom/gnome-wacom-properties.ui",
+                                               objects,
+                                               &error);
 	if (error != NULL)
 	{
 		g_warning ("Error loading UI file: %s", error->message);
@@ -360,10 +362,10 @@
 	gtk_widget_set_vexpand (GTK_WIDGET (notebook), TRUE);
 	gtk_container_set_border_width (GTK_CONTAINER (notebook), 0);
 	g_object_set (G_OBJECT (notebook),
-		      "margin-top", 0,
-		      "margin-right", 24,
-		      "margin-left", 24,
-		      "margin-bottom", 24,
+		      "margin-top", 6,
+		      "margin-right", 30,
+		      "margin-left", 30,
+		      "margin-bottom", 30,
 		      NULL);
 
 	gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (notebook));

=== modified file 'panels/wacom/cc-wacom-stylus-page.c'
--- panels/wacom/cc-wacom-stylus-page.c	2012-02-27 16:51:36 +0000
+++ panels/wacom/cc-wacom-stylus-page.c	2014-02-19 03:07:54 +0000
@@ -297,10 +297,10 @@
 
 	priv->builder = gtk_builder_new ();
 
-	gtk_builder_add_objects_from_file (priv->builder,
-					   GNOMECC_UI_DIR "/wacom-stylus-page.ui",
-					   objects,
-					   &error);
+	gtk_builder_add_objects_from_resource (priv->builder,
+                                               "/org/gnome/control-center/wacom/wacom-stylus-page.ui",
+                                               objects,
+                                               &error);
 	if (error != NULL) {
 		g_warning ("Error loading UI file: %s", error->message);
 		g_object_unref (priv->builder);
@@ -339,16 +339,13 @@
 	       const char  *icon_name)
 {
 	CcWacomStylusPagePrivate *priv;
-	char *filename, *path;
+	char *resource;
 
 	priv = page->priv;
 
-	filename = g_strdup_printf ("%s.svg", icon_name);
-	path = g_build_filename (GNOMECC_UI_DIR, filename, NULL);
-	g_free (filename);
-
-	gtk_image_set_from_file (GTK_IMAGE (WID (widget_name)), path);
-	g_free (path);
+	resource = g_strdup_printf ("/org/gnome/control-center/wacom/%s.svg", icon_name);
+	gtk_image_set_from_resource (GTK_IMAGE (WID (widget_name)), resource);
+	g_free (resource);
 }
 
 /* Different types of layout for the stylus config */

=== modified file 'panels/wacom/gnome-wacom-properties.ui'
--- panels/wacom/gnome-wacom-properties.ui	2012-05-18 16:39:31 +0000
+++ panels/wacom/gnome-wacom-properties.ui	2014-02-19 03:07:54 +0000
@@ -207,7 +207,7 @@
                     <property name="spacing">10</property>
                     <child>
                       <object class="GtkButton" id="display-mapping-button">
-                        <property name="label" translatable="yes">Map to Monitor...</property>
+                        <property name="label" translatable="yes">Map to Monitor…</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -223,7 +223,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="map-buttons-button">
-                        <property name="label" translatable="yes">Map Buttons...</property>
+                        <property name="label" translatable="yes">Map Buttons…</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -239,7 +239,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="button-calibrate">
-                        <property name="label" translatable="yes">Calibrate...</property>
+                        <property name="label" translatable="yes">Calibrate…</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>

=== modified file 'panels/wacom/gsd-input-helper.c'
--- panels/wacom/gsd-input-helper.c	2012-08-21 15:59:36 +0000
+++ panels/wacom/gsd-input-helper.c	2014-02-19 03:07:54 +0000
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
@@ -189,11 +191,36 @@
 }
 
 gboolean
+device_info_is_tablet (XDeviceInfo *device_info)
+{
+        /* Note that this doesn't match Wacom tablets */
+        return (device_info->type == XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XI_TABLET, False));
+}
+
+gboolean
 device_info_is_mouse (XDeviceInfo *device_info)
 {
         return (device_info->type == XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XI_MOUSE, False));
 }
 
+gboolean
+device_info_is_trackball (XDeviceInfo *device_info)
+{
+        gboolean retval;
+
+        retval = (device_info->type == XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XI_TRACKBALL, False));
+        if (retval == FALSE &&
+            device_info->name != NULL) {
+                char *lowercase;
+
+                lowercase = g_ascii_strdown (device_info->name, -1);
+                retval = strstr (lowercase, "trackball") != NULL;
+                g_free (lowercase);
+        }
+
+        return retval;
+}
+
 static gboolean
 device_type_is_present (InfoIdentifyFunc info_func,
                         DeviceIdentifyFunc device_func)
@@ -263,6 +290,13 @@
                                        NULL);
 }
 
+gboolean
+trackball_is_present (void)
+{
+        return device_type_is_present (device_info_is_trackball,
+                                       NULL);
+}
+
 char *
 xdevice_get_device_node (int deviceid)
 {
@@ -480,7 +514,7 @@
         argv[2] = (char *) custom_command_to_string (command);
         argv[3] = "-i";
         argv[4] = g_strdup_printf ("%d", id);
-        argv[5] = g_strdup_printf ("%s", gdk_device_get_name (device));
+        argv[5] = (char*) gdk_device_get_name (device);
         argv[6] = NULL;
 
         rc = g_spawn_sync (g_get_home_dir (), argv, NULL, G_SPAWN_SEARCH_PATH,
@@ -491,9 +525,8 @@
 
         g_free (argv[0]);
         g_free (argv[4]);
-        g_free (argv[5]);
 
-        return (exit_status == 0);
+        return (exit_status == 1);
 }
 
 GList *

=== modified file 'panels/wacom/gsd-input-helper.h'
--- panels/wacom/gsd-input-helper.h	2012-08-21 15:59:36 +0000
+++ panels/wacom/gsd-input-helper.h	2014-02-19 03:07:54 +0000
@@ -61,11 +61,14 @@
 
 gboolean  device_info_is_touchpad    (XDeviceInfo         *device_info);
 gboolean  device_info_is_touchscreen (XDeviceInfo         *device_info);
+gboolean  device_info_is_tablet (XDeviceInfo         *device_info);
 gboolean  device_info_is_mouse       (XDeviceInfo         *device_info);
+gboolean  device_info_is_trackball   (XDeviceInfo         *device_info);
 
 gboolean  touchpad_is_present     (void);
 gboolean  touchscreen_is_present  (void);
 gboolean  mouse_is_present        (void);
+gboolean  trackball_is_present    (void);
 
 gboolean  device_set_property     (XDevice                *xdevice,
                                    const char             *device_name,

=== modified file 'panels/wacom/gsd-wacom-device.c'
--- panels/wacom/gsd-wacom-device.c	2014-02-18 04:27:04 +0000
+++ panels/wacom/gsd-wacom-device.c	2014-02-19 03:07:54 +0000
@@ -255,8 +255,10 @@
 			     const char               *id,
 			     const char               *settings_path,
 			     GsdWacomTabletButtonType  type,
+			     GsdWacomTabletButtonPos   pos,
 			     int                       group_id,
-			     int                       idx)
+			     int                       idx,
+			     int                       status_led)
 {
 	GsdWacomTabletButton *ret;
 
@@ -273,6 +275,8 @@
 	ret->group_id = group_id;
 	ret->idx = idx;
 	ret->type = type;
+	ret->pos = pos;
+	ret->status_led = status_led;
 
 	return ret;
 }
@@ -328,9 +332,11 @@
 	char *path;
 	char *machine_id;
 	const char *icon_name;
+	char *layout_path;
 	char *tool_name;
 	gboolean reversible;
 	gboolean is_screen_tablet;
+	gboolean is_isd; /* integrated system device */
 	gboolean is_fallback;
 	GList *styli;
 	GsdWacomStylus *last_stylus;
@@ -775,12 +781,10 @@
 	if (rr_output == NULL) {
 		if (gsd_wacom_device_is_screen_tablet (device)) {
 			rr_output = find_output_by_heuristic (rr_screen, device);
-			if (rr_output == NULL) {
+			if (rr_output == NULL)
 				g_warning ("No fuzzy match based on heuristics was found.");
-			} else {
+			else
 				g_warning ("Automatically mapping tablet to heuristically-found display.");
-				set_display_by_output (device, rr_output);
-			}
 		}
 	}
 
@@ -956,21 +960,78 @@
 }
 
 int
-gsd_wacom_device_set_next_mode (GsdWacomDevice *device,
+gsd_wacom_device_get_num_modes (GsdWacomDevice *device,
 				int             group_id)
 {
+	int num_modes;
+
+	g_return_val_if_fail (GSD_IS_WACOM_DEVICE (device), -1);
+	num_modes = GPOINTER_TO_INT (g_hash_table_lookup (device->priv->num_modes, GINT_TO_POINTER(group_id)));
+
+	return num_modes;
+}
+
+int
+gsd_wacom_device_get_current_mode (GsdWacomDevice *device,
+				   int             group_id)
+{
 	int current_idx;
-	int num_modes;
 
 	g_return_val_if_fail (GSD_IS_WACOM_DEVICE (device), -1);
 	current_idx = GPOINTER_TO_INT (g_hash_table_lookup (device->priv->modes, GINT_TO_POINTER(group_id)));
 	/* That means that the mode doesn't exist, see gsd_wacom_device_add_modes() */
 	g_return_val_if_fail (current_idx != 0, -1);
 
-	current_idx++;
-
+	return current_idx;
+}
+
+int
+gsd_wacom_device_set_next_mode (GsdWacomDevice       *device,
+				GsdWacomTabletButton *button)
+{
+	GList *l;
+	int current_idx;
+	int num_modes;
+	int num_switches;
+	int group_id;
+
+	g_return_val_if_fail (GSD_IS_WACOM_DEVICE (device), -1);
+
+	group_id = button->group_id;
+	current_idx = 0;
+	num_switches = 0;
 	num_modes = GPOINTER_TO_INT (g_hash_table_lookup (device->priv->num_modes, GINT_TO_POINTER(group_id)));
 
+	/*
+	 * Check if we have multiple mode-switch buttons for that
+	 * group, and if so, compute the current index based on
+	 * the position in the list...
+	 */
+	for (l = device->priv->buttons; l != NULL; l = l->next) {
+		GsdWacomTabletButton *b = l->data;
+		if (b->type != WACOM_TABLET_BUTTON_TYPE_HARDCODED)
+			continue;
+		if (button->group_id == b->group_id)
+			num_switches++;
+		if (g_strcmp0 (button->id, b->id) == 0)
+			current_idx = num_switches;
+	}
+
+	/* We should at least have found the current mode-switch button...
+	 * If not, then it means that the given button is not a valid
+	 * mode-switch.
+	 */
+	g_return_val_if_fail (num_switches != 0, -1);
+
+	/* Only one mode-switch? cycle through the modes */
+	if (num_switches == 1) {
+		current_idx = gsd_wacom_device_get_current_mode (device, group_id);
+		/* gsd_wacom_device_get_current_mode() returns -1 when the mode doesn't exist */
+		g_return_val_if_fail (current_idx > 0, -1);
+
+		current_idx++;
+	}
+
 	if (current_idx > num_modes)
 		current_idx = 1;
 
@@ -1001,30 +1062,69 @@
 {
 	GList *l;
 	guint num_modes;
+	guint group;
 	guint i;
 	char *name, *id;
 
 	l = NULL;
 
 	if ((direction & WACOM_BUTTON_POSITION_LEFT) && libwacom_has_ring (wacom_device)) {
-		/* There is a ring so there must be at least one mode */
-		num_modes = MAX (1, libwacom_get_ring_num_modes (wacom_device));
-		for (i = 1; i <= num_modes; i++) {
-			name = g_strdup_printf (_("Left Ring Mode #%d"), i);
-			id = g_strdup_printf ("left-ring-mode-%d", i);
-			l = g_list_append (l, gsd_wacom_tablet_button_new (name, id, settings_path, WACOM_TABLET_BUTTON_TYPE_ELEVATOR, flags_to_group (WACOM_BUTTON_RING_MODESWITCH), i - 1));
-			g_free (name);
-			g_free (id);
+		num_modes = libwacom_get_ring_num_modes (wacom_device);
+		group = flags_to_group (WACOM_BUTTON_RING_MODESWITCH);
+		if (num_modes == 0) {
+			/* If no mode is available, we use "left-ring-mode-1" for backward compat */
+			l = g_list_append (l, gsd_wacom_tablet_button_new (_("Left Ring"),
+									   "left-ring-mode-1",
+									   settings_path,
+									   WACOM_TABLET_BUTTON_TYPE_RING,
+									   WACOM_TABLET_BUTTON_POS_LEFT,
+									   group,
+									   0,
+									   GSD_WACOM_NO_LED));
+		} else {
+			for (i = 1; i <= num_modes; i++) {
+				name = g_strdup_printf (_("Left Ring Mode #%d"), i);
+				id = g_strdup_printf ("left-ring-mode-%d", i);
+				l = g_list_append (l, gsd_wacom_tablet_button_new (name,
+				                                                   id,
+				                                                   settings_path,
+				                                                   WACOM_TABLET_BUTTON_TYPE_RING,
+										   WACOM_TABLET_BUTTON_POS_LEFT,
+				                                                   group,
+				                                                   i - 1,
+										   GSD_WACOM_NO_LED));
+				g_free (name);
+				g_free (id);
+			}
 		}
 	} else if ((direction & WACOM_BUTTON_POSITION_RIGHT) && libwacom_has_ring2 (wacom_device)) {
-		/* There is a ring so there must be at least one mode */
-		num_modes = MAX (1, libwacom_get_ring2_num_modes (wacom_device));
-		for (i = 1; i <= num_modes; i++) {
-			name = g_strdup_printf (_("Right Ring Mode #%d"), i);
-			id = g_strdup_printf ("right-ring-mode-%d", i);
-			l = g_list_append (l, gsd_wacom_tablet_button_new (name, id, settings_path, WACOM_TABLET_BUTTON_TYPE_ELEVATOR, flags_to_group (WACOM_BUTTON_RING2_MODESWITCH), i - 1));
-			g_free (name);
-			g_free (id);
+		num_modes = libwacom_get_ring2_num_modes (wacom_device);
+		group = flags_to_group (WACOM_BUTTON_RING2_MODESWITCH);
+		if (num_modes == 0) {
+			/* If no mode is available, we use "right-ring-mode-1" for backward compat */
+			l = g_list_append (l, gsd_wacom_tablet_button_new (_("Right Ring"),
+									   "right-ring-mode-1",
+									   settings_path,
+									   WACOM_TABLET_BUTTON_TYPE_RING,
+									   WACOM_TABLET_BUTTON_POS_RIGHT,
+									   group,
+									   0,
+									   GSD_WACOM_NO_LED));
+		} else {
+			for (i = 1; i <= num_modes; i++) {
+				name = g_strdup_printf (_("Right Ring Mode #%d"), i);
+				id = g_strdup_printf ("right-ring-mode-%d", i);
+				l = g_list_append (l, gsd_wacom_tablet_button_new (name,
+				                                                   id,
+				                                                   settings_path,
+				                                                   WACOM_TABLET_BUTTON_TYPE_RING,
+										   WACOM_TABLET_BUTTON_POS_RIGHT,
+				                                                   group,
+				                                                   i - 1,
+										   GSD_WACOM_NO_LED));
+				g_free (name);
+				g_free (id);
+			}
 		}
 	}
 
@@ -1039,6 +1139,7 @@
 	GList *l;
 	guint num_modes;
 	guint num_strips;
+	guint group;
 	guint i;
 	char *name, *id;
 
@@ -1048,24 +1149,62 @@
 		g_warning ("Unhandled number of touchstrips: %d", num_strips);
 
 	if ((direction & WACOM_BUTTON_POSITION_LEFT) && num_strips >= 1) {
-		/* There is a strip so there must be at least one mode */
-		num_modes = MAX (1, libwacom_get_strips_num_modes (wacom_device));
-		for (i = 1; i <= num_modes; i++) {
-			name = g_strdup_printf (_("Left Touchstrip Mode #%d"), i);
-			id = g_strdup_printf ("left-strip-mode-%d", i);
-			l = g_list_append (l, gsd_wacom_tablet_button_new (name, id, settings_path, WACOM_TABLET_BUTTON_TYPE_ELEVATOR, flags_to_group (WACOM_BUTTON_TOUCHSTRIP_MODESWITCH), i - 1));
-			g_free (name);
-			g_free (id);
+		num_modes = libwacom_get_strips_num_modes (wacom_device);
+		group = flags_to_group (WACOM_BUTTON_TOUCHSTRIP_MODESWITCH);
+		if (num_modes == 0) {
+			/* If no mode is available, we use "left-strip-mode-1" for backward compat */
+			l = g_list_append (l, gsd_wacom_tablet_button_new (_("Left Touchstrip"),
+									   "left-strip-mode-1",
+									   settings_path,
+									   WACOM_TABLET_BUTTON_TYPE_STRIP,
+									   WACOM_TABLET_BUTTON_POS_LEFT,
+									   group,
+									   0,
+									   GSD_WACOM_NO_LED));
+		} else {
+			for (i = 1; i <= num_modes; i++) {
+				name = g_strdup_printf (_("Left Touchstrip Mode #%d"), i);
+				id = g_strdup_printf ("left-strip-mode-%d", i);
+				l = g_list_append (l, gsd_wacom_tablet_button_new (name,
+				                                                   id,
+				                                                   settings_path,
+				                                                   WACOM_TABLET_BUTTON_TYPE_STRIP,
+										   WACOM_TABLET_BUTTON_POS_LEFT,
+				                                                   group,
+				                                                   i - 1,
+										   GSD_WACOM_NO_LED));
+				g_free (name);
+				g_free (id);
+			}
 		}
 	} else if ((direction & WACOM_BUTTON_POSITION_RIGHT) && num_strips >= 2) {
-		/* There is a strip so there must be at least one mode */
-		num_modes = MAX (1, libwacom_get_strips_num_modes (wacom_device));
-		for (i = 1; i <= num_modes; i++) {
-			name = g_strdup_printf (_("Right Touchstrip Mode #%d"), i);
-			id = g_strdup_printf ("right-strip-mode-%d", i);
-			l = g_list_append (l, gsd_wacom_tablet_button_new (name, id, settings_path, WACOM_TABLET_BUTTON_TYPE_ELEVATOR, flags_to_group (WACOM_BUTTON_TOUCHSTRIP2_MODESWITCH), i - 1));
-			g_free (name);
-			g_free (id);
+		num_modes = libwacom_get_strips_num_modes (wacom_device);
+		group = flags_to_group (WACOM_BUTTON_TOUCHSTRIP2_MODESWITCH);
+		if (num_modes == 0) {
+			/* If no mode is available, we use "right-strip-mode-1" for backward compat */
+			l = g_list_append (l, gsd_wacom_tablet_button_new (_("Right Touchstrip"),
+									   "right-strip-mode-1",
+									   settings_path,
+									   WACOM_TABLET_BUTTON_TYPE_STRIP,
+									   WACOM_TABLET_BUTTON_POS_RIGHT,
+									   group,
+									   0,
+									   GSD_WACOM_NO_LED));
+		} else {
+			for (i = 1; i <= num_modes; i++) {
+				name = g_strdup_printf (_("Right Touchstrip Mode #%d"), i);
+				id = g_strdup_printf ("right-strip-mode-%d", i);
+				l = g_list_append (l, gsd_wacom_tablet_button_new (name,
+				                                                   id,
+				                                                   settings_path,
+				                                                   WACOM_TABLET_BUTTON_TYPE_STRIP,
+										   WACOM_TABLET_BUTTON_POS_RIGHT,
+				                                                   group,
+				                                                   i - 1,
+										   GSD_WACOM_NO_LED));
+				g_free (name);
+				g_free (id);
+			}
 		}
 	}
 
@@ -1093,6 +1232,23 @@
 	return g_strdup_printf (_("Mode Switch #%d"), button_num);
 }
 
+static GsdWacomTabletButtonType
+gsd_wacom_device_button_pos (WacomButtonFlags flags)
+{
+	if (flags & WACOM_BUTTON_POSITION_LEFT)
+		return WACOM_TABLET_BUTTON_POS_LEFT;
+	else if (flags & WACOM_BUTTON_POSITION_RIGHT)
+		return WACOM_TABLET_BUTTON_POS_RIGHT;
+	else if (flags & WACOM_BUTTON_POSITION_TOP)
+		return WACOM_TABLET_BUTTON_POS_TOP;
+	else if (flags & WACOM_BUTTON_POSITION_BOTTOM)
+		return WACOM_TABLET_BUTTON_POS_BOTTOM;
+
+	g_warning ("Unhandled button position");
+
+	return WACOM_TABLET_BUTTON_POS_UNDEF;
+}
+
 static GList *
 gsd_wacom_device_add_buttons_dir (WacomDevice      *wacom_device,
 				  const char       *settings_path,
@@ -1119,7 +1275,14 @@
 
 		name = g_strdup_printf (button_str, button_num++);
 		id = g_strdup_printf ("%s%c", button_str_id, i);
-		l = g_list_append (l, gsd_wacom_tablet_button_new (name, id, settings_path, WACOM_TABLET_BUTTON_TYPE_NORMAL, flags_to_group (flags), -1));
+		l = g_list_append (l, gsd_wacom_tablet_button_new (name,
+		                                                   id,
+		                                                   settings_path,
+		                                                   WACOM_TABLET_BUTTON_TYPE_NORMAL,
+		                                                   gsd_wacom_device_button_pos (flags),
+		                                                   flags_to_group (flags),
+		                                                   -1,
+		                                                   GSD_WACOM_NO_LED));
 		g_free (name);
 		g_free (id);
 	}
@@ -1128,6 +1291,7 @@
 	for (i = 'A'; i < 'A' + num_buttons; i++) {
 		WacomButtonFlags flags;
 		char *name, *id;
+		int status_led;
 
 		flags = libwacom_get_button_flag (wacom_device, i);
 		if (!(flags & direction))
@@ -1138,7 +1302,15 @@
 
 		name = gsd_wacom_device_modeswitch_name (flags, button_num++);
 		id = g_strdup_printf ("%s%c", button_str_id, i);
-		l = g_list_append (l, gsd_wacom_tablet_button_new (name, id, settings_path, WACOM_TABLET_BUTTON_TYPE_HARDCODED, flags_to_group (flags), -1));
+		status_led = libwacom_get_button_led_group (wacom_device, i);
+		l = g_list_append (l, gsd_wacom_tablet_button_new (name,
+		                                                   id,
+		                                                   settings_path,
+		                                                   WACOM_TABLET_BUTTON_TYPE_HARDCODED,
+		                                                   gsd_wacom_device_button_pos (flags),
+		                                                   flags_to_group (flags),
+		                                                   -1,
+		                                                   status_led));
 		g_free (name);
 		g_free (id);
 	}
@@ -1239,11 +1411,13 @@
 								 settings_path);
 
 	device->priv->name = g_strdup (libwacom_get_name (wacom_device));
+	device->priv->layout_path = g_strdup (libwacom_get_layout_filename (wacom_device));
 	device->priv->reversible = libwacom_is_reversible (wacom_device);
 	integration_flags = libwacom_get_integration_flags (wacom_device);
 	device->priv->is_screen_tablet = (integration_flags & WACOM_DEVICE_INTEGRATED_DISPLAY);
+	device->priv->is_isd = (integration_flags & WACOM_DEVICE_INTEGRATED_SYSTEM);
 	if (device->priv->is_screen_tablet) {
-		if (libwacom_get_class (wacom_device) == WCLASS_CINTIQ)
+		if (!device->priv->is_isd)
 			device->priv->icon_name = "wacom-tablet-cintiq";
 		else
 			device->priv->icon_name = "wacom-tablet-pc";
@@ -1487,6 +1661,8 @@
                 p->num_modes = NULL;
         }
 
+	g_clear_pointer (&p->layout_path, g_free);
+
 	gdk_window_remove_filter (NULL,
 				  (GdkFilterFunc) filter_events,
 				  device);
@@ -1536,6 +1712,14 @@
 }
 
 const char *
+gsd_wacom_device_get_layout_path (GsdWacomDevice *device)
+{
+	g_return_val_if_fail (GSD_IS_WACOM_DEVICE (device), NULL);
+
+	return device->priv->layout_path;
+}
+
+const char *
 gsd_wacom_device_get_path (GsdWacomDevice *device)
 {
 	g_return_val_if_fail (GSD_IS_WACOM_DEVICE (device), NULL);
@@ -1576,6 +1760,14 @@
 }
 
 gboolean
+gsd_wacom_device_is_isd (GsdWacomDevice *device)
+{
+	g_return_val_if_fail (GSD_IS_WACOM_DEVICE (device), FALSE);
+
+	return device->priv->is_isd;
+}
+
+gboolean
 gsd_wacom_device_is_fallback (GsdWacomDevice *device)
 {
 	g_return_val_if_fail (GSD_IS_WACOM_DEVICE (device), FALSE);

=== modified file 'panels/wacom/gsd-wacom-device.h'
--- panels/wacom/gsd-wacom-device.h	2012-10-19 13:41:43 +0000
+++ panels/wacom/gsd-wacom-device.h	2014-02-19 03:07:54 +0000
@@ -93,19 +93,36 @@
 /* Tablet Buttons */
 typedef enum {
 	WACOM_TABLET_BUTTON_TYPE_NORMAL,
-	WACOM_TABLET_BUTTON_TYPE_ELEVATOR,
+	WACOM_TABLET_BUTTON_TYPE_STRIP,
+	WACOM_TABLET_BUTTON_TYPE_RING,
 	WACOM_TABLET_BUTTON_TYPE_HARDCODED
 } GsdWacomTabletButtonType;
 
+/*
+ * Positions of the buttons on the tablet in default right-handed mode
+ * (ie with no rotation applied).
+ */
+typedef enum {
+	WACOM_TABLET_BUTTON_POS_UNDEF = 0,
+	WACOM_TABLET_BUTTON_POS_LEFT,
+	WACOM_TABLET_BUTTON_POS_RIGHT,
+	WACOM_TABLET_BUTTON_POS_TOP,
+	WACOM_TABLET_BUTTON_POS_BOTTOM
+} GsdWacomTabletButtonPos;
+
 #define MAX_GROUP_ID 4
 
+#define GSD_WACOM_NO_LED -1
+
 typedef struct
 {
 	char                     *name;
 	char                     *id;
 	GSettings                *settings;
 	GsdWacomTabletButtonType  type;
+	GsdWacomTabletButtonPos   pos;
 	int                       group_id, idx;
+	int                       status_led;
 } GsdWacomTabletButton;
 
 void                  gsd_wacom_tablet_button_free (GsdWacomTabletButton *button);
@@ -137,11 +154,13 @@
 GsdWacomDevice * gsd_wacom_device_new              (GdkDevice *device);
 GList          * gsd_wacom_device_list_styli       (GsdWacomDevice *device);
 const char     * gsd_wacom_device_get_name         (GsdWacomDevice *device);
+const char     * gsd_wacom_device_get_layout_path  (GsdWacomDevice *device);
 const char     * gsd_wacom_device_get_path         (GsdWacomDevice *device);
 const char     * gsd_wacom_device_get_icon_name    (GsdWacomDevice *device);
 const char     * gsd_wacom_device_get_tool_name    (GsdWacomDevice *device);
 gboolean         gsd_wacom_device_reversible       (GsdWacomDevice *device);
 gboolean         gsd_wacom_device_is_screen_tablet (GsdWacomDevice *device);
+gboolean         gsd_wacom_device_is_isd           (GsdWacomDevice *device);
 gboolean         gsd_wacom_device_is_fallback      (GsdWacomDevice *device);
 gint             gsd_wacom_device_get_num_strips   (GsdWacomDevice *device);
 gint             gsd_wacom_device_get_num_rings    (GsdWacomDevice *device);
@@ -158,8 +177,12 @@
 GsdWacomTabletButton *gsd_wacom_device_get_button   (GsdWacomDevice   *device,
 						     int               button,
 						     GtkDirectionType *dir);
-int gsd_wacom_device_set_next_mode                  (GsdWacomDevice *device,
-						     int             group_id);
+int gsd_wacom_device_get_num_modes                  (GsdWacomDevice   *device,
+						     int               group_id);
+int gsd_wacom_device_get_current_mode               (GsdWacomDevice   *device,
+						     int               group_id);
+int gsd_wacom_device_set_next_mode                  (GsdWacomDevice       *device,
+						     GsdWacomTabletButton *button);
 GsdWacomRotation gsd_wacom_device_rotation_name_to_type (const char *rotation);
 const char     * gsd_wacom_device_rotation_type_to_name (GsdWacomRotation type);
 

=== modified file 'panels/wacom/unity-wacom-panel.desktop.in.in'
--- panels/wacom/unity-wacom-panel.desktop.in.in	2013-12-02 04:30:50 +0000
+++ panels/wacom/unity-wacom-panel.desktop.in.in	2014-02-19 03:07:54 +0000
@@ -1,6 +1,6 @@
 [Desktop Entry]
 _Name=Wacom Tablet
-_Comment=Set your Wacom tablet preferences
+_Comment=Set button mappings and adjust stylus sensitivity for graphics tablets
 Exec=unity-control-center wacom
 Icon=input-tablet
 Terminal=false

=== added file 'panels/wacom/wacom.gresource.xml'
--- panels/wacom/wacom.gresource.xml	1970-01-01 00:00:00 +0000
+++ panels/wacom/wacom.gresource.xml	2014-02-19 03:07:54 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/control-center/wacom">
+    <file preprocess="xml-stripblanks">gnome-wacom-properties.ui</file>
+    <file preprocess="xml-stripblanks">wacom-stylus-page.ui</file>
+    <file preprocess="xml-stripblanks">button-mapping.ui</file>
+    <file>wacom-tablet.svg</file>
+    <file>wacom-stylus.svg</file>
+    <file>wacom-stylus-airbrush.svg</file>
+    <file>wacom-stylus-inking.svg</file>
+    <file>wacom-stylus-art-pen.svg</file>
+    <file>wacom-stylus-classic.svg</file>
+    <file>wacom-tablet-cintiq.svg</file>
+    <file>wacom-tablet-pc.svg</file>
+  </gresource>
+</gresources>