[gnome-control-center] wacom: Make .ui files load the images properly
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] wacom: Make .ui files load the images properly
- Date: Mon, 30 Jan 2012 17:06:52 +0000 (UTC)
commit decc5cf668067c2898cb90e65919442e78a3fbe5
Author: Bastien Nocera <hadess hadess net>
Date: Mon Jan 30 16:27:49 2012 +0000
wacom: Make .ui files load the images properly
So it's easier to see what it looks like in glade.
panels/wacom/Makefile.am | 3 +--
panels/wacom/cc-wacom-page.c | 2 +-
panels/wacom/cc-wacom-stylus-page.c | 2 +-
panels/wacom/gnome-wacom-properties.ui | 2 +-
panels/wacom/wacom-stylus-page.ui | 2 +-
5 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/panels/wacom/Makefile.am b/panels/wacom/Makefile.am
index 23e5086..634db7c 100644
--- a/panels/wacom/Makefile.am
+++ b/panels/wacom/Makefile.am
@@ -10,7 +10,6 @@ INCLUDES = \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DGNOMECC_UI_DIR="\"$(uidir)\"" \
- -DPIXMAP_DIR=\""$(datadir)/gnome-control-center/pixmaps"\" \
$(NULL)
@@ -57,7 +56,7 @@ test_wacom_LDADD = $(PANEL_LIBS) $(WACOM_PANEL_LIBS) $(builddir)/calibrator/libw
@INTLTOOL_DESKTOP_RULE@
-pixmapdir = $(pkgdatadir)/pixmaps
+pixmapdir = $(pkgdatadir)/ui
pixmap_DATA = \
wacom-tablet.svg \
wacom-stylus.svg \
diff --git a/panels/wacom/cc-wacom-page.c b/panels/wacom/cc-wacom-page.c
index 0afeb3a..a4ed691 100644
--- a/panels/wacom/cc-wacom-page.c
+++ b/panels/wacom/cc-wacom-page.c
@@ -397,7 +397,7 @@ set_icon_name (CcWacomPage *page,
priv = page->priv;
filename = g_strdup_printf ("%s.svg", icon_name);
- path = g_build_filename (PIXMAP_DIR, filename, NULL);
+ path = g_build_filename (GNOMECC_UI_DIR, filename, NULL);
g_free (filename);
gtk_image_set_from_file (GTK_IMAGE (WID (widget_name)), path);
diff --git a/panels/wacom/cc-wacom-stylus-page.c b/panels/wacom/cc-wacom-stylus-page.c
index a69eb2b..ea85476 100644
--- a/panels/wacom/cc-wacom-stylus-page.c
+++ b/panels/wacom/cc-wacom-stylus-page.c
@@ -342,7 +342,7 @@ set_icon_name (CcWacomStylusPage *page,
priv = page->priv;
filename = g_strdup_printf ("%s.svg", icon_name);
- path = g_build_filename (PIXMAP_DIR, filename, NULL);
+ path = g_build_filename (GNOMECC_UI_DIR, filename, NULL);
g_free (filename);
gtk_image_set_from_file (GTK_IMAGE (WID (widget_name)), path);
diff --git a/panels/wacom/gnome-wacom-properties.ui b/panels/wacom/gnome-wacom-properties.ui
index bc2dcde..fac2b5d 100644
--- a/panels/wacom/gnome-wacom-properties.ui
+++ b/panels/wacom/gnome-wacom-properties.ui
@@ -168,7 +168,7 @@
<object class="GtkImage" id="image-tablet">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon_name">input-tablet</property>
+ <property name="pixbuf">wacom-tablet.svg</property>
<property name="margin-right">16</property>
</object>
<packing>
diff --git a/panels/wacom/wacom-stylus-page.ui b/panels/wacom/wacom-stylus-page.ui
index 939bd48..12beb00 100644
--- a/panels/wacom/wacom-stylus-page.ui
+++ b/panels/wacom/wacom-stylus-page.ui
@@ -71,7 +71,7 @@
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">center</property>
- <property name="stock">gtk-missing-image</property>
+ <property name="pixbuf">wacom-stylus.svg</property>
<property name="margin-right">16</property>
</object>
<packing>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]