huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-03-14 23:35:17 +00:00
Code Issues Wiki Activity

Rename "Image" menu to "Project"

Browse source 
This name should be more accurate, since this menu now has project properties. Having project properties be under a menu named Image doesn't make much sense. This menu contains options that affect the entire project, such as properties, color mode and resizing.
This commit is contained in:
Emmanouil Papadeas 2025-03-09 02:00:38 +02:00
parent 131f91e7af
commit 38444cb916
6 changed files with 32 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Translations/Translations.pot
View file

@ -61,6 +61,10 @@ msgstr ""
msgid "Image" msgid "Image"
msgstr "" msgstr ""
#. Noun, refers to a Pixelorama project.
msgid "Project"
msgstr ""
msgid "Effects" msgid "Effects"
msgstr "" msgstr ""

6
src/Autoload/ExtensionsApi.gd
View file

@ -177,7 +177,7 @@ class GeneralAPI:
## Gives ability to add/remove items from menus in the top bar. ## Gives ability to add/remove items from menus in the top bar.
class MenuAPI: class MenuAPI:
enum { FILE, EDIT, SELECT, IMAGE, EFFECTS, VIEW, WINDOW, HELP } enum { FILE, EDIT, SELECT, PROJECT, EFFECTS, VIEW, WINDOW, HELP }
# Menu methods # Menu methods
func _get_popup_menu(menu_type: int) -> PopupMenu: func _get_popup_menu(menu_type: int) -> PopupMenu:
@ -188,8 +188,8 @@ class MenuAPI:
return Global.top_menu_container.edit_menu return Global.top_menu_container.edit_menu
SELECT: SELECT:
return Global.top_menu_container.select_menu return Global.top_menu_container.select_menu
IMAGE: PROJECT:
return Global.top_menu_container.image_menu return Global.top_menu_container.project_menu
EFFECTS: EFFECTS:
return Global.top_menu_container.effects_menu return Global.top_menu_container.effects_menu
VIEW: VIEW:

2
src/Autoload/Global.gd
View file

@ -57,7 +57,7 @@ enum ViewMenu {
## Enumeration of items present in the Window Menu. ## Enumeration of items present in the Window Menu.
enum WindowMenu { WINDOW_OPACITY, PANELS, LAYOUTS, MOVABLE_PANELS, ZEN_MODE, FULLSCREEN_MODE } enum WindowMenu { WINDOW_OPACITY, PANELS, LAYOUTS, MOVABLE_PANELS, ZEN_MODE, FULLSCREEN_MODE }
## Enumeration of items present in the Image Menu. ## Enumeration of items present in the Image Menu.
enum ImageMenu { enum ProjectMenu {
PROJECT_PROPERTIES, PROJECT_PROPERTIES,
COLOR_MODE, COLOR_MODE,
RESIZE_CANVAS, RESIZE_CANVAS,

4
src/Classes/Project.gd
View file

@ -241,8 +241,8 @@ func selection_map_changed() -> void:
image_texture = ImageTexture.create_from_image(selection_map) image_texture = ImageTexture.create_from_image(selection_map)
Global.canvas.selection.marching_ants_outline.texture = image_texture Global.canvas.selection.marching_ants_outline.texture = image_texture
Global.top_menu_container.edit_menu.set_item_disabled(Global.EditMenu.NEW_BRUSH, !has_selection) Global.top_menu_container.edit_menu.set_item_disabled(Global.EditMenu.NEW_BRUSH, !has_selection)
Global.top_menu_container.image_menu.set_item_disabled( Global.top_menu_container.project_menu.set_item_disabled(
Global.ImageMenu.CROP_TO_SELECTION, !has_selection Global.ProjectMenu.CROP_TO_SELECTION, !has_selection
) )

40
src/UI/TopMenuContainer/TopMenuContainer.gd
View file

@ -61,7 +61,7 @@ var about_dialog := Dialog.new("res://src/UI/Dialogs/AboutDialog.tscn")
@onready var file_menu := $MarginContainer/HBoxContainer/MenuBar/File as PopupMenu @onready var file_menu := $MarginContainer/HBoxContainer/MenuBar/File as PopupMenu
@onready var edit_menu := $MarginContainer/HBoxContainer/MenuBar/Edit as PopupMenu @onready var edit_menu := $MarginContainer/HBoxContainer/MenuBar/Edit as PopupMenu
@onready var select_menu := $MarginContainer/HBoxContainer/MenuBar/Select as PopupMenu @onready var select_menu := $MarginContainer/HBoxContainer/MenuBar/Select as PopupMenu
@onready var image_menu := $MarginContainer/HBoxContainer/MenuBar/Image as PopupMenu @onready var project_menu := $MarginContainer/HBoxContainer/MenuBar/Project as PopupMenu
@onready var effects_menu := $MarginContainer/HBoxContainer/MenuBar/Effects as PopupMenu @onready var effects_menu := $MarginContainer/HBoxContainer/MenuBar/Effects as PopupMenu
@onready var view_menu := $MarginContainer/HBoxContainer/MenuBar/View as PopupMenu @onready var view_menu := $MarginContainer/HBoxContainer/MenuBar/View as PopupMenu
@onready var window_menu := $MarginContainer/HBoxContainer/MenuBar/Window as PopupMenu @onready var window_menu := $MarginContainer/HBoxContainer/MenuBar/Window as PopupMenu
@ -109,7 +109,7 @@ func _ready() -> void:
_setup_edit_menu() _setup_edit_menu()
_setup_view_menu() _setup_view_menu()
_setup_window_menu() _setup_window_menu()
_setup_image_menu() _setup_project_menu()
_setup_effects_menu() _setup_effects_menu()
_setup_select_menu() _setup_select_menu()
_setup_help_menu() _setup_help_menu()
@ -124,7 +124,7 @@ func _input(event: InputEvent) -> void:
file_menu.activate_item_by_event(event) file_menu.activate_item_by_event(event)
edit_menu.activate_item_by_event(event) edit_menu.activate_item_by_event(event)
select_menu.activate_item_by_event(event) select_menu.activate_item_by_event(event)
image_menu.activate_item_by_event(event) project_menu.activate_item_by_event(event)
effects_menu.activate_item_by_event(event) effects_menu.activate_item_by_event(event)
view_menu.activate_item_by_event(event) view_menu.activate_item_by_event(event)
window_menu.activate_item_by_event(event) window_menu.activate_item_by_event(event)
@ -429,9 +429,9 @@ func populate_layouts_submenu() -> void:
layouts_submenu.add_item(tr("Reset %s") % "Default") layouts_submenu.add_item(tr("Reset %s") % "Default")
func _setup_image_menu() -> void: func _setup_project_menu() -> void:
# Order as in Global.ImageMenu enum # Order as in Global.ProjectMenu enum
var image_menu_items := { var project_menu_items := {
"Project Properties": "project_properties", "Project Properties": "project_properties",
"Color Mode": "", "Color Mode": "",
"Resize Canvas": "resize_canvas", "Resize Canvas": "resize_canvas",
@ -439,14 +439,14 @@ func _setup_image_menu() -> void:
"Crop to Selection": "crop_to_selection", "Crop to Selection": "crop_to_selection",
"Crop to Content": "crop_to_content", "Crop to Content": "crop_to_content",
} }
for i in image_menu_items.size(): for i in project_menu_items.size():
var item: String = image_menu_items.keys()[i] var item: String = project_menu_items.keys()[i]
if item == "Color Mode": if item == "Color Mode":
_setup_color_mode_submenu(item) _setup_color_mode_submenu(item)
else: else:
_set_menu_shortcut(image_menu_items[item], image_menu, i, item) _set_menu_shortcut(project_menu_items[item], project_menu, i, item)
image_menu.set_item_disabled(Global.ImageMenu.CROP_TO_SELECTION, true) project_menu.set_item_disabled(Global.ProjectMenu.CROP_TO_SELECTION, true)
image_menu.id_pressed.connect(image_menu_id_pressed) project_menu.id_pressed.connect(project_menu_id_pressed)
func _setup_color_mode_submenu(item: String) -> void: func _setup_color_mode_submenu(item: String) -> void:
@ -456,8 +456,8 @@ func _setup_color_mode_submenu(item: String) -> void:
color_mode_submenu.add_radio_check_item("Indexed", ColorModes.INDEXED) color_mode_submenu.add_radio_check_item("Indexed", ColorModes.INDEXED)
color_mode_submenu.id_pressed.connect(_color_mode_submenu_id_pressed) color_mode_submenu.id_pressed.connect(_color_mode_submenu_id_pressed)
image_menu.add_child(color_mode_submenu) project_menu.add_child(color_mode_submenu)
image_menu.add_submenu_item(item, color_mode_submenu.get_name()) project_menu.add_submenu_item(item, color_mode_submenu.get_name())
func _setup_effects_menu() -> void: func _setup_effects_menu() -> void:
@ -1044,20 +1044,20 @@ func _toggle_fullscreen() -> void:
window_menu.set_item_checked(Global.WindowMenu.FULLSCREEN_MODE, is_fullscreen) window_menu.set_item_checked(Global.WindowMenu.FULLSCREEN_MODE, is_fullscreen)
func image_menu_id_pressed(id: int) -> void: func project_menu_id_pressed(id: int) -> void:
match id: match id:
Global.ImageMenu.PROJECT_PROPERTIES: Global.ProjectMenu.PROJECT_PROPERTIES:
project_properties_dialog.popup() project_properties_dialog.popup()
Global.ImageMenu.SCALE_IMAGE: Global.ProjectMenu.SCALE_IMAGE:
scale_image_dialog.popup() scale_image_dialog.popup()
Global.ImageMenu.CROP_TO_SELECTION: Global.ProjectMenu.CROP_TO_SELECTION:
DrawingAlgos.crop_to_selection() DrawingAlgos.crop_to_selection()
Global.ImageMenu.CROP_TO_CONTENT: Global.ProjectMenu.CROP_TO_CONTENT:
DrawingAlgos.crop_to_content() DrawingAlgos.crop_to_content()
Global.ImageMenu.RESIZE_CANVAS: Global.ProjectMenu.RESIZE_CANVAS:
resize_canvas_dialog.popup() resize_canvas_dialog.popup()
_: _:
_handle_metadata(id, image_menu) _handle_metadata(id, project_menu)
func effects_menu_id_pressed(id: int) -> void: func effects_menu_id_pressed(id: int) -> void:

3
src/UI/TopMenuContainer/TopMenuContainer.tscn
View file

@ -33,7 +33,7 @@ flat = true
[node name="Select" type="PopupMenu" parent="MarginContainer/HBoxContainer/MenuBar"] [node name="Select" type="PopupMenu" parent="MarginContainer/HBoxContainer/MenuBar"]
[node name="Image" type="PopupMenu" parent="MarginContainer/HBoxContainer/MenuBar"] [node name="Project" type="PopupMenu" parent="MarginContainer/HBoxContainer/MenuBar"]
[node name="Effects" type="PopupMenu" parent="MarginContainer/HBoxContainer/MenuBar"] [node name="Effects" type="PopupMenu" parent="MarginContainer/HBoxContainer/MenuBar"]
@ -142,6 +142,7 @@ size_flags_horizontal = 3
selected = 0 selected = 0
item_count = 1 item_count = 1
popup/item_0/text = "Current layout" popup/item_0/text = "Current layout"
popup/item_0/id = 0
[node name="DeleteLayoutConfirmation" type="ConfirmationDialog" parent="."] [node name="DeleteLayoutConfirmation" type="ConfirmationDialog" parent="."]
auto_translate_mode = 1 auto_translate_mode = 1