diff options
| author | unknown | 2014-05-08 13:59:31 +0200 |
|---|---|---|
| committer | unknown | 2014-05-08 13:59:31 +0200 |
| commit | ea2bbcbaa29508d11404a31b2c17380edc38f80a (patch) | |
| tree | 275929ef8da853da76e62ad1780ef233aadf0120 /Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java | |
| parent | FAQ & OTRS (diff) | |
| parent | -Kopieren von Temp zu Prod inkl. änderung des Pfades in SQL-DB (diff) | |
| download | tutor-module-ea2bbcbaa29508d11404a31b2c17380edc38f80a.tar.gz tutor-module-ea2bbcbaa29508d11404a31b2c17380edc38f80a.tar.xz tutor-module-ea2bbcbaa29508d11404a31b2c17380edc38f80a.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class
Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class
Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class
Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class
Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class
Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
Diffstat (limited to 'Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java')
| -rw-r--r-- | Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java index 0be23ee0..cab588d9 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java @@ -245,6 +245,7 @@ public class EditLectureAllgemein_GUI extends JFrame { panel_2.add(textFieldLaborname); JTextArea textArea = new JTextArea(); + textArea.setEditable(false); textArea.setWrapStyleWord(true); textArea.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an. Dieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\""); textArea.setLineWrap(true); @@ -261,6 +262,7 @@ public class EditLectureAllgemein_GUI extends JFrame { scrollPane.setBounds(200, 104, 347, 78); panel_2.add(scrollPane); description = new JTextArea(); + description.setFont(new Font("Tahoma", Font.PLAIN, 11)); description.setText(Lecture.lecture.getDesc()); description.setLineWrap(true); scrollPane.add(description); |