From 8264dea990c29ef7a52f49da9bacf1e59f0a3b8f Mon Sep 17 00:00:00 2001 From: Bart Hakvoort Date: Fri, 25 Nov 2005 14:53:23 +0000 Subject: [PATCH] gparted finally has a logo/icon ;) (thanks to Alain Clement) see also * gparted finally has a logo/icon ;) (thanks to Alain Clement) see also #162092 --- ChangeLog | 4 ++++ Makefile.am | 2 +- configure.in | 1 + gparted.desktop.in | 1 + include/Dialog_About.h | 1 + pixmaps/.cvsignore | 2 ++ pixmaps/Makefile.am | 4 ++++ pixmaps/gparted.png | Bin 0 -> 2943 bytes src/Dialog_About.cc | 4 +++- src/Makefile.am | 18 +++++++++--------- src/Win_GParted.cc | 1 + 11 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 pixmaps/.cvsignore create mode 100644 pixmaps/Makefile.am create mode 100644 pixmaps/gparted.png diff --git a/ChangeLog b/ChangeLog index 39be2f71..1db13f97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-11-25 Bart Hakvoort + * gparted finally has a logo/icon ;) (thanks to Alain Clement) + see also #162092 + 2005-11-25 Bart Hakvoort * include/.cvsignore, src/.cvsignore: added *.swp diff --git a/Makefile.am b/Makefile.am index bccb4346..d339055b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = include src po compose +SUBDIRS = include src po compose pixmaps @INTLTOOL_DESKTOP_RULE@ diff --git a/configure.in b/configure.in index 59ee3441..90b09ee8 100644 --- a/configure.in +++ b/configure.in @@ -48,5 +48,6 @@ Makefile compose/Makefile include/Makefile src/Makefile +pixmaps/Makefile po/Makefile.in ]) diff --git a/gparted.desktop.in b/gparted.desktop.in index e2ca726e..fadcc076 100644 --- a/gparted.desktop.in +++ b/gparted.desktop.in @@ -3,6 +3,7 @@ Encoding=UTF-8 _Name=GParted _Comment=Gnome Partition Editor Exec=gparted +Icon=gparted.png Terminal=false Type=Application Categories=GNOME;Application;System; diff --git a/include/Dialog_About.h b/include/Dialog_About.h index 779f34ad..00da0860 100644 --- a/include/Dialog_About.h +++ b/include/Dialog_About.h @@ -44,6 +44,7 @@ private: void Show_Credits() ; Gtk::Button button_credits; + Gtk::Image *image ; }; } //GParted diff --git a/pixmaps/.cvsignore b/pixmaps/.cvsignore new file mode 100644 index 00000000..282522db --- /dev/null +++ b/pixmaps/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am new file mode 100644 index 00000000..47816bf5 --- /dev/null +++ b/pixmaps/Makefile.am @@ -0,0 +1,4 @@ +appicondir = $(datadir)/pixmaps +appicon_DATA = gparted.png + +EXTRA_DIST = $(appicon_DATA) diff --git a/pixmaps/gparted.png b/pixmaps/gparted.png new file mode 100644 index 0000000000000000000000000000000000000000..235cf749af525c5bb20666ea96e2c01763bfb927 GIT binary patch literal 2943 zcmV-_3xM>AP)N-}n4}zwf!{z;%4S5Q`1C8r1Ii+r9rY;YBHx)vhTM zr%F6E@yZkby}+xV7>>mTTn$=oUcTd}U%s6`{-?JwTr*RN_!!#Q#eG+J^%FxbHsETI zS$EUQ(R*#CzBd1|AcW0g&MZ<`IA#2r%>9{$P$t3Dj0aK^ll*w|J|g8K50^jkpeNgnyr z`(f&>CQ?V6rdt8%8ycrCI`XM<ip=AhRPb~yUDG@?&>F8l7uYmLISOP2o4IM`q9O~!J!lihtZ$juA zlOrjFQlRGBB&DRbHWJP+aE6n~1f8AdzBDkvbc9$SP7w91e#a3D(TI{-x@J;Xc}zG_myddy!HS8=pYY3C#C^Whq=PNo(sf zEMHzrW8< z=U4m6aCgsN!a7i%$%a(0n%a$e{fBa{EHZZW)KRG${ zP2du<+;^oUu1|*#fMMua-!yY`aL1|$=RJO?UWX+lLX$X@LP$YgVM!*`q;#-#>-}85 z+{ga?tsFV>5o^|b30-eukAchOKq-jFQ{?68Y}l|BpRe$b+S>N~OETH}B#_xB z7W|mox%00++`Rd=^1M7dX#)Z8bkZ^_d1oiH-L7eJx?N^+C!Od*2u4Svw6*;wue|aq zPG=eS+;bnHP>9QyKgQ{F(9%*%MMVJs?d_L1bf}$z0zZL39v^(r&2!KFlK0;~_-$Yh zFrwu${{H(P4H$;;_qDaF5JI5qnyoT(Aac-8lSzkJdQ4h+Uw-*Nc=p*{R8*{D=gyt1 zT^nZU(tJuw^RX<&AO6tIk|hByTo~l&(JsQ_QmU$o2nIcbLM22Z%|xTt`ktQdpk+1Z*w_egQ%(X(S(yZOIJB(fwUOx->?t}^#MfYH%7LcoR%HC((n!hr*)7#o|Sxp@Vt zltq7klxQ?YUYS zxuGB7aC@#7abeYzXSu@49#!d|b}&@?S$NE&GpGsP7YN=Y;t zqqFlP>gy|!Qd@|Cj6@=YO-<|Ay?ZbB-n)Z}ihS<4Bf`^9xADa<)>2&T#p5w>I&HHiCzH5bIt2v* zVzD?aEvreTOirEZ=DFv70njsVBU`s_(|5LQyLGwW?_qZMOq08+IzVl0Ex-HS3+&$g z?-Um=$L;oD820DG;9!i($^r@s+&G;MdV4?St+zT@yY_~REFV1h29G`Vt^TgAH-8K4 zo=2d$`L>_kdFK|7t~(Yr=+o8#G)*HE3NbNpnSJ|SV02W+?=N8e`jxodPL3b%qO>$X zN5=p?JyGiGmm#I(^y!QI`qz7DZGGxeEY`al_$_cUi@-wr4 zfzRiouC9*K(g1C3dpLi7n3|d}m6e6m)Rgd>-<-kWkgQ%^PCRb%=9}-cYu8Wd>N>*s z_~4#YDzz7Q54fC_14799nwqNVXTe-0TFAiJ?TbC9e@jYAC@CqSy1JUDpZ+;dKKUaa ze)xOT)GX!Zn?nG6^wAiH55LE=&pytI6(!WwZRX_36Uj4Y-aQM91Lhn8Vr@8FMJknI zcz8Hx2wY1@DXFQc;rrkJ4u=mP=DXkhCYv^Woo(A%h{dLO{`r67$u%+wr}4~b8|B< zzW5^J<384}-%3?g70Z?_qp+}$p`j?6=5PQ8Fa>i62m!;xBNP|=|6d8Dk)NNB+wJDQ z`|e|GYz&{zM=%(~<#J8$#ACBQ-)&?OkWvzlCs9ge4lsRveIybIlv30EaSX#C9*?8z zI*CLAUDrt_lNpt%t*zz%3d1n)dcE`7l~NdnbKa%FTopno6Qxwf13sURcs!12nz&pp z`uqFwcs#`8ahy&krfCB9p}()Mk7zW?nl)><7BEdSqlC$1a{5?$MFRGzXEuSnyga0o zq*5uQv=2A4ix2{b!;$ft)9JkG@Utw7e?0sQH`IjaKG(yew|#>|B7vFXntrYa;_-L_ z%d#>dB<2R)BG9zl=jTrY(=-{B104VG1D1&Znxad-ps2`$ z!{IyOOeI7`r z`{u<*I2`deHg5UnV6eDBh#dEXp97S#tbu_`r}poEX3x~r002ovPDHLkV1jI`ov8o- literal 0 HcmV?d00001 diff --git a/src/Dialog_About.cc b/src/Dialog_About.cc index bdd4907b..11c282ba 100644 --- a/src/Dialog_About.cc +++ b/src/Dialog_About.cc @@ -28,7 +28,9 @@ Dialog_About::Dialog_About() this ->set_resizable( false ); this ->set_has_separator( false ) ; - this ->get_vbox() ->pack_start( * mk_label( "\nlogo here ;)\n", true, false ), Gtk::PACK_SHRINK ); + image = manage( new Gtk::Image( GNOME_ICONDIR "/gparted.png" ) ); + this ->get_vbox() ->pack_start( *image, Gtk::PACK_SHRINK ); + this ->get_vbox() ->pack_start( * mk_label( "" + (Glib::ustring) _( "GParted" ) + " " + VERSION + "", true, false ) ,Gtk::PACK_SHRINK ); this ->get_vbox() ->pack_start( * mk_label( "\n" + (Glib::ustring) _( "Gnome Partition Editor" ) + "\n", false, false ) ,Gtk::PACK_SHRINK ); this ->get_vbox() ->pack_start( * mk_label( "Copyright © 2004 Bart Hakvoort", true, false ), Gtk::PACK_SHRINK ); diff --git a/src/Makefile.am b/src/Makefile.am index 0637c46d..432dae9d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,13 +1,14 @@ -INCLUDES =\ - $(GTKMM_CFLAGS) \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" +INCLUDES = \ + $(GTKMM_CFLAGS) \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" -AM_CFLAGS =\ - -Wall\ +AM_CFLAGS = \ + -Wall \ -g -AM_CXXFLAGS =\ - -Wall\ +AM_CXXFLAGS = \ + -Wall \ -g bin_PROGRAMS = gparted @@ -48,6 +49,5 @@ gparted_SOURCES = \ gparted_LDFLAGS = -lparted -lgthread-2.0 -gparted_LDADD = \ - $(GTKMM_LIBS) +gparted_LDADD = $(GTKMM_LIBS) diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc index f633a09a..f560f69f 100644 --- a/src/Win_GParted.cc +++ b/src/Win_GParted.cc @@ -31,6 +31,7 @@ Win_GParted::Win_GParted( ) //==== GUI ========================= this ->set_title( _("GParted") ); + this ->set_icon_from_file( GNOME_ICONDIR "/gparted.png" ) ; this ->set_default_size( 775, 500 ); //Pack the main box