From 61067e9c3f7076b3b7f37f9b6527eb5d3bb7980d Mon Sep 17 00:00:00 2001 From: toehead2001 Date: Fri, 13 Nov 2015 07:30:34 -0700 Subject: [PATCH] Clean up the About dialog Logo resource doesn't need it's own special line Layout adjustments --- pcsx2/CMakeLists.txt | 6 +- pcsx2/gui/Dialogs/AboutBoxDialog.cpp | 88 ++++++++---------- pcsx2/gui/Dialogs/ModalPopups.h | 3 +- pcsx2/gui/Resources/Dualshock.jpg | Bin 24231 -> 0 bytes pcsx2/gui/Resources/Logo.png | Bin 0 -> 6268 bytes pcsx2/gui/Resources/rebuild.sh | 2 +- pcsx2/windows/VCprojects/pcsx2.vcxproj | 2 +- .../windows/VCprojects/pcsx2.vcxproj.filters | 6 +- 8 files changed, 47 insertions(+), 60 deletions(-) delete mode 100644 pcsx2/gui/Resources/Dualshock.jpg create mode 100644 pcsx2/gui/Resources/Logo.png diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 3ed249db33..939b8d53f0 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -371,7 +371,7 @@ set(pcsx2GuiResources ${res_bin}/ConfigIcon_Plugins.h ${res_bin}/ConfigIcon_Speedhacks.h ${res_bin}/ConfigIcon_Video.h - ${res_bin}/Dualshock.h + ${res_bin}/Logo.h ${res_bin}/Breakpoint_Active.h ${res_bin}/Breakpoint_Inactive.h ) @@ -646,10 +646,8 @@ include_directories( ### Generate the resources files file(MAKE_DIRECTORY ${res_bin}) -add_custom_command(OUTPUT "${res_bin}/Dualshock.h" COMMAND perl ${CMAKE_SOURCE_DIR}/linux_various/hex2h.pl "${res_src}/Dualshock.jpg" "${res_bin}/Dualshock" ) - foreach(res_file IN ITEMS - AppIcon16 AppIcon32 AppIcon64 BackgroundLogo ButtonIcon_Camera + AppIcon16 AppIcon32 AppIcon64 BackgroundLogo Logo ButtonIcon_Camera ConfigIcon_Appearance ConfigIcon_Cpu ConfigIcon_Gamefixes ConfigIcon_MemoryCard ConfigIcon_Paths ConfigIcon_Plugins ConfigIcon_Speedhacks ConfigIcon_Video Breakpoint_Active Breakpoint_Inactive) add_custom_command(OUTPUT "${res_bin}/${res_file}.h" COMMAND perl ${CMAKE_SOURCE_DIR}/linux_various/hex2h.pl "${res_src}/${res_file}.png" "${res_bin}/${res_file}" ) diff --git a/pcsx2/gui/Dialogs/AboutBoxDialog.cpp b/pcsx2/gui/Dialogs/AboutBoxDialog.cpp index 2f21e84c00..0a26df4e36 100644 --- a/pcsx2/gui/Dialogs/AboutBoxDialog.cpp +++ b/pcsx2/gui/Dialogs/AboutBoxDialog.cpp @@ -20,7 +20,7 @@ #include "Dialogs/ModalPopups.h" #include "Resources/EmbeddedImage.h" -#include "Resources/Dualshock.h" +#include "Resources/Logo.h" #include #include @@ -31,15 +31,15 @@ using namespace pxSizerFlags; // AboutBoxDialog Implementation // -------------------------------------------------------------------------------------- -Dialogs::AboutBoxDialog::AboutBoxDialog( wxWindow* parent ) - : wxDialogWithHelpers( parent, AddAppName(_("About %s")), pxDialogFlags().Resize().MinWidth( 460 ) ) - , m_bitmap_dualshock( this, wxID_ANY, wxBitmap( EmbeddedImage().Get() ), - wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN - ) +Dialogs::AboutBoxDialog::AboutBoxDialog(wxWindow* parent) + : wxDialogWithHelpers(parent, AddAppName(_("About %s")), pxDialogFlags()) + , m_bitmap_logo(this, wxID_ANY, wxBitmap(EmbeddedImage().Get()), + wxDefaultPosition, wxDefaultSize + ) { // [TODO] : About box should be upgraded to use scrollable read-only text boxes. - - wxString LabelAuthors = wxsFormat( + + wxString developsString = wxsFormat( L"Arcum42, avih, Refraction, drk||raziel, cottonvibes, gigaherz, " L"rama, Jake.Stine, saqib, pseudonym, gregory.hainaut" L"\n\n" @@ -54,62 +54,52 @@ Dialogs::AboutBoxDialog::AboutBoxDialog( wxWindow* parent ) L"%s: CKemu, Falcon4ever", _("Previous versions"), _("Betatesting"), _("Webmasters")); - - wxString LabelGreets = wxsFormat( + wxString contribsString = wxsFormat( L"Hiryu and Sjeep (libcdvd / iso filesystem), nneeve (fpu and vu), n1ckname (compilation guides), Shadow Lady" L"\n\n" - L"%s: ChickenLiver (Lilypad), Efp (efp), " + L"%s: ChickenLiver (Lilypad), Efp (efp), " L"Gabest (Gsdx, Cdvdolio, Xpad), Zeydlitz (ZZogl)" L"\n\n" - L"%s: black_wd, Belmont, BGome, _Demo_, Dreamtime, " - L"F|RES, Jake.Stine, MrBrown, razorblade, Seta-san, Skarmeth, feal87, Athos", - _("Plugin Specialists"), _("Special thanks to")); + L"%s: black_wd, Belmont, BGome, _Demo_, Dreamtime, " + L"F|RES, Jake.Stine, MrBrown, razorblade, Seta-san, Skarmeth, feal87, Athos", + _("Plugin Specialists"), _("Special thanks to")); - // This sizer holds text of the authors and a logo! - wxFlexGridSizer& AuthLogoSizer = *new wxFlexGridSizer( 2, 0, StdPadding ); - AuthLogoSizer.AddGrowableCol(0, 4); - AuthLogoSizer.AddGrowableCol(1, 3); + wxFlexGridSizer& boxesContainer = *new wxFlexGridSizer(2, 0, StdPadding); + boxesContainer.AddGrowableCol(0, 1); + boxesContainer.AddGrowableCol(1, 1); - // this sizer holds text of the contributors/testers, and a ps2 image! - wxBoxSizer& ContribSizer = *new wxBoxSizer( wxHORIZONTAL ); + wxStaticBoxSizer& developsBox = *new wxStaticBoxSizer(wxVERTICAL, this); + wxStaticBoxSizer& contribsBox = *new wxStaticBoxSizer(wxVERTICAL, this); - wxStaticBoxSizer& aboutUs = *new wxStaticBoxSizer( wxVERTICAL, this ); - wxStaticBoxSizer& contribs = *new wxStaticBoxSizer( wxVERTICAL, this ); + pxStaticText& developsText = Text(developsString).SetMinWidth(240); + pxStaticText& contribsText = Text(contribsString).SetMinWidth(240); - pxStaticText& label_auth = Text( LabelAuthors ).SetMinWidth(240); - pxStaticText& label_greets = Text( LabelGreets ).SetMinWidth(200); + developsBox += Heading(_("Developers")).Bold() | StdExpand(); + developsBox += developsText | StdExpand(); + contribsBox += Heading(_("Contributors")).Bold() | StdExpand(); + contribsBox += contribsText | StdExpand(); - aboutUs += Heading(_("Developers")).Bold() | StdExpand(); - aboutUs += label_auth | StdExpand(); - contribs += Heading(_("Contributors")).Bold() | StdExpand(); - contribs += label_greets | StdExpand(); + boxesContainer += developsBox | StdExpand(); + boxesContainer += contribsBox | StdExpand(); - AuthLogoSizer += aboutUs | StdExpand(); - AuthLogoSizer += contribs | StdExpand(); + // Main layout + *this += m_bitmap_logo | StdCenter(); - ContribSizer += pxStretchSpacer( 1 ); - ContribSizer += m_bitmap_dualshock | StdSpace(); - ContribSizer += pxStretchSpacer( 1 ); + *this += Text(_("PlayStation 2 Emulator")); - // Main (top-level) layout - - *this += StdPadding; - *this += Text(wxGetApp().GetAppName()).Bold(); - *this += Text(_("A Playstation 2 Emulator")); - *this += AuthLogoSizer | StdExpand(); - - *this += new wxHyperlinkCtrl( this, wxID_ANY, + *this += new wxHyperlinkCtrl(this, wxID_ANY, _("PCSX2 Official Website and Forums"), L"http://www.pcsx2.net" - ) | pxProportion(1).Center().Border( wxALL, 3 ); + ) | pxProportion(1).Center().Border(wxALL, 3); - *this += new wxHyperlinkCtrl( this, wxID_ANY, + *this += new wxHyperlinkCtrl(this, wxID_ANY, _("PCSX2 Official Git Repository at GitHub"), L"https://github.com/PCSX2/pcsx2" - ) | pxProportion(1).Center().Border( wxALL, 3 ); + ) | pxProportion(1).Center().Border(wxALL, 3); - *this += ContribSizer | StdExpand(); - *this += new wxButton( this, wxID_OK, _("I've seen enough")) | StdCenter(); + *this += boxesContainer | StdCenter(); - int bestHeight = GetBestSize().GetHeight(); - if( bestHeight < 400 ) bestHeight = 400; - SetMinHeight( bestHeight ); + wxButton& closeButton = *new wxButton(this, wxID_OK, _("I've seen enough")); + closeButton.SetFocus(); + *this += closeButton | StdCenter(); + + SetSizerAndFit(GetSizer()); } diff --git a/pcsx2/gui/Dialogs/ModalPopups.h b/pcsx2/gui/Dialogs/ModalPopups.h index 874340b4f6..14da06dea6 100644 --- a/pcsx2/gui/Dialogs/ModalPopups.h +++ b/pcsx2/gui/Dialogs/ModalPopups.h @@ -61,8 +61,7 @@ namespace Dialogs class AboutBoxDialog: public wxDialogWithHelpers { protected: - //wxStaticBitmap m_bitmap_logo; - wxStaticBitmap m_bitmap_dualshock; + wxStaticBitmap m_bitmap_logo; public: AboutBoxDialog( wxWindow* parent=NULL ); diff --git a/pcsx2/gui/Resources/Dualshock.jpg b/pcsx2/gui/Resources/Dualshock.jpg deleted file mode 100644 index 12ccd2cd2cb712268256a7dd75cf13f3759484ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24231 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 diff --git a/pcsx2/gui/Resources/Logo.png b/pcsx2/gui/Resources/Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..d9a8d2502508eb06c9b8d324c1d3109638ed5e97 GIT binary patch literal 6268 zcmV-?7=!1DP)&xro!|ZP z{lg!4;e{7oc;ST?UU=b!7hZVbWn{_v^1Bn9#a#~T3UBP#EbesQP|)GICcoWxwdgIJ z@PC)04$oEee}1R?nxdO7&XU`<8!GRa42Dh{DtkvcOYT^Hi}_G~-(bGVSS8oX5ka~V zoKXMu#kZVY%6m+=)I9hjU$VULVt}|@y8j6|pIusG`_i~7unsQ)i}QtG9+VGXBj(6K zf6qOa4-10}WdENlfO%oXU>Q>ZHmMC=t3(~1#v%$ABnBb?o8*SBMNt(nH&o2zH%CdI zcl46$HV<{P2or-Q317K2?{Q?+wxx4A*&P=W>{QtWT)dN2XH}bAQRn6j&CR39G^jVO`QC*q-0&yDI<24!)Fm;blOr zhrW+C6?VE`ef%?YKL5=iIEIN}=II<*l6<*uEp`hA)TKajSe8`(WY(!HCOt!SBDjh> zJU0$f7ih%DwQJV|w{G1M+_`f{(B0k5pr@xt?ceJDS6tI{U0WE{YsR)s*`~n+*>L~< zeZiwgj|5MjJ{7!p@!}1hKYuQG_Uze!Z0qXk(o2uKckc>*_~8d8Ph}klKmPb5qa%f( zUkXRpl=1lSW5I(5516!W-n^+*=grthUzybw>x49jX!;BLdFxM-NNzV{{2z&FIU`1xL=eFv;kAAo0P*PIjT2)mg zg(%WDJ?G9R#sN#%GQRarY274f9cXCF+NX?dVgEc z>248T3TvZ^;rg@R41(m=BN($glxayU$L@w(HM{=53zEt5)W-IiCo{qPXdKk{y)amp zEpeqVKdc0taIjTVz8xJMg3iuPouF`of$P_=3kH=O+S}U&<>lqlwEX^33LzxV*{7;77B$xI#Ffs*Q_t=F5M;LAg|U0X!7NY&YqDE}hc9cNN!VP~JIX$zsd{!m4va-|DM6AkREISo zIq;QFD%d60Kl!e*$5b^>B6@lr#l^)^T@Z`K(xRdwX<=cZQBhD(AkELur}V}8ym<7I z-rimTwjiW&adE&^q^GA#u`qO!1iozrxw*NVwuPRxHiBquY~*x#P-RrxiomHsi>OK% z?-38HgEFD@>1%@^Y`F)Y?FxnYI2*D>)E1-Zd2Ok_|A|9pi;!ka#=D0z@eIxTPIkzfbuNd13J zc8EkGF_-m^j*bR=E2@24trT^-&yOgFF$ZJe`?wNlMrShw$3+cbvNr;jh8KftQM<2d zep_+;V^vOD%)IkO@P%6_q$4>PBhN4QN5R}M34AN+-?iX+`H+4_B?ua%%E`%*1_uWN z*O8T#rO|l0Hxg{1XRT=<7MqK%QBhGNx*Y6t+kNMTm4eB>Xz)d6YeJ_p1eC_4gVC@o zstie@!}CDBth=!p*Ium3y&kXt#|TW^BaD{U7keUL&iP_kk#jvjUHK3}a=C006BD7b zveMP41d)-EAw7NiG;kfHr@Dbl8ju`GHqfk!y0S=3O%;y>8)9Q)rPvM9*a}*X&h>Rj zG2?7Lc@5C`<7j65if&v#z{vtTjU zX12wwuj)VUF;dEh^fW3#Bqb$DeSCa?>!6B>gFXE!CeC<_7#m1WbyJ5ll{r#uIC0_x z*`e_*wHBSr4yQiNf{WlYw+nElv=uI+6B>eV0);RITN0K*B3Oc5j@bdZFnV7ktUN0; zIPIk7doXr?B+Lpb0Go^!p;Kl5Db355FaImrEEy?v%xGf~L=Z7CG15ba4uLM5J$n`? z>|ns#+goS;0RaJ098K?MIL&gfvElIH!$dNJW&<09hli_mEFulI(CkXMeP$AY7q8kGT^gqXJHJEH;meP237>5GuIVi z29iGMH3kPaX9ngYIW&vbpx&Bn!m_gq3=EWpgoH@Ze(8k^7Z~7m8vBw)Mn(=8l!hWb zWzcm6{QdobP5q!U(l%bFH$jjhyLayfZ8&r04B*>atUR|%Q=|ih>ijWIrHOUv;Opxv z#paVh-RuP$8}K0mg>PwT`9Lu@ZHNuZp!sOk{}tD05n5|&tKjO@s~QXK#*G`SZNT*% z7O1~k8z>zj8wKcp)p>Yj{q#XwTblr%oqz^}+0?ByWxb=8q&JJEpAo@moVJX+dJn46 zk=fu9;qhyzQbHwSirabklY<9L#@|Yn`xO2X%k&AP&*mANgLFOBa(!5N>jDzsT}wc-~6%Y zlvOH@U8RNyDiGz5UPGA*@_Jr^rB4F$t9p;ZSIFa6>c}Ib^D&s9J~MDZmQCuFrnP1I zt=b$8!IiKdu&pCRWJV(hYPxUOumQAz!r=7Qpb-Q%ix`5?rUTulaH?@}`j@p0wEUQ> z1i{vZL0>&*WLYJ-JHaZsv3;t47EHwMhUo4~C?^6?19J3IgalFYgABzipa?6G$7cvb zLmrg>OwWrj?L;Q-`)KHLD($}zii<*Zmu(#(pD-Fh;GmP#(a{mKfx_VGtwF1p*oPC~ z7=czj=sty0jZ1p5wSo2-aIx^o>Dk&qP5qI!od28RZgb1T%Y9S)gfQJR7IM)^OVL@C z!H@!?7$HVyFOsA1p$r8Ne^U$QzEb#Nc{&VPsN_NUPRALMDaSKlal++3#}dPKjt(_J z47sloK~U4(-rgRxfx_TC@Ss)9(9lr9fddD$>OuD@oSMZetZkq%7cLe)IXzn&Xgp&i z?)h;LcbhMauYWShHyx%OiiT|LCX^_X!Xuf37a;N<${<4IAqg;e@EhbRf&N$A6Fqzz zhvE}qh#$Qr3j*aw`A+mn1Bj?RT(FnrR(^G0=V*}cN&3js< zWjBZf5kz_D(&7C1^Zghf7ay^*fx?izTr7MVz+_tv^8P5ZTa#KuM0!u2Jb7pLregOf z?arionn3Xhv;&nuY0)zx(2h>p@o7vu?F(<)T3oDw@m?t~=U6-x5h*;9IduLH3PN}d zIS*vWMiR&(^x+;2HK6NspTa5P69r`KpQX&^=(#C9GsGzcl`MAAY;ML&#%zU&5g-Jmkv0Su};+n zocCpG17`_>rlr`HgB;SK!oGd`#5lEQwAFdb3vM~ji@pTojwFF?Q1%;Q$dwaA79tZN zMCT`D$dP`(KNR;AVKe3NDVj zPX_Dq5k);GpD-FhtY5!gYGPsn+CYOJxQvq_h&5~0L?A%dV2M7kva*87lPANtapN?C z!eRfaA3@+o6;?J-7_Jfot>s{2gSO{07%(+81w~nJ-n?0CtT)rL{F^T3kyT)FC=Qkc z2qEX8GBMyR10o$AKJ~r~DN0E0efNJw7z&@x5XI}aM1kop#q`H{#KVH9N}zlV)g9N; zeC*`pBsOOKXN&ps=L4I1o|l(5v;;w6aEkF`ii3+q{)Wo_zlDW`PGyY=dO*0d)AW5L z2wF)=`c0ZNX-J=`K0y7LXQ!@@_gM{$b0;Gd&YysYzxNx&X#w3&P$CS9PwBWMRl%Q~ec>y=3|N|SrOByW^D0R; zg46sAIV@PPfV1UeXJ@C;Pll8rhLR-ctx6RWiNN)JCJ5ZpZbNobv!1IJaLkx7Oj+QJ zmQmIYEKX|?PWI1+Kd(Ch|K;QZ+Z!Ii&ej+3UCRsDj&N;$4%-l05nI$?tNcENqwo}u z;%~Zi4?bLZ7(Ur}5@?Z@t*|xGP+f@_xlG`SveC4he?USG!`8XT5mnXX!Ip^^O!7_zD_Zklz-mc4$cO3= zIU$$H!C0+3qY(rN&Tjnox^?Rw4aT61v$Jz64oqsTjPFYeLLvM2?~hm5&&3K!bL|HY z9&9yeO+;DWM^@N+n06)~{^EKLmM7J~f$J|}A3FA4#BOx*U2=!tLC!D7cS=ycPT?p# z#iRI?4y8xwj@l6{-;9MjH7f@8A)K_dG*)$NI6yCFIXOs($T&w33c)#AKU}0CF$Rtv zJ?e+~*|4$UeIp2Yg>_|R=7QV7m*JTUvxCL(sarU#Os;{W z9WTM7{Usbir`|7j@V(R$KpaU zHkj|Ka{W)JzIgE>>)AfSP?j6cs7SCS|NWp;L}L=faLM~f5X!R~G$KuBUf?cH0iH`B zpo4ief$r0q3JT8#wY9ZOx`+=j{^uSZ9uc(IW-y=S`n>A_mSM#(dT#`*M&~_#;}!UH zzJg;Nuig;FVRZ0=hy&MU4zC~$cO@vuU_aAZc)^4}tV9fy9;Hj^uR;>~9A`7kkR+^y z*Fx;e^dkwjb&SXX-{KbZJn6aWDhs+#Wu^<7%GqeM6+A(VOoA9{!9{TPYzE@!S@!ky z>HRF%Avr8Yav0|x0gfrPaPsCW2L9;8ehA;rm*7RtjZS_<4o`G`55!?LpzCyB5tian zd`gGXqjVK{IHt%*V&*w9EEcxKtk8ob^r>UG;_-v`rb7JQ2!fUq^E9AYuzUCMU=YO4 z+6RAh&bt<(AcwW7wQ%;X&c=9sD@Lw?hUWgm=e_e(>pd8-~JDJc>{0 zP8Zl_3c+LlVn$kc6If z>_2#d7=Z*q6`#V(2j%n{%rgWukVMCdu{n{8jx(dM6sNkn+Ms+D@wKI+G)Va&4u1U! z2PxOG9i(JK5SGI00j9wv@HZrfE$Ec7JwNG0O!rR^jflJ>LxhrJAE~|#pE&!#j=ZaH zu0_bhMakn)d^Y)zK7VzKfT=_hY1cyRB$`P=pE`!SX}_Qs5q+PPW_sv3u>tuafp*za zOPA7M3kpy94P;#Cy(b7RPeG|-_3G6cSGm!>;nYpvX-@hon^tnj?C>-VDTPnnqhWhS z9VFfTSuZ5?$Ph0_c;{0XyE7O*TIs=%gkSBQH}@1__05Cyl95C)SZE;$eF%cfbxdy| z#u@1ZK?m7#brFj)rca*^YuB#rQ)h!>Hz!wD>L~*k#nItCT375@W_7wx4=sbw_Q!%_ zWD%tI{%jCpZ#;#`?iZLbjIWL)z=Q+Q@WppQaJue}!D)Xll##?&3`w-b*s383wgkbI z&02KOtq#K<3_-x)Ed7tNeiQpKsarK z!VYcg{VlU@?3fW&0iPeZ2-c@FAp8C=1|jLzGx+L26ihsp0t>=QVM$!=|5`>?z%)N0 zeBl-bLG|4R=i!!F52J`A0>!W(jn+xLyW*1SJ{vz7ZqSi)TefTw8?^=D;^HFJbuIvf zQFo#=heqE+H*MMk6DCX;@-q|IV9}yQ^bB9(K_362$p+jE=SntAojR41HV~FATShGi zvDTIYk;B1wSQ?N41rL5P2Bbqq>`u zYqDdzwcXagG?XtNF4Af`C9w|}^8AW(~j4vV2WfZtqDPY&6g?lUeRIUI_I z3!HQe%j5I`jT9*fv{`WE-@ZCsJ8Oih;G}?i>`r5Ua7F^d=At+{?%Zt z2+V}f4<*9%@G4l8qx}p?tAZX=vx}Ge#`FfoI03xEEyI>R)S^bzz&#Qj3i+mTmNLDUly4ACPU5r=L6QK4RH+-+j76lNj&nt zqrnR=!{36yFJhml>8=i_ya7IiSHUB*7WSo7z@7vNxW$)%TU@bb;QhTxWpE(93if5x zz}$cwSdmco^SVOAj;8+yb~olFG`3GWTLhLtc}&{7lgnXOyaaY)zB@1W$M*!fM>;2! z!``%NIF#22UXl(tS$DV3u5e_1g^L$nI3t^jZ`-cUXsWh}se*;UgwcadEP=_VL@@q% z7SI^QSnqWC?^~F7Wx$tS>F_1~J=zz;oy>>H!DTQD2S4XyYi3FDz>ccpg%@5>TyZSI zrRbLPT09WODZ4e%F|$SZ2142IYW!V^=R&T?Xcp1mLXHq%UmS7Tq(k z&b{SKo5n0sTN4)~H;Ys;Kl!S}JgHe^me4GkjWA1U5za|zi!o2{bhpU8W4V|o2VQvL mg%@6U;e{7oc;ST?w(?KoqlhDzxYoY_0000dV literal 0 HcmV?d00001 diff --git a/pcsx2/gui/Resources/rebuild.sh b/pcsx2/gui/Resources/rebuild.sh index 6a4b060dd2..7ecec50a59 100755 --- a/pcsx2/gui/Resources/rebuild.sh +++ b/pcsx2/gui/Resources/rebuild.sh @@ -25,4 +25,4 @@ ../../../tools/bin/bin2cpp ConfigIcon_Speedhacks.png ../../../tools/bin/bin2cpp ConfigIcon_Gamefixes.png ../../../tools/bin/bin2cpp ConfigIcon_Video.png -../../../tools/bin/bin2cpp Dualshock.png +../../../tools/bin/bin2cpp Logo.png diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj b/pcsx2/windows/VCprojects/pcsx2.vcxproj index f878f6fd66..80a22e5bf5 100644 --- a/pcsx2/windows/VCprojects/pcsx2.vcxproj +++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj @@ -386,7 +386,7 @@ %(RootDir)%(Directory)\%(Filename).h - + cmd.exe /c "%(RootDir)%(Directory)\bin2cpp.cmd" %(Filename)%(Extension) diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters b/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters index 672aa9f2d1..c15e5101f2 100644 --- a/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters +++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters @@ -1380,9 +1380,6 @@ AppHost\Resources - - AppHost\Resources - AppHost\Resources @@ -1392,6 +1389,9 @@ AppHost\Resources + + AppHost\Resources +