mail[Wesnoth-commits] r29095 - /trunk/data/gui/default/widget/


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by koraq on August 29, 2008 - 21:26:
Author: mordante
Date: Fri Aug 29 21:26:12 2008
New Revision: 29095

URL: http://svn.gna.org/viewcvs/wesnoth?rev=29095&view=rev
Log:
Cleanup patch to move macros in the string.

Modified:
    trunk/data/gui/default/widget/text_box_default.cfg
    trunk/data/gui/default/widget/toggle_button_listbox_text_with_icon.cfg
    trunk/data/gui/default/widget/vertical_scrollbar_default.cfg
    trunk/data/gui/default/widget/window_default.cfg

Modified: trunk/data/gui/default/widget/text_box_default.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/widget/text_box_default.cfg?rev=29095&r1=29094&r2=29095&view=diff
==============================================================================
--- trunk/data/gui/default/widget/text_box_default.cfg (original)
+++ trunk/data/gui/default/widget/text_box_default.cfg Fri Aug 29 21:26:12 
2008
@@ -51,9 +51,9 @@
 
 #define _GUI_DRAW_CURSOR X_OFFSET
        [line]
-               x1 = "(cursor_offset + " + {X_OFFSET} + ")"
+               x1 = "(cursor_offset + {X_OFFSET})"
                y1 = "(text_y_offset)"
-               x2 = "(cursor_offset + " + {X_OFFSET} + ")"
+               x2 = "(cursor_offset + {X_OFFSET})"
                y2 = "(text_y_offset + text_font_height)"
                colour = "255, 255, 255, 255"
                thickness = 1

Modified: 
trunk/data/gui/default/widget/toggle_button_listbox_text_with_icon.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/widget/toggle_button_listbox_text_with_icon.cfg?rev=29095&r1=29094&r2=29095&view=diff
==============================================================================
--- trunk/data/gui/default/widget/toggle_button_listbox_text_with_icon.cfg 
(original)
+++ trunk/data/gui/default/widget/toggle_button_listbox_text_with_icon.cfg 
Fri Aug 29 21:26:12 2008
@@ -29,7 +29,7 @@
        [text]
                x = {OFFSET}
                y = {GUI__TEXT_VERTICALLY_CENTRED}
-               w = "(width - " + {OFFSET} + ")"
+               w = "(width - {OFFSET})"
                h =  "(text_height)"
                font_size = {FONT_SIZE}
                colour = {FONT_COLOUR}

Modified: trunk/data/gui/default/widget/vertical_scrollbar_default.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/widget/vertical_scrollbar_default.cfg?rev=29095&r1=29094&r2=29095&view=diff
==============================================================================
--- trunk/data/gui/default/widget/vertical_scrollbar_default.cfg (original)
+++ trunk/data/gui/default/widget/vertical_scrollbar_default.cfg Fri Aug 29 
21:26:12 2008
@@ -21,7 +21,7 @@
                [image]
                        x = 0
                        y = {GROOVE_TOP}
-                       h = "(height - " + {GROOVE_TOP} + " - " + 
{GROOVE_BOTTOM} + ")"
+                       h = "(height - {GROOVE_TOP} - {GROOVE_BOTTOM})"
                        stretch = true
                        name = "buttons/scrollgroove-mid.png"
                [/image]
@@ -29,7 +29,7 @@
                [image]
                        # 5 pixels high
                        x = 0
-                       y = "(height - " + {GROOVE_BOTTOM} + ")"
+                       y = "(height - {GROOVE_BOTTOM})"
                        name = "buttons/scrollgroove-bottom.png"
                [/image]
 
@@ -41,22 +41,22 @@
                        # 5 pixels high
                        x = 0
                        y = "(positioner_offset)"
-                       name = "buttons/scrolltop" + {IMAGE_SUFFIX}
+                       name = "buttons/scrolltop{IMAGE_SUFFIX}"
                [/image]
 
                [image]
                        x = 0
-                       y = "(positioner_offset + " + {POSITIONER_TOP} + ")"
-                       h = "(positioner_length - "  + {POSITIONER_TOP} + " - 
" + {POSITIONER_BOTTOM} + ")"
+                       y = "(positioner_offset + {POSITIONER_TOP})"
+                       h = "(positioner_length - {POSITIONER_TOP} - 
{POSITIONER_BOTTOM})"
                        stretch = true
-                       name = "buttons/scrollmid"+ {IMAGE_SUFFIX}
+                       name = "buttons/scrollmid{IMAGE_SUFFIX}"
                [/image]
 
                [image]
                        # 5 pixels high
                        x = 0
-                       y = "(positioner_offset + positioner_length - "  + 
{POSITIONER_BOTTOM} + ")"
-                       name = "buttons/scrollbottom" + {IMAGE_SUFFIX}
+                       y = "(positioner_offset + positioner_length - 
{POSITIONER_BOTTOM})"
+                       name = "buttons/scrollbottom{IMAGE_SUFFIX}"
                [/image]
 
        [/draw]

Modified: trunk/data/gui/default/widget/window_default.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/widget/window_default.cfg?rev=29095&r1=29094&r2=29095&view=diff
==============================================================================
--- trunk/data/gui/default/widget/window_default.cfg (original)
+++ trunk/data/gui/default/widget/window_default.cfg Fri Aug 29 21:26:12 2008
@@ -43,7 +43,7 @@
 #                              [/rectangle]
 
                                [image]
-                                       name = "dialogs/" + {BASE_NAME} + 
"-border-topleft.png"
+                                       name = 
"dialogs/{BASE_NAME}-border-topleft.png"
                                [/image]
 
                                [image]
@@ -51,13 +51,13 @@
                                        y = 0
                                        w = "(width - 14)"
                                        stretch = "true"
-                                       name = "dialogs/" +  {BASE_NAME} + 
"-border-top.png"
+                                       name = 
"dialogs/{BASE_NAME}-border-top.png"
                                [/image]
 
                                [image]
                                        x = "(width - 9)"
                                        y = 0
-                                       name = "dialogs/" +  {BASE_NAME} + 
"-border-topright.png"
+                                       name = 
"dialogs/{BASE_NAME}-border-topright.png"
                                [/image]
 
                                [image]
@@ -65,13 +65,13 @@
                                        y = 5
                                        h = "(height - 14)"
                                        stretch = "true"
-                                       name = "dialogs/" +  {BASE_NAME} + 
"-border-right.png"
+                                       name = 
"dialogs/{BASE_NAME}-border-right.png"
                                [/image]
 
                                [image]
                                        x = "(width - 9)"
                                        y = "(height - 9)"
-                                       name = "dialogs/" +  {BASE_NAME} + 
"-border-botright.png"
+                                       name = 
"dialogs/{BASE_NAME}-border-botright.png"
                                [/image]
 
                                [image]
@@ -79,13 +79,13 @@
                                        y = "(height - 9)"
                                        w = "(width - 14)"
                                        stretch = "true"
-                                       name = "dialogs/" +  {BASE_NAME} + 
"-border-bottom.png"
+                                       name = 
"dialogs/{BASE_NAME}-border-bottom.png"
                                [/image]
 
                                [image]
                                        x = 0
                                        y = "(height - 9)"
-                                       name = "dialogs/" +  {BASE_NAME} + 
"-border-botleft.png"
+                                       name = 
"dialogs/{BASE_NAME}-border-botleft.png"
                                [/image]
 
                                [image]
@@ -93,7 +93,7 @@
                                        y = 5
                                        h = "(height - 14)"
                                        stretch = "true"
-                                       name = "dialogs/" +  {BASE_NAME} + 
"-border-left.png"
+                                       name = 
"dialogs/{BASE_NAME}-border-left.png"
                                [/image]
 
                                [image]
@@ -101,7 +101,7 @@
                                        y = 5
                                        w = "(width - 14)"
                                        h = "(height - 14)"
-                                       name = "dialogs/" +  {BASE_NAME} + 
"-background.png"
+                                       name = 
"dialogs/{BASE_NAME}-background.png"
                                [/image]
 
                        [/draw]




Related Messages


Powered by MHonArc, Updated Fri Aug 29 21:41:01 2008