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

1 files changed, 34 insertions, 30 deletions

diff --git a/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java b/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java
index 0f54c346..94ec06a6 100644
--- a/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java
+++ b/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java
@@ -1,45 +1,41 @@
 package gui.image;
 
 
+import gui.intro.About_GUI;
 import gui.intro.MainMenue_GUI;
 
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Toolkit;
-import javax.swing.JFrame;
-import javax.swing.JButton;
-import javax.swing.JPanel;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
 import java.awt.Color;
-import javax.swing.JLabel;
+import java.awt.FlowLayout;
 import java.awt.Font;
-import javax.swing.JTextPane;
 import java.awt.SystemColor;
-import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
-import javax.swing.JSeparator;
-import javax.swing.JMenuBar;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import javax.swing.border.TitledBorder;
-import javax.swing.JTextArea;
+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 javax.swing.JRadioButton;
 import javax.swing.ButtonGroup;
-import javax.swing.JSpinner;
-import javax.swing.SpinnerNumberModel;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.JTextPane;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
 
 import models.Image;
 import models.Links;
-import javax.swing.JComboBox;
-import javax.swing.DefaultComboBoxModel;
+import util.GuiOrganizer;
 
 @SuppressWarnings("serial")
 public class EditImageFreigabe_GUI extends JFrame {
@@ -70,11 +66,10 @@ public class EditImageFreigabe_GUI extends JFrame {
 			e.printStackTrace();
 		}
 		setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen");
-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top=(screenSize.height - 722) / 2;
-		int left=(screenSize.width - 603) / 2;
-		setBounds(left, top, 603, 722);
-		//setBounds(100, 100, 603, 722);
+
+		setBounds(0, 0, 603, 722);
+		GuiOrganizer.centerGUI(this);
+
 		getContentPane().setLayout(null);
 		{
 			JPanel panel = new JPanel();
@@ -247,5 +242,14 @@ public class EditImageFreigabe_GUI extends JFrame {
 
 		mnNewMenu_1.add(mntmOtrs);
 		
+		JMenuItem mntmAbout = new JMenuItem("About");
+		mntmAbout.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				About_GUI ab = new About_GUI();
+				ab.setVisible(true);
+			}
+		});
+		mnNewMenu_1.add(mntmAbout);
+		
 	}
 }