aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-01-25 14:33:41 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-01-25 14:33:41 +0800
commit77ba5399031de0aba831e267a4b6ed6f0d51ca6c (patch)
treef8e64c39b2f63e8b75b7273198b3b9f4ae272f44
parent46e42dcf44573b23812ada87bfe5313cb318662f (diff)
downloadgsoc2013-evolution-77ba5399031de0aba831e267a4b6ed6f0d51ca6c.tar.gz
gsoc2013-evolution-77ba5399031de0aba831e267a4b6ed6f0d51ca6c.tar.zst
gsoc2013-evolution-77ba5399031de0aba831e267a4b6ed6f0d51ca6c.zip
Get the addressbook to use the new "Show all" icon.
svn path=/trunk/; revision=7802
-rw-r--r--ChangeLog4
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/gui/component/addressbook.c28
-rw-r--r--art/Makefile.am1
-rw-r--r--ui/ChangeLog5
-rw-r--r--ui/evolution-addressbook.xml8
6 files changed, 46 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index b9ff208faf..bb014fc267 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-25 Ettore Perazzoli <ettore@ximian.com>
+
+ * art/Makefile.am (images_DATA): Add `24_all_contacts.xpm'.
+
2001-01-24 Christopher James Lahey <clahey@helixcode.com>
* configure.in: Upped the required version of gal in evolution.
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 16e0c6d522..b5adeae5ef 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-25 Ettore Perazzoli <ettore@ximian.com>
+
+ * gui/component/addressbook.c (set_pixmap): New.
+ (update_pixmaps): New function, setting the pixmaps for the items
+ of type "pixbuf", using `set_pixmap'.
+ (control_activate): Call it.
+
2001-01-25 Not Zed <NotZed@Ximian.com>
* backend/pas/pas-backend-ldap.c: esexp api change fixes.
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index fe0ad46e52..54b211bb16 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -282,6 +282,32 @@ BonoboUIVerb verbs [] = {
};
static void
+set_pixmap (BonoboUIComponent *uic,
+ const char *xml_path,
+ const char *icon)
+{
+ char *path;
+ GdkPixbuf *pixbuf;
+
+ path = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution", icon);
+
+ pixbuf = gdk_pixbuf_new_from_file (path);
+ g_return_if_fail (pixbuf != NULL);
+
+ bonobo_ui_util_set_pixbuf (uic, xml_path, pixbuf);
+
+ gdk_pixbuf_unref (pixbuf);
+
+ g_free (path);
+}
+
+static void
+update_pixmaps (BonoboUIComponent *uic)
+{
+ set_pixmap (uic, "/Toolbar/View All", "24_all_contacts.xpm");
+}
+
+static void
control_activate (BonoboControl *control,
BonoboUIComponent *uic,
AddressbookView *view)
@@ -305,6 +331,8 @@ control_activate (BonoboControl *control,
update_view_type (view);
+ update_pixmaps (uic);
+
bonobo_ui_component_thaw (uic, NULL);
}
diff --git a/art/Makefile.am b/art/Makefile.am
index c415cc2e76..fd39710c65 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -1,6 +1,7 @@
imagesdir = $(datadir)/images/evolution
images_DATA = \
+ 24_all_contacts.xpm \
briefcase.png \
butterfly.png \
cellphone.png \
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 2171b95272..e27f7fc329 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-25 Ettore Perazzoli <ettore@ximian.com>
+
+ * evolution-addressbook.xml: Change the type of the "View All"
+ button to "pixbuf".
+
2001-01-24 Jeffrey Stedfast <fejj@ximian.com>
* evolution-message-composer.xml: Change Security* to SecurityPGP*
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index f8a8dff6ed..d435719356 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -64,7 +64,7 @@
<toolitem name="View All" _label="View All"
_tip="View all contacts" verb="ContactViewAll"
- pixtype="stock" pixname="Multiple"/>
+ pixtype="pixbuf"/>
<toolitem name="Stop" _label="Stop"
_tip="Stop Loading" verb="ContactStop"
@@ -73,9 +73,3 @@
</dockitem>
</Root>
-
-
-
-
-
-