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

Conflicts:
	dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
	dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
	dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java

möp. großes geschrei, fehler bitte an mich.
	dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
	dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
	dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
	dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
	dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
	dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
	dozentenmodulserver/src/main/java/server/ServerHandler.java
	dozentenmodulserver/src/main/java/server/generated/Server.java
	dozentenmodulserver/thrift/server.thrift

1 files changed, 22 insertions, 1 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
index 12ef7554..e80c3a68 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
@@ -43,7 +43,11 @@ import javax.swing.border.TitledBorder;
 
 import models.Image;
 import models.Links;
+
 import models.SessionData;
+
+import models.person;
+
 import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.GuiOrganizer;
@@ -108,7 +112,7 @@ public class CreateImageTechnisch_GUI extends JFrame {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		setTitle("bwLehrpool Suite - Image erzeugen");
+		setTitle("bwLehrpool Suite - Image erzeugen - "+person.verantwortlicher.getUserID());
 
 		setBounds(0, 0, 603, 722);
 		setLocationRelativeTo(formerGUI);
@@ -163,6 +167,14 @@ public class CreateImageTechnisch_GUI extends JFrame {
 		panel_1.add(lblNewLabel_2);
 		
 		chckbxIsLicensed = new JCheckBox("");
+		chckbxIsLicensed.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				//if windows is selected, always set isLicensed()=true
+				if(comboBox.getSelectedItem().toString().startsWith("Windows")){
+					chckbxIsLicensed.setSelected(true);
+				}
+			}
+		});
 		chckbxIsLicensed.setSelected(true);
 		chckbxIsLicensed.setBounds(266, 52, 97, 23);
 		panel_1.add(chckbxIsLicensed);
@@ -170,6 +182,7 @@ public class CreateImageTechnisch_GUI extends JFrame {
 		chckbxIsInternetBlocked = new JCheckBox("");
 		chckbxIsInternetBlocked.setSelected(Image.image.isInternet());
 		chckbxIsInternetBlocked.setBounds(266, 80, 97, 23);
+		chckbxIsInternetBlocked.setEnabled(false);
 		panel_1.add(chckbxIsInternetBlocked);
 		
 		JLabel lblLizenzserverEintragen = new JLabel("Lizenzserver eintragen:");
@@ -189,6 +202,14 @@ public class CreateImageTechnisch_GUI extends JFrame {
 		// populate comboBox with list of supported OS we get
 		// from the server ...
 		comboBox = new JComboBox<String>();
+		comboBox.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				//if windows is selected, always set isLicensed()=true
+				if(comboBox.getSelectedItem().toString().startsWith("Windows")){
+					chckbxIsLicensed.setSelected(true);
+				}
+			}
+		});
 		List<String> os = null;
 		try {
 			os = client.getAllOS(SessionData.session.getAuthToken());