From 11ff5ab0fea517e865e37368ff656a7ae15d207c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anian=20B=C3=BChler?=
<anian.buehler@reutlingen-university.de>
Date: Fri, 20 May 2022 09:55:01 +0200
Subject: [PATCH] changed "PRO"-blockset to "FULL"
---
.../java/com/ardublock/ui/OpenblocksFrame.java | 9 +++++++--
.../com/ardublock/block/ardublock.properties | 8 ++++----
.../com/ardublock/block/ardublock_de.properties | 2 +-
.../ardublock/block/ardublock_en_GB.properties | 2 +-
src/main/resources/com/ardublock/block/full1.png | Bin 0 -> 665 bytes
src/main/resources/com/ardublock/block/full2.png | Bin 0 -> 674 bytes
src/main/resources/com/ardublock/block/full3.png | Bin 0 -> 603 bytes
src/main/resources/com/ardublock/block/full4.png | Bin 0 -> 688 bytes
8 files changed, 13 insertions(+), 8 deletions(-)
create mode 100644 src/main/resources/com/ardublock/block/full1.png
create mode 100644 src/main/resources/com/ardublock/block/full2.png
create mode 100644 src/main/resources/com/ardublock/block/full3.png
create mode 100644 src/main/resources/com/ardublock/block/full4.png
diff --git a/src/main/java/com/ardublock/ui/OpenblocksFrame.java b/src/main/java/com/ardublock/ui/OpenblocksFrame.java
index 0cf8ba0..d48eef2 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 4c99959..5d8c179 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 31fc071..f5fdea2 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 0655a81..35fbf5a 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
GIT binary patch
literal 665
zcmV;K0%rY*P)<h;3K|Lk000e1NJLTq002Ay000&U1^@s6oXh_r00004b3#c}2nYxW
zd<bNS00009a7bBm001Gb001Gb0jaX-q5uE@8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10v1U`K~z|U<(SWF(_k3KKS^V{Ztb?}h7~r!U+gespa=s6FTxI9
zyop}Cd-Ol>pV&>o+dRl%ha$`=D5&^jXq`?sYlmjqmXvN;+So2hJqVk{Y|Ny2t?qk#
zzi*!B`{l{|K2IXuzWb=bE`t2G1&Bsl8=hPI%(J;gY};vCpPkS0^6f`oF%`dJ%7)40
z%+qc696Zp^xzQ27DR}TaLtZa4d}I(siEON=AHKl09Zn7({o|Ov4cFFfvR}S!yGK=g
zhYt;b6?Jw*xpw7(Cl`_0@5BT)EXxwHsM-oGLLj6BnS~|BC(_K$XFd7pC$AWvNTU_>
z(6tCLY*sCnizU`7mM6brm@F4d)arKVS^~e)j^l25c^w{1At41#(NY99Y}M-AoV@4B
zUB7y{shzX~0vlEph0&2APfnKq!&_Qa6~<1VXoVIbXulGK3?YUi^3QYZx~?Z*v1%e@
z0D=tn#5(~n%<6BP>$v1gWf3v}L5BDBCIEQ%NuzEz_u9v=-*4HU!+?<KzJG5I1F1f=
zyv~g~)0{ef3|W%MX$9UaERpI<lGnvlS=i^y#j!Kon!1lx&^JcNSVxpg=g*S)kP~KD
z^81U&aUE9IEF>9{iTIA5aUGZ3*CJ)ZB+(V)(7=9FMZv6or@n5Jh{xCy*&I|>%_@%L
z(%apIENxC~D@KI|4U*kE%lj*Q8~#_Z>-z8yFbT2dwiJZE00000NkvXXu0mjfO9n9;
literal 0
HcmV?d00001
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
GIT binary patch
literal 674
zcmV;T0$u%yP)<h;3K|Lk000e1NJLTq002Ay000&U1^@s6oXh_r00004b3#c}2nYxW
zd<bNS00009a7bBm001Gb001Gb0jaX-q5uE@8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10v}04K~z|U<(NHa6JZ#~e|PC6HHNf_wnZYeg4V?k5C;`R&_Php
z!OfwAo2wnV6a?ptt>Dm3e$l~26cjCfl%f@_!A2w@n6xA%fuzZ$Y2xMX>SRmsEbS$E
zjrKp@^WO9R{yg_S&&x@3(Znj-Nb=tX5UrLrJpK6_&!%V5s(Q`y$(ax@--T@DY_kiK
z$>kY+@N~m92loZIdf|-SEtq&dMLe12<dJ@y$~x-UqZd?lopUFSZaJrI!{v%bDDr*7
zH7=)OH+|D&+wd=Wce=SfeBC;^qxDWq-G(I@Jnr^Jun3Wm61@EsW-vI;<cxKrx%cE1
zgTZm4iB!{BgcvRqOT-oySyD@u@l38jY+;d=iq>?Nx<6@MH~-kY4j<@4mZW;OXsGHo
zTq;+%IeOnRHW3`E87Hlvx@lZag^Q<;TPOb?yL7utVc^o)Mz9D`>y@C%5@NW`;Q+ue
zOv|{sTo!==2r|5@(+fa0ul^P@43l^&Edm1&WOz@P4}kYyBK***HL=I9Kd_`Oi@*RH
z(6lzAy*<0>?+p-1BpDvL%lT8skY$*Q&NDUpmA*g^@uZk43mcL*1}<~!&O@S!)Y=u&
z<KDs0wJW^&7#3z&vipliHw?1*B9bK0?eEysJBDErj?I(K=J9uUIJCbPms6ooT%n?A
z_`IH)i%K@Hq8lb%J}<Joe)=-G0<cQAzjMpnwhjNQ+IDmJCogiZq9t&CQUCw|07*qo
IM6N<$f+K!4lK=n!
literal 0
HcmV?d00001
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
GIT binary patch
literal 603
zcmV-h0;K(kP)<h;3K|Lk000e1NJLTq002Ay000&U1^@s6oXh_r00004b3#c}2nYxW
zd<bNS00009a7bBm001Gb001Gb0jaX-q5uE@8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10oX}IK~z|U<(S(}+%ObHm*XTu!lgi=5^bf@he|y4Yx*O6MgI|@
zN>BkqnNAoIa&_W93`092gP4T4Y1xlC&hcKdeU4@E<?yTK1<Cr`2288hz}I2SXcAIY
z^P6xy2^mkqMmg=KX7WODIvhPZX4M<8x3krB3NC*JBw5bpnvaFN|9<vkjMkd%SL;jX
zYz$mh6;Yf#I!0QeY5LC882CPclpK6~UmLT;e+Y~KTlTsX%*lw;AdEOVIbT?4E=B=I
zC+Eaz*0~oWz)F?GX+}|&weh@A#A!xZc7G*ky`^=f7Z$Ho-=lA*xHWKDRUCgG*2X@6
z+DG)PQnv=SgkWcDV_~dsY7Z<e-tKNchZiIIclyaQ$q2BRm97OvSgFc{4Zskv>r78h
zQK$zotu;yBegB=w46r)|o<uQ~o?qsx;0C4Y`*Rm+f3<vqR$Lc<Wk8%}9G_nBdUFGT
zCW=$8!&|(8OOoX#te61?_^`Ljx3f#)G$S5f0U)Jh|J@scn_FYRqUjTl)|%pOE6&d7
zQ~rsPl)O+lwq(usu!KOVl1giATh8_FLMgNc$C1AaAJePoGV}ha#w#p@Sb9Ps1na){
p(1a~(MuTJ5=WhZ!(~IlFzX15Pu2VtoxETNd002ovPDHLkV1mU|3)cVu
literal 0
HcmV?d00001
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
GIT binary patch
literal 688
zcmV;h0#E&kP)<h;3K|Lk000e1NJLTq002Ay000&U1^@s6oXh_r00004b3#c}2nYxW
zd<bNS00009a7bBm001Gb001Gb0jaX-q5uE@8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10xd~IK~z|U<(NNc6JZ#}fAQ{;HmzyXq$JQt6NoWlNJR`vv<ecX
z)S_4vIw($d(Tabzir`Way4X=rMC{-o7IYB02!g1S*2Q+vBGy{dni8#zmp>OLgTb@3
zm*g|rXZ)V;-g|z0$NRmU$=}(VXBBD9-wq&JRSn#+a|=Bk?O4o8(Rz0*%He%G4Aqp4
zhVi(Z44gi?<enF=-*R>MzR_23vS&X*pNG+>FHzH(!uo~YBbXJ1yQ5E5T+=XcU9E-a
z=8a44NvUb0<trw`z&|zrWr4jXF6w%jT&~peWmn0-nwBTIuvm^PLL{VVb?u5UGSp9Z
zEUN3DJ$8_hp?<;vZ^g3+0e0AJg#4{E+ikjji_1aC-%7o;rs7#j{-hN}`eXBYHa3oy
zudcbKWMEsJm0JU6biL4_Q$^QFHK=6Zl$z%DgGahv_J8csiz$`CoA=6*MTn|;w5)`L
z0B5pU0AyLx^_v>%MZ^FE0ng0M1K@VrfAeHnBIxyqhye%!em6Y}Kx}&(wH9-ccl^K}
znwuI#!~n|Bw3eec?>{m&F-hA7AH!G9bLZh>a$25k;Q*cOTN$66BIpxy%0hqv&JEt+
z`lUX?0dHZ1On&`F-{os`?T!coHW~fJqsTIDXCs=H=R^GSvYwG;iO8n)taCewCz3pW
zH9<;E<7ixqwZ_71BFXn(1{Jr{jv`A;#}ni<t+3wWa$v&5)Tg->=Qa%duWHrZ!#@D=
W#f^MawSj;D0000<MNUMnLSTXxltKCc
literal 0
HcmV?d00001
--
GitLab