Skip to content
Snippets Groups Projects
Commit 403260fa authored by Anian Bühler's avatar Anian Bühler
Browse files

added properties for ContextMenue (clone)

parent e29d7071
Branches
No related tags found
1 merge request!1dev_prefereences to master
...@@ -6,6 +6,7 @@ import java.awt.Cursor; ...@@ -6,6 +6,7 @@ import java.awt.Cursor;
import java.awt.Desktop; import java.awt.Desktop;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.FlowLayout; import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
...@@ -74,6 +75,10 @@ public class OpenblocksFrame extends JFrame ...@@ -74,6 +75,10 @@ public class OpenblocksFrame extends JFrame
private ResourceBundle uiMessageBundle; private ResourceBundle uiMessageBundle;
private String appPrefix = ""; private String appPrefix = "";
JButton modeBasicButton = null;
JButton modeProButton = null;
JButton modeSimButton = null;
public void addListener(OpenblocksFrameListener ofl) public void addListener(OpenblocksFrameListener ofl)
{ {
context.registerOpenblocksFrameListener(ofl); context.registerOpenblocksFrameListener(ofl);
...@@ -365,7 +370,8 @@ public class OpenblocksFrame extends JFrame ...@@ -365,7 +370,8 @@ public class OpenblocksFrame extends JFrame
//***************************************** //*****************************************
//Workspace: BASIC //Workspace: BASIC
//***************** //*****************
JButton modeBasicButton = new JButton(uiMessageBundle.getString("ardublock.ui.mode.standard")); modeBasicButton = new JButton(uiMessageBundle.getString("ardublock.ui.mode.standard"));
modeBasicButton.setFont(new Font("Sans", Font.BOLD, 12));
ActionListener modeBasicButtonListener = new ActionListener () { ActionListener modeBasicButtonListener = new ActionListener () {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
//get current zoomLevel //get current zoomLevel
...@@ -384,7 +390,9 @@ public class OpenblocksFrame extends JFrame ...@@ -384,7 +390,9 @@ public class OpenblocksFrame extends JFrame
serialPlotterButton.setVisible(true); serialPlotterButton.setVisible(true);
appPrefix = uiMessageBundle.getString("ardublock.ui.appprefix.standard"); appPrefix = uiMessageBundle.getString("ardublock.ui.appprefix.standard");
setTitle(makeFrameTitle()); setTitle(makeFrameTitle());
modeBasicButton.setFont(new Font("Sans", Font.BOLD, 12));
modeProButton.setFont(new Font("Sans", Font.PLAIN, 12));
modeSimButton.setFont(new Font("Sans", Font.PLAIN, 12));
zoomSlider.reset(); zoomSlider.reset();
zoomSlider.setValue(currentWorkspaceZoom); zoomSlider.setValue(currentWorkspaceZoom);
workspaceModeState=false; workspaceModeState=false;
...@@ -401,7 +409,8 @@ public class OpenblocksFrame extends JFrame ...@@ -401,7 +409,8 @@ public class OpenblocksFrame extends JFrame
//Workspace: PRO //Workspace: PRO
//***************** //*****************
JButton modeProButton = new JButton(uiMessageBundle.getString("ardublock.ui.mode.expert")); modeProButton = new JButton(uiMessageBundle.getString("ardublock.ui.mode.expert"));
modeProButton.setFont(new Font("Sans", Font.PLAIN, 12));
ActionListener modeProButtonListener = new ActionListener () { ActionListener modeProButtonListener = new ActionListener () {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
...@@ -418,6 +427,9 @@ public class OpenblocksFrame extends JFrame ...@@ -418,6 +427,9 @@ public class OpenblocksFrame extends JFrame
simulatorHelpButton.setVisible(false); simulatorHelpButton.setVisible(false);
serialMonitorButton.setVisible(true); serialMonitorButton.setVisible(true);
serialPlotterButton.setVisible(true); serialPlotterButton.setVisible(true);
modeBasicButton.setFont(new Font("Sans", Font.PLAIN, 12));
modeProButton.setFont(new Font("Sans", Font.BOLD, 12));
modeSimButton.setFont(new Font("Sans", Font.PLAIN, 12));
appPrefix = uiMessageBundle.getString("ardublock.ui.appprefix.pro"); appPrefix = uiMessageBundle.getString("ardublock.ui.appprefix.pro");
setTitle(makeFrameTitle()); setTitle(makeFrameTitle());
...@@ -437,7 +449,8 @@ public class OpenblocksFrame extends JFrame ...@@ -437,7 +449,8 @@ public class OpenblocksFrame extends JFrame
//Workspace: SIM //Workspace: SIM
//***************** //*****************
JButton modeSimButton = new JButton(uiMessageBundle.getString("ardublock.ui.mode.sim")); modeSimButton = new JButton(uiMessageBundle.getString("ardublock.ui.mode.sim"));
modeSimButton.setFont(new Font("Sans", Font.PLAIN, 12));
ActionListener modeSimButtonListener = new ActionListener () { ActionListener modeSimButtonListener = new ActionListener () {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
...@@ -454,7 +467,9 @@ public class OpenblocksFrame extends JFrame ...@@ -454,7 +467,9 @@ public class OpenblocksFrame extends JFrame
simulatorHelpButton.setVisible(true); simulatorHelpButton.setVisible(true);
serialMonitorButton.setVisible(false); serialMonitorButton.setVisible(false);
serialPlotterButton.setVisible(false); serialPlotterButton.setVisible(false);
//TODO get up running... modeBasicButton.setFont(new Font("Sans", Font.PLAIN, 12));
modeProButton.setFont(new Font("Sans", Font.PLAIN, 12));
modeSimButton.setFont(new Font("Sans", Font.BOLD, 12));
appPrefix = uiMessageBundle.getString("ardublock.ui.appprefix.sim"); appPrefix = uiMessageBundle.getString("ardublock.ui.appprefix.sim");
setTitle(makeFrameTitle()); setTitle(makeFrameTitle());
......
...@@ -20,6 +20,7 @@ ardublock.ui.load.tooltip=open program Ctrl-O ...@@ -20,6 +20,7 @@ ardublock.ui.load.tooltip=open program Ctrl-O
ardublock.ui.upload=Upload ardublock.ui.upload=Upload
ardublock.ui.upload.tooltip=Upload to Arduino Ctrl-U ardublock.ui.upload.tooltip=Upload to Arduino Ctrl-U
ardublock.ui.clone=Clone (rightclick-Ctrl) ardublock.ui.clone=Clone (rightclick-Ctrl)
ardublock.ui.clone_all=Clone following (rightclick-Shift-Ctrl)
ardublock.ui.add_comment=Add Comment ardublock.ui.add_comment=Add Comment
ardublock.ui.delete_comment=Delete Comment ardublock.ui.delete_comment=Delete Comment
ardublock.ui.organize_blocks=Organize all blocks ardublock.ui.organize_blocks=Organize all blocks
...@@ -620,6 +621,10 @@ bc.variable_number_unsigned_long=Unsigned_long ...@@ -620,6 +621,10 @@ bc.variable_number_unsigned_long=Unsigned_long
bc.variable_number_long = Long bc.variable_number_long = Long
bc.variable_number_float=float bc.variable_number_float=float
#TEST NEW BLOCKDESIGN
bg.setter_variable_analog=int
bg.setter_variable_analog.description=
#ARRAYS #ARRAYS
#**************************** #****************************
bd.array=Arrays bd.array=Arrays
......
...@@ -1877,6 +1877,19 @@ ...@@ -1877,6 +1877,19 @@
</BlockConnectors> </BlockConnectors>
</BlockGenus> </BlockGenus>
<BlockGenus name="setter_variable_analog" kind="command" color="255 0 0" initlabel="bg.setter_variable_analog" editable-label="no">
<description>
<text>TESTTEST</text>
</description>
<BlockConnectors>
<BlockConnector connector-type="number" connector-kind="socket" label="nameDerVariable" label-editable="yes">
<DefaultArg genus-name="number" label="1"/>
</BlockConnector>
</BlockConnectors>
</BlockGenus>
<!-- ******************** Arrays *************** --> <!-- ******************** Arrays *************** -->
<BlockGenus name="arrayDivider1" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.arrayDivider1" color="150 150 150" /> <BlockGenus name="arrayDivider1" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.arrayDivider1" color="150 150 150" />
<BlockGenus name="arrayDivider2" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.arrayDivider2" color="150 150 150" /> <BlockGenus name="arrayDivider2" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.arrayDivider2" color="150 150 150" />
...@@ -2981,6 +2994,8 @@ ...@@ -2981,6 +2994,8 @@
<BlockGenusMember>numberDivider1</BlockGenusMember> <BlockGenusMember>numberDivider1</BlockGenusMember>
<BlockGenusMember>millis</BlockGenusMember> <BlockGenusMember>millis</BlockGenusMember>
<BlockGenusMember>setter_variable_analog</BlockGenusMember>
<BlockGenusMember>numberDivider2</BlockGenusMember> <BlockGenusMember>numberDivider2</BlockGenusMember>
<BlockGenusMember>setter_variable_digital</BlockGenusMember> <BlockGenusMember>setter_variable_digital</BlockGenusMember>
<BlockGenusMember>variable_digital</BlockGenusMember> <BlockGenusMember>variable_digital</BlockGenusMember>
......
...@@ -20,6 +20,7 @@ ardublock.ui.load.tooltip=ArduBlock-Programm ...@@ -20,6 +20,7 @@ ardublock.ui.load.tooltip=ArduBlock-Programm
ardublock.ui.upload=Hochladen auf den Arduino ardublock.ui.upload=Hochladen auf den Arduino
ardublock.ui.upload.tooltip=Programm auf Arduino laden Strg-U ardublock.ui.upload.tooltip=Programm auf Arduino laden Strg-U
ardublock.ui.clone=klonen (Strg-Rechtsklick) ardublock.ui.clone=klonen (Strg-Rechtsklick)
ardublock.ui.clone_all=folgende klonen (Strg-Shift-Rechtsklick)
ardublock.ui.add_comment=Kommentar hinzufgen ardublock.ui.add_comment=Kommentar hinzufgen
ardublock.ui.delete_comment=Kommentar lschen ardublock.ui.delete_comment=Kommentar lschen
ardublock.ui.organize_blocks=Alle Blcke neu anordnen ardublock.ui.organize_blocks=Alle Blcke neu anordnen
...@@ -616,6 +617,11 @@ bc.variable_number=analoge_Variable ...@@ -616,6 +617,11 @@ bc.variable_number=analoge_Variable
bc.variable_number_long =lange_analogen_Variable bc.variable_number_long =lange_analogen_Variable
bc.variable_number_float=dezimale_Variable bc.variable_number_float=dezimale_Variable
#TEST NEW BLOCKDESIGN
bg.setter_variable_analog=int
bg.setter_variable_analog.description=
#ARRAYS #ARRAYS
#**************************** #****************************
bd.array=Tabellen bd.array=Tabellen
......
...@@ -210,6 +210,9 @@ local_variable_string=com.ardublock.translator.block.numbers.LocalVariableString ...@@ -210,6 +210,9 @@ local_variable_string=com.ardublock.translator.block.numbers.LocalVariableString
local_variable_number=com.ardublock.translator.block.numbers.LocalVariableNumberBlock local_variable_number=com.ardublock.translator.block.numbers.LocalVariableNumberBlock
local_variable_digital=com.ardublock.translator.block.numbers.LocalVariableDigitalBlock local_variable_digital=com.ardublock.translator.block.numbers.LocalVariableDigitalBlock
#TEST NEW BLOCKDESIGN
setter_variable_analog=com.ardublock.translator.block.numbers.SetterVariableNumberBlock
#ARRAYS #ARRAYS
#**************************** #****************************
read_number_array=com.ardublock.translator.block.arrays.ReadNumberArrayBlock read_number_array=com.ardublock.translator.block.arrays.ReadNumberArrayBlock
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment