From 7d0ab61fe1ab4146bf8d71e27d5c0589c3341bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anian=20B=C3=BChler?=
<anian.buehler@reutlingen-university.de>
Date: Mon, 19 Apr 2021 09:29:59 +0200
Subject: [PATCH] minor changes
---
src/main/java/com/ardublock/core/Context.java | 1 -
src/main/java/com/ardublock/ui/OpenblocksFrame.java | 12 +++++-------
.../com/ardublock/block/ardublock.properties | 4 ++--
.../com/ardublock/block/ardublock_de.properties | 4 ++--
4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ardublock/core/Context.java b/src/main/java/com/ardublock/core/Context.java
index 8b84cdc..cc420f0 100644
--- a/src/main/java/com/ardublock/core/Context.java
+++ b/src/main/java/com/ardublock/core/Context.java
@@ -246,7 +246,6 @@ public class Context
{
saveFile.createNewFile();
}
- //TODO: change to Unicode?!?
FileOutputStream fos = new FileOutputStream(saveFile, false);
fos.write(saveString.getBytes("UTF8"));
fos.flush();
diff --git a/src/main/java/com/ardublock/ui/OpenblocksFrame.java b/src/main/java/com/ardublock/ui/OpenblocksFrame.java
index 870b738..4d51673 100644
--- a/src/main/java/com/ardublock/ui/OpenblocksFrame.java
+++ b/src/main/java/com/ardublock/ui/OpenblocksFrame.java
@@ -516,10 +516,9 @@ public class OpenblocksFrame extends JFrame
//bottomPanel.add(blockreferenceButton);
bottomPanel.add(Box.createRigidArea(new Dimension(10, 0))); //std value 30,0
- bottomPanel.add(saveImageButton);
-
- //TODO: TEST
- bottomPanel.add(saveDefaultButton);
+ bottomPanel.add(modeBasicButton);
+ bottomPanel.add(modeProButton);
+ bottomPanel.add(modeSimButton);
bottomPanel.add(Box.createRigidArea(new Dimension(10, 0))); //std value 30,0
bottomPanel.add(zoomSlider);
@@ -530,9 +529,8 @@ public class OpenblocksFrame extends JFrame
bottomPanel.add(copyButton);
bottomPanel.add(pasteButton);
bottomPanel.add(Box.createRigidArea(new Dimension(10, 0))); //std value 30,0
- bottomPanel.add(modeBasicButton);
- bottomPanel.add(modeProButton);
- bottomPanel.add(modeSimButton);
+ bottomPanel.add(saveImageButton);
+ bottomPanel.add(saveDefaultButton);
bottomPanel.add(Box.createRigidArea(new Dimension(10, 0))); //std value 30,0
bottomPanel.add(versionLabel);
bottomPanel.add(Box.createRigidArea(new Dimension(10, 0))); //std value 30,0
diff --git a/src/main/resources/com/ardublock/block/ardublock.properties b/src/main/resources/com/ardublock/block/ardublock.properties
index 0fede5b..e769b58 100644
--- a/src/main/resources/com/ardublock/block/ardublock.properties
+++ b/src/main/resources/com/ardublock/block/ardublock.properties
@@ -25,7 +25,7 @@ ardublock.ui.delete_comment=Delete Comment
ardublock.ui.organize_blocks=Organize all blocks
ardublock.ui.create_refer=create reference
ardublock.ui.website=letsgoING Project
-ardublock.ui.website.domain=https://letsgoing.de
+ardublock.ui.website.domain=https://letsgoing.org
ardublock.ui.website.tooltip=goto letsgoING project-page
ardublock.ui.lmssite=Online LMS
ardublock.ui.lmssite.domain=moodle.letsgoing.org
@@ -68,7 +68,7 @@ ardublock.ui.simulatorHelp.tooltip=About the letsgoING-simulator
ardublock.ui.simulatorHelp.title=About the letsgoING-simulator
ardublock.ui.simulatorHelp.text=
-ardublock.ui.version=v2.2 beta2
+ardublock.ui.version=v2.2 beta3
ardublock.ui.appprefix.standard=
ardublock.ui.appprefix.pro=Pro
diff --git a/src/main/resources/com/ardublock/block/ardublock_de.properties b/src/main/resources/com/ardublock/block/ardublock_de.properties
index 1cda312..42a7a2d 100644
--- a/src/main/resources/com/ardublock/block/ardublock_de.properties
+++ b/src/main/resources/com/ardublock/block/ardublock_de.properties
@@ -25,7 +25,7 @@ ardublock.ui.delete_comment=Kommentar l
ardublock.ui.organize_blocks=Alle Blöcke neu anordnen
ardublock.ui.create_refer=Verweis erstellen
ardublock.ui.website=letsgoING Projekt
-ardublock.ui.website.domain=https://letsgoing.de
+ardublock.ui.website.domain=https://letsgoing.org
ardublock.ui.website.tooltip=öffnet die letsgoING-Homepage
ardublock.ui.lmssite=Online Lernen
ardublock.ui.lmssite.domain=moodle.letsgoing.org
@@ -70,7 +70,7 @@ ardublock.ui.simulatorHelp.tooltip=Infos zum letsgoING-Simulator
ardublock.ui.simulatorHelp.title=Infos zum letsgoING-Simulator
ardublock.ui.simulatorHelp.text=TASTER\n**********************\nlinke Maustaste -> Taster-Funktion\nrechte oder mittlere Maustaste -> Schalterfunktion (bleibt aktiv)\n\n\n\nPOTI\n**********************\nSlider ziehen oder mit Mausrad verstellen (Mauszeiger über Slider)\n\n\nSERIALMONITOR\n**********************\nHier werden die Nachrichten vom "Serial.Print"-Block ausgegeben\nAutoscroll:\n an -> neueste Nachrichten werden angezeigt\n aus -> Ausgabe kann manuell ausgewählt werden\nReset SerialMonitor: bisherige Ausgabe wird gelöscht\n\n\n\RESET ARDUINO\n**********************\nTaster startet das Programm neu\n\n\n\ONBOARD LED\n**********************\nLED kann über Pin13 angesteuert werden
-ardublock.ui.version=v2.2 beta2
+ardublock.ui.version=v2.2 beta3
ardublock.ui.appprefix.standard=
ardublock.ui.appprefix.pro=Pro
--
GitLab