Skip to content

Commit

Permalink
GUI2/Stacked Widget: removed [stack] wrapper around [layer] and use t…
Browse files Browse the repository at this point in the history 
…he latter directly

All dialog WML changes in this commit consist of removing [stack] tags and reducing subsequent subtag indent
by one layer.
  • Loading branch information
@Vultraz
Vultraz committed Oct 10, 2016
1 parent 25eb58a commit 1f18553
Show file tree
Hide file tree
Showing 15 changed files with 656 additions and 713 deletions.
23 changes: 10 additions & 13 deletions data/gui/macros/_initial.cfg
View file
Expand Up @@ -196,10 +196,9 @@
[stacked_widget]
definition = "default"

[stack]
{GUI__WIDGET_FORCE_SIZE_LAYER {WIDTH} {HEIGHT}}
{GUI__LAYER_GRID {WIDGET}}
[/stack]
{GUI__WIDGET_FORCE_SIZE_LAYER {WIDTH} {HEIGHT}}
{GUI__LAYER_GRID {WIDGET}}

[/stacked_widget]
#enddef

Expand All @@ -214,10 +213,9 @@
[stacked_widget]
definition = "default"

[stack]
{GUI__WIDGET_BORDER_LAYER {MARGIN} {THICKNESS} {COLOR}}
{GUI__LAYER_GRID {WIDGET}}
[/stack]
{GUI__WIDGET_BORDER_LAYER {MARGIN} {THICKNESS} {COLOR}}
{GUI__LAYER_GRID {WIDGET}}

[/stacked_widget]
#enddef

Expand All @@ -226,11 +224,10 @@
[stacked_widget]
definition = "default"

[stack]
{GUI__WIDGET_FORCE_SIZE_LAYER {WIDTH} {HEIGHT}}
{GUI__WIDGET_BORDER_LAYER {MARGIN} {THICKNESS} {COLOR}}
{GUI__LAYER_GRID {WIDGET}}
[/stack]
{GUI__WIDGET_FORCE_SIZE_LAYER {WIDTH} {HEIGHT}}
{GUI__WIDGET_BORDER_LAYER {MARGIN} {THICKNESS} {COLOR}}
{GUI__LAYER_GRID {WIDGET}}

[/stacked_widget]
#enddef

Expand Down
9 changes: 2 additions & 7 deletions data/gui/schema.cfg
View file
Expand Up @@ -1953,15 +1953,10 @@
max="-1"
super="generic/widget_instance"
[tag]
name="stack"
name="layer"
min="0"
max="-1"
[tag]
name="layer"
min="0"
max="-1"
super="gui/window/resolution/grid"
[/tag]
super="gui/window/resolution/grid"
[/tag]
[/tag]
[tag]
Expand Down
102 changes: 49 additions & 53 deletions data/gui/window/addon_description.cfg
View file
Expand Up @@ -384,78 +384,74 @@

[stacked_widget]

[stack]
[layer]

[layer]
[row]

[row]
[column]
border = "all"
border_size = 5
horizontal_alignment = "left"

[column]
border = "all"
border_size = 5
horizontal_alignment = "left"
[label]
id = "url_none"
label = _ "url^None"
[/label]

[label]
id = "url_none"
label = _ "url^None"
[/label]
[/column]

[/column]
[/row]

[/row]
[/layer]

[/layer]
[layer]

[layer]
[row]

[row]
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_grow = "true"

[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_grow = "true"
[text_box]
id = "url"
definition = "default"
[/text_box]

[text_box]
id = "url"
definition = "default"
[/text_box]
[/column]

[/column]
[column]
border = "all"
border_size = 5
horizontal_alignment = "right"

[column]
border = "all"
border_size = 5
horizontal_alignment = "right"
[button]
id = "url_copy"
definition = "action_copy"
label = _ "url^Copy"
tooltip = _ "Copy this URL to clipboard"
[/button]

[button]
id = "url_copy"
definition = "action_copy"
label = _ "url^Copy"
tooltip = _ "Copy this URL to clipboard"
[/button]
[/column]

[/column]
[column]
border = "all"
border_size = 5
horizontal_alignment = "right"

[column]
border = "all"
border_size = 5
horizontal_alignment = "right"
[button]
id = "url_go"
definition = "action_go"
label = _ "url^Go"
tooltip = _ "Visit this URL with a web browser"
[/button]

[button]
id = "url_go"
definition = "action_go"
label = _ "url^Go"
tooltip = _ "Visit this URL with a web browser"
[/button]
[/column]

[/column]
[/row]

[/row]

[/layer]

[/stack]
[/layer]

[/stacked_widget]

Expand Down
162 changes: 77 additions & 85 deletions data/gui/window/addon_list.cfg
View file
Expand Up @@ -326,53 +326,49 @@
id = "install_update_stack"
definition = "default"

[stack]
[layer]

[layer]
[row]

[row]
[column]
grow_factor = 1
horizontal_grow = "true"

[column]
grow_factor = 1
horizontal_grow = "true"
border = "all"
border_size = 5

border = "all"
border_size = 5
[button]
id = "single_install"
definition = "install"
[/button]

[button]
id = "single_install"
definition = "install"
[/button]
[/column]

[/column]
[/row]

[/row]
[/layer]

[/layer]
[layer]

[layer]
[row]

[row]
[column]
grow_factor = 1
horizontal_grow = "true"

[column]
grow_factor = 1
horizontal_grow = "true"
border = "all"
border_size = 5

border = "all"
border_size = 5
[button]
id = "single_update"
definition = "update"
[/button]

[button]
id = "single_update"
definition = "update"
[/button]
[/column]

[/column]
[/row]

[/row]

[/layer]

[/stack]
[/layer]

[/stacked_widget]

Expand Down Expand Up @@ -879,78 +875,74 @@
[stacked_widget]
id = "feedback_stack"

[stack]
[layer]

[layer]
[row]

[row]
[column]
border = "all"
border_size = 5
horizontal_alignment = "left"

[column]
border = "all"
border_size = 5
horizontal_alignment = "left"
[label]
id = "url_none"
label = _ "url^None"
[/label]

[label]
id = "url_none"
label = _ "url^None"
[/label]
[/column]

[/column]
[/row]

[/row]

[/layer]
[/layer]

[layer]

[row]
[layer]

[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_grow = "true"
[row]

[text_box]
id = "url"
definition = "default"
[/text_box]
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_grow = "true"

[/column]
[text_box]
id = "url"
definition = "default"
[/text_box]

[column]
border = "all"
border_size = 5
horizontal_alignment = "right"
[/column]

[button]
id = "url_copy"
definition = "action_copy"
label = _ "url^Copy"
tooltip = _ "Copy this URL to clipboard"
[/button]
[column]
border = "all"
border_size = 5
horizontal_alignment = "right"

[/column]
[button]
id = "url_copy"
definition = "action_copy"
label = _ "url^Copy"
tooltip = _ "Copy this URL to clipboard"
[/button]

[column]
border = "all"
border_size = 5
horizontal_alignment = "right"
[/column]

[button]
id = "url_go"
definition = "action_go"
label = _ "url^Go"
tooltip = _ "Visit this URL with a web browser"
[/button]
[column]
border = "all"
border_size = 5
horizontal_alignment = "right"

[/column]
[button]
id = "url_go"
definition = "action_go"
label = _ "url^Go"
tooltip = _ "Visit this URL with a web browser"
[/button]

[/row]
[/column]

[/layer]
[/row]

[/stack]
[/layer]

[/stacked_widget]

Expand Down

0 comments on commit 1f18553

Please sign in to comment.