summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNino Breuer2014-10-10 16:07:17 +0200
committerNino Breuer2014-10-10 16:07:17 +0200
commita781d8d8d98946896064fda2dcf4903458dc6b22 (patch)
tree387e63737164a59dbdb73671f73d2cbc48fbce9b
parentRemoved wrong field values (lecture name was set to image name) (diff)
downloadtutor-module-a781d8d8d98946896064fda2dcf4903458dc6b22.tar.gz
tutor-module-a781d8d8d98946896064fda2dcf4903458dc6b22.tar.xz
tutor-module-a781d8d8d98946896064fda2dcf4903458dc6b22.zip
changed position of gui element (image-->lecture)
Diffstat
-rw-r--r--dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java18
-rw-r--r--dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java16
-rw-r--r--dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java143
-rw-r--r--dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java31
4 files changed, 89 insertions, 119 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
index d768874a..164595af 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
@@ -108,8 +108,6 @@ public class PermissionCreateImage_GUI extends JFrame {
private JLabel lblWriteDesc;
private JLabel lblAdminDesc;
private JLabel lblLinkallowedDesc;
- private JCheckBox chckbxFrAlleSichtbar;
- private JLabel lblFuerAlleSichtbar;
private static final String HELP_MESSAGE = "<html><div align=\"center\">" +
"Legen Sie fest, welche Personen welche Rechte an Ihrem Image haben.<br />" +
"Sie können die Rechte read, write, link und admin vergeben.<br />" +
@@ -182,14 +180,14 @@ public class PermissionCreateImage_GUI extends JFrame {
panel_1.setBackground(SystemColor.menu);
panel_1.setBorder(new TitledBorder(null, "Berechtigungen",
TitledBorder.LEADING, TitledBorder.TOP, null, null));
- panel_1.setBounds(10, 228, 557, 292);
+ panel_1.setBounds(10, 202, 557, 318);
contentPanel.add(panel_1);
panel_1.setLayout(null);
JScrollPane scrollPane = new JScrollPane();
scrollPane
.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
- scrollPane.setBounds(10, 21, 537, 170);
+ scrollPane.setBounds(10, 21, 537, 195);
panel_1.add(scrollPane);
table = new JTable();
@@ -319,7 +317,7 @@ public class PermissionCreateImage_GUI extends JFrame {
panel.setBorder(new TitledBorder(null, "Freigabe",
TitledBorder.LEADING, TitledBorder.TOP, null, null));
panel.setBackground(SystemColor.menu);
- panel.setBounds(10, 201, 537, 80);
+ panel.setBounds(10, 227, 537, 80);
panel_1.add(panel);
JLabel label = new JLabel("Freigabemodus:");
@@ -390,7 +388,7 @@ public class PermissionCreateImage_GUI extends JFrame {
panel_2.setBackground(SystemColor.menu);
panel_2.setBorder(new TitledBorder(null, "Beschreibung",
TitledBorder.LEADING, TitledBorder.TOP, null, null));
- panel_2.setBounds(10, 67, 557, 150);
+ panel_2.setBounds(10, 67, 557, 124);
contentPanel.add(panel_2);
panel_2.setLayout(null);
@@ -429,14 +427,6 @@ public class PermissionCreateImage_GUI extends JFrame {
"Erzeugung einer Veranstaltung auf ein Image ist erlaubt.");
lblLinkallowedDesc.setBounds(120, 58, 380, 20);
panel_2.add(lblLinkallowedDesc);
-
- chckbxFrAlleSichtbar = new JCheckBox("");
- chckbxFrAlleSichtbar.setBounds(115, 119, 21, 23);
- panel_2.add(chckbxFrAlleSichtbar);
-
- lblFuerAlleSichtbar = new JLabel("Für alle sichtbar");
- lblFuerAlleSichtbar.setBounds(20, 120, 90, 20);
- panel_2.add(lblFuerAlleSichtbar);
{
JPanel buttonPane = new JPanel();
buttonPane.setBounds(0, 640, 597, 33);
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
index a8ddaf03..de7e4129 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
@@ -146,14 +146,14 @@ public class PermissionEditImage_GUI extends JFrame {
panel_1.setBackground(SystemColor.menu);
panel_1.setBorder(new TitledBorder(null, "Berechtigungen",
TitledBorder.LEADING, TitledBorder.TOP, null, null));
- panel_1.setBounds(10, 228, 557, 292);
+ panel_1.setBounds(10, 202, 557, 318);
contentPanel.add(panel_1);
panel_1.setLayout(null);
JScrollPane scrollPane = new JScrollPane();
scrollPane
.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
- scrollPane.setBounds(10, 21, 537, 170);
+ scrollPane.setBounds(10, 21, 537, 195);
panel_1.add(scrollPane);
table = new JTable();
@@ -201,7 +201,7 @@ public class PermissionEditImage_GUI extends JFrame {
panel_2.setLayout(null);
panel_2.setBorder(new TitledBorder(null, "Freigabe", TitledBorder.LEADING, TitledBorder.TOP, null, null));
panel_2.setBackground(SystemColor.menu);
- panel_2.setBounds(10, 201, 537, 80);
+ panel_2.setBounds(10, 227, 537, 80);
panel_1.add(panel_2);
JLabel label_7 = new JLabel("Freigabemodus:");
@@ -266,7 +266,7 @@ public class PermissionEditImage_GUI extends JFrame {
contentPanel.add(comboBox);
JPanel panel = new JPanel();
- panel.setBounds(10, 67, 557, 150);
+ panel.setBounds(10, 67, 557, 124);
contentPanel.add(panel);
panel.setLayout(null);
panel.setBorder(new TitledBorder(null, "Beschreibung",
@@ -306,14 +306,6 @@ public class PermissionEditImage_GUI extends JFrame {
lblvolleRechteRead = new JLabel("<HTML>Volle Rechte: read, write, löschen, Link und<br>Berechtigungen für andere Benutzer festlegen.</HTML>");
lblvolleRechteRead.setBounds(120, 78, 380, 40);
panel.add(lblvolleRechteRead);
-
- JLabel label_4 = new JLabel("Für alle sichtbar");
- label_4.setBounds(20, 120, 90, 20);
- panel.add(label_4);
-
- JCheckBox checkBox = new JCheckBox("");
- checkBox.setBounds(115, 120, 21, 23);
- panel.add(checkBox);
{
JPanel buttonPane = new JPanel();
buttonPane.setBounds(0, 640, 597, 33);
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
index 74df74ff..8f51d17a 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
@@ -59,8 +59,8 @@ public class PermissionCreateLecture_GUI extends JFrame {
private final JPanel contentPanel = new JPanel();
String[] result;
- private JTable table;
private Class[] classes;
+ private JTable table;
Object[] titles = { "Name","Read", "Write","Admin"};
Component c = null;
private static final String HELP_MESSAGE = "<html><div align=\"center\">" +
@@ -92,7 +92,6 @@ public class PermissionCreateLecture_GUI extends JFrame {
};
private JTextField textField;
- private JTable table_1;
private final ButtonGroup buttonGroup = new ButtonGroup();
public PermissionCreateLecture_GUI(Component formerGUI) {
@@ -142,26 +141,8 @@ public class PermissionCreateLecture_GUI extends JFrame {
contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
getContentPane().add(contentPanel);
contentPanel.setLayout(null);
-
- JPanel panel_1 = new JPanel();
- panel_1.setBackground(SystemColor.menu);
- 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, 291, 249);
- panel_1.add(scrollPane);
-
- table = new JTable();
- table.setModel(model);
- table.setSelectionForeground(Color.WHITE);
Object[] rowdata={"Max Mustermann", new Boolean(false),new Boolean(false),new Boolean(false),new Boolean(false)};
model.addRow(rowdata);
-
- TableCellRenderer rend=table.getTableHeader().getDefaultRenderer();
TableColumn tc1 = table.getColumnModel().getColumn(1);
@@ -178,23 +159,10 @@ public class PermissionCreateLecture_GUI extends JFrame {
tc3.setCellEditor(table.getDefaultEditor(Boolean.class));
tc3.setCellRenderer(table.getDefaultRenderer(Boolean.class));
tc3.setHeaderRenderer(new CheckBoxHeader(new MyItemListener3(),(String) titles[3]));
- /*
- TableColumn tc4 = table.getColumnModel().getColumn(4);
- tc4.setCellEditor(table.getDefaultEditor(Boolean.class));
- tc4.setCellRenderer(table.getDefaultRenderer(Boolean.class));
- tc4.setHeaderRenderer(new CheckBoxHeader(new MyItemListener4(),(String) titles[4]));
- */
- scrollPane.setViewportView(table);
-
- JButton btnHinzufgen_1 = new JButton("Hinzufügen");
- btnHinzufgen_1.setEnabled(false);
- btnHinzufgen_1.setBounds(10, 279, 89, 23);
- panel_1.add(btnHinzufgen_1);
-
- JButton btnLschen_1 = new JButton("Löschen");
- btnLschen_1.setEnabled(false);
- btnLschen_1.setBounds(109, 279, 89, 23);
- panel_1.add(btnLschen_1);
+
+ tc1.setHeaderRenderer(new CheckBoxHeader(new MyItemListener1(),(String) titles[1]));
+ tc2.setHeaderRenderer(new CheckBoxHeader(new MyItemListener2(),(String) titles[2]));
+ tc3.setHeaderRenderer(new CheckBoxHeader(new MyItemListener3(),(String) titles[3]));
JLabel lblHauptmen = new JLabel("Hauptmenü");
lblHauptmen.addMouseListener(new MouseAdapter() {
@@ -246,7 +214,7 @@ public class PermissionCreateLecture_GUI extends JFrame {
contentPanel.add(comboBox);
JPanel panel = new JPanel();
- panel.setBounds(10, 67, 557, 129);
+ panel.setBounds(10, 67, 557, 148);
contentPanel.add(panel);
panel.setLayout(null);
panel.setBorder(new TitledBorder(null, "Beschreibung", TitledBorder.LEADING, TitledBorder.TOP, null, null));
@@ -276,42 +244,69 @@ public class PermissionCreateLecture_GUI extends JFrame {
lblvolleRechteRead.setBounds(120, 78, 380, 40);
panel.add(lblvolleRechteRead);
+ JCheckBox checkBox = new JCheckBox("");
+ checkBox.setBounds(115, 118, 21, 23);
+ panel.add(checkBox);
+
+ JLabel label_4 = new JLabel("Für alle sichtbar");
+ label_4.setBounds(20, 119, 90, 20);
+ panel.add(label_4);
+
+ JPanel panel_1 = new JPanel();
+ panel_1.setLayout(null);
+ panel_1.setBorder(new TitledBorder(null, "Suite-Berechtigungen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+ panel_1.setBackground(SystemColor.menu);
+ panel_1.setBounds(10, 226, 311, 294);
+ contentPanel.add(panel_1);
+
+ JScrollPane scrollPane = new JScrollPane();
+ scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+ scrollPane.setBounds(10, 28, 291, 223);
+ panel_1.add(scrollPane);
+
+ JButton button = new JButton("Hinzufügen");
+ button.setEnabled(false);
+ button.setBounds(10, 260, 89, 23);
+ panel_1.add(button);
+
+ JButton button_1 = new JButton("Löschen");
+ button_1.setEnabled(false);
+ button_1.setBounds(109, 260, 89, 23);
+ panel_1.add(button_1);
+
JPanel panel_2 = new JPanel();
- panel_2.setBounds(331, 207, 236, 313);
- contentPanel.add(panel_2);
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, 226, 236, 294);
+ contentPanel.add(panel_2);
- final JScrollPane scrollPane_1 = new JScrollPane();
- scrollPane_1.setEnabled(false);
+ JScrollPane scrollPane_1 = new JScrollPane();
scrollPane_1.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
- scrollPane_1.setBounds(23, 83, 203, 185);
+ scrollPane_1.setEnabled(false);
+ scrollPane_1.setBounds(23, 88, 203, 161);
panel_2.add(scrollPane_1);
- table_1 = new JTable();
- scrollPane_1.setViewportView(table_1);
-
- JRadioButton rdbtnAlle = new JRadioButton("Sichtbar für alle");
- rdbtnAlle.setSelected(true);
- buttonGroup.add(rdbtnAlle);
- rdbtnAlle.setBounds(6, 27, 109, 23);
- panel_2.add(rdbtnAlle);
-
- JRadioButton rdbtnIndividuell = new JRadioButton("Individuell");
- buttonGroup.add(rdbtnIndividuell);
- 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);
+ JRadioButton radioButton = new JRadioButton("Sichtbar für alle");
+ radioButton.setSelected(true);
+ radioButton.setEnabled(false);
+ radioButton.setBounds(6, 32, 109, 23);
+ panel_2.add(radioButton);
+
+ JRadioButton radioButton_1 = new JRadioButton("Individuell");
+ radioButton_1.setEnabled(false);
+ radioButton_1.setBounds(6, 58, 109, 23);
+ panel_2.add(radioButton_1);
+
+ JButton button_2 = new JButton("Hinzufügen");
+ button_2.setEnabled(false);
+ button_2.setBounds(23, 260, 89, 23);
+ panel_2.add(button_2);
+
+ JButton button_3 = new JButton("Löschen");
+ button_3.setEnabled(false);
+ button_3.setBounds(122, 260, 89, 23);
+ panel_2.add(button_3);
{
JPanel buttonPane = new JPanel();
buttonPane.setBounds(0, 640, 597, 33);
@@ -350,22 +345,6 @@ 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 c146d42b..f0a1231e 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
@@ -48,6 +48,7 @@ import javax.swing.table.TableColumn;
import models.Links;
import util.OpenLinks;
+import javax.swing.JCheckBox;
@SuppressWarnings("serial")
public class PermissionEditLecture_GUI extends JFrame {
@@ -140,7 +141,7 @@ public class PermissionEditLecture_GUI extends JFrame {
panel.setLayout(null);
panel.setBorder(new TitledBorder(null, "Beschreibung", TitledBorder.LEADING, TitledBorder.TOP, null, null));
panel.setBackground(SystemColor.menu);
- panel.setBounds(10, 67, 557, 129);
+ panel.setBounds(10, 67, 557, 148);
contentPanel.add(panel);
JLabel label = new JLabel("Read");
@@ -167,16 +168,24 @@ public class PermissionEditLecture_GUI extends JFrame {
label_7.setBounds(120, 78, 380, 40);
panel.add(label_7);
+ JLabel label_8 = new JLabel("Für alle sichtbar");
+ label_8.setBounds(20, 119, 90, 20);
+ panel.add(label_8);
+
+ JCheckBox checkBox = new JCheckBox("");
+ checkBox.setBounds(115, 118, 21, 23);
+ panel.add(checkBox);
+
JPanel panel_1 = new JPanel();
panel_1.setBackground(SystemColor.menu);
panel_1.setBorder(new TitledBorder(null, "Suite-Berechtigungen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
- panel_1.setBounds(10, 207, 311, 313);
+ panel_1.setBounds(10, 226, 311, 294);
contentPanel.add(panel_1);
panel_1.setLayout(null);
JScrollPane scrollPane = new JScrollPane();
scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
- scrollPane.setBounds(10, 21, 291, 249);
+ scrollPane.setBounds(10, 28, 291, 223);
panel_1.add(scrollPane);
table = new JTable();
@@ -212,12 +221,12 @@ public class PermissionEditLecture_GUI extends JFrame {
JButton button = new JButton("Hinzufügen");
button.setEnabled(false);
- button.setBounds(10, 279, 89, 23);
+ button.setBounds(10, 260, 89, 23);
panel_1.add(button);
JButton button_1 = new JButton("Löschen");
button_1.setEnabled(false);
- button_1.setBounds(109, 279, 89, 23);
+ button_1.setBounds(109, 260, 89, 23);
panel_1.add(button_1);
JLabel lblHauptmen = new JLabel("Hauptmenü");
@@ -273,34 +282,34 @@ public class PermissionEditLecture_GUI extends JFrame {
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);
+ panel_2.setBounds(331, 226, 236, 294);
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);
+ scrollPane_1.setBounds(23, 88, 203, 161);
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);
+ rdbtnAlle.setBounds(6, 32, 109, 23);
panel_2.add(rdbtnAlle);
JRadioButton rdbtnIndividuell = new JRadioButton("Individuell");
rdbtnIndividuell.setEnabled(false);
- rdbtnIndividuell.setBounds(6, 53, 109, 23);
+ rdbtnIndividuell.setBounds(6, 58, 109, 23);
panel_2.add(rdbtnIndividuell);
final JButton btnAddVmUser = new JButton("Hinzufügen");
btnAddVmUser.setEnabled(false);
- btnAddVmUser.setBounds(23, 279, 89, 23);
+ btnAddVmUser.setBounds(23, 260, 89, 23);
panel_2.add(btnAddVmUser);
final JButton btnDelVmUser = new JButton("Löschen");
btnDelVmUser.setEnabled(false);
- btnDelVmUser.setBounds(122, 279, 89, 23);
+ btnDelVmUser.setBounds(122, 260, 89, 23);
panel_2.add(btnDelVmUser);
{
JPanel buttonPane = new JPanel();
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-02-28 20:32:51 +0100