Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	Dozentenmodul/bin/gui/intro/Login_GUI.class
	Dozentenmodulserver/bin/server/ServerHandler.class
	Dozentenmodulserver/bin/server/startServer.class
	Dozentenmodulserver/src/server/startServer.java

1 files changed, 39 insertions, 0 deletions

diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
index 348b1c77..67f86a13 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
@@ -34,9 +34,12 @@ import javax.swing.border.TitledBorder;
 
 import models.Image;
 import models.Lecture;
+import models.Links;
 import models.person;
 import javax.swing.JTextArea;
 import java.awt.ScrollPane;
+import java.io.IOException;
+
 import com.toedter.calendar.JDateChooser;
 import javax.swing.JRadioButton;
 import javax.swing.ButtonGroup;
@@ -242,6 +245,7 @@ public class EditLectureAllgemein_GUI extends JFrame {
 		panel_2.add(textFieldLaborname);
 		
 		JTextArea textArea = new JTextArea();
+		textArea.setEditable(false);
 		textArea.setWrapStyleWord(true);
 		textArea.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an. Dieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\"");
 		textArea.setLineWrap(true);
@@ -258,6 +262,7 @@ public class EditLectureAllgemein_GUI extends JFrame {
 		scrollPane.setBounds(200, 104, 347, 78);
 		panel_2.add(scrollPane);
 		description = new JTextArea();
+		description.setFont(new Font("Tahoma", Font.PLAIN, 11));
 		description.setText(Lecture.lecture.getDesc());
 		description.setLineWrap(true);
 		scrollPane.add(description);
@@ -403,9 +408,43 @@ public class EditLectureAllgemein_GUI extends JFrame {
 		menuBar.add(mnNewMenu_1);
 		
 		JMenuItem mntmFaq = new JMenuItem("FAQ");
+		mntmFaq.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mousePressed(MouseEvent arg0) {
+				
+				String faq;
+				
+				faq = Links.getFAQ();
+
+				try {
+					Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq );
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+		});
+		
 		mnNewMenu_1.add(mntmFaq);
 		
 		JMenuItem mntmOtrs = new JMenuItem("OTRS");
+		mntmOtrs.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mousePressed(MouseEvent arg0) {
+				String otrs;
+				
+				otrs = Links.getOTRS();
+				
+				try {
+					Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs );
+				} catch (IOException f) {
+					// TODO Auto-generated catch block
+					f.printStackTrace();
+				}
+
+			}
+		});
+
 		mnNewMenu_1.add(mntmOtrs);
 		
 	}