Neueste Version mit ersten GUI Überarbeitungen

1 files changed, 126 insertions, 110 deletions

diff --git a/Dozentenmodul/src/GUI/EingabeAllgemein.java b/Dozentenmodul/src/GUI/EingabeAllgemein.java
index 8c92966f..c04a01b5 100644
--- a/Dozentenmodul/src/GUI/EingabeAllgemein.java
+++ b/Dozentenmodul/src/GUI/EingabeAllgemein.java
@@ -27,16 +27,17 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.JMenuBar;

 import javax.swing.JMenu;

 import javax.swing.JMenuItem;

-

 import Models.person;

 import java.awt.event.WindowAdapter;

 import java.awt.event.WindowEvent;

+import javax.swing.border.TitledBorder;

 

 @SuppressWarnings("serial")

 public class EingabeAllgemein extends JFrame {

 

 	private final JPanel contentPanel = new JPanel();

 	String[] result;

+	JCheckBox chckbxDerVerantwortlicheEntspricht;

 	private JTextField Vorname_V;

 	private JTextField Nachname_V;

 	private JTextField Hochschule_V;

@@ -49,7 +50,6 @@ public class EingabeAllgemein extends JFrame {
 	private JTextField EMail_E;

 	private JTextField Tel_E;

 	private JTextField Fak_E;

-	JCheckBox chckbxDerVerantwortlicheEntspricht;

 	/**

 	 * Launch the application.

 	 */

@@ -82,7 +82,7 @@ public class EingabeAllgemein extends JFrame {
 			// TODO Auto-generated catch block

 			e.printStackTrace();

 		}

-		setTitle("Dozentenmodul *Prototyp*");

+		setTitle("bwLehrpool Suite *Prototyp*");

 		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();

 		int top=(screenSize.height - 603) / 2;

 		int left=(screenSize.width - 722) / 2;

@@ -91,183 +91,188 @@ public class EingabeAllgemein extends JFrame {
 		getContentPane().setLayout(null);

 		{

 			JPanel panel = new JPanel();

-			panel.setBounds(0, 0, 587, 68);

+			panel.setBackground(Color.WHITE);

+			panel.setBounds(10, 11, 577, 57);

 			getContentPane().add(panel);

 			panel.setLayout(null);

 			{

 				JLabel lblNewLabel = new JLabel("Eingabe der allgemeinen Daten (Schritt 3 von 7)");

 				lblNewLabel.setBounds(10, 11, 509, 22);

 				panel.add(lblNewLabel);

-				lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18));

+				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));

 			}

 			

 			JTextPane txtpnBitteWhlenSie = new JTextPane();

 			txtpnBitteWhlenSie.setEditable(false);

-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);

+			txtpnBitteWhlenSie.setBackground(Color.WHITE);

 			txtpnBitteWhlenSie.setText("Geben Sie hier bitte die Kontaktdaten des Vernatwortlichen und des Erstellers der VMDK ein");

-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 42);

+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);

 			panel.add(txtpnBitteWhlenSie);

 		}

-		contentPanel.setBounds(10, 91, 577, 525);

+		contentPanel.setBounds(10, 85, 577, 493);

 		contentPanel.setBackground(Color.WHITE);

 		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));

 		getContentPane().add(contentPanel);

 		contentPanel.setLayout(null);

 		

-		JLabel lblNewLabel_1 = new JLabel("Allgemeine Informationen zum Verantwortlichen");

-		lblNewLabel_1.setFont(new Font("Tahoma", Font.PLAIN, 14));

-		lblNewLabel_1.setBounds(10, 0, 338, 25);

-		contentPanel.add(lblNewLabel_1);

+		chckbxDerVerantwortlicheEntspricht = new JCheckBox("Der Verantwortliche entspricht dem Ersteller");

+		chckbxDerVerantwortlicheEntspricht.setSelected(person.verantowrtlicher.isIschecked());

+		chckbxDerVerantwortlicheEntspricht.addChangeListener(new ChangeListener() {

+			public void stateChanged(ChangeEvent arg0) {

+				if(chckbxDerVerantwortlicheEntspricht.isSelected()==true){

+				Nachname_E.setText(Nachname_V.getText());

+				Vorname_E.setText(Vorname_V.getText());

+				Hochschule_E.setText(Hochschule_V.getText());

+				EMail_E.setText(EMail_V.getText());

+				Tel_E.setText(Tel_V.getText());

+				Fak_E.setText(Fak_V.getText());

+				}else{

+					Nachname_E.setText("");

+					Vorname_E.setText("");

+					Hochschule_E.setText("");

+					EMail_E.setText("");

+					Tel_E.setText("");

+					Fak_E.setText("");

+				}

+			}

+		});

+		chckbxDerVerantwortlicheEntspricht.setBackground(Color.WHITE);

+		chckbxDerVerantwortlicheEntspricht.setBounds(10, 239, 264, 23);

+		contentPanel.add(chckbxDerVerantwortlicheEntspricht);

+		

+		JPanel panel_1 = new JPanel();

+		panel_1.setBackground(Color.WHITE);

+		panel_1.setBorder(new TitledBorder(null, "Informationen zum Verantwortlichen", TitledBorder.LEADING, TitledBorder.TOP, null, null));

+		panel_1.setBounds(10, 22, 557, 210);

+		contentPanel.add(panel_1);

+		panel_1.setLayout(null);

 		

-		JLabel lblNewLabel_2 = new JLabel("Vorname: *");

-		lblNewLabel_2.setBounds(10, 36, 125, 20);

-		contentPanel.add(lblNewLabel_2);

+		JLabel label = new JLabel("Vorname: *");

+		label.setBounds(10, 24, 125, 20);

+		panel_1.add(label);

 		

 		Vorname_V = new JTextField();

-		Vorname_V.setBounds(145, 36, 350, 20);

-		Vorname_V.setText(person.verantowrtlicher.getVorname());

-		contentPanel.add(Vorname_V);

+		Vorname_V.setText((String) null);

 		Vorname_V.setColumns(10);

+		Vorname_V.setBounds(145, 24, 350, 20);

+		panel_1.add(Vorname_V);

 		

-		JLabel lblNachname = new JLabel("Nachname: *");

-		lblNachname.setBounds(10, 67, 125, 20);

-		contentPanel.add(lblNachname);

+		JLabel label_7 = new JLabel("Nachname: *");

+		label_7.setBounds(10, 55, 125, 20);

+		panel_1.add(label_7);

 		

 		Nachname_V = new JTextField();

-		Nachname_V.setBounds(145, 67, 350, 20);

-		Nachname_V.setText(person.verantowrtlicher.getName());

-		contentPanel.add(Nachname_V);

+		Nachname_V.setText((String) null);

 		Nachname_V.setColumns(10);

+		Nachname_V.setBounds(145, 55, 350, 20);

+		panel_1.add(Nachname_V);

 		

-		JLabel lblHochschule = new JLabel("Hochschule: *");

-		lblHochschule.setBounds(10, 98, 125, 20);

-		contentPanel.add(lblHochschule);

+		JLabel label_8 = new JLabel("Hochschule: *");

+		label_8.setBounds(10, 86, 125, 20);

+		panel_1.add(label_8);

 		

 		Hochschule_V = new JTextField();

+		Hochschule_V.setText((String) null);

 		Hochschule_V.setColumns(10);

-		Hochschule_V.setBounds(145, 98, 350, 20);

-		Hochschule_V.setText(person.verantowrtlicher.getHochschule());

-		contentPanel.add(Hochschule_V);

+		Hochschule_V.setBounds(145, 86, 350, 20);

+		panel_1.add(Hochschule_V);

 		

-		JLabel lblEmail = new JLabel("E-Mail: *");

-		lblEmail.setBounds(10, 129, 125, 20);

-		contentPanel.add(lblEmail);

+		JLabel label_9 = new JLabel("E-Mail: *");

+		label_9.setBounds(10, 117, 125, 20);

+		panel_1.add(label_9);

 		

 		EMail_V = new JTextField();

+		EMail_V.setText((String) null);

 		EMail_V.setColumns(10);

-		EMail_V.setBounds(145, 129, 350, 20);

-		EMail_V.setText(person.verantowrtlicher.getEMail());

-		contentPanel.add(EMail_V);

+		EMail_V.setBounds(145, 117, 350, 20);

+		panel_1.add(EMail_V);

 		

-		JLabel lblTelnummer = new JLabel("Tel.-Nummer:");

-		lblTelnummer.setBounds(10, 160, 125, 20);

-		contentPanel.add(lblTelnummer);

+		JLabel label_10 = new JLabel("Tel.-Nummer:");

+		label_10.setBounds(10, 148, 125, 20);

+		panel_1.add(label_10);

 		

 		Tel_V = new JTextField();

+		Tel_V.setText((String) null);

 		Tel_V.setColumns(10);

-		Tel_V.setBounds(145, 160, 350, 20);

-		Tel_V.setText(person.verantowrtlicher.getTel());

-		contentPanel.add(Tel_V);

+		Tel_V.setBounds(145, 148, 350, 20);

+		panel_1.add(Tel_V);

 		

-		JLabel lblFakultt = new JLabel("Fakult\u00E4t:");

-		lblFakultt.setBounds(10, 191, 125, 20);

-		contentPanel.add(lblFakultt);

+		JLabel label_11 = new JLabel("Fakult\u00E4t:");

+		label_11.setBounds(10, 179, 125, 20);

+		panel_1.add(label_11);

 		

 		Fak_V = new JTextField();

+		Fak_V.setText((String) null);

 		Fak_V.setColumns(10);

-		Fak_V.setBounds(145, 191, 350, 20);

-		Fak_V.setText(person.verantowrtlicher.getFakultät());

-		contentPanel.add(Fak_V);

+		Fak_V.setBounds(145, 179, 350, 20);

+		panel_1.add(Fak_V);

 		

-		chckbxDerVerantwortlicheEntspricht = new JCheckBox("Der Verantwortliche entspricht dem Ersteller");

-		chckbxDerVerantwortlicheEntspricht.setSelected(person.verantowrtlicher.isIschecked());

-		chckbxDerVerantwortlicheEntspricht.addChangeListener(new ChangeListener() {

-			public void stateChanged(ChangeEvent arg0) {

-				if(chckbxDerVerantwortlicheEntspricht.isSelected()==true){

-				Nachname_E.setText(Nachname_V.getText());

-				Vorname_E.setText(Vorname_V.getText());

-				Hochschule_E.setText(Hochschule_V.getText());

-				EMail_E.setText(EMail_V.getText());

-				Tel_E.setText(Tel_V.getText());

-				Fak_E.setText(Fak_V.getText());

-				}else{

-					Nachname_E.setText("");

-					Vorname_E.setText("");

-					Hochschule_E.setText("");

-					EMail_E.setText("");

-					Tel_E.setText("");

-					Fak_E.setText("");

-				}

-			}

-		});

-		chckbxDerVerantwortlicheEntspricht.setBackground(Color.WHITE);

-		chckbxDerVerantwortlicheEntspricht.setBounds(6, 228, 264, 23);

-		contentPanel.add(chckbxDerVerantwortlicheEntspricht);

-		

-		JLabel lblAllgemeineInformationenZum = new JLabel("Allgemeine Informationen zum Ersteller");

-		lblAllgemeineInformationenZum.setFont(new Font("Tahoma", Font.PLAIN, 14));

-		lblAllgemeineInformationenZum.setBounds(10, 258, 338, 25);

-		contentPanel.add(lblAllgemeineInformationenZum);

+		JPanel panel_2 = new JPanel();

+		panel_2.setBackground(Color.WHITE);

+		panel_2.setBorder(new TitledBorder(null, "Informationen zum Ersteller", TitledBorder.LEADING, TitledBorder.TOP, null, null));

+		panel_2.setBounds(6, 269, 561, 218);

+		contentPanel.add(panel_2);

+		panel_2.setLayout(null);

 		

 		JLabel label_1 = new JLabel("Vorname: *");

-		label_1.setBounds(10, 294, 125, 20);

-		contentPanel.add(label_1);

+		label_1.setBounds(10, 21, 125, 20);

+		panel_2.add(label_1);

 		

 		Vorname_E = new JTextField();

+		Vorname_E.setText((String) null);

 		Vorname_E.setColumns(10);

-		Vorname_E.setBounds(145, 294, 350, 20);

-		Vorname_E.setText(person.ersteller.getVorname());

-		contentPanel.add(Vorname_E);

+		Vorname_E.setBounds(145, 21, 350, 20);

+		panel_2.add(Vorname_E);

 		

 		JLabel label_2 = new JLabel("Nachname: *");

-		label_2.setBounds(10, 325, 125, 20);

-		contentPanel.add(label_2);

+		label_2.setBounds(10, 52, 125, 20);

+		panel_2.add(label_2);

 		

 		Nachname_E = new JTextField();

+		Nachname_E.setText((String) null);

 		Nachname_E.setColumns(10);

-		Nachname_E.setBounds(145, 325, 350, 20);

-		Nachname_E.setText(person.ersteller.getName());

-		contentPanel.add(Nachname_E);

+		Nachname_E.setBounds(145, 52, 350, 20);

+		panel_2.add(Nachname_E);

 		

 		Hochschule_E = new JTextField();

+		Hochschule_E.setText((String) null);

 		Hochschule_E.setColumns(10);

-		Hochschule_E.setBounds(145, 356, 350, 20);

-		Hochschule_E.setText(person.ersteller.getHochschule());

-		contentPanel.add(Hochschule_E);

+		Hochschule_E.setBounds(145, 83, 350, 20);

+		panel_2.add(Hochschule_E);

 		

 		JLabel label_3 = new JLabel("Hochschule: *");

-		label_3.setBounds(10, 356, 125, 20);

-		contentPanel.add(label_3);

+		label_3.setBounds(10, 83, 125, 20);

+		panel_2.add(label_3);

 		

 		JLabel label_4 = new JLabel("E-Mail: *");

-		label_4.setBounds(10, 387, 125, 20);

-		contentPanel.add(label_4);

+		label_4.setBounds(10, 114, 125, 20);

+		panel_2.add(label_4);

 		

 		EMail_E = new JTextField();

+		EMail_E.setText((String) null);

 		EMail_E.setColumns(10);

-		EMail_E.setBounds(145, 387, 350, 20);

-		EMail_E.setText(person.ersteller.getEMail());

-		contentPanel.add(EMail_E);

+		EMail_E.setBounds(145, 114, 350, 20);

+		panel_2.add(EMail_E);

 		

 		Tel_E = new JTextField();

+		Tel_E.setText((String) null);

 		Tel_E.setColumns(10);

-		Tel_E.setBounds(145, 418, 350, 20);

-		Tel_E.setText(person.ersteller.getTel());

-		contentPanel.add(Tel_E);

+		Tel_E.setBounds(145, 145, 350, 20);

+		panel_2.add(Tel_E);

 		

 		JLabel label_5 = new JLabel("Tel.-Nummer:");

-		label_5.setBounds(10, 418, 125, 20);

-		contentPanel.add(label_5);

+		label_5.setBounds(10, 145, 125, 20);

+		panel_2.add(label_5);

 		

 		JLabel label_6 = new JLabel("Fakult\u00E4t:");

-		label_6.setBounds(10, 449, 125, 20);

-		contentPanel.add(label_6);

+		label_6.setBounds(10, 176, 125, 20);

+		panel_2.add(label_6);

 		

 		Fak_E = new JTextField();

+		Fak_E.setText((String) null);

 		Fak_E.setColumns(10);

-		Fak_E.setText(person.ersteller.getFakultät());

-		Fak_E.setBounds(145, 449, 350, 20);

-		contentPanel.add(Fak_E);

+		Fak_E.setBounds(145, 176, 350, 20);

+		panel_2.add(Fak_E);

 		{

 			JPanel buttonPane = new JPanel();

 			buttonPane.setBounds(0, 640, 597, 33);

@@ -291,7 +296,7 @@ public class EingabeAllgemein extends JFrame {
 						person.ersteller.setName(Nachname_E.getText());

 						person.ersteller.setVorname(Vorname_V.getText());

 						person.ersteller.setTel(Tel_E.getText());

-						getVMwarePlayer sr=new getVMwarePlayer();

+						VmWareLink_GUI sr=new VmWareLink_GUI();

 						sr.setVisible(true);

 						dispose();

 					}

@@ -317,7 +322,7 @@ public class EingabeAllgemein extends JFrame {
 						person.ersteller.setFakultät(Fak_E.getText());

 						person.ersteller.setHochschule(Hochschule_E.getText());

 						person.ersteller.setName(Nachname_E.getText());

-						person.ersteller.setVorname(Vorname_V.getText());

+						person.ersteller.setVorname(Vorname_E.getText());

 						person.ersteller.setTel(Tel_E.getText());

 						EingabeSystemDaten ea=new EingabeSystemDaten();

 						ea.setVisible(true);

@@ -335,13 +340,24 @@ public class EingabeAllgemein extends JFrame {
 		}

 		

 		JSeparator separator = new JSeparator();

-		separator.setBounds(0, 79, 597, 2);

+		separator.setBounds(0, 78, 597, 2);

 		getContentPane().add(separator);

 		

 		JSeparator separator_1 = new JSeparator();

 		separator_1.setBounds(0, 627, 597, 2);

 		getContentPane().add(separator_1);

 		

+		JPanel panel = new JPanel();

+		panel.setLayout(null);

+		panel.setBorder(new EmptyBorder(5, 5, 5, 5));

+		panel.setBackground(Color.WHITE);

+		panel.setBounds(10, 583, 577, 33);

+		getContentPane().add(panel);

+		

+		JLabel lblPflichtfelder = new JLabel("* Pflichtfelder");

+		lblPflichtfelder.setBounds(10, 11, 136, 14);

+		panel.add(lblPflichtfelder);

+		

 		JMenuBar menuBar = new JMenuBar();

 		setJMenuBar(menuBar);