huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-02-22 13:33:13 +00:00
Code Issues Wiki Activity

Split View menu into View and Window menus

Browse source
This commit is contained in:
Manolis Papadeas 2022-02-17 00:54:09 +02:00
parent a7110e4be4
commit 8b53773d2d
3 changed files with 71 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Translations/Translations.pot
View file

@ -55,6 +55,9 @@ msgstr ""
msgid "View" msgid "View"
msgstr "" msgstr ""
msgid "Window"
msgstr ""
msgid "Image" msgid "Image"
msgstr "" msgstr ""

98
src/UI/TopMenuContainer.gd
View file

@ -4,19 +4,14 @@ enum FileMenuId { NEW, OPEN, OPEN_LAST_PROJECT, SAVE, SAVE_AS, EXPORT, EXPORT_AS
enum EditMenuId { UNDO, REDO, COPY, CUT, PASTE, DELETE, NEW_BRUSH, PREFERENCES } enum EditMenuId { UNDO, REDO, COPY, CUT, PASTE, DELETE, NEW_BRUSH, PREFERENCES }
enum ViewMenuId { enum ViewMenuId {
TILE_MODE, TILE_MODE,
WINDOW_OPACITY,
GREYSCALE_VIEW, GREYSCALE_VIEW,
PANELS,
LAYOUTS,
MIRROR_VIEW, MIRROR_VIEW,
SHOW_GRID, SHOW_GRID,
SHOW_PIXEL_GRID, SHOW_PIXEL_GRID,
SHOW_RULERS, SHOW_RULERS,
SHOW_GUIDES, SHOW_GUIDES,
EDIT_MODE,
ZEN_MODE,
FULLSCREEN_MODE
} }
enum WindowMenuId { WINDOW_OPACITY, PANELS, LAYOUTS, EDIT_MODE, ZEN_MODE, FULLSCREEN_MODE }
enum ImageMenuId { enum ImageMenuId {
SCALE_IMAGE, SCALE_IMAGE,
CENTRALIZE_IMAGE, CENTRALIZE_IMAGE,
@ -43,6 +38,7 @@ enum HelpMenuId {
var file_menu: PopupMenu var file_menu: PopupMenu
var view_menu: PopupMenu var view_menu: PopupMenu
var window_menu: PopupMenu
var recent_projects := [] var recent_projects := []
var layouts := [ var layouts := [
["Default", preload("res://assets/layouts/default.tres")], ["Default", preload("res://assets/layouts/default.tres")],
@ -54,6 +50,7 @@ onready var ui_elements: Array = Global.control.find_node("DockableContainer").g
onready var file_menu_button: MenuButton = find_node("FileMenu") onready var file_menu_button: MenuButton = find_node("FileMenu")
onready var edit_menu_button: MenuButton = find_node("EditMenu") onready var edit_menu_button: MenuButton = find_node("EditMenu")
onready var view_menu_button: MenuButton = find_node("ViewMenu") onready var view_menu_button: MenuButton = find_node("ViewMenu")
onready var window_menu_button: MenuButton = find_node("WindowMenu")
onready var image_menu_button: MenuButton = find_node("ImageMenu") onready var image_menu_button: MenuButton = find_node("ImageMenu")
onready var select_menu_button: MenuButton = find_node("SelectMenu") onready var select_menu_button: MenuButton = find_node("SelectMenu")
onready var help_menu_button: MenuButton = find_node("HelpMenu") onready var help_menu_button: MenuButton = find_node("HelpMenu")
@ -73,6 +70,7 @@ func _ready() -> void:
_setup_file_menu() _setup_file_menu()
_setup_edit_menu() _setup_edit_menu()
_setup_view_menu() _setup_view_menu()
_setup_window_menu()
_setup_image_menu() _setup_image_menu()
_setup_select_menu() _setup_select_menu()
_setup_help_menu() _setup_help_menu()
@ -146,20 +144,13 @@ func _setup_edit_menu() -> void:
func _setup_view_menu() -> void: func _setup_view_menu() -> void:
var view_menu_items := { # order as in ViewMenuId enum var view_menu_items := { # order as in ViewMenuId enum
"Tile Mode": 0, "Tile Mode": 0,
"Window Opacity": 0,
"Greyscale View": 0, "Greyscale View": 0,
"Panels": 0,
"Layouts": 0,
"Mirror View": InputMap.get_action_list("mirror_view")[0].get_scancode_with_modifiers(), "Mirror View": InputMap.get_action_list("mirror_view")[0].get_scancode_with_modifiers(),
"Show Grid": InputMap.get_action_list("show_grid")[0].get_scancode_with_modifiers(), "Show Grid": InputMap.get_action_list("show_grid")[0].get_scancode_with_modifiers(),
"Show Pixel Grid": "Show Pixel Grid":
InputMap.get_action_list("show_pixel_grid")[0].get_scancode_with_modifiers(), InputMap.get_action_list("show_pixel_grid")[0].get_scancode_with_modifiers(),
"Show Rulers": InputMap.get_action_list("show_rulers")[0].get_scancode_with_modifiers(), "Show Rulers": InputMap.get_action_list("show_rulers")[0].get_scancode_with_modifiers(),
"Show Guides": InputMap.get_action_list("show_guides")[0].get_scancode_with_modifiers(), "Show Guides": InputMap.get_action_list("show_guides")[0].get_scancode_with_modifiers(),
"Edit Mode": InputMap.get_action_list("edit_mode")[0].get_scancode_with_modifiers(),
"Zen Mode": InputMap.get_action_list("zen_mode")[0].get_scancode_with_modifiers(),
"Fullscreen Mode":
InputMap.get_action_list("toggle_fullscreen")[0].get_scancode_with_modifiers(),
} }
view_menu = view_menu_button.get_popup() view_menu = view_menu_button.get_popup()
@ -167,12 +158,6 @@ func _setup_view_menu() -> void:
for item in view_menu_items.keys(): for item in view_menu_items.keys():
if item == "Tile Mode": if item == "Tile Mode":
_setup_tile_mode_submenu(item) _setup_tile_mode_submenu(item)
elif item == "Panels":
_setup_panels_submenu(item)
elif item == "Layouts":
_setup_layouts_submenu(item)
elif item == "Window Opacity":
view_menu.add_item(item, i, view_menu_items[item])
else: else:
view_menu.add_check_item(item, i, view_menu_items[item]) view_menu.add_check_item(item, i, view_menu_items[item])
i += 1 i += 1
@ -180,11 +165,6 @@ func _setup_view_menu() -> void:
view_menu.set_item_checked(ViewMenuId.SHOW_GUIDES, true) view_menu.set_item_checked(ViewMenuId.SHOW_GUIDES, true)
view_menu.hide_on_checkable_item_selection = false view_menu.hide_on_checkable_item_selection = false
view_menu.connect("id_pressed", self, "view_menu_id_pressed") view_menu.connect("id_pressed", self, "view_menu_id_pressed")
# Disable window opacity item if per pixel transparency is not allowed
view_menu.set_item_disabled(
ViewMenuId.WINDOW_OPACITY,
!ProjectSettings.get_setting("display/window/per_pixel_transparency/allowed")
)
func _setup_tile_mode_submenu(item: String) -> void: func _setup_tile_mode_submenu(item: String) -> void:
@ -201,6 +181,38 @@ func _setup_tile_mode_submenu(item: String) -> void:
view_menu.add_submenu_item(item, tile_mode_submenu.get_name()) view_menu.add_submenu_item(item, tile_mode_submenu.get_name())
func _setup_window_menu() -> void:
var window_menu_items := { # order as in WindowMenuId enum
"Window Opacity": 0,
"Panels": 0,
"Layouts": 0,
"Edit Mode": InputMap.get_action_list("edit_mode")[0].get_scancode_with_modifiers(),
"Zen Mode": InputMap.get_action_list("zen_mode")[0].get_scancode_with_modifiers(),
"Fullscreen Mode":
InputMap.get_action_list("toggle_fullscreen")[0].get_scancode_with_modifiers(),
}
window_menu = window_menu_button.get_popup()
var i := 0
for item in window_menu_items.keys():
if item == "Panels":
_setup_panels_submenu(item)
elif item == "Layouts":
_setup_layouts_submenu(item)
elif item == "Window Opacity":
window_menu.add_item(item, i, window_menu_items[item])
else:
window_menu.add_check_item(item, i, window_menu_items[item])
i += 1
window_menu.hide_on_checkable_item_selection = false
window_menu.connect("id_pressed", self, "window_menu_id_pressed")
# Disable window opacity item if per pixel transparency is not allowed
window_menu.set_item_disabled(
WindowMenuId.WINDOW_OPACITY,
!ProjectSettings.get_setting("display/window/per_pixel_transparency/allowed")
)
func _setup_panels_submenu(item: String) -> void: func _setup_panels_submenu(item: String) -> void:
panels_submenu.set_name("panels_submenu") panels_submenu.set_name("panels_submenu")
panels_submenu.hide_on_checkable_item_selection = false panels_submenu.hide_on_checkable_item_selection = false
@ -210,8 +222,8 @@ func _setup_panels_submenu(item: String) -> void:
panels_submenu.set_item_checked(ui_elements.find(element), !is_hidden) panels_submenu.set_item_checked(ui_elements.find(element), !is_hidden)
panels_submenu.connect("id_pressed", self, "_panels_submenu_id_pressed") panels_submenu.connect("id_pressed", self, "_panels_submenu_id_pressed")
view_menu.add_child(panels_submenu) window_menu.add_child(panels_submenu)
view_menu.add_submenu_item(item, panels_submenu.get_name()) window_menu.add_submenu_item(item, panels_submenu.get_name())
func _setup_layouts_submenu(item: String) -> void: func _setup_layouts_submenu(item: String) -> void:
@ -232,8 +244,8 @@ func _setup_layouts_submenu(item: String) -> void:
layouts_submenu.set_item_checked(0, true) layouts_submenu.set_item_checked(0, true)
layouts_submenu.connect("id_pressed", self, "_layouts_submenu_id_pressed") layouts_submenu.connect("id_pressed", self, "_layouts_submenu_id_pressed")
view_menu.add_child(layouts_submenu) window_menu.add_child(layouts_submenu)
view_menu.add_submenu_item(item, layouts_submenu.get_name()) window_menu.add_submenu_item(item, layouts_submenu.get_name())
func populate_layouts_submenu() -> void: func populate_layouts_submenu() -> void:
@ -415,9 +427,6 @@ func edit_menu_id_pressed(id: int) -> void:
func view_menu_id_pressed(id: int) -> void: func view_menu_id_pressed(id: int) -> void:
match id: match id:
ViewMenuId.WINDOW_OPACITY:
window_opacity_dialog.popup_centered()
Global.dialog_open(true)
ViewMenuId.GREYSCALE_VIEW: ViewMenuId.GREYSCALE_VIEW:
_toggle_greyscale_view() _toggle_greyscale_view()
ViewMenuId.MIRROR_VIEW: ViewMenuId.MIRROR_VIEW:
@ -430,13 +439,6 @@ func view_menu_id_pressed(id: int) -> void:
_toggle_show_rulers() _toggle_show_rulers()
ViewMenuId.SHOW_GUIDES: ViewMenuId.SHOW_GUIDES:
_toggle_show_guides() _toggle_show_guides()
ViewMenuId.EDIT_MODE:
ui.tabs_visible = !ui.tabs_visible
view_menu.set_item_checked(ViewMenuId.EDIT_MODE, ui.tabs_visible)
ViewMenuId.ZEN_MODE:
_toggle_zen_mode()
ViewMenuId.FULLSCREEN_MODE:
_toggle_fullscreen()
Global.canvas.update() Global.canvas.update()
@ -450,6 +452,20 @@ func _tile_mode_submenu_id_pressed(id: int) -> void:
Global.canvas.grid.update() Global.canvas.grid.update()
func window_menu_id_pressed(id: int) -> void:
match id:
WindowMenuId.WINDOW_OPACITY:
window_opacity_dialog.popup_centered()
Global.dialog_open(true)
WindowMenuId.EDIT_MODE:
ui.tabs_visible = !ui.tabs_visible
window_menu.set_item_checked(WindowMenuId.EDIT_MODE, ui.tabs_visible)
WindowMenuId.ZEN_MODE:
_toggle_zen_mode()
WindowMenuId.FULLSCREEN_MODE:
_toggle_fullscreen()
func _panels_submenu_id_pressed(id: int) -> void: func _panels_submenu_id_pressed(id: int) -> void:
if zen_mode: if zen_mode:
return return
@ -478,7 +494,7 @@ func set_layout(id: int) -> void:
Global.control.find_node("TabsContainer").visible = true Global.control.find_node("TabsContainer").visible = true
zen_mode = false zen_mode = false
view_menu.set_item_checked(ViewMenuId.ZEN_MODE, false) window_menu.set_item_checked(WindowMenuId.ZEN_MODE, false)
func _toggle_greyscale_view() -> void: func _toggle_greyscale_view() -> void:
@ -544,12 +560,12 @@ func _toggle_zen_mode() -> void:
ui.set_control_hidden(Global.palette_panel, !zen_mode) ui.set_control_hidden(Global.palette_panel, !zen_mode)
Global.control.find_node("TabsContainer").visible = zen_mode Global.control.find_node("TabsContainer").visible = zen_mode
zen_mode = !zen_mode zen_mode = !zen_mode
view_menu.set_item_checked(ViewMenuId.ZEN_MODE, zen_mode) window_menu.set_item_checked(WindowMenuId.ZEN_MODE, zen_mode)
func _toggle_fullscreen() -> void: func _toggle_fullscreen() -> void:
OS.window_fullscreen = !OS.window_fullscreen OS.window_fullscreen = !OS.window_fullscreen
view_menu.set_item_checked(ViewMenuId.FULLSCREEN_MODE, OS.window_fullscreen) window_menu.set_item_checked(WindowMenuId.FULLSCREEN_MODE, OS.window_fullscreen)
if OS.window_fullscreen: # If window is fullscreen then reset transparency if OS.window_fullscreen: # If window is fullscreen then reset transparency
window_opacity_dialog.set_window_opacity(1.0) window_opacity_dialog.set_window_opacity(1.0)

13
src/UI/TopMenuContainer.tscn
View file

@ -58,9 +58,18 @@ mouse_default_cursor_shape = 2
text = "View" text = "View"
switch_on_hover = true switch_on_hover = true
[node name="HelpMenu" type="MenuButton" parent="MenuItems"] [node name="WindowMenu" type="MenuButton" parent="MenuItems"]
margin_left = 236.0 margin_left = 236.0
margin_right = 278.0 margin_right = 299.0
margin_bottom = 20.0
focus_mode = 2
mouse_default_cursor_shape = 2
text = "Window"
switch_on_hover = true
[node name="HelpMenu" type="MenuButton" parent="MenuItems"]
margin_left = 303.0
margin_right = 345.0
margin_bottom = 20.0 margin_bottom = 20.0
mouse_default_cursor_shape = 2 mouse_default_cursor_shape = 2
text = "Help" text = "Help"