tpreferences: move composite slider definition to main file

This makes it available to all preference subfiles
wesnoth · Feb 21, 2016 · 6d48d72 · 6d48d72
1 parent a13ad0c
commit 6d48d72
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 50 deletions.
diff --git a/data/gui/default/window/preferences.cfg b/data/gui/default/window/preferences.cfg
@@ -46,6 +46,55 @@
 	[/toggle_panel]
 #enddef
 
+#define _GUI_PREFERENCES_MAIN_COMPOSITE_SLIDER _LABEL_ID _LABEL_TEXT _SLIDER_ID _SLIDER_ATTRIBUTES
+	[grid]
+		[row]
+			[column]
+				horizontal_alignment = "left"
+				[grid]
+					[row]
+						[column]
+							border = "top,left,right"
+							border_size = 5
+							horizontal_alignment = "left"
+
+							[label]
+								id = "help_text"
+								definition = "default_small"
+								label = {_LABEL_TEXT}
+							[/label]
+						[/column]
+
+						[column]
+							border = "top,right"
+							border_size = 5
+							horizontal_alignment = "left"
+
+							[scroll_label]
+								id = {_LABEL_ID}
+								definition = "default_small"
+							[/scroll_label]
+						[/column]
+					[/row]
+				[/grid]
+			[/column]
+		[/row]
+		[row]
+			[column]
+				border = "all"
+				border_size = 5
+				horizontal_grow = true
+
+				[slider]
+					id = {_SLIDER_ID}
+					definition = "minimal"
+					{_SLIDER_ATTRIBUTES}
+				[/slider]
+			[/column]
+		[/row]
+	[/grid]
+#enddef
+
 [window]
 	id = "preferences"
 	description = "Main game preferences dialog."
@@ -245,5 +294,6 @@
 #undef _GUI_PREFS_PAGE4
 #undef _GUI_PREFS_PAGE5
 #undef _GUI_PREFS_PAGE
+#undef _GUI_PREFERENCES_MAIN_COMPOSITE_SLIDER
 #undef _GUI_INFO_TAB_PADDING
 #undef _GUI_TAB_BAR
diff --git a/data/gui/default/window/preferences/01_general.cfg b/data/gui/default/window/preferences/01_general.cfg
@@ -3,55 +3,6 @@
 ### Preferences dialog, General page
 ###
 
-#define _GUI_PREFERENCES_MAIN_COMPOSITE_SLIDER _LABEL_ID _LABEL_TEXT _SLIDER_ID _SLIDER_ATTRIBUTES
-	[grid]
-		[row]
-			[column]
-				horizontal_alignment = "left"
-				[grid]
-					[row]
-						[column]
-							border = "top,left,right"
-							border_size = 5
-							horizontal_alignment = "left"
-
-							[label]
-								id = "help_text"
-								definition = "default_small"
-								label = {_LABEL_TEXT}
-							[/label]
-						[/column]
-
-						[column]
-							border = "top,right"
-							border_size = 5
-							horizontal_alignment = "left"
-
-							[scroll_label]
-								id = {_LABEL_ID}
-								definition = "default_small"
-							[/scroll_label]
-						[/column]
-					[/row]
-				[/grid]
-			[/column]
-		[/row]
-		[row]
-			[column]
-				border = "all"
-				border_size = 5
-				horizontal_grow = true
-
-				[slider]
-					id = {_SLIDER_ID}
-					definition = "minimal"
-					{_SLIDER_ATTRIBUTES}
-				[/slider]
-			[/column]
-		[/row]
-	[/grid]
-#enddef
-
 #define _GUI_PREFERENCES_GENERAL_GRID_1
 	[row]
 		[column]
@@ -317,4 +268,3 @@
 
 #undef _GUI_PREFERENCES_GENERAL_GRID_1
 #undef _GUI_PREFERENCES_GENERAL_GRID_2
-#undef _GUI_PREFERENCES_MAIN_COMPOSITE_SLIDER