Register num_box for compilation, syntax & wiki

add a missing wiki entry for password_box as well
aquileia · Mar 15, 2014 · 21634af · 21634af
1 parent 43e4da8
commit 21634af
Show file tree

Hide file tree

Showing 7 changed files with 148 additions and 2 deletions.
diff --git a/data/gui/schema.cfg b/data/gui/schema.cfg
@@ -1627,6 +1627,32 @@
                                         default=""
                                     [/key]
                                 [/tag]
+                                [tag]
+                                    name="num_box"
+                                    min="0"
+                                    max="-1"
+                                    super="generic/widget_instance"
+                                    [key]
+                                        name="maximum_value"
+                                        type="int"
+                                        default=32767
+                                    [/key]
+                                    [key]
+                                        name="minimum_value"
+                                        type="int"
+                                        default=0
+                                    [/key]
+                                    [key]
+                                        name="value"
+                                        type="int"
+                                        default=0
+                                    [/key]
+                                    [key]
+                                        name="history"
+                                        type="string"
+                                        default=""
+                                    [/key]
+                                [/tag]
                                 [tag]
                                     name="progress_bar"
                                     min="0"

diff --git a/data/tools/emacs_mode/wesnoth-wml-data.el b/data/tools/emacs_mode/wesnoth-wml-data.el
@@ -22,8 +22,8 @@
   ("resolution")
   nil)
  ("column"
-  ("drawing" "matrix" "window" "tree_view" "slider" "minimap" "password_box" "progress_bar" "stacked_widget" "multi_page" "listbox" "toggle_button" "text_box" "scroll_label" "panel" "image" "toggle_panel" "viewport" "label" "button" "grid" "scrollbar_panel" "spacer" "horizontal_scrollbar" "vertical_scrollbar" "repeating_button")
-  ("_grid" "_vertical_scrollbar" "_tree_view" "_toggle_panel" "_toggle_button" "_password_box" "_text_box" "_stacked_widget" "_spacer" "_slider" "_scrollbar_panel" "_scroll_label" "_repeating_button" "_panel" "_multi_page" "_minimap" "_menubar" "_listbox" "_label" "_image" "_horizontal_scrollbar" "_horizontal_listbox" "_button" "vertical_grow" "horizontal_grow" "border_size" "horizontal_alignment" "border" "grow_factor" "vertical_alignment"))
+  ("drawing" "matrix" "window" "tree_view" "slider" "minimap" "password_box" "num_box" "progress_bar" "stacked_widget" "multi_page" "listbox" "toggle_button" "text_box" "scroll_label" "panel" "image" "toggle_panel" "viewport" "label" "button" "grid" "scrollbar_panel" "spacer" "horizontal_scrollbar" "vertical_scrollbar" "repeating_button")
+  ("_grid" "_vertical_scrollbar" "_tree_view" "_toggle_panel" "_toggle_button" "_password_box" "_num_box" "_text_box" "_stacked_widget" "_spacer" "_slider" "_scrollbar_panel" "_scroll_label" "_repeating_button" "_panel" "_multi_page" "_minimap" "_menubar" "_listbox" "_label" "_image" "_horizontal_scrollbar" "_horizontal_listbox" "_button" "vertical_grow" "horizontal_grow" "border_size" "horizontal_alignment" "border" "grow_factor" "vertical_alignment"))
  ("row"
   ("grid" "toggle_button" "text_box" "row" "column")
   ("_column" "grow_factor"))

diff --git a/projectfiles/VC9/wesnoth.vcproj b/projectfiles/VC9/wesnoth.vcproj
@@ -5766,6 +5766,62 @@
 					RelativePath="..\..\src\gui\widgets\multi_page.hpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\src\gui\widgets\num_box.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Gui\Widgets\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Gui\Widgets\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug_with_VLD|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Gui\Widgets\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Test_Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Gui\Widgets\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Test_Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Gui\Widgets\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="ReleaseDEBUG|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\Gui\Widgets\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\gui\widgets\num_box.hpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\src\gui\widgets\pane.cpp"
 					>
@@ -11321,6 +11377,62 @@
 						RelativePath="..\..\src\gui\auxiliary\window_builder\multi_page.hpp"
 						>
 					</File>
+					<File
+						RelativePath="..\..\src\gui\auxiliary\window_builder\num_box.cpp"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\Gui\Auxiliary\Window_Builder\"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\Gui\Auxiliary\Window_Builder\"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug_with_VLD|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\Gui\Auxiliary\Window_Builder\"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Test_Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\Gui\Auxiliary\Window_Builder\"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Test_Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\Gui\Auxiliary\Window_Builder\"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="ReleaseDEBUG|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\Gui\Auxiliary\Window_Builder\"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\..\src\gui\auxiliary\window_builder\num_box.hpp"
+						>
+					</File>
 					<File
 						RelativePath="..\..\src\gui\auxiliary\window_builder\pane.cpp"
 						>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -481,6 +481,7 @@ set(wesnoth-gui_widget_SRC
 	gui/widgets/matrix.cpp
 	gui/widgets/minimap.cpp
 	gui/widgets/multi_page.cpp
+	gui/widgets/num_box.cpp
 	gui/widgets/pane.cpp
 	gui/widgets/panel.cpp
 	gui/widgets/password_box.cpp
@@ -518,6 +519,7 @@ set(wesnoth-gui_widget_SRC
 	gui/auxiliary/window_builder/matrix.cpp
 	gui/auxiliary/window_builder/minimap.cpp
 	gui/auxiliary/window_builder/multi_page.cpp
+	gui/auxiliary/window_builder/num_box.cpp
 	gui/auxiliary/window_builder/pane.cpp
 	gui/auxiliary/window_builder/panel.cpp
 	gui/auxiliary/window_builder/password_box.cpp

diff --git a/src/SConscript b/src/SConscript
@@ -328,6 +328,7 @@ wesnoth_sources = Split("""
     gui/auxiliary/window_builder/matrix.cpp
     gui/auxiliary/window_builder/minimap.cpp
     gui/auxiliary/window_builder/multi_page.cpp
+    gui/auxiliary/window_builder/num_box.cpp
     gui/auxiliary/window_builder/pane.cpp
     gui/auxiliary/window_builder/panel.cpp
     gui/auxiliary/window_builder/password_box.cpp
@@ -416,6 +417,7 @@ wesnoth_sources = Split("""
     gui/widgets/matrix.cpp
     gui/widgets/minimap.cpp
     gui/widgets/multi_page.cpp
+    gui/widgets/num_box.cpp
     gui/widgets/pane.cpp
     gui/widgets/panel.cpp
     gui/widgets/password_box.cpp

diff --git a/src/gui/auxiliary/window_builder.cpp b/src/gui/auxiliary/window_builder.cpp
@@ -37,6 +37,7 @@
 #include "gui/auxiliary/window_builder/drawing.hpp"
 #include "gui/auxiliary/window_builder/pane.hpp"
 #include "gui/auxiliary/window_builder/password_box.hpp"
+#include "gui/auxiliary/window_builder/num_box.hpp"
 #include "gui/auxiliary/window_builder/viewport.hpp"
 #endif
 #include "gui/auxiliary/window_builder/instance.hpp"
@@ -219,6 +220,7 @@ tbuilder_widget_ptr create_builder_widget(const config& cfg)
 	TRY(button);
 	TRY(drawing);
 	TRY(password_box);
+	TRY(num_box);
 #undef TRY
 #endif
 

diff --git a/src/gui/widgets/settings.cpp b/src/gui/widgets/settings.cpp
@@ -207,7 +207,9 @@ struct tgui_definition
  * Listbox &                      @macro = listbox_description $
  * Minimap &                      @macro = minimap_description $
  * Multi_page &                   @macro = multi_page_description $
+ * Num_box &                      A text box that converts the input to an integer. $
  * Panel &                        @macro = panel_description $
+ * Password_box &                 A text box masking it's content by asterisks. $
  * Repeating_button &             @macro = repeating_button_description $
  * Scroll_label &                 @macro = scroll_label_description $
  * Slider &                       @macro = slider_description $