Author: mordante
Date: Sat Apr 5 16:12:42 2008
New Revision: 25579
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25579&view=rev
Log:
Add the initial gui definitions.
Added:
trunk/data/gui/
trunk/data/gui/default/
trunk/data/gui/default.cfg
trunk/data/gui/default/macros.cfg
trunk/data/gui/default/widget/
trunk/data/gui/default/widget/button_default.cfg
trunk/data/gui/default/widget/button_drawn.cfg
trunk/data/gui/default/widget/label.cfg
trunk/data/gui/default/widget/text_box.cfg
trunk/data/gui/default/widget/window_default.cfg
trunk/data/gui/default/window/
trunk/data/gui/default/window/addon.cfg
Added: trunk/data/gui/default.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default.cfg?rev=25579&view=auto
==============================================================================
--- trunk/data/gui/default.cfg (added)
+++ trunk/data/gui/default.cfg Sat Apr 5 16:12:42 2008
@@ -1,0 +1,19 @@
+###
+### Defines a gui, all widgets and windows used in a certain 'theme'.
+###
+
+[gui]
+ id = "default"
+ description = _ "Default"
+
+{gui/default/macros.cfg}
+{gui/default/window/}
+{gui/default/widget/}
+
+# For tab sheets we need two kinds
+# - 1 where we're a filter eg every irc chan looks the same
+# - 1 where every page has other data
+
+# rename set_dirty to redraw and add another one for resize
+
+[/gui]
Added: trunk/data/gui/default/macros.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/macros.cfg?rev=25579&view=auto
==============================================================================
--- trunk/data/gui/default/macros.cfg (added)
+++ trunk/data/gui/default/macros.cfg Sat Apr 5 16:12:42 2008
@@ -1,0 +1,145 @@
+###
+### Contains the macros for the new widget library, not sorted yet.
+###
+
+
+#
+#
+##### Default settings
+#
+#
+
+#define FONT_COLOUR_ENABLED
+ "0, 0, 0, 255"
+#enddef
+
+#define FONT_COLOUR_DISABLED
+ "128, 128, 128, 0"
+#enddef
+
+
+#
+#
+#### settings per resolution
+#
+#
+
+
+# Definition of the upper border of tiny-gui
+#define RESOLUTION_TINY
+ window_width = 640
+ window_height = 480
+#enddef
+
+#define FONT_SIZE_TINY__SMALL
+ 9
+#enddef
+
+#define FONT_SIZE_TINY__NORMAL
+ 10
+#enddef
+
+#define FONT_SIZE_TINY__BIG
+ 11
+#enddef
+
+# Definition of the upper border of small-gui
+#define RESOLUTION_SMALL
+ window_width = 800
+ window_height = 480
+#enddef
+
+# Definition of the upper border of the normal gui
+#define RESOLUTION_NORMAL
+ window_width = 1024
+ window_height = 768
+#enddef
+
+#define FONT_SIZE_NORMAL__SMALL
+ 12
+#enddef
+
+#define FONT_SIZE_NORMAL__NORMAL
+ 14
+#enddef
+
+#define FONT_SIZE_NORMAL__BIG
+ 18
+#enddef
+
+# Definition of the upper border of the big gui
+#define RESOLUTION_BIG
+ window_width = 1680
+ window_height = 1050
+#enddef
+
+# for guis bigger as big fall back to the default of 0 0
+
+#
+#
+# Other helper macros
+#
+#
+
+#define OUTER_RECT COLOUR_1 COLOUR_2
+ [line]
+ x1 = 0
+ y1 = 0
+ x2 = "(width - 1)"
+ y2 = 0
+ colour = {COLOUR_1}
+ thickness = 1
+ [/line]
+
+ [line]
+ x1 = "(width - 1)"
+ y1 = 0
+ x2 = "(width - 1)"
+ y2 = "(height - 1)"
+ colour = {COLOUR_1}
+ thickness = 1
+ [/line]
+
+ [line]
+ x1 = "(width - 1)"
+ y1 = "(height - 1)"
+ x2 = 0
+ y2 = "(height - 1)"
+ colour = {COLOUR_2}
+ thickness = 1
+ [/line]
+
+ [line]
+ x1 = 0
+ y1 = "(height - 1)"
+ x2 = 0
+ y2 = 0
+ colour = {COLOUR_2}
+ thickness = 1
+ [/line]
+
+#enddef
+
+# Make sure that if the text is to wide we don't get a negative
+# number of huge positive number.
+#define TEXT_H_CENTRE
+ "(if(text_width <= width, (width - text_width ) / 2, 0))"
+#enddef
+
+# Make sure that if the text is to wide we don't get a negative
+# number of huge positive number.
+#define TEXT_V_CENTRE
+ "(if(text_height <= height, (height - text_height) / 2, 0))"
+#enddef
+
+#define TEXT_DEFAULT_NORMAL
+ [text]
+ x = {TEXT_H_CENTRE}
+ y = {TEXT_V_CENTRE}
+ w = "(text_width)"
+ h = "(text_height)"
+ font_size = {FONT_SIZE_NORMAL__NORMAL}
+ colour = {FONT_COLOUR_ENABLED}
+ text = "(text)"
+ [/text]
+#enddef
Added: trunk/data/gui/default/widget/button_default.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/widget/button_default.cfg?rev=25579&view=auto
==============================================================================
--- trunk/data/gui/default/widget/button_default.cfg (added)
+++ trunk/data/gui/default/widget/button_default.cfg Sat Apr 5 16:12:42 2008
@@ -1,0 +1,81 @@
+###
+### Definition of the default button.
+###
+
+[button_definition]
+
+ id = "default"
+ description = "Default button"
+
+ [resolution]
+
+ min_width = 40
+ min_height = 22
+
+ default_width = 108
+ default_height = 22
+
+ max_width = 0
+ max_height = 22
+
+ text_extra_width = 10
+ text_extra_height = 4
+ text_font_size = {FONT_SIZE_NORMAL__NORMAL}
+
+ [state_enabled]
+
+ [draw]
+
+ [image]
+ name = "buttons/button.png"
+ [/image]
+
+ {TEXT_DEFAULT_NORMAL}
+
+ [/draw]
+
+ [/state_enabled]
+
+ [state_disabled]
+
+ [draw]
+
+ [image]
+ name = "buttons/button.png"
+ [/image]
+
+ [/draw]
+
+ [/state_disabled]
+
+ [state_pressed]
+
+ [draw]
+
+ [image]
+ name = "buttons/button-pressed.png"
+ [/image]
+
+ {TEXT_DEFAULT_NORMAL}
+
+ [/draw]
+
+ [/state_pressed]
+
+ [state_focussed]
+
+ [draw]
+
+ [image]
+ name = "buttons/button-active.png"
+ [/image]
+
+ {TEXT_DEFAULT_NORMAL}
+
+ [/draw]
+
+ [/state_focussed]
+
+ [/resolution]
+
+[/button_definition]
Added: trunk/data/gui/default/widget/button_drawn.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/widget/button_drawn.cfg?rev=25579&view=auto
==============================================================================
--- trunk/data/gui/default/widget/button_drawn.cfg (added)
+++ trunk/data/gui/default/widget/button_drawn.cfg Sat Apr 5 16:12:42 2008
@@ -1,0 +1,96 @@
+###
+### Definition of a drawn button. This button is just a proof of concept and
+### will be removed at some point.
+###
+
+[button_definition]
+ id = "drawn"
+ description = "Proof-of-concept drawn button, just shows items can be
fully drawn."
+
+ [resolution]
+ window_width = 0
+ window_height = 0
+
+ min_width = 40
+ min_height = 22
+
+ default_width = 208
+ default_height = 22
+
+ max_width = 0
+ max_height = 22
+
+ text_extra_width = 10
+ text_extra_height = 4
+ text_font_size = 15
+
+ [state_enabled]
+
+ full_redraw = "true"
+
+ [draw]
+
+ {OUTER_RECT "255, 255, 255, 255" "0, 0, 0, 255"}
+
+ {TEXT_DEFAULT_NORMAL}
+
+ [/draw]
+
+ [/state_enabled]
+
+ [state_disabled]
+ # this state isn't used yet so also not drawing stuff
+ [draw]
+ [/draw]
+ [/state_disabled]
+
+ [state_pressed]
+
+ full_redraw = "true"
+
+ [draw]
+
+ [rectangle]
+ x = 1
+ y = 1
+ w = "(width - 2)"
+ h = "(height - 2)"
+ border_thickness = 0
+ fill_colour = "64, 64, 64, 128"
+ [/rectangle]
+
+ {OUTER_RECT "0, 0, 0, 255" "255, 255, 255, 255"}
+
+ {TEXT_DEFAULT_NORMAL}
+
+ [/draw]
+
+ [/state_pressed]
+
+ [state_focussed]
+
+ full_redraw = "true"
+
+ [draw]
+
+ [rectangle]
+ x = 1
+ y = 1
+ w = "(width - 2)"
+ h = "(height - 2)"
+ border_thickness = 0
+ fill_colour = "196, 196, 196, 128"
+
+ [/rectangle]
+
+ {OUTER_RECT "255, 255, 255, 255" "0, 0, 0, 255"}
+
+ {TEXT_DEFAULT_NORMAL}
+
+ [/draw]
+
+ [/state_focussed]
+
+ [/resolution]
+
+[/button_definition]
Added: trunk/data/gui/default/widget/label.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/widget/label.cfg?rev=25579&view=auto
==============================================================================
--- trunk/data/gui/default/widget/label.cfg (added)
+++ trunk/data/gui/default/widget/label.cfg Sat Apr 5 16:12:42 2008
@@ -1,0 +1,42 @@
+###
+### Definition of a label.
+###
+
+[label_definition]
+ id = "default"
+ description = "Default label"
+
+ [resolution]
+ min_width = 40
+ min_height = 22
+
+ default_width = 180
+ default_height = 22
+
+ max_width = 0
+ max_height = 22
+
+ [state_enabled]
+
+ full_redraw = "true"
+
+ [draw]
+
+ [text]
+ x = "5"
+ y = {TEXT_V_CENTRE}
+ w = "(text_width)"
+ h = "(text_height)"
+ font_size = {FONT_SIZE_NORMAL__NORMAL}
+ colour = {FONT_COLOUR_ENABLED}
+ text = "(text)"
+ [/text]
+
+ [/draw]
+
+ [/state_enabled]
+
+ [/resolution]
+
+[/label_definition]
+
Added: trunk/data/gui/default/widget/text_box.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/widget/text_box.cfg?rev=25579&view=auto
==============================================================================
--- trunk/data/gui/default/widget/text_box.cfg (added)
+++ trunk/data/gui/default/widget/text_box.cfg Sat Apr 5 16:12:42 2008
@@ -1,0 +1,52 @@
+###
+### Definition of a single line text box.
+###
+
+[text_box_definition]
+ id = "default"
+ description = "Default text box"
+
+ [resolution]
+ min_width = 40
+ min_height = 22
+
+ default_width = 250
+ default_height = 22
+
+ max_width = 0
+ max_height = 22
+
+ [state_enabled]
+
+ full_redraw = "true"
+
+ [draw]
+
+ [rectangle]
+ x = 0
+ y = 0
+ w = "(width)"
+ h = "(height)"
+
+ border_thickness = 3
+ border_colour = "55, 55, 55, 192"
+
+ [/rectangle]
+
+ [text]
+ x = "5"
+ y = {TEXT_V_CENTRE}
+ w = "(text_width)"
+ h = "(text_height)"
+ font_size = {FONT_SIZE_NORMAL__NORMAL}
+ colour = {FONT_COLOUR_ENABLED}
+ text = "(text)"
+ [/text]
+
+ [/draw]
+
+ [/state_enabled]
+
+ [/resolution]
+
+[/text_box_definition]
Added: trunk/data/gui/default/widget/window_default.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/widget/window_default.cfg?rev=25579&view=auto
==============================================================================
--- trunk/data/gui/default/widget/window_default.cfg (added)
+++ trunk/data/gui/default/widget/window_default.cfg Sat Apr 5 16:12:42 2008
@@ -1,0 +1,56 @@
+###
+### Default definition of a window.
+###
+
+[window_definition]
+
+ id = "default"
+ description = "The default window"
+
+ [resolution]
+
+ left_border = 10
+ right_border = 10
+ top_border = 10
+ bottom_border = 10
+
+ [background]
+
+ [draw]
+
+ [rectangle]
+ x = 0
+ y = 0
+ w = "(width)"
+ h = "(height)"
+
+ border_thickness = 3
+ border_colour = "55, 55, 55, 192"
+ fill_colour = "128, 128, 128, 128"
+ [/rectangle]
+
+ [rectangle]
+ x = 10
+ y = 10
+ w = "(width - 20)"
+ h = "(height - 20)"
+
+ border_thickness = 3
+ border_colour = "55, 55, 55, 192"
+ [/rectangle]
+
+ [/draw]
+
+ [/background]
+
+ [foreground]
+
+ [draw]
+ [/draw]
+
+ [/foreground]
+
+ [/resolution]
+
+[/window_definition]
+
Added: trunk/data/gui/default/window/addon.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/window/addon.cfg?rev=25579&view=auto
==============================================================================
--- trunk/data/gui/default/window/addon.cfg (added)
+++ trunk/data/gui/default/window/addon.cfg Sat Apr 5 16:12:42 2008
@@ -1,0 +1,110 @@
+###
+### Definition of the window to connect to the addon server or manage locally
+### installed addons.
+###
+
+[window]
+ id = "addon_connect"
+ description = _ "addon server connection dialog"
+
+ [resolution]
+ top = "center"
+ left = "center"
+
+ width = 600
+ height = 150
+
+ window_definition = "default"
+
+ [grid]
+
+ [row]
+
+ [column]
+
+ [label]
+ label_definition = "default"
+
+ label = _ "name :"
+ [/label]
+
+ [/column]
+
+ [column]
+
+ [text_box]
+ id = "host_name"
+ edit_box_definition = "default"
+
+ size_text = _ "very long text
which might need to fit"
+ label = ""
+ [/text_box]
+
+ [/column]
+
+ [/row]
+
+ [row]
+
+ [column]
+
+ [label]
+ # Dummy; empty cells aren't
allowed (yet).
+ label_definition = "default"
+
+ label = ""
+ [/label]
+
+ [/column]
+
+ [column]
+
+ [button]
+ # just show how the default
looks.
+ button_definition = "default"
+
+ size_text = _ "manage addons"
+ label = _ "manage addons"
+
+ # we define the return value
manually instead of being
+ # linked to the id. Not sure
whether that's the best
+ # solution, but it's nice as
proof-of-concept.
+ return_value = 2
+ [/button]
+
+ [/column]
+
+ [/row]
+
+ [row]
+
+ [column]
+
+ [button]
+ id = "ok"
+ button_definition = "drawn"
+
+ size_text = _ "connect"
+ label = _ "connect"
+ [/button]
+
+ [/column]
+
+ [column]
+
+ [button]
+ id = "cancel"
+ button_definition = "drawn"
+
+ label = _ "cancel"
+ [/button]
+
+ [/column]
+
+ [/row]
+
+ [/grid]
+
+ [/resolution]
+
+[/window]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
