diff options
4 files changed, 66 insertions, 51 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java index 5b5f615a..969f61ae 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java @@ -1,13 +1,11 @@ package org.openslx.dozmod.gui.wizard.layout; -import java.awt.GridBagLayout; - import javax.swing.JButton; import javax.swing.JPanel; import javax.swing.JScrollPane; import org.openslx.dozmod.gui.control.table.ImagePermissionTable; -import org.openslx.dozmod.gui.helper.GridPos; +import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.WizardPage; @@ -32,11 +30,12 @@ public class ImageCustomPermissionPageLayout extends WizardPage { public ImageCustomPermissionPageLayout(Wizard wizard) { super(wizard, "Benutzerspezifische Rechte setzen"); setDescription("Setzen Sie hier spezielle Berechtigungen, sofern Sie dies wünschen."); - setLayout(new GridBagLayout()); + GridManager grid = new GridManager(this, 1, false); // table in the center permissionTable = new ImagePermissionTable(); - add(new JScrollPane(permissionTable), GridPos.get(0, 0, true, true)); + grid.add(new JScrollPane(permissionTable)).fill(true, true).expand(true, true); + grid.nextRow(); // Buttons below Table JPanel panel = new JPanel(); @@ -44,6 +43,9 @@ public class ImageCustomPermissionPageLayout extends WizardPage { removeUser = new JButton(removeUserLabel); panel.add(addUser); panel.add(removeUser); - add(panel, GridPos.get(0, 1)); + grid.add(panel); + grid.nextRow(); + + grid.finish(true); } } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java index 375dc401..6f10f937 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java @@ -2,7 +2,6 @@ package org.openslx.dozmod.gui.wizard.layout; import java.awt.Component; import java.awt.Dimension; -import java.awt.GridBagLayout; import javax.swing.Box; import javax.swing.DefaultListCellRenderer; @@ -16,7 +15,7 @@ import javax.swing.JTextArea; import javax.swing.border.TitledBorder; import org.openslx.bwlp.thrift.iface.OperatingSystem; -import org.openslx.dozmod.gui.helper.GridPos; +import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.WizardPage; @@ -43,7 +42,7 @@ public abstract class ImageMetaDataPageLayout extends WizardPage { super(wizard, "Metadaten"); setDescription("Geben Sie bitte einen aussagekräftigen Namen für das neue Image ein."); - setLayout(new GridBagLayout()); + GridManager grid = new GridManager(this, 2, false); JLabel osCaption = new JLabel("Betriebssystem"); osCombo = new JComboBox<>(); @@ -59,25 +58,29 @@ public abstract class ImageMetaDataPageLayout extends WizardPage { return this; } }); - add(osCaption, GridPos.get(0, 0)); - add(osCombo, GridPos.get(1, 0)); + grid.add(osCaption); + grid.add(osCombo); JLabel descriptionCation = new JLabel("Beschreibung"); - descriptionText = new JTextArea(3, 50); - descriptionText.setMinimumSize(new Dimension(0, 60)); + descriptionText = new JTextArea(5,50); + descriptionText.setMinimumSize(new Dimension(0, 70)); descriptionText.setLineWrap(true); descriptionText.setWrapStyleWord(true); JScrollPane descPane = new JScrollPane(descriptionText, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); descPane.setMinimumSize(descriptionText.getMinimumSize()); - add(descriptionCation, GridPos.get(0, 1)); - add(descPane, GridPos.get(1, 1, true, false)); + grid.add(descriptionCation); + grid.add(descPane).fill(true, false).expand(true, false); + grid.nextRow(); setActiveCheck = new JCheckBox("Image aktivieren"); - add(setActiveCheck, GridPos.get(0, 2)); + grid.add(setActiveCheck); + licencedSoftwareCheck = new JCheckBox("Image enthält lizenzpflichtige Software"); licencedSoftwareCheck.setSelected(true); - add(setActiveCheck, GridPos.get(0, 3)); + grid.add(licencedSoftwareCheck); + grid.nextRow(); + // -- default permissions group -- JPanel permissionsGroup = new JPanel(); @@ -93,9 +96,11 @@ public abstract class ImageMetaDataPageLayout extends WizardPage { permissionsGroup.add(readPermissionsCheck); permissionsGroup.add(writePermissionsCheck); permissionsGroup.add(adminPermissionsCheck); - add(permissionsGroup, GridPos.get(0, 4, 2, 1, true, false)); - add(Box.createVerticalGlue(), GridPos.get(0, 5, true, true)); + grid.add(permissionsGroup, 2, 1).fill(true, false).expand(true, false); + grid.nextRow(); // -- end permissions group -- + + grid.finish(true); } public String getImageDescription() { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java index 458fc729..818c1b22 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java @@ -1,7 +1,6 @@ package org.openslx.dozmod.gui.wizard.layout; import java.awt.Dimension; -import java.awt.GridBagLayout; import java.util.Calendar; import java.util.Date; import java.util.Properties; @@ -21,7 +20,7 @@ import javax.swing.text.DateFormatter; import org.jdatepicker.impl.JDatePanelImpl; import org.jdatepicker.impl.JDatePickerImpl; import org.jdatepicker.impl.UtilDateModel; -import org.openslx.dozmod.gui.helper.GridPos; +import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.WizardPage; import org.openslx.dozmod.util.DateLabelFormatter; @@ -60,16 +59,14 @@ public abstract class LectureCreationPageLayout extends WizardPage { public LectureCreationPageLayout(Wizard wizard, String title) { super(wizard, title); setDescription("Geben Sie bitte einen aussagekräftigen Namen für die neue Veranstaltung ein"); - setLayout(new GridBagLayout()); - - // helper index - int row = 0; + GridManager grid = new GridManager(this, 3, false); // lecture name JLabel lectureNameLabel = new JLabel("Veranstaltungsname"); + grid.add(lectureNameLabel); lectureNameTextField = new JTextField(); - add(lectureNameLabel, GridPos.get(0, row)); - add(lectureNameTextField, GridPos.get(1, row++, 2, 1, true, false)); + grid.add(lectureNameTextField, 2, 1).fill(true, false).expand(true, false); + grid.nextRow(); JLabel descriptionCaption = new JLabel("Beschreibung"); descriptionText = new JTextArea(3, 50); @@ -79,52 +76,61 @@ public abstract class LectureCreationPageLayout extends WizardPage { JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); descriptionText.setMinimumSize(new Dimension(0, 60)); descPane.setMinimumSize(descriptionText.getMinimumSize()); - add(descriptionCaption, GridPos.get(0, row)); - add(descPane, GridPos.get(1, row++, 2, 1, true, false)); + grid.add(descriptionCaption); + grid.add(descPane, 2, 1).fill(true, false); + grid.nextRow(); + // Start date/time JLabel startDateLabel = new JLabel("Startdatum"); startDate = new JDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings), new DateLabelFormatter()); startTime = makeTimeSpinner(0, 0); - add(startDateLabel, GridPos.get(0, row)); - add(startDate, GridPos.get(1, row)); - add(startTime, GridPos.get(2, row++)); + grid.add(startDateLabel); + grid.add(startDate).fill(true, false).expand(true, false); + grid.add(startTime); + grid.nextRow(); JLabel endDateLabel = new JLabel("Enddatum"); endDate = new JDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings), new DateLabelFormatter()); endTime = makeTimeSpinner(23, 59); - add(endDateLabel, GridPos.get(0, row)); - add(endDate, GridPos.get(1, row)); - add(endTime, GridPos.get(2, row++)); - - add(Box.createVerticalStrut(10), GridPos.get(0, row++, 3, 1)); + grid.add(endDateLabel); + grid.add(endDate).fill(true, false).expand(true, false); + grid.add(endTime); + grid.nextRow(); + + grid.add(Box.createVerticalStrut(10), 3, 1); // Options related to exams examCheck = new JCheckBox("Veranstaltung ist eine Prüfung"); - add(examCheck, GridPos.get(0, row++, 3, 1)); + grid.add(examCheck, 3, 1); + grid.nextRow(); networkAccessCheck = new JCheckBox("Internet verfügbar"); - add(networkAccessCheck, GridPos.get(0, row++, 3, 1)); + grid.add(networkAccessCheck, 3, 1); + grid.nextRow(); autoUpdate = new JCheckBox("Aktuellste Imageversion verwenden"); - add(autoUpdate, GridPos.get(0, row++, 3, 1)); + grid.add(autoUpdate, 3, 1); + grid.nextRow(); - add(Box.createVerticalStrut(10), GridPos.get(0, row++, 3, 1)); + grid.add(Box.createVerticalStrut(10), 3, 1); // -- default permissions group -- JPanel permissionsGroup = new JPanel(); permissionsGroup.setBorder(new TitledBorder("Standardberechtigungen")); - editPermissionsCheck = new JCheckBox("Bearbeiten"); adminPermissionsCheck = new JCheckBox("Administrieren"); permissionsGroup.add(editPermissionsCheck); permissionsGroup.add(adminPermissionsCheck); - add(permissionsGroup, GridPos.get(0, row++, 3, 1, true, false)); + grid.add(permissionsGroup, 3, 1).fill(true, true); + grid.nextRow(); enabledCheck = new JCheckBox("Vorlesung ist aktiv", true); - add(enabledCheck, GridPos.get(0, row++, 3, 1)); - add(Box.createVerticalGlue(), GridPos.get(0, row++, 3, 1, true, true)); + grid.add(enabledCheck, 3, 1); + grid.add(Box.createVerticalGlue(), 3, 1).fill(true, true); + + grid.finish(true); } private JSpinner makeTimeSpinner(int h, int m) { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCustomPermissionPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCustomPermissionPageLayout.java index 3b7792a1..d27f6001 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCustomPermissionPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCustomPermissionPageLayout.java @@ -1,13 +1,11 @@ package org.openslx.dozmod.gui.wizard.layout; -import java.awt.GridBagLayout; - import javax.swing.JButton; import javax.swing.JPanel; import javax.swing.JScrollPane; import org.openslx.dozmod.gui.control.table.LecturePermissionTable; -import org.openslx.dozmod.gui.helper.GridPos; +import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.WizardPage; @@ -27,11 +25,12 @@ public abstract class LectureCustomPermissionPageLayout extends WizardPage { public LectureCustomPermissionPageLayout(Wizard wizard) { super(wizard, "Benutzerdefinierte Berechtigungen"); setDescription("Setzen Sie bei Bedarf benutzerdefinierte Berechtigungen"); - setLayout(new GridBagLayout()); + GridManager grid = new GridManager(this, 1, false); // TableViewer on the table permissionTableViewer = new LecturePermissionTable(); - add(new JScrollPane(permissionTableViewer), GridPos.get(0, 0, true, true)); + grid.add(new JScrollPane(permissionTableViewer)).fill(true, true).expand(true,true); + grid.nextRow(); // Buttons below table JPanel panel = new JPanel(); @@ -39,6 +38,9 @@ public abstract class LectureCustomPermissionPageLayout extends WizardPage { removeUser = new JButton(removeUserLabel); panel.add(addUser); panel.add(removeUser); - add(panel, GridPos.get(0, 1)); + grid.add(panel); + grid.nextRow(); + + grid.finish(true); } } |