summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java
diff options
context:
space:
mode:
authorNino Breuer2014-10-01 14:13:29 +0200
committerNino Breuer2014-10-01 14:13:29 +0200
commitfb9161dff5099ed09d556ced23fc18bbd13fed62 (patch)
tree7932173e1829b4418c82a6c01341d34197c796a5 /dozentenmodul/src/main/java
parentMerge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff)
downloadtutor-module-fb9161dff5099ed09d556ced23fc18bbd13fed62.tar.gz
tutor-module-fb9161dff5099ed09d556ced23fc18bbd13fed62.tar.xz
tutor-module-fb9161dff5099ed09d556ced23fc18bbd13fed62.zip
• added warning for 'back' on ftp upload task
• enabled and implemented radio buttons for vmchooser userlist
Diffstat (limited to 'dozentenmodul/src/main/java')
-rw-r--r--dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java23
-rw-r--r--dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java25
-rw-r--r--dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java29
-rw-r--r--dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java59
4 files changed, 98 insertions, 38 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index 754a5d63..943844f0 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -372,7 +372,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();
@@ -448,9 +448,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/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
index ef9dab15..a1cf16a0 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
@@ -297,28 +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 btnAddVmUser = new JButton("Hinzufügen");
+ 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);
@@ -357,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 f356d3dd..9c78b6d2 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
@@ -285,32 +285,32 @@ public class PermissionEditLecture_GUI extends JFrame {
panel_2.setBounds(331, 207, 236, 313);
contentPanel.add(panel_2);
- JScrollPane scrollPane_1 = new JScrollPane();
+ 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 radioButton = new JRadioButton("Sichtbar für alle");
- radioButton.setSelected(true);
- radioButton.setEnabled(false);
- radioButton.setBounds(6, 27, 109, 23);
- panel_2.add(radioButton);
-
- JRadioButton radioButton_1 = new JRadioButton("Individuell");
- radioButton_1.setEnabled(false);
- radioButton_1.setBounds(6, 53, 109, 23);
- panel_2.add(radioButton_1);
-
- JButton button_2 = new JButton("Hinzufügen");
- button_2.setEnabled(false);
- button_2.setBounds(23, 279, 89, 23);
- panel_2.add(button_2);
-
- JButton button_3 = new JButton("Löschen");
- button_3.setEnabled(false);
- button_3.setBounds(122, 279, 89, 23);
- panel_2.add(button_3);
+ 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);
@@ -349,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);