diff options
author | Stephan Schwär | 2020-10-14 08:42:31 +0200 |
---|---|---|
committer | Stephan Schwär | 2020-10-14 08:42:31 +0200 |
commit | 22aa5a10f2d0b8ad6c6a477ce367b58f55d5b50e (patch) | |
tree | 0c99c8e4dbfc9e5ba4be630408123484f1136022 /dozentenmodul/src | |
parent | [client] Automatically select converted vmx after page change (diff) | |
download | tutor-module-22aa5a10f2d0b8ad6c6a477ce367b58f55d5b50e.tar.gz tutor-module-22aa5a10f2d0b8ad6c6a477ce367b58f55d5b50e.tar.xz tutor-module-22aa5a10f2d0b8ad6c6a477ce367b58f55d5b50e.zip |
[client] Enable the next button after ovf conversion is complete
Diffstat (limited to 'dozentenmodul/src')
5 files changed, 19 insertions, 5 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java index 745a5b47..e8847152 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java @@ -226,8 +226,8 @@ public class ImageCreationWizard extends Wizard implements UiFeedback, QuitNotif @Override protected final void doPrevious() { - if (state.outOfOrderFlow) { - state.outOfOrderFlow = false; + if (outOfOrderFlow) { + outOfOrderFlow = false; returnAfterOutOfOrderPage(state.imageUploadPage, state.conversionPage); } else { super.doPrevious(); @@ -235,6 +235,16 @@ public class ImageCreationWizard extends Wizard implements UiFeedback, QuitNotif } @Override + public final void doNext() { + if (outOfOrderFlow) { + outOfOrderFlow = false; + returnAfterOutOfOrderPage(state.imageUploadPage, state.conversionPage); + } else { + super.doNext(); + } + } + + @Override protected boolean onCancelRequest() { if (state.uuid == null) return true; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/Wizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/Wizard.java index cd455e6a..b000659f 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/Wizard.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/Wizard.java @@ -39,6 +39,7 @@ public abstract class Wizard extends JDialog { private int currentPage = -1; private boolean needsLayout = true; private boolean isCancelled = false; + protected boolean outOfOrderFlow = false; private final JButton btnPrev; private final JButton btnNext; @@ -164,6 +165,7 @@ public abstract class Wizard extends JDialog { // Show an out of order page e.g. for converting an image public void showOutOfOrderPage(WizardPage page) { WizardPage old = getPage(currentPage); + outOfOrderFlow = true; old.onPageLeave(); old.setVisible(false); @@ -250,6 +252,9 @@ public abstract class Wizard extends JDialog { } btnFinish.setEnabled(canFinish); // State of next button + if (outOfOrderFlow) { + btnNext.setEnabled(page.isComplete()); + } if (currentPage != -1 && getPage(currentPage) == page) { btnNext.setEnabled(currentPage + 1 < pages.size() && page.isComplete()); btnPrev.setEnabled(currentPage > 0 && getPage(currentPage - 1).canComeBack); @@ -275,7 +280,7 @@ public abstract class Wizard extends JDialog { return isCancelled; } - public final void doNext() { + public void doNext() { if (isPostFinish || !btnNext.isEnabled()) return; if (currentPage + 1 < pages.size()) { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java index ec2bb43e..fcac46d1 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java @@ -96,6 +96,7 @@ public class ImageOvfConversionPage extends ImageOvfConversionPageLayout { System.out.println("Error reading output or OVFTool."); } state.convertedDescriptionFile = vmxFile; + setPageComplete(true); } /** diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java index 6175ee3c..0e203545 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java @@ -157,7 +157,6 @@ public class ImageUploadPage extends ImageUploadPageLayout { setErrorMessage(null); setDescription("Im nächsten Schritt wird die Konvertierung gestartet."); // setPageComplete(true); - state.outOfOrderFlow = true; wizard.showOutOfOrderPage(state.conversionPage); return; } else { 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 4ed3d35f..beea1a74 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java @@ -37,7 +37,6 @@ public class UploadWizardState { // flags an image as a template public boolean isTemplate = false; // flag if we the description file is in the ovf format that needs conversion - public boolean outOfOrderFlow = false; public File convertedDescriptionFile; /** |