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

1 files changed, 29 insertions, 33 deletions

diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
index fb7a2c34..de98b04d 100644
--- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
@@ -857,115 +857,111 @@ public class DeleteImage_GUI extends JFrame {
 		getContentPane().add(panel);
 		
 		JLabel lblName = new JLabel("Name:");
-		lblName.setBounds(10, 73, 130, 14);
+		lblName.setBounds(10, 87, 130, 14);
 		panel.add(lblName);
 		
 		labelName = new JLabel("");
-		labelName.setBounds(150, 73, 130, 14);
+		labelName.setBounds(10, 102, 296, 14);
 		panel.add(labelName);
 		
 		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");
-		lblVerantwortlicher.setBounds(10, 224, 130, 14);
+		lblVerantwortlicher.setBounds(10, 259, 130, 14);
 		panel.add(lblVerantwortlicher);
 		
 		labelOS = new JLabel("");
-		labelOS.setBounds(150, 174, 130, 14);
+		labelOS.setBounds(10, 216, 296, 14);
 		panel.add(labelOS);
 		
 		JLabel lblWeitereVerantwortliche = new JLabel("Betriebssystem:");
-		lblWeitereVerantwortliche.setBounds(10, 174, 130, 14);
+		lblWeitereVerantwortliche.setBounds(10, 202, 130, 14);
 		panel.add(lblWeitereVerantwortliche);
 		
 		labelVerantwortlicher = new JLabel("");
-		labelVerantwortlicher.setBounds(150, 224, 130, 14);
+		labelVerantwortlicher.setBounds(10, 272, 296, 14);
 		panel.add(labelVerantwortlicher);
 		
 		JLabel label = new JLabel("Weitere Verantwortliche:");
-		label.setBounds(10, 249, 130, 14);
+		label.setBounds(10, 284, 130, 14);
 		panel.add(label);
 		
 		labelWeitereVerantwortliche = new JLabel("");
-		labelWeitereVerantwortliche.setBounds(150, 249, 130, 14);
+		labelWeitereVerantwortliche.setBounds(10, 297, 296, 14);
 		panel.add(labelWeitereVerantwortliche);
 		
-		JLabel label_5 = new JLabel("");
-		label_5.setBounds(150, 130, 130, 14);
-		panel.add(label_5);
-		
 		labelUpdate = new JLabel("");
-		labelUpdate.setBounds(150, 199, 130, 14);
+		labelUpdate.setBounds(10, 245, 296, 14);
 		panel.add(labelUpdate);
 		
 		JLabel lblLetztesUpdate = new JLabel("Letztes Update:");
-		lblLetztesUpdate.setBounds(10, 199, 130, 14);
+		lblLetztesUpdate.setBounds(10, 231, 130, 14);
 		panel.add(lblLetztesUpdate);
 		
 		JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:");
-		lblImageIstVorlage.setBounds(10, 331, 130, 14);
+		lblImageIstVorlage.setBounds(10, 336, 130, 14);
 		panel.add(lblImageIstVorlage);
 		
 		labelVorlage = new JLabel("");
-		labelVorlage.setBounds(150, 331, 130, 14);
+		labelVorlage.setBounds(10, 350, 296, 14);
 		panel.add(labelVorlage);
 		
 		labelLizenzSoftware = new JLabel("");
-		labelLizenzSoftware.setBounds(150, 356, 130, 14);
+		labelLizenzSoftware.setBounds(10, 383, 296, 14);
 		panel.add(labelLizenzSoftware);
 		
 		JLabel lblLizenzpflichtigeSoftware = new JLabel("Lizenzpflichtige Software:");
-		lblLizenzpflichtigeSoftware.setBounds(10, 356, 130, 14);
+		lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14);
 		panel.add(lblLizenzpflichtigeSoftware);
 		
 		JLabel lblInternet = new JLabel("Internet:");
-		lblInternet.setBounds(10, 381, 130, 14);
+		lblInternet.setBounds(10, 400, 130, 14);
 		panel.add(lblInternet);
 		
 		labelInternet = new JLabel("");
-		labelInternet.setBounds(150, 381, 130, 14);
+		labelInternet.setBounds(10, 417, 296, 14);
 		panel.add(labelInternet);
 		
 		JLabel lblEmpfehlungRam = new JLabel("Empfehlung RAM:");
-		lblEmpfehlungRam.setBounds(10, 406, 130, 14);
+		lblEmpfehlungRam.setBounds(10, 432, 130, 14);
 		panel.add(lblEmpfehlungRam);
 		
 		labelRam = new JLabel("");
-		labelRam.setBounds(150, 406, 130, 14);
+		labelRam.setBounds(10, 455, 296, 14);
 		panel.add(labelRam);
 		
 		JLabel lblEmpfehlungCpu = new JLabel("Empfehlung CPU:");
-		lblEmpfehlungCpu.setBounds(10, 431, 130, 14);
+		lblEmpfehlungCpu.setBounds(10, 469, 130, 14);
 		panel.add(lblEmpfehlungCpu);
 		
 		labelCPU = new JLabel("");
-		labelCPU.setBounds(150, 431, 130, 14);
+		labelCPU.setBounds(10, 487, 296, 14);
 		panel.add(labelCPU);
 		
 		JLabel lblTechnischeDaten = new JLabel("Technische Daten:");
-		lblTechnischeDaten.setBounds(10, 295, 296, 14);
+		lblTechnischeDaten.setBounds(10, 322, 296, 14);
 		panel.add(lblTechnischeDaten);
 		
 		JLabel lblId = new JLabel("ID:");
-		lblId.setBounds(10, 23, 130, 14);
+		lblId.setBounds(10, 23, 296, 14);
 		panel.add(lblId);
 		
 		labelID = new JLabel("");
-		labelID.setBounds(150, 23, 130, 14);
+		labelID.setBounds(10, 37, 296, 14);
 		panel.add(labelID);
 		
 		labelVersion = new JLabel("");
-		labelVersion.setBounds(150, 48, 130, 14);
+		labelVersion.setBounds(10, 73, 296, 14);
 		panel.add(labelVersion);
 		
 		JLabel lblVersion = new JLabel("Version:");
-		lblVersion.setBounds(10, 48, 130, 14);
+		lblVersion.setBounds(10, 57, 296, 14);
 		panel.add(lblVersion);
 		
 		JLabel lblBeschreibung = new JLabel("Beschreibung:");
-		lblBeschreibung.setBounds(10, 98, 130, 14);
+		lblBeschreibung.setBounds(10, 119, 130, 14);
 		panel.add(lblBeschreibung);
 		
 		JScrollPane scrollPane = new JScrollPane();
-		scrollPane.setBounds(148, 98, 158, 65);
+		scrollPane.setBounds(10, 135, 296, 65);
 		panel.add(scrollPane);
 		
 		textAreadesc = new JTextArea();
@@ -1109,8 +1105,8 @@ public class DeleteImage_GUI extends JFrame {
 			labelRam.setText(res.get("ram"));
 			labelCPU.setText(res.get("cpu"));
 			labelID.setText(res.get("id"));
-			labelVersion.setText("version");
-			textAreadesc.setText("desc");
+			labelVersion.setText(res.get("version"));
+			textAreadesc.setText(res.get("desc"));
 		} catch (TException | ParseException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();