diff options
| author | unknown | 2014-04-15 14:25:10 +0200 |
|---|---|---|
| committer | unknown | 2014-04-15 14:25:10 +0200 |
| commit | a39c9fc0a181b12e7a47b01ff3c725ef5b6ad2d7 (patch) | |
| tree | 7170d0b499399c767dcb7adaf47233993a5ec0f7 /Dozentenmodul/src/gui/intro/MainMenue_GUI.java | |
| parent | vbg (diff) | |
| parent | sdfv (diff) | |
| download | tutor-module-a39c9fc0a181b12e7a47b01ff3c725ef5b6ad2d7.tar.gz tutor-module-a39c9fc0a181b12e7a47b01ff3c725ef5b6ad2d7.tar.xz tutor-module-a39c9fc0a181b12e7a47b01ff3c725ef5b6ad2d7.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
rgDozentenmodul/bin/gui/image/DeleteImage_GUI.class
Dozentenmodul/src/gui/image/DeleteImage_GUI.java
Diffstat (limited to 'Dozentenmodul/src/gui/intro/MainMenue_GUI.java')
| -rw-r--r-- | Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 3649d79d..868f9cd3 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -208,7 +208,6 @@ public class MainMenue_GUI extends JFrame { rdbtnLectureEdit.setBackground(SystemColor.menu); rdbtnLectureDelete = new JRadioButton("L\u00F6schen"); - rdbtnLectureDelete.setEnabled(false); rdbtnLectureDelete .setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen"); rdbtnLectureDelete.setBounds(6, 76, 175, 23); @@ -378,8 +377,9 @@ public class MainMenue_GUI extends JFrame { // dl.setVisible(true); // dispose(); } else if (rdbtnLectureSearch.isSelected() == true) { - // SearchLecture_GUI sl = new SearchLecture_GUI(); - EditLectureSearch_GUI sl = new EditLectureSearch_GUI(); + SearchLecture_GUI sl = new SearchLecture_GUI(); + // EditLectureSearch_GUI sl = new + // EditLectureSearch_GUI(); sl.setVisible(true); dispose(); } |