[Wesnoth-cvs-commits] wesnoth src/editor/editor_layout.cpp data/theme...

[Bram Ridder]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Bram Ridder <address@hidden>    05/07/13 00:27:57

Modified files:
        src/editor     : editor_layout.cpp 
        data/themes    : editor.cfg 
Added files:
        images/buttons : draw_button_editor-active.png 
                         draw_button_editor.png 
                         draw_button_editor-pressed.png 
                         flip_map_button_editor-active.png 
                         flip_map_button_editor.png 
                         flip_map_button_editor-pressed.png 
                         flood_button_editor-active.png 
                         flood_button_editor.png 
                         flood_button_editor-pressed.png 
                         paste_button_editor-active.png 
                         paste_button_editor.png 
                         paste_button_editor-pressed.png 
                         redo_button_editor-active.png 
                         redo_button_editor.png 
                         redo_button_editor-pressed.png 
                         resize_button_editor-active.png 
                         resize_button_editor.png 
                         resize_button_editor-pressed.png 
                         start_position_button_editor-active.png 
                         start_position_button_editor.png 
                         start_position_button_editor-pressed.png 
                         toggle_grid_button_editor-active.png 
                         toggle_grid_button_editor.png 
                         toggle_grid_button_editor-pressed.png 
                         undo_button_editor-active.png 
                         undo_button_editor.png 
                         undo_button_editor-pressed.png 
                         zoom_in_button_editor-active.png 
                         zoom_in_button_editor.png 
                         zoom_in_button_editor-pressed.png 
                         zoom_out_button_editor-active.png 
                         zoom_out_button_editor.png 
                         zoom_out_button_editor-pressed.png 

Log message:
        Created a toolbar under the mini map. The buttons with labels have been
        replaced by buttons with icons. The art needs to be redone, obviously, 
but
        the current images work for now...

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_layout.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/themes/editor.cfg.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/draw_button_editor-active.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/draw_button_editor.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/draw_button_editor-pressed.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/flip_map_button_editor-active.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/flip_map_button_editor.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/flip_map_button_editor-pressed.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/flood_button_editor-active.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/flood_button_editor.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/flood_button_editor-pressed.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/paste_button_editor-active.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/paste_button_editor.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/paste_button_editor-pressed.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/redo_button_editor-active.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/redo_button_editor.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/redo_button_editor-pressed.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/resize_button_editor-active.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/resize_button_editor.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/resize_button_editor-pressed.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/start_position_button_editor-active.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/start_position_button_editor.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/start_position_button_editor-pressed.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/toggle_grid_button_editor-active.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/toggle_grid_button_editor.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/toggle_grid_button_editor-pressed.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/undo_button_editor-active.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/undo_button_editor.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/undo_button_editor-pressed.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/zoom_in_button_editor-active.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/zoom_in_button_editor.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/zoom_in_button_editor-pressed.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/zoom_out_button_editor-active.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/zoom_out_button_editor.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/buttons/zoom_out_button_editor-pressed.png?rev=1.1

Patches:
Index: wesnoth/data/themes/editor.cfg
diff -u wesnoth/data/themes/editor.cfg:1.30 wesnoth/data/themes/editor.cfg:1.31
--- wesnoth/data/themes/editor.cfg:1.30 Tue Jul  5 20:22:43 2005
+++ wesnoth/data/themes/editor.cfg      Wed Jul 13 00:27:57 2005
@@ -239,38 +239,34 @@
 
        # The toolbar.
        [menu]
-       title=_"Draw"
-       image=button
+       image=draw_button_editor
        items=editdraw
-       rect=900,230,1007,253
+       rect=900,230,920,250
        xanchor=right
        yanchor=fixed
        [/menu]
 
        [menu]
-       title=_"Flood"
-       image=button
+       image=flood_button_editor
        items=editfloodfill
-       rect=900,255,1007,278
-       xanchor=right
+       rect=922,230,942,250
+       xanchor=fixed
        yanchor=fixed
        [/menu]
 
        [menu]
-       title=_"Start Position"
-       image=button
+       image=start_position_button_editor
        items=editsetstartpos
-       rect=900,280,1007,303
-       xanchor=right
+       rect=944,230,964,250
+       xanchor=fixed
        yanchor=fixed
        [/menu]
 
        [menu]
-       title=_"Paste"
-       image=button
+       image=paste_button_editor
        items=editpaste
-       rect=900,305,1007,328
-       xanchor=right
+       rect=966,230,986,250
+       xanchor=fixed
        yanchor=fixed
        [/menu]
 
@@ -332,13 +328,77 @@
                [/edit_left_button_function]
 
                [selected_terrain]
-               font_size=12
-               rect=900,730,1024,20
+               font_size=10
+               rect=890,730,1024,20
                xanchor=right
                yanchor=bottom
                [/selected_terrain]
 
        [/status]
+
+       # Botton panel
+       #[panel]
+        #image=misc/bottomside-editor.png
+        #rect=0,698,882,758
+        #xanchor=right
+        #yanchor=bottom
+       #[/panel]
+
+       [menu]
+       image=resize_button_editor
+       items=editresize
+       rect=900,304,20,20
+       xanchor=fixed   
+       yachnor=fixed
+       [/menu]
+
+        [menu]
+        image=flip_map_button_editor
+        items=editflip
+        rect=922,304,20,20
+        xanchor=fixed
+        yachnor=fixed
+        [/menu]
+
+       [menu]
+        image=undo_button_editor
+        items=undo
+        rect=900,258,20,20
+        xanchor=fixed
+        yachnor=fixed
+        [/menu]
+
+        [menu]
+        image=redo_button_editor
+        items=redo
+        rect=922,258,20,20
+        xanchor=fixed
+        yachnor=fixed
+        [/menu]
+
+        [menu]
+        image=toggle_grid_button_editor
+        items=togglegrid
+        rect=942,304,20,20
+        xanchor=fixed
+        yachnor=fixed
+        [/menu]
+
+       [menu]
+       image=zoom_in_button_editor
+       items=zoomin
+       rect=900,281,20,20
+       xanchor=fixed
+       yachnor=fixed
+       [/menu]
+
+       [menu]
+       image=zoom_out_button_editor
+       items=zoomout
+       rect=922,281,20,20
+       xanchor=fixed
+       yanchor=fixed
+       [/menu]
                
 [/resolution]
 [/theme]
Index: wesnoth/src/editor/editor_layout.cpp
diff -u wesnoth/src/editor/editor_layout.cpp:1.7 
wesnoth/src/editor/editor_layout.cpp:1.8
--- wesnoth/src/editor/editor_layout.cpp:1.7    Tue Jul  5 10:14:50 2005
+++ wesnoth/src/editor/editor_layout.cpp        Wed Jul 13 00:27:57 2005
@@ -16,7 +16,7 @@
 
 
 namespace {
-       const size_t default_terrain_size = 35;
+       const size_t default_terrain_size = 36;
        const size_t default_palette_width = 3;
 }
 namespace map_editor {
@@ -35,9 +35,9 @@
 }
 
 void adjust_sizes(const display &disp, size_specs &sizes) {
-       sizes.brush_x = disp.mapx() + 33;
+       sizes.brush_x = disp.mapx() + 28;
        sizes.brush_y = 190;
-       sizes.palette_x = disp.mapx() + 15;
+       sizes.palette_x = disp.mapx() + 13;
        sizes.palette_y = sizes.brush_y + 160 + 10;
        sizes.palette_w = sizes.terrain_space * default_palette_width;
        sizes.palette_h = disp.y() - sizes.palette_y - 60;