aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2008-12-02 11:49:55 -0600
committerTed Gould <ted@canonical.com>2008-12-02 11:49:55 -0600
commita387d91c169cb0add2cee70c66ae2c465bc341eb (patch)
tree51d0cca15cf84c5db0a5ee09155d223996f8b6b7
parent52e485504a859a632dbfad9b20d88e25325f7a57 (diff)
downloadlibayatana-indicator-a387d91c169cb0add2cee70c66ae2c465bc341eb.tar.gz
libayatana-indicator-a387d91c169cb0add2cee70c66ae2c465bc341eb.tar.bz2
libayatana-indicator-a387d91c169cb0add2cee70c66ae2c465bc341eb.zip
Adding in all of the icons into the mockups.
-rw-r--r--data/icons/16x16/panel/Makefile.am2
-rw-r--r--data/icons/22x22/panel/Makefile.am2
-rw-r--r--data/icons/24x24/panel/Makefile.am2
-rw-r--r--data/icons/32x32/panel/Makefile.am2
-rw-r--r--data/icons/48x48/panel/Makefile.am2
-rw-r--r--data/icons/scalable/panel/Makefile.am2
-rw-r--r--src/Makefile.am1
-rw-r--r--src/applet-main.c5
-rw-r--r--src/indicator-audio.c2
-rw-r--r--src/indicator-power.c8
10 files changed, 17 insertions, 11 deletions
diff --git a/data/icons/16x16/panel/Makefile.am b/data/icons/16x16/panel/Makefile.am
index 0b73f15..e36faed 100644
--- a/data/icons/16x16/panel/Makefile.am
+++ b/data/icons/16x16/panel/Makefile.am
@@ -1,5 +1,5 @@
-iconsdir = $(pkgdatadir)/icons/hicolor/16x16/status
+iconsdir = $(pkgdatadir)/icons/hicolor/16x16/panel
icons_DATA = \
panel-dummy.png \
diff --git a/data/icons/22x22/panel/Makefile.am b/data/icons/22x22/panel/Makefile.am
index a919254..94524b4 100644
--- a/data/icons/22x22/panel/Makefile.am
+++ b/data/icons/22x22/panel/Makefile.am
@@ -1,5 +1,5 @@
-iconsdir = $(pkgdatadir)/icons/hicolor/22x22/status
+iconsdir = $(pkgdatadir)/icons/hicolor/22x22/panel
icons_DATA = \
panel-dummy.png
diff --git a/data/icons/24x24/panel/Makefile.am b/data/icons/24x24/panel/Makefile.am
index 7914685..f3c3cdf 100644
--- a/data/icons/24x24/panel/Makefile.am
+++ b/data/icons/24x24/panel/Makefile.am
@@ -1,5 +1,5 @@
-iconsdir = $(pkgdatadir)/icons/hicolor/24x24/status
+iconsdir = $(pkgdatadir)/icons/hicolor/24x24/panel
icons_DATA = \
panel-dummy.png
diff --git a/data/icons/32x32/panel/Makefile.am b/data/icons/32x32/panel/Makefile.am
index 7820f73..5fb5210 100644
--- a/data/icons/32x32/panel/Makefile.am
+++ b/data/icons/32x32/panel/Makefile.am
@@ -1,5 +1,5 @@
-iconsdir = $(pkgdatadir)/icons/hicolor/32x32/status
+iconsdir = $(pkgdatadir)/icons/hicolor/32x32/panel
icons_DATA = \
panel-dummy.png
diff --git a/data/icons/48x48/panel/Makefile.am b/data/icons/48x48/panel/Makefile.am
index 0a12992..32ab766 100644
--- a/data/icons/48x48/panel/Makefile.am
+++ b/data/icons/48x48/panel/Makefile.am
@@ -1,5 +1,5 @@
-iconsdir = $(pkgdatadir)/icons/hicolor/48x48/status
+iconsdir = $(pkgdatadir)/icons/hicolor/48x48/panel
icons_DATA = \
panel-dummy.png
diff --git a/data/icons/scalable/panel/Makefile.am b/data/icons/scalable/panel/Makefile.am
index 2f82bfa..a907e42 100644
--- a/data/icons/scalable/panel/Makefile.am
+++ b/data/icons/scalable/panel/Makefile.am
@@ -1,5 +1,5 @@
-iconsdir = $(pkgdatadir)/icons/hicolor/scalable/status
+iconsdir = $(pkgdatadir)/icons/hicolor/scalable/panel
icons_DATA = \
panel-dummy.svg
diff --git a/src/Makefile.am b/src/Makefile.am
index d378011..dff09f5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,6 +4,7 @@ libexec_PROGRAMS = \
indicator_applet_CFLAGS = \
-DG_LOG_DOMAIN=\""Indicator-Applet"\" \
+ -DDATADIR=\""$(datadir)"\" \
$(APPLET_CFLAGS)
indicator_applet_SOURCES = \
diff --git a/src/applet-main.c b/src/applet-main.c
index 5f5461a..f442d09 100644
--- a/src/applet-main.c
+++ b/src/applet-main.c
@@ -7,6 +7,8 @@
#include "indicator-power.h"
#include "indicator-system.h"
+#define ICONS_DIR (DATADIR G_DIR_SEPARATOR_S "indicator-applet" G_DIR_SEPARATOR_S "icons")
+
static gboolean applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data);
@@ -37,6 +39,9 @@ menuitem_func indicators[] = {
static gboolean
applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data)
{
+ gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
+ ICONS_DIR);
+
int i;
GtkWidget * menubar = gtk_menu_bar_new();
gtk_widget_set_name (menubar, "indicator-applet-menubar");
diff --git a/src/indicator-audio.c b/src/indicator-audio.c
index d102ff9..5cf2ac3 100644
--- a/src/indicator-audio.c
+++ b/src/indicator-audio.c
@@ -9,7 +9,7 @@ indicator_audio_menuitem (void)
{
GtkWidget * mainmenu = gtk_menu_item_new();
- GtkWidget * icon = gtk_image_new_from_icon_name("audio-volume-muted",
+ GtkWidget * icon = gtk_image_new_from_icon_name("panel-light-audio-volume-low",
GTK_ICON_SIZE_MENU);
gtk_container_add(GTK_CONTAINER(mainmenu), icon);
diff --git a/src/indicator-power.c b/src/indicator-power.c
index 03ee0d2..84d5da1 100644
--- a/src/indicator-power.c
+++ b/src/indicator-power.c
@@ -21,9 +21,9 @@ block_prelight (GtkWidget * widget, GtkStateType prev, gpointer data)
#define MENU_ITEM_CNT 3
menuitem_t menuitems[MENU_ITEM_CNT] = {
- {"Main", "audio-volume-low", "(1:34 left)"},
- {"Mouse", "audio-volume-med", "(0:40 left)"},
- {"Phone", "audio-volume-high", "(10:40 left)"}
+ {"Main", "panel-light-power-battery-medium", "(1:34 left)"},
+ {"Mouse", "panel-light-power-mouse-verylow", "(0:40 left)"},
+ {"Phone", "panel-light-power-battery-verylow", "(10:40 left)"}
};
GtkWidget *
@@ -85,7 +85,7 @@ indicator_power_menuitem (void)
GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
- GtkWidget * icon = gtk_image_new_from_icon_name("audio-volume-high",
+ GtkWidget * icon = gtk_image_new_from_icon_name("panel-light-power-battery-plugged",
GTK_ICON_SIZE_MENU);
gtk_box_pack_start(GTK_BOX(hbox), icon, FALSE, FALSE, 0);
gtk_widget_show(icon);