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, 3 insertions, 13 deletions

diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index 510e7a7d..4a8b9fd9 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -102,7 +102,6 @@ public class SearchLecture_GUI extends JFrame {
 			modelAll);

 	final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(

 			modelMyLectures);

-	private JTextField textField;

 

 

 	/**

@@ -217,8 +216,8 @@ public class SearchLecture_GUI extends JFrame {
 		contentPanel.add(panel_1);

 		panel_1.setLayout(null);

 

-		JLabel lblNewLabel_2 = new JLabel("Name:");

-		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);

 

 		textFieldName = new JTextField();

@@ -248,18 +247,9 @@ public class SearchLecture_GUI extends JFrame {
 			}

 		});

 

-		textFieldName.setBounds(96, 30, 166, 20);

+		textFieldName.setBounds(133, 30, 400, 20);

 		panel_1.add(textFieldName);

 		textFieldName.setColumns(10);

-		

-		JLabel label = new JLabel("Beschreibung:");

-		label.setBounds(291, 30, 80, 20);

-		panel_1.add(label);

-		

-		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() {