Explorar o código

tools: use integers for numeric radios, not strings

Daniele Bartolini %!s(int64=3) %!d(string=hai) anos
pai
achega
29feeb7147

+ 4 - 4
tools/level_editor/level_editor.vala

@@ -189,10 +189,10 @@ public class LevelEditorApplication : Gtk.Application
 		{ "menu-grid",            null,                        null, null         },
 		{ "menu-grid",            null,                        null, null         },
 		{ "grid-show",            on_show_grid,                null, "true"       },
 		{ "grid-show",            on_show_grid,                null, "true"       },
 		{ "grid-custom",          on_custom_grid,              null, null         },
 		{ "grid-custom",          on_custom_grid,              null, null         },
-		{ "grid-preset",          on_grid_changed,             "s",  "'1'"        },
+		{ "grid-preset",          on_grid_changed,             "i",  "10"         }, // 10*meters.
 		{ "menu-rotation-snap",   null,                        null, null         },
 		{ "menu-rotation-snap",   null,                        null, null         },
 		{ "rotation-snap-custom", on_rotation_snap,            null, null         },
 		{ "rotation-snap-custom", on_rotation_snap,            null, null         },
-		{ "rotation-snap-preset", on_rotation_snap_changed,    "s",  "'15'"       }
+		{ "rotation-snap-preset", on_rotation_snap_changed,    "i",  "15"         }
 	};
 	};
 
 
 	private const GLib.ActionEntry[] action_entries_create =
 	private const GLib.ActionEntry[] action_entries_create =
@@ -1619,14 +1619,14 @@ public class LevelEditorApplication : Gtk.Application
 
 
 	private void on_grid_changed(GLib.SimpleAction action, GLib.Variant? param)
 	private void on_grid_changed(GLib.SimpleAction action, GLib.Variant? param)
 	{
 	{
-		_grid_size = float.parse(param.get_string());
+		_grid_size = (double)param.get_int32() / 10.0;
 		send_state();
 		send_state();
 		action.set_state(param);
 		action.set_state(param);
 	}
 	}
 
 
 	private void on_rotation_snap_changed(GLib.SimpleAction action, GLib.Variant? param)
 	private void on_rotation_snap_changed(GLib.SimpleAction action, GLib.Variant? param)
 	{
 	{
-		_rotation_snap = float.parse(param.get_string());
+		_rotation_snap = (double)param.get_int32();
 		send_state();
 		send_state();
 		action.set_state(param);
 		action.set_state(param);
 	}
 	}

+ 12 - 12
tools/level_editor/resources/gtk/menus.ui

@@ -172,32 +172,32 @@
           <item>
           <item>
             <attribute name="label" translatable="no">0.1m</attribute>
             <attribute name="label" translatable="no">0.1m</attribute>
             <attribute name="action">app.grid-preset</attribute>
             <attribute name="action">app.grid-preset</attribute>
-            <attribute name="target">0.1</attribute>
+            <attribute name="target" type="i">1</attribute>
           </item>
           </item>
           <item>
           <item>
             <attribute name="label" translatable="no">0.2m</attribute>
             <attribute name="label" translatable="no">0.2m</attribute>
             <attribute name="action">app.grid-preset</attribute>
             <attribute name="action">app.grid-preset</attribute>
-            <attribute name="target">0.2</attribute>
+            <attribute name="target" type="i">2</attribute>
           </item>
           </item>
           <item>
           <item>
             <attribute name="label" translatable="no">0.5m</attribute>
             <attribute name="label" translatable="no">0.5m</attribute>
             <attribute name="action">app.grid-preset</attribute>
             <attribute name="action">app.grid-preset</attribute>
-            <attribute name="target">0.5</attribute>
+            <attribute name="target" type="i">5</attribute>
           </item>
           </item>
           <item>
           <item>
             <attribute name="label" translatable="no">1m</attribute>
             <attribute name="label" translatable="no">1m</attribute>
             <attribute name="action">app.grid-preset</attribute>
             <attribute name="action">app.grid-preset</attribute>
-            <attribute name="target">1</attribute>
+            <attribute name="target" type="i">10</attribute>
           </item>
           </item>
           <item>
           <item>
             <attribute name="label" translatable="no">2m</attribute>
             <attribute name="label" translatable="no">2m</attribute>
             <attribute name="action">app.grid-preset</attribute>
             <attribute name="action">app.grid-preset</attribute>
-            <attribute name="target">2</attribute>
+            <attribute name="target" type="i">20</attribute>
           </item>
           </item>
           <item>
           <item>
             <attribute name="label" translatable="no">5m</attribute>
             <attribute name="label" translatable="no">5m</attribute>
             <attribute name="action">app.grid-preset</attribute>
             <attribute name="action">app.grid-preset</attribute>
-            <attribute name="target">5</attribute>
+            <attribute name="target" type="i">50</attribute>
           </item>
           </item>
         </section>
         </section>
       </submenu>
       </submenu>
@@ -215,32 +215,32 @@
           <item>
           <item>
             <attribute name="label" translatable="no">1°</attribute>
             <attribute name="label" translatable="no">1°</attribute>
             <attribute name="action">app.rotation-snap-preset</attribute>
             <attribute name="action">app.rotation-snap-preset</attribute>
-            <attribute name="target">1</attribute>
+            <attribute name="target" type="i">1</attribute>
           </item>
           </item>
           <item>
           <item>
             <attribute name="label" translatable="no">15°</attribute>
             <attribute name="label" translatable="no">15°</attribute>
             <attribute name="action">app.rotation-snap-preset</attribute>
             <attribute name="action">app.rotation-snap-preset</attribute>
-            <attribute name="target">15</attribute>
+            <attribute name="target" type="i">15</attribute>
           </item>
           </item>
           <item>
           <item>
             <attribute name="label" translatable="no">30°</attribute>
             <attribute name="label" translatable="no">30°</attribute>
             <attribute name="action">app.rotation-snap-preset</attribute>
             <attribute name="action">app.rotation-snap-preset</attribute>
-            <attribute name="target">30</attribute>
+            <attribute name="target" type="i">30</attribute>
           </item>
           </item>
           <item>
           <item>
             <attribute name="label" translatable="no">45°</attribute>
             <attribute name="label" translatable="no">45°</attribute>
             <attribute name="action">app.rotation-snap-preset</attribute>
             <attribute name="action">app.rotation-snap-preset</attribute>
-            <attribute name="target">45</attribute>
+            <attribute name="target" type="i">45</attribute>
           </item>
           </item>
           <item>
           <item>
             <attribute name="label" translatable="no">90°</attribute>
             <attribute name="label" translatable="no">90°</attribute>
             <attribute name="action">app.rotation-snap-preset</attribute>
             <attribute name="action">app.rotation-snap-preset</attribute>
-            <attribute name="target">90</attribute>
+            <attribute name="target" type="i">90</attribute>
           </item>
           </item>
           <item>
           <item>
             <attribute name="label" translatable="no">180°</attribute>
             <attribute name="label" translatable="no">180°</attribute>
             <attribute name="action">app.rotation-snap-preset</attribute>
             <attribute name="action">app.rotation-snap-preset</attribute>
-            <attribute name="target">180</attribute>
+            <attribute name="target" type="i">180</attribute>
           </item>
           </item>
         </section>
         </section>
       </submenu>
       </submenu>