From 975533afbab325f6cd83a4e52893d918c6d72ef2 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <ratstail91@yahoo.com.au>
Date: Sat, 1 Mar 2014 23:58:06 +1100
Subject: [PATCH] Minor tweak to the editor's menu bar

---
 editor/editor_scene.cpp                | 145 ++++++++++---------------
 editor/editor_scene.hpp                |   3 +
 rsc/graphics/interface/button_menu.bmp | Bin 12294 -> 18054 bytes
 3 files changed, 63 insertions(+), 85 deletions(-)

diff --git a/editor/editor_scene.cpp b/editor/editor_scene.cpp
index 005b05a..07403bf 100644
--- a/editor/editor_scene.cpp
+++ b/editor/editor_scene.cpp
@@ -51,9 +51,9 @@ EditorScene::EditorScene(ConfigUtility* const arg1):
 	menuBar.SetImage(&buttonImage);
 
 	menuBar.SetEntries({
-		{"File", "New", "Open", "Save", "Save As...", "Close", "Exit"},
-		{"Edit", "Set Tile", "Load Sheet", "Delete Sheet", "Metadata", "Run Script"},
-		{"Debugging", "Debug On", "Debug Off", "Toggle Debug", "Testificate"}
+		{"File", "New", "Open", "Save", "Close"},
+		{"Edit", "Set Tile", "Set Brush", "Script"},
+		{"Debug", "Debug On", "Debug Off", "Toggle", "Testificate"}
 	});
 
 	//debug
@@ -95,7 +95,7 @@ void EditorScene::Render(SDL_Surface* const screen) {
 		}
 	}
 
-	//draw a big bar across the top
+	//draw a big bar across the top (hackish)
 	buttonImage.SetClipY(0);
 	for (int i = 0; i < screen->w; i += buttonImage.GetClipW()) {
 		buttonImage.DrawTo(screen, i, 0);
@@ -145,85 +145,7 @@ void EditorScene::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 void EditorScene::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 	int entry, drop;
 	menuBar.MouseButtonUp(button, &entry, &drop);
-
-	//manage input from the menu bar
-	switch(entry) {
-		case 0: //File
-			switch(drop) {
-				case 0:
-					//TODO: NEW
-				break;
-
-				case 1:
-					//TODO: OPEN
-				break;
-
-				case 2:
-					//TODO: SAVE
-				break;
-
-				case 3:
-					//TODO: SAVE AS
-				break;
-
-				case 4:
-					//TODO: CLOSE
-				break;
-
-				case 5: {
-					//EXIT
-					SDL_Event e;
-					e.type = SDL_QUIT;
-					SDL_PushEvent(&e);
-				}
-				break;
-			}
-		break;
-
-		case 1: //Edit
-			switch(drop) {
-				case 0:
-					//TODO: SET TILE
-				break;
-
-				case 1:
-					//TODO: LOAD SHEET
-				break;
-
-				case 2:
-					//TODO: DELETE SHEET
-				break;
-
-				case 3:
-					//TODO: METADATA
-				break;
-
-				case 4:
-					//TODO: RUN SCRIPT
-				break;
-			}
-		break;
-
-		case 2: //Debug
-			switch(drop) {
-				case 0:
-					debugOpen = true;
-				break;
-
-				case 1:
-					debugOpen = false;
-				break;
-
-				case 2:
-					debugOpen = !debugOpen;
-				break;
-
-				case 3:
-					SetNextScene(SceneList::TESTIFICATESCENE);
-				break;
-			}
-		break;
-	}
+	HandleMenuOption(entry, drop);
 }
 
 void EditorScene::KeyDown(SDL_KeyboardEvent const& key) {
@@ -231,12 +153,10 @@ void EditorScene::KeyDown(SDL_KeyboardEvent const& key) {
 		case SDLK_ESCAPE:
 			QuitEvent();
 		break;
-
 		case SDLK_SPACE:
 			camera.x = 0;
 			camera.y = 0;
 		break;
-
 		case SDLK_TAB:
 			debugOpen = !debugOpen;
 		break;
@@ -246,3 +166,58 @@ void EditorScene::KeyDown(SDL_KeyboardEvent const& key) {
 void EditorScene::KeyUp(SDL_KeyboardEvent const& key) {
 	//
 }
+
+//-------------------------
+//Members
+//-------------------------
+
+void EditorScene::HandleMenuOption(int entry, int drop) {
+	//manage input from the menu bar
+	switch(entry) {
+		case 0: //File
+			switch(drop) {
+				case 0:
+					//TODO: NEW
+				break;
+				case 1:
+					//TODO: OPEN
+				break;
+				case 2:
+					//TODO: SAVE
+				break;
+				case 3:
+					//TODO: CLOSE
+				break;
+			}
+		break;
+		case 1: //Edit
+			switch(drop) {
+				case 0:
+					//TODO: SET TILE
+				break;
+				case 1:
+					//TODO: SET BRUSH
+				break;
+				case 2:
+					//TODO: SCRIPT
+				break;
+			}
+		break;
+		case 2: //Debug
+			switch(drop) {
+				case 0:
+					debugOpen = true;
+				break;
+				case 1:
+					debugOpen = false;
+				break;
+				case 2:
+					debugOpen = !debugOpen;
+				break;
+				case 3:
+					SetNextScene(SceneList::TESTIFICATESCENE);
+				break;
+			}
+		break;
+	}
+}
\ No newline at end of file
diff --git a/editor/editor_scene.hpp b/editor/editor_scene.hpp
index d8052bd..e86fa52 100644
--- a/editor/editor_scene.hpp
+++ b/editor/editor_scene.hpp
@@ -54,6 +54,9 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
+	//members
+	void HandleMenuOption(int entry, int drop);
+
 	//globals
 	ConfigUtility& config;
 
diff --git a/rsc/graphics/interface/button_menu.bmp b/rsc/graphics/interface/button_menu.bmp
index 281770f0570211adee2969bc297cb0970d8f410a..b2dcb2af1279b70df965d5e0adf1fbeacdb2e3ac 100644
GIT binary patch
delta 176
zcmZomXzOKEaq?|*V*mp)AgKYwDL`xk#Ec9QK$3wWz-^<76Z6J|2FA^4%m&PxColt9
z)7XHl18hLnF-{=s11FI6jVFO^u>vpi<}hKHP@5P`*)~Za3#|2-i~+<nF$JQOUDGjO
J-lW^W2mqqrG$sH5

delta 111
zcmZqcWo%1Oaq?v|U;qO%AgKYwE<kJp#Ec9QK$3ysg8oJoC+5x1SPYmqPvZm<ZhS!E
gn@|GV<}eu`i%k(oY*PgiX<9%+OdnJ1nxg?T0KX;~tN;K2