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

Conflicts:
	Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
yxc

12 files changed, 74 insertions, 20 deletions

diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class
index 7386f412..d6b99925 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class
index 48eda34b..97d4800a 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class
index c4a626a9..02d5a631 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class
deleted file mode 100644
index 6986cdbd..00000000
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class
deleted file mode 100644
index 502e389a..00000000
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class
index b967f4da..93784d1a 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class
index a2842e4d..bb9c8ff4 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class
deleted file mode 100644
index 37db7038..00000000
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class
index a8f331c8..123d5023 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class
index e46e3ff7..145e938e 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
index db1d6d14..e99a3af8 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
index 56d66c66..2670b2bd 100644
--- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
+++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
@@ -81,31 +81,32 @@ public class MainMenue_GUI extends JFrame {
 		
 		//for testing
 		System.out.println("Setze Rechte für Student");
-		imageRights.setRead(1);
-		imageRights.setWrite(0);
-		imageRights.setChangePermission(0);
-		imageRights.setAdmin(0);
-		imageRights.setLinkAllowed(0);
-		System.out.println("Rechte (r,w,cp,a,la): "+imageRights.getRead()+","+imageRights.getWrite()+","+imageRights.getChangePermission()+","+imageRights.getAdmin()+","+imageRights.getAdmin());
+		ImageRights.rights.setRead(1);
+		ImageRights.rights.setWrite(0);
+		ImageRights.rights.setChangePermission(0);
+		ImageRights.rights.setAdmin(0);
+		ImageRights.rights.setLinkAllowed(0);
+		System.out.println("Rechte (r,w,cp,a,la): "+ImageRights.rights.getRead()+","+ImageRights.rights.getWrite()+","+ImageRights.rights.getChangePermission()+","+ImageRights.rights.getAdmin()+","+ImageRights.rights.getAdmin());
 		
-		/*//for testing
-		System.out.println("Setze Rechte für Dozent");
-		imageRights.setRead(1);
-		imageRights.setWrite(1);
-		imageRights.setChangePermission(0);
-		imageRights.setAdmin(0);
-		imageRights.setLinkAllowed(1);
-		System.out.println("Rechte (r,w,cp,a,la): "+imageRights.getRead()+","+imageRights.getWrite()+","+imageRights.getChangePermission()+","+imageRights.getAdmin()+","+imageRights.getAdmin());
+		
+		//for testing
+		/*System.out.println("Setze Rechte für Dozent");
+		ImageRights.rights.setRead(1);
+		ImageRights.rights.setWrite(1);
+		ImageRights.rights.setChangePermission(0);
+		ImageRights.rights.setAdmin(0);
+		ImageRights.rights.setLinkAllowed(1);
+		System.out.println("Rechte (r,w,cp,a,la): "+ImageRights.rights.getRead()+","+ImageRights.rights.getWrite()+","+ImageRights.rights.getChangePermission()+","+ImageRights.rights.getAdmin()+","+ImageRights.rights.getAdmin());
 		*/		
 		
 		/*//for testing
 		System.out.println("Setze Rechte für Admin");
-		imageRights.setRead(1);
-		imageRights.setWrite(1);
-		imageRights.setChangePermission(1);
-		imageRights.setAdmin(1);
-		imageRights.setLinkAllowed(1);
-		System.out.println("Rechte (r,w,cp,a,la): "+imageRights.getRead()+","+imageRights.getWrite()+","+imageRights.getChangePermission()+","+imageRights.getAdmin()+","+imageRights.getAdmin());
+		ImageRights.rights.setRead(1);
+		ImageRights.rights.setWrite(1);
+		ImageRights.rights.setChangePermission(1);
+		ImageRights.rights.setAdmin(1);
+		ImageRights.rights.setLinkAllowed(1);
+		System.out.println("Rechte (r,w,cp,a,la): "+ImageRights.rights.getRead()+","+ImageRights.rights.getWrite()+","+ImageRights.rights.getChangePermission()+","+ImageRights.rights.getAdmin()+","+ImageRights.rights.getAdmin());
 		*/
 		
 		
@@ -283,6 +284,17 @@ public class MainMenue_GUI extends JFrame {
 		txtNews.setText("Hier werden mal die Neuigkeiten stehen. Diese kommen direkt vom Satelliten und sind HS-spezifisch.");
 		scrollPaneNews.add(txtNews);
 		panelNews.add(scrollPaneNews);
+		
+		
+		
+		/*
+		 * Ber\u00fccksichtigen der Rechte für GUI
+		 */
+		processRights();
+		
+		
+		
+		
 
 		/*
 		 * Funktion Texte f\u00fcr das Klicken der RadioButtons
@@ -498,4 +510,46 @@ public class MainMenue_GUI extends JFrame {
 		mnNewMenu_1.add(mntmAbout);
 
 	}// end main
+	
+	private void processRights(){
+		//Image anlegen
+		System.out.println("ImageRights.rights.getWrite()="+ImageRights.rights.getWrite());
+		if(ImageRights.rights.getWrite()== 1){
+			rdbtnImageNew.setEnabled(true);
+		} else {
+			rdbtnImageNew.setEnabled(false);
+		}
+		
+		//Image bearbeiten
+		System.out.println("ImageRights.rights.getWrite()="+ImageRights.rights.getWrite());
+		if(ImageRights.rights.getWrite()== 1){
+			rdbtnImageEdit.setEnabled(true);
+		} else {
+			rdbtnImageEdit.setEnabled(false);
+		}
+		
+		//Image l\o00fcschen
+		System.out.println("ImageRights.rights.getWrite()="+ImageRights.rights.getWrite());
+		if(ImageRights.rights.getWrite()== 1){
+			rdbtnImageDelete.setEnabled(true);
+		} else {
+			rdbtnImageDelete.setEnabled(false);
+		}
+			
+		
+		//Image Suchen/Download
+		System.out.println("ImageRights.rights.getRead()="+ImageRights.rights.getRead());
+		if(ImageRights.rights.getRead()== 1){
+			rdbtnImageSearchDownload.setEnabled(true);
+		} else {
+			rdbtnImageSearchDownload.setEnabled(false);
+		}
+		
+		//Veranstaltung anlegen
+		
+		
+		
+		
+		
+	}//end processRights()
 }// end class