From 474a404dfdd091f76d750bd8e88cfae586350831 Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Thu, 26 Nov 2009 07:01:24 +0000
Subject: [PATCH] Turn an ugly snapshot button into a pretty one!

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2254 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 common/src/Utilities/wxHelpers.cpp         |   2 +-
 pcsx2/Linux/pcsx2.cbp                      |   8 +-
 pcsx2/gui/Dialogs/ConfigurationDialog.cpp  |  23 ++++--
 pcsx2/gui/Resources/ButtonIcon_Camera.png  | Bin 0 -> 1415 bytes
 pcsx2/windows/VCprojects/pcsx2_2008.vcproj |  92 ++++++++-------------
 5 files changed, 59 insertions(+), 66 deletions(-)
 create mode 100644 pcsx2/gui/Resources/ButtonIcon_Camera.png

diff --git a/common/src/Utilities/wxHelpers.cpp b/common/src/Utilities/wxHelpers.cpp
index e496f2f062..9a9e71ad7d 100644
--- a/common/src/Utilities/wxHelpers.cpp
+++ b/common/src/Utilities/wxHelpers.cpp
@@ -108,7 +108,7 @@ void wxDialogWithHelpers::AddOkCancel( wxSizer &sizer, bool hasApply )
 	{
 		SetExtraStyle( wxDIALOG_EX_CONTEXTHELP );
 #ifndef __WXMSW__
-		m_extraButtonSizer += new wxContextHelpButton(this)	| StdButton();
+		m_extraButtonSizer += new wxContextHelpButton(this);
 #endif
 	}
 
diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp
index 43dbc4497f..4363bf97ff 100644
--- a/pcsx2/Linux/pcsx2.cbp
+++ b/pcsx2/Linux/pcsx2.cbp
@@ -405,7 +405,13 @@
 			<Option weight="0" />
 			<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
 		</Unit>
-		<Unit filename="../gui/Resources/ConfigIcon_Cpu.h" />
+    <Unit filename="../gui/Resources/ButtonIcon_Camera.h" />
+    <Unit filename="../gui/Resources/ButtonIcon_Camera.png">
+      <Option compile="1" />
+      <Option weight="0" />
+      <Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
+    </Unit>
+    <Unit filename="../gui/Resources/ConfigIcon_Cpu.h" />
 		<Unit filename="../gui/Resources/ConfigIcon_Cpu.png">
 			<Option compile="1" />
 			<Option weight="0" />
diff --git a/pcsx2/gui/Dialogs/ConfigurationDialog.cpp b/pcsx2/gui/Dialogs/ConfigurationDialog.cpp
index 19fd255d3a..1355dc7468 100644
--- a/pcsx2/gui/Dialogs/ConfigurationDialog.cpp
+++ b/pcsx2/gui/Dialogs/ConfigurationDialog.cpp
@@ -21,6 +21,9 @@
 #include "ModalPopups.h"
 #include "Panels/ConfigurationPanels.h"
 
+#include "Resources/EmbeddedImage.h"
+#include "Resources/ButtonIcon_Camera.h"
+
 #include <wx/artprov.h>
 #include <wx/listbook.h>
 #include <wx/listctrl.h>
@@ -52,14 +55,12 @@ void Dialogs::ConfigurationDialog::AddPage( const char* label, int iconid )
 		( labelstr == g_Conf->SettingsTabName ), iconid );
 }
 
-Dialogs::ConfigurationDialog::ConfigurationDialog( wxWindow* parent, int id ) :
-	wxDialogWithHelpers( parent, id, _("PCSX2 Configuration"), true )
-,	m_listbook( *new wxListbook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, s_orient ) )
+Dialogs::ConfigurationDialog::ConfigurationDialog( wxWindow* parent, int id )
+	: wxDialogWithHelpers( parent, id, _("PCSX2 Configuration"), true )
+	, m_listbook( *new wxListbook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, s_orient ) )
 {
 	m_idealWidth = 600;
 
-	SetSizer( new wxBoxSizer( wxVERTICAL ) );
-
 	m_listbook.SetImageList( &wxGetApp().GetImgList_Config() );
 	const AppImageIds::ConfigIds& cfgid( wxGetApp().GetImgId().Config );
 
@@ -73,10 +74,15 @@ Dialogs::ConfigurationDialog::ConfigurationDialog( wxWindow* parent, int id ) :
 	AddPage<PluginSelectorPanel>( wxLt("Plugins"),		cfgid.Plugins );
 	AddPage<StandardPathsPanel>	( wxLt("Folders"),		cfgid.Paths );
 
+	wxBitmapButton& screenshotButton( *new wxBitmapButton( this, wxID_SAVE, EmbeddedImage<res_ButtonIcon_Camera>().Get() ) );
+	screenshotButton.SetToolTip( _("Saves a snapshot of this settings panel to a PNG file.") );
+
+	SetSizer( new wxBoxSizer( wxVERTICAL ) );
 	*this += m_listbook;
 	AddOkCancel( *GetSizer(), true );
-	*m_extraButtonSizer += new wxButton( this, wxID_SAVE, _("Screenshot!") );
-	
+
+	*m_extraButtonSizer += screenshotButton;
+
 	FindWindow( wxID_APPLY )->Disable();
 
 	Fit();
@@ -168,7 +174,10 @@ void Dialogs::ConfigurationDialog::OnScreenshot_Click( wxCommandEvent& evt )
 		filenameDefault, L"png", NULL, wxFD_SAVE | wxFD_OVERWRITE_PROMPT, this ) );
 
 	if( !filename.IsEmpty() )
+	{
+		ScopedBusyCursor busy( Cursor_ReallyBusy );
 		memBmp.SaveFile( filename, wxBITMAP_TYPE_PNG );
+	}
 }
 
 // ----------------------------------------------------------------------------
diff --git a/pcsx2/gui/Resources/ButtonIcon_Camera.png b/pcsx2/gui/Resources/ButtonIcon_Camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..e698e2943fdfe71f474d8a6440b70574f924d936
GIT binary patch
literal 1415
zcmV;21$g?2P)<h;3K|Lk000e1NJLTq000~S000&U1^@s6)0X`50000ibVXQnLvm$d
zbZKvHAXI5>WdK)YWFRs%AWm;~ATls8IUq4MIx;ajG&CSBFf}kR616{500007bV*G`
z2iXf56)PJ>+?!nh000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP000Eu
zNkl<Zc-rNaU5Hd=9LAsXIiEW_JD>Y8&2H+tnkypfW~8vxl^93}5mcfUU4>WnaS>f?
zL{tz<7eW@K-Uv}aqG-0rDtfVGxwez2qpt4ejyf}EzRt(Y`R+dx#Rg7nUDkUz9M0jK
z_xFGP&-1<q_^%J<pS)Zs6gueA=Qxg+<2e1mr(X;&<SH**IDg^L?!CLW&fl6ndGNp|
zXa5y&-@bjGY&N?p6!Ir`?ASTr^>yrx#bS@MEW=xt*)S|ucU&&a3m(R_SwtdH7)HaI
zot-%-<+5*%kB@810*;N1#h!ic#qrfc!@GL=R(80K1;aG)%e6aLo$i8EYmm|+HVm&u
zZ!7@IVW8;_)VhWH1qq@*iJ6P%&K2e_?wpvIDE%#P&+~g8d1Bl4Gb1CL2WzSV0S+p%
z2~{(|Ff5e14i*L?U2z0_ECilKM@ImL#h_A?QK`xhyisgin}AZjE8o5|Kl#D?@4h-c
zJ^d$`Ukco~b;~QGn>G$sl^PsFhivi$b0ODx*bYxn28l!(E*+}LfFV#$QefLE6=K4n
zcMMrVO%9@`C*2WAuH5<3%hDVH-*_m{8%jQTdMbn7?l6pc0}d-<K37FLwGvvRfpRGa
z4l3f202sEZ*rn$#ESmwxa^P7DrE&$b(oF?Y^H>4VM0$8BgI#)~8}N*cZ9%HH4~!Tf
zPil}=6Ei<wgy0r1@>m>0=>Ym-JO&@_#y~2HAhlMnE6~ZuXjcTuXeXpn2^`0xuA5M_
zMt&*dFA6QohGiJPS3(6g44WVk#KQf!HJ`^!<_1`*dU)LsdhG&=6$>7Z7e23odwB_g
zpbx3;UX;rPIJQM9U6`hWwh9%s>4!y=GIX*SU6-VZ>i99c0AF7W>z{rK$xWMaVeSFG
zn!G}af+*(i(RV5=Q^nQmSxT%4xGwogK+Az?+wFn=K+vT{P0=M!7y}K9gT~kx-8zcV
zHU01gf)G3&^sQJ0UwQyvp1y>&t9r=W5&<pb9~7va71YUpnuruSs8ca*fl{HgKwW4(
zjfefn&gId!W(8tF0Tl`c!*dYn^iVj0B4CHQkh$>y>7Ec&Rcoor=Zhqe+DM5ep=jtv
zd!WzfQCyd4DQteA*DLUc!ibVL&9$ggwI=!8?2<#3aiSMj77DG@8st4oYgMk*DCKcV
zF-QJcEsNR$OHyu*WHecDsLGyX0{0g4uqh~ISx2o>fnF=aYN(WG+Ff+Ai{l`OVhiZ=
zc`>qK2!g=3QrZlS-p~q58QjvFXs38J)D=$&oYNx}^PWgF$=2j5{GAcxsupURMO&Cj
zR~wS*P*`-N{3g0PMf`O6rnYV<c|IIu2Nb!g)~aRY+O^r^w=!p6&tx)s+r6|oip658
zTrTgQ$=rNRcLKs~MaRHE8rO3&Gy-Z31Dd9T)2rCNp%;bwzd9#Qe7Eb!=O0z+^DR8j
ze;A2Gst=o+eb__#E8I;a67O|&@LzjH$6Xr@qHyOXbSX#e)L^SM#9Rs6)+Z4P2=3&m
zV{e~2cK9f5eVvwNO|*lxRrtqPTwL@|Pyevrbj5c<(SE_P3@CC1A}x(@IErfdzWwbt
zN8dVf=(CTp%(1K=@YK{)>dcw5+xk}wK4X|pTogH{QjsowfAaX@$;rvf%Z2?v#&090
VXO6y7eKi08002ovPDHLkV1n7DgVg{4

literal 0
HcmV?d00001

diff --git a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj
index 35b531f58b..b2fb84439b 100644
--- a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj
+++ b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj
@@ -533,14 +533,6 @@
 					<File
 						RelativePath="..\..\Counters.cpp"
 						>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AssemblerOutput="4"
-							/>
-						</FileConfiguration>
 					</File>
 					<File
 						RelativePath="..\..\Counters.h"
@@ -895,30 +887,6 @@
 							<File
 								RelativePath="..\..\x86\iFPU.cpp"
 								>
-								<FileConfiguration
-									Name="Debug|Win32"
-									>
-									<Tool
-										Name="VCCLCompilerTool"
-										AssemblerOutput="0"
-									/>
-								</FileConfiguration>
-								<FileConfiguration
-									Name="Devel|Win32"
-									>
-									<Tool
-										Name="VCCLCompilerTool"
-										AssemblerOutput="0"
-									/>
-								</FileConfiguration>
-								<FileConfiguration
-									Name="Release|Win32"
-									>
-									<Tool
-										Name="VCCLCompilerTool"
-										AssemblerOutput="0"
-									/>
-								</FileConfiguration>
 							</File>
 							<File
 								RelativePath="..\..\x86\iFPU.h"
@@ -986,14 +954,6 @@
 								<File
 									RelativePath="..\..\x86\ix86-32\iR5900-32.cpp"
 									>
-									<FileConfiguration
-										Name="Devel|Win32"
-										>
-										<Tool
-											Name="VCCLCompilerTool"
-											AssemblerOutput="4"
-										/>
-									</FileConfiguration>
 								</File>
 								<File
 									RelativePath="..\..\x86\ix86-32\iR5900Arit.cpp"
@@ -1241,22 +1201,6 @@
 					<File
 						RelativePath="..\..\Ipu\IPU.cpp"
 						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								UsePrecompiledHeader="0"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Devel|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								UsePrecompiledHeader="0"
-							/>
-						</FileConfiguration>
 					</File>
 					<File
 						RelativePath="..\..\Ipu\IPU.h"
@@ -1935,7 +1879,41 @@
 			<Filter
 				Name="Resources"
 				>
-				<File
+        <File
+					RelativePath="..\..\gui\Resources\ButtonIcon_Camera.png"
+					>
+          <FileConfiguration
+						Name="Debug|Win32"
+						>
+            <Tool
+							Name="VCCustomBuildTool"
+							Description=""
+							CommandLine="&quot;$(InputDir)\bin2cpp.cmd&quot; $(InputFileName)&#x0D;&#x0A;"
+							Outputs="&quot;$(InputDir)\$(InputName).h"
+						/>
+          </FileConfiguration>
+          <FileConfiguration
+						Name="Devel|Win32"
+						>
+            <Tool
+							Name="VCCustomBuildTool"
+							Description=""
+							CommandLine="&quot;$(InputDir)\bin2cpp.cmd&quot; $(InputFileName)&#x0D;&#x0A;"
+							Outputs="&quot;$(InputDir)\$(InputName).h"
+						/>
+          </FileConfiguration>
+          <FileConfiguration
+						Name="Release|Win32"
+						>
+            <Tool
+							Name="VCCustomBuildTool"
+							Description=""
+							CommandLine="&quot;$(InputDir)\bin2cpp.cmd&quot; $(InputFileName)&#x0D;&#x0A;"
+							Outputs="&quot;$(InputDir)\$(InputName).h"
+						/>
+          </FileConfiguration>
+        </File>
+        <File
 					RelativePath="..\..\gui\Resources\AppIcon16.png"
 					>
 					<FileConfiguration