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

Conflicts:
	dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
	dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
	dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
g

1 files changed, 5 insertions, 15 deletions

diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index a8993278..b874b9c2 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -125,7 +125,6 @@ public class CreateLectureLink_GUI extends JFrame {
 			modelMyImages);
 	final TableRowSorter<TableModel> rowSorterPublicVorlagen = new TableRowSorter<TableModel>(
 			modelPublicVorlagen);
-	private JTextField textField;
 	
 	/**
 	 * Create the dialog.
@@ -260,12 +259,12 @@ public class CreateLectureLink_GUI extends JFrame {
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 
-		JLabel lblNewLabel_2 = new JLabel("Anzeigename:");
-		lblNewLabel_2.setBounds(10, 30, 80, 20);
+		JLabel lblNewLabel_2 = new JLabel("Volltextsuche:");
+		lblNewLabel_2.setBounds(30, 30, 80, 20);
 		panel_1.add(lblNewLabel_2);
 
 		JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");
-		lblInternetIstInnerhalb.setBounds(10, 58, 80, 20);
+		lblInternetIstInnerhalb.setBounds(30, 58, 80, 20);
 		panel_1.add(lblInternetIstInnerhalb);
 
 		textFieldName = new JTextField();
@@ -299,7 +298,7 @@ public class CreateLectureLink_GUI extends JFrame {
 
 		});
 
-		textFieldName.setBounds(96, 30, 166, 20);
+		textFieldName.setBounds(133, 30, 400, 20);
 		panel_1.add(textFieldName);
 		textFieldName.setColumns(10);
 
@@ -341,17 +340,8 @@ public class CreateLectureLink_GUI extends JFrame {
 				}
 			}
 		});
-		comboBox.setBounds(96, 58, 166, 20);
+		comboBox.setBounds(133, 58, 191, 20);
 		panel_1.add(comboBox);
-		
-		JLabel label_3 = new JLabel("Beschreibung:");
-		label_3.setBounds(291, 30, 80, 20);
-		panel_1.add(label_3);
-		
-		textField = new JTextField();
-		textField.setColumns(10);
-		textField.setBounds(381, 30, 166, 20);
-		panel_1.add(textField);
 
 		JLabel lblHauptmen = new JLabel("Hauptmenü");
 		lblHauptmen.addMouseListener(new MouseAdapter() {