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, 8 insertions, 18 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index d021b264..a51cdfe0 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -141,7 +141,6 @@ public class SearchImage_GUI extends JFrame {
 			modelMyImages);

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

 			modelPublicVorlagen);

-	private JTextField textField;

 

 	/**

 	 * Create the dialog.

@@ -282,12 +281,12 @@ public class SearchImage_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();

@@ -322,7 +321,7 @@ public class SearchImage_GUI extends JFrame {
 			}

 		});

 

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

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

 		panel_1.add(textFieldName);

 		textFieldName.setColumns(10);

 

@@ -369,17 +368,8 @@ public class SearchImage_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() {

@@ -753,11 +743,11 @@ public class SearchImage_GUI extends JFrame {
 		panel.add(lblLetztesUpdate);

 

 		JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:");

-		lblImageIstVorlage.setBounds(10, 336, 130, 14);

+		lblImageIstVorlage.setBounds(10, 334, 130, 14);

 		panel.add(lblImageIstVorlage);

 

 		labelVorlage = new JLabel("");

-		labelVorlage.setBounds(10, 350, 296, 14);

+		labelVorlage.setBounds(10, 348, 296, 14);

 		panel.add(labelVorlage);

 

 		labelLizenzSoftware = new JLabel("");

@@ -794,7 +784,7 @@ public class SearchImage_GUI extends JFrame {
 		panel.add(labelCPU);

 

 		JLabel lblTechnischeDaten = new JLabel("Technische Daten:");

-		lblTechnischeDaten.setBounds(10, 322, 296, 14);

+		lblTechnischeDaten.setBounds(10, 312, 296, 14);

 		panel.add(lblTechnischeDaten);

 

 		JLabel lblId = new JLabel("ID:");