From 045889d4cd339d30cbd2ff58aac1205e7b3bedf5 Mon Sep 17 00:00:00 2001 From: bgk Date: Wed, 4 Jun 2008 18:08:37 +0000 Subject: [PATCH] GTK GUI : - Improved icon installation. Thanks joneslee ! - Improved make install --- CMakeLists.txt | 10 +- debian/rules | 4 +- {debian => src/gtk}/gvbam.desktop | 2 +- src/gtk/icons/16x16/apps/vbam.png | Bin 0 -> 594 bytes src/gtk/icons/22x22/apps/vbam.png | Bin 0 -> 935 bytes src/gtk/icons/24x24/apps/vbam.png | Bin 0 -> 1640 bytes src/gtk/icons/32x32/apps/vbam.png | Bin 0 -> 1614 bytes .../{gbadvance.svg => scalable/apps/vbam.svg} | 804 ++++++++---------- src/gtk/main.cpp | 2 +- src/gtk/windowcallbacks.cpp | 1 + 10 files changed, 362 insertions(+), 461 deletions(-) rename {debian => src/gtk}/gvbam.desktop (91%) create mode 100644 src/gtk/icons/16x16/apps/vbam.png create mode 100644 src/gtk/icons/22x22/apps/vbam.png create mode 100644 src/gtk/icons/24x24/apps/vbam.png create mode 100644 src/gtk/icons/32x32/apps/vbam.png rename src/gtk/icons/{gbadvance.svg => scalable/apps/vbam.svg} (67%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6846bd17..72e5d2b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,12 +27,11 @@ IF( GLIBMM_FOUND AND GTKMM_FOUND AND GLADEMM_FOUND AND PORTAUDIO_FOUND AND XV_FO ENDIF( GLIBMM_FOUND AND GTKMM_FOUND AND GLADEMM_FOUND AND PORTAUDIO_FOUND AND XV_FOUND ) IF( NOT DATA_INSTALL_DIR ) - SET( DATA_INSTALL_DIR "src/gtk" ) - SET( PKGDATADIR ${DATA_INSTALL_DIR} ) -ELSE( NOT DATA_INSTALL_DIR ) - SET( PKGDATADIR ${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR} ) + SET( DATA_INSTALL_DIR "share/vbam" ) ENDIF( NOT DATA_INSTALL_DIR ) +SET( PKGDATADIR ${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR} ) + IF( NOT SYSCONFDIR ) SET( SYSCONFDIR "/etc" ) ENDIF( NOT SYSCONFDIR ) @@ -218,6 +217,7 @@ IF( CAN_BUILD_GVBAM ) INSTALL(PROGRAMS gvbam DESTINATION bin) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/vba.glade DESTINATION ${DATA_INSTALL_DIR}) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/icons/gbadvance.svg DESTINATION ${DATA_INSTALL_DIR}/icons) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/gvbam.desktop DESTINATION share/applications) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/icons/ DESTINATION share/icons/hicolor PATTERN ".svn" EXCLUDE) ENDIF( CAN_BUILD_GVBAM ) diff --git a/debian/rules b/debian/rules index c7ce01e6..6a939340 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,7 @@ build: build-stamp build-stamp: dh_testdir - cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DDATA_INSTALL_DIR:PATH=share/VisualBoyAdvanceM . + cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr . $(MAKE) #docbook-to-man debian/vbam.sgml > vbam.1 @@ -50,8 +50,6 @@ install: build # Add here commands to install the package into debian/vbam. $(MAKE) DESTDIR=$(CURDIR)/debian/vbam install - install -c -m 644 -D debian/gvbam.desktop debian/vbam/usr/share/applications/gvbam.desktop - install -c -m 644 -D src/gtk/icons/gbadvance.svg debian/vbam/usr/share/pixmaps/vbam-icon.svg # Build architecture-independent files here. binary-indep: build install diff --git a/debian/gvbam.desktop b/src/gtk/gvbam.desktop similarity index 91% rename from debian/gvbam.desktop rename to src/gtk/gvbam.desktop index 4caea54a..8a471a11 100644 --- a/debian/gvbam.desktop +++ b/src/gtk/gvbam.desktop @@ -6,5 +6,5 @@ Name=VBA-M GenericName=GameBoy Advance Emulator Comment=Nindendo GameBoy Advance Emulator Exec=gvbam -Icon=vbam-icon.svg +Icon=vbam Categories=Application;Game;Emulator;GTK diff --git a/src/gtk/icons/16x16/apps/vbam.png b/src/gtk/icons/16x16/apps/vbam.png new file mode 100644 index 0000000000000000000000000000000000000000..1390add4e0599b1cbe46703b5c0846857c6bae4d GIT binary patch literal 594 zcmV-Y0v{o-n)e96$1iRQRXakS5vm3A(b~?8|1bWD|GpKR^e?(#it8 z{q0;EnBrYwg7op>n)Bx;Z_!cAa{BCErp8tQkbYR9x4#{L;k(BuyWeSSh}E zMC#2rJGL`D_dXDZ+lH=(DjKRcwW@8~VN0sT%sA<~m}Q~q8bSy>&&RF0EUqqlD}`0J zR4Qv#*NaK1-xL6S^l6{=IF24^t(uTIgvdovm{KTHDJ7+lRUzaCit$JV^5REUePy#N3J07*qoM6N<$f}&^-;s5{u literal 0 HcmV?d00001 diff --git a/src/gtk/icons/22x22/apps/vbam.png b/src/gtk/icons/22x22/apps/vbam.png new file mode 100644 index 0000000000000000000000000000000000000000..10c5cba05f68c2b67260b139042f857460076f1e GIT binary patch literal 935 zcmV;Y16cftP)nd8bi}D87d4SvVyQhK}AJ~pi~vO_jm8}Jg3DFv>3)s?fk-L`5ex9&W8iH@_$DF#>Y<&xFAof$Q^8j;i89Z>duetcgk6EYI)SFK@r~65c5x1f27H z`PFyT=C{A>v#FGQWO%5`#ozy;@#kf7nG%BV@z_U{?>|6!g?~K${RfoYAPR)wv6XpN zSIRa{#g7_6w&Zge>XU!)Cydv=**VC}dWowa}#J93h^=6x%%b?0PUAP}yQa z2x~jZJkPwgo%0hH*z?9H*V`?+E}@Xmu1ME)u%!id?HypT?K$z`6rx3f>RKCurpx(0 zjvoGzJ+F^)RW@Rbp;*YSsFaG*na%Lc(J4rZIA`e}$f7~hRv|6Mkh5z!cIa0s zg#lCrfI=a2Q(rY0np1)1T%E-Ac&L9ARnk_BTHk}2*(OQ1OEdi`ck&bfKfM1YBC>oz zRZy6lZ*y^~1_-gSxI~dityLvX7Cjok2ZvF`dnIMEw37u!?%GToMZ|H;Y_mnrIgE{{ zH!hKiGE1tdU?WSVP{Di9ps}??KaHQO?bx|~(yMt~5Pi%jgvD$IY{&tRzTf_$k zKx8Z#o24&zJNIpRjMb$gYx+mXXLBe}yVOuC_Gj5S{OV@0sV`LgkQn3BHueMSZezpx zYPzqyirB`eg2>V&B7z8b4YcO2(U_j@)n_h+#Py=!LS!VWsp~#2EZvJdP$;DO*Oc>v zL&eWqT=?Yrjf)fQ?#wLE2IiOB zOa!F)OoKGgpA_zwkFz=vMyI{0%7ee#X1xGL`@U002ov JPDHLkV1iAc%eVjl literal 0 HcmV?d00001 diff --git a/src/gtk/icons/24x24/apps/vbam.png b/src/gtk/icons/24x24/apps/vbam.png new file mode 100644 index 0000000000000000000000000000000000000000..b19688ffce8fcf5e26a2a220de9c873048039af2 GIT binary patch literal 1640 zcmV-u2ABDXP)7fK7=1H4ySCTABqSkrLrhYU28SqWt5iY=+Da8YfCLB-LP(&(1(2F6 z2o4oeZk$@d4Iu;-7cNv)L7=J?LZ~GzKLJGe39(7+1h6ql*0Fazv(v+9;}m*m(^IRw zgFnk&&3td(``#?DfCVhzKMnHc4?{ykLpN{6AJwJTPs&~cJ}mKyhsQkgh=@ofmAA$+P^;(TCrm3(&px3acnG|e)Wnm zLI?o>DW#MW&@{$04cNJJ`}TF~fR2vN&XyL{5T(GAC&R_DBALnvXo<4o{><>Q>A_V6`0IE^7F93K%vsufs?Nn-TaB%S0 zu~Lb71OfruW^C84*49KKkzj1!zAwJmy0zB0M}$&MBLuj5_4@Ve*MV=o>F@9F2P~^n znVPCS&$;VXt8-6Wt-u(ix(@h!j0FO~wry+I?%qwvS6>}DvS$w<1m}vJ>$)z$xgvDs z%8x((`fDPQ&;Rnv-MhPXsZ~#$m?dBshQZh;pR~0llZgZ{GV%_4EK!QT^R##n6WQh-uQDFwpeP$&?Xe+){gGNn=}6#RbR=bz7< z$>jjRw!>jH1B?MpP4Rdj07$9&e2akcp3g^!YRohlYiIz@o;`Z>-aQ}|3x(owHKb%t z_yMjsk|EX@39Q_*4orrfG~RE{*NA)2Gl#cDb|I-1Q&$rvGw4Gzva$NSRT+tzmA!1CpUFlHE+E=fs<5Xq#P2_bww z#&lhXc)YQ3$r7NYrMWqg@cHWNqtQi+09|KH*K0SYcj0@Ac^31GCWO+sSe%@E{Tj$- z$H&LVtJO?qVq$dEb(Qxu&2>3%oMQ2(p9+QP>EYq;zMGnwo*o%_{MfP_XJVpIQ2khzs-@Cw zhW)dw@Ltvoy3?db%ao=>$QBMln}-^w{6ag#n-PVCSJX|b?fCz m^{?anbydD!zycQVKgJ)};0{AqNqZ~+0000{5X literal 0 HcmV?d00001 diff --git a/src/gtk/icons/32x32/apps/vbam.png b/src/gtk/icons/32x32/apps/vbam.png new file mode 100644 index 0000000000000000000000000000000000000000..63952932c4e2a0448d3a939b357b1ba880db7846 GIT binary patch literal 1614 zcmV-U2C?~xP)0QUg^`@cGT{#)OT z-}`;@Xxeq(&YhdMn?a2+^-|e>|KpGEeet>P9qs(LzOwN*oI88!n;>5RYCvguv0M7i zH-4>K#>eIH$7Z9csZkJUwYykjh~okP-6SK9LPP`6nwgo&)&Y*}{rWQ^@`J$0&>D}bA|m?PCm-`4d1$w(UsL5rNUkGUL-joIH6h|HZHVU;tU4r7B@)7t*x%#S<5v|E0|C zdG~lzx-r*czEbmdqil|mw4$nFY(VCe`h6GLDk{aS7?DQjdUP!k+8$d6=PGj{N4`jP>nxVNx z6nZ_+{Eaqc9f^QZ3yc+P7+znzL^P6c;A00k^N-(BU+OXvJwPX2rD80FD7+)Ue+mr^ z_4*aUY?M(u3e~<#hd*7VJnmWeaTtimn6<`Cfs>v4hxpL`eW+JH_sl0b@#i@%A4^E{ zF4l%bn*?ySK%>*ZIi*yyOztvV{#!<~*`hRDLA?-~aH|a@*itN(IQ!Q{-g)yhPaXXP zFZ}Q)^cHGtEzRQ8VNF0(*c?D+EvZj&xw30EB;L{@X_c9KrOTPHN#64m!omkE$V9PF zL|04H8;hL$%W0DOFx!R>qaHvoHrTWS9UFiu&MD`QciH~o3fIoJaZXWDs*@qkyAiAC zs5O?Xn^E<-h6`Gv|+Q~B8#`jXJhU9r( zwW>O7j3vvuWIe~y>I&9|grOsfilFpA!DazW|Cn*kb7k=yt!|6lr<4lAg7QaJiCZ z8O?SR=W|AUM727B2rOKDhwjq#O#yV4>L8#BUNekDI87OgA0!BbJac`g0x@SAjitlG z6D5`!Fg>yZ@0HG#gpMd%O1rpr^AhpmRf0em8yR88_HCp|N*qUY+Fi0VrRN+=D^1$1 zHcmZhFK0a70l;wSgH(!D%Fz&k5o+Tx^NUNEz?_rWJ(p*`kv9!p|`5T>^^9@PTELK(ZUb8@CF3Xb_PF?)bi$Z_v zjt7d??rY_plVg>Ahs)8#M~j8pVI|nAsun;*Tp;3&wHg3kRa8CBsVFL_1|lqHdF$;~ zQa`@jzI0-7_5Ax@^A3;z>7Y$yaPEgd@ivHPg9>Y{4dRlu#j*|Jk~MJ*5_rvXuX)e= zJn_EQ&3)3zUAGNngJc_(4Afo+SPKym`ej;p8%SaB-VPiy^y^6(NC)zO8z={Q8xp1i zpiH&D$HHwT*`1=#wVrHEYX$8_fLo+@G5B2p{6FKKm*w{X?m57}0Pj4@cTMx0D*ylh M07*qoM6N<$f*5cI>Hq)$ literal 0 HcmV?d00001 diff --git a/src/gtk/icons/gbadvance.svg b/src/gtk/icons/scalable/apps/vbam.svg similarity index 67% rename from src/gtk/icons/gbadvance.svg rename to src/gtk/icons/scalable/apps/vbam.svg index 764018e7..4201ae94 100644 --- a/src/gtk/icons/gbadvance.svg +++ b/src/gtk/icons/scalable/apps/vbam.svg @@ -1,9 +1,8 @@ + sodipodi:docname="vbam.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + + + + + @@ -117,18 +132,6 @@ offset="1" style="stop-color:white;stop-opacity:0.32738096;" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - + showborder="true" + inkscape:guide-bbox="true" + inkscape:window-width="768" + inkscape:window-height="715" + inkscape:window-x="3" + inkscape:window-y="24" /> @@ -593,14 +450,6 @@ id="path1963" d="M 6.000792,13.525998 C 6.000792,12.10946 7.2516113,11.734835 16.353553,11.734835 C 16.353553,11.734835 6.000792,16 6.000792,16 L 6.000792,13.525998 z " style="fill:#d3d7cf;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - + sodipodi:nodetypes="cszsszs" /> - - - - - - - - - - - + sodipodi:nodetypes="ccccscscsccsccccccccccsccccccccccccccsccccccsccscsccccccsscccccc" /> + + @@ -728,56 +500,29 @@ d="M 8.2812376,13.012372 C 8.3759829,12.945634 8.5245971,13.170491 8.3841513,13.173806 C 8.2842055,13.065544 8.1069951,13.168576 8.1051174,13.319542 C 8.0683199,13.478251 8.3412394,13.495857 8.3019512,13.36617 C 8.2122413,13.38742 8.1758907,13.243915 8.2821091,13.245777 C 8.3790654,13.204367 8.4948775,13.286837 8.4186264,13.403113 C 8.361808,13.566265 8.1419242,13.638407 8.0357797,13.497932 C 7.9265682,13.30525 8.084229,13.007056 8.2812376,13.012372 z M 8.78068,13.097966 C 8.7854283,13.250493 8.8651993,13.399705 8.8205372,13.552578 C 8.7287553,13.58494 8.7218135,13.393417 8.6220858,13.448829 C 8.548988,13.427948 8.482094,13.640662 8.4334548,13.517497 C 8.4755469,13.38075 8.5594647,13.267037 8.611534,13.13516 C 8.6348907,13.055292 8.7614821,12.966313 8.78068,13.097966 z M 8.6060943,13.343957 C 8.6806591,13.368014 8.7517581,13.321977 8.7060721,13.230026 C 8.6928888,13.096964 8.6332272,13.321302 8.6060943,13.343957 z M 9.1586569,13.092212 C 9.1751966,13.150521 9.1607618,13.396998 9.2268395,13.257885 C 9.2476726,13.145859 9.4097207,12.911936 9.4472614,13.132226 C 9.4164099,13.267514 9.4703254,13.418906 9.4027372,13.540723 C 9.2955171,13.593854 9.3303127,13.378535 9.3346629,13.307647 C 9.3263156,13.202744 9.2726183,13.396663 9.2539083,13.429943 C 9.2346367,13.516745 9.1204188,13.626605 9.0970204,13.481831 C 9.0749763,13.435413 9.1026074,13.261461 9.0576717,13.288173 C 9.0232457,13.372817 9.0119354,13.57563 8.9087812,13.547326 C 8.8577848,13.410783 8.9859999,13.285473 9.0007197,13.149064 C 9.0262517,13.063448 9.1092521,12.952412 9.1586569,13.092212 z M 9.5534932,13.081423 C 9.606906,12.993451 9.8271092,12.985524 9.8054445,13.119487 C 9.7518467,13.150262 9.565947,13.132842 9.6517005,13.247577 C 9.7084972,13.23141 9.8312879,13.276662 9.7373703,13.340426 C 9.6814844,13.338104 9.5226577,13.398399 9.627336,13.446367 C 9.7214497,13.400339 9.7821052,13.576949 9.6586785,13.565292 C 9.5746335,13.580012 9.4189177,13.567605 9.4895884,13.428103 C 9.5099519,13.31232 9.5323132,13.197012 9.5534932,13.081423 z M 10.190936,13.092212 C 10.150391,13.241461 10.161966,13.416032 10.070261,13.542222 C 10.001771,13.641343 9.7860777,13.501015 9.9087179,13.430716 C 10.047878,13.494488 10.04941,13.29367 10.06194,13.189541 C 10.048852,13.111211 10.177144,12.931061 10.190936,13.092212 z M 10.486682,13.011653 C 10.631536,12.991601 10.714144,13.20304 10.653228,13.336714 C 10.607116,13.508869 10.411218,13.642475 10.267595,13.533379 C 10.148505,13.419497 10.197524,13.19901 10.302505,13.094649 C 10.352067,13.042515 10.418572,13.008918 10.486682,13.011653 z M 10.404117,13.456164 C 10.525797,13.45504 10.608024,13.244097 10.514219,13.148682 C 10.412208,13.07816 10.303932,13.226739 10.311896,13.340202 C 10.312843,13.395712 10.349855,13.462774 10.404117,13.456164 z M 10.820757,13.059844 C 10.83026,13.179691 10.937109,13.198717 10.962444,13.07466 C 11.016274,12.985057 11.138503,13.073888 11.042356,13.148429 C 10.955015,13.243735 10.86972,13.36294 10.869464,13.507752 C 10.781575,13.654001 10.741763,13.403793 10.798948,13.335874 C 10.804105,13.231275 10.635256,13.09755 10.770782,13.031303 C 10.790446,13.025234 10.814069,13.036741 10.820757,13.059844 z " style="font-size:4px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#d3d7cf;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:MgOpen Modata" /> - - - - - - - - - - + + + @@ -795,21 +540,21 @@ + sodipodi:type="arc" /> @@ -826,25 +571,25 @@ transform="matrix(0.491085,0,0,0.523479,-8.013891,51.88914)" id="g1599"> + sodipodi:type="arc" /> @@ -930,5 +675,162 @@ width="16" height="16" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/gtk/main.cpp b/src/gtk/main.cpp index 7a655006..22e4531a 100644 --- a/src/gtk/main.cpp +++ b/src/gtk/main.cpp @@ -87,7 +87,7 @@ int main(int argc, char * argv[]) exit(0); } - Gtk::Window::set_default_icon_from_file(PKGDATADIR "/icons/gbadvance.svg"); + Gtk::Window::set_default_icon_name("vbam"); Glib::RefPtr poXml; try diff --git a/src/gtk/windowcallbacks.cpp b/src/gtk/windowcallbacks.cpp index 4b7aae67..995e1f49 100644 --- a/src/gtk/windowcallbacks.cpp +++ b/src/gtk/windowcallbacks.cpp @@ -1251,6 +1251,7 @@ void Window::vOnHelpAbout() oAboutDialog.set_version(VERSION); oAboutDialog.set_comments(_("Nintendo GameBoy Advance emulator.")); oAboutDialog.set_license("GPL"); + oAboutDialog.set_logo_icon_name("vbam"); oAboutDialog.set_website("http://vba-m.ngemu.com/");