From c4e27d2550e7a9a40477bbcafbee0a7d6176f368 Mon Sep 17 00:00:00 2001 From: Thorsten Sommer Date: Fri, 8 Dec 2023 22:56:37 +0100 Subject: [PATCH] Moved theme determination --- I18N Commander/App/scenes/BtnIcon.tscn | 4 +--- I18N Commander/App/scenes/loading_screen.tscn | 4 +++- I18N Commander/App/theme/ui_theme_dark.tres | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/I18N Commander/App/scenes/BtnIcon.tscn b/I18N Commander/App/scenes/BtnIcon.tscn index 5dbc5aa..db5f446 100644 --- a/I18N Commander/App/scenes/BtnIcon.tscn +++ b/I18N Commander/App/scenes/BtnIcon.tscn @@ -1,7 +1,6 @@ -[gd_scene load_steps=3 format=3 uid="uid://d0x0yv7nevod7"] +[gd_scene load_steps=2 format=3 uid="uid://d0x0yv7nevod7"] [ext_resource type="Script" path="res://scenes/BtnIcon.cs" id="1_b787p"] -[ext_resource type="Theme" uid="uid://uqhultm05f5a" path="res://theme/ui_theme_dark.tres" id="2_8n123"] [node name="btn_icon" type="MarginContainer"] theme_override_constants/margin_left = 6 @@ -13,4 +12,3 @@ script = ExtResource("1_b787p") [node name="btn" type="Button" parent="."] unique_name_in_owner = true layout_mode = 2 -theme = ExtResource("2_8n123") diff --git a/I18N Commander/App/scenes/loading_screen.tscn b/I18N Commander/App/scenes/loading_screen.tscn index 0011b9a..1cf5f6e 100644 --- a/I18N Commander/App/scenes/loading_screen.tscn +++ b/I18N Commander/App/scenes/loading_screen.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=4 format=3 uid="uid://qm7ovimcfc3h"] +[gd_scene load_steps=5 format=3 uid="uid://qm7ovimcfc3h"] [ext_resource type="Texture2D" uid="uid://csxeqym474oxu" path="res://assets/icons/icons8-language-512.png" id="1_1ya62"] [ext_resource type="PackedScene" uid="uid://d0x0yv7nevod7" path="res://scenes/BtnIcon.tscn" id="2_gp72s"] [ext_resource type="Texture2D" uid="uid://cp33pga3vuk5k" path="res://assets/icons/icons8-new-window-512.png" id="3_4v5hm"] +[ext_resource type="Theme" uid="uid://uqhultm05f5a" path="res://theme/ui_theme_dark.tres" id="3_7idnl"] [node name="frame" type="Control"] layout_mode = 3 @@ -11,6 +12,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +theme = ExtResource("3_7idnl") [node name="center" type="CenterContainer" parent="."] layout_mode = 1 diff --git a/I18N Commander/App/theme/ui_theme_dark.tres b/I18N Commander/App/theme/ui_theme_dark.tres index 008b78f..ec0b011 100644 --- a/I18N Commander/App/theme/ui_theme_dark.tres +++ b/I18N Commander/App/theme/ui_theme_dark.tres @@ -1,9 +1,9 @@ [gd_resource type="Theme" load_steps=8 format=3 uid="uid://uqhultm05f5a"] -[ext_resource type="StyleBox" uid="uid://chaurklijlgu7" path="res://theme/btn/d_style_box_flat_focus.tres" id="1_no4nl"] -[ext_resource type="StyleBox" uid="uid://l1tjpnljc6c1" path="res://theme/btn/d_style_box_flat_hover.tres" id="2_qu3am"] -[ext_resource type="StyleBox" uid="uid://tj810ebe65el" path="res://theme/btn/d_style_box_flat_norm.tres" id="3_cuhgr"] -[ext_resource type="StyleBox" uid="uid://he0mxms4j1q7" path="res://theme/btn/d_style_box_flat_press.tres" id="4_cvafn"] +[ext_resource type="StyleBox" uid="uid://chaurklijlgu7" path="res://theme/btn/d_style_box_flat_focus.tres" id="1_uspte"] +[ext_resource type="StyleBox" uid="uid://l1tjpnljc6c1" path="res://theme/btn/d_style_box_flat_hover.tres" id="2_pm5yo"] +[ext_resource type="StyleBox" uid="uid://tj810ebe65el" path="res://theme/btn/d_style_box_flat_norm.tres" id="3_p1mf5"] +[ext_resource type="StyleBox" uid="uid://he0mxms4j1q7" path="res://theme/btn/d_style_box_flat_press.tres" id="4_a7p74"] [ext_resource type="StyleBox" uid="uid://bgka0t482q0dh" path="res://theme/checkbox/style_box_empty.tres" id="5_1ugrl"] [ext_resource type="StyleBox" uid="uid://batay7mp6vfon" path="res://theme/checkBtn/style_box_empty.tres" id="6_i1h00"] [ext_resource type="StyleBox" uid="uid://cens6ndafk28w" path="res://theme/panel/d_style_box_flat.tres" id="7_3s8mj"] @@ -11,10 +11,10 @@ [resource] Button/constants/h_separation = 6 Button/font_sizes/font_size = 32 -Button/styles/focus = ExtResource("1_no4nl") -Button/styles/hover = ExtResource("2_qu3am") -Button/styles/normal = ExtResource("3_cuhgr") -Button/styles/pressed = ExtResource("4_cvafn") +Button/styles/focus = ExtResource("1_uspte") +Button/styles/hover = ExtResource("2_pm5yo") +Button/styles/normal = ExtResource("3_p1mf5") +Button/styles/pressed = ExtResource("4_a7p74") CheckBox/constants/h_separation = 16 CheckBox/font_sizes/font_size = 32 CheckBox/styles/disabled = ExtResource("5_1ugrl")