|
@@ -2208,7 +2208,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
|
|
|
tool_buttons_group.instantiate();
|
|
|
|
|
|
select_tool_button = memnew(Button);
|
|
|
- select_tool_button->set_theme_type_variation("FlatButton");
|
|
|
+ select_tool_button->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
select_tool_button->set_toggle_mode(true);
|
|
|
select_tool_button->set_button_group(tool_buttons_group);
|
|
|
select_tool_button->set_shortcut(ED_SHORTCUT("tiles_editor/selection_tool", TTR("Selection"), Key::S));
|
|
@@ -2217,7 +2217,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
|
|
|
viewport_shortcut_buttons.push_back(select_tool_button);
|
|
|
|
|
|
paint_tool_button = memnew(Button);
|
|
|
- paint_tool_button->set_theme_type_variation("FlatButton");
|
|
|
+ paint_tool_button->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
paint_tool_button->set_toggle_mode(true);
|
|
|
paint_tool_button->set_button_group(tool_buttons_group);
|
|
|
paint_tool_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/paint_tool"));
|
|
@@ -2227,7 +2227,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
|
|
|
viewport_shortcut_buttons.push_back(paint_tool_button);
|
|
|
|
|
|
line_tool_button = memnew(Button);
|
|
|
- line_tool_button->set_theme_type_variation("FlatButton");
|
|
|
+ line_tool_button->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
line_tool_button->set_toggle_mode(true);
|
|
|
line_tool_button->set_button_group(tool_buttons_group);
|
|
|
// TRANSLATORS: This refers to the line tool in the tilemap editor.
|
|
@@ -2237,7 +2237,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
|
|
|
viewport_shortcut_buttons.push_back(line_tool_button);
|
|
|
|
|
|
rect_tool_button = memnew(Button);
|
|
|
- rect_tool_button->set_theme_type_variation("FlatButton");
|
|
|
+ rect_tool_button->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
rect_tool_button->set_toggle_mode(true);
|
|
|
rect_tool_button->set_button_group(tool_buttons_group);
|
|
|
rect_tool_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/rect_tool"));
|
|
@@ -2246,7 +2246,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
|
|
|
viewport_shortcut_buttons.push_back(rect_tool_button);
|
|
|
|
|
|
bucket_tool_button = memnew(Button);
|
|
|
- bucket_tool_button->set_theme_type_variation("FlatButton");
|
|
|
+ bucket_tool_button->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
bucket_tool_button->set_toggle_mode(true);
|
|
|
bucket_tool_button->set_button_group(tool_buttons_group);
|
|
|
bucket_tool_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/bucket_tool"));
|
|
@@ -2264,7 +2264,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
|
|
|
|
|
|
// Picker
|
|
|
picker_button = memnew(Button);
|
|
|
- picker_button->set_theme_type_variation("FlatButton");
|
|
|
+ picker_button->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
picker_button->set_toggle_mode(true);
|
|
|
picker_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/picker"));
|
|
|
Key key = (OS::get_singleton()->has_feature("macos") || OS::get_singleton()->has_feature("web_macos") || OS::get_singleton()->has_feature("web_ios")) ? Key::META : Key::CTRL;
|
|
@@ -2275,7 +2275,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
|
|
|
|
|
|
// Erase button.
|
|
|
erase_button = memnew(Button);
|
|
|
- erase_button->set_theme_type_variation("FlatButton");
|
|
|
+ erase_button->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
erase_button->set_toggle_mode(true);
|
|
|
erase_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/eraser"));
|
|
|
erase_button->set_tooltip_text(TTR("Alternatively use RMB to erase tiles."));
|
|
@@ -2289,28 +2289,28 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
|
|
|
transform_toolbar->add_child(memnew(VSeparator));
|
|
|
|
|
|
transform_button_rotate_left = memnew(Button);
|
|
|
- transform_button_rotate_left->set_theme_type_variation("FlatButton");
|
|
|
+ transform_button_rotate_left->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
transform_button_rotate_left->set_shortcut(ED_SHORTCUT("tiles_editor/rotate_tile_left", TTR("Rotate Tile Left"), Key::Z));
|
|
|
transform_toolbar->add_child(transform_button_rotate_left);
|
|
|
transform_button_rotate_left->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_apply_transform).bind(TRANSFORM_ROTATE_LEFT));
|
|
|
viewport_shortcut_buttons.push_back(transform_button_rotate_left);
|
|
|
|
|
|
transform_button_rotate_right = memnew(Button);
|
|
|
- transform_button_rotate_right->set_theme_type_variation("FlatButton");
|
|
|
+ transform_button_rotate_right->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
transform_button_rotate_right->set_shortcut(ED_SHORTCUT("tiles_editor/rotate_tile_right", TTR("Rotate Tile Right"), Key::X));
|
|
|
transform_toolbar->add_child(transform_button_rotate_right);
|
|
|
transform_button_rotate_right->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_apply_transform).bind(TRANSFORM_ROTATE_RIGHT));
|
|
|
viewport_shortcut_buttons.push_back(transform_button_rotate_right);
|
|
|
|
|
|
transform_button_flip_h = memnew(Button);
|
|
|
- transform_button_flip_h->set_theme_type_variation("FlatButton");
|
|
|
+ transform_button_flip_h->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
transform_button_flip_h->set_shortcut(ED_SHORTCUT("tiles_editor/flip_tile_horizontal", TTR("Flip Tile Horizontally"), Key::C));
|
|
|
transform_toolbar->add_child(transform_button_flip_h);
|
|
|
transform_button_flip_h->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_apply_transform).bind(TRANSFORM_FLIP_H));
|
|
|
viewport_shortcut_buttons.push_back(transform_button_flip_h);
|
|
|
|
|
|
transform_button_flip_v = memnew(Button);
|
|
|
- transform_button_flip_v->set_theme_type_variation("FlatButton");
|
|
|
+ transform_button_flip_v->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
transform_button_flip_v->set_shortcut(ED_SHORTCUT("tiles_editor/flip_tile_vertical", TTR("Flip Tile Vertically"), Key::V));
|
|
|
transform_toolbar->add_child(transform_button_flip_v);
|
|
|
transform_button_flip_v->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_apply_transform).bind(TRANSFORM_FLIP_V));
|
|
@@ -2329,7 +2329,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
|
|
|
|
|
|
// Random tile checkbox.
|
|
|
random_tile_toggle = memnew(Button);
|
|
|
- random_tile_toggle->set_theme_type_variation("FlatButton");
|
|
|
+ random_tile_toggle->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
random_tile_toggle->set_toggle_mode(true);
|
|
|
random_tile_toggle->set_tooltip_text(TTR("Place Random Tile"));
|
|
|
random_tile_toggle->connect(SceneStringName(toggled), callable_mp(this, &TileMapLayerEditorTilesPlugin::_on_random_tile_checkbox_toggled));
|
|
@@ -3553,7 +3553,7 @@ TileMapLayerEditorTerrainsPlugin::TileMapLayerEditorTerrainsPlugin() {
|
|
|
tool_buttons_group.instantiate();
|
|
|
|
|
|
paint_tool_button = memnew(Button);
|
|
|
- paint_tool_button->set_theme_type_variation("FlatButton");
|
|
|
+ paint_tool_button->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
paint_tool_button->set_toggle_mode(true);
|
|
|
paint_tool_button->set_button_group(tool_buttons_group);
|
|
|
paint_tool_button->set_pressed(true);
|
|
@@ -3563,7 +3563,7 @@ TileMapLayerEditorTerrainsPlugin::TileMapLayerEditorTerrainsPlugin() {
|
|
|
viewport_shortcut_buttons.push_back(paint_tool_button);
|
|
|
|
|
|
line_tool_button = memnew(Button);
|
|
|
- line_tool_button->set_theme_type_variation("FlatButton");
|
|
|
+ line_tool_button->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
line_tool_button->set_toggle_mode(true);
|
|
|
line_tool_button->set_button_group(tool_buttons_group);
|
|
|
line_tool_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/line_tool"));
|
|
@@ -3572,7 +3572,7 @@ TileMapLayerEditorTerrainsPlugin::TileMapLayerEditorTerrainsPlugin() {
|
|
|
viewport_shortcut_buttons.push_back(line_tool_button);
|
|
|
|
|
|
rect_tool_button = memnew(Button);
|
|
|
- rect_tool_button->set_theme_type_variation("FlatButton");
|
|
|
+ rect_tool_button->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
rect_tool_button->set_toggle_mode(true);
|
|
|
rect_tool_button->set_button_group(tool_buttons_group);
|
|
|
rect_tool_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/rect_tool"));
|
|
@@ -3581,7 +3581,7 @@ TileMapLayerEditorTerrainsPlugin::TileMapLayerEditorTerrainsPlugin() {
|
|
|
viewport_shortcut_buttons.push_back(rect_tool_button);
|
|
|
|
|
|
bucket_tool_button = memnew(Button);
|
|
|
- bucket_tool_button->set_theme_type_variation("FlatButton");
|
|
|
+ bucket_tool_button->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
bucket_tool_button->set_toggle_mode(true);
|
|
|
bucket_tool_button->set_button_group(tool_buttons_group);
|
|
|
bucket_tool_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/bucket_tool"));
|
|
@@ -3600,7 +3600,7 @@ TileMapLayerEditorTerrainsPlugin::TileMapLayerEditorTerrainsPlugin() {
|
|
|
|
|
|
// Picker
|
|
|
picker_button = memnew(Button);
|
|
|
- picker_button->set_theme_type_variation("FlatButton");
|
|
|
+ picker_button->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
picker_button->set_toggle_mode(true);
|
|
|
picker_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/picker"));
|
|
|
picker_button->connect(SceneStringName(pressed), callable_mp(CanvasItemEditor::get_singleton(), &CanvasItemEditor::update_viewport));
|
|
@@ -3609,7 +3609,7 @@ TileMapLayerEditorTerrainsPlugin::TileMapLayerEditorTerrainsPlugin() {
|
|
|
|
|
|
// Erase button.
|
|
|
erase_button = memnew(Button);
|
|
|
- erase_button->set_theme_type_variation("FlatButton");
|
|
|
+ erase_button->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
erase_button->set_toggle_mode(true);
|
|
|
erase_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/eraser"));
|
|
|
erase_button->connect(SceneStringName(pressed), callable_mp(CanvasItemEditor::get_singleton(), &CanvasItemEditor::update_viewport));
|
|
@@ -4467,19 +4467,19 @@ TileMapLayerEditor::TileMapLayerEditor() {
|
|
|
layer_selection_hbox->add_child(layers_selection_button);
|
|
|
|
|
|
select_previous_layer = memnew(Button);
|
|
|
- select_previous_layer->set_theme_type_variation("FlatButton");
|
|
|
+ select_previous_layer->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
select_previous_layer->set_tooltip_text(TTR("Select previous layer"));
|
|
|
select_previous_layer->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditor::_select_previous_layer_pressed));
|
|
|
layer_selection_hbox->add_child(select_previous_layer);
|
|
|
|
|
|
select_next_layer = memnew(Button);
|
|
|
- select_next_layer->set_theme_type_variation("FlatButton");
|
|
|
+ select_next_layer->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
select_next_layer->set_tooltip_text(TTR("Select next layer"));
|
|
|
select_next_layer->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditor::_select_next_layer_pressed));
|
|
|
layer_selection_hbox->add_child(select_next_layer);
|
|
|
|
|
|
select_all_layers = memnew(Button);
|
|
|
- select_all_layers->set_theme_type_variation("FlatButton");
|
|
|
+ select_all_layers->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
select_all_layers->set_text(TTR("Select all layers"));
|
|
|
select_all_layers->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditor::_select_all_layers_pressed));
|
|
|
select_all_layers->set_tooltip_text(TTR("Select all TileMapLayers in scene"));
|
|
@@ -4487,7 +4487,7 @@ TileMapLayerEditor::TileMapLayerEditor() {
|
|
|
|
|
|
// Highlighting selected layer.
|
|
|
toggle_highlight_selected_layer_button = memnew(Button);
|
|
|
- toggle_highlight_selected_layer_button->set_theme_type_variation("FlatButton");
|
|
|
+ toggle_highlight_selected_layer_button->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
toggle_highlight_selected_layer_button->set_toggle_mode(true);
|
|
|
toggle_highlight_selected_layer_button->set_pressed(true);
|
|
|
toggle_highlight_selected_layer_button->connect(SceneStringName(toggled), callable_mp(this, &TileMapLayerEditor::_highlight_selected_layer_button_toggled));
|
|
@@ -4498,7 +4498,7 @@ TileMapLayerEditor::TileMapLayerEditor() {
|
|
|
|
|
|
// Grid toggle.
|
|
|
toggle_grid_button = memnew(Button);
|
|
|
- toggle_grid_button->set_theme_type_variation("FlatButton");
|
|
|
+ toggle_grid_button->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
toggle_grid_button->set_toggle_mode(true);
|
|
|
toggle_grid_button->set_tooltip_text(TTR("Toggle grid visibility."));
|
|
|
toggle_grid_button->connect(SceneStringName(toggled), callable_mp(this, &TileMapLayerEditor::_on_grid_toggled));
|
|
@@ -4507,7 +4507,7 @@ TileMapLayerEditor::TileMapLayerEditor() {
|
|
|
// Advanced settings menu button.
|
|
|
advanced_menu_button = memnew(MenuButton);
|
|
|
advanced_menu_button->set_flat(false);
|
|
|
- advanced_menu_button->set_theme_type_variation("FlatButton");
|
|
|
+ advanced_menu_button->set_theme_type_variation(SceneStringName(FlatButton));
|
|
|
advanced_menu_button->get_popup()->add_item(TTR("Automatically Replace Tiles with Proxies"), ADVANCED_MENU_REPLACE_WITH_PROXIES);
|
|
|
advanced_menu_button->get_popup()->add_item(TTR("Extract TileMap layers as individual TileMapLayer nodes"), ADVANCED_MENU_EXTRACT_TILE_MAP_LAYERS);
|
|
|
advanced_menu_button->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &TileMapLayerEditor::_advanced_menu_button_id_pressed));
|