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, 5 deletions

diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java
index 631e3c2d..1bbfa699 100644
--- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java
@@ -14,6 +14,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 javax.swing.ButtonGroup;
 import javax.swing.JButton;
 import javax.swing.JFrame;
@@ -33,6 +35,7 @@ import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 import models.Image;
+import models.Links;
 
 @SuppressWarnings("serial")
 public class EditImageTechnisch_GUI extends JFrame {
@@ -61,7 +64,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 			}
 
 		});
-		// Verhindert das Vergrößern des Fensters
+		// Verhindert das Vergroeßern des Fensters
 		setResizable(false);
 
 		try {
@@ -192,7 +195,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 		JPanel panel_2 = new JPanel();
 		panel_2.setLayout(null);
 		panel_2.setBorder(new TitledBorder(null,
-				"Empfehlung bezüglich Ressourcen", TitledBorder.LEADING,
+				"Empfehlung bez\u00fcglich Ressourcen", TitledBorder.LEADING,
 				TitledBorder.TOP, null, null));
 		panel_2.setBackground(SystemColor.menu);
 		panel_2.setBounds(10, 172, 557, 338);
@@ -285,7 +288,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 						} else {
 							Image.image.setLicensed(false);
 						}
-						// Öffnet das vorherige Fenster
+						// oeffnet das vorherige Fenster
 						EditImageAllgemein_GUI ei = new EditImageAllgemein_GUI();
 						ei.setVisible(true);
 						dispose();
@@ -314,7 +317,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 						} else {
 							Image.image.setLicensed(false);
 						}
-						// Öffnet das nächste Fenster
+						// oeffnet das naechste Fenster
 						FTPEditUploader_GUI ea = new FTPEditUploader_GUI();
 						ea.setVisible(true);
 						dispose();
@@ -341,11 +344,42 @@ public class EditImageTechnisch_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);
 
 	}
-
 }