2007-02-20 [colin] 2.7.2cvs57
authorColin Leroy <colin@colino.net>
Tue, 20 Feb 2007 17:49:16 +0000 (17:49 +0000)
committerColin Leroy <colin@colino.net>
Tue, 20 Feb 2007 17:49:16 +0000 (17:49 +0000)
* src/Makefile.am
* src/main.c
* src/mimeview.c
* src/stock_pixmap.c
* src/stock_pixmap.h
* src/pixmaps/mime_calendar.xpm
* src/pixmaps/mime_pdf.xpm
* src/pixmaps/mime_ps.xpm
Add icons for text/calendar, application/pdf
and application/postscript

ChangeLog
PATCHSETS
configure.ac
src/Makefile.am
src/main.c
src/mimeview.c
src/pixmaps/mime_calendar.xpm [new file with mode: 0644]
src/pixmaps/mime_pdf.xpm [new file with mode: 0644]
src/pixmaps/mime_ps.xpm [new file with mode: 0644]
src/stock_pixmap.c
src/stock_pixmap.h

index cddd859..9a51a41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-02-20 [colin]     2.7.2cvs57
+
+       * src/Makefile.am
+       * src/main.c
+       * src/mimeview.c
+       * src/stock_pixmap.c
+       * src/stock_pixmap.h
+       * src/pixmaps/mime_calendar.xpm
+       * src/pixmaps/mime_pdf.xpm
+       * src/pixmaps/mime_ps.xpm
+               Add icons for text/calendar, application/pdf
+               and application/postscript
+
 2007-02-20 [colin]     2.7.2cvs56
 
        * autogen.sh
index 5f1614f..8ff6c06 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.16.2.10 -r 1.16.2.11 src/matcher_parser_lex.l;  cvs diff -u -r 1.8.2.7 -r 1.8.2.8 src/quote_fmt_lex.l;  ) > 2.7.2cvs54.patchset
 ( cvs diff -u -r 1.25.2.22 -r 1.25.2.23 src/matcher_parser_parse.y;  ) > 2.7.2cvs55.patchset
 ( cvs diff -u -r 1.4.2.7 -r 1.4.2.8 autogen.sh;  cvs diff -u -r 1.25.2.23 -r 1.25.2.24 src/matcher_parser_parse.y;  cvs diff -u -r 1.16.2.11 -r 1.16.2.12 src/matcher_parser_lex.l;  ) > 2.7.2cvs56.patchset
+( cvs diff -u -r 1.155.2.51 -r 1.155.2.52 src/Makefile.am;  cvs diff -u -r 1.115.2.136 -r 1.115.2.137 src/main.c;  cvs diff -u -r 1.83.2.101 -r 1.83.2.102 src/mimeview.c;  cvs diff -u -r 1.25.2.31 -r 1.25.2.32 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.22 -r 1.18.2.23 src/stock_pixmap.h;  diff -u /dev/null src/pixmaps/mime_calendar.xpm;  diff -u /dev/null src/pixmaps/mime_pdf.xpm;  diff -u /dev/null src/pixmaps/mime_ps.xpm;  ) > 2.7.2cvs57.patchset
index 2beef2c..976b8e7 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=56
+EXTRA_VERSION=57
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 8ddb80b..faef2f2 100644 (file)
@@ -353,6 +353,9 @@ EXTRA_DIST = \
        pixmaps/mime_audio.xpm \
        pixmaps/mime_image.xpm \
        pixmaps/mime_message.xpm \
+       pixmaps/mime_pdf.xpm \
+       pixmaps/mime_ps.xpm \
+       pixmaps/mime_calendar.xpm \
        pixmaps/mime_text_enriched.xpm \
        pixmaps/mime_text_html.xpm \
        pixmaps/mime_text_plain.xpm \
index 12321a4..4d6e8f1 100644 (file)
@@ -960,7 +960,7 @@ int main(int argc, char *argv[])
 
        sc_starting = FALSE;
        END_TIMING();
-       
+
        gtk_main();
 
        exit_claws(mainwin);
index f44a9d4..cbb9870 100644 (file)
@@ -2001,6 +2001,8 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                        stockp = STOCK_PIXMAP_MIME_TEXT_HTML;
                else if  (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "enriched"))
                        stockp = STOCK_PIXMAP_MIME_TEXT_ENRICHED;
+               else if  (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "calendar"))
+                       stockp = STOCK_PIXMAP_MIME_TEXT_CALENDAR;
                else
                        stockp = STOCK_PIXMAP_MIME_TEXT_PLAIN;
                break;
@@ -2008,7 +2010,12 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                stockp = STOCK_PIXMAP_MIME_MESSAGE;
                break;
        case MIMETYPE_APPLICATION:
-               stockp = STOCK_PIXMAP_MIME_APPLICATION;
+               if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "pdf"))
+                       stockp = STOCK_PIXMAP_MIME_PDF;
+               else if  (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "postscript"))
+                       stockp = STOCK_PIXMAP_MIME_PS;
+               else
+                       stockp = STOCK_PIXMAP_MIME_APPLICATION;
                break;
        case MIMETYPE_IMAGE:
                stockp = STOCK_PIXMAP_MIME_IMAGE;
diff --git a/src/pixmaps/mime_calendar.xpm b/src/pixmaps/mime_calendar.xpm
new file mode 100644 (file)
index 0000000..a56f0b5
--- /dev/null
@@ -0,0 +1,59 @@
+/* XPM */
+static char * mime_calendar_xpm[] = {
+"16 16 40 1",
+"      c None",
+".     c #000000",
+"+     c #FEFEFE",
+"@     c #FDFDFD",
+"#     c #E0E0E0",
+"$     c #C1C1C1",
+"%     c #F1F1F1",
+"&     c #C3C3C3",
+"*     c #FBFBFB",
+"=     c #A8A8A8",
+"-     c #ADADAD",
+";     c #767676",
+">     c #5D5D5D",
+",     c #404040",
+"'     c #688DAE",
+")     c #E2E2E2",
+"!     c #858585",
+"~     c #4B4B49",
+"{     c #161616",
+"]     c #89BAE6",
+"^     c #C5C5C5",
+"/     c #ECECEC",
+"(     c #EBEBEB",
+"_     c #EAEAEA",
+":     c #C4C4C4",
+"<     c #E9E9E9",
+"[     c #E8E8E8",
+"}     c #E7E7E7",
+"|     c #C0C0C0",
+"1     c #E6E6E6",
+"2     c #E5E5E5",
+"3     c #E4E4E4",
+"4     c #BFBFBF",
+"5     c #E3E3E3",
+"6     c #BEBEBE",
+"7     c #BDBDBD",
+"8     c #BBBBBB",
+"9     c #C2C2C2",
+"0     c #BCBCBC",
+"a     c #A0A0A0",
+"   .........    ",
+"  .++++++@#$.   ",
+"  .+%%%%%%&*=.  ",
+"  .+%%%%%%-;>,. ",
+"  .+.'.'.')!~{. ",
+"  .+;]']']'];^. ",
+"  .+;/;/;(;_;:. ",
+"  .@;&;&;&;&;&. ",
+"  .@;_;<;[;};$. ",
+"  .@;&;&;&;&;|. ",
+"  .@;};1;2;3;4. ",
+"  .@;;;;;;;;56. ",
+"  .@%%%%%%%%%7. ",
+"  .@%%%%%%%%%8. ",
+"  .9777008888a. ",
+"   ...........  "};
diff --git a/src/pixmaps/mime_pdf.xpm b/src/pixmaps/mime_pdf.xpm
new file mode 100644 (file)
index 0000000..2eec54e
--- /dev/null
@@ -0,0 +1,90 @@
+/* XPM */
+static char * mime_pdf_xpm[] = {
+"16 16 71 1",
+"      c None",
+".     c #000000",
+"+     c #FEFEFE",
+"@     c #FDFDFD",
+"#     c #E0E0E0",
+"$     c #C1C1C1",
+"%     c #F1F1F1",
+"&     c #C3C3C3",
+"*     c #FBFBFB",
+"=     c #A8A8A8",
+"-     c #ADADAD",
+";     c #767676",
+">     c #5D5D5D",
+",     c #404040",
+"'     c #FEA6A6",
+")     c #F3C7CA",
+"!     c #F0F0F0",
+"~     c #E2E2E2",
+"{     c #858585",
+"]     c #4B4B49",
+"^     c #161616",
+"/     c #EFEFEF",
+"(     c #FFA7A9",
+"_     c #F7C7C7",
+":     c #EEEEEE",
+"<     c #C5C5C5",
+"[     c #FFA1A3",
+"}     c #FEB8BA",
+"|     c #ECECEC",
+"1     c #C4C4C4",
+"2     c #FF9797",
+"3     c #FF9597",
+"4     c #EBEBEB",
+"5     c #EDEDED",
+"6     c #ECEBEB",
+"7     c #FF7F82",
+"8     c #FF9191",
+"9     c #F3D0CF",
+"0     c #EAEAEA",
+"a     c #E8E8E8",
+"b     c #FCA4A4",
+"c     c #F5B7B7",
+"d     c #F3C5C5",
+"e     c #FF575B",
+"f     c #FF7575",
+"g     c #FF8F8F",
+"h     c #FBA1A5",
+"i     c #C0C0C0",
+"j     c #E9E7E7",
+"k     c #F9B5B5",
+"l     c #F1C5C5",
+"m     c #E8E6E6",
+"n     c #EED0D0",
+"o     c #FF9194",
+"p     c #F89B98",
+"q     c #BFBFBF",
+"r     c #F7B5B7",
+"s     c #FF777A",
+"t     c #EDCBCB",
+"u     c #E6E6E6",
+"v     c #E5E5E5",
+"w     c #BEBEBE",
+"x     c #FF7376",
+"y     c #FAA6A6",
+"z     c #E4E4E4",
+"A     c #BDBDBD",
+"B     c #E3E3E3",
+"C     c #BBBBBB",
+"D     c #C2C2C2",
+"E     c #BCBCBC",
+"F     c #A0A0A0",
+"   .........    ",
+"  .++++++@#$.   ",
+"  .+%%%%%%&*=.  ",
+"  .+%%%%%%-;>,. ",
+"  .+%%%')!~{]^. ",
+"  .+%//(_//::<. ",
+"  .+///[}:::|1. ",
+"  .@:::23:::4&. ",
+"  .@5|6789000$. ",
+"  .@4abcdefghi. ",
+"  .@0jfklmnopq. ",
+"  .@rstuuuuuvw. ",
+"  .@xyuuuvvzzA. ",
+"  .@uvvvzzBBBC. ",
+"  .DAAAEECCCCF. ",
+"   ...........  "};
diff --git a/src/pixmaps/mime_ps.xpm b/src/pixmaps/mime_ps.xpm
new file mode 100644 (file)
index 0000000..7adfef0
--- /dev/null
@@ -0,0 +1,94 @@
+/* XPM */
+static char * mime_ps_xpm[] = {
+"16 16 75 1",
+"      c None",
+".     c #000000",
+"+     c #FEFEFE",
+"@     c #FDFDFD",
+"#     c #E0E0E0",
+"$     c #C1C1C1",
+"%     c #F1F1F1",
+"&     c #C3C3C3",
+"*     c #FBFBFB",
+"=     c #A8A8A8",
+"-     c #ADADAD",
+";     c #767676",
+">     c #5D5D5D",
+",     c #404040",
+"'     c #F0F0F0",
+")     c #E9849A",
+"!     c #F0E6E8",
+"~     c #E2E2E2",
+"{     c #858585",
+"]     c #4B4B49",
+"^     c #161616",
+"/     c #EA96A9",
+"(     c #E55273",
+"_     c #E54F71",
+":     c #EDD6DB",
+"<     c #E8849A",
+"[     c #EFEFEF",
+"}     c #E45272",
+"|     c #E99DAE",
+"1     c #C5C5C5",
+"2     c #E11240",
+"3     c #E00A3A",
+"4     c #EBBDC7",
+"5     c #EEEEEE",
+"6     c #EDDEE1",
+"7     c #E00D3C",
+"8     c #E00032",
+"9     c #E1204B",
+"0     c #C4C4C4",
+"a     c #E99AAB",
+"b     c #E7849A",
+"c     c #E11845",
+"d     c #E1234D",
+"e     c #E67C93",
+"f     c #E9BEC8",
+"g     c #ECECEC",
+"h     c #EAE7E8",
+"i     c #E11B47",
+"j     c #E00133",
+"k     c #E597A8",
+"l     c #E599AA",
+"m     c #E01240",
+"n     c #C0C0C0",
+"o     c #E00A39",
+"p     c #E34F70",
+"q     c #E13057",
+"r     c #E01B47",
+"s     c #BFBFBF",
+"t     c #E25474",
+"u     c #E01945",
+"v     c #E12E56",
+"w     c #E25272",
+"x     c #E01643",
+"y     c #E26682",
+"z     c #BEBEBE",
+"A     c #E7E7E7",
+"B     c #E6E6E6",
+"C     c #E5E5E5",
+"D     c #E4E4E4",
+"E     c #BDBDBD",
+"F     c #E3E3E3",
+"G     c #BBBBBB",
+"H     c #C2C2C2",
+"I     c #BCBCBC",
+"J     c #A0A0A0",
+"   .........    ",
+"  .++++++@#$.   ",
+"  .+%%%%%%&*=.  ",
+"  .+%%%%%%-;>,. ",
+"  .+%%')!'~{]^. ",
+"  .+/(_:<[<}|1. ",
+"  .+2345<67890. ",
+"  .@8a5<5b88c&. ",
+"  .@defghi888$. ",
+"  .@88jkl888mn. ",
+"  .@o88pq888rs. ",
+"  .@tuvw888xyz. ",
+"  .@AABBBCCDDE. ",
+"  .@BCCCDDFFFG. ",
+"  .HEEEIIGGGGJ. ",
+"   ...........  "};
index e99233a..6a2b4c2 100644 (file)
@@ -95,6 +95,9 @@
 #include "pixmaps/mime_audio.xpm"
 #include "pixmaps/mime_text_enriched.xpm"
 #include "pixmaps/mime_unknown.xpm"
+#include "pixmaps/mime_pdf.xpm"
+#include "pixmaps/mime_ps.xpm"
+#include "pixmaps/mime_calendar.xpm"
 #include "pixmaps/privacy_signed.xpm"
 #include "pixmaps/privacy_passed.xpm"
 #include "pixmaps/privacy_failed.xpm"
@@ -288,6 +291,9 @@ static StockPixmapData pixmaps[] =
        {mime_audio_xpm                         , NULL, NULL, "mime_audio", NULL},
        {mime_text_enriched_xpm                 , NULL, NULL, "mime_text_enriched", NULL},
        {mime_unknown_xpm                       , NULL, NULL, "mime_unknown", NULL},    
+       {mime_pdf_xpm                           , NULL, NULL, "mime_pdf", NULL},        
+       {mime_ps_xpm                            , NULL, NULL, "mime_ps", NULL}, 
+       {mime_calendar_xpm                      , NULL, NULL, "mime_calendar", NULL},   
        {privacy_signed_xpm                     , NULL, NULL, "privacy_signed", NULL},
        {privacy_passed_xpm                     , NULL, NULL, "privacy_passed", NULL},
        {privacy_failed_xpm                     , NULL, NULL, "privacy_failed", NULL},  
index d39b1b4..801fd23 100644 (file)
@@ -137,6 +137,9 @@ typedef enum
        STOCK_PIXMAP_MIME_AUDIO,
        STOCK_PIXMAP_MIME_TEXT_ENRICHED,
        STOCK_PIXMAP_MIME_UNKNOWN,
+       STOCK_PIXMAP_MIME_PDF,
+       STOCK_PIXMAP_MIME_PS,
+       STOCK_PIXMAP_MIME_TEXT_CALENDAR,
        STOCK_PIXMAP_PRIVACY_SIGNED,
        STOCK_PIXMAP_PRIVACY_PASSED,
        STOCK_PIXMAP_PRIVACY_FAILED,