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

fixed "opening multiple help pages" by helpButton

parent 57e328fd
No related branches found
No related tags found
1 merge request!1dev_prefereences to master
...@@ -578,7 +578,7 @@ public class OpenblocksFrame extends JFrame ...@@ -578,7 +578,7 @@ public class OpenblocksFrame extends JFrame
simulateMenuItem.setVisible(false); simulateMenuItem.setVisible(false);
simulateMenuItem.unregisterKeyboardAction(ctrluKeyStroke); simulateMenuItem.unregisterKeyboardAction(ctrluKeyStroke);
//helpButton.setVisible(false); //helpButton.setVisible(false);
helpButton.removeActionListener(simulatorHelpButtonListener); removeAllActionListeners(helpButton);
helpButton.addActionListener(helpButtonListener); helpButton.addActionListener(helpButtonListener);
helpButton.setToolTipText(uiMessageBundle.getString("ardublock.ui.help.tooltip")); helpButton.setToolTipText(uiMessageBundle.getString("ardublock.ui.help.tooltip"));
serialMonitorButton.setVisible(true); serialMonitorButton.setVisible(true);
...@@ -649,7 +649,7 @@ public class OpenblocksFrame extends JFrame ...@@ -649,7 +649,7 @@ public class OpenblocksFrame extends JFrame
simulateMenuItem.setVisible(false); simulateMenuItem.setVisible(false);
simulateMenuItem.unregisterKeyboardAction(ctrluKeyStroke); simulateMenuItem.unregisterKeyboardAction(ctrluKeyStroke);
//helpButton.setVisible(false); //helpButton.setVisible(false);
helpButton.removeActionListener(simulatorHelpButtonListener); removeAllActionListeners(helpButton);
helpButton.addActionListener(helpButtonListener); helpButton.addActionListener(helpButtonListener);
helpButton.setToolTipText(uiMessageBundle.getString("ardublock.ui.help.tooltip")); helpButton.setToolTipText(uiMessageBundle.getString("ardublock.ui.help.tooltip"));
serialMonitorButton.setVisible(true); serialMonitorButton.setVisible(true);
...@@ -718,8 +718,9 @@ public class OpenblocksFrame extends JFrame ...@@ -718,8 +718,9 @@ public class OpenblocksFrame extends JFrame
simulateMenuItem.setVisible(true); simulateMenuItem.setVisible(true);
simulateMenuItem.registerKeyboardAction(simulateButtonListener, ctrluKeyStroke, JComponent.WHEN_IN_FOCUSED_WINDOW); simulateMenuItem.registerKeyboardAction(simulateButtonListener, ctrluKeyStroke, JComponent.WHEN_IN_FOCUSED_WINDOW);
//helpButton.setVisible(true); //helpButton.setVisible(true);
helpButton.removeActionListener(helpButtonListener); removeAllActionListeners(helpButton);
helpButton.addActionListener(simulatorHelpButtonListener); helpButton.addActionListener(simulatorHelpButtonListener);
helpButton.addActionListener(helpButtonListener);
helpButton.setToolTipText(uiMessageBundle.getString("ardublock.ui.simulatorHelp.tooltip")); helpButton.setToolTipText(uiMessageBundle.getString("ardublock.ui.simulatorHelp.tooltip"));
serialMonitorButton.setVisible(false); serialMonitorButton.setVisible(false);
serialPlotterButton.setVisible(false); serialPlotterButton.setVisible(false);
...@@ -1380,6 +1381,12 @@ public class OpenblocksFrame extends JFrame ...@@ -1380,6 +1381,12 @@ public class OpenblocksFrame extends JFrame
return workspaceModeState; return workspaceModeState;
} }
private void removeAllActionListeners(JButton button) { //letsgoING
for( ActionListener al : button.getActionListeners() ) {
button.removeActionListener( al );
}
}
//TODO: TESTTESTTEST //TODO: TESTTESTTEST
private void addLibrary(String libraryName) private void addLibrary(String libraryName)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment