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

1 files changed, 33 insertions, 24 deletions

diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
index 96826596..87a59a6b 100644
--- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
@@ -2,49 +2,49 @@ package gui.image;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
-import java.awt.Dimension;
 import java.awt.FlowLayout;
-import java.awt.Toolkit;
+import java.awt.Font;
+import java.awt.SystemColor;
+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.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.io.File;
-import java.io.IOException;
 
 import javax.swing.JButton;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JProgressBar;
+import javax.swing.JSeparator;
+import javax.swing.JTextPane;
 import javax.swing.SwingConstants;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
-import ftp.DownloadTask;
-import gui.intro.MainMenue_GUI;
 
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.awt.SystemColor;
-import java.awt.Font;
-import javax.swing.JTextPane;
-import javax.swing.JSeparator;
 import models.Image;
 import models.Links;
 import models.SessionData;
 
 import org.apache.thrift.TException;
+
 import server.Server.Client;
 import server.User;
 import thrift.ThriftConnection;
-import javax.swing.JMenuBar;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
+import util.GuiOrganizer;
+import ftp.DownloadTask;
+import gui.intro.About_GUI;
+import gui.intro.MainMenue_GUI;
 
 @SuppressWarnings("serial")
 public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener {
@@ -114,10 +114,10 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 
 		setBackground(Color.WHITE);
 		setTitle("Dozentenmodul *Prototyp* - Image herunterladen");
-		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);
+		
 		getContentPane().setLayout(new BorderLayout());
 		contentPanel.setBackground(SystemColor.menu);
 		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
@@ -319,6 +319,15 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 		});
 
 		menu.add(menuItem_1);
+		
+		JMenuItem mntmAbout = new JMenuItem("About");
+		mntmAbout.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				About_GUI ab = new About_GUI();
+				ab.setVisible(true);
+			}
+		});
+		menu.add(mntmAbout);
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBackground(UIManager.getColor("Button.background"));