-Breadcrumbs und deren Beschriftungen korrigiert

22 files changed, 96 insertions, 158 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
index 4a00f1ec..26b40619 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
@@ -300,7 +300,7 @@ public class CreateImageAllgemein_GUI extends JFrame {
 		contentPanel.add(label_2);
 
 		JLabel lblNewLabel_1 = new JLabel("Neu");
-		lblNewLabel_1.setBounds(146, 11, 46, 14);
+		lblNewLabel_1.setBounds(146, 11, 155, 14);
 		contentPanel.add(lblNewLabel_1);
 		{
 			JPanel buttonPane = new JPanel();
diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
index b2fb21fd..4508f128 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
@@ -288,7 +288,7 @@ public class CreateImageTechnisch_GUI extends JFrame {
 		contentPanel.add(label_2);
 		
 		JLabel lblNewLabel_1 = new JLabel("Neu");
-		lblNewLabel_1.setBounds(146, 11, 46, 14);
+		lblNewLabel_1.setBounds(146, 11, 155, 14);
 		contentPanel.add(lblNewLabel_1);
 		{
 			JPanel buttonPane = new JPanel();
diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index 54dda92b..27197447 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -405,8 +405,8 @@ public class DeleteImage_GUI extends JFrame {
 		label_2.setBounds(115, 11, 13, 14);
 		contentPanel.add(label_2);
 
-		JLabel lblNewLabel_1 = new JLabel("Imageauswahl");
-		lblNewLabel_1.setBounds(128, 11, 85, 14);
+		JLabel lblNewLabel_1 = new JLabel("Löschen");
+		lblNewLabel_1.setBounds(128, 11, 155, 14);
 		contentPanel.add(lblNewLabel_1);
 
 		JButton btnDelete = new JButton("Löschen");
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
index 91770b26..8238c5c1 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
@@ -298,7 +298,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 		contentPanel.add(label_2);
 
 		JLabel lblNewLabel_1 = new JLabel("Bearbeiten");
-		lblNewLabel_1.setBounds(146, 11, 71, 14);
+		lblNewLabel_1.setBounds(146, 11, 155, 14);
 		contentPanel.add(lblNewLabel_1);
 		{
 			buttonPane = new JPanel();
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
index 7f97601e..9b687de4 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
@@ -222,8 +222,8 @@ public class EditImageTechnisch_GUI extends JFrame {
 		label_2.setBounds(133, 0, 13, 14);
 		contentPanel.add(label_2);
 
-		JLabel lblNewLabel_1 = new JLabel("Neu");
-		lblNewLabel_1.setBounds(146, 0, 46, 14);
+		JLabel lblNewLabel_1 = new JLabel("Bearbeiten");
+		lblNewLabel_1.setBounds(146, 0, 155, 14);
 		contentPanel.add(lblNewLabel_1);
 
 		JPanel panel_2 = new JPanel();
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index e1b86ed9..3a9e9c87 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -337,7 +337,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		contentPanel.add(label_5);
 
 		JLabel lblNeubearbeiten = new JLabel("Neu");
-		lblNeubearbeiten.setBounds(149, 91, 108, 14);
+		lblNeubearbeiten.setBounds(149, 91, 155, 14);
 		contentPanel.add(lblNeubearbeiten);
 
 		JSeparator separator_1 = new JSeparator();
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
index bd4c0d32..b26f4169 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
@@ -311,8 +311,8 @@ public class FTPEditDownloader_GUI extends JFrame implements
 		label_4.setBounds(139, 95, 14, 14);
 		contentPanel.add(label_4);
 
-		JLabel lblNeuBearbeiten = new JLabel("Neu / Bearbeiten");
-		lblNeuBearbeiten.setBounds(149, 95, 108, 14);
+		JLabel lblNeuBearbeiten = new JLabel("Bearbeiten");
+		lblNeuBearbeiten.setBounds(149, 95, 155, 14);
 		contentPanel.add(lblNeuBearbeiten);
 
 		JSeparator separator_1 = new JSeparator();
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index 68a05bc9..2c8a6b16 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -324,7 +324,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 		contentPanel.add(label_5);
 
 		JLabel lblNeubearbeiten = new JLabel("Bearbeiten");
-		lblNeubearbeiten.setBounds(149, 91, 108, 14);
+		lblNeubearbeiten.setBounds(149, 91, 155, 14);
 		contentPanel.add(lblNeubearbeiten);
 
 		JSeparator separator_1 = new JSeparator();
diff --git a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
index 17981c0e..49da4e01 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
@@ -310,8 +310,8 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 		label_4.setBounds(139, 95, 14, 14);
 		contentPanel.add(label_4);
 
-		JLabel label_5 = new JLabel("Neu/Bearbeiten");
-		label_5.setBounds(149, 95, 108, 14);
+		JLabel label_5 = new JLabel("Suche und Download");
+		label_5.setBounds(149, 95, 155, 14);
 		contentPanel.add(label_5);
 
 		JSeparator separator_1 = new JSeparator();
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
index 32c42df3..95654247 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
@@ -98,8 +98,6 @@ public class PermissionCreateImage_GUI extends JFrame {
 		}
 
 	};
-
-	private JTextField textField;
 	private JLabel lblRead;
 	private JLabel lblWrite;
 	private JLabel lblAdmin;
@@ -170,14 +168,14 @@ public class PermissionCreateImage_GUI extends JFrame {
 		panel_1.setBackground(SystemColor.menu);
 		panel_1.setBorder(new TitledBorder(null, "Berechtigungen",
 				TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 202, 557, 318);
+		panel_1.setBounds(10, 170, 557, 354);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 
 		JScrollPane scrollPane = new JScrollPane();
 		scrollPane
 				.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-		scrollPane.setBounds(10, 21, 537, 195);
+		scrollPane.setBounds(10, 21, 537, 228);
 		panel_1.add(scrollPane);
 
 		table = new JTable();
@@ -297,7 +295,7 @@ public class PermissionCreateImage_GUI extends JFrame {
 		panel.setBorder(new TitledBorder(null, "Freigabe",
 				TitledBorder.LEADING, TitledBorder.TOP, null, null));
 		panel.setBackground(SystemColor.menu);
-		panel.setBounds(10, 227, 537, 80);
+		panel.setBounds(10, 260, 537, 80);
 		panel_1.add(panel);
 
 		JLabel label = new JLabel("Freigabemodus:");
@@ -340,72 +338,52 @@ public class PermissionCreateImage_GUI extends JFrame {
 		label_2.setBounds(133, 11, 13, 14);
 		contentPanel.add(label_2);
 
-		JLabel lblNewLabel_1 = new JLabel("Berechtigung");
-		lblNewLabel_1.setBounds(146, 11, 80, 14);
+		JLabel lblNewLabel_1 = new JLabel("Neu");
+		lblNewLabel_1.setBounds(146, 11, 155, 14);
 		contentPanel.add(lblNewLabel_1);
 
-		JLabel lblName = new JLabel("Nach Namen filtern:");
-		lblName.setBounds(10, 36, 46, 20);
-		contentPanel.add(lblName);
-
-		textField = new JTextField();
-		textField.setBounds(69, 36, 171, 20);
-		contentPanel.add(textField);
-		textField.setColumns(10);
-
-		JLabel lblHochschule = new JLabel("Hochschule:");
-		lblHochschule.setBounds(275, 36, 80, 20);
-		contentPanel.add(lblHochschule);
-
-		final JComboBox comboBox = new JComboBox();
-		comboBox.setModel(new DefaultComboBoxModel(new String[] {
-				"Hochschule Offenburg", "Hochschule Reutlingen",
-				"Universität Freiburg" }));
-		comboBox.setBounds(365, 36, 202, 20);
-		contentPanel.add(comboBox);
-
 		JPanel panel_2 = new JPanel();
 		panel_2.setBackground(SystemColor.menu);
 		panel_2.setBorder(new TitledBorder(null, "Beschreibung",
 				TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_2.setBounds(10, 67, 557, 124);
+		panel_2.setBounds(10, 35, 557, 124);
 		contentPanel.add(panel_2);
 		panel_2.setLayout(null);
 
 		lblRead = new JLabel("Read");
-		lblRead.setBounds(20, 18, 90, 20);
+		lblRead.setBounds(28, 18, 90, 20);
 		panel_2.add(lblRead);
 
 		lblWrite = new JLabel("Write");
-		lblWrite.setBounds(20, 38, 90, 20);
+		lblWrite.setBounds(28, 38, 90, 20);
 		panel_2.add(lblWrite);
 
 		lblAdmin = new JLabel("Admin");
-		lblAdmin.setBounds(20, 78, 90, 20);
+		lblAdmin.setBounds(28, 78, 90, 20);
 		panel_2.add(lblAdmin);
 
 		lblLinkallowed = new JLabel("Link");
-		lblLinkallowed.setBounds(20, 58, 90, 20);
+		lblLinkallowed.setBounds(28, 58, 90, 20);
 		panel_2.add(lblLinkallowed);
 
 		lblReadDesc = new JLabel(
 				"Image lesen und starten, in Suchfenster und VMchooser sichtbar.");
-		lblReadDesc.setBounds(120, 18, 427, 20);
+		lblReadDesc.setBounds(128, 18, 380, 20);
 		panel_2.add(lblReadDesc);
 
 		lblWriteDesc = new JLabel(
 				"Image anpassen und überschreiben, jedoch nicht löschen.");
-		lblWriteDesc.setBounds(120, 38, 380, 20);
+		lblWriteDesc.setBounds(128, 38, 380, 20);
 		panel_2.add(lblWriteDesc);
 
 		lblAdminDesc = new JLabel(
 				"<HTML>Volle Rechte: read, write, löschen, Link und<br>Berechtigungen für andere Benutzer festlegen.</HTML>");
-		lblAdminDesc.setBounds(120, 78, 380, 40);
+		lblAdminDesc.setBounds(128, 78, 380, 40);
 		panel_2.add(lblAdminDesc);
 
 		lblLinkallowedDesc = new JLabel(
 				"Erzeugung einer Veranstaltung auf ein Image ist erlaubt.");
-		lblLinkallowedDesc.setBounds(120, 58, 380, 20);
+		lblLinkallowedDesc.setBounds(128, 58, 380, 20);
 		panel_2.add(lblLinkallowedDesc);
 		{
 			JPanel buttonPane = new JPanel();
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
index 04911c20..9ab70a5f 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
@@ -92,7 +92,6 @@ public class PermissionEditImage_GUI extends JFrame {
 		}
 
 	};
-	private JTextField textField;
 	private JLabel lblLinkAllowed;
 	private JLabel label_5;
 	private JLabel label_6;
@@ -159,14 +158,14 @@ public class PermissionEditImage_GUI extends JFrame {
 		panel_1.setBackground(SystemColor.menu);
 		panel_1.setBorder(new TitledBorder(null, "Berechtigungen",
 				TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 202, 557, 318);
+		panel_1.setBounds(10, 170, 557, 354);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 
 		JScrollPane scrollPane = new JScrollPane();
 		scrollPane
 				.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-		scrollPane.setBounds(10, 21, 537, 195);
+		scrollPane.setBounds(10, 21, 537, 228);
 		panel_1.add(scrollPane);
 
 		table = new JTable();
@@ -300,7 +299,7 @@ public class PermissionEditImage_GUI extends JFrame {
 		panel_2.setBorder(new TitledBorder(null, "Freigabe",
 				TitledBorder.LEADING, TitledBorder.TOP, null, null));
 		panel_2.setBackground(SystemColor.menu);
-		panel_2.setBounds(10, 227, 537, 80);
+		panel_2.setBounds(10, 260, 537, 80);
 		panel_1.add(panel_2);
 
 		JLabel label_7 = new JLabel("Freigabemodus:");
@@ -343,32 +342,12 @@ public class PermissionEditImage_GUI extends JFrame {
 		label_2.setBounds(133, 11, 13, 14);
 		contentPanel.add(label_2);
 
-		JLabel lblNewLabel_1 = new JLabel("Berechtigung");
-		lblNewLabel_1.setBounds(146, 11, 80, 14);
+		JLabel lblNewLabel_1 = new JLabel("Bearbeiten");
+		lblNewLabel_1.setBounds(146, 11, 155, 14);
 		contentPanel.add(lblNewLabel_1);
 
-		JLabel lblName = new JLabel("Name:");
-		lblName.setBounds(10, 36, 46, 20);
-		contentPanel.add(lblName);
-
-		textField = new JTextField();
-		textField.setBounds(69, 36, 171, 20);
-		contentPanel.add(textField);
-		textField.setColumns(10);
-
-		JLabel lblHochschule = new JLabel("Hochschule:");
-		lblHochschule.setBounds(275, 36, 80, 20);
-		contentPanel.add(lblHochschule);
-
-		JComboBox comboBox = new JComboBox();
-		comboBox.setModel(new DefaultComboBoxModel(new String[] {
-				"Hochschule Offenburg", "Hochschule Reutlingen",
-				"Universität Freiburg" }));
-		comboBox.setBounds(365, 36, 202, 20);
-		contentPanel.add(comboBox);
-
 		JPanel panel = new JPanel();
-		panel.setBounds(10, 67, 557, 124);
+		panel.setBounds(10, 35, 557, 124);
 		contentPanel.add(panel);
 		panel.setLayout(null);
 		panel.setBorder(new TitledBorder(null, "Beschreibung",
@@ -376,39 +355,39 @@ public class PermissionEditImage_GUI extends JFrame {
 		panel.setBackground(SystemColor.menu);
 
 		JLabel label = new JLabel("Read");
-		label.setBounds(20, 18, 90, 20);
+		label.setBounds(28, 18, 90, 20);
 		panel.add(label);
 
 		JLabel label_3 = new JLabel("Write");
-		label_3.setBounds(20, 38, 90, 20);
+		label_3.setBounds(28, 38, 90, 20);
 		panel.add(label_3);
 
 		JLabel lblImageLesenUnd = new JLabel(
 				"Image lesen und starten, in Suchfenster und VMchooser sichtbar.");
-		lblImageLesenUnd.setBounds(120, 18, 380, 20);
+		lblImageLesenUnd.setBounds(128, 18, 380, 20);
 		panel.add(lblImageLesenUnd);
 
 		JLabel lblImageAnpassenUnd = new JLabel(
 				"Image anpassen und überschreiben, jedoch nicht löschen.");
-		lblImageAnpassenUnd.setBounds(120, 38, 380, 20);
+		lblImageAnpassenUnd.setBounds(128, 38, 380, 20);
 		panel.add(lblImageAnpassenUnd);
 
 		lblLinkAllowed = new JLabel("Link");
-		lblLinkAllowed.setBounds(20, 58, 90, 20);
+		lblLinkAllowed.setBounds(28, 58, 90, 20);
 		panel.add(lblLinkAllowed);
 
 		label_5 = new JLabel("Admin");
-		label_5.setBounds(20, 78, 90, 20);
+		label_5.setBounds(28, 78, 90, 20);
 		panel.add(label_5);
 
 		label_6 = new JLabel(
 				"Erzeugung einer Veranstaltung auf ein Image ist erlaubt.");
-		label_6.setBounds(120, 58, 380, 20);
+		label_6.setBounds(128, 58, 380, 20);
 		panel.add(label_6);
 
 		lblvolleRechteRead = new JLabel(
 				"<HTML>Volle Rechte: read, write, löschen, Link und<br>Berechtigungen für andere Benutzer festlegen.</HTML>");
-		lblvolleRechteRead.setBounds(120, 78, 380, 40);
+		lblvolleRechteRead.setBounds(128, 78, 380, 40);
 		panel.add(lblvolleRechteRead);
 		{
 			JPanel buttonPane = new JPanel();
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index e92b04b0..5942c49d 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -400,8 +400,8 @@ public class SearchEditImage_GUI extends JFrame {
 		label_2.setBounds(116, 11, 13, 14);
 		contentPanel.add(label_2);
 
-		JLabel lblNewLabel_1 = new JLabel("Imageauswahl");
-		lblNewLabel_1.setBounds(129, 11, 85, 14);
+		JLabel lblNewLabel_1 = new JLabel("Bearbeiten");
+		lblNewLabel_1.setBounds(129, 11, 155, 14);
 		contentPanel.add(lblNewLabel_1);
 
 		JButton btnDownload = new JButton("Download");
diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index 3a5e6ccf..49e71b7d 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -401,8 +401,8 @@ public class SearchImage_GUI extends JFrame {
 		label_2.setBounds(116, 11, 13, 14);

 		contentPanel.add(label_2);

 

-		JLabel lblNewLabel_1 = new JLabel("Imageauswahl");

-		lblNewLabel_1.setBounds(129, 11, 85, 14);

+		JLabel lblNewLabel_1 = new JLabel("Suche und Download");

+		lblNewLabel_1.setBounds(129, 11, 155, 14);

 		contentPanel.add(lblNewLabel_1);

 

 		tabbedPane = new JTabbedPane(JTabbedPane.TOP);

diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
index be4a25a4..bcb14c9e 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
@@ -238,7 +238,7 @@ public class CreateLectureAllgemein_GUI extends JFrame {
 		contentPanel.add(label_2);
 
 		JLabel lblNewLabel_1 = new JLabel("Neu");
-		lblNewLabel_1.setBounds(174, 11, 46, 14);
+		lblNewLabel_1.setBounds(174, 11, 155, 14);
 		contentPanel.add(lblNewLabel_1);
 
 		JPanel panel_2 = new JPanel();
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index fd1a2c51..8d85ed47 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -387,8 +387,8 @@ public class CreateLectureLink_GUI extends JFrame {
 		label_2.setBounds(151, 11, 13, 14);
 		contentPanel.add(label_2);
 
-		JLabel lblNewLabel_1 = new JLabel("Imageauswahl");
-		lblNewLabel_1.setBounds(164, 11, 85, 14);
+		JLabel lblNewLabel_1 = new JLabel("Neu");
+		lblNewLabel_1.setBounds(164, 11, 155, 14);
 		contentPanel.add(lblNewLabel_1);
 
 		JScrollPane scrollPaneMyImage = new JScrollPane();
diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
index fa03a7ff..0c83fc91 100644
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -300,8 +300,8 @@ public class DeleteLecture_GUI extends JFrame {
 		label_2.setBounds(152, 11, 13, 14);
 		contentPanel.add(label_2);
 
-		JLabel lblNewLabel_1 = new JLabel("Veranstaltung löschen");
-		lblNewLabel_1.setBounds(166, 11, 128, 14);
+		JLabel lblNewLabel_1 = new JLabel("Löschen");
+		lblNewLabel_1.setBounds(166, 11, 155, 14);
 		contentPanel.add(lblNewLabel_1);
 		JScrollPane scrollPaneMyImage = new JScrollPane();
 		scrollPaneMyImage.setBounds(10, 120, 552, 369);
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
index 6ccd0831..179064ea 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
@@ -236,7 +236,7 @@ public class EditLectureAllgemein_GUI extends JFrame {
 		contentPanel.add(label_2);
 
 		JLabel lblNewLabel_1 = new JLabel("Bearbeiten");
-		lblNewLabel_1.setBounds(188, 11, 72, 14);
+		lblNewLabel_1.setBounds(188, 11, 155, 14);
 		contentPanel.add(lblNewLabel_1);
 
 		JPanel panel_2 = new JPanel();
@@ -491,7 +491,7 @@ public class EditLectureAllgemein_GUI extends JFrame {
 							Image.image.setImagename(textFieldLaborname
 									.getText());
 
-							PermissionCreateLecture_GUI ev = new PermissionCreateLecture_GUI(c);
+							PermissionEditLecture_GUI ev = new PermissionEditLecture_GUI(c);
 							ev.setVisible(true);
 							dispose();
 						}
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
index ce2130ad..1db2c46b 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -368,8 +368,8 @@ public class EditLectureLink_GUI extends JFrame {
 		label_2.setBounds(151, 11, 13, 14);
 		contentPanel.add(label_2);
 
-		JLabel lblNewLabel_1 = new JLabel("Veranstaltung verlinken");
-		lblNewLabel_1.setBounds(164, 11, 113, 14);
+		JLabel lblNewLabel_1 = new JLabel("Bearbeiten");
+		lblNewLabel_1.setBounds(164, 11, 155, 14);
 		contentPanel.add(lblNewLabel_1);
 
 		tabbedPane = new JTabbedPane(JTabbedPane.TOP);
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
index e5727867..b5750898 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -294,8 +294,8 @@ public class EditLectureSearch_GUI extends JFrame {
 		label_2.setBounds(152, 11, 13, 14);
 		contentPanel.add(label_2);
 
-		JLabel lblNewLabel_1 = new JLabel("Veranstaltungsauswahl");
-		lblNewLabel_1.setBounds(166, 11, 128, 14);
+		JLabel lblNewLabel_1 = new JLabel("Bearbeiten");
+		lblNewLabel_1.setBounds(166, 11, 155, 14);
 		contentPanel.add(lblNewLabel_1);
 		
 				JScrollPane scrollPaneMyImage = new JScrollPane();
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
index 761dd406..de19520b 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
@@ -338,12 +338,12 @@ public class PermissionCreateLecture_GUI extends JFrame {
 		label_2.setBounds(181, 11, 13, 14);
 		contentPanel.add(label_2);
 
-		JLabel lblNewLabel_1 = new JLabel("Berechtigungen");
-		lblNewLabel_1.setBounds(194, 11, 95, 14);
+		JLabel lblNewLabel_1 = new JLabel("Neu");
+		lblNewLabel_1.setBounds(194, 11, 155, 14);
 		contentPanel.add(lblNewLabel_1);
 
 		JPanel panel = new JPanel();
-		panel.setBounds(10, 67, 557, 148);
+		panel.setBounds(10, 35, 557, 148);
 		contentPanel.add(panel);
 		panel.setLayout(null);
 		panel.setBorder(new TitledBorder(null, "Beschreibung",
@@ -351,38 +351,38 @@ public class PermissionCreateLecture_GUI extends JFrame {
 		panel.setBackground(SystemColor.menu);
 
 		JLabel label = new JLabel("Read");
-		label.setBounds(20, 18, 90, 20);
+		label.setBounds(28, 18, 90, 20);
 		panel.add(label);
 
 		JLabel label_3 = new JLabel("Write");
-		label_3.setBounds(20, 38, 90, 20);
+		label_3.setBounds(28, 38, 90, 20);
 		panel.add(label_3);
 
 		JLabel label_5 = new JLabel("Admin");
-		label_5.setBounds(20, 78, 90, 20);
+		label_5.setBounds(28, 78, 90, 20);
 		panel.add(label_5);
 
 		JLabel label_7 = new JLabel(
 				"Image darf gelesen und gestartet werden und ist in Suchfenster sichtbar.");
-		label_7.setBounds(120, 18, 380, 20);
+		label_7.setBounds(128, 18, 380, 20);
 		panel.add(label_7);
 
 		JLabel lblimageDarfAngepasst = new JLabel(
 				"<HTML>Image darf angepasst und &uuml;berschrieben, jedoch nicht gel&ouml;scht werden. Berechtigungen f&uuml;r andere Benutzer festlegen</HTML>");
-		lblimageDarfAngepasst.setBounds(120, 38, 380, 45);
+		lblimageDarfAngepasst.setBounds(128, 38, 380, 45);
 		panel.add(lblimageDarfAngepasst);
 
 		JLabel lblvolleRechteRead = new JLabel(
 				"<HTML>Volle Rechte: read, write, l&ouml;schen und Berechtigungen f&uuml;r andere Benutzer festlegen.</HTML>");
-		lblvolleRechteRead.setBounds(120, 78, 380, 40);
+		lblvolleRechteRead.setBounds(128, 78, 380, 40);
 		panel.add(lblvolleRechteRead);
 
 		JCheckBox checkBox = new JCheckBox("");
-		checkBox.setBounds(115, 118, 21, 23);
+		checkBox.setBounds(123, 118, 21, 23);
 		panel.add(checkBox);
 
 		JLabel label_4 = new JLabel("Für alle sichtbar");
-		label_4.setBounds(20, 119, 90, 20);
+		label_4.setBounds(28, 119, 90, 20);
 		panel.add(label_4);
 
 		JPanel panel_1 = new JPanel();
@@ -390,13 +390,13 @@ public class PermissionCreateLecture_GUI extends JFrame {
 		panel_1.setBorder(new TitledBorder(null, "Suite-Berechtigungen",
 				TitledBorder.LEADING, TitledBorder.TOP, null, null));
 		panel_1.setBackground(SystemColor.menu);
-		panel_1.setBounds(10, 226, 311, 294);
+		panel_1.setBounds(10, 194, 311, 326);
 		contentPanel.add(panel_1);
 
 		JScrollPane scrollPaneMyImage = new JScrollPane();
 		scrollPaneMyImage
 				.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-		scrollPaneMyImage.setBounds(10, 28, 291, 223);
+		scrollPaneMyImage.setBounds(10, 28, 291, 251);
 		panel_1.add(scrollPaneMyImage);
 		
 		
@@ -408,12 +408,12 @@ public class PermissionCreateLecture_GUI extends JFrame {
 		
 
 		JButton button = new JButton("Hinzufügen");
-		button.setBounds(10, 260, 89, 23);
+		button.setBounds(10, 290, 89, 23);
 		panel_1.add(button);
 
 		JButton button_1 = new JButton("Löschen");
 		button_1.setEnabled(false);
-		button_1.setBounds(109, 260, 89, 23);
+		button_1.setBounds(109, 290, 89, 23);
 		panel_1.add(button_1);
 
 		JPanel panel_2 = new JPanel();
@@ -421,14 +421,14 @@ public class PermissionCreateLecture_GUI extends JFrame {
 		panel_2.setBorder(new TitledBorder(null, "Sichtbarkeit im VMChooser",
 				TitledBorder.LEADING, TitledBorder.TOP, null, null));
 		panel_2.setBackground(SystemColor.menu);
-		panel_2.setBounds(331, 226, 236, 294);
+		panel_2.setBounds(331, 194, 236, 326);
 		contentPanel.add(panel_2);
 
 		JScrollPane scrollPane_1 = new JScrollPane();
 		scrollPane_1
 				.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
 		scrollPane_1.setEnabled(false);
-		scrollPane_1.setBounds(23, 88, 203, 161);
+		scrollPane_1.setBounds(16, 88, 210, 191);
 		panel_2.add(scrollPane_1);
 
 		JRadioButton radioButton = new JRadioButton("Sichtbar für alle");
@@ -444,12 +444,12 @@ public class PermissionCreateLecture_GUI extends JFrame {
 
 		JButton button_2 = new JButton("Hinzufügen");
 		button_2.setEnabled(false);
-		button_2.setBounds(23, 260, 89, 23);
+		button_2.setBounds(23, 290, 89, 23);
 		panel_2.add(button_2);
 
 		JButton button_3 = new JButton("Löschen");
 		button_3.setEnabled(false);
-		button_3.setBounds(122, 260, 89, 23);
+		button_3.setBounds(122, 290, 89, 23);
 		panel_2.add(button_3);
 		{
 			JPanel buttonPane = new JPanel();
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
index f0a1231e..f2e29690 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
@@ -87,7 +87,6 @@ public class PermissionEditLecture_GUI extends JFrame {
 		    
 
 	};
-	private JTextField textField;
 
 	public PermissionEditLecture_GUI(Component formerGUI) {
 		addWindowListener(new WindowAdapter() {
@@ -141,51 +140,51 @@ public class PermissionEditLecture_GUI extends JFrame {
 		panel.setLayout(null);
 		panel.setBorder(new TitledBorder(null, "Beschreibung", TitledBorder.LEADING, TitledBorder.TOP, null, null));
 		panel.setBackground(SystemColor.menu);
-		panel.setBounds(10, 67, 557, 148);
+		panel.setBounds(10, 35, 557, 148);
 		contentPanel.add(panel);
 		
 		JLabel label = new JLabel("Read");
-		label.setBounds(20, 18, 90, 20);
+		label.setBounds(28, 18, 90, 20);
 		panel.add(label);
 		
 		JLabel label_3 = new JLabel("Image darf gelesen und gestartet werden und ist in Suchfenster sichtbar.");
-		label_3.setBounds(120, 18, 380, 20);
+		label_3.setBounds(128, 18, 380, 20);
 		panel.add(label_3);
 		
 		JLabel label_4 = new JLabel("Write");
-		label_4.setBounds(20, 38, 90, 20);
+		label_4.setBounds(28, 38, 90, 20);
 		panel.add(label_4);
 		
 		JLabel label_5 = new JLabel("<HTML>Image darf angepasst und überschrieben, jedoch nicht gelöscht werden. Berechtigungen für andere Benutzer festlegen</HTML>");
-		label_5.setBounds(120, 38, 380, 45);
+		label_5.setBounds(128, 38, 380, 45);
 		panel.add(label_5);
 		
 		JLabel label_6 = new JLabel("Admin");
-		label_6.setBounds(20, 78, 90, 20);
+		label_6.setBounds(28, 78, 90, 20);
 		panel.add(label_6);
 		
 		JLabel label_7 = new JLabel("<HTML>Volle Rechte: read, write, löschen und Berechtigungen für andere Benutzer festlegen.</HTML>");
-		label_7.setBounds(120, 78, 380, 40);
+		label_7.setBounds(128, 78, 380, 40);
 		panel.add(label_7);
 		
 		JLabel label_8 = new JLabel("Für alle sichtbar");
-		label_8.setBounds(20, 119, 90, 20);
+		label_8.setBounds(28, 119, 90, 20);
 		panel.add(label_8);
 		
 		JCheckBox checkBox = new JCheckBox("");
-		checkBox.setBounds(115, 118, 21, 23);
+		checkBox.setBounds(123, 118, 21, 23);
 		panel.add(checkBox);
 		
 		JPanel panel_1 = new JPanel();
 		panel_1.setBackground(SystemColor.menu);
 		panel_1.setBorder(new TitledBorder(null, "Suite-Berechtigungen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 226, 311, 294);
+		panel_1.setBounds(10, 194, 311, 326);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 		
 		JScrollPane scrollPane = new JScrollPane();
 		scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-		scrollPane.setBounds(10, 28, 291, 223);
+		scrollPane.setBounds(10, 28, 291, 251);
 		panel_1.add(scrollPane);
 		
 		table = new JTable();
@@ -221,12 +220,12 @@ public class PermissionEditLecture_GUI extends JFrame {
 		
 		JButton button = new JButton("Hinzufügen");
 		button.setEnabled(false);
-		button.setBounds(10, 260, 89, 23);
+		button.setBounds(10, 290, 89, 23);
 		panel_1.add(button);
 		
 		JButton button_1 = new JButton("Löschen");
 		button_1.setEnabled(false);
-		button_1.setBounds(109, 260, 89, 23);
+		button_1.setBounds(109, 290, 89, 23);
 		panel_1.add(button_1);
 		
 		JLabel lblHauptmen = new JLabel("Hauptmenü");
@@ -256,39 +255,21 @@ public class PermissionEditLecture_GUI extends JFrame {
 		label_2.setBounds(181, 11, 13, 14);
 		contentPanel.add(label_2);
 		
-		JLabel lblNewLabel_1 = new JLabel("Berechtigungen");
-		lblNewLabel_1.setBounds(194, 11, 99, 14);
+		JLabel lblNewLabel_1 = new JLabel("Bearbeiten");
+		lblNewLabel_1.setBounds(194, 11, 155, 14);
 		contentPanel.add(lblNewLabel_1);
 		
-		JLabel lblName = new JLabel("Name:");
-		lblName.setBounds(10, 36, 46, 20);
-		contentPanel.add(lblName);
-		
-		textField = new JTextField();
-		textField.setBounds(69, 36, 171, 20);
-		contentPanel.add(textField);
-		textField.setColumns(10);
-		
-		JLabel lblHochschule = new JLabel("Hochschule:");
-		lblHochschule.setBounds(275, 36, 80, 20);
-		contentPanel.add(lblHochschule);
-		
-		JComboBox comboBox = new JComboBox();
-		comboBox.setModel(new DefaultComboBoxModel(new String[] {"Hochschule Offenburg", "Hochschule Reutlingen", "Universität Freiburg"}));
-		comboBox.setBounds(365, 36, 202, 20);
-		contentPanel.add(comboBox);
-		
 		JPanel panel_2 = new JPanel();
 		panel_2.setLayout(null);
 		panel_2.setBorder(new TitledBorder(null, "Sichtbarkeit im VMChooser", TitledBorder.LEADING, TitledBorder.TOP, null, null));
 		panel_2.setBackground(SystemColor.menu);
-		panel_2.setBounds(331, 226, 236, 294);
+		panel_2.setBounds(331, 194, 236, 326);
 		contentPanel.add(panel_2);
 		
 		final JScrollPane scrollPane_1 = new JScrollPane();
 		scrollPane_1.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
 		scrollPane_1.setEnabled(false);
-		scrollPane_1.setBounds(23, 88, 203, 161);
+		scrollPane_1.setBounds(16, 88, 210, 191);
 		panel_2.add(scrollPane_1);
 		
 		JRadioButton rdbtnAlle = new JRadioButton("Sichtbar für alle");
@@ -304,12 +285,12 @@ public class PermissionEditLecture_GUI extends JFrame {
 		
 		final JButton btnAddVmUser = new JButton("Hinzufügen");
 		btnAddVmUser.setEnabled(false);
-		btnAddVmUser.setBounds(23, 260, 89, 23);
+		btnAddVmUser.setBounds(23, 290, 89, 23);
 		panel_2.add(btnAddVmUser);
 		
 		final JButton btnDelVmUser = new JButton("Löschen");
 		btnDelVmUser.setEnabled(false);
-		btnDelVmUser.setBounds(122, 260, 89, 23);
+		btnDelVmUser.setBounds(122, 290, 89, 23);
 		panel_2.add(btnDelVmUser);
 		{
 			JPanel buttonPane = new JPanel();
diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index 1f597cb3..14e16fc0 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -281,8 +281,8 @@ public class SearchLecture_GUI extends JFrame {
 		label_2.setBounds(152, 11, 13, 14);

 		contentPanel.add(label_2);

 

-		JLabel lblNewLabel_1 = new JLabel("Veranstaltungssuche");

-		lblNewLabel_1.setBounds(166, 11, 128, 14);

+		JLabel lblNewLabel_1 = new JLabel("Suche");

+		lblNewLabel_1.setBounds(166, 11, 155, 14);

 		contentPanel.add(lblNewLabel_1);

 

 		tabbedPane = new JTabbedPane(JTabbedPane.TOP);