diff --git a/src/main/java/org/rebotted/ui/BotFrame.java b/src/main/java/org/rebotted/ui/BotFrame.java index 21692e0..736fd8c 100644 --- a/src/main/java/org/rebotted/ui/BotFrame.java +++ b/src/main/java/org/rebotted/ui/BotFrame.java @@ -33,6 +33,8 @@ public final class BotFrame extends JFrame implements ActionListener { setLocationRelativeTo(getParent()); setLocationRelativeTo(getOwner()); setVisible(true); + requestFocus(); + toFront(); applet.initClientFrame(766, 536); System.out.println("Client Launched."); } diff --git a/src/main/java/org/rebotted/ui/BotMenuBar.java b/src/main/java/org/rebotted/ui/BotMenuBar.java index 5358263..5759006 100644 --- a/src/main/java/org/rebotted/ui/BotMenuBar.java +++ b/src/main/java/org/rebotted/ui/BotMenuBar.java @@ -10,7 +10,7 @@ public class BotMenuBar extends JMenuBar { private BotFrame botUI; private JButton startButton, pauseButton, stopButton; private JMenu features, file, scripts; - private JMenuItem cacheClear, notifications, run, pause, stop; + private JMenuItem run, pause, stop; public BotMenuBar(BotFrame botUI) { this.botUI = botUI; @@ -28,14 +28,7 @@ public class BotMenuBar extends JMenuBar { features = new JMenu("Features"); scripts = new JMenu("Script"); - JMenuItem screenshot = new JMenuItem("Create screenshot"); - JMenuItem proxy = new JMenuItem("Network"); - JMenuItem randoms = new JMenuItem("Randoms"); - JMenuItem dialog = new JCheckBoxMenuItem("Disable dialog"); - JMenuItem logger = new JCheckBoxMenuItem("Logger"); - - JMenuItem explorer = new JMenuItem("Reflection explorer"); - JMenuItem exit = new JMenuItem("Exit"); + final JMenuItem exit = new JMenuItem("Exit"); run = createNewJMenuItem( "Run", true); @@ -44,38 +37,14 @@ public class BotMenuBar extends JMenuBar { stop = createNewJMenuItem("Stop", false); - cacheClear = new JMenuItem("Clear cache"); - //cacheClear.setIcon(new ImageIcon(Images.getResource("/storage/images/trash.png"))); - - notifications = new JMenuItem("Notifications"); - //notifications.setIcon(new ImageIcon(Images.getResource("/storage/images/bell.png"))); - - - screenshot.addActionListener(botUI); - proxy.addActionListener(botUI); - randoms.addActionListener(botUI); - dialog.addActionListener(botUI); - logger.addActionListener(botUI); - explorer.addActionListener(botUI); exit.addActionListener(botUI); - cacheClear.addActionListener(botUI); - notifications.addActionListener(botUI); scripts.add(run); scripts.add(pause); scripts.add(stop); - file.add(screenshot); - file.add(proxy); - file.add(randoms); - file.add(dialog); - file.add(logger); - file.add(explorer); file.add(exit); - features.add(cacheClear); - features.add(notifications); - /* startButton = createNewButton(new ImageIcon(Images.getResource("/storage/images/run_button.png")), "Run Script", "Run", true); @@ -125,14 +94,6 @@ public class BotMenuBar extends JMenuBar { return file; } - public JMenuItem getCacheClear() { - return cacheClear; - } - - public JMenuItem getNotifications() { - return notifications; - } - public JButton getStartButton() { return startButton; }