Rename menu2-* dialog images to menu-*

wesnoth · Jan 21, 2016 · 583ab69 · 583ab69
1 parent 15ed585
commit 583ab69
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 3 deletions.
diff --git a/data/gui/default/widget/window_default.cfg b/data/gui/default/widget/window_default.cfg
@@ -181,8 +181,8 @@
 	id = "menu"
 	description = "Window style used for menus"
 
-	{_GUI_RESOLUTION ({GUI_TINY__RESOLUTION}) ("menu2") () 5 6 2 4 6 }
-	{_GUI_RESOLUTION ()                       ("menu2") () 2 2 2 2 4 }
+	{_GUI_RESOLUTION ({GUI_TINY__RESOLUTION}) ("menu") () 5 6 2 4 6 }
+	{_GUI_RESOLUTION ()                       ("menu") () 2 2 2 2 4 }
 
 [/window_definition]
 

diff --git a/images/dialogs/menu2-background.png → images/dialogs/menu-background.png b/images/dialogs/menu2-background.png → images/dialogs/menu-background.png
diff --git a/images/dialogs/menu2-border-botleft.png → images/dialogs/menu-border-botleft.png b/images/dialogs/menu2-border-botleft.png → images/dialogs/menu-border-botleft.png
diff --git a/images/dialogs/menu2-border-botright.png → images/dialogs/menu-border-botright.png b/images/dialogs/menu2-border-botright.png → images/dialogs/menu-border-botright.png
diff --git a/images/dialogs/menu2-border-bottom.png → images/dialogs/menu-border-bottom.png b/images/dialogs/menu2-border-bottom.png → images/dialogs/menu-border-bottom.png
diff --git a/images/dialogs/menu2-border-left.png → images/dialogs/menu-border-left.png b/images/dialogs/menu2-border-left.png → images/dialogs/menu-border-left.png
diff --git a/images/dialogs/menu2-border-right.png → images/dialogs/menu-border-right.png b/images/dialogs/menu2-border-right.png → images/dialogs/menu-border-right.png
diff --git a/images/dialogs/menu2-border-top.png → images/dialogs/menu-border-top.png b/images/dialogs/menu2-border-top.png → images/dialogs/menu-border-top.png
diff --git a/images/dialogs/menu2-border-topleft.png → images/dialogs/menu-border-topleft.png b/images/dialogs/menu2-border-topleft.png → images/dialogs/menu-border-topleft.png
diff --git a/images/dialogs/menu2-border-topright.png → images/dialogs/menu-border-topright.png b/images/dialogs/menu2-border-topright.png → images/dialogs/menu-border-topright.png
diff --git a/src/construct_dialog.cpp b/src/construct_dialog.cpp
@@ -42,7 +42,7 @@ namespace gui {
 //note: style names are directly related to the panel image file names
 const dialog::style& dialog::default_style = dialog_frame::default_style;
 const dialog::style& dialog::message_style = dialog_frame::message_style;
-const dialog::style dialog::hotkeys_style("menu2", 0);
+const dialog::style dialog::hotkeys_style("menu", 0);
 const int dialog::message_font_size = font::SIZE_PLUS;
 const int dialog::caption_font_size = font::SIZE_LARGE;
 const size_t dialog::left_padding = font::relative_size(10);