diff options
| author | Stephan Schwaer | 2015-10-07 16:45:20 +0200 |
|---|---|---|
| committer | Stephan Schwaer | 2015-10-07 16:45:20 +0200 |
| commit | ce1f7dbd17ca83d73cc08ccde61d9b12bc784d69 (patch) | |
| tree | db546345b898f74df4932e377538c27e42c68056 | |
| parent | [client] Refresh imagelist after image deletion. (diff) | |
| download | tutor-module-ce1f7dbd17ca83d73cc08ccde61d9b12bc784d69.tar.gz tutor-module-ce1f7dbd17ca83d73cc08ccde61d9b12bc784d69.tar.xz tutor-module-ce1f7dbd17ca83d73cc08ccde61d9b12bc784d69.zip | |
[client] Removed useless isActive button from imageCreation wizard.
3 files changed, 1 insertions, 9 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java index 5d178596..46792063 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java @@ -23,7 +23,6 @@ public abstract class ImageMetaDataPageLayout extends WizardPage { protected JComboBox<OperatingSystem> osCombo; protected JTextArea descriptionText; protected JCheckBox licencedSoftwareCheck; - protected JCheckBox setActiveCheck; protected JCheckBox isTemplateCheck; /** @@ -62,12 +61,9 @@ public abstract class ImageMetaDataPageLayout extends WizardPage { grid.add(descPane).fill(true, false).expand(true, false); grid.nextRow(); - setActiveCheck = new JCheckBox("Image aktivieren"); - grid.add(setActiveCheck); - licencedSoftwareCheck = new JCheckBox("Image enthält lizenzpflichtige Software"); licencedSoftwareCheck.setSelected(true); - grid.add(licencedSoftwareCheck); + grid.add(licencedSoftwareCheck, 2); grid.nextRow(); // -- end permissions group -- diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java index b6730365..6645e388 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java @@ -89,7 +89,6 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout { } else if (state.selectedOs == null) { osCombo.setSelectedItem(null); } - setActiveCheck.setSelected(state.isEnabled); isTemplateCheck.setSelected(state.isTemplate); licencedSoftwareCheck.setSelected(state.isRestricted); reactToUserInput(); @@ -98,7 +97,6 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout { @Override protected boolean wantNextOrFinish() { state.selectedOs = (OperatingSystem) osCombo.getSelectedItem(); - state.isEnabled = setActiveCheck.isSelected(); state.isTemplate = isTemplateCheck.isSelected(); state.isRestricted = licencedSoftwareCheck.isSelected(); return state.selectedOs != null && state.description != null; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java b/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java index 3cb6f2f3..252cb190 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java @@ -30,8 +30,6 @@ public class UploadWizardState { public Map<String, ImagePermissions> permissionMap = null; // local, publish, download frozen share mode public ShareMode shareMode = null; - // enabled flag - public boolean isEnabled = true; // resctricted flag public boolean isRestricted = true; // flags an image as a template |
