added info option in main menu

4 files changed, 20 insertions, 4 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index 64c76bed..fe2b5017 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -295,7 +295,7 @@ public class SearchImage_GUI extends JFrame {
 			@Override

 			public void keyReleased(KeyEvent e) {

 				// Textfield eingabe auslesen

-				String stext = textFieldName.getText();

+				String stext = textFieldName.getText().trim();

 

 				// Wenn Textfield nicht leer

 				if (stext != "") {

@@ -307,8 +307,8 @@ public class SearchImage_GUI extends JFrame {
 							textFieldName.getText(), 0));

 					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(

 							textFieldName.getText(), 0));

-

-				} else {

+					

+				} else { //refresh list (deprecated, remove tabfolder)

 					activeSearch = false;

 					String username = person.verantwortlicher.getName() + " "

 							+ person.verantwortlicher.getVorname();

diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 4c29027a..656f58bb 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..8ee3b522 100644
--- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
@@ -86,6 +86,8 @@ public class MainMenue_GUI extends JFrame {
 	JRadioButton rdbtnLectureSearch;
 	private final ButtonGroup buttonGroup = new ButtonGroup();
 	private JMenuItem mntmAbout;
+	
+	private static final String HELP_MESSAGE = "";
 
 	// for testing
 	ImageRights imageRights = new ImageRights();
@@ -441,6 +443,15 @@ public class MainMenue_GUI extends JFrame {
 
 		JMenu mnNewMenu_1 = new JMenu("Hilfe");
 		menuBar.add(mnNewMenu_1);
+		
+		JMenu mnNewMenu_Info = new JMenu("Info");
+		mnNewMenu_Info.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				JOptionPane.showMessageDialog(null, HELP_MESSAGE, "title", JOptionPane.INFORMATION_MESSAGE);
+			}
+		});
+		menuBar.add(mnNewMenu_Info);
 
 		JMenuItem mntmFaq = new JMenuItem("FAQ");
 		mntmFaq.addMouseListener(new MouseAdapter() {
@@ -482,6 +493,7 @@ public class MainMenue_GUI extends JFrame {
 			}
 		});
 		mnNewMenu_1.add(mntmAbout);
+		
 
 	}// end main
 
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
index b62ed49d..9e7b5d77 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
@@ -128,7 +128,7 @@ public class PermissionCreateLecture_GUI extends JFrame {
 			getContentPane().add(panel);
 			panel.setLayout(null);
 			{
-				JLabel lblNewLabel = new JLabel("Veranstaltungen - Berechtigungen (Nur zur Veranschaulichung)");
+				JLabel lblNewLabel = new JLabel("Veranstaltung - Berechtigungen (Nur zur Veranschaulichung)");
 				lblNewLabel.setBounds(10, 11, 509, 22);
 				panel.add(lblNewLabel);
 				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));