From 362306d0947b93bdffc644a59ba76fc5b7bddb55 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 2 Sep 2015 15:00:24 +0200
Subject: [client] Use default combo for share mode

---
 .../dozmod/gui/window/layout/ImageDetailsWindowLayout.java     | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'dozentenmodul/src/main/java')

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java
index 92c02cc6..f5b41f9d 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java
@@ -152,15 +152,7 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 		*/
 
 		// share mode
-		cboShareMode = new ComboBox<ShareMode>(Comparators.sharemode,
-				new ComboBoxRenderer<ShareMode>() {
-			@Override
-			public String renderItem(ShareMode item) {
-				if (item == null)
-					return null;
-				return item.name();
-			}
-		});
+		cboShareMode = new JComboBox<ShareMode>();
 		grid.add(new QLabel("Freigabemodus"));
 		grid.add(cboShareMode, 2).expand(true, false).fill(true, false);
 		grid.nextRow();
-- 
cgit v1.2.3-55-g7522


From 86ff492fa521a091be6b840a945f548b7bf1c03d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 2 Sep 2015 15:09:18 +0200
Subject: [client] Set position of disclaimer

---
 .../org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'dozentenmodul/src/main/java')

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java
index 5a6b6b07..3ef52e46 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java
@@ -13,6 +13,7 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 
+import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.control.QLabel;
 import org.openslx.dozmod.gui.helper.GridManager;
 
@@ -86,6 +87,6 @@ public abstract class DisclaimerWindowLayout extends JDialog {
 		grid.finish(false);
 
 		pack();
-		setLocationRelativeTo(modalParent);
+		Gui.centerShellOverShell(modalParent, this);
 	}
 }
-- 
cgit v1.2.3-55-g7522