[client] disabled UI elements for unfinished features

4 files changed, 16 insertions, 8 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
index 504cf6d6..2781372e 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
@@ -746,10 +746,14 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 		editable &= (LecturePerms.canEdit(lecture));
 		// "Übersicht" is always enabled
 		pnlTabs.setEnabledAt(pnlTabs.indexOfTab("Allgemein"), editable);
-		pnlTabs.setEnabledAt(pnlTabs.indexOfTab("Beschränkungen"), editable);
+		// TODO: enable when restriction stuff is finished
+		// pnlTabs.setEnabledAt(pnlTabs.indexOfTab("Beschränkungen"), editable);
 		pnlTabs.setEnabledAt(pnlTabs.indexOfTab("Berechtigungen"), editable && LecturePerms.canAdmin(lecture));
-		pnlTabs.setEnabledAt(pnlTabs.indexOfTab("Raumauswahl"), editable);
-		pnlTabs.setEnabledAt(pnlTabs.indexOfTab("Erweitert"), editable);
+		if (pnlTabs.indexOfTab("Raumauswahl") != -1) {
+			pnlTabs.setEnabledAt(pnlTabs.indexOfTab("Raumauswahl"), editable);
+		}
+		// TODO: enable when advanced stuff is finished
+		// pnlTabs.setEnabledAt(pnlTabs.indexOfTab("Erweitert"), editable);
 		btnChangeOwner.setEnabled(LecturePerms.canAdmin(lecture));
 		btnDownloadImage.setEnabled(ImagePerms.canDownload(image));
 	}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java
index 5c8f9f10..74b218d5 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java
@@ -86,8 +86,8 @@ public abstract class ImageListWindowLayout extends CompositePage {
 		buttonPanel.add(btnDownload);
 		buttonPanel.add(Box.createHorizontalStrut(5));
 		buttonPanel.add(btnNewLecture);
-		buttonPanel.add(Box.createHorizontalStrut(5));
-		buttonPanel.add(btnShowPublishedImages);
+		//buttonPanel.add(Box.createHorizontalStrut(5));
+		//buttonPanel.add(btnShowPublishedImages);
 		buttonPanel.add(Box.createHorizontalGlue());
 		buttonPanel.add(btnSwitchView);
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
index fa35c13c..d405ba16 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
@@ -373,11 +373,13 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 		pnlTabs = new JTabbedPane();
 		pnlTabs.addTab("Übersicht", pnlTabInfo);
 		pnlTabs.addTab("Allgemein", pnlTabGeneral);
-		pnlTabs.addTab("Beschränkungen", pnlTabRestrictions);
-		if (MetaDataCache.getLocations() != null) {
+		// TODO enable when restriction stuff is done
+		// pnlTabs.addTab("Beschränkungen", pnlTabRestrictions);
+		if (MetaDataCache.getLocations() != null && !MetaDataCache.getLocations().isEmpty()) {
 			pnlTabs.addTab("Raumauswahl", pnlTabLocations);
 		}
-		pnlTabs.addTab("Erweitert", pnlTabAdvanced);
+		// TODO enable when advanced stuff is done
+		// pnlTabs.addTab("Erweitert", pnlTabAdvanced);
 		pnlTabs.addTab("Berechtigungen", pnlTabPermissions);
 		add(pnlTabs, BorderLayout.CENTER);
 		// usage counter + button panel on the bottom
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureOptionsPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureOptionsPage.java
index 38522954..cc7c802f 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureOptionsPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureOptionsPage.java
@@ -42,6 +42,8 @@ public class LectureOptionsPage extends LectureOptionsPageLayout {
 		// TODO Temporarily disabled until implemented
 		chkIsExam.setEnabled(false);
 		chkInternetEnabled.setEnabled(false);
+		btnAdvanced.setEnabled(false);
+		chkUsbEnabled.setEnabled(false);
 	}
 
 	@Override