Skip to content

Commit 0113319

Browse files
committed
tools and help kt works
1 parent 44d1161 commit 0113319

2 files changed

Lines changed: 7 additions & 25 deletions

File tree

app/src/processing/app/ui/ComposeTopBar.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ fun TopBar(panel: ComposePanel, base: Base, editor: Editor) {
6060
//showMenuPopup(p, b, e, x, y)
6161
},
6262
TopBarItemData("Tools") { p, b, e, x, y ->
63-
showMenuPopup(p, b, e, x, y)
63+
showToolsPopup(p, e,x,y )
6464
},
65-
TopBarItemData("Help") { p, b, e, x, y ->
66-
showMenuPopup(p, b, e, x, y)
65+
TopBarItemData("Help") { p, _, e, x, y ->
66+
showHelpPopup(p, e, x, y)
6767
},
6868
TopBarItemData("Develop") { p, _, e, x, y ->
6969
showDevelopPopup(p, e, x, y)
@@ -150,7 +150,7 @@ private fun showSketchPopup(panel: ComposePanel, editor: Editor, x: Int, y: Int)
150150
}
151151

152152
private fun showToolsPopup(panel: ComposePanel, editor: Editor, x: Int, y: Int) {
153-
val menu = editor.buildToolsMenu()
153+
val menu = editor.getToolMenu()
154154
showPopupFromMenu(panel, menu, x, y)
155155
}
156156

app/src/processing/app/ui/Editor.java

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,29 +1081,11 @@ public JMenu buildModeMenu() {
10811081
return null;
10821082
}
10831083

1084-
public void buildToolsMenu() {
1085-
toolsMenu = new JMenu(Language.text("menu.tools"));
1086-
1087-
var updateTrigger = new JMenuItem(Language.text("menu.tools.check_for_updates"));
1088-
updateTrigger.addActionListener(e -> {
1089-
Preferences.unset("update.last");
1090-
Preferences.setInteger("update.beta_welcome", 0);
1091-
new UpdateCheck(base);
1092-
});
1093-
toolsMenu.add(updateTrigger);
1094-
}
10951084

1096-
public void buildHelpMenu(){
1097-
JMenu helpMenu = new JMenu(Language.text("menu.develop"));
10981085

1099-
var updateTrigger = new JMenuItem(Language.text("menu.help.check_for_updates"));
1100-
updateTrigger.addActionListener(e -> {
1101-
Preferences.unset("update.last");
1102-
Preferences.setInteger("update.beta_welcome", 0);
1103-
new UpdateCheck(base);
1104-
});
1105-
helpMenu.add(updateTrigger);
1106-
} //HELP MENU CODE!!!!
1086+
public JMenu buildHelpMenu(){
1087+
return null;
1088+
} //HELP MENU CODE
11071089

11081090
public void buildDevelopMenu(){
11091091
developMenu = new JMenu(Language.text("menu.develop"));

0 commit comments

Comments
 (0)