From 9bf1660d18c761c8ff2777c43681e89a51a360d0 Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Wed, 25 Mar 2020 18:22:29 +0200 Subject: [PATCH] ExportDialog visual changes Tabs are now included as Class items in all themes, the OK button in ExportDialog appears on the left on Windows machines, and on the right in all other operating systems. Also added border outlines to all window dialogs. --- Changelog.md | 2 + Prefabs/Dialogs/ExportDialog.tscn | 2 + Scripts/Dialogs/ExportDialog.gd | 9 +++- Themes & Styles/Dark Theme/Dark Theme.tres | 53 +++++++++++++++++--- Themes & Styles/Gold Theme/Gold Theme.tres | 24 ++++++++- Themes & Styles/Gray Theme/Gray Theme.tres | 24 ++++++++- Themes & Styles/Light Theme/Light Theme.tres | 24 ++++++++- 7 files changed, 126 insertions(+), 12 deletions(-) diff --git a/Changelog.md b/Changelog.md index 090d37348..2f81edc97 100644 --- a/Changelog.md +++ b/Changelog.md @@ -16,12 +16,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Changed - The timeline has been revamped! +- The export dialog has also been revamped - thanks to thanks to Martin Novák (novhack)! - An asterisk is added to the window title if there are unsaved changes. - A VSplitContainer has been added between the canvas and the timeline. - Notification text is now black on the gold and light themes. - Layer's LineEdit now saves the changes when it loses focus, or when the user presses ESC (or Enter) - LineEdits lose focus when the user presses Enter - thanks to Gaarco! - Layer visibility is taken into account when exporting the drawing as a .png file. This means that invisible layers will not be included in the final .png file. +- Visual change, added border outlines to all window dialogs. ### Fixed - Chinese characters not being rendered in notifications (the labels that appear when undoing/redoing) diff --git a/Prefabs/Dialogs/ExportDialog.tscn b/Prefabs/Dialogs/ExportDialog.tscn index f6ccd0bd2..cae9a3e21 100644 --- a/Prefabs/Dialogs/ExportDialog.tscn +++ b/Prefabs/Dialogs/ExportDialog.tscn @@ -275,6 +275,7 @@ margin_right = 448.0 margin_bottom = 280.0 size_flags_horizontal = 0 size_flags_vertical = 0 +resizable = true dialog_text = "Directory path or file name is not valid!" __meta__ = { "_edit_use_anchors_": false @@ -287,6 +288,7 @@ margin_right = 448.0 margin_bottom = 280.0 size_flags_horizontal = 0 size_flags_vertical = 0 +resizable = true dialog_text = "File %s already exists. Overwrite?" __meta__ = { "_edit_use_anchors_": false diff --git a/Scripts/Dialogs/ExportDialog.gd b/Scripts/Dialogs/ExportDialog.gd index d1c4fe680..337d917f9 100644 --- a/Scripts/Dialogs/ExportDialog.gd +++ b/Scripts/Dialogs/ExportDialog.gd @@ -51,8 +51,12 @@ func _ready() -> void: $VBoxContainer/Tabs.add_tab("Frame") $VBoxContainer/Tabs.add_tab("Spritesheet") $VBoxContainer/Tabs.add_tab("Animation") - add_button("Cancel", false, "cancel") - $Popups/FileExistsAlert.add_button("Cancel Export", false, "cancel") + if OS.get_name() == "Windows": + add_button("Cancel", true, "cancel") + $Popups/FileExistsAlert.add_button("Cancel Export", true, "cancel") + else: + add_button("Cancel", false, "cancel") + $Popups/FileExistsAlert.add_button("Cancel Export", false, "cancel") func show_tab() -> void: $VBoxContainer/FrameOptions.hide() @@ -322,6 +326,7 @@ func _on_ExportDialog_about_to_show() -> void: child.theme = Global.control.theme file_exists_alert = tr("File %s already exists. Overwrite?") # Update translation + #$VBoxContainer/Tabs.set_tab_title(0, "Frame") func _on_Tabs_tab_clicked(tab : int) -> void: current_tab = tab diff --git a/Themes & Styles/Dark Theme/Dark Theme.tres b/Themes & Styles/Dark Theme/Dark Theme.tres index 225e8226d..f6f0407c2 100644 --- a/Themes & Styles/Dark Theme/Dark Theme.tres +++ b/Themes & Styles/Dark Theme/Dark Theme.tres @@ -1,4 +1,4 @@ -[gd_resource type="Theme" load_steps=28 format=2] +[gd_resource type="Theme" load_steps=30 format=2] [ext_resource path="res://Assets/Fonts/Roboto-Regular.tres" type="DynamicFont" id=1] @@ -211,6 +211,23 @@ border_color = Color( 0.321569, 0.321569, 0.321569, 1 ) [sub_resource type="StyleBoxFlat" id=24] bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) +border_width_left = 5 +border_width_top = 10 +border_width_right = 5 +border_width_bottom = 5 +border_color = Color( 0.321569, 0.321569, 0.321569, 1 ) +anti_aliasing = false + +[sub_resource type="StyleBoxFlat" id=25] +bg_color = Color( 0.2, 0.2, 0.2, 1 ) +border_width_left = 10 +border_width_top = 6 +border_width_right = 10 +border_width_bottom = 8 +border_color = Color( 0.2, 0.2, 0.2, 1 ) + +[sub_resource type="StyleBoxFlat" id=28] +bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) border_width_left = 4 border_width_top = 4 border_width_right = 4 @@ -222,7 +239,7 @@ corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 anti_aliasing = false -[sub_resource type="StyleBoxFlat" id=25] +[sub_resource type="StyleBoxFlat" id=29] bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) border_width_left = 4 border_width_top = 4 @@ -234,9 +251,12 @@ corner_radius_top_right = 4 corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 -[sub_resource type="StyleBoxFlat" id=26] -bg_color = Color( 0.133333, 0.133333, 0.133333, 1 ) +[sub_resource type="StyleBoxFlat" id=30] +bg_color = Color( 0.0705882, 0.0705882, 0.0705882, 1 ) +border_width_left = 2 border_width_top = 20 +border_width_right = 2 +border_width_bottom = 2 border_color = Color( 0.403922, 0.403922, 0.403922, 1 ) expand_margin_top = 20.0 @@ -397,6 +417,25 @@ TabContainer/styles/panel = SubResource( 20 ) TabContainer/styles/tab_bg = SubResource( 21 ) TabContainer/styles/tab_disabled = SubResource( 22 ) TabContainer/styles/tab_fg = SubResource( 23 ) +Tabs/colors/font_color_bg = Color( 0.69, 0.69, 0.69, 1 ) +Tabs/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +Tabs/colors/font_color_fg = Color( 0.94, 0.94, 0.94, 1 ) +Tabs/constants/hseparation = 4 +Tabs/constants/label_valign_bg = 2 +Tabs/constants/label_valign_fg = 0 +Tabs/constants/top_margin = 24 +Tabs/fonts/font = null +Tabs/icons/close = null +Tabs/icons/decrement = null +Tabs/icons/decrement_highlight = null +Tabs/icons/increment = null +Tabs/icons/increment_highlight = null +Tabs/styles/button = null +Tabs/styles/button_pressed = null +Tabs/styles/panel = SubResource( 24 ) +Tabs/styles/tab_bg = SubResource( 25 ) +Tabs/styles/tab_disabled = SubResource( 22 ) +Tabs/styles/tab_fg = SubResource( 23 ) TextEdit/colors/background_color = Color( 0, 0, 0, 0 ) TextEdit/colors/brace_mismatch_color = Color( 1, 0.2, 0.2, 1 ) TextEdit/colors/breakpoint_color = Color( 0.8, 0.8, 0.4, 0.2 ) @@ -428,7 +467,7 @@ TextEdit/fonts/font = null TextEdit/icons/tab = null TextEdit/styles/completion = null TextEdit/styles/focus = null -TextEdit/styles/normal = SubResource( 24 ) +TextEdit/styles/normal = SubResource( 28 ) TextEdit/styles/read_only = null Tree/colors/cursor_color = Color( 0, 0, 0, 1 ) Tree/colors/custom_button_font_highlight = Color( 0.941176, 0.941176, 0.941176, 1 ) @@ -456,7 +495,7 @@ Tree/icons/checked = null Tree/icons/select_arrow = null Tree/icons/unchecked = null Tree/icons/updown = null -Tree/styles/bg = SubResource( 25 ) +Tree/styles/bg = SubResource( 29 ) Tree/styles/bg_focus = null Tree/styles/button_pressed = null Tree/styles/cursor = null @@ -487,4 +526,4 @@ WindowDialog/constants/title_height = 20 WindowDialog/fonts/title_font = null WindowDialog/icons/close = null WindowDialog/icons/close_highlight = null -WindowDialog/styles/panel = SubResource( 26 ) +WindowDialog/styles/panel = SubResource( 30 ) diff --git a/Themes & Styles/Gold Theme/Gold Theme.tres b/Themes & Styles/Gold Theme/Gold Theme.tres index 2ff1159dd..e46b08744 100644 --- a/Themes & Styles/Gold Theme/Gold Theme.tres +++ b/Themes & Styles/Gold Theme/Gold Theme.tres @@ -244,8 +244,11 @@ border_width_left = 1 border_color = Color( 0.372549, 0.360784, 0.301961, 1 ) [sub_resource type="StyleBoxFlat" id=29] -bg_color = Color( 0.878431, 0.87451, 0.819608, 1 ) +bg_color = Color( 0.901961, 0.866667, 0.670588, 1 ) +border_width_left = 2 border_width_top = 20 +border_width_right = 2 +border_width_bottom = 2 border_color = Color( 0.372549, 0.360784, 0.301961, 1 ) expand_margin_top = 20.0 @@ -417,6 +420,25 @@ TabContainer/styles/panel = SubResource( 21 ) TabContainer/styles/tab_bg = SubResource( 22 ) TabContainer/styles/tab_disabled = SubResource( 23 ) TabContainer/styles/tab_fg = SubResource( 24 ) +Tabs/colors/font_color_bg = Color( 0.69, 0.69, 0.69, 1 ) +Tabs/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +Tabs/colors/font_color_fg = Color( 0.94, 0.94, 0.94, 1 ) +Tabs/constants/hseparation = 4 +Tabs/constants/label_valign_bg = 2 +Tabs/constants/label_valign_fg = 0 +Tabs/constants/top_margin = 24 +Tabs/fonts/font = null +Tabs/icons/close = null +Tabs/icons/decrement = null +Tabs/icons/decrement_highlight = null +Tabs/icons/increment = null +Tabs/icons/increment_highlight = null +Tabs/styles/button = null +Tabs/styles/button_pressed = null +Tabs/styles/panel = SubResource( 21 ) +Tabs/styles/tab_bg = SubResource( 22 ) +Tabs/styles/tab_disabled = SubResource( 23 ) +Tabs/styles/tab_fg = SubResource( 24 ) TextEdit/colors/background_color = Color( 0, 0, 0, 0 ) TextEdit/colors/brace_mismatch_color = Color( 1, 0.2, 0.2, 1 ) TextEdit/colors/breakpoint_color = Color( 0.8, 0.8, 0.4, 0.2 ) diff --git a/Themes & Styles/Gray Theme/Gray Theme.tres b/Themes & Styles/Gray Theme/Gray Theme.tres index 6d2b960c3..8339e578b 100644 --- a/Themes & Styles/Gray Theme/Gray Theme.tres +++ b/Themes & Styles/Gray Theme/Gray Theme.tres @@ -235,8 +235,11 @@ corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 [sub_resource type="StyleBoxFlat" id=26] -bg_color = Color( 0.133333, 0.133333, 0.133333, 1 ) +bg_color = Color( 0.176471, 0.176471, 0.176471, 1 ) +border_width_left = 2 border_width_top = 20 +border_width_right = 2 +border_width_bottom = 2 border_color = Color( 0.403922, 0.403922, 0.403922, 1 ) expand_margin_top = 20.0 @@ -397,6 +400,25 @@ TabContainer/styles/panel = SubResource( 20 ) TabContainer/styles/tab_bg = SubResource( 21 ) TabContainer/styles/tab_disabled = SubResource( 22 ) TabContainer/styles/tab_fg = SubResource( 23 ) +Tabs/colors/font_color_bg = Color( 0.69, 0.69, 0.69, 1 ) +Tabs/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +Tabs/colors/font_color_fg = Color( 0.94, 0.94, 0.94, 1 ) +Tabs/constants/hseparation = 4 +Tabs/constants/label_valign_bg = 2 +Tabs/constants/label_valign_fg = 0 +Tabs/constants/top_margin = 24 +Tabs/fonts/font = null +Tabs/icons/close = null +Tabs/icons/decrement = null +Tabs/icons/decrement_highlight = null +Tabs/icons/increment = null +Tabs/icons/increment_highlight = null +Tabs/styles/button = null +Tabs/styles/button_pressed = null +Tabs/styles/panel = SubResource( 20 ) +Tabs/styles/tab_bg = SubResource( 21 ) +Tabs/styles/tab_disabled = SubResource( 22 ) +Tabs/styles/tab_fg = SubResource( 23 ) TextEdit/colors/background_color = Color( 0, 0, 0, 0 ) TextEdit/colors/brace_mismatch_color = Color( 1, 0.2, 0.2, 1 ) TextEdit/colors/breakpoint_color = Color( 0.8, 0.8, 0.4, 0.2 ) diff --git a/Themes & Styles/Light Theme/Light Theme.tres b/Themes & Styles/Light Theme/Light Theme.tres index c12736c5c..845ad9d07 100644 --- a/Themes & Styles/Light Theme/Light Theme.tres +++ b/Themes & Styles/Light Theme/Light Theme.tres @@ -255,8 +255,11 @@ corner_radius_bottom_right = 2 corner_radius_bottom_left = 2 [sub_resource type="StyleBoxFlat" id=28] -bg_color = Color( 1, 1, 1, 1 ) +bg_color = Color( 0.835294, 0.835294, 0.835294, 1 ) +border_width_left = 2 border_width_top = 20 +border_width_right = 2 +border_width_bottom = 2 border_color = Color( 0.403922, 0.403922, 0.403922, 1 ) expand_margin_top = 20.0 @@ -426,6 +429,25 @@ TabContainer/styles/panel = SubResource( 21 ) TabContainer/styles/tab_bg = SubResource( 22 ) TabContainer/styles/tab_disabled = SubResource( 23 ) TabContainer/styles/tab_fg = SubResource( 24 ) +Tabs/colors/font_color_bg = Color( 0.69, 0.69, 0.69, 1 ) +Tabs/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +Tabs/colors/font_color_fg = Color( 0.94, 0.94, 0.94, 1 ) +Tabs/constants/hseparation = 4 +Tabs/constants/label_valign_bg = 2 +Tabs/constants/label_valign_fg = 0 +Tabs/constants/top_margin = 24 +Tabs/fonts/font = null +Tabs/icons/close = null +Tabs/icons/decrement = null +Tabs/icons/decrement_highlight = null +Tabs/icons/increment = null +Tabs/icons/increment_highlight = null +Tabs/styles/button = null +Tabs/styles/button_pressed = null +Tabs/styles/panel = SubResource( 21 ) +Tabs/styles/tab_bg = SubResource( 22 ) +Tabs/styles/tab_disabled = SubResource( 23 ) +Tabs/styles/tab_fg = SubResource( 24 ) TextEdit/colors/background_color = Color( 0, 0, 0, 0 ) TextEdit/colors/brace_mismatch_color = Color( 1, 0.2, 0.2, 1 ) TextEdit/colors/breakpoint_color = Color( 0.8, 0.8, 0.4, 0.2 )