diff options
| author | Michael Wilson | 2014-10-02 14:26:51 +0200 |
|---|---|---|
| committer | Michael Wilson | 2014-10-02 14:26:51 +0200 |
| commit | da08822fc12f4fb5a798ef9ba7b93139832daae1 (patch) | |
| tree | 799b5faf4ff6905b6525f0fda5a881671c59af35 /dozentenmodul/src/main/java/gui/intro | |
| parent | -Suchfenster "Image bearbeiten", "Image löschen", Veranstaltung bearbeiten", ... (diff) | |
| parent | • added warning for 'back' on ftp upload task (diff) | |
| download | tutor-module-da08822fc12f4fb5a798ef9ba7b93139832daae1.tar.gz tutor-module-da08822fc12f4fb5a798ef9ba7b93139832daae1.tar.xz tutor-module-da08822fc12f4fb5a798ef9ba7b93139832daae1.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Diffstat (limited to 'dozentenmodul/src/main/java/gui/intro')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/intro/Login_GUI.java | 4 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java | 37 |
2 files changed, 25 insertions, 16 deletions
diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java index 31d9d60b..a20daa55 100644 --- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java @@ -36,6 +36,8 @@ import thrift.ThriftConnection; import util.GuiOrganizer; import util.ResourceLoader; import config.Config; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; @SuppressWarnings("serial") public class Login_GUI extends JFrame { @@ -51,6 +53,7 @@ public class Login_GUI extends JFrame { JLabel lblConnectionInfo = new JLabel(""); boolean isClientReturnedCorrectly = false; JCheckBox chckbxBenutzernameSpeichern; + private static final String HELP_MESSAGE = ""; /** * Create the frame. @@ -196,6 +199,7 @@ public class Login_GUI extends JFrame { // Sanity checks if (result.authToken == null || result.sessionId == null) { setStatus(Color.red, "Antwort des Masterservers korrupt.", null); + LOGGER.info("Antwort des Masterservers korrupt"); return; } diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java index c86bfe4c..21b5dcda 100644 --- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java @@ -19,13 +19,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; -import java.net.URL; -import java.util.HashMap; import javax.swing.ButtonGroup; import javax.swing.JButton; @@ -46,25 +41,18 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; - -import org.xml.sax.SAXException; -import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; import models.ImageRights; import models.Links; import models.SessionData; import models.person; + +import org.apache.log4j.Logger; + import util.GuiOrganizer; import util.News; -import util.ResourceLoader; import util.OpenLinks; +import util.ResourceLoader; @SuppressWarnings("serial") public class MainMenue_GUI extends JFrame { @@ -86,6 +74,9 @@ public class MainMenue_GUI extends JFrame { JRadioButton rdbtnLectureSearch; private final ButtonGroup buttonGroup = new ButtonGroup(); private JMenuItem mntmAbout; + + private static final String HELP_MESSAGE = "<html>Bitte wählen Sie aus, was Sie anlegen möchten.<br /> " + + "Sie können </html>"; // for testing ImageRights imageRights = new ImageRights(); @@ -441,6 +432,19 @@ public class MainMenue_GUI extends JFrame { JMenu mnNewMenu_1 = new JMenu("Hilfe"); menuBar.add(mnNewMenu_1); + + //Template for Help-Buttons + /* + JMenu mnNewMenu_Info = new JMenu("Info"); + mnNewMenu_Info.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + JOptionPane.showMessageDialog(null, HELP_MESSAGE, "Hilfe zu dieser Oberfläche", JOptionPane.INFORMATION_MESSAGE); + } + }); + menuBar.add(mnNewMenu_Info); + * + */ JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @@ -482,6 +486,7 @@ public class MainMenue_GUI extends JFrame { } }); mnNewMenu_1.add(mntmAbout); + }// end main |