+2007-08-01 [paul] 2.10.0cvs82
+
+ * src/mainwindow.h
+ clean up cruft
+ * src/toolbar.c
+ change default toolbar layout on maemo
+ * src/pixmaps/close.xpm
+ make the red cross a grey cross
+ * src/pixmaps/jpilot.xpm
+ make icon smaller so it fits better
+
2007-07-31 [paul] 2.10.0cvs81
* src/setup.c
( cvs diff -u -r 1.115.2.161 -r 1.115.2.162 src/main.c; ) > 2.10.0cvs79.patchset
( cvs diff -u -r 1.43.2.60 -r 1.43.2.61 src/prefs_matcher.c; ) > 2.10.0cvs80.patchset
( cvs diff -u -r 1.5.2.13 -r 1.5.2.14 src/setup.c; cvs diff -u -r 1.5.2.62 -r 1.5.2.63 src/gtk/gtkutils.c; ) > 2.10.0cvs81.patchset
+( cvs diff -u -r 1.39.2.39 -r 1.39.2.40 src/mainwindow.h; cvs diff -u -r 1.43.2.80 -r 1.43.2.81 src/toolbar.c; cvs diff -u -r 1.1.14.1 -r 1.1.14.2 src/pixmaps/close.xpm; cvs diff -u -r 1.1.16.1 -r 1.1.16.2 src/pixmaps/jpilot.xpm; ) > 2.10.0cvs82.patchset
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=81
+EXTRA_VERSION=82
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
void main_window_hide (MainWindow *mainwin);
void main_window_popup (MainWindow *mainwin);
-void main_window_toolbar_set_compose_button (MainWindow *mainwin,
- ComposeButtonType compose_btn_type);
-
SensitiveCond main_window_get_current_state (MainWindow *mainwin);
void toolbar_set_compose_button (Toolbar *toolbar,
/* XPM */
-static char *close_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 65 1",
-" c #42403E",
-". c #2A0D07",
-"X c #2F1813",
-"o c #D8705B",
-"O c #DD8D7D",
-"+ c #3A3534",
-"@ c #4C160D",
-"# c #C13B22",
-"$ c #BE3B22",
-"% c #BD3B22",
-"& c #BA3A22",
-"* c #AF3720",
-"= c #B63922",
-"- c #B23821",
-"; c #982F1D",
-": c #B93B24",
-"> c #BD3D25",
-", c #922E1D",
-"< c #96311E",
-"1 c #BE3F28",
-"2 c #B63D26",
-"3 c #C24129",
-"4 c #B83E27",
-"5 c #A23824",
-"6 c #411710",
-"7 c #C84E37",
-"8 c #C34C36",
-"9 c #C54D37",
-"0 c #CE523A",
-"q c #AD4632",
-"w c #3B1711",
-"e c #1B0B08",
-"r c #3C1812",
-"t c #CD5B45",
-"y c #2A130F",
-"u c #D16551",
-"i c #B45B4A",
-"p c #3E201B",
-"a c #C66E5D",
-"s c #CD7767",
-"d c #341E1A",
-"f c #392420",
-"g c #4E342F",
-"h c #822617",
-"j c #4D1C14",
-"k c #5A231A",
-"l c #382826",
-"z c #2B2929",
-"x c gray100",
-"c c #F8F8F8",
-"v c #F4F4F4",
-"b c #E4E4E4",
-"n c #D2D2D2",
-"m c gray80",
-"M c #BCBCBC",
-"N c #B9B9B9",
-"B c #B2B2B2",
-"V c #AAAAAA",
-"C c #9A9A9A",
-"Z c #929292",
-"A c #8D8D8D",
-"S c gray51",
-"D c gray47",
-"F c #1D1D1D",
-"G c None",
-/* pixels */
-"GGGGGGGGGGGGGGGG",
-"GZppSGGGGGGVzznG",
-"GgOtjSGGGGMXaqzG",
-"Ggut9jCGGBdo3;lG",
-"G 8#$8kCceo:,@mG",
-"GVX8$$-wFa4h.MGG",
-"GGAy8%&=i0;.mGGG",
-"GGGVr8&&7=.DGGGG",
-"GGGGD@u>&&=yBGGG",
-"GGGCes12=%%*XMGG",
-"GGAps1,zw8$$=dBG",
-"GDks&<ycC68$#5zG",
-"Gfs><ybGGZj9#*fG",
-"G+,<emGGGGDj75lG",
-"GnpXBGGGGGGSdXZG",
-"GGGGGGGGGGGGGGGG"
-};
+static char * close_xpm[] = {
+"16 16 55 1",
+" c None",
+". c #929292",
+"+ c #262626",
+"@ c #828282",
+"# c #AAAAAA",
+"$ c #292929",
+"% c #D2D2D2",
+"& c #393939",
+"* c #9D9D9D",
+"= c #727272",
+"- c #BCBCBC",
+"; c #1D1D1D",
+"> c #7F7F7F",
+", c #5A5A5A",
+"' c #7B7B7B",
+") c #656565",
+"! c #9A9A9A",
+"~ c #B2B2B2",
+"{ c #222222",
+"] c #858585",
+"^ c #5B5B5B",
+"/ c #444444",
+"( c #2B2B2B",
+"_ c #404040",
+": c #646464",
+"< c #565656",
+"[ c #555555",
+"} c #2E2E2E",
+"| c #F8F8F8",
+"1 c #0E0E0E",
+"2 c #545454",
+"3 c #424242",
+"4 c #212121",
+"5 c #CCCCCC",
+"6 c #505050",
+"7 c #1E1E1E",
+"8 c #383838",
+"9 c #131313",
+"0 c #8D8D8D",
+"a c #181818",
+"b c #535353",
+"c c #525252",
+"d c #6D6D6D",
+"e c #6B6B6B",
+"f c #1F1F1F",
+"g c #666666",
+"h c #787878",
+"i c #888888",
+"j c #585858",
+"k c #4F4F4F",
+"l c #454545",
+"m c #4D4D4D",
+"n c #282828",
+"o c #E4E4E4",
+"p c #363636",
+" ",
+" .++@ #$$% ",
+" &*=+@ -;>,$ ",
+" &'=)+! ~{]^/( ",
+" _:<[:}!|1]2345 ",
+" #;:[[67;><89- ",
+" 0a:[bcde/95 ",
+" #f:bbgc9h ",
+" h4'<bbca~ ",
+" !1ij[c[[k;- ",
+" 0+ij3$7:[[c{~ ",
+" h}ibla|!f:[<m$ ",
+" ni<lao .+)<kn ",
+" p3l15 h+gm( ",
+" %+;~ @{;. ",
+" "};
/* XPM */
static char * jpilot_xpm[] = {
-"32 32 174 2",
+"15 18 154 2",
" c None",
-". c #767676",
-"+ c #000000",
-"@ c #868686",
-"# c #EFEFEF",
-"$ c #F1F1F1",
-"% c #F2F2F2",
-"& c #F3F3F3",
-"* c #EEEEEE",
-"= c #ECECEC",
-"- c #E9E9E9",
-"; c #E6E6E6",
-"> c #E3E3E3",
-", c #E0E0E0",
-"' c #DEDEDE",
-") c #DBDBDB",
-"! c #D8D8D8",
-"~ c #D2D2D2",
-"{ c #B2B2B2",
-"] c #E8E8E8",
-"^ c #EAEAEA",
-"/ c #EBEBEB",
-"( c #E4E4E4",
-"_ c #E2E2E2",
-": c #DFDFDF",
-"< c #DCDCDC",
-"[ c #D9D9D9",
-"} c #D6D6D6",
-"| c #D3D3D3",
-"1 c #CFCFCF",
-"2 c #CACACA",
-"3 c #8C8C8C",
-"4 c #747474",
-"5 c #C7C7C7",
-"6 c #848484",
-"7 c #519551",
-"8 c #4F954F",
-"9 c #509650",
-"0 c #548A52",
-"a c #2A2A2A",
-"b c #C5C5C5",
-"c c #85BD86",
-"d c #81BB82",
-"e c #7EBA7E",
-"f c #7DB97D",
-"g c #78B678",
-"h c #5CA45C",
-"i c #1D1D1D",
-"j c #C1C1C1",
-"k c #F0F0F0",
-"l c #E7E7E7",
-"m c #82BC82",
-"n c #75B575",
-"o c #72B472",
-"p c #71B371",
-"q c #5DA55D",
-"r c #BFBFBF",
-"s c #E5E5E5",
-"t c #6FB16F",
-"u c #6CB06C",
-"v c #6AB06A",
-"w c #69AF69",
-"x c #68AE68",
-"y c #BBBBBB",
-"z c #EDEDED",
-"A c #7CB87C",
-"B c #7AB87A",
-"C c #7FB87E",
-"D c #79B779",
-"E c #68AE6A",
-"F c #6DAF6B",
-"G c #5EA85E",
-"H c #5BA75B",
-"I c #57A557",
-"J c #53A353",
-"K c #5FA95F",
-"L c #B8B8B8",
-"M c #63AB63",
-"N c #5FA55F",
-"O c #599957",
-"P c #54A054",
-"Q c #439B43",
-"R c #449C44",
-"S c #459D45",
-"T c #429C42",
-"U c #B3B3B3",
-"V c #838383",
-"W c #51A353",
-"X c #4B9F4B",
-"Y c #4DA14D",
-"Z c #4AA04C",
-"` c #4EA250",
-" . c #489E48",
-".. c #439D43",
-"+. c #65AD65",
-"@. c #B0B0B0",
-"#. c #529652",
-"$. c #77B577",
-"%. c #51A351",
-"&. c #50A04E",
-"*. c #479D47",
-"=. c #459B45",
-"-. c #ADADAD",
-";. c #D5D5D5",
-">. c #4BA14D",
-",. c #52A452",
-"'. c #6BAF6B",
-"). c #A9A9A9",
-"!. c #D1D1D1",
-"~. c #539652",
-"{. c #499F49",
-"]. c #6EB06E",
-"^. c #A6A6A6",
-"/. c #828282",
-"(. c #DDDDDD",
-"_. c #CDCDCD",
-":. c #539753",
-"<. c #70B270",
-"[. c #A3A3A3",
-"}. c #D7D7D7",
-"|. c #C8C8C8",
-"1. c #549854",
-"2. c #4FA34F",
-"3. c #74B474",
-"4. c #A0A0A0",
-"5. c #9D9D9D",
-"6. c #CECECE",
-"7. c #C0C0C0",
-"8. c #56A656",
-"9. c #80BB7F",
-"0. c #999999",
-"a. c #BCBCBC",
-"b. c #609E60",
-"c. c #83BC82",
-"d. c #979797",
-"e. c #C6C6C6",
-"f. c #B7B7B7",
-"g. c #515151",
-"h. c #8D8D8D",
-"i. c #969696",
-"j. c #C3C3C3",
-"k. c #B9B9B9",
-"l. c #BDBDBD",
-"m. c #AEAEAE",
-"n. c #ACACAC",
-"o. c #AAAAAA",
-"p. c #A8A8A8",
-"q. c #A7A7A7",
-"r. c #A4A4A4",
-"s. c #BEBEBE",
-"t. c #AFAFAF",
-"u. c #A1A1A1",
-"v. c #9F9F9F",
-"w. c #9E9E9E",
-"x. c #4B739F",
-"y. c #8A8A8A",
-"z. c #898989",
-"A. c #888888",
-"B. c #878787",
-"C. c #727272",
-"D. c #7A7A7A",
-"E. c #474747",
-"F. c #4E4E4E",
-"G. c #4D4D4D",
-"H. c #4B4B4B",
-"I. c #4A4A4A",
-"J. c #494949",
-"K. c #464646",
-"L. c #606060",
-"M. c #7B7B7B",
-"N. c #7E7E7E",
-"O. c #777777",
-"P. c #757575",
-"Q. c #949494",
-" ",
-" ",
-" . + + + + + + + + + + + + + + + + + + @ ",
-" + # $ % & & & # * = - ; > , ' ) ! ~ { + ",
-" + $ ] ^ / = = ] ; ( _ : < [ } | 1 2 3 + ",
-" + % - . + + + + + + + + + + + + 4 5 6 + ",
-" + % ^ + 7 8 9 9 9 9 9 8 8 8 8 0 a b 6 + ",
-" + $ - + 8 c c d d e e e f f g h i j 6 + ",
-" + k l + 8 m m m m m m n n o p q i r 6 + ",
-" + # s + 8 d d d d p t u v w x q i y 6 + ",
-" + z _ + 8 A B C D E F G H I J K i L 6 + ",
-" + ^ : + 9 B f M N O P Q R S T M i U V + ",
-" + l < + 9 g t W X Y Z ` S ...+.i @.V + ",
-" + ( ! + #.$.%.X X X &.Y *.S =.E i -.V + ",
-" + _ ;.+ #.>.Z Y X X Y ,.Z ....'.i ).V + ",
-" + : !.+ ~.*.{.X X X X X X *.{.].i ^./.+ ",
-" + (._.+ :.X X X X X X X X X Y <.i [./.+ ",
-" + }.|.+ 1.2.2.2.2.2.2.2.2.2.2.3.i 4./.+ ",
-" + | b + 1.,.,.,.,.,.,.,.,.,.,.$.i 5./.+ ",
-" + 6.7.+ 1.8.8.8.8.8.8.8.8.8.8.9.i 0./.+ ",
-" + 2 a.+ b.u 3.3.3.3.3.3.3.3.3.c.i d./.+ ",
-" + e.f.g.+ + + + + + + + + + + + h.i./.+ ",
-" + j.U k.l.l.l.@.m.n.o.p.q.^.r.[.[.i./.+ ",
-" + s.m.t.t.t.t.u.v.w.5.x.x.x.x.r.0.i./.+ ",
-" + t.i.d.d.d.d.3 3 y.z.A.B.@ y.C.4 6 D.+ ",
-" E.+ + F.G.F.F.H.I.I.J.E.E.K.K.K.K.+ + L. ",
-" 6 + C.M.N./.@ 6 /.N.D.O.. P.P.P.+ Q. ",
-" G.+ + + + + + + + + + + + + + + ",
-" ",
-" ",
-" ",
-" "};
+". c #000000",
+"+ c #393939",
+"@ c #ABABAB",
+"# c #ACACAC",
+"$ c #ADADAD",
+"% c #A9A9A9",
+"& c #A7A7A7",
+"* c #A4A4A4",
+"= c #A0A0A0",
+"- c #9D9D9D",
+"; c #9A9A9A",
+"> c #898989",
+", c #353535",
+"' c #282828",
+") c #EDEDED",
+"! c #B2B2B2",
+"~ c #878787",
+"{ c #868686",
+"] c #848484",
+"^ c #828282",
+"/ c #7F7F7F",
+"( c #7D7D7D",
+"_ c #7A7A7A",
+": c #171717",
+"< c #EEEEEE",
+"[ c #3D4A3D",
+"} c #437943",
+"| c #467B46",
+"1 c #457B45",
+"2 c #457A45",
+"3 c #447643",
+"4 c #4C584C",
+"5 c #161616",
+"6 c #ECECEC",
+"7 c #314231",
+"8 c #70AE70",
+"9 c #83BC83",
+"0 c #81BB82",
+"a c #80BB80",
+"b c #7AB87A",
+"c c #78B778",
+"d c #6CAE6C",
+"e c #415341",
+"f c #A2A2A2",
+"g c #EAEAEA",
+"h c #304230",
+"i c #6EAC6E",
+"j c #80BB81",
+"k c #7EB97F",
+"l c #71B371",
+"m c #6BAF6B",
+"n c #67AE67",
+"o c #62AA62",
+"p c #9F9F9F",
+"q c #272727",
+"r c #E6E6E6",
+"s c #304130",
+"t c #6BAB6B",
+"u c #77B677",
+"v c #6AAC6A",
+"w c #5FA45E",
+"x c #50A150",
+"y c #4DA14D",
+"z c #52A352",
+"A c #9C9C9C",
+"B c #262626",
+"C c #E1E1E1",
+"D c #69AA69",
+"E c #5FA95F",
+"F c #4EA04E",
+"G c #4DA04D",
+"H c #4BA04C",
+"I c #469D46",
+"J c #50A351",
+"K c #415342",
+"L c #999999",
+"M c #DCDCDC",
+"N c #2F402F",
+"O c #57A158",
+"P c #4CA14D",
+"Q c #4B9F4B",
+"R c #4DA04C",
+"S c #4EA24E",
+"T c #469E46",
+"U c #425342",
+"V c #979797",
+"W c #252525",
+"X c #D7D7D7",
+"Y c #4C9B4C",
+"Z c #4A9F4A",
+"` c #499E49",
+" . c #58A658",
+".. c #939393",
+"+. c #242424",
+"@. c #D1D1D1",
+"#. c #2E3F2E",
+"$. c #509E50",
+"%. c #5CA95C",
+"&. c #435343",
+"*. c #919191",
+"=. c #232323",
+"-. c #CACACA",
+";. c #2D3E2D",
+">. c #54A054",
+",. c #54A554",
+"'. c #62AC62",
+"). c #445344",
+"!. c #8F8F8F",
+"~. c #222222",
+"{. c #C3C3C3",
+"]. c #334033",
+"^. c #558F55",
+"/. c #5D975D",
+"(. c #649B64",
+"_. c #4B574B",
+":. c #8D8D8D",
+"<. c #212121",
+"[. c #BDBDBD",
+"}. c #818181",
+"|. c #5F5F5F",
+"1. c #5C5C5C",
+"2. c #575757",
+"3. c #565656",
+"4. c #545454",
+"5. c #535353",
+"6. c #525252",
+"7. c #8C8C8C",
+"8. c #1F1F1F",
+"9. c #B3B3B3",
+"0. c #9B9B9B",
+"a. c #6C829B",
+"b. c #657E9B",
+"c. c #79899A",
+"d. c #949494",
+"e. c #151515",
+"f. c #2E2E2E",
+"g. c #464646",
+"h. c #686868",
+"i. c #6D6D6D",
+"j. c #6B6B6B",
+"k. c #666666",
+"l. c #656565",
+"m. c #636363",
+"n. c #626262",
+"o. c #555555",
+"p. c #363636",
+"q. c #3E3E3E",
+"r. c #494949",
+"s. c #5A5A5A",
+"t. c #585858",
+"u. c #515151",
+"v. c #505050",
+"w. c #373737",
+" . . . . . . . . . . . ",
+" + @ # $ # % & * = - ; > , ",
+" ' ) ! ~ { ] ^ / ( _ = % : ",
+" ' < [ } | | 1 2 2 3 4 * 5 ",
+" ' 6 7 8 9 0 a b c d e f 5 ",
+" ' g h i j k l m n o e p 5 ",
+" q r s t u v w x y z e A 5 ",
+" B C s D E F G H I J K L 5 ",
+" B M N O P Q R S T z U V 5 ",
+" W X N Y Z Q Q Q ` .U ..5 ",
+" +.@.#.$.S S S S S %.&.*.5 ",
+" =.-.;.>.,.,.,.,.,.'.).!.5 ",
+" ~.{.].^./././././.(._.:.5 ",
+" <.[.}.|.1.2.3.4.5.6.{ 7.5 ",
+" 8.9.@ # & - 0.a.b.c.d.> e. ",
+" f.g.h.i.j.k.l.m.n.|.o.p.p. ",
+" q.r.3.s.s.t.5.u.v.g.w. ",
+" "};
gchar *text;
} default_toolbar[] = {
#ifdef MAEMO
- { A_GO_FOLDERS, STOCK_PIXMAP_GO_FOLDERS, _("Folders") },
+ { A_GO_FOLDERS, STOCK_PIXMAP_GO_FOLDERS, _("Folders") },
+ { A_OPEN_MAIL, STOCK_PIXMAP_OPEN_MAIL, _("Open") },
{ A_SEPARATOR, 0, ("") },
#endif
{ A_RECEIVE_ALL, STOCK_PIXMAP_MAIL_RECEIVE_ALL, _("Get Mail")},
{ A_COMPOSE_EMAIL, STOCK_PIXMAP_MAIL_COMPOSE,
(gchar*)Q_("Toolbar|Compose") },
{ A_SEPARATOR, 0, ("") },
-#ifdef MAEMO
- { A_OPEN_MAIL, STOCK_PIXMAP_OPEN_MAIL, _("Open") },
-#endif
{ A_REPLY_MESSAGE, STOCK_PIXMAP_MAIL_REPLY, _("Reply") },
#ifndef MAEMO
{ A_REPLY_ALL, STOCK_PIXMAP_MAIL_REPLY_TO_ALL, _("All") },
gint icon;
gchar *text;
} default_toolbar[] = {
+#ifdef MAEMO
+ { A_CLOSE, STOCK_PIXMAP_CLOSE, _("Close") },
+ { A_SEPARATOR, 0, ("") },
+#endif
{ A_SEND, STOCK_PIXMAP_MAIL_SEND, _("Send") },
{ A_SENDL, STOCK_PIXMAP_MAIL_SEND_QUEUE, _("Send later") },
{ A_DRAFT, STOCK_PIXMAP_MAIL, _("Draft") },
{ A_ATTACH, STOCK_PIXMAP_MAIL_ATTACH, _("Attach") },
{ A_SEPARATOR, 0, ("") },
{ A_ADDRBOOK, STOCK_PIXMAP_ADDRESS_BOOK, _("Address") }
-#ifdef MAEMO
- ,
- { A_SEPARATOR, 0, ("") },
- { A_CLOSE, STOCK_PIXMAP_CLOSE, _("Close") }
-#endif
};
gint i;
gint icon;
gchar *text;
} default_toolbar[] = {
+#ifdef MAEMO
+ { A_CLOSE, STOCK_PIXMAP_CLOSE, _("Close") },
+ { A_SEPARATOR, 0, ("") },
+#endif
{ A_REPLY_MESSAGE, STOCK_PIXMAP_MAIL_REPLY, _("Reply") },
{ A_REPLY_ALL, STOCK_PIXMAP_MAIL_REPLY_TO_ALL, _("All") },
{ A_REPLY_SENDER, STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR, _("Sender") },
#endif
#endif
{ A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW, _("Next") }
-#ifdef MAEMO
- ,
- { A_SEPARATOR, 0, ("") },
- { A_CLOSE, STOCK_PIXMAP_CLOSE, _("Close") }
-#endif
};
gint i;
projects / claws.git / commitdiff