From 1e6c518700cecf86c0053b44ceed5b70df999df3 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Tue, 10 Dec 2013 21:14:45 -0700
Subject: [PATCH] change a few names for some of the control callbacks

---
 obs/window-main-basic.cpp | 47 ++++++++++++++++++++++-----------------
 obs/window-main-basic.hpp | 41 +++++++++++++++++-----------------
 2 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/obs/window-main-basic.cpp b/obs/window-main-basic.cpp
index e5471a152..d72bf03d9 100644
--- a/obs/window-main-basic.cpp
+++ b/obs/window-main-basic.cpp
@@ -16,20 +16,21 @@
 ******************************************************************************/
 
 #include "obs-app.hpp"
+#include "window-settings-basic.hpp"
 #include "window-main-basic.hpp"
 
-void OBSBasic::OnClose(wxCloseEvent& event)
+void OBSBasic::OnClose(wxCloseEvent &event)
 {
 	wxGetApp().ExitMainLoop();
 	event.Skip();
 }
 
-void OBSBasic::OnMinimize(wxIconizeEvent& event)
+void OBSBasic::OnMinimize(wxIconizeEvent &event)
 {
 	event.Skip();
 }
 
-void OBSBasic::OnSize(wxSizeEvent& event)
+void OBSBasic::OnSize(wxSizeEvent &event)
 {
 	struct obs_video_info ovi;
 
@@ -51,72 +52,78 @@ void OBSBasic::OnSize(wxSizeEvent& event)
 				targetSize.x / baseAspect));
 }
 
-void OBSBasic::file_newOnMenuSelection(wxCommandEvent& event)
+void OBSBasic::fileNewClicked(wxCommandEvent &event)
 {
 }
 
-void OBSBasic::file_openOnMenuSelection(wxCommandEvent& event)
+void OBSBasic::fileOpenClicked(wxCommandEvent &event)
 {
 }
 
-void OBSBasic::file_saveOnMenuSelection(wxCommandEvent& event)
+void OBSBasic::fileSaveClicked(wxCommandEvent &event)
 {
 }
 
-void OBSBasic::file_exitOnMenuSelection(wxCommandEvent& event)
+void OBSBasic::fileExitClicked(wxCommandEvent &event)
 {
 	wxGetApp().ExitMainLoop();
 }
 
-void OBSBasic::scenesOnRightDown(wxMouseEvent& event)
+void OBSBasic::scenesRDown(wxMouseEvent &event)
 {
 }
 
-void OBSBasic::sceneAddOnToolClicked(wxCommandEvent& event)
+void OBSBasic::sceneAddClicked(wxCommandEvent &event)
 {
 }
 
-void OBSBasic::sceneRemoveOnToolClicked(wxCommandEvent& event)
+void OBSBasic::sceneRemoveClicked(wxCommandEvent &event)
 {
 }
 
-void OBSBasic::scenePropertiesOnToolClicked(wxCommandEvent& event)
+void OBSBasic::scenePropertiesClicked(wxCommandEvent &event)
 {
 }
 
-void OBSBasic::sceneUpOnToolClicked(wxCommandEvent& event)
+void OBSBasic::sceneUpClicked(wxCommandEvent &event)
 {
 }
 
-void OBSBasic::sceneDownOnToolClicked(wxCommandEvent& event)
+void OBSBasic::sceneDownClicked(wxCommandEvent &event)
 {
 }
 
-void OBSBasic::sourcesOnRightDown(wxMouseEvent& event)
+void OBSBasic::sourcesRDown(wxMouseEvent &event)
 {
 }
 
-void OBSBasic::sourceAddOnToolClicked(wxCommandEvent& event)
+void OBSBasic::sourceAddClicked(wxCommandEvent &event)
 {
 }
 
-void OBSBasic::sourceRemoveOnToolClicked(wxCommandEvent& event)
+void OBSBasic::sourceRemoveClicked(wxCommandEvent &event)
 {
 }
 
-void OBSBasic::sourcePropertiesOnToolClicked(wxCommandEvent& event)
+void OBSBasic::sourcePropertiesClicked(wxCommandEvent &event)
 {
 }
 
-void OBSBasic::sourceUpOnToolClicked(wxCommandEvent& event)
+void OBSBasic::sourceUpClicked(wxCommandEvent &event)
 {
 }
 
-void OBSBasic::sourceDownOnToolClicked(wxCommandEvent& event)
+void OBSBasic::sourceDownClicked(wxCommandEvent &event)
 {
 }
 
-void OBSBasic::exitButtonOnButtonClick(wxCommandEvent& event)
+void OBSBasic::settingsClicked(wxCommandEvent &event)
+{
+	OBSBasicSettings *test = new OBSBasicSettings(this);
+	test->ShowModal();
+}
+
+void OBSBasic::exitClicked(wxCommandEvent &event)
 {
 	wxGetApp().ExitMainLoop();
 }
diff --git a/obs/window-main-basic.hpp b/obs/window-main-basic.hpp
index 956135f59..0e3e5772a 100644
--- a/obs/window-main-basic.hpp
+++ b/obs/window-main-basic.hpp
@@ -21,26 +21,27 @@
 
 class OBSBasic : public OBSBasicBase {
 protected:
-	virtual void OnClose(wxCloseEvent& event);
-	virtual void OnMinimize(wxIconizeEvent& event);
-	virtual void OnSize(wxSizeEvent& event);
-	virtual void file_newOnMenuSelection(wxCommandEvent& event);
-	virtual void file_openOnMenuSelection(wxCommandEvent& event);
-	virtual void file_saveOnMenuSelection(wxCommandEvent& event);
-	virtual void file_exitOnMenuSelection(wxCommandEvent& event);
-	virtual void scenesOnRightDown(wxMouseEvent& event);
-	virtual void sceneAddOnToolClicked(wxCommandEvent& event);
-	virtual void sceneRemoveOnToolClicked(wxCommandEvent& event);
-	virtual void scenePropertiesOnToolClicked(wxCommandEvent& event);
-	virtual void sceneUpOnToolClicked(wxCommandEvent& event);
-	virtual void sceneDownOnToolClicked(wxCommandEvent& event);
-	virtual void sourcesOnRightDown(wxMouseEvent& event);
-	virtual void sourceAddOnToolClicked(wxCommandEvent& event);
-	virtual void sourceRemoveOnToolClicked(wxCommandEvent& event);
-	virtual void sourcePropertiesOnToolClicked(wxCommandEvent& event);
-	virtual void sourceUpOnToolClicked(wxCommandEvent& event);
-	virtual void sourceDownOnToolClicked(wxCommandEvent& event);
-	virtual void exitButtonOnButtonClick(wxCommandEvent& event);
+	virtual void OnClose(wxCloseEvent &event);
+	virtual void OnMinimize(wxIconizeEvent &event);
+	virtual void OnSize(wxSizeEvent &event);
+	virtual void fileNewClicked(wxCommandEvent &event);
+	virtual void fileOpenClicked(wxCommandEvent &event);
+	virtual void fileSaveClicked(wxCommandEvent &event);
+	virtual void fileExitClicked(wxCommandEvent &event);
+	virtual void scenesRDown(wxMouseEvent &event);
+	virtual void sceneAddClicked(wxCommandEvent &event);
+	virtual void sceneRemoveClicked(wxCommandEvent &event);
+	virtual void scenePropertiesClicked(wxCommandEvent &event);
+	virtual void sceneUpClicked(wxCommandEvent &event);
+	virtual void sceneDownClicked(wxCommandEvent &event);
+	virtual void sourcesRDown(wxMouseEvent &event);
+	virtual void sourceAddClicked(wxCommandEvent &event);
+	virtual void sourceRemoveClicked(wxCommandEvent &event);
+	virtual void sourcePropertiesClicked(wxCommandEvent &event);
+	virtual void sourceUpClicked(wxCommandEvent &event);
+	virtual void sourceDownClicked(wxCommandEvent &event);
+	virtual void settingsClicked(wxCommandEvent &event);
+	virtual void exitClicked(wxCommandEvent &event);
 
 public:
 	inline OBSBasic() : OBSBasicBase(NULL) {}