diff options
7 files changed, 158 insertions, 43 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java index 62937f60..743d9165 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java @@ -371,7 +371,7 @@ public class FTPCreateUploader_GUI extends JFrame implements } }); btnUploadStoppen.setEnabled(false); - btnUploadStoppen.setBounds(318, 200, 173, 23); + btnUploadStoppen.setBounds(307, 200, 173, 23); contentPanel.add(btnUploadStoppen); { JPanel buttonPane = new JPanel(); @@ -447,9 +447,24 @@ public class FTPCreateUploader_GUI extends JFrame implements }// end if choice } else { - dispose(); - PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(); - m.setVisible(true); + + int selectedOption = JOptionPane.showConfirmDialog(null, + "<html>Achtung: Alle Änderungen gehen verloren!<br />Klicken Sie auf fertigstellen, wenn Sie die Änderungen dauerhaft speichern möchten.<br /><br />Möchten Sie jetzt abbrechen und zurück?</html>", + "Abbrechen und zurück", + JOptionPane.YES_NO_OPTION); + if (selectedOption == JOptionPane.YES_OPTION) + { + dispose(); + PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(); + m.setVisible(true); + } + else + { + //for actions if "no" is selected. tbd. + } + + + }// end else }// end action }); diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java index ec97287f..a1465a86 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java @@ -275,7 +275,7 @@ public class FTPEditUploader_GUI extends JFrame implements panel.setBounds(10, 11, 577, 57); contentPanel.add(panel); - JLabel lblUploadIhresImage = new JLabel("Upload Ihres Image"); + JLabel lblUploadIhresImage = new JLabel("Upload Ihres Images"); lblUploadIhresImage.setFont(new Font("Tahoma", Font.BOLD, 18)); lblUploadIhresImage.setBounds(10, 11, 509, 22); panel.add(lblUploadIhresImage); @@ -354,7 +354,7 @@ public class FTPEditUploader_GUI extends JFrame implements }); btnUploadStoppen.setEnabled(false); - btnUploadStoppen.setBounds(301, 200, 173, 23); + btnUploadStoppen.setBounds(307, 200, 173, 23); contentPanel.add(btnUploadStoppen); { JPanel buttonPane = new JPanel(); @@ -429,9 +429,24 @@ public class FTPEditUploader_GUI extends JFrame implements }// end if coice } else { - dispose(); - PermissionEditImage_GUI ei = new PermissionEditImage_GUI(); - ei.setVisible(true); + + + int selectedOption = JOptionPane.showConfirmDialog(null, + "<html>Achtung: Alle Änderungen gehen verloren!<br />Klicken Sie auf fertigstellen, wenn Sie die Änderungen dauerhaft speichern möchten.<br /><br />Möchten Sie jetzt abbrechen und zurück?</html>", + "Abbrechen und zurück", + JOptionPane.YES_NO_OPTION); + if (selectedOption == JOptionPane.YES_OPTION) + { + dispose(); + PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(); + m.setVisible(true); + } + else + { + //for actions if "no" is selected. tbd. + } + + }// end else }// end action }); diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java index 64c76bed..fe2b5017 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java @@ -295,7 +295,7 @@ public class SearchImage_GUI extends JFrame { @Override
public void keyReleased(KeyEvent e) {
// Textfield eingabe auslesen
- String stext = textFieldName.getText();
+ String stext = textFieldName.getText().trim();
// Wenn Textfield nicht leer
if (stext != "") {
@@ -307,8 +307,8 @@ public class SearchImage_GUI extends JFrame { textFieldName.getText(), 0));
rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
textFieldName.getText(), 0));
-
- } else {
+
+ } else { //refresh list (deprecated, remove tabfolder)
activeSearch = false;
String username = person.verantwortlicher.getName() + " "
+ person.verantwortlicher.getVorname();
diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java index 31d9d60b..a20daa55 100644 --- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java @@ -36,6 +36,8 @@ import thrift.ThriftConnection; import util.GuiOrganizer; import util.ResourceLoader; import config.Config; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; @SuppressWarnings("serial") public class Login_GUI extends JFrame { @@ -51,6 +53,7 @@ public class Login_GUI extends JFrame { JLabel lblConnectionInfo = new JLabel(""); boolean isClientReturnedCorrectly = false; JCheckBox chckbxBenutzernameSpeichern; + private static final String HELP_MESSAGE = ""; /** * Create the frame. @@ -196,6 +199,7 @@ public class Login_GUI extends JFrame { // Sanity checks if (result.authToken == null || result.sessionId == null) { setStatus(Color.red, "Antwort des Masterservers korrupt.", null); + LOGGER.info("Antwort des Masterservers korrupt"); return; } diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java index c86bfe4c..21b5dcda 100644 --- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java @@ -19,13 +19,8 @@ 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.io.InputStream; -import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; -import java.net.URL; -import java.util.HashMap; import javax.swing.ButtonGroup; import javax.swing.JButton; @@ -46,25 +41,18 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; - -import org.xml.sax.SAXException; -import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; import models.ImageRights; import models.Links; import models.SessionData; import models.person; + +import org.apache.log4j.Logger; + import util.GuiOrganizer; import util.News; -import util.ResourceLoader; import util.OpenLinks; +import util.ResourceLoader; @SuppressWarnings("serial") public class MainMenue_GUI extends JFrame { @@ -86,6 +74,9 @@ public class MainMenue_GUI extends JFrame { JRadioButton rdbtnLectureSearch; private final ButtonGroup buttonGroup = new ButtonGroup(); private JMenuItem mntmAbout; + + private static final String HELP_MESSAGE = "<html>Bitte wählen Sie aus, was Sie anlegen möchten.<br /> " + + "Sie können </html>"; // for testing ImageRights imageRights = new ImageRights(); @@ -441,6 +432,19 @@ public class MainMenue_GUI extends JFrame { JMenu mnNewMenu_1 = new JMenu("Hilfe"); menuBar.add(mnNewMenu_1); + + //Template for Help-Buttons + /* + JMenu mnNewMenu_Info = new JMenu("Info"); + mnNewMenu_Info.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + JOptionPane.showMessageDialog(null, HELP_MESSAGE, "Hilfe zu dieser Oberfläche", JOptionPane.INFORMATION_MESSAGE); + } + }); + menuBar.add(mnNewMenu_Info); + * + */ JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @@ -482,6 +486,7 @@ public class MainMenue_GUI extends JFrame { } }); mnNewMenu_1.add(mntmAbout); + }// end main diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java index b62ed49d..a1cf16a0 100644 --- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java @@ -128,7 +128,7 @@ public class PermissionCreateLecture_GUI extends JFrame { getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel("Veranstaltungen - Berechtigungen (Nur zur Veranschaulichung)"); + JLabel lblNewLabel = new JLabel("Veranstaltung - Berechtigungen (Nur zur Veranschaulichung)"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); @@ -287,7 +287,7 @@ public class PermissionCreateLecture_GUI extends JFrame { panel_2.setBorder(new TitledBorder(null, "Sichtbarkeit im VMChooser", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_2.setBackground(SystemColor.menu); - JScrollPane scrollPane_1 = new JScrollPane(); + final JScrollPane scrollPane_1 = new JScrollPane(); scrollPane_1.setEnabled(false); scrollPane_1.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); scrollPane_1.setBounds(23, 83, 203, 185); @@ -297,27 +297,25 @@ public class PermissionCreateLecture_GUI extends JFrame { scrollPane_1.setViewportView(table_1); JRadioButton rdbtnAlle = new JRadioButton("Sichtbar für alle"); - rdbtnAlle.setEnabled(false); rdbtnAlle.setSelected(true); buttonGroup.add(rdbtnAlle); rdbtnAlle.setBounds(6, 27, 109, 23); panel_2.add(rdbtnAlle); JRadioButton rdbtnIndividuell = new JRadioButton("Individuell"); - rdbtnIndividuell.setEnabled(false); buttonGroup.add(rdbtnIndividuell); rdbtnIndividuell.setBounds(6, 53, 109, 23); panel_2.add(rdbtnIndividuell); - JButton btnHinzufgen = new JButton("Hinzufügen"); - btnHinzufgen.setEnabled(false); - btnHinzufgen.setBounds(23, 279, 89, 23); - panel_2.add(btnHinzufgen); + final JButton btnAddVmUser = new JButton("Hinzufügen"); + btnAddVmUser.setEnabled(false); + btnAddVmUser.setBounds(23, 279, 89, 23); + panel_2.add(btnAddVmUser); - JButton btnLschen = new JButton("Löschen"); - btnLschen.setEnabled(false); - btnLschen.setBounds(122, 279, 89, 23); - panel_2.add(btnLschen); + final JButton btnDelVmUser = new JButton("Löschen"); + btnDelVmUser.setEnabled(false); + btnDelVmUser.setBounds(122, 279, 89, 23); + panel_2.add(btnDelVmUser); { JPanel buttonPane = new JPanel(); buttonPane.setBounds(0, 640, 597, 33); @@ -356,6 +354,22 @@ public class PermissionCreateLecture_GUI extends JFrame { } } + rdbtnAlle.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + scrollPane_1.setEnabled(false); + btnAddVmUser.setEnabled(false); + btnDelVmUser.setEnabled(false); + } + }); + + rdbtnIndividuell.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + scrollPane_1.setEnabled(true); + btnAddVmUser.setEnabled(true); + btnDelVmUser.setEnabled(true); + } + }); + JSeparator separator = new JSeparator(); separator.setBounds(0, 78, 597, 2); getContentPane().add(separator); diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java index e66a2929..9c78b6d2 100644 --- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java @@ -62,6 +62,7 @@ import javax.swing.JTextField; import org.eclipse.jface.viewers.CheckboxCellEditor; import java.awt.Choice; +import javax.swing.JRadioButton; @SuppressWarnings("serial") public class PermissionEditLecture_GUI extends JFrame { @@ -177,14 +178,14 @@ public class PermissionEditLecture_GUI extends JFrame { JPanel panel_1 = new JPanel(); panel_1.setBackground(SystemColor.menu); - panel_1.setBorder(new TitledBorder(null, "Berechtigungen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 207, 557, 313); + panel_1.setBorder(new TitledBorder(null, "Suite-Berechtigungen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBounds(10, 207, 311, 313); contentPanel.add(panel_1); panel_1.setLayout(null); JScrollPane scrollPane = new JScrollPane(); scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); - scrollPane.setBounds(10, 21, 537, 281); + scrollPane.setBounds(10, 21, 291, 249); panel_1.add(scrollPane); table = new JTable(); @@ -218,6 +219,16 @@ public class PermissionEditLecture_GUI extends JFrame { */ scrollPane.setViewportView(table); + JButton button = new JButton("Hinzufügen"); + button.setEnabled(false); + button.setBounds(10, 279, 89, 23); + panel_1.add(button); + + JButton button_1 = new JButton("Löschen"); + button_1.setEnabled(false); + button_1.setBounds(109, 279, 89, 23); + panel_1.add(button_1); + JLabel lblHauptmen = new JLabel("Hauptmenü"); lblHauptmen.addMouseListener(new MouseAdapter() { @Override @@ -266,6 +277,40 @@ public class PermissionEditLecture_GUI extends JFrame { comboBox.setModel(new DefaultComboBoxModel(new String[] {"Hochschule Offenburg", "Hochschule Reutlingen", "Universität Freiburg"})); comboBox.setBounds(365, 36, 202, 20); contentPanel.add(comboBox); + + JPanel panel_2 = new JPanel(); + panel_2.setLayout(null); + panel_2.setBorder(new TitledBorder(null, "Sichtbarkeit im VMChooser", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_2.setBackground(SystemColor.menu); + panel_2.setBounds(331, 207, 236, 313); + contentPanel.add(panel_2); + + final JScrollPane scrollPane_1 = new JScrollPane(); + scrollPane_1.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); + scrollPane_1.setEnabled(false); + scrollPane_1.setBounds(23, 83, 203, 185); + panel_2.add(scrollPane_1); + + JRadioButton rdbtnAlle = new JRadioButton("Sichtbar für alle"); + rdbtnAlle.setSelected(true); + rdbtnAlle.setEnabled(false); + rdbtnAlle.setBounds(6, 27, 109, 23); + panel_2.add(rdbtnAlle); + + JRadioButton rdbtnIndividuell = new JRadioButton("Individuell"); + rdbtnIndividuell.setEnabled(false); + rdbtnIndividuell.setBounds(6, 53, 109, 23); + panel_2.add(rdbtnIndividuell); + + final JButton btnAddVmUser = new JButton("Hinzufügen"); + btnAddVmUser.setEnabled(false); + btnAddVmUser.setBounds(23, 279, 89, 23); + panel_2.add(btnAddVmUser); + + final JButton btnDelVmUser = new JButton("Löschen"); + btnDelVmUser.setEnabled(false); + btnDelVmUser.setBounds(122, 279, 89, 23); + panel_2.add(btnDelVmUser); { JPanel buttonPane = new JPanel(); buttonPane.setBounds(0, 640, 597, 33); @@ -304,6 +349,23 @@ public class PermissionEditLecture_GUI extends JFrame { } } + + rdbtnAlle.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + scrollPane_1.setEnabled(false); + btnAddVmUser.setEnabled(false); + btnDelVmUser.setEnabled(false); + } + }); + + rdbtnIndividuell.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + scrollPane_1.setEnabled(true); + btnAddVmUser.setEnabled(true); + btnDelVmUser.setEnabled(true); + } + }); + JSeparator separator = new JSeparator(); separator.setBounds(0, 78, 597, 2); getContentPane().add(separator); |