Merge guus dev

This commit is contained in:
Yorick
2015-04-07 15:30:17 +02:00
parent d60924a05b
commit d6b511bab5
24 changed files with 2925 additions and 6 deletions
+12 -1
View File
@@ -28,6 +28,16 @@ public class MenuBar extends JMenuBar
});
file.add(item);
JMenuItem agenda = new JMenuItem("Open Agenda");
agenda.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
{
new Agenda.Window();
}
});
file.add(agenda);
item = new JMenuItem("Open");
item.addActionListener(new ActionListener() {
@@ -55,7 +65,8 @@ public class MenuBar extends JMenuBar
{
public void actionPerformed(ActionEvent e)
{
System.exit(0);
w.setVisible(false);
w.dispose();
}
});