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 @@
-
+
+
+
+
+
+
+
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
#include
#include
@@ -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( wxLt("Plugins"), cfgid.Plugins );
AddPage ( wxLt("Folders"), cfgid.Paths );
+ wxBitmapButton& screenshotButton( *new wxBitmapButton( this, wxID_SAVE, EmbeddedImage().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 0000000000..e698e2943f
Binary files /dev/null and b/pcsx2/gui/Resources/ButtonIcon_Camera.png differ
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+