Formatting: respect margin

This commit is contained in:
Marc Gilleron 2020-06-14 16:53:57 +01:00
parent c11a8062f4
commit 0436a12572
2 changed files with 23 additions and 9 deletions

View File

@ -109,17 +109,25 @@ func _process_tscn(f, fpath):
STATE_SEARCHING:
var i = line.find(pattern)
if i != -1:
var begin_quote_index = line.find('"', i + len(pattern))
if begin_quote_index == -1:
printerr("Could not find begin quote after text property, in ", fpath, " line ", line_number)
printerr("Could not find begin quote after text property, in ",
fpath, " line ", line_number)
continue
var end_quote_index = line.rfind('"')
if end_quote_index != -1 and end_quote_index > begin_quote_index and line[end_quote_index - 1] != '\\':
text = line.substr(begin_quote_index + 1, end_quote_index - begin_quote_index - 1)
if end_quote_index != -1 and end_quote_index > begin_quote_index \
and line[end_quote_index - 1] != '\\':
text = line.substr(begin_quote_index + 1,
end_quote_index - begin_quote_index - 1)
if text != "":
_add_string(fpath, line_number, text)
text = ""
else:
# The text may be multiline
text = str(line.right(begin_quote_index + 1), "\n")

View File

@ -26,7 +26,8 @@ onready var _clear_search_button = get_node("VBoxContainer/Main/LeftPane/Search/
onready var _string_list = get_node("VBoxContainer/Main/LeftPane/StringList")
onready var _translation_tab_container = \
get_node("VBoxContainer/Main/RightPane/VSplitContainer/TranslationTabContainer")
onready var _notes_edit = get_node("VBoxContainer/Main/RightPane/VSplitContainer/VBoxContainer/NotesEdit")
onready var _notes_edit = \
get_node("VBoxContainer/Main/RightPane/VSplitContainer/VBoxContainer/NotesEdit")
onready var _status_label = get_node("VBoxContainer/StatusBar/Label")
var _string_edit_dialog = null
@ -105,12 +106,15 @@ func _setup_dialogs():
_add_dialog(_string_edit_dialog)
_language_selection_dialog = LanguageSelectionDialog.instance()
_language_selection_dialog.connect("language_selected", self, "_on_LanguageSelectionDialog_language_selected")
_language_selection_dialog.connect(
"language_selected", self, "_on_LanguageSelectionDialog_language_selected")
_add_dialog(_language_selection_dialog)
_remove_language_confirmation_dialog = ConfirmationDialog.new()
_remove_language_confirmation_dialog.dialog_text = "Do you really want to remove this language? (There is no undo!)"
_remove_language_confirmation_dialog.connect("confirmed", self, "_on_RemoveLanguageConfirmationDialog_confirmed")
_remove_language_confirmation_dialog.dialog_text = \
"Do you really want to remove this language? (There is no undo!)"
_remove_language_confirmation_dialog.connect(
"confirmed", self, "_on_RemoveLanguageConfirmationDialog_confirmed")
_add_dialog(_remove_language_confirmation_dialog)
_extractor_dialog = ExtractorDialog.instance()
@ -121,7 +125,8 @@ func _setup_dialogs():
_remove_string_confirmation_dialog = ConfirmationDialog.new()
_remove_string_confirmation_dialog.dialog_text = \
"Do you really want to remove this string and all its translations? (There is no undo)"
_remove_string_confirmation_dialog.connect("confirmed", self, "_on_RemoveStringConfirmationDialog_confirmed")
_remove_string_confirmation_dialog.connect(
"confirmed", self, "_on_RemoveStringConfirmationDialog_confirmed")
_add_dialog(_remove_string_confirmation_dialog)
@ -170,7 +175,8 @@ func _on_FileMenu_id_pressed(id):
MENU_FILE_REMOVE_LANGUAGE:
var language = get_current_language()
_remove_language_confirmation_dialog.window_title = str("Remove language `", language, "`")
_remove_language_confirmation_dialog.window_title = \
str("Remove language `", language, "`")
_remove_language_confirmation_dialog.popup_centered_minsize()
MENU_FILE_EXTRACT: