diff options
| author | Stephan Schwär | 2021-01-31 00:08:44 +0100 |
|---|---|---|
| committer | Stephan Schwär | 2021-01-31 00:08:44 +0100 |
| commit | 3eb0a7a79ff9ffbcb996329887c7df6c1829487e (patch) | |
| tree | f32972462ec612ee1d0c1877ea147785060bb3e7 | |
| parent | [client] UI-scaling now also applies to pup-up messages. (diff) | |
| parent | [client] added improved documentation for editor (diff) | |
| download | tutor-module-3eb0a7a79ff9ffbcb996329887c7df6c1829487e.tar.gz tutor-module-3eb0a7a79ff9ffbcb996329887c7df6c1829487e.tar.xz tutor-module-3eb0a7a79ff9ffbcb996329887c7df6c1829487e.zip | |
Merge branch 'feature/htmlEditorInDescrioptionText' into feature-merge
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java | 5 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java index 10cedbec..93d9d204 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java @@ -267,6 +267,7 @@ import java.util.*; } }); + // change between html and Wysiwyg btnWysiwyg.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -297,7 +298,9 @@ import java.util.*; } } }); - + + // insertion of <br> in needed because textpane is not able to + // to insert <br> when enter is pressed. txtDescription.addKeyListener(new KeyListener() { @Override public void keyPressed(KeyEvent e) { 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 2f53e8c5..dbbdec5e 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 @@ -316,7 +316,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements } }); - + // change button for html to Wysiwyg btnWysiwyg.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { |