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

1 files changed, 18 insertions, 8 deletions

diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
index 59512570..9c197421 100644
--- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
@@ -1,13 +1,12 @@
 package gui.image;
 
+import gui.intro.About_GUI;
 import gui.intro.MainMenue_GUI;
-import gui.lecture.ExtendedSearchForImages_GUI;
+
 import java.awt.Color;
-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.KeyAdapter;
@@ -16,9 +15,9 @@ 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.util.Iterator;
 import java.util.List;
+
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JFrame;
@@ -45,12 +44,16 @@ import javax.swing.event.ChangeListener;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
+
 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 SearchImage_GUI extends JFrame {
@@ -115,10 +118,8 @@ public class SearchImage_GUI extends JFrame {
 		// Setzt den Fenstertitel
 		setTitle("bwLehrpool Suite *Prototyp* - Suche VL-Image");
 		// Zentriert das Fenster in die 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);
 
 		final DefaultTableModel model = new DefaultTableModel(titles, 0);
 
@@ -452,6 +453,15 @@ public class SearchImage_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);
 
 	}