Skip to content

Commit f40c305

Browse files
committed
ui(codeGen): copy to clipboard for Java/Python; JS keeps browser test
Made-with: Cursor
1 parent f64fb92 commit f40c305

5 files changed

Lines changed: 55 additions & 13 deletions

File tree

‎src/main/java/de/visustruct/view/CodeErzeuger.java‎

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.awt.Font;
66
import java.awt.Insets;
77
import java.awt.Toolkit;
8+
import java.awt.datatransfer.StringSelection;
89
import java.awt.event.ActionEvent;
910
import java.awt.event.ActionListener;
1011
import java.nio.charset.StandardCharsets;
@@ -43,7 +44,8 @@ public class CodeErzeuger extends JDialog {
4344
private JLabel jLabel2 = new JLabel();
4445
private JNumberField numberfieldZeichenzahl = new JNumberField();
4546
private JButton buttonCodeErzeugen = new JButton();
46-
private JButton buttonOpenInBrowser = new JButton();
47+
/** Je nach Zielsprache: Browser (JS) oder Zwischenablage (Java/Python). */
48+
private JButton buttonCodeSecondary = new JButton();
4749
private JButton buttonSchliessen = new JButton();
4850
private Struktogramm str;
4951

@@ -114,16 +116,15 @@ public void actionPerformed(ActionEvent evt) {
114116
}
115117
});
116118
cp.add(buttonCodeErzeugen);
117-
buttonOpenInBrowser.setBounds(144, 386, 228, 25);
118-
buttonOpenInBrowser.setText(I18n.tr("dialog.codeGen.openInBrowser"));
119-
buttonOpenInBrowser.setMargin(new Insets(2, 2, 2, 2));
120-
buttonOpenInBrowser.addActionListener(new ActionListener() {
119+
buttonCodeSecondary.setBounds(144, 386, 228, 25);
120+
buttonCodeSecondary.setMargin(new Insets(2, 2, 2, 2));
121+
buttonCodeSecondary.addActionListener(new ActionListener() {
121122
@Override
122123
public void actionPerformed(ActionEvent e) {
123-
buttonOpenInBrowser_ActionPerformed();
124+
buttonCodeSecondary_ActionPerformed();
124125
}
125126
});
126-
cp.add(buttonOpenInBrowser);
127+
cp.add(buttonCodeSecondary);
127128
buttonSchliessen.setBounds(380, 386, 102, 25);
128129
buttonSchliessen.setText(I18n.tr("dialog.codeGen.close"));
129130
buttonSchliessen.setMargin(new Insets(2, 2, 2, 2));
@@ -136,7 +137,7 @@ public void actionPerformed(ActionEvent evt) {
136137

137138
java.awt.event.ItemListener sprachWahlListener = e -> {
138139
if (e.getStateChange() == java.awt.event.ItemEvent.SELECTED) {
139-
aktualisiereBrowserButton();
140+
aktualisiereCodeSecondaryButton();
140141
}
141142
};
142143
javaButton.addItemListener(sprachWahlListener);
@@ -149,19 +150,39 @@ public void actionPerformed(ActionEvent evt) {
149150

150151
this.str = str;
151152

152-
aktualisiereBrowserButton();
153+
aktualisiereCodeSecondaryButton();
153154
setResizable(false);
154155
setVisible(true);
155156
}
156157

157-
private void aktualisiereBrowserButton() {
158-
buttonOpenInBrowser.setEnabled(javaScriptButton.isSelected());
158+
private void aktualisiereCodeSecondaryButton() {
159+
boolean js = javaScriptButton.isSelected();
160+
buttonCodeSecondary.setEnabled(true);
161+
buttonCodeSecondary.setFocusable(true);
162+
if (js) {
163+
buttonCodeSecondary.setText(I18n.tr("dialog.codeGen.openInBrowser"));
164+
buttonCodeSecondary.setToolTipText(I18n.tr("dialog.codeGen.openInBrowser.tooltip"));
165+
} else {
166+
buttonCodeSecondary.setText(I18n.tr("dialog.codeGen.copyCode"));
167+
buttonCodeSecondary.setToolTipText(I18n.tr("dialog.codeGen.copyCode.tooltip"));
168+
}
159169
}
160170

161-
private void buttonOpenInBrowser_ActionPerformed() {
162-
if (!javaScriptButton.isSelected()) {
171+
private void buttonCodeSecondary_ActionPerformed() {
172+
if (javaScriptButton.isSelected()) {
173+
openJsPreviewInBrowser();
163174
return;
164175
}
176+
String code = textarea.gibText();
177+
if (code == null) {
178+
code = "";
179+
}
180+
Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(code), null);
181+
JOptionPane.showMessageDialog(this, I18n.tr("dialog.codeGen.copyDone.message"),
182+
I18n.tr("dialog.codeGen.copyDone.title"), JOptionPane.INFORMATION_MESSAGE);
183+
}
184+
185+
private void openJsPreviewInBrowser() {
165186
String code = textarea.gibText();
166187
if (code == null || code.isBlank()) {
167188
JOptionPane.showMessageDialog(this, I18n.tr("dialog.codeGen.jsBrowserEmpty.message"),
@@ -250,6 +271,7 @@ public void buttonCodeErzeugen_ActionPerformed(ActionEvent evt) {
250271
GlobalSettings.setCodeErzeugerProgrammiersprache(typ);
251272
GlobalSettings.setCodeErzeugerAlsKommentar(alsKommentar);
252273
GlobalSettings.saveSettings();
274+
aktualisiereCodeSecondaryButton();
253275
}else{
254276
JOptionPane.showMessageDialog(this, I18n.tr("dialog.codeInvalidInput.message"),
255277
I18n.tr("dialog.codeInvalidInput.title"), JOptionPane.ERROR_MESSAGE);

‎src/main/resources/de/visustruct/i18n/Messages.properties‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@ dialog.codeGen.spacesPerLevel=Spaces per indentation level:
8484
dialog.codeGen.generate=Generate
8585
dialog.codeGen.close=Close
8686
dialog.codeGen.openInBrowser=Test in browser…
87+
dialog.codeGen.openInBrowser.tooltip=Opens the generated JavaScript in a temporary HTML file in your default browser.
88+
dialog.codeGen.copyCode=Copy code …
89+
dialog.codeGen.copyCode.tooltip=Copies the displayed source code to the clipboard.
90+
dialog.codeGen.copyDone.title=Clipboard
91+
dialog.codeGen.copyDone.message=The source code was copied to the clipboard.
8792
dialog.codeGen.jsBrowserHint.title=Run JavaScript in the browser
8893
dialog.codeGen.jsBrowserHint.message=Instructions you entered in the chart are copied unchanged into the script.\n\nTo run it you need valid JavaScript (e.g. let x = 5; or const MAX = 10;).\n\nPseudocode (e.g. “whole number …”) is not translated and may cause errors.
8994
dialog.codeGen.jsBrowserEmpty.title=No code

‎src/main/resources/de/visustruct/i18n/Messages_de.properties‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@ dialog.codeGen.spacesPerLevel=Leerzeichen pro Einrückungsstufe:
8484
dialog.codeGen.generate=Erzeugen
8585
dialog.codeGen.close=Schließen
8686
dialog.codeGen.openInBrowser=Im Browser testen …
87+
dialog.codeGen.openInBrowser.tooltip=Öffnet den erzeugten JavaScript-Code in einer temporären HTML-Datei im Standardbrowser.
88+
dialog.codeGen.copyCode=Code kopieren …
89+
dialog.codeGen.copyCode.tooltip=Kopiert den angezeigten Quelltext in die Zwischenablage.
90+
dialog.codeGen.copyDone.title=Zwischenablage
91+
dialog.codeGen.copyDone.message=Der Quelltext wurde in die Zwischenablage kopiert.
8792
dialog.codeGen.jsBrowserHint.title=JavaScript im Browser
8893
dialog.codeGen.jsBrowserHint.message=Freie Anweisungen aus dem Struktogramm werden unverändert in das Skript übernommen.\n\nZum Ausführen brauchen Sie gültiges JavaScript (z. B. let x = 5; oder const MAX = 10;).\n\nPseudocode (z. B. „ganze Zahl …“) wird nicht übersetzt und kann Fehler auslösen.
8994
dialog.codeGen.jsBrowserEmpty.title=Kein Code

‎src/main/resources/de/visustruct/i18n/Messages_en.properties‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@ dialog.codeGen.spacesPerLevel=Spaces per indentation level:
8484
dialog.codeGen.generate=Generate
8585
dialog.codeGen.close=Close
8686
dialog.codeGen.openInBrowser=Test in browser…
87+
dialog.codeGen.openInBrowser.tooltip=Opens the generated JavaScript in a temporary HTML file in your default browser.
88+
dialog.codeGen.copyCode=Copy code …
89+
dialog.codeGen.copyCode.tooltip=Copies the displayed source code to the clipboard.
90+
dialog.codeGen.copyDone.title=Clipboard
91+
dialog.codeGen.copyDone.message=The source code was copied to the clipboard.
8792
dialog.codeGen.jsBrowserHint.title=Run JavaScript in the browser
8893
dialog.codeGen.jsBrowserHint.message=Instructions you entered in the chart are copied unchanged into the script.\n\nTo run it you need valid JavaScript (e.g. let x = 5; or const MAX = 10;).\n\nPseudocode (e.g. “whole number …”) is not translated and may cause errors.
8994
dialog.codeGen.jsBrowserEmpty.title=No code

‎src/main/resources/de/visustruct/i18n/Messages_pt_PT.properties‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@ dialog.codeGen.spacesPerLevel=Espaços por nível de indentação:
8484
dialog.codeGen.generate=Gerar
8585
dialog.codeGen.close=Fechar
8686
dialog.codeGen.openInBrowser=Testar no navegador…
87+
dialog.codeGen.openInBrowser.tooltip=Abre o JavaScript gerado num ficheiro HTML temporário no navegador predefinido.
88+
dialog.codeGen.copyCode=Copiar código …
89+
dialog.codeGen.copyCode.tooltip=Copia o código mostrado para a área de transferência.
90+
dialog.codeGen.copyDone.title=Área de transferência
91+
dialog.codeGen.copyDone.message=O código foi copiado para a área de transferência.
8792
dialog.codeGen.jsBrowserHint.title=Executar JavaScript no navegador
8893
dialog.codeGen.jsBrowserHint.message=As instruções que introduziu no diagrama são copiadas tal como estão para o script.\n\nPara executar, precisa de JavaScript válido (por exemplo, let x = 5; ou const MAX = 10;).\n\nPseudocódigo (por exemplo, «número inteiro …») não é traduzido e pode causar erros.
8994
dialog.codeGen.jsBrowserEmpty.title=Sem código

0 commit comments

Comments
 (0)