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

1 files changed, 18 insertions, 11 deletions

diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
index fe89746c..d9b29d91 100644
--- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
@@ -1,24 +1,20 @@
 package gui.image;
 
+import gui.intro.About_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
-import java.awt.Desktop;
-import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Font;
 import java.awt.SystemColor;
-import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 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.net.URISyntaxException;
-import java.net.URL;
 import java.util.Map;
+
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -35,12 +31,16 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
-import org.apache.thrift.TException;
+
 import models.Image;
 import models.Links;
 import models.person;
+
+import org.apache.thrift.TException;
+
 import server.Server.Client;
 import thrift.ThriftConnection;
+import util.GuiOrganizer;
 
 @SuppressWarnings("serial")
 public class EditImageAllgemein_GUI extends JFrame {
@@ -87,10 +87,8 @@ public class EditImageAllgemein_GUI extends JFrame {
 		setTitle("bwLehrpool Suite *Prototyp* - Image bearbeiten");
 
 		// Zentriert das Fenster in der Bildmitte
-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top = (screenSize.height - 722) / 2;
-		int left = (screenSize.width - 603) / 2;
-		setBounds(left, top, 603, 722);
+		setBounds(0, 0, 603, 722);
+		GuiOrganizer.centerGUI(this);
 		initData();
 		getContentPane().setLayout(null);
 		{
@@ -341,6 +339,15 @@ public class EditImageAllgemein_GUI extends JFrame {
 		});
 
 		mnNewMenu_1.add(mntmOtrs);
+		
+		JMenuItem menuItem = new JMenuItem("About");
+		menuItem.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				About_GUI ab = new About_GUI();
+				ab.setVisible(true);
+			}
+		});
+		mnNewMenu_1.add(menuItem);
 		// setFocusTraversalPolicy(new FocusTraversalOnArray(new
 		// Component[]{getContentPane(), panel_2, lblNewLabel,
 		// txtpnBitteWhlenSie, contentPanel, panel_1, label, Vorname, label_7,