1 files changed, 23 insertions, 8 deletions

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 040fffa5..9490bc72 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
@@ -2,17 +2,19 @@ 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;
 import java.awt.Insets;
-import java.awt.GridLayout;
+import java.awt.FlowLayout;
 
 import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
 import javax.swing.JDialog;
 import javax.swing.JEditorPane;
 import javax.swing.JFrame;
@@ -20,7 +22,6 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
-import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.text.StyledEditorKit;
 import javax.swing.JEditorPane;
@@ -81,7 +82,9 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 	protected final JButton btnBold;
 	protected final JButton btnItalic;
 	protected final JButton btnUnderline;
-
+	protected final JComboBox cbTxtSize;
+	protected final JComboBox cbTxtColor;
+	
 	protected JTabbedPane pnlTabs;
 
 	protected ImagePermissionConfigurator ctlImagePermissionConfigurator;
@@ -114,22 +117,34 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 
 		// buttons for text editing
 		JPanel editingPanel = new JPanel();
-		editingPanel.setLayout(new GridLayout(1, 3));
+
+		editingPanel.setLayout(new FlowLayout(FlowLayout.LEADING));
 		JPanel emptyPanel = new JPanel();
 		grid.add(emptyPanel);
 		btnBold = new JButton(new StyledEditorKit.BoldAction());
-		btnBold.setIcon(Gui.getScaledIconResource("/img/bold.png", "B", 24, this));
+		btnBold.setIcon(Gui.getScaledIconResource("/img/bold.png", "B", 15, this));
 		btnBold.setText("");
 		btnItalic = new JButton(new StyledEditorKit.ItalicAction());
-		btnItalic.setIcon(Gui.getScaledIconResource("/img/italic.png", "B", 24, this));
+		btnItalic.setIcon(Gui.getScaledIconResource("/img/italic.png", "B", 15, this));
 		btnItalic.setText("");
 		btnUnderline = new JButton(new StyledEditorKit.UnderlineAction());
-		btnUnderline.setIcon(Gui.getScaledIconResource("/img/underline.png", "B", 24, this));
+		btnUnderline.setIcon(Gui.getScaledIconResource("/img/underline.png", "B", 15, this));
 		btnUnderline.setText("");
 		editingPanel.add(btnBold);
 		editingPanel.add(btnItalic);
 		editingPanel.add(btnUnderline);
-		grid.add(editingPanel);
+
+		String[] textsizes = {"10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29"};
+		cbTxtSize = new JComboBox<>(textsizes);
+		cbTxtSize.setPreferredSize(new Dimension(65,25));
+		editingPanel.add(cbTxtSize);
+
+		Object[] colors = {"Black", "Blue", "Red", "Yellow", "Green"};
+		cbTxtColor = new JComboBox<>(colors);
+		cbTxtColor.setPreferredSize(new Dimension(100,25));
+		editingPanel.add(cbTxtColor);
+
+		grid.add(editingPanel).expand(false, true);
 		grid.add(emptyPanel);
 		grid.nextRow();