neue Änderungen

-Fenstergröße angepasst
-Eingabefelder vergrößert
-Texte angepasst
-Buttons zur Änderung der Daten eingefügt

1 files changed, 29 insertions, 26 deletions

diff --git a/Dozentenmodul/src/GUI/EingabeSystemDaten.java b/Dozentenmodul/src/GUI/EingabeSystemDaten.java
index 81071323..b5a0b5e4 100644
--- a/Dozentenmodul/src/GUI/EingabeSystemDaten.java
+++ b/Dozentenmodul/src/GUI/EingabeSystemDaten.java
@@ -23,21 +23,16 @@ import java.awt.Choice;
 import java.sql.Connection;

 import java.sql.ResultSet;

 import java.sql.SQLException;

-

 import Models.vm;

-

 import com.toedter.calendar.JDateChooser;

 import javax.swing.JMenuBar;

 import javax.swing.JMenu;

 import javax.swing.JMenuItem;

 import javax.swing.JScrollPane;

-import java.awt.event.FocusAdapter;

-import java.awt.event.FocusEvent;

-import java.awt.event.MouseAdapter;

-import java.awt.event.MouseEvent;

 import java.awt.event.WindowAdapter;

 import java.awt.event.WindowEvent;

 

+

 @SuppressWarnings("serial")

 public class EingabeSystemDaten extends JDialog {

 

@@ -48,9 +43,9 @@ public class EingabeSystemDaten extends JDialog {
 	JDateChooser dateChooser;

 	JDateChooser dateChooser_1;

 	Choice choiceOS;

-	JTextArea comment;

 	JTextArea shortDesc;

 	JTextArea longDesc;

+	JTextArea comment;

 	/**

 	 * Launch the application.

 	 */

@@ -82,15 +77,15 @@ public class EingabeSystemDaten extends JDialog {
 			e.printStackTrace();

 		}

 		setTitle("Dozentenmodul");

-		setBounds(100, 100, 583, 648);

+		setBounds(100, 100, 603, 722);

 		getContentPane().setLayout(null);

 		{

 			JPanel panel = new JPanel();

-			panel.setBounds(0, 0, 567, 71);

+			panel.setBounds(0, 0, 587, 71);

 			getContentPane().add(panel);

 			panel.setLayout(null);

 			{

-				JLabel lblNewLabel = new JLabel("Eingabe der systembezogenen Daten (Schritt 4 von 5)");

+				JLabel lblNewLabel = new JLabel("Eingabe der systembezogenen Daten (Schritt 4 von 6)");

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

 				panel.add(lblNewLabel);

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

@@ -103,7 +98,7 @@ public class EingabeSystemDaten extends JDialog {
 			txtpnBitteWhlenSie.setBounds(10, 36, 509, 42);

 			panel.add(txtpnBitteWhlenSie);

 		}

-		contentPanel.setBounds(10, 95, 547, 441);

+		contentPanel.setBounds(10, 95, 567, 506);

 		contentPanel.setBackground(Color.WHITE);

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

 		getContentPane().add(contentPanel);

@@ -120,7 +115,7 @@ public class EingabeSystemDaten extends JDialog {
 		

 		Laborname = new JTextField();

 		Laborname.setText(vm.vl.getLaborname());

-		Laborname.setBounds(170, 36, 150, 20);

+		Laborname.setBounds(170, 36, 350, 20);

 		contentPanel.add(Laborname);

 		Laborname.setColumns(10);

 		

@@ -141,12 +136,13 @@ public class EingabeSystemDaten extends JDialog {
 		contentPanel.add(lblBetriebssystem);

 		

 		choiceOS = new Choice();

+		choiceOS.setFont(new Font("Tahoma", Font.PLAIN, 11));

 

 

 

 

 		

-		choiceOS.setBounds(170, 373, 150, 20);

+		choiceOS.setBounds(170, 373, 226, 20);

 		

 		Connection con=sql.getConnection();

 		ResultSet rs=sql.getAllOS(con);

@@ -175,7 +171,7 @@ public class EingabeSystemDaten extends JDialog {
 		dateChooser = new JDateChooser();

 		dateChooser.setDateFormatString("dd.MM.yyyy HH:mm:ss");

 		dateChooser.setDate(vm.vl.getBegin());

-		dateChooser.setBounds(204, 404, 140, 20);

+		dateChooser.setBounds(204, 404, 132, 20);

 		contentPanel.add(dateChooser);

 		

 		JLabel lblNewLabel_1 = new JLabel("bis");

@@ -185,7 +181,7 @@ public class EingabeSystemDaten extends JDialog {
 		dateChooser_1 = new JDateChooser();

 		dateChooser_1.setDateFormatString("dd.MM.yyyy HH:mm:ss");

 		dateChooser_1.setDate(vm.vl.getEnd());

-		dateChooser_1.setBounds(388, 404, 140, 20);

+		dateChooser_1.setBounds(388, 404, 132, 20);

 		contentPanel.add(dateChooser_1);

 		

 		JButton btnHinzufgen = new JButton("Hinzuf\u00FCgen");

@@ -196,29 +192,36 @@ public class EingabeSystemDaten extends JDialog {
 				

 			}

 		});

-		btnHinzufgen.setBounds(326, 372, 118, 23);

+		btnHinzufgen.setBounds(402, 372, 118, 23);

 		contentPanel.add(btnHinzufgen);

 		shortDesc=new JTextArea();

+		shortDesc.setBorder(UIManager.getBorder("ComboBox.border"));

 		shortDesc.setFont(new Font("Tahoma", Font.PLAIN, 11));

 		shortDesc.setText(vm.vl.getShortDesc());

 		JScrollPane scrollPane = new JScrollPane(shortDesc);

-		scrollPane.setBounds(170, 67, 274, 63);

+		scrollPane.setBorder(null);

+		scrollPane.setBounds(170, 67, 350, 63);

 		contentPanel.add(scrollPane);

 		longDesc=new JTextArea();

+		longDesc.setBorder(UIManager.getBorder("TextField.border"));

 		longDesc.setFont(new Font("Tahoma", Font.PLAIN, 11));

 		longDesc.setText(vm.vl.getLongDesc());

 		JScrollPane scrollPane_1 = new JScrollPane(longDesc);

-		scrollPane_1.setBounds(170, 139, 274, 158);

+		scrollPane_1.setBorder(null);

+		scrollPane_1.setBounds(170, 139, 350, 158);

 		contentPanel.add(scrollPane_1);

-		comment=new JTextArea();

-		comment.setFont(new Font("Tahoma", Font.PLAIN, 11));

-		comment.setText(vm.vl.getComment());

-		JScrollPane scrollPane_2 = new JScrollPane(comment);

-		scrollPane_2.setBounds(170, 308, 274, 59);

+		JScrollPane scrollPane_2 = new JScrollPane();

+		scrollPane_2.setBorder(UIManager.getBorder("TextArea.border"));

+		scrollPane_2.setBounds(170, 308, 350, 59);

 		contentPanel.add(scrollPane_2);

+		

+		comment = new JTextArea();

+		comment.setFont(new Font("Tahoma", Font.PLAIN, 11));

+		comment.setBorder(UIManager.getBorder("TextField.border"));

+		scrollPane_2.setViewportView(comment);

 		{

 			JPanel buttonPane = new JPanel();

-			buttonPane.setBounds(0, 554, 567, 33);

+			buttonPane.setBounds(0, 630, 587, 33);

 			buttonPane.setBackground(SystemColor.menu);

 			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));

 			getContentPane().add(buttonPane);

@@ -272,11 +275,11 @@ public class EingabeSystemDaten extends JDialog {
 		}

 		

 		JSeparator separator = new JSeparator();

-		separator.setBounds(0, 547, 567, 2);

+		separator.setBounds(0, 617, 587, 2);

 		getContentPane().add(separator);

 		

 		JSeparator separator_1 = new JSeparator();

-		separator_1.setBounds(0, 82, 567, 2);

+		separator_1.setBounds(0, 82, 587, 2);

 		getContentPane().add(separator_1);

 		

 		JMenuBar menuBar = new JMenuBar();