From e0425e335dd2860b7a5d3f58586cde4658a98886 Mon Sep 17 00:00:00 2001 From: Jiri Zizkin Zizka Date: Wed, 29 Aug 2018 20:33:37 +0200 Subject: [PATCH 1/5] Bugfix: Add missing listener in WorkspaceSettingsEditor for more intuitive behaviour of translator mode --- .../rpg/atcontentstudio/ui/WorkspaceSettingsEditor.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/com/gpl/rpg/atcontentstudio/ui/WorkspaceSettingsEditor.java b/src/com/gpl/rpg/atcontentstudio/ui/WorkspaceSettingsEditor.java index 0172366..95c7ce5 100644 --- a/src/com/gpl/rpg/atcontentstudio/ui/WorkspaceSettingsEditor.java +++ b/src/com/gpl/rpg/atcontentstudio/ui/WorkspaceSettingsEditor.java @@ -182,12 +182,19 @@ public class WorkspaceSettingsEditor extends JDialog { useInternetBox.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - translatorLanguagesBox.setEnabled(useInternetBox.isSelected()); + translatorLanguagesBox.setEnabled(useInternetBox.isSelected() && translatorModeBox.isSelected()); translatorModeBox.setEnabled(useInternetBox.isSelected()); checkUpdatesBox.setEnabled(useInternetBox.isSelected()); } }); + translatorModeBox.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + translatorLanguagesBox.setEnabled(translatorModeBox.isSelected()); + } + }); + return pane; } From f95327bd129aa22091bb1fa55d39e45d72a78021 Mon Sep 17 00:00:00 2001 From: Jiri Zizkin Zizka Date: Wed, 29 Aug 2018 20:45:47 +0200 Subject: [PATCH 2/5] Show translated text from Weblate in DialogueGraphView --- .../ui/gamedataeditors/dialoguetree/DialogueGraphView.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java index 52fbe53..6ae892b 100644 --- a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java +++ b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java @@ -49,11 +49,13 @@ import prefuse.visual.expression.InGroupPredicate; import com.gpl.rpg.atcontentstudio.ATContentStudio; import com.gpl.rpg.atcontentstudio.model.GameDataElement; +import com.gpl.rpg.atcontentstudio.model.Workspace; import com.gpl.rpg.atcontentstudio.model.gamedata.Dialogue; import com.gpl.rpg.atcontentstudio.model.gamedata.NPC; import com.gpl.rpg.atcontentstudio.model.gamedata.Requirement; import com.gpl.rpg.atcontentstudio.ui.DefaultIcons; import com.gpl.rpg.atcontentstudio.ui.gamedataeditors.DialogueEditor; +import com.gpl.rpg.atcontentstudio.utils.WeblateIntegration; import com.jidesoft.swing.JideBoxLayout; public class DialogueGraphView extends Display { @@ -188,7 +190,7 @@ public class DialogueGraphView extends Display { } Node dNode = graph.addNode(); cells.put(dialogue, dNode); - dNode.setString(LABEL, dialogue.message != null ? dialogue.message : "[Selector]"); + dNode.setString(LABEL, dialogue.message == null ? "[Selector]" : Workspace.activeWorkspace.settings.translatorLanguage.getCurrentValue() == null ? dialogue.message : dialogue.message + "\n---\n" + WeblateIntegration.getTranslationUnit(dialogue.message).translatedText); dNode.set(ICON, npcIcon); dNode.set(TARGET, dialogue); if (dialogue.replies != null) { @@ -210,7 +212,7 @@ public class DialogueGraphView extends Display { if (r.text != null && !r.text.equals(Dialogue.Reply.GO_NEXT_TEXT)) { //Normal reply... rNode = graph.addNode(); - rNode.setString(LABEL, r.text); + rNode.setString(LABEL, Workspace.activeWorkspace.settings.translatorLanguage.getCurrentValue() == null ? r.text : r.text + "\n---\n" + WeblateIntegration.getTranslationUnit(r.text).translatedText); rNode.set(ICON, DefaultIcons.getHeroIcon()); rNode.set(TARGET, d); rNode.set(REPLY, r); From d1612269c09bdaf31127e26b4fcc954a58ca769a Mon Sep 17 00:00:00 2001 From: Jiri Zizkin Zizka Date: Thu, 6 Sep 2018 16:12:58 +0200 Subject: [PATCH 3/5] Update to translation in DialogueGraphView --- .../ui/gamedataeditors/dialoguetree/DialogueGraphView.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java index 6ae892b..2cadd76 100644 --- a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java +++ b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java @@ -79,6 +79,7 @@ public class DialogueGraphView extends Display { private Dialogue dialogue; private Image npcIcon; private Graph graph; + private Boolean translatorMode; private Map cells = new HashMap(); @@ -90,6 +91,7 @@ public class DialogueGraphView extends Display { } else { npcIcon = DefaultIcons.getNPCIcon(); } + translatorMode = Workspace.activeWorkspace.settings.useInternet.getCurrentValue() && Workspace.activeWorkspace.settings.translatorLanguage.getCurrentValue() != null; loadGraph(); // add visual data groups @@ -190,7 +192,7 @@ public class DialogueGraphView extends Display { } Node dNode = graph.addNode(); cells.put(dialogue, dNode); - dNode.setString(LABEL, dialogue.message == null ? "[Selector]" : Workspace.activeWorkspace.settings.translatorLanguage.getCurrentValue() == null ? dialogue.message : dialogue.message + "\n---\n" + WeblateIntegration.getTranslationUnit(dialogue.message).translatedText); + dNode.setString(LABEL, dialogue.message == null ? "[Selector]" : !translatorMode ? dialogue.message : dialogue.message + "\n---\n" + WeblateIntegration.getTranslationUnit(dialogue.message).translatedText); dNode.set(ICON, npcIcon); dNode.set(TARGET, dialogue); if (dialogue.replies != null) { @@ -212,7 +214,7 @@ public class DialogueGraphView extends Display { if (r.text != null && !r.text.equals(Dialogue.Reply.GO_NEXT_TEXT)) { //Normal reply... rNode = graph.addNode(); - rNode.setString(LABEL, Workspace.activeWorkspace.settings.translatorLanguage.getCurrentValue() == null ? r.text : r.text + "\n---\n" + WeblateIntegration.getTranslationUnit(r.text).translatedText); + rNode.setString(LABEL, !translatorMode ? r.text : r.text + "\n---\n" + WeblateIntegration.getTranslationUnit(r.text).translatedText); rNode.set(ICON, DefaultIcons.getHeroIcon()); rNode.set(TARGET, d); rNode.set(REPLY, r); From 67b8acd20b9bb3a573d289d93b8d481b09173210 Mon Sep 17 00:00:00 2001 From: Jiri Zizkin Zizka Date: Thu, 6 Sep 2018 22:16:33 +0200 Subject: [PATCH 4/5] Code more human readable --- .../ui/gamedataeditors/dialoguetree/DialogueGraphView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java index 2cadd76..80658a6 100644 --- a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java +++ b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java @@ -192,7 +192,7 @@ public class DialogueGraphView extends Display { } Node dNode = graph.addNode(); cells.put(dialogue, dNode); - dNode.setString(LABEL, dialogue.message == null ? "[Selector]" : !translatorMode ? dialogue.message : dialogue.message + "\n---\n" + WeblateIntegration.getTranslationUnit(dialogue.message).translatedText); + dNode.setString(LABEL, dialogue.message == null ? "[Selector]" : translatorMode ? dialogue.message + "\n---\n" + WeblateIntegration.getTranslationUnit(dialogue.message).translatedText : dialogue.message); dNode.set(ICON, npcIcon); dNode.set(TARGET, dialogue); if (dialogue.replies != null) { @@ -214,7 +214,7 @@ public class DialogueGraphView extends Display { if (r.text != null && !r.text.equals(Dialogue.Reply.GO_NEXT_TEXT)) { //Normal reply... rNode = graph.addNode(); - rNode.setString(LABEL, !translatorMode ? r.text : r.text + "\n---\n" + WeblateIntegration.getTranslationUnit(r.text).translatedText); + rNode.setString(LABEL, translatorMode ? r.text + "\n---\n" + WeblateIntegration.getTranslationUnit(r.text).translatedText : r.text); rNode.set(ICON, DefaultIcons.getHeroIcon()); rNode.set(TARGET, d); rNode.set(REPLY, r); From f4041ee2c7fdb3910c48fd010d7917b34f9acf7d Mon Sep 17 00:00:00 2001 From: Jiri Zizkin Zizka Date: Mon, 10 Sep 2018 10:02:16 +0200 Subject: [PATCH 5/5] Add myself to contributors --- src/com/gpl/rpg/atcontentstudio/ui/AboutEditor.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/gpl/rpg/atcontentstudio/ui/AboutEditor.java b/src/com/gpl/rpg/atcontentstudio/ui/AboutEditor.java index 4401e45..3e19105 100644 --- a/src/com/gpl/rpg/atcontentstudio/ui/AboutEditor.java +++ b/src/com/gpl/rpg/atcontentstudio/ui/AboutEditor.java @@ -51,6 +51,7 @@ public class AboutEditor extends Editor { "
" + "Contributors:
" + "Quentin Delvallet
" + + "Žižkin
" + "
" + "This project uses the following libraries:
" + "JSON.simple by Yidong Fang & Chris Nokleberg.
" +