[client] Scale windows/panels according to the saved scaling factor

When setting sizes, please use Gui.getScaledDimension(width, height)t

17 files changed, 44 insertions, 57 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/Gui.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/Gui.java
index 72705a38..ce13107d 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/Gui.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/Gui.java
@@ -1,6 +1,7 @@
 package org.openslx.dozmod.gui;
 
 import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.Frame;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
@@ -18,6 +19,7 @@ import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 
 import org.apache.log4j.Logger;
+import org.openslx.dozmod.Config;
 import org.openslx.dozmod.gui.helper.MessageType;
 import org.openslx.util.QuickTimer;
 
@@ -106,6 +108,17 @@ public class Gui {
 	}
 
 	/**
+	 * Gets the given dimension scaled to the saved scaling factor
+	 *
+	 * @param width starting width to scale
+	 * @param height starting height to scale
+	 * @return scaled dimension
+	 */
+	public static Dimension getScaledDimension(int width, int height) {
+		int scale = Config.getFontScaling();
+		return new Dimension(width * scale / 100, height * scale / 100);
+	}
+	/**
 	 * Get the {@link GraphicsDevice} which the given {@link Point} lies in.
 	 * 
 	 * @param point The point in question
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
index 7fc7cae1..b862a29a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
@@ -1,7 +1,6 @@
 package org.openslx.dozmod.gui;
 
 import java.awt.BorderLayout;
-import java.awt.Dimension;
 import java.awt.KeyEventDispatcher;
 import java.awt.KeyboardFocusManager;
 import java.awt.Window;
@@ -196,8 +195,7 @@ public abstract class MainWindow {
 		mainContainer.setLayout(new BoxLayout(mainContainer, BoxLayout.PAGE_AXIS));
 
 		// Scale the ui with the font.
-		int scale = Config.getFontScaling();
-		mainWindow.setMinimumSize(new Dimension(850 * scale / 100, 650 * scale / 100));
+		mainWindow.setMinimumSize(Gui.getScaledDimension(850, 650));
 
 		// register all pages of the main window
 		registerPage(new MainMenuWindow());
@@ -208,7 +206,7 @@ public abstract class MainWindow {
 		// Debug?
 		if (System.getProperty("log") != null) {
 			DebugWindow win = new DebugWindow();
-			win.setMinimumSize(new Dimension(0, 250));
+			win.setMinimumSize(Gui.getScaledDimension(0, 250));
 			win.setPreferredSize(win.getMinimumSize());
 			mainWindow.getContentPane().add(win, BorderLayout.PAGE_START);
 		}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java
index cbb0fd2f..fcc2159b 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java
@@ -1,7 +1,6 @@
 package org.openslx.dozmod.gui.activity;
 
 import java.awt.Color;
-import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.GridLayout;
 
@@ -64,7 +63,7 @@ public abstract class TransferPanel extends ActivityPanel implements TransferEve
 		// ProgressBar
 		JPanel progressWrapper = new JPanel();
 		progressWrapper.setLayout(new GridLayout(1, 1));
-		progressWrapper.setMinimumSize(new Dimension(0, 50));
+		progressWrapper.setMinimumSize(Gui.getScaledDimension(0, 50));
 		progressWrapper.setPreferredSize(progressWrapper.getMinimumSize());
 		progress = new BlockProgressBar(null);
 		progressWrapper.add(progress);
@@ -75,12 +74,12 @@ public abstract class TransferPanel extends ActivityPanel implements TransferEve
 		lblError = new QLabel();
 		lblSpeed = new QLabel("-");
 		lblRemaining = new QLabel("-");
-		lblSpeed.setMinimumSize(new Dimension(50, 0));
-		lblRemaining.setMinimumSize(new Dimension(60, 0));
+		lblSpeed.setMinimumSize(Gui.getScaledDimension(50, 0));
+		lblRemaining.setMinimumSize(Gui.getScaledDimension(60, 0));
 		footer.add(lblError);
 		footer.add(Box.createGlue());
 		footer.add(lblSpeed);
-		footer.add(Box.createRigidArea(new Dimension(6, 6)));
+		footer.add(Box.createRigidArea(Gui.getScaledDimension(6, 6)));
 		footer.add(lblRemaining);
 		add(footer);
 		this.transfer = transfer;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeLinkedImage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeLinkedImage.java
index fe30abf7..63fa107a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeLinkedImage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeLinkedImage.java
@@ -32,8 +32,6 @@ public class LectureChangeLinkedImage extends LectureChangeLinkedImageLayout imp
 
 	private LectureChangeLinkedImage me;
 
-
-
 	/**
 	 * Don't use this constructor, use static function open instead.
 	 */
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java
index 4b69b801..0ea71c6a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java
@@ -1,7 +1,6 @@
 package org.openslx.dozmod.gui.window.layout;
 
 import java.awt.BorderLayout;
-import java.awt.Dimension;
 import java.awt.Frame;
 
 import javax.swing.BorderFactory;
@@ -15,10 +14,7 @@ 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;
-import org.openslx.dozmod.util.ClientVersion;
-import org.openslx.sat.thrift.version.Version;
 
 
 @SuppressWarnings("serial")
@@ -26,7 +22,6 @@ public abstract class CheckUpdateWindowLayout extends JDialog {
 
 	private final static String title = "Update";
 	private final static String noticeLabel = "Update";
-	private final static String noticeText = "Hier können Sie nach Software-Update suchen und den Changelog ansehen.";
 	private final static String closeButtonLabel = "Schließen";
 
 	protected static String changelogText = "-";
@@ -42,7 +37,7 @@ public abstract class CheckUpdateWindowLayout extends JDialog {
 	public CheckUpdateWindowLayout(Frame modalParent) {
 		super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL : ModalityType.MODELESS);
 		setLayout(new BorderLayout());
-		setPreferredSize(new Dimension(680, 400));
+		setPreferredSize(Gui.getScaledDimension(680, 400));
 
 		// Panel used for creating border. We'll add everything into this.
 		JPanel borderPanel = new JPanel();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ConfigWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ConfigWindowLayout.java
index c364c8bd..0b91191c 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ConfigWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ConfigWindowLayout.java
@@ -19,6 +19,7 @@ import javax.swing.JRadioButton;
 import javax.swing.JSlider;
 
 import org.openslx.dozmod.Config;
+import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.helper.GridManager;
 import org.openslx.dozmod.thrift.Session;
 
@@ -44,7 +45,7 @@ public class ConfigWindowLayout extends JDialog {
 
 		// regular layout as a helper for the whole page
 		setLayout(new BorderLayout());
-		setMinimumSize(new Dimension(500, 300));
+		setMinimumSize(Gui.getScaledDimension(500, 300));
 		
 		// Panel to add everything into, needed for the border.
 		JPanel contentPanel = new JPanel();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageCustomPermissionWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageCustomPermissionWindowLayout.java
index 3448cfa9..95a57cc7 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageCustomPermissionWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageCustomPermissionWindowLayout.java
@@ -1,6 +1,5 @@
 package org.openslx.dozmod.gui.window.layout;
 
-import java.awt.Dimension;
 import java.awt.Window;
 
 import javax.swing.BorderFactory;
@@ -12,6 +11,7 @@ import javax.swing.JDialog;
 import javax.swing.JPanel;
 
 import org.apache.log4j.Logger;
+import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.control.ImageCustomPermissionManager;
 import org.openslx.dozmod.gui.helper.GridManager;
 
@@ -80,7 +80,7 @@ public class ImageCustomPermissionWindowLayout extends JDialog {
 		grid.nextRow();
 		grid.finish(false);
 
-		contentPanel.setPreferredSize(new Dimension(480, 350));
+		contentPanel.setPreferredSize(Gui.getScaledDimension(480, 350));
 
 		pack();
 		setLocationRelativeTo( modalParent );
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 cd1351bf..5c836a15 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
@@ -1,7 +1,6 @@
 package org.openslx.dozmod.gui.window.layout;
 
 import java.awt.BorderLayout;
-import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Frame;
 import java.awt.GridBagConstraints;
@@ -22,6 +21,7 @@ import javax.swing.JTextField;
 
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
 import org.openslx.bwlp.thrift.iface.ShareMode;
+import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.control.ComboBox;
 import org.openslx.dozmod.gui.control.ComboBox.ComboBoxRenderer;
 import org.openslx.dozmod.gui.control.PersonLabel;
@@ -86,7 +86,7 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 		txtDescription = new JTextArea();
 		txtDescription.setLineWrap(true);
 		txtDescription.setWrapStyleWord(true);
-		txtDescription.setMinimumSize(new Dimension(0, 100));
+		txtDescription.setMinimumSize(Gui.getScaledDimension(0, 100));
 		grid.add(new QLabel("Beschreibung")).anchor = GridBagConstraints.FIRST_LINE_START;
 		grid.add(
 				new JScrollPane(txtDescription, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
@@ -183,8 +183,8 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 		grid.nextRow();
 		grid.finish(true);
 
-		infoPanel.setPreferredSize(new Dimension(500, 400));
-		infoPanel.setMinimumSize(new Dimension(350, 300));
+		infoPanel.setPreferredSize(Gui.getScaledDimension(500, 400));
+		infoPanel.setMinimumSize(Gui.getScaledDimension(350, 300));
 
 		// finally add the infoPanel itself to the left panel
 		// button panel at the bottom
@@ -207,7 +207,6 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 		lblVersion.setFont(lblVersion.getFont().deriveFont(Font.BOLD));
 		versionTablePanel.add(lblVersion, BorderLayout.PAGE_START);
 		versionTable = new ImageVersionTable();
-		//versionTablePanel.setPreferredSize(new Dimension(450, 200));
 		versionTableScrollPane = new JScrollPane(versionTable);
 		versionTableScrollPane.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
 		versionTablePanel.add(versionTableScrollPane, BorderLayout.CENTER);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeLinkedImageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeLinkedImageLayout.java
index 808b524a..b034227e 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeLinkedImageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeLinkedImageLayout.java
@@ -1,6 +1,5 @@
 package org.openslx.dozmod.gui.window.layout;
 
-import java.awt.Dimension;
 import java.awt.Window;
 
 import javax.swing.BorderFactory;
@@ -11,6 +10,7 @@ import javax.swing.JDialog;
 import javax.swing.JPanel;
 
 import org.apache.log4j.Logger;
+import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.control.ImageListViewer;
 import org.openslx.dozmod.gui.helper.GridManager;
 
@@ -70,7 +70,7 @@ public class LectureChangeLinkedImageLayout extends JDialog {
 		grid.nextRow();
 		grid.finish(false);
 
-		contentPanel.setPreferredSize(new Dimension(480, 350));
+		contentPanel.setPreferredSize(Gui.getScaledDimension(480, 350));
 
 		pack();
 		setLocationRelativeTo( modalParent );
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureCustomPermissionWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureCustomPermissionWindowLayout.java
index 53f37d59..d2a2eee8 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureCustomPermissionWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureCustomPermissionWindowLayout.java
@@ -1,6 +1,5 @@
 package org.openslx.dozmod.gui.window.layout;
 
-import java.awt.Dimension;
 import java.awt.Window;
 
 import javax.swing.BorderFactory;
@@ -12,6 +11,7 @@ import javax.swing.JDialog;
 import javax.swing.JPanel;
 
 import org.apache.log4j.Logger;
+import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.control.LectureCustomPermissionManager;
 import org.openslx.dozmod.gui.helper.GridManager;
 
@@ -29,8 +29,6 @@ public class LectureCustomPermissionWindowLayout extends JDialog {
 	 */
 	protected final JButton btnOk;
 	protected final JButton btnClose;
-
-
 	protected final JCheckBox chkCustomPermAdmin;
 	protected final JCheckBox chkCustomPermEdit;
 
@@ -85,7 +83,7 @@ public class LectureCustomPermissionWindowLayout extends JDialog {
 		grid.nextRow();
 		grid.finish(false);
 
-		contentPanel.setPreferredSize(new Dimension(480, 350));
+		contentPanel.setPreferredSize(Gui.getScaledDimension(480, 350));
 
 		pack();
 		setLocationRelativeTo( modalParent );
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 94f5ad21..83baf886 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
@@ -2,7 +2,6 @@ package org.openslx.dozmod.gui.window.layout;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
-import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Frame;
 import java.awt.GridBagConstraints;
@@ -29,6 +28,7 @@ import org.jdatepicker.impl.JDatePanelImpl;
 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.ComboBox;
 import org.openslx.dozmod.gui.control.ComboBox.ComboBoxRenderer;
 import org.openslx.dozmod.gui.control.PersonLabel;
@@ -106,7 +106,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 		// description
 		txtDescription = new JTextArea();
 		txtDescription.setLineWrap(true);
-		txtDescription.setPreferredSize(new Dimension(450, 100));
+		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();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/UserListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/UserListWindowLayout.java
index 25f33d8a..b9e864b1 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/UserListWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/UserListWindowLayout.java
@@ -13,6 +13,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JTextField;
 import javax.swing.UIManager;
 
+import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.control.QLabel;
 import org.openslx.dozmod.gui.control.table.UserTable;
 import org.openslx.dozmod.gui.helper.GridManager;
@@ -74,7 +75,7 @@ public class UserListWindowLayout extends JDialog {
 		grid.nextRow();
 		grid.finish(false);
 
-		setPreferredSize(new Dimension(300, 350));
+		setPreferredSize(Gui.getScaledDimension(300, 350));
 		pack();
 	}
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java
index 1e53abb2..d61ed5f5 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java
@@ -7,12 +7,11 @@ import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
-import javax.swing.JCheckBox;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
-import org.openslx.dozmod.Config;
+import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.helper.GridManager;
 
 @SuppressWarnings("serial")
@@ -74,8 +73,7 @@ public abstract class VirtualizerNoticeWindowLayout extends JDialog {
 		grid.finish(false);
 
 		// Scale window with font
-		int scale = Config.getFontScaling();
-		setSize(new Dimension(600 * scale /100, 250 * scale / 100));
+		setMinimumSize(Gui.getScaledDimension(600, 250));
 		setLocationRelativeTo(modalParent);
 		validate();
 	}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/Wizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/Wizard.java
index 26f0d4d1..17aa9617 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/Wizard.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/Wizard.java
@@ -23,7 +23,6 @@ import javax.swing.JSeparator;
 import javax.swing.SwingConstants;
 
 import org.apache.log4j.Logger;
-import org.openslx.dozmod.Config;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.control.QLabel;
 import org.openslx.dozmod.gui.helper.GridManager;
@@ -50,7 +49,7 @@ public abstract class Wizard extends JDialog {
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 		setLayout(new BorderLayout());
 		JPanel header = new JPanel();
-		header.setMinimumSize(new Dimension(0, 100));
+		header.setMinimumSize(Gui.getScaledDimension(0, 100));
 		header.setOpaque(true);
 		header.setBackground(Color.WHITE);
 		header.setLayout(new BoxLayout(header, BoxLayout.PAGE_AXIS));
@@ -93,8 +92,7 @@ public abstract class Wizard extends JDialog {
 		add(contentPanel, BorderLayout.CENTER);
 		
 		// Scale window with font size
-		int scale = Config.getFontScaling(); 
-		setPreferredSize(new Dimension(550 * scale / 100, 420 * scale / 100));
+		setPreferredSize(Gui.getScaledDimension(550, 420));
 		setResizable(false);
 
 		pack();
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 f592743a..ee20d678 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
@@ -1,7 +1,5 @@
 package org.openslx.dozmod.gui.wizard.layout;
 
-import java.awt.Dimension;
-
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
 import javax.swing.JPanel;
@@ -10,6 +8,7 @@ import javax.swing.JTextArea;
 import javax.swing.border.TitledBorder;
 
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
+import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.control.ComboBox;
 import org.openslx.dozmod.gui.control.ComboBox.ComboBoxRenderer;
 import org.openslx.dozmod.gui.control.QLabel;
@@ -59,7 +58,7 @@ public abstract class ImageMetaDataPageLayout extends WizardPage {
 
 		QLabel descriptionCation = new QLabel("Beschreibung");
 		descriptionText = new JTextArea(5, 50);
-		descriptionText.setMinimumSize(new Dimension(0, 70));
+		descriptionText.setMinimumSize(Gui.getScaledDimension(0, 70));
 		descriptionText.setLineWrap(true);
 		descriptionText.setWrapStyleWord(true);
 		JScrollPane descPane = new JScrollPane(descriptionText, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
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 6527c655..bc3f154a 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,6 +1,5 @@
 package org.openslx.dozmod.gui.wizard.layout;
 
-import java.awt.Dimension;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Properties;
@@ -14,6 +13,7 @@ import javax.swing.text.DateFormatter;
 
 import org.jdatepicker.impl.JDatePanelImpl;
 import org.jdatepicker.impl.UtilDateModel;
+import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.control.QDatePickerImpl;
 import org.openslx.dozmod.gui.control.QLabel;
 import org.openslx.dozmod.gui.helper.GridManager;
@@ -61,7 +61,7 @@ public abstract class LectureCreationPageLayout extends WizardPage {
 		descriptionText.setWrapStyleWord(true);
 		JScrollPane descPane = new JScrollPane(descriptionText, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
 				JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-		descriptionText.setMinimumSize(new Dimension(0, 60));
+		descriptionText.setMinimumSize(Gui.getScaledDimension(0, 60));
 		descPane.setMinimumSize(descriptionText.getMinimumSize());
 		grid.add(new QLabel("Beschreibung"));
 		grid.add(descPane, 2).fill(true, false).expand(true, false);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java
index 74e7cb31..9cac8a39 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java
@@ -1,7 +1,5 @@
 package org.openslx.dozmod.gui.wizard.page;
 
-import java.awt.Dimension;
-
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
@@ -22,8 +20,6 @@ public class LectureImageListPage extends LectureImageListPageLayout {
 	private final static Logger LOGGER = Logger.getLogger(LectureImageListPage.class);
 
 	private LectureWizardState state = null;
-	private Dimension startDim = null;
-	private Wizard wizard = null;
 	/**
 	 * The image table held by the ImageListViewer
 	 */
@@ -35,8 +31,6 @@ public class LectureImageListPage extends LectureImageListPageLayout {
 	public LectureImageListPage(Wizard wizard, LectureWizardState state) {
 		super(wizard);
 		this.state = state;
-		this.wizard = wizard;
-		this.startDim = wizard.getSize();
 		setPageComplete(false);
 		imageTable.setColumnVisible(ImageTable.COL_OS, false);
 		imageTable.setColumnVisible(ImageTable.COL_TEMPLATE, false);
@@ -53,10 +47,6 @@ public class LectureImageListPage extends LectureImageListPageLayout {
 	protected void onPageEnter() {
 		imageListViewer.refreshList(false, 1);
 	}
-	@Override
-	protected void onPageLeave() {
-		wizard.setSize(startDim);
-	}
 	/**
 	 * Called by event listeners. This will set guidance message or error
 	 * message and call setPageComplete(bool) accordingly. The state will be