From b794e38b72473538461b97882f4f20ede7042ea9 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Fri, 2 Sep 2016 17:29:47 +0200 Subject: [client] splitted netrules & runscript tab/panel/w/e --- .../window/layout/LectureDetailsWindowLayout.java | 34 ++++++++++++---------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java') diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java index 2b9727db..048061df 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java @@ -32,7 +32,6 @@ import org.jdatepicker.impl.JDatePickerImpl; import org.jdatepicker.impl.UtilDateModel; import org.openslx.bwlp.thrift.iface.ImageVersionDetails; import org.openslx.dozmod.gui.Gui; -import org.openslx.dozmod.gui.control.AdvancedConfigurator; import org.openslx.dozmod.gui.control.ComboBox; import org.openslx.dozmod.gui.control.ComboBox.ComboBoxRenderer; import org.openslx.dozmod.gui.control.LectureCustomPermissionManager; @@ -40,6 +39,7 @@ import org.openslx.dozmod.gui.control.LocationSelector; import org.openslx.dozmod.gui.control.PersonLabel; import org.openslx.dozmod.gui.control.QDatePickerImpl; import org.openslx.dozmod.gui.control.QLabel; +import org.openslx.dozmod.gui.control.RunscriptConfigurator; import org.openslx.dozmod.gui.control.WordWrapLabel; import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.thrift.Session; @@ -78,6 +78,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog { protected final QLabel lblUseCount; protected final JButton btnPermissions; + protected final JButton btnNetrules; protected final QLabel lblError; protected final JButton btnSaveChanges; @@ -94,7 +95,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog { protected JTabbedPane pnlTabs; protected final LectureCustomPermissionManager ctlPermissionManager; protected final LocationSelector ctlLocationSelector; - protected final AdvancedConfigurator ctlAdvancedConfigurator; + protected final RunscriptConfigurator ctlRunscriptConfigurator; private static final Properties pickerStrings = new Properties(); @@ -105,7 +106,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog { protected JPanel pnlTabRestrictions; protected JPanel pnlTabPermissions; protected JPanel pnlTabLocations; - protected JPanel pnlTabAdvanced; + protected JPanel pnlTabRunscript; static { pickerStrings.put("text.today", "Heute"); @@ -295,33 +296,34 @@ public abstract class LectureDetailsWindowLayout extends JDialog { grdGeneral.finish(true); pnlTabRestrictions = new JPanel(); - GridManager grdRestrictions = new GridManager(pnlTabRestrictions, 2, true, + GridManager grdRestrictions = new GridManager(pnlTabRestrictions, 3, true, new Insets(3, 3, 3, 3)); // "restrictions": internet access / usb access / exam grdRestrictions.add(new JLabel("Internetzugriff")); + btnNetrules = new JButton("Ausnahmen"); chkHasInternetAccess = new JCheckBox("zulassen"); - grdRestrictions.add(new WordWrapLabel("Legen Sie hier fest, ob die Veranstaltung Zugriff zum Internet haben soll", false, true)).fill(true, false).expand(true, false); + grdRestrictions.add(new WordWrapLabel("Legen Sie hier fest, ob die Veranstaltung Zugriff zum Internet haben soll", false, true), 2).fill(true, false).expand(true, false); grdRestrictions.nextRow(); grdRestrictions.skip(); grdRestrictions.add(chkHasInternetAccess).fill(true, false).expand(true, false); - // TODO add netrules button here + grdRestrictions.add(btnNetrules).fill(true, false).expand(true, false); grdRestrictions.nextRow(); grdRestrictions.add(new JLabel("Speichermedium-Zugriff")); chkHasUsbAccess = new JCheckBox("zulassen"); - grdRestrictions.add(new WordWrapLabel("Legen Sie hier fest, ob die Veranstaltung den Zugriff auf Speichermedien (CD, USB, ...) erlauben soll", false, true)).fill(true, false).expand(true, false); + grdRestrictions.add(new WordWrapLabel("Legen Sie hier fest, ob die Veranstaltung den Zugriff auf Speichermedien (CD, USB, ...) erlauben soll", false, true), 2).fill(true, false).expand(true, false); grdRestrictions.nextRow(); grdRestrictions.skip(); - grdRestrictions.add(chkHasUsbAccess); + grdRestrictions.add(chkHasUsbAccess, 2); grdRestrictions.nextRow(); grdRestrictions.add(new JLabel("E-Prüfung")); chkIsExam = new JCheckBox("aktiv"); - grdRestrictions.add(new WordWrapLabel("Markieren Sie diese Veranstaltung als E-Prüfung", false, true)).fill(true, false).expand(true, false); + grdRestrictions.add(new WordWrapLabel("Markieren Sie diese Veranstaltung als E-Prüfung", false, true), 2).fill(true, false).expand(true, false); grdRestrictions.nextRow(); grdRestrictions.skip(); - grdRestrictions.add(chkIsExam); + grdRestrictions.add(chkIsExam, 2); btnPermissions = new JButton("Ändern"); grdRestrictions.finish(true); @@ -357,13 +359,13 @@ public abstract class LectureDetailsWindowLayout extends JDialog { /* ******************************************************************************* * - * Tab "Advanced" + * Tab "Runscript" * ********************************************************************************/ - ctlAdvancedConfigurator = new AdvancedConfigurator(); - pnlTabAdvanced = new JPanel(); - GridManager grdAdvanced = new GridManager(pnlTabAdvanced, 1, false); - grdAdvanced.add(ctlAdvancedConfigurator).fill(true, true).expand(true, true); + ctlRunscriptConfigurator = new RunscriptConfigurator(); + pnlTabRunscript = new JPanel(); + GridManager grdAdvanced = new GridManager(pnlTabRunscript, 1, false); + grdAdvanced.add(ctlRunscriptConfigurator).fill(true, true).expand(true, true); grdAdvanced.finish(false); /* ******************************************************************************* @@ -382,7 +384,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog { pnlTabs.addTab("Raumauswahl", pnlTabLocations); } if (Session.isLectureRestrictionsSupported()) { - pnlTabs.addTab("Erweitert", pnlTabAdvanced); + pnlTabs.addTab("Startskript", pnlTabRunscript); } pnlTabs.addTab("Berechtigungen", pnlTabPermissions); add(pnlTabs, BorderLayout.CENTER); -- cgit v1.2.3-55-g7522