Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:  grhrdh
	Dozentenmodul/bin/gui/image/DeleteImage_GUI.class

5 files changed, 7 insertions, 10 deletions

diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
index bf6b6cbc..d07ffc37 100644
--- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class
index eb3e0b32..97a29d37 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
index f0c49faa..0d205dc2 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
index 9a811bc5..3e7f494d 100644
--- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
@@ -116,7 +116,7 @@ public class DeleteImage_GUI extends JFrame {
 			e.printStackTrace();
 		}
 		// Setzt den Fenstertitel
-		setTitle("bwLehrpool Suite *Prototyp*");
+		setTitle("bwLehrpool Suite *Prototyp* - Image l\u00F6schen");
 		// Zentriert das Fenster in die Bildmitte
 		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
 		int top = (screenSize.height - 722) / 2;
@@ -133,7 +133,8 @@ public class DeleteImage_GUI extends JFrame {
 			getContentPane().add(panel);
 			panel.setLayout(null);
 			{
-				JLabel lblNewLabel = new JLabel("Suche nach VL-Image");
+				JLabel lblNewLabel = new JLabel(
+						"Zu l\u00F6schendes Image w\u00E4hlen");
 				lblNewLabel.setBounds(10, 11, 509, 22);
 				panel.add(lblNewLabel);
 				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
@@ -143,7 +144,7 @@ public class DeleteImage_GUI extends JFrame {
 			txtpnBitteWhlenSie.setEditable(false);
 			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
 			txtpnBitteWhlenSie
-					.setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");
+					.setText("W\u00E4hlen Sie bitte aus der unten stehenden Liste das zu l\u00F6schende Image aus.");
 			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
 			panel.add(txtpnBitteWhlenSie);
 		}
diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
index 868f9cd3..5e9c85c5 100644
--- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
+++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
@@ -359,8 +359,6 @@ public class MainMenue_GUI extends JFrame {
 							// SearchMethodLecture_GUI sm = new
 							// SearchMethodLecture_GUI();
 							SearchImage_GUI si = new SearchImage_GUI();
-							// SearchEditImage_GUI si = new
-							// SearchEditImage_GUI();
 							si.setVisible(true);
 							dispose();
 							// Lectures
@@ -373,13 +371,11 @@ public class MainMenue_GUI extends JFrame {
 							el.setVisible(true);
 							dispose();
 						} else if (rdbtnLectureDelete.isSelected() == true) {
-							// DeleteLecture_GUI dl = new DeleteLecture_GUI();
-							// dl.setVisible(true);
-							// dispose();
+							DeleteLecture_GUI dl = new DeleteLecture_GUI();
+							dl.setVisible(true);
+							dispose();
 						} else if (rdbtnLectureSearch.isSelected() == true) {
 							SearchLecture_GUI sl = new SearchLecture_GUI();
-							// EditLectureSearch_GUI sl = new
-							// EditLectureSearch_GUI();
 							sl.setVisible(true);
 							dispose();
 						}