Skip to content
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

Jump to bottom

The preview does not work anymore: #1901 #1904

Merged
merged 1 commit into from
Sep 12, 2024
Merged

The preview does not work anymore: #1901 #1904

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
12 changes: 6 additions & 6 deletions ....preview.static_html/src/org/eclipse/birt/report/designer/ui/viewer/StaticHTMLViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,12 +772,12 @@ private void showReportOutputJob(RenderJobRule jobRule) {
public void work(IProgressMonitor monitor) {
monitor.subTask("Show report in Browser"); //$NON-NLS-1$
if (!form.isDisposed()) {
// browser.setUrl( outputLocation
// + ( currentBookmark == null ? ""
// : ( "#" + currentBookmark ) ) );
browser.setUrl(outputLocation);
// if special the anchor, SWT browser will not refresh
// browser.refresh( );
try {
String url = new File(outputLocation).toURI().toURL().toString();
browser.setUrl(url);
} catch (Exception e) {
browser.setUrl(outputLocation);
}
if (currentPageNum < totalPageNum) {
navNextAction.setEnabled(true);
navLastAction.setEnabled(true);
Expand Down
4 changes: 2 additions & 2 deletions UI/org.eclipse.birt.report.designer.ui.preview/plugin.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ designer.preview.previewtoolbarmenuaction.label=View Report
designer.preview.previewcascadingmenugroup.label=View &Report
ActionSet.Preview=Preview

template.preview=New Preview Pro&totype
design.preview=New Preview Pro&totype
template.preview=Pre&view
design.preview=Pre&view

preference.preview=Preview
preference.preview.server=Preview Server
Expand Down
29 changes: 17 additions & 12 deletions ...review/src/org/eclipse/birt/report/designer/ui/preview/editors/ReportPreviewFormPage.java
View file
Open in desktop
wimjongman marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,14 @@
import org.eclipse.birt.report.designer.ui.preview.extension.ViewerExtensionManager;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.gef.ui.actions.ActionRegistry;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.part.EditorPart;
Expand Down Expand Up @@ -64,15 +67,17 @@ public ReportPreviewFormPage() throws FrameworkException {
reportViewer = manager.createViewer(VIEWER_ID);
}

/*
* (non-Javadoc)
*
* @see
* org.eclipse.birt.report.designer.ui.editors.IReportEditorPage#onBroughtToTop(
* org.eclipse.birt.report.designer.ui.editors.IReportEditorPage)
*/
@Override
public boolean onBroughtToTop(IReportEditorPage prePage) {
if (editor.isDirty()) {
int SAVEBUTTON = 0;
int buttonPressed = MessageDialog.open(MessageDialog.QUESTION, getSite().getShell(),
"Save Report", "Save the report so that the preview can show the latest changes?",
SWT.SHEET, "Save", "Don't Save");
if (buttonPressed == SAVEBUTTON) {
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().saveEditor(editor, false);
}
}
startRender();
return true;
}
Expand Down Expand Up @@ -319,6 +324,11 @@ protected void finalize() throws Throwable {
*/
@Override
public void doSave(IProgressMonitor monitor) {
IReportProvider provider = getProvider();
if (provider != null) {
provider.saveReport(provider.queryReportModuleHandle(), getEditorInput(), monitor);
firePropertyChange(PROP_DIRTY);
}
}

/*
Expand Down Expand Up @@ -352,11 +362,6 @@ public boolean isSaveAsAllowed() {
return false;
}

/*
* (non-Javadoc)
*
* @see org.eclipse.ui.part.WorkbenchPart#setFocus()
*/
@Override
public void setFocus() {
}
Expand Down
Loading