Merge remote-tracking branch 'Kira/master' into master-afsp
This commit is contained in:
@@ -27,13 +27,13 @@ func on_setting_changed():
|
||||
|
||||
|
||||
func apply_colors():
|
||||
var is_light: bool = ProjectSettings.get_setting("application/config/Цвет темы программы", false)
|
||||
var is_light: bool = ProjectSettings.get_setting('application/config/Цвет темы программы', false)
|
||||
var style = StyleBoxFlat.new()
|
||||
if is_light:
|
||||
style.bg_color = Color.DARK_GRAY
|
||||
add_theme_stylebox_override("tabbar_background", style)
|
||||
add_theme_stylebox_override("panel", style)
|
||||
add_theme_stylebox_override('tabbar_background', style)
|
||||
add_theme_stylebox_override('panel', style)
|
||||
else:
|
||||
style.bg_color = Color(0.12, 0.12, 0.12)
|
||||
add_theme_stylebox_override("tabbar_background", style)
|
||||
add_theme_stylebox_override("panel", style)
|
||||
add_theme_stylebox_override('tabbar_background', style)
|
||||
add_theme_stylebox_override('panel', style)
|
||||
|
||||
@@ -134,7 +134,7 @@ func on_ems2_pressed(btn) -> void:
|
||||
|
||||
func on_debag_control_pressed(btn) -> void:
|
||||
var state = btn.button_pressed
|
||||
signaller.emit_signal("debag_control_pressed", state)
|
||||
signaller.emit_signal('debag_control_pressed', state)
|
||||
_autosave_now()
|
||||
|
||||
|
||||
@@ -280,13 +280,13 @@ func button_settings():
|
||||
color_black.color = Color(arr_col_b[0], arr_col_b[1], arr_col_b[2], arr_col_b[3]) if arr_col_b else Color.WHITE_SMOKE
|
||||
color_black.text = JSON.stringify(arr_col_b)
|
||||
var theme_node = $scroll_set/table.get_node2(1, COLOR_THEME).get_children()[0]
|
||||
theme_node.connect("pressed", on_theme_toggle_pressed.bind(theme_node))
|
||||
theme_node.connect('pressed', on_theme_toggle_pressed.bind(theme_node))
|
||||
on_theme_toggle_pressed(theme_node)
|
||||
|
||||
|
||||
func on_theme_toggle_pressed(btn: CheckButton) -> void:
|
||||
var is_light = btn.button_pressed
|
||||
ProjectSettings.set_setting("application/config/Цвет темы программы", is_light)
|
||||
ProjectSettings.set_setting('application/config/Цвет темы программы', is_light)
|
||||
_autosave_now()
|
||||
|
||||
func _update_theme_colors():
|
||||
|
||||
@@ -6,14 +6,14 @@ func _enter_tree() -> void:
|
||||
|
||||
|
||||
func apply_colors():
|
||||
var is_light: bool = ProjectSettings.get_setting("application/config/Цвет темы программы", false)
|
||||
var style = get_theme_stylebox("read_only").duplicate()
|
||||
var is_light: bool = ProjectSettings.get_setting('application/config/Цвет темы программы', false)
|
||||
var style = get_theme_stylebox('read_only').duplicate()
|
||||
if is_light:
|
||||
style.bg_color = Color.GRAY
|
||||
add_theme_color_override("font_color_readonly", Color.BLACK)
|
||||
add_theme_color_override("font_color_placeholder", Color(0, 0, 0, 0.5))
|
||||
add_theme_color_override('font_color_readonly', Color.BLACK)
|
||||
add_theme_color_override('font_color_placeholder', Color(0, 0, 0, 0.5))
|
||||
else:
|
||||
style.bg_color = Color(0.12, 0.12, 0.12)
|
||||
add_theme_color_override("font_color_readonly", Color("#D8731A")) # тёмно-оранжевый
|
||||
add_theme_color_override("font_color_placeholder", Color(1, 1, 1, 0.5))
|
||||
add_theme_stylebox_override("read_only", style)
|
||||
add_theme_color_override('font_color_readonly', Color('#D8731A')) # тёмно-оранжевый
|
||||
add_theme_color_override('font_color_placeholder', Color(1, 1, 1, 0.5))
|
||||
add_theme_stylebox_override('read_only', style)
|
||||
|
||||
@@ -6,10 +6,10 @@ func _enter_tree() -> void:
|
||||
|
||||
|
||||
func apply_colors():
|
||||
var is_light: bool = ProjectSettings.get_setting("application/config/Цвет темы программы", false)
|
||||
var style = get_theme_stylebox("normal").duplicate()
|
||||
var is_light: bool = ProjectSettings.get_setting('application/config/Цвет темы программы', false)
|
||||
var style = get_theme_stylebox('normal').duplicate()
|
||||
if is_light:
|
||||
style.bg_color = Color.GRAY
|
||||
else:
|
||||
style.bg_color = Color(0.12, 0.12, 0.12)
|
||||
add_theme_stylebox_override("normal", style)
|
||||
add_theme_stylebox_override('normal', style)
|
||||
|
||||
@@ -6,14 +6,14 @@ func _enter_tree() -> void:
|
||||
|
||||
|
||||
func apply_colors():
|
||||
var is_light: bool = ProjectSettings.get_setting("application/config/Цвет темы программы", false)
|
||||
var style = get_theme_stylebox("read_only").duplicate()
|
||||
var is_light: bool = ProjectSettings.get_setting('application/config/Цвет темы программы', false)
|
||||
var style = get_theme_stylebox('read_only').duplicate()
|
||||
if is_light:
|
||||
style.bg_color = Color.GRAY
|
||||
add_theme_color_override("font_color_readonly", Color.BLACK)
|
||||
add_theme_color_override("font_color_placeholder", Color(0, 0, 0, 0.5))
|
||||
add_theme_color_override('font_color_readonly', Color.BLACK)
|
||||
add_theme_color_override('font_color_placeholder', Color(0, 0, 0, 0.5))
|
||||
else:
|
||||
style.bg_color = Color(0.12, 0.12, 0.12)
|
||||
add_theme_color_override("font_color_readonly", Color("#D8731A")) # тёмно-оранжевый
|
||||
add_theme_color_override("font_color_placeholder", Color(1, 1, 1, 0.5))
|
||||
add_theme_stylebox_override("read_only", style)
|
||||
add_theme_color_override('font_color_readonly', Color('#D8731A')) # тёмно-оранжевый
|
||||
add_theme_color_override('font_color_placeholder', Color(1, 1, 1, 0.5))
|
||||
add_theme_stylebox_override('read_only', style)
|
||||
|
||||
@@ -14,13 +14,13 @@ func on_setting_changed():
|
||||
|
||||
|
||||
func apply_colors():
|
||||
var is_light: bool = ProjectSettings.get_setting("application/config/Цвет темы программы", false)
|
||||
var style = get_theme_stylebox("read_only").duplicate()
|
||||
var is_light: bool = ProjectSettings.get_setting('application/config/Цвет темы программы', false)
|
||||
var style = get_theme_stylebox('read_only').duplicate()
|
||||
if is_light:
|
||||
style.bg_color = Color.GRAY
|
||||
else:
|
||||
style.bg_color = Color(0.12, 0.12, 0.12)
|
||||
add_theme_stylebox_override("read_only", style)
|
||||
add_theme_stylebox_override('read_only', style)
|
||||
var cb = $CheckButton
|
||||
if is_light:
|
||||
cb.material = null
|
||||
|
||||
@@ -14,13 +14,13 @@ func on_setting_changed():
|
||||
|
||||
|
||||
func apply_colors():
|
||||
var is_light: bool = ProjectSettings.get_setting("application/config/Цвет темы программы", false)
|
||||
var style = get_theme_stylebox("read_only").duplicate()
|
||||
var is_light: bool = ProjectSettings.get_setting('application/config/Цвет темы программы', false)
|
||||
var style = get_theme_stylebox('read_only').duplicate()
|
||||
if is_light:
|
||||
style.bg_color = Color.GRAY
|
||||
else:
|
||||
style.bg_color = Color(0.12, 0.12, 0.12)
|
||||
add_theme_stylebox_override("read_only", style)
|
||||
add_theme_stylebox_override('read_only', style)
|
||||
var cb = $CheckButton
|
||||
if is_light:
|
||||
cb.material = null
|
||||
|
||||
@@ -6,18 +6,18 @@ func _enter_tree() -> void:
|
||||
|
||||
|
||||
func apply_colors():
|
||||
var is_light: bool = ProjectSettings.get_setting("application/config/Цвет темы программы", false)
|
||||
var style = get_theme_stylebox("normal").duplicate()
|
||||
var style_1 = get_theme_stylebox("read_only").duplicate()
|
||||
var is_light: bool = ProjectSettings.get_setting('application/config/Цвет темы программы', false)
|
||||
var style = get_theme_stylebox('normal').duplicate()
|
||||
var style_1 = get_theme_stylebox('read_only').duplicate()
|
||||
if is_light:
|
||||
style.bg_color = Color.GRAY
|
||||
style_1.bg_color = Color.GRAY
|
||||
add_theme_color_override("font_color", Color.BLACK)
|
||||
add_theme_color_override("font_uneditable_color", Color.BLACK)
|
||||
add_theme_color_override('font_color', Color.BLACK)
|
||||
add_theme_color_override('font_uneditable_color', Color.BLACK)
|
||||
else:
|
||||
style.bg_color = Color(0.12, 0.12, 0.12)
|
||||
style_1.bg_color = Color(0.12, 0.12, 0.12)
|
||||
add_theme_color_override("font_color", Color(1.0, 0.596, 0.4))
|
||||
add_theme_color_override("font_uneditable_color", Color(1.0, 0.596, 0.4))
|
||||
add_theme_stylebox_override("normal", style)
|
||||
add_theme_stylebox_override("read_only", style_1)
|
||||
add_theme_color_override('font_color', Color(1.0, 0.596, 0.4))
|
||||
add_theme_color_override('font_uneditable_color', Color(1.0, 0.596, 0.4))
|
||||
add_theme_stylebox_override('normal', style)
|
||||
add_theme_stylebox_override('read_only', style_1)
|
||||
|
||||
@@ -6,10 +6,10 @@ func _enter_tree() -> void:
|
||||
|
||||
|
||||
func apply_colors():
|
||||
var is_light: bool = ProjectSettings.get_setting("application/config/Цвет темы программы", false)
|
||||
var style = get_theme_stylebox("normal").duplicate()
|
||||
var is_light: bool = ProjectSettings.get_setting('application/config/Цвет темы программы', false)
|
||||
var style = get_theme_stylebox('normal').duplicate()
|
||||
if is_light:
|
||||
style.bg_color = Color.GRAY
|
||||
else:
|
||||
style.bg_color = Color(0.12, 0.12, 0.12)
|
||||
add_theme_stylebox_override("normal", style)
|
||||
add_theme_stylebox_override('normal', style)
|
||||
|
||||
Reference in New Issue
Block a user