From f4025bd62ecc5e0dfbf19c87f4e79fda199148e7 Mon Sep 17 00:00:00 2001 From: tspitzer Date: Thu, 17 Oct 2013 16:03:17 +0200 Subject: -Anpassen der Texte -Bug in SQL gefixt --- Dozentenmodul/src/GUI/ActionChooser.java | 34 +++++++++++++++---------- Dozentenmodul/src/GUI/AddOS.java | 5 +++- Dozentenmodul/src/GUI/AddSoftware.java | 4 ++- Dozentenmodul/src/GUI/EingabeAllgemein.java | 2 +- Dozentenmodul/src/GUI/EingabeSoftwareDaten.java | 2 +- Dozentenmodul/src/GUI/EingabeSystemDaten.java | 2 +- Dozentenmodul/src/GUI/FTPDownloader.java | 2 +- Dozentenmodul/src/GUI/FTPUploader.java | 2 +- Dozentenmodul/src/GUI/Freigabe.java | 2 +- Dozentenmodul/src/GUI/LoginWindow.java | 2 +- Dozentenmodul/src/GUI/Rechtsbelehrung.java | 17 +++++++------ Dozentenmodul/src/GUI/Summary.java | 5 +++- Dozentenmodul/src/GUI/getVMwarePlayer.java | 2 +- Dozentenmodul/src/GUI/searchRohling.java | 2 +- 14 files changed, 49 insertions(+), 34 deletions(-) (limited to 'Dozentenmodul/src/GUI') diff --git a/Dozentenmodul/src/GUI/ActionChooser.java b/Dozentenmodul/src/GUI/ActionChooser.java index d861e71e..631686bd 100644 --- a/Dozentenmodul/src/GUI/ActionChooser.java +++ b/Dozentenmodul/src/GUI/ActionChooser.java @@ -65,11 +65,11 @@ public class ActionChooser extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("Dozentenmodul"); + setTitle("Dozentenmodul *Prototyp*"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top=(screenSize.height - 545) / 2; - int left=(screenSize.width - 366) / 2; - setBounds(left, top, 545, 366); + int left=(screenSize.width - 381) / 2; + setBounds(left, top, 545, 381); //setBounds(100, 100, 545, 366); getContentPane().setLayout(null); { @@ -91,7 +91,7 @@ public class ActionChooser extends JFrame { txtpnBitteWhlenSie.setBounds(10, 36, 509, 42); panel.add(txtpnBitteWhlenSie); } - contentPanel.setBounds(10, 104, 509, 144); + contentPanel.setBounds(10, 104, 509, 165); contentPanel.setBackground(Color.WHITE); contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); getContentPane().add(contentPanel); @@ -112,29 +112,35 @@ public class ActionChooser extends JFrame { radioButton_1.setBounds(6, 7, 265, 23); contentPanel.add(radioButton_1); - JRadioButton radioButton_2 = new JRadioButton("Bearbeiten einer bestehenden VL"); - radioButton_2.setEnabled(false); - buttonGroup.add(radioButton_2); - radioButton_2.setBackground(Color.WHITE); - radioButton_2.setBounds(6, 53, 185, 23); - contentPanel.add(radioButton_2); + JRadioButton rdbtnEigenschaftenEinerVl = new JRadioButton("Eigenschaften einer VL \u00E4ndern"); + rdbtnEigenschaftenEinerVl.setEnabled(false); + buttonGroup.add(rdbtnEigenschaftenEinerVl); + rdbtnEigenschaftenEinerVl.setBackground(Color.WHITE); + rdbtnEigenschaftenEinerVl.setBounds(6, 53, 185, 23); + contentPanel.add(rdbtnEigenschaftenEinerVl); JRadioButton radioButton_3 = new JRadioButton("Kopieren einer bestehenden VL"); radioButton_3.setEnabled(false); buttonGroup.add(radioButton_3); radioButton_3.setBackground(Color.WHITE); - radioButton_3.setBounds(6, 76, 175, 23); + radioButton_3.setBounds(6, 105, 175, 23); contentPanel.add(radioButton_3); JRadioButton radioButton_4 = new JRadioButton("Verlinken einer bestehenden VL"); radioButton_4.setEnabled(false); buttonGroup.add(radioButton_4); radioButton_4.setBackground(Color.WHITE); - radioButton_4.setBounds(6, 102, 175, 23); + radioButton_4.setBounds(6, 131, 175, 23); contentPanel.add(radioButton_4); + + JRadioButton rdbtnInhaltEinerVl = new JRadioButton("Inhalt einer VL \u00E4ndern"); + rdbtnInhaltEinerVl.setEnabled(false); + rdbtnInhaltEinerVl.setBackground(Color.WHITE); + rdbtnInhaltEinerVl.setBounds(6, 79, 185, 23); + contentPanel.add(rdbtnInhaltEinerVl); { JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 272, 529, 33); + buttonPane.setBounds(0, 293, 529, 33); buttonPane.setBackground(SystemColor.menu); buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); getContentPane().add(buttonPane); @@ -162,7 +168,7 @@ public class ActionChooser extends JFrame { } { JSeparator separator = new JSeparator(); - separator.setBounds(0, 259, 529, 2); + separator.setBounds(0, 280, 529, 2); getContentPane().add(separator); } { diff --git a/Dozentenmodul/src/GUI/AddOS.java b/Dozentenmodul/src/GUI/AddOS.java index 386d7745..1642b05b 100644 --- a/Dozentenmodul/src/GUI/AddOS.java +++ b/Dozentenmodul/src/GUI/AddOS.java @@ -53,7 +53,7 @@ public class AddOS extends JFrame { @SuppressWarnings({ "rawtypes", "unchecked" }) public AddOS() { setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - setTitle("Dozentenmodul"); + setTitle("Dozentenmodul *Prototyp*"); try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); @@ -145,8 +145,11 @@ public class AddOS extends JFrame { Kosten=1; } Connection con=sql.getConnection(); + sql.AddOS(con, textField_1.getText().toString(), textField_2.getText().toString(), comboBox.getSelectedItem().toString(), Kosten, textField.getText().toString()); + dispose(); + } else { diff --git a/Dozentenmodul/src/GUI/AddSoftware.java b/Dozentenmodul/src/GUI/AddSoftware.java index 1539e1de..37a3a8bb 100644 --- a/Dozentenmodul/src/GUI/AddSoftware.java +++ b/Dozentenmodul/src/GUI/AddSoftware.java @@ -53,7 +53,7 @@ public class AddSoftware extends JFrame { @SuppressWarnings({ "rawtypes", "unchecked" }) public AddSoftware() { setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - setTitle("Dozentenmodul"); + setTitle("Dozentenmodul *Prototyp*"); try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); @@ -145,7 +145,9 @@ public class AddSoftware extends JFrame { Kosten=1; } Connection con=sql.getConnection(); + sql.AddSoftware(con, textField_1.getText().toString(), textField_2.getText().toString(), comboBox.getSelectedItem().toString(), Kosten, textField.getText().toString()); + dispose(); }else { diff --git a/Dozentenmodul/src/GUI/EingabeAllgemein.java b/Dozentenmodul/src/GUI/EingabeAllgemein.java index d81cd8bb..8c92966f 100644 --- a/Dozentenmodul/src/GUI/EingabeAllgemein.java +++ b/Dozentenmodul/src/GUI/EingabeAllgemein.java @@ -82,7 +82,7 @@ public class EingabeAllgemein extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("Dozentenmodul"); + setTitle("Dozentenmodul *Prototyp*"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top=(screenSize.height - 603) / 2; int left=(screenSize.width - 722) / 2; diff --git a/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java b/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java index 7cafaa38..d18c369a 100644 --- a/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java +++ b/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java @@ -77,7 +77,7 @@ public class EingabeSoftwareDaten extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("Dozentenmodul"); + setTitle("Dozentenmodul *Prototyp*"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top=(screenSize.height - 603) / 2; int left=(screenSize.width - 722) / 2; diff --git a/Dozentenmodul/src/GUI/EingabeSystemDaten.java b/Dozentenmodul/src/GUI/EingabeSystemDaten.java index 82391612..2a77b2a7 100644 --- a/Dozentenmodul/src/GUI/EingabeSystemDaten.java +++ b/Dozentenmodul/src/GUI/EingabeSystemDaten.java @@ -79,7 +79,7 @@ public class EingabeSystemDaten extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("Dozentenmodul"); + setTitle("Dozentenmodul *Prototyp*"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top=(screenSize.height - 603) / 2; int left=(screenSize.width - 722) / 2; diff --git a/Dozentenmodul/src/GUI/FTPDownloader.java b/Dozentenmodul/src/GUI/FTPDownloader.java index 3b053d7d..5d7ec8da 100644 --- a/Dozentenmodul/src/GUI/FTPDownloader.java +++ b/Dozentenmodul/src/GUI/FTPDownloader.java @@ -94,7 +94,7 @@ public class FTPDownloader extends JFrame implements PropertyChangeListener { //filename=name; setBackground(Color.WHITE); - setTitle("Downloader"); + setTitle("Dozentenmodul *Prototyp*"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top=(screenSize.height - 603) / 2; int left=(screenSize.width - 250) / 2; diff --git a/Dozentenmodul/src/GUI/FTPUploader.java b/Dozentenmodul/src/GUI/FTPUploader.java index 0ac05ad2..119f5b6c 100644 --- a/Dozentenmodul/src/GUI/FTPUploader.java +++ b/Dozentenmodul/src/GUI/FTPUploader.java @@ -106,7 +106,7 @@ public class FTPUploader extends JFrame implements PropertyChangeListener { //filename=name; setBackground(Color.WHITE); - setTitle("Uploader"); + setTitle("Dozentenmodul *Prototyp*"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top=(screenSize.height - 603) / 2; int left=(screenSize.width - 250) / 2; diff --git a/Dozentenmodul/src/GUI/Freigabe.java b/Dozentenmodul/src/GUI/Freigabe.java index 38c041f5..d720e9b4 100644 --- a/Dozentenmodul/src/GUI/Freigabe.java +++ b/Dozentenmodul/src/GUI/Freigabe.java @@ -71,7 +71,7 @@ public class Freigabe extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("Dozentenmodul"); + setTitle("Dozentenmodul *Prototyp*"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top=(screenSize.height - 603) / 2; int left=(screenSize.width - 722) / 2; diff --git a/Dozentenmodul/src/GUI/LoginWindow.java b/Dozentenmodul/src/GUI/LoginWindow.java index b97044b4..c187c3fb 100644 --- a/Dozentenmodul/src/GUI/LoginWindow.java +++ b/Dozentenmodul/src/GUI/LoginWindow.java @@ -70,7 +70,7 @@ public class LoginWindow extends JFrame { e.printStackTrace(); } //Titel des Fensters setzen - setTitle("Dozentenmodul"); + setTitle("Dozentenmodul *Prototyp*"); //Aktion die beim Schließen durchgeführt werden soll setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); //Größe des Fensters definieren diff --git a/Dozentenmodul/src/GUI/Rechtsbelehrung.java b/Dozentenmodul/src/GUI/Rechtsbelehrung.java index a7bb644b..4728e8a3 100644 --- a/Dozentenmodul/src/GUI/Rechtsbelehrung.java +++ b/Dozentenmodul/src/GUI/Rechtsbelehrung.java @@ -66,11 +66,12 @@ public class Rechtsbelehrung extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("Dozentenmodul"); + setTitle("Dozentenmodul *Prototyp*"); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top=(screenSize.height - 545) / 2; - int left=(screenSize.width - 366) / 2; - setBounds(left, top, 545, 366); + int left=(screenSize.width - 381) / 2; + setBounds(left, top, 545, 381); //setBounds(100, 100, 545, 366); getContentPane().setLayout(null); { @@ -92,7 +93,7 @@ public class Rechtsbelehrung extends JFrame { txtpnBitteWhlenSie.setBounds(10, 36, 509, 33); panel.add(txtpnBitteWhlenSie); } - contentPanel.setBounds(10, 104, 509, 124); + contentPanel.setBounds(10, 104, 509, 135); contentPanel.setBackground(Color.WHITE); contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); getContentPane().add(contentPanel); @@ -100,11 +101,11 @@ public class Rechtsbelehrung extends JFrame { JTextPane txtpnJaIchBin = new JTextPane(); txtpnJaIchBin.setText("Ja, ich bin verantwortlich f\u00FCr die in meiner VL genutzen Lizenzen."); - txtpnJaIchBin.setBounds(10, 11, 489, 102); + txtpnJaIchBin.setBounds(10, 11, 489, 113); contentPanel.add(txtpnJaIchBin); { JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 272, 529, 33); + buttonPane.setBounds(0, 289, 529, 33); buttonPane.setBackground(SystemColor.menu); buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); getContentPane().add(buttonPane); @@ -131,7 +132,7 @@ public class Rechtsbelehrung extends JFrame { } { JSeparator separator = new JSeparator(); - separator.setBounds(0, 259, 529, 2); + separator.setBounds(0, 276, 529, 2); getContentPane().add(separator); } { @@ -141,7 +142,7 @@ public class Rechtsbelehrung extends JFrame { } chckbxAkzeptieren = new JCheckBox("Akzeptieren"); - chckbxAkzeptieren.setBounds(6, 229, 97, 23); + chckbxAkzeptieren.setBounds(0, 246, 97, 23); getContentPane().add(chckbxAkzeptieren); JMenuBar menuBar = new JMenuBar(); diff --git a/Dozentenmodul/src/GUI/Summary.java b/Dozentenmodul/src/GUI/Summary.java index f0955510..ff81a6c4 100644 --- a/Dozentenmodul/src/GUI/Summary.java +++ b/Dozentenmodul/src/GUI/Summary.java @@ -65,7 +65,7 @@ public class Summary extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("Dozentenmodul"); + setTitle("Dozentenmodul *Prototyp*"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top=(screenSize.height - 603) / 2; int left=(screenSize.width - 722) / 2; @@ -312,6 +312,7 @@ public class Summary extends JFrame { panel_1.add(scrollPane_3); JTextArea textArea_comment = new JTextArea(); + textArea_comment.setFont(new Font("Tahoma", Font.PLAIN, 11)); textArea_comment.setText(vm.vl.getComment()); scrollPane_3.setViewportView(textArea_comment); textArea_comment.setEditable(false); @@ -325,6 +326,7 @@ public class Summary extends JFrame { panel_1.add(scrollPane_2); JTextArea textArea_long = new JTextArea(); + textArea_long.setFont(new Font("Tahoma", Font.PLAIN, 11)); textArea_long.setText(vm.vl.getLongDesc()); scrollPane_2.setViewportView(textArea_long); textArea_long.setEditable(false); @@ -338,6 +340,7 @@ public class Summary extends JFrame { panel_1.add(scrollPane_1); JTextArea textArea_short = new JTextArea(); + textArea_short.setFont(new Font("Tahoma", Font.PLAIN, 11)); textArea_short.setText(vm.vl.getShortDesc()); scrollPane_1.setViewportView(textArea_short); textArea_short.setEditable(false); diff --git a/Dozentenmodul/src/GUI/getVMwarePlayer.java b/Dozentenmodul/src/GUI/getVMwarePlayer.java index fbd20732..ad6ae894 100644 --- a/Dozentenmodul/src/GUI/getVMwarePlayer.java +++ b/Dozentenmodul/src/GUI/getVMwarePlayer.java @@ -66,7 +66,7 @@ public class getVMwarePlayer extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("Dozentenmodul"); + setTitle("Dozentenmodul *Prototyp*"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top=(screenSize.height - 603) / 2; int left=(screenSize.width - 722) / 2; diff --git a/Dozentenmodul/src/GUI/searchRohling.java b/Dozentenmodul/src/GUI/searchRohling.java index a234f26c..13182a65 100644 --- a/Dozentenmodul/src/GUI/searchRohling.java +++ b/Dozentenmodul/src/GUI/searchRohling.java @@ -78,7 +78,7 @@ public class searchRohling extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("Dozentenmodul"); + setTitle("Dozentenmodul *Prototyp*"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top=(screenSize.height - 603) / 2; int left=(screenSize.width - 722) / 2; -- cgit v1.2.3-55-g7522