Improve texture dialog

examples/.directory

@@ -0,0 +1,4 @@
+[Dolphin]
+PreviewsShown=true
+Timestamp=2014,11,5,18,15,12
+Version=3

src/MenuState.hpp

@@ -80,7 +80,8 @@ enum GUI_ID
 	// File Dialog
 	GUI_FILEDIALOG_PATH = 222 + SIDEBAR_MAX_IDS,
 	GUI_FILEDIALOG_FORM = 223 + SIDEBAR_MAX_IDS,
-	GUI_DIALOG_SUBMIT = 224 + SIDEBAR_MAX_IDS
+	GUI_DIALOG_SUBMIT = 224 + SIDEBAR_MAX_IDS,
+	GUI_DIALOG = 225
 };
 
 class EditorState;

src/TextureDialog.cpp

@@ -3,6 +3,15 @@
 #include "ImageDialog.hpp"
 #include "util/filesys.hpp"
 
+enum TEXTURE_DIALOG_GUI_IDS
+{
+	ETD_GUI_ID_APPLY = GUI_DIALOG,
+	ETD_GUI_ID_IMPORT,
+	ETD_GUI_ID_ACTIONS,
+	ETD_GUI_ID_ACTIONS_CM,
+	ETD_GUI_ID_EXPORT
+};
+
 const char* getCubeSideName(CubeSide face)
 {
 	switch (face) {
@@ -29,7 +38,8 @@ TextureDialog::TextureDialog(EditorState *pstate, Node *pnode, CubeSide pface):
 	node(pnode),
 	face(pface),
 	lb(NULL),
-	the_image(NULL)
+	the_image(NULL),
+	context(NULL)
 {
 	IVideoDriver *driver = state->device->getVideoDriver();
 	IGUIEnvironment *guienv = state->device->getGUIEnvironment();
@@ -37,17 +47,15 @@ TextureDialog::TextureDialog(EditorState *pstate, Node *pnode, CubeSide pface):
 	// Window and basic items
 	win = guienv->addWindow(rect<s32>(340, 50, 340 + 74 * 3 + 10, 50 + 74 * 3 + 10), true,
 			narrow_to_wide(std::string(getCubeSideName(face)) + " texture").c_str());
-	guienv->addButton(rect<s32>(155, 30, 74 * 3, 55), win, 501, L"Apply", L"Apply this texture selection to the node face");
-	//guienv->addButton(rect<s32>(155, 60, 74 * 3, 85), win, 505, L"Unique",
-	//		L"Duplicate the current texture, and make it so only this face uses it.");
-	guienv->addButton(rect<s32>(84, 30, 150, 55), win, 503, L"Import", L"Import images from files");
-	guienv->addButton(rect<s32>(84, 60, 150, 85), win, 504, L"Export", L"Export the selected texture");
+	guienv->addButton(rect<s32>(155, 30, 74*3, 55), win, ETD_GUI_ID_APPLY,   L"Apply",  L"Apply this texture selection to the node face");
+	guienv->addButton(rect<s32>(155, 60, 74*3, 85), win, ETD_GUI_ID_IMPORT,  L"Import", L"Import images from files");
+	guienv->addButton(rect<s32>(84,  60, 150,  85), win, ETD_GUI_ID_ACTIONS, L"Actions");
 
 	// Fill out listbox
 	lb = guienv->addListBox(rect<s32>(10, 104, 74 * 3, 74 * 3), win, 502);
 	Media *media = &state->project->media;
 	std::map<std::string, Media::Image*>& images = media->getList();
-	int count = 0;
+	int count = 1;
 	lb->addItem(L"");
 	lb->setSelected(0);
 	for (std::map<std::string, Media::Image*>::const_iterator it = images.begin();
@@ -71,6 +79,13 @@ TextureDialog::TextureDialog(EditorState *pstate, Node *pnode, CubeSide pface):
 	if (image) {
 		the_image = driver->addTexture("tmpicon.png", image->get());
 	}
+
+	// Context menu
+	context = guienv->addContextMenu(rect<s32>(84, 85, 150, 180), win, ETD_GUI_ID_ACTIONS_CM);
+	context->addItem(L"Export", ETD_GUI_ID_EXPORT);
+	context->setCloseHandling(ECMC_HIDE);
+	context->setVisible(false);
+	context->setEventParent(win);
 }
 
 void TextureDialog::draw(IVideoDriver *driver)
@@ -127,7 +142,7 @@ bool TextureDialog::OnEvent(const SEvent &event)
 
 	if (event.GUIEvent.EventType == EGET_BUTTON_CLICKED) {
 		switch (event.GUIEvent.Caller->getID()) {
-		case 501: {
+		case ETD_GUI_ID_APPLY: {
 			if (lb->getSelected() == 0) {
 				node->setTexture(face, NULL);
 				node->remesh();
@@ -152,11 +167,19 @@ bool TextureDialog::OnEvent(const SEvent &event)
 			close();
 			return true;
 		}
-		case 503: {
+		case ETD_GUI_ID_IMPORT: {
 			ImageDialog::show(state, node, face);
-			return true;
+			return false;
 		}
-		case 504: {
+		case ETD_GUI_ID_ACTIONS:
+			context->setVisible(true);
+			state->device->getGUIEnvironment()->setFocus(context);
+			return false;
+		}
+	} else if (event.GUIEvent.EventType == EGET_MENU_ITEM_SELECTED) {
+		IGUIContextMenu *menu = (IGUIContextMenu *)event.GUIEvent.Caller;
+		switch (menu->getItemCommandId(menu->getSelectedItem())) {
+		case ETD_GUI_ID_EXPORT: {
 			if (lb->getSelected() == 0)
 				return true;
 
@@ -170,6 +193,7 @@ bool TextureDialog::OnEvent(const SEvent &event)
 					Media::Image *image = it->second;
 					std::string path = getSaveLoadDirectory(state->settings->get("save_directory"),
 								state->settings->getBool("installed")) + image->name;
+					std::cerr << "Exported image to " << path.c_str() << std::endl;
 					state->device->getVideoDriver()->writeImageToFile(image->get(),
 						path.c_str());
 					state->device->getGUIEnvironment()->addMessageBox(L"Saved Image to: ",
@@ -178,11 +202,9 @@ bool TextureDialog::OnEvent(const SEvent &event)
 				}
 				count++;
 			}
-			return true;
+			return false;
 		}} // end of switch
-	}
-
-	if (event.GUIEvent.EventType == EGET_LISTBOX_CHANGED && event.GUIEvent.Caller == lb) {
+	} else if (event.GUIEvent.EventType == EGET_LISTBOX_CHANGED && event.GUIEvent.Caller == lb) {
 		if (lb->getSelected() == 0) {
 			the_image = NULL;
 			return true;
@@ -201,9 +223,7 @@ bool TextureDialog::OnEvent(const SEvent &event)
 			count++;
 		}
 		return true;
-	}
-
-	if (event.GUIEvent.EventType == EGET_ELEMENT_CLOSED && event.GUIEvent.Caller == win) {
+	} else if (event.GUIEvent.EventType == EGET_ELEMENT_CLOSED && event.GUIEvent.Caller == win) {
 		if (canClose())
 			close();
 		return true;

src/TextureDialog.hpp

@@ -17,6 +17,7 @@ private:
 	IGUIWindow *win;
 	IGUIListBox *lb;
 	ITexture *the_image;
+	IGUIContextMenu *context;
 };
 
 #endif