diff --git a/src/main/java/com/ardublock/ui/OpenblocksFrame.java b/src/main/java/com/ardublock/ui/OpenblocksFrame.java index 0cf8ba01fcc70552350bca72a3224bd63fb3b0f5..d48eef298977e341c0750840f8efaee5d5f77d2f 100644 --- a/src/main/java/com/ardublock/ui/OpenblocksFrame.java +++ b/src/main/java/com/ardublock/ui/OpenblocksFrame.java @@ -539,10 +539,15 @@ public class OpenblocksFrame extends JFrame ImageIcon modeBasicButtonIconPressed = new ImageIcon(getToolkit().getImage(GUI.class.getResource("/com/ardublock/block/basic3.png"))); ImageIcon modeBasicButtonIconSelected = new ImageIcon(getToolkit().getImage(GUI.class.getResource("/com/ardublock/block/basic4.png"))); - ImageIcon modeProButtonIcon = new ImageIcon(getToolkit().getImage(GUI.class.getResource("/com/ardublock/block/pro1.png"))); + ImageIcon modeProButtonIcon = new ImageIcon(getToolkit().getImage(GUI.class.getResource("/com/ardublock/block/full1.png")));//"com/ardublock/block/pro1.png"))); + ImageIcon modeProButtonIconHovered = new ImageIcon(getToolkit().getImage(GUI.class.getResource("/com/ardublock/block/full2.png")));//"/com/ardublock/block/pro2.png"))); + ImageIcon modeProButtonIconPressed = new ImageIcon(getToolkit().getImage(GUI.class.getResource("/com/ardublock/block/full3.png")));//"/com/ardublock/block/pro3.png"))); + ImageIcon modeProButtonIconSelected = new ImageIcon(getToolkit().getImage(GUI.class.getResource("/com/ardublock/block/full4.png")));//"/com/ardublock/block/pro4.png"))); + +/* ImageIcon modeProButtonIcon = new ImageIcon(getToolkit().getImage(GUI.class.getResource("/com/ardublock/block/pro1.png"))); ImageIcon modeProButtonIconHovered = new ImageIcon(getToolkit().getImage(GUI.class.getResource("/com/ardublock/block/pro2.png"))); ImageIcon modeProButtonIconPressed = new ImageIcon(getToolkit().getImage(GUI.class.getResource("/com/ardublock/block/pro3.png"))); - ImageIcon modeProButtonIconSelected = new ImageIcon(getToolkit().getImage(GUI.class.getResource("/com/ardublock/block/pro4.png"))); + ImageIcon modeProButtonIconSelected = new ImageIcon(getToolkit().getImage(GUI.class.getResource("/com/ardublock/block/pro4.png"))); */ ImageIcon modeSimButtonIcon = new ImageIcon(getToolkit().getImage(GUI.class.getResource("/com/ardublock/block/sim1.png"))); ImageIcon modeSimButtonIconHovered = new ImageIcon(getToolkit().getImage(GUI.class.getResource("/com/ardublock/block/sim2.png"))); diff --git a/src/main/resources/com/ardublock/block/ardublock.properties b/src/main/resources/com/ardublock/block/ardublock.properties index 4c99959e180ccb394e4dd4358c642d7ea673c350..5d8c1794b9bf100295c46d7618753733bdd3f455 100644 --- a/src/main/resources/com/ardublock/block/ardublock.properties +++ b/src/main/resources/com/ardublock/block/ardublock.properties @@ -50,12 +50,12 @@ ardublock.ui.blockreference.domain=https://blockreferenz.letsgoing.org/ ardublock.ui.blockreference.tooltip=open block reference ardublock.ui.website.repository=https://gitlab.reutlingen-university.de/letsgoing/ardublock ardublock.ui.website.repository.tooltip=go to ArduBlock Repository -ardublock.ui.mode.expert=Pro -ardublock.ui.mode.expert.tooltip=Mehr Blöcke und komplexere Funktionen fuer Fortgeschrittene +ardublock.ui.mode.expert=Full +ardublock.ui.mode.expert.tooltip=full blockset ardublock.ui.mode.standard=Basic -ardublock.ui.mode.standard.tooltip=Die wichtigsten Blöcke für den Einstieg +ardublock.ui.mode.standard.tooltip=most important blocks to get started ardublock.ui.mode.sim=Sim -ardublock.ui.mode.sim.tooltip=ArduBlock Basic mit Simulation "letsgoING-Grundlagen-Hardware" +ardublock.ui.mode.sim.tooltip=basic blockset for use with simulator "letsgoING-basic-hardware" ardublock.ui.search=search block ardublock.ui.search.tooltip=Search for blocks in the drawers and workspace ardublock.ui.serialMonitor=Serial Monitor diff --git a/src/main/resources/com/ardublock/block/ardublock_de.properties b/src/main/resources/com/ardublock/block/ardublock_de.properties index 31fc071084210af814fcd59d368514307e339d5b..f5fdea2a0f3cd906bc9b932d9fde9697397c56a9 100644 --- a/src/main/resources/com/ardublock/block/ardublock_de.properties +++ b/src/main/resources/com/ardublock/block/ardublock_de.properties @@ -50,7 +50,7 @@ ardublock.ui.blockreference.domain=https://blockreferenz.letsgoing.org/ ardublock.ui.blockreference.tooltip=öffnet die Blockreferenz ardublock.ui.repository=https://gitlab.reutlingen-university.de/letsgoing/ardublock ardublock.ui.repository.tooltip=gehe zur ArduBlock Repository -ardublock.ui.mode.expert=Pro +ardublock.ui.mode.expert=Full ardublock.ui.mode.expert.tooltip=Mehr Blöcke und komplexere Funktionen fuer Fortgeschrittene ardublock.ui.mode.standard=Basic ardublock.ui.mode.standard.tooltip=Die wichtigsten Blöcke für den Einstieg diff --git a/src/main/resources/com/ardublock/block/ardublock_en_GB.properties b/src/main/resources/com/ardublock/block/ardublock_en_GB.properties index 0655a8103cb10226a19d09a57ed43c3f8ad0fd3b..35fbf5a66da528e4cff33afe0e573bc31a8ce43d 100644 --- a/src/main/resources/com/ardublock/block/ardublock_en_GB.properties +++ b/src/main/resources/com/ardublock/block/ardublock_en_GB.properties @@ -50,7 +50,7 @@ ardublock.ui.blockreference.domain=https://blockreferenz.letsgoing.org/ ardublock.ui.blockreference.tooltip=öffnet die Blockreferenz ardublock.ui.repository=https://gitlab.reutlingen-university.de/letsgoing/ardublock ardublock.ui.repository.tooltip=gehe zur ArduBlock Repository -ardublock.ui.mode.expert=Pro +ardublock.ui.mode.expert=Full ardublock.ui.mode.expert.tooltip=Mehr Blöcke und komplexere Funktionen fuer Fortgeschrittene ardublock.ui.mode.standard=Basic ardublock.ui.mode.standard.tooltip=Die wichtigsten Blöcke für den Einstieg diff --git a/src/main/resources/com/ardublock/block/full1.png b/src/main/resources/com/ardublock/block/full1.png new file mode 100644 index 0000000000000000000000000000000000000000..ebc8bf8284de80c65e872c6e08b014e707ca3f0e Binary files /dev/null and b/src/main/resources/com/ardublock/block/full1.png differ diff --git a/src/main/resources/com/ardublock/block/full2.png b/src/main/resources/com/ardublock/block/full2.png new file mode 100644 index 0000000000000000000000000000000000000000..3c58c492af71a1d130b70560979c675c0a9aa104 Binary files /dev/null and b/src/main/resources/com/ardublock/block/full2.png differ diff --git a/src/main/resources/com/ardublock/block/full3.png b/src/main/resources/com/ardublock/block/full3.png new file mode 100644 index 0000000000000000000000000000000000000000..b2c8061805934da278cd913d6c02a0876e16f6e8 Binary files /dev/null and b/src/main/resources/com/ardublock/block/full3.png differ diff --git a/src/main/resources/com/ardublock/block/full4.png b/src/main/resources/com/ardublock/block/full4.png new file mode 100644 index 0000000000000000000000000000000000000000..7800451353b3340b6c71d4c446042886fcdebad9 Binary files /dev/null and b/src/main/resources/com/ardublock/block/full4.png differ