Skip to content

Fix wizard dialog and progress monitor #375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vsennedot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix wizard dialog and progress monitor #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bundles/org.eclipse.rap.jface/src/org/eclipse/jface/wizard/ProgressMonitorPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ public void widgetDisposed(DisposeEvent e) {
arrowCursor.dispose();
}
});
fStopButton.setEnabled(false);
fStopButton.setToolTipText(JFaceResources.getString("ProgressMonitorPart.cancelToolTip")); //$NON-NLS-1$
}
}
Expand Down
5 changes: 3 additions & 2 deletions bundles/org.eclipse.rap.jface/src/org/eclipse/jface/wizard/WizardDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1333,10 +1333,11 @@ public void updateButtons() {
boolean canFlipToNextPage = false;
boolean canFinish = wizard.canFinish();
if (backButton != null) {
backButton.setEnabled(currentPage.getPreviousPage() != null);
boolean backEnabled = currentPage != null && currentPage.getPreviousPage() != null;
backButton.setEnabled(backEnabled);
}
if (nextButton != null) {
canFlipToNextPage = currentPage.canFlipToNextPage();
canFlipToNextPage = currentPage != null && currentPage.canFlipToNextPage();
nextButton.setEnabled(canFlipToNextPage);
}
finishButton.setEnabled(canFinish);
Expand Down
2 changes: 2 additions & 0 deletions bundles/org.eclipse.rap.jface/src/org/eclipse/jface/wizard/WizardSelectionPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ public IWizardPage getNextPage() {
}

if (!isCreated) {
// Allow the wizard to know its surrounding container
wizard.setContainer(getContainer());
// Allow the wizard to create its pages
wizard.addPages();
}
Expand Down
2 changes: 1 addition & 1 deletion ....workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressMonitorFocusJobDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
* particular job in a modal dialog so as to give a user accustomed to a modal
* UI a more familiar feel.
*/
class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog {
public class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog {
Job job;
private boolean showDialog;

Expand Down