diff options
| author | Jonathan Bauer | 2015-08-31 17:45:16 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2015-08-31 17:45:16 +0200 |
| commit | 447cffee62d97ee02d09c7298d40639602c91433 (patch) | |
| tree | dd03098a8e817f43df95134acac0b37e18070c40 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java | |
| parent | [client] slightly improved user info message when deleting a basis image in I... (diff) | |
| download | tutor-module-447cffee62d97ee02d09c7298d40639602c91433.tar.gz tutor-module-447cffee62d97ee02d09c7298d40639602c91433.tar.xz tutor-module-447cffee62d97ee02d09c7298d40639602c91433.zip | |
[client] MainMenu -> Einstellungen
added ConfigWindow to graphically config Proxy-Setting, MailMe stuff and FontScaling
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java index 7da7ccdc..25fb2fbd 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java @@ -27,10 +27,7 @@ import javax.swing.JSeparator; import org.apache.log4j.Logger; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.SatelliteStatus; -import org.openslx.bwlp.thrift.iface.WhoamiInfo; -import org.openslx.dozmod.App; import org.openslx.dozmod.Config; -import org.openslx.dozmod.Config.SavedSession; import org.openslx.dozmod.filetransfer.DownloadTask; import org.openslx.dozmod.gui.Gui.GuiCallable; import org.openslx.dozmod.gui.activity.ActivityPanel; @@ -41,6 +38,7 @@ import org.openslx.dozmod.gui.helper.CompositePage; import org.openslx.dozmod.gui.helper.DebugWindow; import org.openslx.dozmod.gui.helper.MessageType; import org.openslx.dozmod.gui.helper.UiFeedback; +import org.openslx.dozmod.gui.window.ConfigWindow; import org.openslx.dozmod.gui.window.DisclaimerWindow; import org.openslx.dozmod.gui.window.ImageListWindow; import org.openslx.dozmod.gui.window.LectureListWindow; @@ -303,6 +301,8 @@ public abstract class MainWindow { JMenu cascadeFileMenu = new JMenu("Session"); menuBar.add(cascadeFileMenu); + JMenuItem configItem = new JMenuItem("Einstellungen"); + cascadeFileMenu.add(configItem); JMenuItem logoutItem = new JMenuItem("Logout"); cascadeFileMenu.add(logoutItem); JMenuItem exitItem = new JMenuItem("Exit"); @@ -322,7 +322,12 @@ public abstract class MainWindow { menuBar.add(memStats); // Define actions - + configItem.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + ConfigWindow.open(mainWindow); + } + }); logoutItem.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { |