From a74d594e2fcea73193b8ab208b0d333c76e9ece0 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Tue, 13 Feb 2001 23:50:25 +0000 Subject: Set toolbar new appointment icon (set_pixmap): load files rather than 2001-02-13 JP Rosevear * gui/calendar-commands.c (update_pixmaps): Set toolbar new appointment icon (set_pixmap): load files rather than create from xpm file * gui/*view.xpm: move to the art directory 2001-02-13 JP Rosevear * art/Makefile.am: install new files * art/*view.xpm: add files from calendar/gui svn path=/trunk/; revision=8216 --- ChangeLog | 6 ++++ art/Makefile.am | 10 +++++- art/dayview.xpm | 34 ++++++++++++++++++ art/monthview.xpm | 34 ++++++++++++++++++ art/weekview.xpm | 34 ++++++++++++++++++ art/workweekview.xpm | 34 ++++++++++++++++++ art/yearview.xpm | 44 +++++++++++++++++++++++ calendar/ChangeLog | 10 ++++++ calendar/gui/calendar-commands.c | 77 ++++++++++++++++++---------------------- calendar/gui/dayview.xpm | 34 ------------------ calendar/gui/monthview.xpm | 34 ------------------ calendar/gui/weekview.xpm | 34 ------------------ calendar/gui/workweekview.xpm | 34 ------------------ calendar/gui/yearview.xpm | 44 ----------------------- 14 files changed, 240 insertions(+), 223 deletions(-) create mode 100644 art/dayview.xpm create mode 100644 art/monthview.xpm create mode 100644 art/weekview.xpm create mode 100644 art/workweekview.xpm create mode 100644 art/yearview.xpm delete mode 100644 calendar/gui/dayview.xpm delete mode 100644 calendar/gui/monthview.xpm delete mode 100644 calendar/gui/weekview.xpm delete mode 100644 calendar/gui/workweekview.xpm delete mode 100644 calendar/gui/yearview.xpm diff --git a/ChangeLog b/ChangeLog index 7a4824424c..e5a930aac7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-02-13 JP Rosevear + + * art/Makefile.am: install new files + + * art/*view.xpm: add files from calendar/gui + 2001-02-11 Chris Toshok * configure.in: rework ldap check logic so it'll work to diff --git a/art/Makefile.am b/art/Makefile.am index 97856c5884..cb5161dbb7 100644 --- a/art/Makefile.am +++ b/art/Makefile.am @@ -37,6 +37,7 @@ images_DATA = \ globe.png \ house.png \ malehead.png \ + new_contact.xpm \ service-close.png \ service-configure.png \ service-down.png \ @@ -54,11 +55,18 @@ buttons_DATA = \ add-service.png \ compose-message.png \ copy-message.png \ + dayview.xpm \ fetch-mail.png \ forward.png \ + monthview.xpm \ move-message.png \ + new_appointment.png \ reply-to-all.png \ - reply.png + reply.png \ + weekview.xpm \ + workweekview.xpm \ + yearview.xpm + EXTRA_DIST = \ add-service.png \ diff --git a/art/dayview.xpm b/art/dayview.xpm new file mode 100644 index 0000000000..dbabb24c5c --- /dev/null +++ b/art/dayview.xpm @@ -0,0 +1,34 @@ +/* XPM */ +static char * dayview_xpm[] = { +"24 24 7 1", +" c None", +". c #000000", +"+ c #D8D8D4", +"@ c #919191", +"# c #666666", +"$ c #FFFFFF", +"% c #F2F1ED", +"....................... ", +".++++++++++++++++++++@. ", +".+@@@@@@@@@@@@@@@@@@@#. ", +".+@@@@@@@@@@@@@@@@@@@#. ", +".+@@@@@@@@@@@@@@@@@@@#. ", +".@####################. ", +".$++@%%%%%%%%%%%%%%%%@. ", +".$++@%%%%%%%%%%%%%%%%@. ", +".$++@%%%%%%%%%%%%%%%%@. ", +".@@@@@@@@@@@@@@@@@@@@#. ", +".$++@%%%%%%%%%%%%%%%%@. ", +".$++@%%%%%%%%%%%%%%%%@. ", +".$++@%%%%%%%%%%%%%%%%@. ", +".@@@@@@@@@@@@@@@@@@@@#. ", +".$++@%%%%%%%%%%%%%%%%@. ", +".$++@%%%%%%%%%%%%%%%%@. ", +".$++@%%%%%%%%%%%%%%%%@. ", +".@@@@@@@@@@@@@@@@@@@@#. ", +".$++@%%%%%%%%%%%%%%%%@. ", +".$++@%%%%%%%%%%%%%%%%@. ", +".$++@%%%%%%%%%%%%%%%%@. ", +".+@@#@@@@@@@@@@@@@@@@#. ", +"....................... ", +" "}; diff --git a/art/monthview.xpm b/art/monthview.xpm new file mode 100644 index 0000000000..21c76151d5 --- /dev/null +++ b/art/monthview.xpm @@ -0,0 +1,34 @@ +/* XPM */ +static char * monthview_xpm[] = { +"24 24 7 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #666666", +"# c #919191", +"$ c #F2F1ED", +"% c #D8D8D4", +"....................... ", +".+++++++++++++++++++++. ", +".+@@@@@@@@@@@@@@@@@@@#. ", +".+@@@@@@@@@@@@@@@@@@@#. ", +".+$$$#$$$#$$$#$$$#$$$#. ", +".+$$$#$$$#$$$#$$$#$$$#. ", +".+$$$#$$$#$$$#$$$#$$$#. ", +".+####################. ", +".+$$$#$$$#$$$#$$$#$$$#. ", +".+$$$#$$$#$$$#$$$#$$$#. ", +".+$$$#$$$#$$$#$$$#$$$#. ", +".+$$$#$$$#$$$#$$$#$$$#. ", +".+####################. ", +".+$$$#$$$#$$$#$$$#$$$#. ", +".+$$$#$$$#$$$#$$$#$$$#. ", +".+$$$#$$$#$$$#$$$#$$$#. ", +".+$$$#$$$#$$$#$$$#$$$#. ", +".+####################. ", +".+$$$#$$$#$$$#$$$#$$$#. ", +".+$$$#$$$#$$$#$$$#$$$#. ", +".+$$$#$$$#$$$#$$$#$$$#. ", +".%###################@. ", +"....................... ", +" "}; diff --git a/art/weekview.xpm b/art/weekview.xpm new file mode 100644 index 0000000000..869b9e722a --- /dev/null +++ b/art/weekview.xpm @@ -0,0 +1,34 @@ +/* XPM */ +static char * weekview_xpm[] = { +"24 24 7 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #D8D8D4", +"# c #F2F1ED", +"$ c #919191", +"% c #666666", +"....................... ", +".++++++++++@++++++++++. ", +".+#..$.$###$#..$.$###$. ", +".+#########$#########$. ", +".+#########$#########$. ", +".+#########$#########$. ", +".+#########$#########$. ", +".+$$$$$$$$$$$$$$$$$$$$. ", +".+#..$.$###$#..$.$###$. ", +".+#########$#########$. ", +".+#########$#########$. ", +".+#########$#########$. ", +".+#########$#########$. ", +".+$$$$$$$$$$$$$$$$$$$$. ", +".+#..$.$###$#..$.$###$. ", +".+#########$#########$. ", +".+#########$#########$. ", +".+#########$$$$$$$$$$$. ", +".+#########$#..$.$###$. ", +".+#########$#########$. ", +".+#########$#########$. ", +".@$$$$$$$$$%$$$$$$$$$%. ", +"....................... ", +" "}; diff --git a/art/workweekview.xpm b/art/workweekview.xpm new file mode 100644 index 0000000000..35cceedbdc --- /dev/null +++ b/art/workweekview.xpm @@ -0,0 +1,34 @@ +/* XPM */ +static char * workweekview_xpm[] = { +"24 24 7 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #D8D8D4", +"# c #B5B4AF", +"$ c #666666", +"% c #F2F1ED", +"....................... ", +".++++@+++@+++@+++@++++. ", +".+###$###$###$###$###$. ", +".+###$###$###$###$###$. ", +".@$$$$$$$$$$$$$$$$$$$$. ", +".++++#+++#+++#+++#+++#. ", +".+%%%#%%%#%%%#%%%#%%%#. ", +".+%%%#%%%#%%%#%%%#%%%#. ", +".+%%%#%%%#%%%#%%%#%%%#. ", +".+%%%#%%%#%%%#%%%#%%%#. ", +".+%%%#%%%#%%%#%%%#%%%#. ", +".+%%%#%%%#%%%#%%%#%%%#. ", +".+%%%#%%%#%%%#%%%#%%%#. ", +".+%%%#%%%#%%%#%%%#%%%#. ", +".+%%%#%%%#%%%#%%%#%%%#. ", +".+%%%#%%%#%%%#%%%#%%%#. ", +".+%%%#%%%#%%%#%%%#%%%#. ", +".+%%%#%%%#%%%#%%%#%%%#. ", +".+%%%#%%%#%%%#%%%#%%%#. ", +".+%%%#%%%#%%%#%%%#%%%#. ", +".+%%%#%%%#%%%#%%%#%%%#. ", +".@###$###$###$###$####. ", +"....................... ", +" "}; diff --git a/art/yearview.xpm b/art/yearview.xpm new file mode 100644 index 0000000000..0d4fa4135b --- /dev/null +++ b/art/yearview.xpm @@ -0,0 +1,44 @@ +/* XPM */ +static char * yearview_xpm[] = { +"24 24 17 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #F2F1ED", +"# c #AAA9A6", +"$ c #D7D6D2", +"% c #92918E", +"& c #B7B6B3", +"* c #CBCAC6", +"= c #919191", +"- c #888785", +"; c #B6B6B2", +"> c #888884", +", c #C1C1BD", +"' c #A7A6A3", +") c #D8D8D4", +"! c #666666", +"....................... ", +".+++++++++++++++++++++. ", +".+@@@@@@@#$%&*@@@@@@@=. ", +".+@@@@@@@-;>,'@@@@@@@=. ", +".+====================. ", +".+@@@@@@@@@@@@@@@@@@@=. ", +".+===@===@===@===@====. ", +".+)=)@)=)@)=)@)=)@)=)=. ", +".+=)=@=)=@=)=@=)=@=)==. ", +".+@@@@@@@@@@@@@@@@@@@=. ", +".+===@===@===@===@====. ", +".+)=)@)=)@)=)@)=)@)=)=. ", +".+=)=@=)=@=)=@=)=@=)==. ", +".+@@@@@@@@@@@@@@@@@@@=. ", +".+===@===@===@===@====. ", +".+)=)@)=)@)=)@)=)@)=)=. ", +".+=)=@=)=@=)=@=)=@=)==. ", +".+@@@@@@@@@@@@@@@@@@@=. ", +".+===@===@===@===@====. ", +".+)=)@)=)@)=)@)=)@)=)=. ", +".+=)=@=)=@=)=@=)=@=)==. ", +".)===================!. ", +"....................... ", +" "}; diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 49ffbec716..9b14aac03c 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2001-02-13 JP Rosevear + + * gui/calendar-commands.c (update_pixmaps): Set toolbar new + appointment icon + (set_pixmap): load files rather than create from xpm file + + * gui/*view.xpm: move to the art directory + 2001-02-13 Rodrigo Moya * pcs/cal-backend-db.c (cal_backend_db_get_alarms_for_object): @@ -5,6 +13,8 @@ 2001-02-13 JP Rosevear + * gui/calendar-commands.c (update_pixmaps): Set toolbar new command + * gui/e-calendar-table.c: Add titles to pixbuf column for grouping * gui/calendar-model.c (calendar_model_class_init): override value diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index a9a9d62101..29557e2d68 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -45,14 +45,6 @@ #include "print.h" #include "dialogs/cal-prefs-dialog.h" -#include "dayview.xpm" -#include "workweekview.xpm" -#include "weekview.xpm" -#include "monthview.xpm" -#if 0 -#include "yearview.xpm" -#endif - /* A list of all of the calendars started */ static GList *all_calendars = NULL; @@ -60,13 +52,6 @@ static GList *all_calendars = NULL; /* We have one global preferences dialog. */ static CalPrefsDialog *preferences_dialog = NULL; - -static void update_pixmaps (BonoboUIComponent *uic); -static void set_pixmap (BonoboUIComponent *uic, - const char *xml_path, - char **xpm_data); - - /* Callback for the new appointment command */ static void new_appointment_cb (BonoboUIComponent *uic, gpointer data, const char *path) @@ -360,6 +345,41 @@ static BonoboUIVerb verbs [] = { BONOBO_UI_VERB_END }; +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); + if (pixbuf == NULL) { + g_warning ("Cannot load image -- %s", path); + g_free (path); + return; + } + + 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/New", "buttons/new_appointment.png"); + + set_pixmap (uic, "/Toolbar/DayView", "buttons/dayview.xpm"); + set_pixmap (uic, "/Toolbar/WorkWeekView", "buttons/workweekview.xpm"); + set_pixmap (uic, "/Toolbar/WeekView", "buttons/weekview.xpm"); + set_pixmap (uic, "/Toolbar/MonthView", "buttons/monthview.xpm"); +} + void calendar_control_activate (BonoboControl *control, GnomeCalendar *cal) @@ -404,33 +424,6 @@ calendar_control_activate (BonoboControl *control, bonobo_ui_component_thaw (uic, NULL); } - -static void -update_pixmaps (BonoboUIComponent *uic) -{ - set_pixmap (uic, "/Toolbar/DayView", dayview_xpm); - set_pixmap (uic, "/Toolbar/WorkWeekView", workweekview_xpm); - set_pixmap (uic, "/Toolbar/WeekView", weekview_xpm); - set_pixmap (uic, "/Toolbar/MonthView", monthview_xpm); -} - - -static void -set_pixmap (BonoboUIComponent *uic, - const char *xml_path, - char **xpm_data) -{ - GdkPixbuf *pixbuf; - - pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) xpm_data); - g_return_if_fail (pixbuf != NULL); - - bonobo_ui_util_set_pixbuf (uic, xml_path, pixbuf); - - gdk_pixbuf_unref (pixbuf); -} - - void calendar_control_deactivate (BonoboControl *control) { diff --git a/calendar/gui/dayview.xpm b/calendar/gui/dayview.xpm deleted file mode 100644 index dbabb24c5c..0000000000 --- a/calendar/gui/dayview.xpm +++ /dev/null @@ -1,34 +0,0 @@ -/* XPM */ -static char * dayview_xpm[] = { -"24 24 7 1", -" c None", -". c #000000", -"+ c #D8D8D4", -"@ c #919191", -"# c #666666", -"$ c #FFFFFF", -"% c #F2F1ED", -"....................... ", -".++++++++++++++++++++@. ", -".+@@@@@@@@@@@@@@@@@@@#. ", -".+@@@@@@@@@@@@@@@@@@@#. ", -".+@@@@@@@@@@@@@@@@@@@#. ", -".@####################. ", -".$++@%%%%%%%%%%%%%%%%@. ", -".$++@%%%%%%%%%%%%%%%%@. ", -".$++@%%%%%%%%%%%%%%%%@. ", -".@@@@@@@@@@@@@@@@@@@@#. ", -".$++@%%%%%%%%%%%%%%%%@. ", -".$++@%%%%%%%%%%%%%%%%@. ", -".$++@%%%%%%%%%%%%%%%%@. ", -".@@@@@@@@@@@@@@@@@@@@#. ", -".$++@%%%%%%%%%%%%%%%%@. ", -".$++@%%%%%%%%%%%%%%%%@. ", -".$++@%%%%%%%%%%%%%%%%@. ", -".@@@@@@@@@@@@@@@@@@@@#. ", -".$++@%%%%%%%%%%%%%%%%@. ", -".$++@%%%%%%%%%%%%%%%%@. ", -".$++@%%%%%%%%%%%%%%%%@. ", -".+@@#@@@@@@@@@@@@@@@@#. ", -"....................... ", -" "}; diff --git a/calendar/gui/monthview.xpm b/calendar/gui/monthview.xpm deleted file mode 100644 index 21c76151d5..0000000000 --- a/calendar/gui/monthview.xpm +++ /dev/null @@ -1,34 +0,0 @@ -/* XPM */ -static char * monthview_xpm[] = { -"24 24 7 1", -" c None", -". c #000000", -"+ c #FFFFFF", -"@ c #666666", -"# c #919191", -"$ c #F2F1ED", -"% c #D8D8D4", -"....................... ", -".+++++++++++++++++++++. ", -".+@@@@@@@@@@@@@@@@@@@#. ", -".+@@@@@@@@@@@@@@@@@@@#. ", -".+$$$#$$$#$$$#$$$#$$$#. ", -".+$$$#$$$#$$$#$$$#$$$#. ", -".+$$$#$$$#$$$#$$$#$$$#. ", -".+####################. ", -".+$$$#$$$#$$$#$$$#$$$#. ", -".+$$$#$$$#$$$#$$$#$$$#. ", -".+$$$#$$$#$$$#$$$#$$$#. ", -".+$$$#$$$#$$$#$$$#$$$#. ", -".+####################. ", -".+$$$#$$$#$$$#$$$#$$$#. ", -".+$$$#$$$#$$$#$$$#$$$#. ", -".+$$$#$$$#$$$#$$$#$$$#. ", -".+$$$#$$$#$$$#$$$#$$$#. ", -".+####################. ", -".+$$$#$$$#$$$#$$$#$$$#. ", -".+$$$#$$$#$$$#$$$#$$$#. ", -".+$$$#$$$#$$$#$$$#$$$#. ", -".%###################@. ", -"....................... ", -" "}; diff --git a/calendar/gui/weekview.xpm b/calendar/gui/weekview.xpm deleted file mode 100644 index 869b9e722a..0000000000 --- a/calendar/gui/weekview.xpm +++ /dev/null @@ -1,34 +0,0 @@ -/* XPM */ -static char * weekview_xpm[] = { -"24 24 7 1", -" c None", -". c #000000", -"+ c #FFFFFF", -"@ c #D8D8D4", -"# c #F2F1ED", -"$ c #919191", -"% c #666666", -"....................... ", -".++++++++++@++++++++++. ", -".+#..$.$###$#..$.$###$. ", -".+#########$#########$. ", -".+#########$#########$. ", -".+#########$#########$. ", -".+#########$#########$. ", -".+$$$$$$$$$$$$$$$$$$$$. ", -".+#..$.$###$#..$.$###$. ", -".+#########$#########$. ", -".+#########$#########$. ", -".+#########$#########$. ", -".+#########$#########$. ", -".+$$$$$$$$$$$$$$$$$$$$. ", -".+#..$.$###$#..$.$###$. ", -".+#########$#########$. ", -".+#########$#########$. ", -".+#########$$$$$$$$$$$. ", -".+#########$#..$.$###$. ", -".+#########$#########$. ", -".+#########$#########$. ", -".@$$$$$$$$$%$$$$$$$$$%. ", -"....................... ", -" "}; diff --git a/calendar/gui/workweekview.xpm b/calendar/gui/workweekview.xpm deleted file mode 100644 index 35cceedbdc..0000000000 --- a/calendar/gui/workweekview.xpm +++ /dev/null @@ -1,34 +0,0 @@ -/* XPM */ -static char * workweekview_xpm[] = { -"24 24 7 1", -" c None", -". c #000000", -"+ c #FFFFFF", -"@ c #D8D8D4", -"# c #B5B4AF", -"$ c #666666", -"% c #F2F1ED", -"....................... ", -".++++@+++@+++@+++@++++. ", -".+###$###$###$###$###$. ", -".+###$###$###$###$###$. ", -".@$$$$$$$$$$$$$$$$$$$$. ", -".++++#+++#+++#+++#+++#. ", -".+%%%#%%%#%%%#%%%#%%%#. ", -".+%%%#%%%#%%%#%%%#%%%#. ", -".+%%%#%%%#%%%#%%%#%%%#. ", -".+%%%#%%%#%%%#%%%#%%%#. ", -".+%%%#%%%#%%%#%%%#%%%#. ", -".+%%%#%%%#%%%#%%%#%%%#. ", -".+%%%#%%%#%%%#%%%#%%%#. ", -".+%%%#%%%#%%%#%%%#%%%#. ", -".+%%%#%%%#%%%#%%%#%%%#. ", -".+%%%#%%%#%%%#%%%#%%%#. ", -".+%%%#%%%#%%%#%%%#%%%#. ", -".+%%%#%%%#%%%#%%%#%%%#. ", -".+%%%#%%%#%%%#%%%#%%%#. ", -".+%%%#%%%#%%%#%%%#%%%#. ", -".+%%%#%%%#%%%#%%%#%%%#. ", -".@###$###$###$###$####. ", -"....................... ", -" "}; diff --git a/calendar/gui/yearview.xpm b/calendar/gui/yearview.xpm deleted file mode 100644 index 0d4fa4135b..0000000000 --- a/calendar/gui/yearview.xpm +++ /dev/null @@ -1,44 +0,0 @@ -/* XPM */ -static char * yearview_xpm[] = { -"24 24 17 1", -" c None", -". c #000000", -"+ c #FFFFFF", -"@ c #F2F1ED", -"# c #AAA9A6", -"$ c #D7D6D2", -"% c #92918E", -"& c #B7B6B3", -"* c #CBCAC6", -"= c #919191", -"- c #888785", -"; c #B6B6B2", -"> c #888884", -", c #C1C1BD", -"' c #A7A6A3", -") c #D8D8D4", -"! c #666666", -"....................... ", -".+++++++++++++++++++++. ", -".+@@@@@@@#$%&*@@@@@@@=. ", -".+@@@@@@@-;>,'@@@@@@@=. ", -".+====================. ", -".+@@@@@@@@@@@@@@@@@@@=. ", -".+===@===@===@===@====. ", -".+)=)@)=)@)=)@)=)@)=)=. ", -".+=)=@=)=@=)=@=)=@=)==. ", -".+@@@@@@@@@@@@@@@@@@@=. ", -".+===@===@===@===@====. ", -".+)=)@)=)@)=)@)=)@)=)=. ", -".+=)=@=)=@=)=@=)=@=)==. ", -".+@@@@@@@@@@@@@@@@@@@=. ", -".+===@===@===@===@====. ", -".+)=)@)=)@)=)@)=)@)=)=. ", -".+=)=@=)=@=)=@=)=@=)==. ", -".+@@@@@@@@@@@@@@@@@@@=. ", -".+===@===@===@===@====. ", -".+)=)@)=)@)=)@)=)@)=)=. ", -".+=)=@=)=@=)=@=)=@=)==. ", -".)===================!. ", -"....................... ", -" "}; -- cgit