Merge branch 'master' of ssh://git.code.sf.net/p/wesnoth/code

data/core/about.cfg

@@ -1110,7 +1110,7 @@
         comment = "AI improvements"
     [/entry]
     [entry]
-        name = "Maxim Biro"
+        name = "Maxim Biro (nurupo)"
     [/entry]
     [entry]
         name = "Maximilian Lupke (malumalu)"

data/themes/editor.cfg

@@ -215,7 +215,7 @@
         [menu]
             type=radiobox
             id=draw_button_editor
-            image=editor/draw_button_editor
+            image=editor/tool/draw_button_editor
             items=editor-tool-paint
             # wmllint: local spelling left/right Ctrl+click
             tooltip= _ "Use left/right mouse button to draw fore-/background terrain. Hold Shift to paint base layer only. Ctrl+click to sample terrain under cursor."
@@ -228,7 +228,7 @@
         [menu]
             type=radiobox
             id=start_position_button_editor
-            image=editor/start_position_button_editor
+            image=editor/tool/start_position_button_editor
             items=editor-tool-starting-position
             # wmllint: local spelling alt+number
             tooltip= _ "Left mouse button displays player selection, right clears. Number keys scroll to the starting position, alt+number sets respective starting position under cursor, delete clears."
@@ -240,7 +240,7 @@
         [menu]
             type=radiobox
             id=pipette_button_editor
-            image=editor/pipette_button_editor
+            image=editor/tool/pipette_button_editor
             items=editor-tool-pipette
             tooltip= _ "Use left/right mouse button to select a terrain from the map. Not implemented yet."
             tooltip_name_prepend=yes
@@ -251,7 +251,7 @@
         [menu]
             type=radiobox
             id=item_button_editor
-            image=editor/item_button_editor
+            image=editor/tool/item_button_editor
             items=editor-tool-item
             tooltip= _ "Left mouse button sets a new item or moves it via drag and drop, right clears. Not implemented yet."
             tooltip_name_prepend=yes
@@ -262,7 +262,7 @@
         [menu]
             type=radiobox
             id=village_button_editor
-            image=editor/villages_button_editor
+            image=editor/tool/villages_button_editor
             items=editor-tool-village
             tooltip= _ "Left mouse button sets the village ownership to the current side, right clears. Not implemented yet."
             tooltip_name_prepend=yes
@@ -275,7 +275,7 @@
         [menu]
             type=radiobox
             id=flood_button_editor
-            image=editor/flood_button_editor
+            image=editor/tool/flood_button_editor
             items=editor-tool-fill
             # wmllint: local spelling fore-/background
             tooltip= _ "Use left/right mouse button to draw fore-/background terrain. Hold Shift to paint base layer only. Ctrl+click to sample terrain under cursor."
@@ -288,7 +288,7 @@
         [menu]
             type=radiobox
             id=select_button_editor
-            image=editor/select_button_editor
+            image=editor/tool/select_button_editor
             items=editor-tool-select
             # wmllint: local spelling deselects
             tooltip= _ "Left mouse button selects, right deselects. Hold Shift for magic-wand selection of tiles with same terrain."
@@ -300,7 +300,7 @@
         [menu]
             type=radiobox
             id=label_button_editor
-            image=editor/label_button_editor
+            image=editor/tool/label_button_editor
             items=editor-tool-label
             tooltip= _ "Left mouse button sets or drags a label, right clears. Not implemented yet."
             tooltip_name_prepend=yes
@@ -311,7 +311,7 @@
         [menu]
             type=radiobox
             id=soundsource_button_editor
-            image=editor/soundsource_button_editor
+            image=editor/tool/soundsource_button_editor
             items=editor-tool-soundsource
             tooltip= _ "Left mouse button sets or drags a sound source, right clears. Not implemented yet."
             tooltip_name_prepend=yes
@@ -322,7 +322,7 @@
         [menu]
             type=radiobox
             id=unit_button_editor
-            image=editor/units_button_editor
+            image=editor/tool/units_button_editor
             items=editor-tool-unit
             tooltip= _ "Left mouse button sets a new unit or moves a unit via drag and drop, right clears. Not implemented yet."
             tooltip_name_prepend=yes
@@ -334,7 +334,7 @@
         #3th Row.
         [menu]
             id=resize_button_editor
-            image=editor/resize_button_editor
+            image=editor/util/resize_button_editor
             items=editor-map-resize
             tooltip_name_prepend=yes
             ref=flood_button_editor            
@@ -345,7 +345,7 @@
         [menu]
             id=toggle_grid_button_editor
             type=checkbox
-            image=editor/toggle_grid_button_editor
+            image=editor/util/toggle_grid_button_editor
             items=togglegrid
             tooltip_name_prepend=yes
             rect="+6,=,+24,+24"
@@ -355,7 +355,7 @@
         [menu]
             id=flip_map_button_editor
             type=checkbox
-            image=editor/flip_map_button_editor
+            image=editor/util/flip_map_button_editor
             items=editor-map-flip
             tooltip= _ "Not implemented yet."
             tooltip_name_prepend=yes
@@ -388,7 +388,7 @@
         [menu]
             id=undo_button_editor
             ref=resize_button_editor
-            image=editor/undo_button_editor
+            image=editor/util/undo_button_editor
             items=undo
             auto_tooltip=yes
             rect="=,+6,+24,+24"
@@ -397,7 +397,7 @@
         [/menu]
         [menu]
             id=redo_button_editor
-            image=editor/redo_button_editor
+            image=editor/util/redo_button_editor
             items=redo
             auto_tooltip=yes
             rect="+6,=,+24,+24"
@@ -407,7 +407,7 @@
         [menu]
             id=zoom_in_button_editor
             type=turbo
-            image=editor/zoom_in_button_editor
+            image=editor/util/zoom_in_button_editor
             items=zoomin
             auto_tooltip=yes
             rect="+6,=,+24,+24"
@@ -417,7 +417,7 @@
         [menu]
             id=zoom_out_button_editor
             type=turbo
-            image=editor/zoom_out_button_editor
+            image=editor/util/zoom_out_button_editor
             items=zoomout
             auto_tooltip=yes
             rect="+6,=,+24,+24"
@@ -427,7 +427,7 @@
         [menu]
             id=zoom_default_button_editor
             type=checkbox
-            image=editor/zoom_default_button_editor
+            image=editor/util/zoom_default_button_editor
             items=zoomdefault
             auto_tooltip=yes
             rect="+6,=,+24,+24"
@@ -437,8 +437,7 @@
 
         [menu]
             id=editor_brush_1
-            #title= _ "Brush"
-            image=editor/brush-1
+            image=editor/brush/brush-1
             type=radiobox
             items=editor-brush-1
             ref=bottom-right-panel
@@ -449,72 +448,46 @@
 
         [menu]
             id=editor_brush_2
-            #title= _ "Brush"
-            image=editor/brush-2
+            image=editor/brush/brush-2
             type=radiobox
             items=editor-brush-2
             ref=editor_brush_1
             rect="+3,=,+30,+30"
             xanchor=right
             yanchor=fixed
-            #xanchor=right
-            #yanchor=top
         [/menu]
 
         [menu]
             id=editor_brush_3
-            #title= _ "Brush"
-            image=editor/brush-3
+            image=editor/brush/brush-3
             type=radiobox
             items=editor-brush-3
             ref=editor_brush_2
             rect="+3,=,+30,+30"
             xanchor=right
             yanchor=fixed
-            #xanchor=right
-            #yanchor=top
         [/menu]
 
-#        [menu]
-#            id=editor_brush_3
-#            #title= _ "Brush"
-#            image=editor/brush-3
-#            type=radiobox
-#            items=brush-3
-#            ref=editor_brush_2
-#            rect="+6,=,+30,+30"
-#            xanchor=right
-#            yanchor=fixed
-#            #xanchor=right
-            #yanchor=top
-#        [/menu]
-
         [menu]
             id=editor_brush_nw_se
-            #title= _ "Brush"
-            image=editor/brush-nw-se
+            image=editor/brush/brush-nw-se
             type=radiobox
             items=editor-brush-nw-se
             ref=editor_brush_3
             rect="+3,=,+30,+30"
             xanchor=right
             yanchor=fixed
-            #xanchor=right
-            #yanchor=top
         [/menu]
 
         [menu]
             id=editor_brush_se_nw
-            #title= _ "Brush"
-            image=editor/brush-se-nw
+            image=editor/brush/brush-se-nw
             type=radiobox
             items=editor-brush-se-nw
             ref=editor_brush_nw_se
             rect="+3,=,+30,+30"
             xanchor=right
             yanchor=fixed
-            #xanchor=right
-            #yanchor=top
         [/menu]
 
         [menu]
@@ -574,7 +547,7 @@
             [terrain_image]
                 id=terrain_image
                 ref=menu-editor-terrain
-                rect="+4,=-2,+24,+24"
+                rect="+4,=-2,+25,+25"
                 xanchor=right
                 yanchor=fixed
             [/terrain_image]