GNOME.org
 

[mlview-list][patch] pixmaps/ fixes

Hello,

No more folder_violet.png and other KDE-ish names :-)

Thanks to Baptiste for the artwork.

Nicolas Centa
"HappyPeng"

Attachment: pixmaps.tar.gz
Description: application/gzip

? 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
 
-
IHDRw=bKGDIDATxڥ]hW3f
hѵըm!ؚP(-[R4>T(BJ)-V--X&1İM3>x7fs=g`aD-B
OӶoX>r\va (\__AxoD,W\vKUk>VLNM~-<rT(}ꜵ:cycgq"izepU^A	@5'k*P]ZcOӻ]/1:2$t:+Gc{Zc9[e*رg;Ɓ;P(8R)2mc6O,eUH%uT zp(eYض8ض0DҽpMM
 
- \p   QV24eD	l6V*	EK^|!pEy[^2Nz;͸c
m*4MJ<rw;-s44+DÜ&H'H3sO[ Gh6n{6>;c#a: xϟu]QPT~m=*Sv(ضiLOOcӆ9cyʊ`0eYDQ0,BTBa_m? I 42XݩJ4Mv{k[I666:%%%>m'á(aKIV	Z.EUu)k7mܨq0HYlMeh6Q3W?V2T`4%GRfhO***ȤQT"5uL(Rz|G/
-R8Ytē̥l۶
˲,G~?.DNrMr1 ! r䍞UqBX[Cubzql9}Z6G4	rMn<խ=|HZi%fQUχt\JڏM-龎%---ξa.t14*ޤrh;{FB Dr][JV[^z]- ,ZLF2ʆ>9jz;R-g9葰\	˕8	Ljd`%.ߥeg
-̇e'#,ʢ2ث…IENDB`
\ No newline at end of file
+
IHDRabKGDCuIDATx͓K/QN*Jذ]XBDbo#7d%.fhEhFU:sXqbKy |1=ℕG9vN)>vWQ*3Ӌt!` n,,,!l^!rT_e	xO9j"2P 6N$c*$I/V=P<-9ߢ/6FKɚ_4T5JOO7FdJvpш}"	T<<=أKF͚N\e!nUPW_K{G;8|11>S-y!LdO
q#ZR|]({Oϸ\|қݻEIENDB`
\ 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
 
-
IHDRw=bKGDyIDATxŖ]lUٙ-mqJ(h0IT  /11*n
-	!za)Җv̌m)Q7'̼}B6? 	`8DEy#ͭg"fXiضeYX}GFΞ׻+~aXd41MCB85mvnnMS
Cohj]֙T1~;	Wb:!p(e)ok@
^jw+!}o&~`0
-4/l[2ޛtH^AR<7M x}ofXTk5t	x(Ǧ!/]={UĀ'
-SřurJLJXߵLvt͉eY`v0̙+TGD b1f/eL;71U+*A5MŬɏ"zl>m:zp'_²<Õ$FXQThjQ.H-]YE`a]J߰lvp,)N\!JS[F9o05གྷuӆTѴh!q+2";;ô{;J" JI$璭-w;Gi=D*׮eqkSJy8UעʡaZ
->ZZt:M2|Z[[D"LdK0J AN4O?ST1[/mqRZ߁$q֭kR3f?0 i!CV051}EqmFeU^=|4 ̂Xr\B.Kn*Cwfrtzx3yB

EɚC~ iAU<h$
-LSS=eO`{U nٹ?F5xF^|)ViléӼ|\
	hˁm٥7Z9hky9phwejzX*p= 7xr?~(ԻO`?(aE
-F[63 yȿӤ 2k>rW[IENDB`
\ No newline at end of file
+
IHDRabKGDCIDATx͓MJA.\(эQ"3i<xD4BIDGIĪzYI
E߫WV~Jt[t[<=;H7\41y}x<:QG|~GtR8Md#`oݰ
F
+P]о,,EigԤ,@_!_bBDC΁IڒAp1i|2JVA>.Wz<YVE8aIENDB`
\ 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
 
-
IHDRw=gAMAabKGD	pHYs)ItIME	58|rIDATxڽnA{! KHAI(RPHHpD$mr N bI|,;m驎F#]г3=88P2кQGq*^G$,qSD(,ަ:D+y"n漺A!MS9<<;n\ߎpH s8::x+'[Pş͘DxBeb{<^38g	LiC'\^^2蟟s킓O}5CB"ȠRDVmvvvs,
-j<pu7Δ6Us$qL`YGoժ֖ @S*Z+4	"n"4ܣ
-W׬N77I;]ƃ7g`}D^W*VuANB*nEι<t(Z;|S屢ѹ+W?V8RGoSΏF8DĀ	5Ƅ+`Tk
zC SFEāji
-~
-~jsoIZ: #3gqc<Gi?Ϳɑn
-IENDB`
\ No newline at end of file
+
IHDRabKGDIDATxڍAkQ? v"%ϽRu!ET&HqHBL!
+)
yLfa&h/Νt
#ιx<v v68^N#j$2TF^GL&ZVAP&|>Zrr㏘`__Jz`4J)|GD<7x|]?8mNT2y'/^me
"vl<]~nݒ>]OXkf"B\>y+GA׳1sTZ=	GAEDQ$aJ~9 f<16Fy5ιB[7WJ!"T*iWMιn1ft
+0X-qsZf.03IENDB`
\ 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;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]