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, 38 insertions, 1 deletions

diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
index cf71082c..308ff3b7 100644
--- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
@@ -30,12 +30,15 @@ import javax.swing.border.TitledBorder;
 import javax.swing.JTextArea;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.io.IOException;
+
 import javax.swing.JRadioButton;
 import javax.swing.ButtonGroup;
 import javax.swing.JSpinner;
 import javax.swing.SpinnerNumberModel;
 
 import models.Image;
+import models.Links;
 
 @SuppressWarnings("serial")
 public class CreateImageTechnisch_GUI extends JFrame {
@@ -169,7 +172,7 @@ public class CreateImageTechnisch_GUI extends JFrame {
 		
 		JPanel panel_2 = new JPanel();
 		panel_2.setLayout(null);
-		panel_2.setBorder(new TitledBorder(null, "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_2.setBorder(new TitledBorder(null, "Empfehlung bez\u00fcglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
 		panel_2.setBackground(SystemColor.menu);
 		panel_2.setBounds(11, 196, 557, 338);
 		contentPanel.add(panel_2);
@@ -357,9 +360,43 @@ public class CreateImageTechnisch_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);
 		
 	}