Re: [mlview-list][patch] pixmaps/ fixes

From: Dodji Seketeli <dodji seketeli org>
To: Nicolas Centa <nicolas centa free fr>
Cc: mlview-list gnome org
Subject: Re: [mlview-list][patch] pixmaps/ fixes
Date: Thu, 20 Nov 2003 21:07:25 +0100
Hey Happypeng,

The patch looks good !
It's applied and commited.

I have just added some error handling messages in case
we don't find the icons at load time.

Thank you for your time.

All the best,

Dodji.

On Mon, Nov 17, 2003 at 06:11:01PM +0100, Nicolas Centa wrote:
> Hello,
> 
> No more folder_violet.png and other KDE-ish names :-)
> 
> Thanks to Baptiste for the artwork.
> 
> Nicolas Centa
> "HappyPeng"


> ? depcomp
> ? icons.patch
> ? install-sh
> ? missing
> ? mkinstalldirs
> ? pixmaps/xml-comment-node.png
> ? pixmaps/xml-pi-node.png
> ? pixmaps/xml-root-open.png
> ? pixmaps/xml-root.png
> ? schemas/Makefile.in
> Index: pixmaps/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/mlview/pixmaps/Makefile.am,v
> retrieving revision 1.8
> diff -a -u -r1.8 Makefile.am
> --- pixmaps/Makefile.am	14 Nov 2003 22:03:03 -0000	1.8
> +++ pixmaps/Makefile.am	17 Nov 2003 17:02:59 -0000
> @@ -1,14 +1,13 @@
>  pixmaps_DATA = mlview-app-icon.png \
> -	       xml-element-node-open.xpm \
> -	       xml-element-node.xpm \
> -	       xml-text-node.xpm \
> +	       xml-element-node-open.png \
> +	       xml-element-node.png \
> +	       xml-text-node.png \
>  	       mlview-app-icon.xpm \
> -	       folder_violet.png \
> -	       folder_violet_open.png \
> -               misc_doc.png \
> -               txt.png \
> -               unknown.png \
> -               blockdevice.png
> +	       xml-root.png \
> +	       xml-root-open.png \
> +               xml-comment-node.png \
> +               xml-text-node.png \
> +               xml-pi-node.png
>  pixmapsdir = $(datadir)/pixmaps
>  EXTRA_DIST = $(pixmaps_DATA)
>  
> Index: pixmaps/xml-element-node-open.png
> ===================================================================
> RCS file: /cvs/gnome/mlview/pixmaps/xml-element-node-open.png,v
> retrieving revision 1.2
> diff -a -u -r1.2 xml-element-node-open.png
> --- pixmaps/xml-element-node-open.png	25 Mar 2002 21:40:11 -0000	1.2
> +++ pixmaps/xml-element-node-open.png	17 Nov 2003 17:03:00 -0000
> @@ -1,6 +1,3 @@
>  ?PNG
>  
> -
IHDR?w=?bKGD????????IDATx???]hW?3????f??
??h??????m???!??P(??-[?R4>T(?BJ)-???V?-?????-?X??&1??I????M?3??????>x7???f????s?=g`a?????D??-???B?
??O??o?????X>r\??va (\??_???_A?x??oD,?W??\?vK?U?k???>?VLNM???~???-?<r??T?(}???:???c???ycg??q"??i?zepU^A	@5?'k??*P]Z??cO????]/1:2???$??t:?+Gc??{Z?c??9?[e????*??g?;???;?P(??8?R)2??mc?6?O?,??eUH%??u?T??? ??????z???p(?eY????8??????0?D?????pMM???
 
> -? \?p? ?  Q??????V?2?4?e?D?	l?6V*?	EK^|!p??E?y??[?^??2?N?z;??c
?m*4M????J<??r?w;-?s44?+?D??&?H?'H?3???s?O[?? ??G????h6?n?{6?>????;c?#?a?: ?x????u]?QPT~m???=*????S?v????(????iLOOc???9cy???`0?eYD?Q??0,?B?TB?a?_?m????? ??I? 42X???????J4M??v?{k??[I666??:%%%??>??m???'??(??a?K??I?V?????	Z?.EU?????u)k7m????q?0HY?l?Meh?6Q3?W??V2?T`?4%G?Rf????h???O?***???QT??"5?u??L??(?Rz???|G/??????
> -R??8Y????t??????????l??
???,G?~?.?????D??Nr???Mr?1 !? r???Uq??B????X????[????C?ub?????zql?????????9?????}Z6G4	r?M?n<??????=?|?HZi%f????QU?????t?\?J?????M?-???????????????%---???a.t??????14*???????????r?h;{F?B D?????r]?[?J?V[??^??z]- ??,?ZLF???????2???????????>9?j???????z;???R??-???g???9???\	???8	L??jd???`?????%??.??e?g
> -????e'?#?,???2?????IEND?B`?
> \ No newline at end of file
> +
IHDR??abKGD?C?uIDATx???K/Q??N?*?J??????]?X??B???Dbo#????7?d??%.?fhE?hFU?:s??X?q?b?K??????y????? ?|????1=???G9?v??????N?)???>??v?W?Q?*3???t!`? n?,,,!?l?^!rT????_?e	?x?O??9?j?"2P? ?6?N???$??c*?$I/V=P???<-???9?????????/??????6F?K???_???????????4T5JOO7F??dJ?vp???}"	?T<<=???????K??F?????N?\?e????!???????n??UPW_K{G?;??8|?11>S??-??y!LdO
q#ZR|?]?(?{?O??\??|??????E?IEND?B`?
> \ No newline at end of file
> Index: pixmaps/xml-element-node.png
> ===================================================================
> RCS file: /cvs/gnome/mlview/pixmaps/xml-element-node.png,v
> retrieving revision 1.2
> diff -a -u -r1.2 xml-element-node.png
> --- pixmaps/xml-element-node.png	25 Mar 2002 21:40:11 -0000	1.2
> +++ pixmaps/xml-element-node.png	17 Nov 2003 17:03:00 -0000
> @@ -1,9 +1,4 @@
>  ?PNG
>  
> -
IHDR?w=?bKGD???????yIDATx???]lU??????????-mq?J?????(?h0IT ?????? ??/11?*n??
> -?	!??za?)????v???????m)Q???7'???????}???B6??? ??	`8DEy??#????g"??fX??i????eYX?}?G??F??????????+???~?a?X???d?41MC?B85m??vnnMS?
?Cohj?]???T?1~;???	Wb:!p????(e)?o????k@
??????^?j?w???+?!?}o?????&???~`0?
> -4/?l?[??2?????tH^?A?R????<??7???M? x???}o?fXTk5?t?????	x(??????!?/]???={?U?????'???
> -??S???u??rJ?????X???Lvt?????eY??`???v?0??????+??TG?D? ?b1?f?/?e?L;??71U??+?*?A?5M?????????"z???l>m:???z???p'_??<????$?FXQ?ThjQ.?H-]????YE`?a?]?J??l?v??p??,?)N\!?J????S??[F9o???05?????u??T???h?!??q?+??2?"?;;????{;J"? ?J????I?$??????-?w??;G?i=?D??*???eqk?S???Jy8?U????????aZ?
> -?>??ZZ?t:M2???|Z[[?D"LdK??0J A????N4??O?S?T???1[?/????????m?qR??Z???????$q??k?R3f??0 ?i!?C??V?051???}E?q?m??F????eU^=|????4? ???X?r?????\?B.Kn*Cw?f??r?tz??x??????3?y???B
?
???E????C~ ?iA??U?<???h$?
> -?????L??S??S?????=?e?O?`???{?U ?n????F?5?x?????F^|?)?V?il??????????|\?
???	h??m???????7?Z?9?h??ky?9p?h?w???e?j??z???X??*?p??= 7?xr??~?(???O`???(?a?E
> -F??[6?3? y?????? 2k>r???W??[?IEND?B`?
> \ No newline at end of file
> +
IHDR??abKGD?C?IDATx???MJA??.\(???Q"??3????i<?x??D4B??IDGI?????zY???I???
E????W???V????~J?t[?t[<=;??H?????7\4?1y}?x<???:???Q??G?|~?G????tR???8???Md???#??`?o??????
???F???
> +P]????,??,????E?i??g????,@?_?!_?b????BD?C??I???A??p1i?|???2?JVA???>????.????W?z???<Y??VE??8???a?IEND?B`?
> \ No newline at end of file
> Index: pixmaps/xml-text-node.png
> ===================================================================
> RCS file: /cvs/gnome/mlview/pixmaps/xml-text-node.png,v
> retrieving revision 1.2
> diff -a -u -r1.2 xml-text-node.png
> --- pixmaps/xml-text-node.png	25 Mar 2002 21:40:11 -0000	1.2
> +++ pixmaps/xml-text-node.png	17 Nov 2003 17:03:00 -0000
> @@ -1,8 +1,5 @@
>  ?PNG
>  
> -
IHDR?w=?gAMA???abKGD???????	pHYs????)ItIME?	58?|rIDATx????nA?{!?? ????K??H??AI????(R??P??HH??pD$??mr?????? N b????I??|??,????;???m?????F#]??????3=88P???2??QG?q?*?^?G?$????????,???q???SD(??,????????:??D+y??"n????A??!MS???9<<?;?n\???pH?? ?s???8::x?+'???[P??????D??xB?e?b{<^3??8g?	LiC'\^^2???s?????O}???5?C??B"????????R?D?V???mvvv??s?,????
> -j???<pu7??6U?s$qL??`??YG?o???????? ??@?S?*Z+???4???	"n??"4??
> -???W??????N77I??;??]????7g`}D^W?*VuA??NB?*??nE??<?t?(Z;?|???S????????????+?W???V8?R?Go??S??????F??8D???	5??+`Tk
zC?? ?SFE??????????j?i?????
> -?~??
> -~?js??oIZ??:? ?#?3??g??????qc?<??G?i?????????n????????????
> -??IEND?B`?
> \ No newline at end of file
> +
IHDR??abKGD????????IDATx???AkQ??? v?"?%???R?u??!?????E?T?&HqHBL!
> +??)
y?Lf??????a&?h/???????????t?
#??????x<?v?? v6?8^?N?#???j?$?2????T??F?^?GL&Z?V??AP?&?|>?Z?rr??????`?__J?z???`4?J)|?GD?<?????7x|]?????8?m?N?T?2????y??'/^??me
"?v?l?<???]~?n??????>?]?OXk??f??"B?\???>??y??+G?A???1?s??T?Z??=???	G?A?????E?DQ$aJ???~9?? ?f??<?1??6?F?y???5??B?[?7WJ!"T*??i??????WM????n??1??f??t
> +0X-q???s????Z?f?.0?3IEND?B`?
> \ No newline at end of file
> Index: src/mlview-icon-tree.c
> ===================================================================
> RCS file: /cvs/gnome/mlview/src/mlview-icon-tree.c,v
> retrieving revision 1.7
> diff -a -u -r1.7 mlview-icon-tree.c
> --- src/mlview-icon-tree.c	15 Nov 2003 01:58:21 -0000	1.7
> +++ src/mlview-icon-tree.c	17 Nov 2003 17:03:01 -0000
> @@ -31,6 +31,15 @@
>   *The definition of a tree editor that embedds nice icons.
>   */
>  
> +
> +#define ELEMENT_ICON      "pixmaps/xml-element-node.png"
> +#define OPEN_ELEMENT_ICON "pixmaps/xml-element-node-open.png"
> +#define TEXT_ICON         "pixmaps/xml-text-node.png"
> +#define ROOT_ICON         "pixmaps/xml-root.png"
> +#define OPEN_ROOT_ICON    "pixmaps/xml-root-open.png"
> +#define COMMENT_ICON      "pixmaps/xml-comment-node.png"
> +#define PI_ICON           "pixmaps/xml-pi-node.png"
> +
>  enum MlViewIconTreeColumns  {
>          /*hidden column, where the xml node is stored.*/
>          XML_NODE_COLUMN = 0,        
> @@ -160,7 +169,7 @@
>  			    (G_OBJECT_GET_CLASS (a_this))->icons.root,
>  			    OPEN_ICON_COLUMN, 
>  			    MLVIEW_ICON_TREE_CLASS 
> -			    (G_OBJECT_GET_CLASS (a_this))->icons.root,
> +			    (G_OBJECT_GET_CLASS (a_this))->icons.open_root,
>  			    ARE_ATTRIBUTES_EDITABLE_COLUMN, FALSE, -1);
>          xml_tree = a_doc->children;
>          status = build_tree_model_from_xml_tree
> @@ -821,32 +830,37 @@
>          gchar *path;
>  
>          path = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_DATADIR,
> -                                          "pixmaps/folder_violet.png", TRUE, NULL);
> +                                          ELEMENT_ICON, TRUE, NULL);
>          a_klass->icons.element = gdk_pixbuf_new_from_file (path, NULL);
>          g_free (path);
>  
>          path = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_DATADIR,
> -                                          "pixmaps/folder_violet_open.png", TRUE, NULL);
> +                                          OPEN_ELEMENT_ICON, TRUE, NULL);
>          a_klass->icons.open_element = gdk_pixbuf_new_from_file (path, NULL);
>          g_free (path);
>  
>          path = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_DATADIR,
> -                                          "pixmaps/txt.png", TRUE, NULL);
> +                                          TEXT_ICON, TRUE, NULL);
>          a_klass->icons.text = gdk_pixbuf_new_from_file (path, NULL);
>          g_free (path);
>  
>          path = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_DATADIR,
> -                                          "pixmaps/blockdevice.png", TRUE, NULL);
> +                                          ROOT_ICON, TRUE, NULL);
>          a_klass->icons.root = gdk_pixbuf_new_from_file (path, NULL);
>          g_free (path);
>  
>          path = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_DATADIR,
> -                                          "pixmaps/misc_doc.png", TRUE, NULL);
> +                                          OPEN_ROOT_ICON, TRUE, NULL);
> +        a_klass->icons.open_root = gdk_pixbuf_new_from_file (path, NULL);
> +        g_free (path);
> +
> +        path = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_DATADIR,
> +                                          COMMENT_ICON, TRUE, NULL);
>          a_klass->icons.comment = gdk_pixbuf_new_from_file (path, NULL);
>          g_free (path);
>    
>          path = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_DATADIR,
> -                                          "pixmaps/unknown.png", TRUE, NULL);
> +                                          PI_ICON, TRUE, NULL);
>          a_klass->icons.pi = gdk_pixbuf_new_from_file (path, NULL);
>          g_free (path);
>  }
> @@ -858,6 +872,7 @@
>          g_object_unref (G_OBJECT (a_klass->icons.open_element));
>          g_object_unref (G_OBJECT (a_klass->icons.text));
>          g_object_unref (G_OBJECT (a_klass->icons.root));
> +        g_object_unref (G_OBJECT (a_klass->icons.open_root));
>          g_object_unref (G_OBJECT (a_klass->icons.comment));
>          g_object_unref (G_OBJECT (a_klass->icons.pi));
>  }
> Index: src/mlview-icon-tree.h
> ===================================================================
> RCS file: /cvs/gnome/mlview/src/mlview-icon-tree.h,v
> retrieving revision 1.3
> diff -a -u -r1.3 mlview-icon-tree.h
> --- src/mlview-icon-tree.h	9 Nov 2003 23:33:53 -0000	1.3
> +++ src/mlview-icon-tree.h	17 Nov 2003 17:03:02 -0000
> @@ -68,6 +68,7 @@
>                  GdkPixbuf *open_element;
>                  GdkPixbuf *text;
>                  GdkPixbuf *root;
> +                GdkPixbuf *open_root;
>                  GdkPixbuf *comment;
>                  GdkPixbuf *pi;
>
References:
- [mlview-list][patch] pixmaps/ fixes
  - From: Nicolas Centa
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]