Fix various issues (#864)

MewPurPur · Aug 19, 2024 · e91f9e3 · e91f9e3
1 parent 78fd028
commit e91f9e3
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 56 deletions.
diff --git a/src/data_classes/AttributePathdata.gd b/src/data_classes/AttributePathdata.gd
@@ -9,7 +9,7 @@ func _sync() -> void:
 	_commands = parse_pathdata(get_value())
 	locate_start_points()
 
-func autoformat(text: String) -> String:
+func format(text: String) -> String:
 	return path_commands_to_text(parse_pathdata(text))
 
 
@@ -435,8 +435,11 @@ func path_commands_to_text(commands_arr: Array[PathCommand]) -> String:
 					output += (" 0" if cmd.large_arc_flag == 0 else " 1") +\
 							("0" if cmd.sweep_flag == 0 else "1")
 				else:
-					output += (" 0 " if cmd.large_arc_flag == 0 else " 1 ") +\
-							("0 " if cmd.sweep_flag == 0 else "1 ")
+					output += " 0 " if cmd.large_arc_flag == 0 else " 1 "
+					if num_parser.num_to_text(cmd.x)[0] == "-":
+						output += "0" if cmd.sweep_flag == 0 else "1"
+					else:
+						output += "0 " if cmd.sweep_flag == 0 else "1 "
 				output += num_parser.numstr_arr_to_text([num_parser.num_to_text(cmd.x),
 						num_parser.num_to_text(cmd.y)])
 			"C":

diff --git a/src/data_classes/ElementLinearGradient.gd b/src/data_classes/ElementLinearGradient.gd
@@ -21,7 +21,7 @@ func get_percentage_handling(attribute_name: String) -> DB.PercentageHandling:
 func get_config_warnings() -> PackedStringArray:
 	var warnings := super()
 	if not has_attribute("id"):
-		warnings.append(TranslationServer.translate("No id attribute defined."))
+		warnings.append(TranslationServer.translate("No \"id\" attribute defined."))
 
 	var first_stop_color := ""
 	var first_stop_opacity := -1.0

diff --git a/src/data_classes/ElementSVG.gd b/src/data_classes/ElementSVG.gd
@@ -10,8 +10,8 @@ var canvas_transform: Transform2D
 const name = "svg"
 
 func _init() -> void:
-	super()
 	attribute_changed.connect(update_cache.unbind(1))
+	super()
 
 func update_cache() -> void:
 	var has_valid_width := has_attribute("width")

diff --git a/src/ui_parts/settings_menu.gd b/src/ui_parts/settings_menu.gd
@@ -95,7 +95,7 @@ func setup_content() -> void:
 				btn.toggle_mode = true
 				btn.button_group = button_group
 				btn.pressed.connect(show_keybinds.bind(tab_idx))
-				btn.text = shortcut_tab_names[tab_idx].call()
+				btn.text = get_translated_shortcut_tab(tab_idx)
 				btn.mouse_default_cursor_shape = Control.CURSOR_POINTING_HAND
 				btn.focus_mode = Control.FOCUS_NONE
 				categories.add_child(btn)
@@ -451,13 +451,17 @@ func set_formatter(formatter_purpose: String, formatter_name: String) -> void:
 		GlobalSettings.modify_setting(formatter_purpose, new_formatter)
 
 
-var shortcut_tab_names := {
-	"file": TranslationServer.translate.bind("File"),
-	"edit": TranslationServer.translate.bind("Edit"),
-	"view": TranslationServer.translate.bind("View"),
-	"tool": TranslationServer.translate.bind("Tool"),
-	"help": TranslationServer.translate.bind("Help"),
-}
+var shortcut_tab_names := ["file", "edit", "view", "tool", "help"]
+
+func get_translated_shortcut_tab(tab_idx: String) -> String:
+	match tab_idx:
+		"file": return TranslationServer.translate("File")
+		"edit": return TranslationServer.translate("Edit")
+		"view": return TranslationServer.translate("View")
+		"tool": return TranslationServer.translate("Tool")
+		"help": return TranslationServer.translate("Help")
+		_: return ""
+
 
 func show_keybinds(category: String):
 	var keybinds_container := content_container.get_child(-1).get_child(-1)

diff --git a/translations/GodSVG.pot b/translations/GodSVG.pot
@@ -120,7 +120,8 @@ msgid "This group has only one element."
 msgstr ""
 
 #: src/data_classes/ElementLinearGradient.gd
-msgid "No id attribute defined."
+#: src/data_classes/ElementRadialGradient.gd
+msgid "No \"id\" attribute defined."
 msgstr ""
 
 #: src/data_classes/ElementLinearGradient.gd
@@ -133,10 +134,6 @@ msgstr ""
 msgid "This gradient is a solid color."
 msgstr ""
 
-#: src/data_classes/ElementRadialGradient.gd
-msgid "No \"id\" attribute defined."
-msgstr ""
-
 #: src/data_classes/SVGParser.gd
 msgid "Doesn’t describe an SVG."
 msgstr ""

diff --git a/translations/bg.po b/translations/bg.po
@@ -122,8 +122,9 @@ msgid "This group has only one element."
 msgstr "Тази група има само един елемент."
 
 #: src/data_classes/ElementLinearGradient.gd
-msgid "No id attribute defined."
-msgstr "Не е дефиниран id атрибут."
+#: src/data_classes/ElementRadialGradient.gd
+msgid "No \"id\" attribute defined."
+msgstr "Не е дефиниран \"id\" атрибут."
 
 #: src/data_classes/ElementLinearGradient.gd
 #: src/data_classes/ElementRadialGradient.gd
@@ -135,10 +136,6 @@ msgstr "Няма <stop> елемент под този градиент."
 msgid "This gradient is a solid color."
 msgstr "Този градиент е едноцветен."
 
-#: src/data_classes/ElementRadialGradient.gd
-msgid "No \"id\" attribute defined."
-msgstr "Не е дефиниран \"id\" атрибут."
-
 #: src/data_classes/SVGParser.gd
 msgid "Doesn’t describe an SVG."
 msgstr "Текстът не описва SVG."

diff --git a/translations/de.po b/translations/de.po
@@ -123,8 +123,9 @@ msgid "This group has only one element."
 msgstr "Diese Gruppe hat nur ein Element."
 
 #: src/data_classes/ElementLinearGradient.gd
-msgid "No id attribute defined."
-msgstr "Kein id Attribut definiert."
+#: src/data_classes/ElementRadialGradient.gd
+msgid "No \"id\" attribute defined."
+msgstr "Kein \"id\" Attribut definiert."
 
 #: src/data_classes/ElementLinearGradient.gd
 #: src/data_classes/ElementRadialGradient.gd
@@ -136,10 +137,6 @@ msgstr "Keine <stop> Elemente unter diesem Farbverlauf."
 msgid "This gradient is a solid color."
 msgstr "Dieser Farbverlauf ist einfarbig."
 
-#: src/data_classes/ElementRadialGradient.gd
-msgid "No \"id\" attribute defined."
-msgstr "Kein \"id\" Attribut definiert."
-
 #: src/data_classes/SVGParser.gd
 msgid "Doesn’t describe an SVG."
 msgstr "Beschreibt kein SVG."
@@ -1007,6 +1004,9 @@ msgstr "Kubischer Bezier to"
 msgid "Shorthand Cubic Bezier to"
 msgstr "Kurzhand-Kubischer Bezier to"
 
+#~ msgid "No id attribute defined."
+#~ msgstr "Kein id Attribut definiert."
+
 #~ msgid "General"
 #~ msgstr "Allgemein"
 

diff --git a/translations/en.po b/translations/en.po
@@ -120,7 +120,8 @@ msgid "This group has only one element."
 msgstr ""
 
 #: src/data_classes/ElementLinearGradient.gd
-msgid "No id attribute defined."
+#: src/data_classes/ElementRadialGradient.gd
+msgid "No \"id\" attribute defined."
 msgstr ""
 
 #: src/data_classes/ElementLinearGradient.gd
@@ -133,10 +134,6 @@ msgstr ""
 msgid "This gradient is a solid color."
 msgstr ""
 
-#: src/data_classes/ElementRadialGradient.gd
-msgid "No \"id\" attribute defined."
-msgstr ""
-
 #: src/data_classes/SVGParser.gd
 msgid "Doesn’t describe an SVG."
 msgstr ""

diff --git a/translations/nl.po b/translations/nl.po
@@ -123,8 +123,9 @@ msgid "This group has only one element."
 msgstr "Deze groep heeft alleen een element."
 
 #: src/data_classes/ElementLinearGradient.gd
-msgid "No id attribute defined."
-msgstr "Geen id attribuut gedefinieert."
+#: src/data_classes/ElementRadialGradient.gd
+msgid "No \"id\" attribute defined."
+msgstr "Geen \"id\" attribuut gedefineerd."
 
 #: src/data_classes/ElementLinearGradient.gd
 #: src/data_classes/ElementRadialGradient.gd
@@ -136,10 +137,6 @@ msgstr "Geen <stop> elementen onder deze kleurovergang."
 msgid "This gradient is a solid color."
 msgstr "Deze kleurovergang is een vaste kleur."
 
-#: src/data_classes/ElementRadialGradient.gd
-msgid "No \"id\" attribute defined."
-msgstr "Geen \"id\" attribuut gedefineerd."
-
 #: src/data_classes/SVGParser.gd
 msgid "Doesn’t describe an SVG."
 msgstr "Beschrijft geen SVG."
@@ -996,3 +993,6 @@ msgstr ""
 #: src/utils/TranslationUtils.gd
 msgid "Shorthand Cubic Bezier to"
 msgstr ""
+
+#~ msgid "No id attribute defined."
+#~ msgstr "Geen id attribuut gedefinieert."
diff --git a/translations/ru.po b/translations/ru.po
@@ -125,7 +125,8 @@ msgid "This group has only one element."
 msgstr ""
 
 #: src/data_classes/ElementLinearGradient.gd
-msgid "No id attribute defined."
+#: src/data_classes/ElementRadialGradient.gd
+msgid "No \"id\" attribute defined."
 msgstr ""
 
 #: src/data_classes/ElementLinearGradient.gd
@@ -138,10 +139,6 @@ msgstr ""
 msgid "This gradient is a solid color."
 msgstr ""
 
-#: src/data_classes/ElementRadialGradient.gd
-msgid "No \"id\" attribute defined."
-msgstr ""
-
 #: src/data_classes/SVGParser.gd
 msgid "Doesn’t describe an SVG."
 msgstr "Не является описанием SVG."

diff --git a/translations/uk.po b/translations/uk.po
@@ -125,7 +125,8 @@ msgid "This group has only one element."
 msgstr ""
 
 #: src/data_classes/ElementLinearGradient.gd
-msgid "No id attribute defined."
+#: src/data_classes/ElementRadialGradient.gd
+msgid "No \"id\" attribute defined."
 msgstr ""
 
 #: src/data_classes/ElementLinearGradient.gd
@@ -138,10 +139,6 @@ msgstr ""
 msgid "This gradient is a solid color."
 msgstr ""
 
-#: src/data_classes/ElementRadialGradient.gd
-msgid "No \"id\" attribute defined."
-msgstr ""
-
 #: src/data_classes/SVGParser.gd
 msgid "Doesn’t describe an SVG."
 msgstr "Не є описом SVG."

diff --git a/translations/zh.po b/translations/zh.po
@@ -122,7 +122,8 @@ msgid "This group has only one element."
 msgstr ""
 
 #: src/data_classes/ElementLinearGradient.gd
-msgid "No id attribute defined."
+#: src/data_classes/ElementRadialGradient.gd
+msgid "No \"id\" attribute defined."
 msgstr ""
 
 #: src/data_classes/ElementLinearGradient.gd
@@ -135,10 +136,6 @@ msgstr ""
 msgid "This gradient is a solid color."
 msgstr ""
 
-#: src/data_classes/ElementRadialGradient.gd
-msgid "No \"id\" attribute defined."
-msgstr ""
-
 #: src/data_classes/SVGParser.gd
 msgid "Doesn’t describe an SVG."
 msgstr "文本不是 SVG 格式。"