Skip to content

Commit

Permalink
Merge pull request #37 from fenix-hub/dev
Browse files Browse the repository at this point in the history
Fixed bug found on Discord + Suggestion select all checkbox
  • Loading branch information
fenix-hub authored Nov 1, 2020
2 parents 3124761 + 27aa6b1 commit 138c813
Show file tree
Hide file tree
Showing 9 changed files with 147 additions and 80 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This plugin is now supported in [Godot Extended Library Discord](https://discord
A little plugin to easy-way manage your text files inside your project folder.

Author: *"Nicolo (fenix) Santilio"*
Version: *1.8.4*
Version: *1.8.6*
Godot Version: *3.2.3*

**This repository was pushed directly from Godot Engine Editor thanks to this [GitHub Integration](https://github.com/fenix-hub/godot-engine.github-integration)!**
Expand Down
8 changes: 8 additions & 0 deletions addons/file-editor/file.samples/translation.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
keys;en;it;da;de;ja;es
HELLO;"""Hello!""";"""Ciao!""";"""Hej!""";"""Hallo!""";"""こんにちは!""";"""¡Hola!"""
BYE;"""Bye bye!""";"""Ciao ciao!""";"""Hej hej!""";"""Tschüss!""";"""バイバイ!""";"""¡Adiós!"""
GOODMORNING;"""Gooedmorning!""";"""Buongiorno!""";"""Gooedmorning!""";"""Guten Morgen!""";"""グーエドモーニング!""";"""¡Buen día!"""
CONFIRM;"""Confirm this action""";"""Conferma questa azione""";"""Bekræft denne handling""";"""Bestätigen Sie diese Aktion""";"""このアクションを確認します""";"""Confirma esta acción"""
CANCEL;"""Cancel this action""";"""Annulla questa azione""";"""Annuller denne handling""";"""Brechen Sie diese Aktion ab""";"""このアクションをキャンセルします""";"""Cancelar esta acción"""
YES;"""Yes, please""";"""Sì grazie""";"""Ja tak""";"""Ja bitte""";"""はい、お願いします""";"""Sí por favor"""
NO;"""No, thanks""";"""No grazie""";"""Nej tak""";"""Nein Danke""";"""結構です""";"""No, gracias"""
10 changes: 10 additions & 0 deletions addons/file-editor/file.samples/translation.csv.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[remap]

importer="csv"
type="TextFile"

[deps]

source_file="res://addons/file-editor/file.samples/translation.csv"
[params]

2 changes: 1 addition & 1 deletion addons/file-editor/lastopenedfiles.lastcfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ sample.html="res://addons/file-editor/file.samples/sample.html"
sample.ini="res://addons/file-editor/file.samples/sample.ini"
sample.md="res://addons/file-editor/file.samples/sample.md"
sample.txt="res://addons/file-editor/file.samples/sample.txt"
translation_example2.csv="res://translation_example2.csv"
translation.csv="res://addons/file-editor/file.samples/translation.csv"
2 changes: 1 addition & 1 deletion addons/file-editor/plugin.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
name="File Editor"
description="An internal file editor to view and edit text files in your project folder."
author="Nicolo 'fenix' Santilio"
version="1.8.4"
version="1.8.6"
script="scripts/file-editor.gd"
162 changes: 93 additions & 69 deletions addons/file-editor/scenes/CSVEditor.tscn

Large diffs are not rendered by default.

35 changes: 32 additions & 3 deletions addons/file-editor/scripts/CSVEditor.gd
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ tool
extends Control
class_name CSVEditor

var IconLoader = preload("res://addons/file-editor/scripts/IconLoader.gd").new()

onready var Columns : HBoxContainer = $Container/Scroll/Columns
onready var _column_head : VBoxContainer = Columns.get_node("_COLUMN_HEAD")
onready var _row_label : Label = _column_head.get_node("1")
Expand Down Expand Up @@ -112,7 +114,30 @@ func _connect_signals() -> void:
$TranslationDialog/TranslationContainer/Buttons/GetTokenBtn.connect("pressed", how_to, "popup")
source_lang_menu.connect("item_selected", self , "_on_source_lang_selected")

# GoogleTranslate.connect("translation_received", self, "_on_translation_received")
keys_tree.connect("cell_selected", self , "_on_keys_select_all_pressed")
target_langs_tree.connect("cell_selected", self , "_on_langs_select_all_pressed")

func _on_keys_select_all_pressed():
if keys_tree.get_selected() != keys_tree.get_root():
return
var check : bool = not keys_tree.get_root().is_checked(0)
var first_key : TreeItem = keys_tree.get_root().get_children()
set_checked(first_key, check)
for key in range(0, keys.size()-1):
first_key = set_checked(first_key.get_next(), check)

func _on_langs_select_all_pressed():
if target_langs_tree.get_selected() != target_langs_tree.get_root():
return
var check : bool = not target_langs_tree.get_root().is_checked(0)
var first_key : TreeItem = target_langs_tree.get_root().get_children()
set_checked(first_key, check)
for key in range(0, keys.size()-1):
first_key = set_checked(first_key.get_next(), check)

func set_checked(key : TreeItem, to_check : bool) -> TreeItem:
if key!=null and key.is_editable(0): key.set_checked(0, to_check)
return key

func _load_icons() -> void:
$Container/Menu/AlignMenu.set_button_icon(IconLoader.load_icon_from_name("align"))
Expand Down Expand Up @@ -427,17 +452,21 @@ func create_key_tree(keys : Array) -> void:
keys_tree.set_column_titles_visible(true)
keys_tree.set_column_title(0, "Keys to translate")
var root : TreeItem = keys_tree.create_item()
root.set_cell_mode(0, TreeItem.CELL_MODE_CHECK)
root.set_text(0, "Select/Deselect All")
root.set_editable(0, true)
for key in keys:
var child : TreeItem = keys_tree.create_item(root)
child.set_cell_mode(0, TreeItem.CELL_MODE_CHECK)
child.set_editable(0, true)
child.set_text(0, key)

func create_lang_tree(target_langs : Array) -> void:
# target_langs_tree.set_column_titles_visible(true)
# target_langs_tree.set_column_title(0, "Keys to translate")
target_langs_tree.clear()
var root : TreeItem = target_langs_tree.create_item()
root.set_cell_mode(0, TreeItem.CELL_MODE_CHECK)
root.set_text(0, "Select/Deselect All")
root.set_editable(0, true)
for lang in target_langs:
var child : TreeItem = target_langs_tree.create_item(root)
child.set_cell_mode(0, TreeItem.CELL_MODE_CHECK)
Expand Down
1 change: 1 addition & 0 deletions addons/file-editor/scripts/GoogleTranslatorAPI.gd
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
tool
extends HTTPRequest
class_name GoogleTranslateAPI

Expand Down
5 changes: 0 additions & 5 deletions addons/file-editor/scripts/file-editor.gd
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
tool
extends EditorPlugin

#var doc = preload("../scenes/FileEditor.tscn")

var IconLoader = preload("res://addons/file-editor/scripts/IconLoader.gd").new()

var FileEditor

func _enter_tree():
add_autoload_singleton("IconLoader","res://addons/file-editor/scripts/IconLoader.gd")
add_autoload_singleton("LastOpenedFiles","res://addons/file-editor/scripts/LastOpenedFiles.gd")
FileEditor = preload("../scenes/FileEditor.tscn").instance()
get_editor_interface().get_editor_viewport().add_child(FileEditor)
FileEditor.hide()

func _exit_tree():
# FileEditor.clean_editor()
remove_autoload_singleton("IconLoader")
remove_autoload_singleton("LastOpenedFiles")
get_editor_interface().get_editor_viewport().remove_child(FileEditor)

Expand Down

0 comments on commit 138c813

Please sign in to comment.