summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java
diff options
context:
space:
mode:
authorKuersat Akmaz2020-11-30 21:06:01 +0100
committerKuersat Akmaz2020-11-30 21:06:01 +0100
commitc71369bccd6bbd081e9d1e5daf54b249a1606274 (patch)
treeaa3671c6e8e0cad487f329910259fbffbd7fcb80 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java
parent[client] added WYSIWYG button into image datailswindow (diff)
downloadtutor-module-c71369bccd6bbd081e9d1e5daf54b249a1606274.tar.gz
tutor-module-c71369bccd6bbd081e9d1e5daf54b249a1606274.tar.xz
tutor-module-c71369bccd6bbd081e9d1e5daf54b249a1606274.zip
[client] added fixed htmleditor to imagedetailswindow
Issue : #3732
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java10
1 files changed, 6 insertions, 4 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 f2609e89..0d5cfd0f 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
@@ -24,7 +24,7 @@ import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
import javax.swing.JTextField;
import javax.swing.text.StyledEditorKit;
-import javax.swing.JEditorPane;
+import javax.swing.text.html.HTMLEditorKit;
import org.openslx.bwlp.thrift.iface.OperatingSystem;
import org.openslx.bwlp.thrift.iface.ShareMode;
@@ -83,10 +83,10 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
protected final JButton btnItalic;
protected final JButton btnUnderline;
protected final JButton btnWysiwyg;
-
+
protected final JComboBox cbTxtSize;
protected final JComboBox cbTxtColor;
-
+ protected final HTMLEditorKit kit;
protected JTabbedPane pnlTabs;
protected ImagePermissionConfigurator ctlImagePermissionConfigurator;
@@ -113,7 +113,6 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
// name
txtTitle = new JTextField();
txtTitle.setFont(txtTitle.getFont().deriveFont(Font.BOLD, txtTitle.getFont().getSize2D() * 1.4f));
- // txtTitle.setMinimumSize(Gui.getScaledDimension(0, 24));
grid.add(txtTitle, 3).expand(true, false).fill(true, false);
grid.nextRow();
@@ -158,7 +157,10 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
// description
txtDescription = new JEditorPane();
+ kit = new HTMLEditorKit();
+ txtDescription.setEditorKit(kit);
txtDescription.setContentType("text/html");
+
grid.add(new QLabel("Beschreibung")).anchor = GridBagConstraints.FIRST_LINE_START;
JScrollPane jsp = new JScrollPane(txtDescription, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);