From 15ac45b2b345ec461b7ebfd8a7dca5d2f6ac9b63 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 14 Aug 2015 17:47:33 +0200 Subject: [client] Lecure Details --- .../openslx/dozmod/gui/window/LectureDetailsWindow.java | 15 ++++++--------- .../gui/window/layout/LectureDetailsWindowLayout.java | 12 +++++++----- 2 files changed, 13 insertions(+), 14 deletions(-) (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui') diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java index 400d7018..f17c9c5b 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java @@ -204,21 +204,18 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout { */ private void makeEditable(boolean editable) { editable = editable && LecturePerms.canEdit(lecture); - txtTitle.setEnabled(editable); + //txtTitle.setEnabled(editable); txtDescription.setEditable(editable); - - // TODO functionality for changing dates still missing - // lblCreateTime.setText(FormatHelper.longDate(lecture.getCreateTime())); - // lblUpdateTime.setText(FormatHelper.longDate(lecture.getUpdateTime())); - // lblStartTime.setText(FormatHelper.longDate(lecture.getStartTime())); - // lblEndTime.setText(FormatHelper.longDate(lecture.getEndTime())); - btnLinkImage.setEnabled(editable); btnIsExam.setEnabled(editable); btnAutoUpdate.setEnabled(editable); - cboVersions.setEnabled(editable); + cboVersions.setEnabled(editable && !lecture.autoUpdate); btnSaveChanges.setEnabled(editable); btnChangeOwner.setEnabled(editable && LecturePerms.canAdmin(lecture)); + startDate.setEnabled(editable); // TODO + startTime.setEnabled(editable); + endDate.setEnabled(editable); // TODO + endTime.setEnabled(editable); } /** 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 5ee23c01..386cb5df 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 @@ -107,7 +107,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog { // linked image // name txtImageName = new JLabel(); - grid.add(new JLabel("Imagename")); + grid.add(new JLabel("Verknüpftes Image")); grid.add(txtImageName).expand(true, false); // link button for image btnLinkImage = new JButton("Ändern"); @@ -116,7 +116,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog { // image version handling // auto update - btnAutoUpdate = new JCheckBox("Auto Update"); + btnAutoUpdate = new JCheckBox("Immer aktuellste Version verwenden"); // versions combo cboVersions = new ComboBox<>(Comparators.imageVersionDetails, new ComboBoxRenderer() { @@ -127,9 +127,11 @@ public abstract class LectureDetailsWindowLayout extends JDialog { return FormatHelper.longDate(item.getCreateTime()); } }); - grid.add(new JLabel("Image Version")); - grid.add(cboVersions).expand(true, false); - grid.add(btnAutoUpdate); + JPanel versionPanel = new JPanel(new BorderLayout()); + versionPanel.add(cboVersions, BorderLayout.WEST); + versionPanel.add(btnAutoUpdate, BorderLayout.CENTER); + grid.add(new JLabel("Image-Version")); + grid.add(versionPanel, 2); grid.nextRow(); // start time of the lecture -- cgit v1.2.3-55-g7522