diff options
author | Jonathan Bauer | 2015-09-10 18:15:47 +0200 |
---|---|---|
committer | Jonathan Bauer | 2015-09-10 18:15:47 +0200 |
commit | ef9a127e9b056202ef635b13a4ca8635f9dcd852 (patch) | |
tree | bde19b430c0955afdf1fbd140a88aa078e8feed9 /dozentenmodul/src/main/java | |
parent | [client] ImageDetails: add listeners right from the start and fix removing th... (diff) | |
download | tutor-module-ef9a127e9b056202ef635b13a4ca8635f9dcd852.tar.gz tutor-module-ef9a127e9b056202ef635b13a4ca8635f9dcd852.tar.xz tutor-module-ef9a127e9b056202ef635b13a4ca8635f9dcd852.zip |
[client] LectureDetails: moved fields around to keep the same order as in ImageDetailsWindow
Diffstat (limited to 'dozentenmodul/src/main/java')
2 files changed, 29 insertions, 30 deletions
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 c328e880..9f5e773d 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 @@ -41,9 +41,9 @@ import org.openslx.dozmod.gui.helper.MessageType; import org.openslx.dozmod.gui.helper.UiFeedback; import org.openslx.dozmod.gui.window.UserListWindow.UserAddedCallback; import org.openslx.dozmod.gui.window.layout.LectureDetailsWindowLayout; +import org.openslx.dozmod.permissions.DefaultCustomPerms; import org.openslx.dozmod.permissions.ImagePerms; import org.openslx.dozmod.permissions.LecturePerms; -import org.openslx.dozmod.permissions.DefaultCustomPerms; import org.openslx.dozmod.thrift.Session; import org.openslx.dozmod.thrift.ThriftActions; import org.openslx.dozmod.thrift.ThriftActions.DownloadCallback; @@ -52,8 +52,6 @@ import org.openslx.dozmod.thrift.ThriftError; import org.openslx.dozmod.thrift.cache.UserCache; import org.openslx.dozmod.util.FormatHelper; import org.openslx.thrifthelper.ThriftManager; -import org.openslx.util.QuickTimer; -import org.openslx.util.QuickTimer.Task; /** * Window to display and edit the details of a lecture 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 83baf886..820cfcac 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 @@ -106,11 +106,37 @@ public abstract class LectureDetailsWindowLayout extends JDialog { // description txtDescription = new JTextArea(); txtDescription.setLineWrap(true); + txtDescription.setWrapStyleWord(true); txtDescription.setPreferredSize(Gui.getScaledDimension(450, 100)); grid.add(new QLabel("Beschreibung")).anchor(GridBagConstraints.FIRST_LINE_START); grid.add(new JScrollPane(txtDescription), 2).expand(true, true).fill(true, true); grid.nextRow(); + // owner + lblOwner = new PersonLabel(); + btnChangeOwner = new JButton("Ändern"); + grid.add(new QLabel("Besitzer")); + grid.add(lblOwner).expand(true, false); + grid.add(btnChangeOwner).fill(true, false); + grid.nextRow(); + + // creation time + lblCreateTime = new QLabel(); + grid.add(new QLabel("Erstellt")); + grid.add(lblCreateTime, 2); + grid.nextRow(); + + // last updater + lblUpdater = new PersonLabel(); + grid.add(new QLabel("Geändert durch")); + grid.add(lblUpdater, 2); + grid.nextRow(); + + // last updated + lblUpdateTime = new QLabel(); + grid.add(new QLabel("Änderungszeitpunkt")); + grid.add(lblUpdateTime, 2); + grid.nextRow(); // linked image // name txtImageName = new QLabel(); @@ -172,32 +198,6 @@ public abstract class LectureDetailsWindowLayout extends JDialog { grid.add(endTimePanel, 2); grid.nextRow(); - // owner - lblOwner = new PersonLabel(); - btnChangeOwner = new JButton("Ändern"); - grid.add(new QLabel("Besitzer")); - grid.add(lblOwner).expand(true, false); - grid.add(btnChangeOwner).fill(true, false); - grid.nextRow(); - - // creation time - lblCreateTime = new QLabel(); - grid.add(new QLabel("Erstellt")); - grid.add(lblCreateTime, 2); - grid.nextRow(); - - // last updater - lblUpdater = new PersonLabel(); - grid.add(new QLabel("Geändert durch")); - grid.add(lblUpdater, 2); - grid.nextRow(); - - // last updated - lblUpdateTime = new QLabel(); - grid.add(new QLabel("Änderungszeitpunkt")); - grid.add(lblUpdateTime, 2); - grid.nextRow(); - // is exam chkIsExam = new JCheckBox("Klausur"); grid.skip(); @@ -229,8 +229,9 @@ public abstract class LectureDetailsWindowLayout extends JDialog { // button for the custom permissions btnPermissions = new JButton("Berechtigungen"); + grid.skip(); grid.add(btnPermissions); - grid.skip(2); + grid.skip(); grid.nextRow(); grid.finish(true); |