Rename combobox -> menu_button

data/gui/schema.cfg

@@ -585,7 +585,7 @@
                 [/tag]
             [/tag]
             [tag]
-                name="combobox_definition"
+                name="menu_button_definition"
                 min="0"
                 max="-1"
                 super="gui/button_definition"
@@ -1387,7 +1387,7 @@
                                     [/key]
                                 [/tag]
                                 [tag]
-                                    name="combobox"
+                                    name="menu_button"
                                     min="0"
                                     max="-1"
                                     super="gui/window/resolution/grid/row/column/button"

data/gui/widget/combobox_default.cfg → data/gui/widget/menu_button_default.cfg

@@ -130,14 +130,14 @@
 	[/resolution]
 #enddef
 
-[combobox_definition]
+[menu_button_definition]
 
 	id = "default"
 	description = "Default button"
 
 	{_GUI_RESOLUTION () 40 140 30 13 4 ({GUI_NORMAL__FONT_SIZE__SMALL}) "button_dropdown/button_dropdown" ()}
 
-[/combobox_definition]
+[/menu_button_definition]
 
 #undef _GUI_RESOLUTION
 #undef _GUI_DRAW_BORDER

data/gui/window/addon_list.cfg

@@ -1083,7 +1083,7 @@
 				horizontal_alignment = "left"
 
 				# TODO: maybe do this in the source code?
-				[combobox]
+				[menu_button]
 					definition = "default"
 					[option]
 						label = "All Add-ons"
@@ -1104,7 +1104,7 @@
 					[option]
 						label = "Not Uploaded"
 					[/option]
-				[/combobox]
+				[/menu_button]
 			[/column]
 
 			[column]

data/gui/window/mp_create_game.cfg

@@ -103,10 +103,10 @@
 						border_size = 5
 						horizontal_grow = "true"
 
-						[combobox]
+						[menu_button]
 							id = "eras"
 							definition = "default"
-						[/combobox]
+						[/menu_button]
 
 					[/column]
 
@@ -139,10 +139,10 @@
 						border_size = 5
 						horizontal_grow = "true"
 
-						[combobox]
+						[menu_button]
 							id = "random_faction_mode"
 							definition = "default"
-						[/combobox]
+						[/menu_button]
 
 					[/column]
 
@@ -359,7 +359,7 @@
 				[/node]
 
 				[node]
-					id = "option_combobox_node"
+					id = "option_menu_button_node"
 					unfolded = true
 
 					[node_definition]
@@ -371,7 +371,7 @@
 								border_size = 5
 
 								[label]
-									id = "combobox_label"
+									id = "menu_button_label"
 									definition = "default_small"
 									linked_group = "custom_options_labels"
 								[/label]
@@ -384,9 +384,9 @@
 								border_size = 5
 								horizontal_grow = "true"
 
-								[combobox]
-									id = "option_combobox"
-								[/combobox]
+								[menu_button]
+									id = "option_menu_button"
+								[/menu_button]
 
 							[/column]
 
@@ -1233,10 +1233,10 @@
 											horizontal_grow = "true"
 											vertical_alignment = "top"
 
-											[combobox]
+											[menu_button]
 												id = "game_types"
 												definition = "default"
-											[/combobox]
+											[/menu_button]
 
 										[/column]
 

data/gui/window/preferences/03_display.cfg

@@ -26,11 +26,11 @@
 						border_size = 5
 						horizontal_alignment = "left"
 
-						[combobox]
+						[menu_button]
 							id = "resolution_set"
 							definition = "default"
 							tooltip = _ "Change the game resolution"
-						[/combobox]
+						[/menu_button]
 					[/column]
 
 				[/row]

projectfiles/CodeBlocks/wesnoth.cbp

@@ -644,8 +644,6 @@
 		<Unit filename="../../src/gui/widgets/button.cpp" />
 		<Unit filename="../../src/gui/widgets/button.hpp" />
 		<Unit filename="../../src/gui/widgets/clickable.hpp" />
-		<Unit filename="../../src/gui/widgets/combobox.cpp" />
-		<Unit filename="../../src/gui/widgets/combobox.hpp" />
 		<Unit filename="../../src/gui/widgets/container.cpp" />
 		<Unit filename="../../src/gui/widgets/container.hpp" />
 		<Unit filename="../../src/gui/widgets/control.cpp" />
@@ -679,6 +677,8 @@
 		<Unit filename="../../src/gui/widgets/matrix.hpp" />
 		<Unit filename="../../src/gui/widgets/minimap.cpp" />
 		<Unit filename="../../src/gui/widgets/minimap.hpp" />
+		<Unit filename="../../src/gui/widgets/menu_button.cpp" />
+		<Unit filename="../../src/gui/widgets/menu_button.hpp" />
 		<Unit filename="../../src/gui/widgets/multi_page.cpp" />
 		<Unit filename="../../src/gui/widgets/multi_page.hpp" />
 		<Unit filename="../../src/gui/widgets/pane.cpp" />

projectfiles/VC12/wesnoth.vcxproj

@@ -2220,14 +2220,6 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\src\gui\widgets\combobox.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\src\gui\widgets\container.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
@@ -2338,6 +2330,14 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\src\gui\widgets\menu_button.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\src\gui\widgets\minimap.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
@@ -4153,7 +4153,6 @@
     <ClInclude Include="..\..\src\gui\dialogs\wml_message.hpp" />
     <ClInclude Include="..\..\src\gui\widgets\button.hpp" />
     <ClInclude Include="..\..\src\gui\widgets\clickable.hpp" />
-    <ClInclude Include="..\..\src\gui\widgets\combobox.hpp" />
     <ClInclude Include="..\..\src\gui\widgets\container.hpp" />
     <ClInclude Include="..\..\src\gui\widgets\control.hpp" />
     <ClInclude Include="..\..\src\gui\widgets\debug.hpp" />
@@ -4172,6 +4171,7 @@
     <ClInclude Include="..\..\src\gui\widgets\list.hpp" />
     <ClInclude Include="..\..\src\gui\widgets\listbox.hpp" />
     <ClInclude Include="..\..\src\gui\widgets\matrix.hpp" />
+    <ClInclude Include="..\..\src\gui\widgets\menu_button.hpp" />
     <ClInclude Include="..\..\src\gui\widgets\minimap.hpp" />
     <ClInclude Include="..\..\src\gui\widgets\multi_page.hpp" />
     <ClInclude Include="..\..\src\gui\widgets\pane.hpp" />

projectfiles/VC12/wesnoth.vcxproj.filters

@@ -395,9 +395,6 @@
     <ClCompile Include="..\..\src\gui\widgets\button.cpp">
       <Filter>Gui\Widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\gui\widgets\combobox.cpp">
-      <Filter>Gui\Widgets</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\gui\widgets\container.cpp">
       <Filter>Gui\Widgets</Filter>
     </ClCompile>
@@ -437,6 +434,9 @@
     <ClCompile Include="..\..\src\gui\widgets\matrix.cpp">
       <Filter>Gui\Widgets</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\gui\widgets\menu_button.cpp">
+      <Filter>Gui\Widgets</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\gui\widgets\minimap.cpp">
       <Filter>Gui\Widgets</Filter>
     </ClCompile>
@@ -1745,9 +1745,6 @@
     <ClInclude Include="..\..\src\gui\widgets\clickable.hpp">
       <Filter>Gui\Widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\gui\widgets\combobox.hpp">
-      <Filter>Gui\Widgets</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\gui\widgets\container.hpp">
       <Filter>Gui\Widgets</Filter>
     </ClInclude>
@@ -1802,6 +1799,9 @@
     <ClInclude Include="..\..\src\gui\widgets\matrix.hpp">
       <Filter>Gui\Widgets</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\gui\widgets\menu_button.hpp">
+      <Filter>Gui\Widgets</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\gui\widgets\minimap.hpp">
       <Filter>Gui\Widgets</Filter>
     </ClInclude>

projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj

@@ -395,7 +395,7 @@
 		91A215E21CAD9B9000927AEA /* libpango-1.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = EC5C242E18EF07B4001FA499 /* libpango-1.0.0.dylib */; };
 		91A215E31CAD9B9000927AEA /* libpangocairo-1.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = EC5C242F18EF07B4001FA499 /* libpangocairo-1.0.0.dylib */; };
 		91A215E41CAD9D4300927AEA /* button.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5A9BCEA0ECA805A002BE442 /* button.cpp */; };
-		91A215E71CAD9D4300927AEA /* combobox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91F462861C7115C50050A9C9 /* combobox.cpp */; };
+		91A215E71CAD9D4300927AEA /* menu_button.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91F462861C7115C50050A9C9 /* menu_button.cpp */; };
 		91A215E91CAD9D4300927AEA /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5A9BCEE0ECA805A002BE442 /* container.cpp */; };
 		91A215EB1CAD9D4300927AEA /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5A9BCF00ECA805A002BE442 /* control.cpp */; };
 		91A215ED1CAD9D4300927AEA /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5A9BCF20ECA805A002BE442 /* debug.cpp */; };
@@ -739,7 +739,7 @@
 		91E357501CACCC3E00774252 /* message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5A9BCC10ECA805A002BE442 /* message.cpp */; };
 		91ECD5D21BA11A5200B25CF1 /* unit_creator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91ECD5D01BA11A5200B25CF1 /* unit_creator.cpp */; };
 		91F462841C71139C0050A9C9 /* preferences_dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91F462821C71139B0050A9C9 /* preferences_dialog.cpp */; };
-		91F462881C7115C50050A9C9 /* combobox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91F462861C7115C50050A9C9 /* combobox.cpp */; };
+		91F462881C7115C50050A9C9 /* menu_button.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91F462861C7115C50050A9C9 /* menu_button.cpp */; };
 		91F462941C7117400050A9C9 /* drop_down_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91F462921C7117400050A9C9 /* drop_down_list.cpp */; };
 		91FAC70A1C7FBC3400DAB2C3 /* lua_formula_bridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91FAC7091C7FBC2C00DAB2C3 /* lua_formula_bridge.cpp */; };
 		91FBBAD61CB6AF8900470BFE /* player_connection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91FBBAD41CB6AF8900470BFE /* player_connection.cpp */; };
@@ -1747,8 +1747,8 @@
 		91EF6C041C9E22E400E2A733 /* smart_list.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = smart_list.hpp; sourceTree = "<group>"; };
 		91F462821C71139B0050A9C9 /* preferences_dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = preferences_dialog.cpp; sourceTree = "<group>"; };
 		91F462831C71139B0050A9C9 /* preferences_dialog.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = preferences_dialog.hpp; sourceTree = "<group>"; };
-		91F462861C7115C50050A9C9 /* combobox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = combobox.cpp; sourceTree = "<group>"; };
-		91F462871C7115C50050A9C9 /* combobox.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = combobox.hpp; sourceTree = "<group>"; };
+		91F462861C7115C50050A9C9 /* menu_button.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = menu_button.cpp; sourceTree = "<group>"; };
+		91F462871C7115C50050A9C9 /* menu_button.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = menu_button.hpp; sourceTree = "<group>"; };
 		91F462921C7117400050A9C9 /* drop_down_list.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drop_down_list.cpp; sourceTree = "<group>"; };
 		91F462931C7117400050A9C9 /* drop_down_list.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = drop_down_list.hpp; sourceTree = "<group>"; };
 		91FAC7081C7F931900DAB2C3 /* lua_formula_bridge.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = lua_formula_bridge.hpp; sourceTree = "<group>"; };
@@ -4376,8 +4376,6 @@
 				B5A9BCEA0ECA805A002BE442 /* button.cpp */,
 				B5A9BCEB0ECA805A002BE442 /* button.hpp */,
 				B5CF7BBE10D55F7B00A8BEB5 /* clickable.hpp */,
-				91F462861C7115C50050A9C9 /* combobox.cpp */,
-				91F462871C7115C50050A9C9 /* combobox.hpp */,
 				B5A9BCEE0ECA805A002BE442 /* container.cpp */,
 				B5A9BCEF0ECA805A002BE442 /* container.hpp */,
 				B5A9BCF00ECA805A002BE442 /* control.cpp */,
@@ -4409,6 +4407,8 @@
 				B5A9BD000ECA805A002BE442 /* listbox.hpp */,
 				62579C811573E797003089D5 /* matrix.cpp */,
 				62579C821573E797003089D5 /* matrix.hpp */,
+				91F462861C7115C50050A9C9 /* menu_button.cpp */,
+				91F462871C7115C50050A9C9 /* menu_button.hpp */,
 				B5A9BD030ECA805A002BE442 /* minimap.cpp */,
 				B5A9BD040ECA805A002BE442 /* minimap.hpp */,
 				B54AC6F80FEA9FA5006F6FBD /* multi_page.cpp */,
@@ -5214,7 +5214,7 @@
 				919B37F81BAF789E00E0094C /* synced_user_choice.cpp in Sources */,
 				919B37FC1BAF7A9D00E0094C /* synced_choice_wait.cpp in Sources */,
 				91F462841C71139C0050A9C9 /* preferences_dialog.cpp in Sources */,
-				91F462881C7115C50050A9C9 /* combobox.cpp in Sources */,
+				91F462881C7115C50050A9C9 /* menu_button.cpp in Sources */,
 				91F462941C7117400050A9C9 /* drop_down_list.cpp in Sources */,
 				9130A4601C73BB6100852782 /* select_orb_colors.cpp in Sources */,
 				91DCA6891C9066CC0030F8D0 /* unit_preview_pane.cpp in Sources */,
@@ -5721,7 +5721,7 @@
 				91A215D91CAD96D900927AEA /* mp_method_selection.cpp in Sources */,
 				91A215DA1CAD96D900927AEA /* synced_choice_wait.cpp in Sources */,
 				91A215E41CAD9D4300927AEA /* button.cpp in Sources */,
-				91A215E71CAD9D4300927AEA /* combobox.cpp in Sources */,
+				91A215E71CAD9D4300927AEA /* menu_button.cpp in Sources */,
 				91A215E91CAD9D4300927AEA /* container.cpp in Sources */,
 				91A215EB1CAD9D4300927AEA /* control.cpp in Sources */,
 				91A215ED1CAD9D4300927AEA /* debug.cpp in Sources */,

src/CMakeLists.txt

@@ -519,7 +519,6 @@ add_library(wesnoth-gui_tooltip
 set(wesnoth-gui_widget_SRC
 	gui/dialogs/drop_down_list.cpp
 	gui/widgets/button.cpp
-	gui/widgets/combobox.cpp
 	gui/widgets/container.cpp
 	gui/widgets/control.cpp
 	gui/widgets/debug.cpp
@@ -533,6 +532,7 @@ set(wesnoth-gui_widget_SRC
 	gui/widgets/list.cpp
 	gui/widgets/listbox.cpp
 	gui/widgets/matrix.cpp
+	gui/widgets/menu_button.cpp
 	gui/widgets/minimap.cpp
 	gui/widgets/multi_page.cpp
 	gui/widgets/pane.cpp

src/SConscript

@@ -429,7 +429,6 @@ wesnoth_sources = Split("""
     gui/dialogs/wml_error.cpp
     gui/dialogs/wml_message.cpp
     gui/widgets/button.cpp
-    gui/widgets/combobox.cpp
     gui/widgets/container.cpp
     gui/widgets/control.cpp
     gui/widgets/drawing.cpp
@@ -442,6 +441,7 @@ wesnoth_sources = Split("""
     gui/widgets/list.cpp
     gui/widgets/listbox.cpp
     gui/widgets/matrix.cpp
+    gui/widgets/menu_button.cpp
     gui/widgets/minimap.cpp
     gui/widgets/multi_page.cpp
     gui/widgets/pane.cpp

src/gui/core/window_builder.cpp

@@ -22,7 +22,7 @@
 #include "gui/core/window_builder/helper.hpp"
 #include "gui/core/window_builder/instance.hpp"
 #include "gui/widgets/button.hpp"
-#include "gui/widgets/combobox.hpp"
+#include "gui/widgets/menu_button.hpp"
 #include "gui/widgets/drawing.hpp"
 #include "gui/widgets/horizontal_scrollbar.hpp"
 #include "gui/widgets/image.hpp"
@@ -223,7 +223,7 @@ tbuilder_widget_ptr create_builder_widget(const config& cfg)
 	TRY(matrix);
 	TRY(minimap);
 	TRY(button);
-	TRY(combobox);
+	TRY(menu_button);
 	TRY(drawing);
 	TRY(password_box);
 	TRY(unit_preview_pane);

src/gui/dialogs/drop_down_list.hpp

@@ -21,7 +21,7 @@ class config;
 
 namespace gui2
 {
-///Used by the combobox widget.
+///Used by the menu_button widget.
 class tdrop_down_list : public tdialog
 {
 public:
@@ -34,7 +34,7 @@ class tdrop_down_list : public tdialog
 	}
 	int selected_item() const { return selected_item_; }
 private:
-	/// The screen location of the combobox button that triggred this droplist.
+	/// The screen location of the menu_button button that triggred this droplist.
 	/// Note: we don't adjust the location of this dialog to when resizing the window.
 	/// Instead this dialog automatically closes itself on resizing.
 	SDL_Rect button_pos_;