Adapted c-files to new iconset "Essen"

Moved some additional icons from static/ to static/icons
The goal is, that we can remove all stray image files from static/ after the transition
Only relevant .gif in static that is left should be citadel-logo.gif.

diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c
index 0b789f74f5f65ee6acc57988a897ce812dbf0f6b..f8491fed1e36a4146648b8317d39962cc614a7e2 100644 (file)
--- a/webcit/addressbook_popup.c
+++ b/webcit/addressbook_popup.c
@@ -53,7 +53,7 @@ void display_address_book_middle_div(void) {
        DefAddrBook = get_room_pref("defaddrbook");
 
        wc_printf("<table border=0 width=100%%><tr valign=middle>");
-       wc_printf("<td align=left><img src=\"static/viewcontacts_32x.gif\"></td>");
+       wc_printf("<td align=left><img src=\"static/icons/essen/32x32/contact.png\"></td>");
        wc_printf("<td align=center>");
 
        wc_printf("<form>"
@@ -99,7 +99,7 @@ void display_address_book_middle_div(void) {
        wc_printf("</td>");
        wc_printf("<td align=right "
                "onclick=\"javascript:$('address_book_popup').style.display='none';\" "
-               "><img src=\"static/closewindow.gif\">");
+               "><img src=\"static/icons/closewindow.gif\">");
        wc_printf("</td></tr></table>");
 
        wc_printf("<script type=\"text/javascript\">PopulateAddressBookInnerDiv($('which_addr_book').value,'%s');</script>",

diff --git a/webcit/buildpackages b/webcit/buildpackages
index 8a066da6c7cb5157c60cba608ba04ef37905c51d..7d2e2a2af0df54d1f7443b1fe129be123f42a0de 100755 (executable)
--- a/webcit/buildpackages
+++ b/webcit/buildpackages
@@ -60,7 +60,7 @@ case $1 in
        ;;
     sourcedist)
        if test "$2" == "dfsg"; then
-           NONDFSG=-"-exclude static/openid-small.gif"
+           NONDFSG=-"-exclude static/icons/openid-small.gif"
        fi
        cd ..; tar --exclude .svn --exclude "debian/*" $NONDFSG -cvhzf webcit-${WEBCIT_VERSION}.tar.gz webcit-${WEBCIT_VERSION}/
        ;;

diff --git a/webcit/calendar.c b/webcit/calendar.c
index 98fc8260c426eaa2ef052356f866b1555913c7f5..be32db14464591c48135a19778c89de278b973dc 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -75,7 +75,7 @@ void cal_process_object(StrBuf *Target,
                the_method = icalproperty_get_method(method);
 
                StrBufAppendPrintf(Target, "<div id=\"%s_title\">", divname);
-               StrBufAppendPrintf(Target, "<img src=\"static/calarea_48x.gif\">");
+               StrBufAppendPrintf(Target, "<img src=\"static/icons/essen/32x32/calendar.png\">");
                StrBufAppendPrintf(Target, "<span>");
                switch(the_method) {
                case ICAL_METHOD_REQUEST:
@@ -329,7 +329,7 @@ void respond_to_request(void)
        serv_getln(buf, sizeof buf);
 
        if (buf[0] == '2') {
-               wc_printf("<img src=\"static/calarea_48x.gif\"><span>");
+               wc_printf("<img src=\"static/icons/essen/32x32/calendar.png\"><span>");
                if (!strcasecmp(bstr("sc"), "accept")) {
                        wc_printf(_("You have accepted this meeting invitation.  "
                                "It has been entered into your calendar.")
@@ -347,7 +347,7 @@ void respond_to_request(void)
                wc_printf(_("A reply has been sent to the meeting organizer."));
                wc_printf("</span>");
        } else {
-               wc_printf("<img align=\"center\" src=\"static/error.gif\"><span>");
+               wc_printf("<img align=\"center\" src=\"static/icons/error.gif\"><span>");
                wc_printf("%s\n", &buf[4]);
                wc_printf("</span>");
        }
@@ -374,7 +374,7 @@ void handle_rsvp(void)
        serv_getln(buf, sizeof buf);
 
        if (buf[0] == '2') {
-               wc_printf("<img src=\"static/calarea_48x.gif\"><span>");
+               wc_printf("<img src=\"static/icons/calendar.png\"><span>");
                if (!strcasecmp(bstr("sc"), "update")) {
                        /* Translators: RSVP aka Répondez s'il-vous-plaît Is the term 
                           that the recipient of an ical-invitation should please 
@@ -387,7 +387,7 @@ void handle_rsvp(void)
                }
                wc_printf("</span>");
        } else {
-               wc_printf("<img src=\"static/error.gif\"><span> %s\n", &buf[4]);
+               wc_printf("<img src=\"static/icons/error.gif\"><span> %s\n", &buf[4]);
                wc_printf("</span>");
        }
 

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index c7af4b607304d5f1678d861ecfa8341acc0eb6bd..1bdcf608e26e3976c8b329dfd6e9079e4adb1da8 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -586,7 +586,7 @@ void calendar_month_view(int year, int month, int day) {
        localtime_r(&previous_month, &tm);
        wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
                (int)(tm.tm_year)+1900, tm.tm_mon + 1);
-       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/prevdate_32x.gif\" border=\"0\"></a>\n", _("previous"));
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/icons/essen/32x32/back.png\" border=\"0\"></a>\n", _("previous"));
 
        wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm);
        wc_printf("&nbsp;&nbsp;"
@@ -598,7 +598,7 @@ void calendar_month_view(int year, int month, int day) {
        localtime_r(&next_month, &tm);
        wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
                (int)(tm.tm_year)+1900, tm.tm_mon + 1);
-       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/nextdate_32x.gif\" border=\"0\"></A>\n", _("next"));
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/icons/essen/32x32/forward.png\" border=\"0\"></A>\n", _("next"));
 
        wc_printf("</td></tr></table>\n");
 
@@ -722,7 +722,7 @@ void calendar_brief_month_view(int year, int month, int day) {
        localtime_r(&previous_month, &tm);
        wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
                (int)(tm.tm_year)+1900, tm.tm_mon + 1);
-       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/prevdate_32x.gif\" border=\"0\"></a>\n", _("previous"));
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/icons/essen/32x32/back.png\" border=\"0\"></a>\n", _("previous"));
 
        wc_strftime(month_label, sizeof month_label, "%B", &tm);
        wc_printf("&nbsp;&nbsp;"
@@ -734,7 +734,7 @@ void calendar_brief_month_view(int year, int month, int day) {
        localtime_r(&next_month, &tm);
        wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
                (int)(tm.tm_year)+1900, tm.tm_mon + 1);
-       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/nextdate_32x.gif\" border=\"0\"></a>\n", _("next"));
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/icons/essen/32x32/forward.png\" border=\"0\"></a>\n", _("next"));
 
        wc_printf("</td></tr></table>\n");
 
@@ -1284,7 +1284,7 @@ void calendar_day_view(int year, int month, int day) {
        wc_printf("<td align=\"center\">");
        wc_printf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">",
                yesterday.year, yesterday.month, yesterday.day);
-       wc_printf("<img alt=\"previous\" align=\"middle\" src=\"static/prevdate_32x.gif\" border=\"0\"></a>");
+       wc_printf("<img alt=\"previous\" align=\"middle\" src=\"static/icons/essen/32x32/back.png\" border=\"0\"></a>");
        wc_printf("</td>");
 
        wc_strftime(d_str, sizeof d_str,
@@ -1302,7 +1302,7 @@ void calendar_day_view(int year, int month, int day) {
        wc_printf("<td align=\"center\">");
        wc_printf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">",
                tomorrow.year, tomorrow.month, tomorrow.day);
-       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/nextdate_32x.gif\""
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/icons/essen/32x32/forward.png\""
                " border=\"0\"></a>\n", _("next"));
        wc_printf("</td>");
 

diff --git a/webcit/downloads.c b/webcit/downloads.c
index b1ece229c7300b9fd63cf576ad8c9e5cd4443858..2e7489f9eae2c9406ab743f424697d429c7b1468 100644 (file)
--- a/webcit/downloads.c
+++ b/webcit/downloads.c
@@ -246,7 +246,7 @@ void display_mime_icon(void)
        FileName = GetIconFilename(MimeType, tlen);
 
        if (FileName == NULL)
-               snprintf (FileBuf, SIZ, "%s%s", static_dirs[0], "/diskette_24x.gif");
+               snprintf (FileBuf, SIZ, "%s%s", static_dirs[0], "/icons/essen/16x16/file.png");
        else
                snprintf (FileBuf, SIZ, "%s%s", static_dirs[3], FileName);
        output_static(FileBuf);
@@ -410,7 +410,7 @@ void output_image(void)
         * Instead of an ugly 404, send a 1x1 transparent GIF
         * when there's no such image on the server.
         */
-       StrBufPrintf (Buf, "%s%s", static_dirs[0], "/blank.gif");
+       StrBufPrintf (Buf, "%s%s", static_dirs[0], "/icons/blank.gif");
        output_static(ChrPtr(Buf));
        FreeStrBuf(&Buf);
 }

diff --git a/webcit/event.c b/webcit/event.c
index a7107bde7b072e78817da8009c1a3adc5897502a..40addb0e44353c8f6f78ae7a32630b3a77a67482 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -445,7 +445,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
        wc_printf(
                "&nbsp;<a href=\"javascript:PopOpenAddressBook('attendees_box|%s');\" "
                "title=\"%s\">"
-               "<img alt='' align='middle' border='0' width='24' height='24' src=\"static/viewcontacts_24x.gif\">"
+               "<img alt='' align='middle' border='0' width='16' height='16' src=\"static/icons/essen/16x16/contact.png\">"
                "</a>",
                _("Attendees"),
                _("Contacts")

diff --git a/webcit/openid.c b/webcit/openid.c
index 5a6c8e9f5a639450fbfd4daa616e2620f64bd924..8df6d3c3648f56b48a89ab7672a997b4886f2f31 100644 (file)
--- a/webcit/openid.c
+++ b/webcit/openid.c
@@ -43,7 +43,7 @@ void display_openids(void)
                if (buf[0] == '1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                        bg = 1 - bg;
                        wc_printf("<tr class=\"%s\">", (bg ? "even" : "odd"));
-                       wc_printf("<td><img src=\"static/openid-small.gif\"></td><td>");
+                       wc_printf("<td><img src=\"static/icons/openid-small.gif\"></td><td>");
                        escputs(buf);
                        wc_printf("</td><td>");
                        wc_printf("<a href=\"openid_detach?id_to_detach=");

diff --git a/webcit/roomchat.c b/webcit/roomchat.c
index 90a9162b70bafee2ed2dc593db039c65803444aa..fae0868a7565aa8beb2fc825d83202a14b85e6cb 100644 (file)
--- a/webcit/roomchat.c
+++ b/webcit/roomchat.c
@@ -132,7 +132,7 @@ void chat_rwho(void) {
                        else {
                                wc_printf("<span class=\"chat_notmyname_class\">");
                        }
-                       wc_printf("<img src=\"static/citadelchat_16x.gif\">");
+                       wc_printf("<img src=\"static/icons/essen/16x16/chat.png\">");
                        escputs(buf);
                        wc_printf("</span><br>\n");
                }

diff --git a/webcit/sieve.c b/webcit/sieve.c
index 0db8f5ae0bca9b1cdc1ec4e0c26bb51ab867d5a5..635b2fc5314daf01c737b76b2eff0a67169d53d5 100644 (file)
--- a/webcit/sieve.c
+++ b/webcit/sieve.c
@@ -31,7 +31,7 @@ void display_no_sieve(void) {
        output_headers(1, 1, 2, 0, 0, 0);
 
        wc_printf("<div id=\"banner\">\n");
-       wc_printf("<img src=\"static/advanpage2_48x.gif\">");
+       wc_printf("<img src=\"static/icons/essen/32x32/config.png\">");
        wc_printf("<h1>");
        wc_printf(_("View/edit server-side mail filters"));
        wc_printf("</h1>\n");
@@ -115,7 +115,7 @@ void display_sieve(void)
        );
 
        wc_printf("<div id=\"banner\">\n");
-       wc_printf("<img src=\"static/advanpage2_48x.gif\">");
+       wc_printf("<img src=\"static/icons/essen/32x32/config.png\">");
        wc_printf("<h1>");
        wc_printf(_("View/edit server-side mail filters"));
        wc_printf("</h1>\n");
@@ -656,7 +656,7 @@ void display_add_remove_scripts(char *message)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wc_printf("<div id=\"banner\">\n");
-       wc_printf("<img src=\"static/advanpage2_48x.gif\">");
+       wc_printf("<img src=\"static/icons/essen/32x32/config.png\">");
        wc_printf(_("Add or delete scripts"));
        wc_printf("</h1>\n");
        wc_printf("</div>\n");
@@ -985,17 +985,17 @@ void display_rules_editor_inner_div(void) {
                wc_printf("</div>");
 
                if (i>0) wc_printf("<a href=\"javascript:SwapRules(%d,%d);UpdateRules();\">"
-                       "<img border=\"0\" src=\"static/up_pointer.gif\" "
+                       "<img border=\"0\" src=\"static/icons/up_pointer.gif\" "
                        "title=\"%s\"/></a>",
                        i-1, i, _("Move rule up") );
 
                wc_printf("<a href=\"javascript:SwapRules(%d,%d);UpdateRules();\">"
-                       "<img id=\"movedown%d\" border=\"0\" src=\"static/down_pointer.gif\" "
+                       "<img id=\"movedown%d\" border=\"0\" src=\"static/icons/down_pointer.gif\" "
                        "title=\"%s\"/></a>",
                        i, i+1, i, _("Move rule down") );
 
                wc_printf("<a href=\"javascript:DeleteRule(%d);UpdateRules();\">"
-                       "<img id=\"delete%d\" border=\"0\" src=\"static/delete.gif\" "
+                       "<img id=\"delete%d\" border=\"0\" src=\"static/icons/delete.gif\" "
                        "title=\"%s\"/></a>",
                        i, i, _("Delete rule") );
 

diff --git a/webcit/smtpqueue.c b/webcit/smtpqueue.c
index 6ee2db9ef98ebc7888ee4f9bb8ca574a0efeb393..fd5c02abdafac02924afe6691ae3806fe666f8db 100644 (file)
--- a/webcit/smtpqueue.c
+++ b/webcit/smtpqueue.c
@@ -243,7 +243,7 @@ void display_smtpqueue(void)
                "<tr><td valign=top>\n");
 
        wc_printf("<div id=\"smtpqueue_inner_div\">"
-               "<div align=\"center\"><img src=\"static/throbber.gif\"></div>"
+               "<div align=\"center\"><img src=\"static/icons/throbber.gif\"></div>"
                "</div>"
                "<div align=\"center\">"
                "<a href=\"javascript:RefreshSMTPqueueDisplay();\">%s</a>"

diff --git a/webcit/static/blank.gif b/webcit/static/blank.gif
deleted file mode 100644 (file)
index 4bcc753..0000000
Binary files a/webcit/static/blank.gif and /dev/null differ

diff --git a/webcit/static/delete.gif b/webcit/static/delete.gif
deleted file mode 100644 (file)
index 4309863..0000000
Binary files a/webcit/static/delete.gif and /dev/null differ

diff --git a/webcit/static/down_pointer.gif b/webcit/static/down_pointer.gif
deleted file mode 100644 (file)
index 49a3ef5..0000000
Binary files a/webcit/static/down_pointer.gif and /dev/null differ

diff --git a/webcit/static/error.gif b/webcit/static/error.gif
deleted file mode 100644 (file)
index 57d398c..0000000
Binary files a/webcit/static/error.gif and /dev/null differ

diff --git a/webcit/static/icons/blank.gif b/webcit/static/icons/blank.gif
new file mode 100644 (file)
index 0000000..4bcc753
Binary files /dev/null and b/webcit/static/icons/blank.gif differ

diff --git a/webcit/static/icons/delete.gif b/webcit/static/icons/delete.gif
new file mode 100644 (file)
index 0000000..4309863
Binary files /dev/null and b/webcit/static/icons/delete.gif differ

diff --git a/webcit/static/icons/down_pointer.gif b/webcit/static/icons/down_pointer.gif
new file mode 100644 (file)
index 0000000..49a3ef5
Binary files /dev/null and b/webcit/static/icons/down_pointer.gif differ

diff --git a/webcit/static/icons/error.gif b/webcit/static/icons/error.gif
new file mode 100644 (file)
index 0000000..57d398c
Binary files /dev/null and b/webcit/static/icons/error.gif differ

diff --git a/webcit/static/icons/sort_none.gif b/webcit/static/icons/sort_none.gif
new file mode 100644 (file)
index 0000000..68dce00
Binary files /dev/null and b/webcit/static/icons/sort_none.gif differ

diff --git a/webcit/static/icons/up_pointer.gif b/webcit/static/icons/up_pointer.gif
new file mode 100644 (file)
index 0000000..83e5e61
Binary files /dev/null and b/webcit/static/icons/up_pointer.gif differ

diff --git a/webcit/static/sort_none.gif b/webcit/static/sort_none.gif
deleted file mode 100644 (file)
index 68dce00..0000000
Binary files a/webcit/static/sort_none.gif and /dev/null differ

diff --git a/webcit/static/up_pointer.gif b/webcit/static/up_pointer.gif
deleted file mode 100644 (file)
index 83e5e61..0000000
Binary files a/webcit/static/up_pointer.gif and /dev/null differ

diff --git a/webcit/subst.c b/webcit/subst.c
index 49723377ae23f235662e81b9fb3e52a679063530..354b51601623c3e77496df87c661df1b325c4bad 100644 (file)
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -2433,9 +2433,9 @@ enum {
 };
 
 ConstStr SortIcons[] = {
-       {HKEY("static/sort_none.gif")},
-       {HKEY("static/up_pointer.gif")},
-       {HKEY("static/down_pointer.gif")},
+       {HKEY("static/icons/sort_none.gif")},
+       {HKEY("static/icons/up_pointer.gif")},
+       {HKEY("static/icons/down_pointer.gif")},
 };
 
 ConstStr SortNextOrder[] = {

diff --git a/webcit/summary.c b/webcit/summary.c
index 1e0d8e160865175109f668dfa862a9e272d84817..ed7bbef4777dcffcc86ba12895d0ab1d04badbd0 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -286,7 +286,7 @@ void summary(void) {
        output_headers(1, 1, 2, 0, 0, 0);
        wc_printf("<div id=\"banner\" class=\"banner\">\n");
        wc_printf("<table border=0><tr>");
-        wc_printf("<td><img src=\"static/summscreen_48x.gif\"></td>");
+        wc_printf("<td><img src=\"static/icons/essen/32x32/summary.png\"></td>");
         wc_printf("<td><h1>");
         snprintf(title, sizeof title, _("Summary page for %s"),
                ( (WC->logged_in) ?  ChrPtr(WC->wc_fullname) : ChrPtr(WC->serv_info->serv_humannode))

diff --git a/webcit/userlist.c b/webcit/userlist.c
index 845978a7471dc7c356dc2e2aea5b9aa3c1a10e89..b9c08818ac4791acca7f03ce6309ac2040b0b1f6 100644 (file)
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -113,7 +113,7 @@ void showuser(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wc_printf("<div id=\"banner\">\n");
-       wc_printf("<img src=\"static/usermanag_48x.gif\">");
+       wc_printf("<img src=\"static/icons/essen/32x32/account.png\">");
         wc_printf("<h1>");
        wc_printf(_("User profile"));
         wc_printf("</h1>");
@@ -150,7 +150,7 @@ void showuser(void)
        wc_printf("<br><a href=\"display_page?recp=");
        urlescputs(who);
        wc_printf("\">"
-               "<img src=\"static/citadelchat_24x.gif\" "
+               "<img src=\"static/icons/essen/16x16/chat.png\" "
                "align=middle border=0>&nbsp;&nbsp;");
        snprintf(buf, sizeof buf, _("Click here to send an instant message to %s"), who);
        escputs(buf);

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 3fbde0520987b241b3100fca00a0e156222deb4e..4934cf6ee4a9b39083d01f6586f4093f0e4f5e51 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -505,7 +505,7 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, wc_mime_att
                if (pass == 1) {
                        StrBufAppendPrintf(Target, "<tr bgcolor=\"#aaaaaa\">"
       "<td colspan=2 bgcolor=\"#ffffff\">"
-      "<img align=\"center\" src=\"static/viewcontacts_48x.gif\">"
+      "<img align=\"center\" src=\"static/icons/essen/32x32/contact.png\">"
       "<font size=\"+1\"><b>");
                        StrEscAppend(Target, NULL, fullname, 0, 0);
                        StrBufAppendPrintf(Target, "</b></font>");