tonytins/CozyPixelStudio
1
0
Fork 0
mirror of https://github.com/tonytins/CozyPixelStudio.git synced 2025-06-25 10:24:44 -04:00
Code Issues Projects Releases Wiki Activity

Small UI changes

Browse source
This commit is contained in:
OverloadedOrama 2019-12-31 03:02:53 +02:00
parent 20d643b4ca
commit ff47ae26c0
7 changed files with 98 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Dialogs/ImportSprites.gd
View file

@ -107,5 +107,5 @@ func _on_ImportSprites_files_selected(paths : PoolStringArray) -> void:
Global.canvas = Global.canvases[Global.canvases.size() - 1]
Global.canvas.visible = true
OS.set_window_title(first_path.get_file() + " (imported) - Pixelorama")
OS.set_window_title(first_path.get_file() + " (" + tr("imported") + ") - Pixelorama")

4
Scripts/Global.gd
View file

@ -128,8 +128,6 @@ var canvas : Canvas
var canvas_parent : Node
var main_viewport : ViewportContainer
var second_viewport : ViewportContainer
var viewport_separator : VSeparator
var split_screen_button : BaseButton
var camera : Camera2D
var camera2 : Camera2D
var camera_preview : Camera2D
@ -241,8 +239,6 @@ func _ready() -> void:
canvas_parent = canvas.get_parent()
main_viewport = find_node_by_name(root, "ViewportContainer")
second_viewport = find_node_by_name(root, "ViewportContainer2")
viewport_separator = find_node_by_name(root, "ViewportSeparator")
split_screen_button = find_node_by_name(root, "SplitScreenButton")
camera = find_node_by_name(canvas_parent, "Camera2D")
camera2 = find_node_by_name(root, "Camera2D2")
camera_preview = find_node_by_name(root, "CameraPreview")

25
Scripts/Main.gd
View file

@ -16,7 +16,7 @@ var previous_right_color := Color.white
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
get_tree().set_auto_accept_quit(false)
OS.set_window_title("(untitled) - Pixelorama")
OS.set_window_title("(" + tr("untitled") + ") - Pixelorama")
# Set a minimum window size to prevent UI elements from collapsing on each other.
# This property is only available in 3.2alpha or later, so use `set()` to fail gracefully if it doesn't exist.
OS.set("min_window_size", Vector2(1152, 648))
@ -343,7 +343,7 @@ func help_menu_id_pressed(id : int) -> void:
func _on_OpenSprite_file_selected(path : String) -> void:
var file := File.new()
var err := file.open(path, File.READ)
if err != OK: #An error occured
if err != OK: # An error occured
file.close()
OS.alert("Can't load file")
return
@ -357,7 +357,7 @@ func _on_OpenSprite_file_selected(path : String) -> void:
var frame := 0
var frame_line := file.get_line()
clear_canvases()
while frame_line == "--": #Load frames
while frame_line == "--": # Load frames
var canvas : Canvas = load("res://Prefabs/Canvas.tscn").instance()
Global.canvas = canvas
var width := file.get_16()
@ -378,8 +378,8 @@ func _on_OpenSprite_file_selected(path : String) -> void:
canvas.layers.append([image, tex, layer_name, true, layer_transparency])
layer_line = file.get_line()
var guide_line := file.get_line() #"guideline" no pun intended
while guide_line == "|": #Load guides
var guide_line := file.get_line() # "guideline" no pun intended
while guide_line == "|": # Load guides
var guide := Guide.new()
guide.default_color = Color.purple
guide.type = file.get_8()
@ -401,7 +401,7 @@ func _on_OpenSprite_file_selected(path : String) -> void:
frame += 1
Global.current_frame = frame - 1
#Load tool options
# Load tool options
Global.left_color_picker.color = file.get_var()
Global.right_color_picker.color = file.get_var()
Global.left_brush_size = file.get_8()
@ -415,7 +415,7 @@ func _on_OpenSprite_file_selected(path : String) -> void:
for color in right_palette:
Global.right_color_picker.get_picker().add_preset(color)
#Load custom brushes
# Load custom brushes
Global.custom_brushes.resize(Global.brushes_from_files)
Global.remove_brush_buttons()
@ -502,6 +502,7 @@ func clear_canvases() -> void:
current_save_path = ""
$ExportSprites.current_export_path = ""
file_menu.set_item_text(5, "Export PNG...")
OS.set_window_title("(" + tr("untitled") + ") - Pixelorama")
Global.undo_redo.clear_history(false)
func _on_ImportSprites_popup_hide() -> void:
@ -823,16 +824,6 @@ func _on_FutureOnionSkinning_value_changed(value) -> void:
func _on_BlueRedMode_toggled(button_pressed) -> void:
Global.onion_skinning_blue_red = button_pressed
func _on_SplitScreenButton_toggled(button_pressed) -> void:
if button_pressed:
Global.viewport_separator.visible = true
Global.second_viewport.visible = true
$SplitScreenButton.hint_tooltip = tr("SPLITSCREEN_HIDE_HT")
else:
Global.viewport_separator.visible = false
Global.second_viewport.visible = false
$SplitScreenButton.hint_tooltip = tr("SPLITSCREEN_HT")
func _on_ColorSwitch_pressed() -> void:
var temp: Color = Global.left_color_picker.color
Global.left_color_picker.color = Global.right_color_picker.color

6
Scripts/Palette/EditPalettePopup.gd
View file

@ -2,10 +2,10 @@ extends WindowDialog
onready var color_picker = $VBoxContainer/HBoxContainer/EditPaletteColorPicker
onready var palette_grid = $VBoxContainer/HBoxContainer/Panel/EditPaletteGridContainer
onready var color_name_edit = $VBoxContainer/ColorNameContainer/EditPaletteColorNameLineEdit
onready var palette_name_edit = $VBoxContainer/PaletteNameContainer/EditPaletteNameLineEdit
onready var color_name_edit = $VBoxContainer/PaletteOptions/EditPaletteColorNameLineEdit
onready var palette_name_edit = $VBoxContainer/PaletteOptions/EditPaletteNameLineEdit
var palette_button = preload("res://Prefabs/PaletteButton.tscn");
var palette_button = preload("res://Prefabs/PaletteButton.tscn")
var current_palette : String
var current_swatch := -1