From 5f841941459e1ba7435352c23e4a1296601d3f87 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 8 Jan 2022 17:24:26 +0100 Subject: [PATCH 1/4] first working version of help with dummy input --- doc/com.minres.scviewer.doc/.gitignore | 1 + doc/com.minres.scviewer.doc/.project | 11 + doc/com.minres.scviewer.doc/pom.xml | 182 ++++++++++++++++ .../src/asciidoc/Overview.adoc | 26 +++ .../src/asciidoc/Reference.adoc | 39 ++++ .../src/asciidoc/SCViewerHelp.adoc | 28 +++ .../asciidoc/images/Minres_logo_square.png | Bin 0 -> 21175 bytes .../src/docbkx/.gitignore | 1 + .../src/docbkx/css/narrow_style.css | 124 +++++++++++ .../src/docbkx/images/.gitignore | 1 + .../.gitignore | 1 + .../.project | 17 ++ .../build.properties | 1 + .../feature.xml | 204 ++++++++++++++++++ .../pom.xml | 12 ++ .../.classpath | 7 + .../.gitignore | 1 + .../.project | 28 +++ .../.settings/org.eclipse.jdt.core.prefs | 9 + .../META-INF/MANIFEST.MF | 8 + .../OSGI-INF/l10n/bundle.properties | 5 + .../build.properties | 7 + .../html/maintopic.html | 13 ++ .../html/subtopic.html | 13 ++ .../html/toc.html | 13 ++ .../plugin.xml | 16 ++ .../pom.xml | 13 ++ .../testToc.xml | 6 + .../toc.xml | 9 + .../Application.e4xmi | 15 +- .../META-INF/MANIFEST.MF | 6 +- .../handlers/HelpContentsHandler.java | 15 ++ .../e4/application/handlers/HelpHandler.java | 2 +- pom.xml | 3 + .../scviewer.product | 4 +- 35 files changed, 830 insertions(+), 11 deletions(-) create mode 100644 doc/com.minres.scviewer.doc/.gitignore create mode 100644 doc/com.minres.scviewer.doc/.project create mode 100644 doc/com.minres.scviewer.doc/pom.xml create mode 100644 doc/com.minres.scviewer.doc/src/asciidoc/Overview.adoc create mode 100644 doc/com.minres.scviewer.doc/src/asciidoc/Reference.adoc create mode 100644 doc/com.minres.scviewer.doc/src/asciidoc/SCViewerHelp.adoc create mode 100644 doc/com.minres.scviewer.doc/src/asciidoc/images/Minres_logo_square.png create mode 100644 doc/com.minres.scviewer.doc/src/docbkx/.gitignore create mode 100644 doc/com.minres.scviewer.doc/src/docbkx/css/narrow_style.css create mode 100644 doc/com.minres.scviewer.doc/src/docbkx/images/.gitignore create mode 100644 features/com.minres.scviewer.e4.help.feature/.gitignore create mode 100644 features/com.minres.scviewer.e4.help.feature/.project create mode 100644 features/com.minres.scviewer.e4.help.feature/build.properties create mode 100644 features/com.minres.scviewer.e4.help.feature/feature.xml create mode 100644 features/com.minres.scviewer.e4.help.feature/pom.xml create mode 100644 plugins/com.minres.scviewer.e4.application.help/.classpath create mode 100644 plugins/com.minres.scviewer.e4.application.help/.gitignore create mode 100644 plugins/com.minres.scviewer.e4.application.help/.project create mode 100644 plugins/com.minres.scviewer.e4.application.help/.settings/org.eclipse.jdt.core.prefs create mode 100644 plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF create mode 100644 plugins/com.minres.scviewer.e4.application.help/OSGI-INF/l10n/bundle.properties create mode 100644 plugins/com.minres.scviewer.e4.application.help/build.properties create mode 100644 plugins/com.minres.scviewer.e4.application.help/html/maintopic.html create mode 100644 plugins/com.minres.scviewer.e4.application.help/html/subtopic.html create mode 100644 plugins/com.minres.scviewer.e4.application.help/html/toc.html create mode 100644 plugins/com.minres.scviewer.e4.application.help/plugin.xml create mode 100644 plugins/com.minres.scviewer.e4.application.help/pom.xml create mode 100644 plugins/com.minres.scviewer.e4.application.help/testToc.xml create mode 100644 plugins/com.minres.scviewer.e4.application.help/toc.xml create mode 100644 plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpContentsHandler.java diff --git a/doc/com.minres.scviewer.doc/.gitignore b/doc/com.minres.scviewer.doc/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/doc/com.minres.scviewer.doc/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/doc/com.minres.scviewer.doc/.project b/doc/com.minres.scviewer.doc/.project new file mode 100644 index 0000000..f250ef1 --- /dev/null +++ b/doc/com.minres.scviewer.doc/.project @@ -0,0 +1,11 @@ + + + com.minres.scviewer.doc + + + + + + + + diff --git a/doc/com.minres.scviewer.doc/pom.xml b/doc/com.minres.scviewer.doc/pom.xml new file mode 100644 index 0000000..53d18b8 --- /dev/null +++ b/doc/com.minres.scviewer.doc/pom.xml @@ -0,0 +1,182 @@ + + 4.0.0 + com.minres.scviewer.doc + 1.0.0-SNAPSHOT + pom + + com.minres.scviewer + com.minres.scviewer.parent + 2.15.1 + ../.. + + + + UTF-8 + 1.5.6 + 1.5.0-alpha.16 + 1.5.6 + 1.7.26 + target/eclipse + + + + + + org.asciidoctor + asciidoctor-maven-plugin + ${asciidoctor.maven.plugin.version} + + + org.asciidoctor + asciidoctorj-pdf + ${asciidoctorj.pdf.version} + + + + org.jruby + jruby-complete + ${jruby.version} + + + + org.asciidoctor + asciidoctorj + ${asciidoctorj.version} + + + + src/asciidoc + SCViewerHelp.adoc + true + + + + output-html + generate-resources + + process-asciidoc + + + coderay + html + + + false + + + + + output-docbook + generate-resources + + process-asciidoc + + + docbook + + + + output-pdf + generate-resources + + process-asciidoc + + + pdf + coderay + + font + + + + - + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.6 + + + copy-asciidoc-resources + generate-resources + + copy-resources + + + + + target/generated-docs/ + + SCViewerHelp.xml + **/*.jpg + **/*.png + **/*.svg + + + + src/docbkx + + + + + + com.agilejava.docbkx + docbkx-maven-plugin + 2.0.17 + + + + generate-resources + + generate-eclipse + + + + + + org.docbook + docbook-xml + 4.4 + runtime + + + + src/docbkx + ${help.plugin.target.dir} + + + + + + + + + ./ + + 1 + 1 + java + 1 + A4 + + + + + css/narrow_style.css + + SCViewerHelp.xml + true + true + + com.minres.scviewer.doc + + + + + diff --git a/doc/com.minres.scviewer.doc/src/asciidoc/Overview.adoc b/doc/com.minres.scviewer.doc/src/asciidoc/Overview.adoc new file mode 100644 index 0000000..10248d4 --- /dev/null +++ b/doc/com.minres.scviewer.doc/src/asciidoc/Overview.adoc @@ -0,0 +1,26 @@ +// ///////////////////////////////////////////////////////////////////////////////////////////////////// OVERVIEW /////////////////////////////////////////////////////// + +[#_introduction] +== Introduction + +[#_overview] +=== SCViewer overview + +SCViewer is composed of a set of eclipse plugins to display VCD and transaction streams +created by the SystemC VCD trace implementation and the SystemC Verification Library (SCV). +For further description of the SCV please refer to +http://www.accellera.org/activities/committees/systemc-verification. + + +[#_features] +=== SCViewer features + +Features include: +* support of VCD files (compressed and uncompressed) +** real numbers +** showing vectors and real numbers as analog (step-wise & continuous) +* various value representations of bit vectors +* support of SCV transaction recordings in various formats +** text log files (compressed and uncompressed) +** sqlite based +** visualization of transaction relations diff --git a/doc/com.minres.scviewer.doc/src/asciidoc/Reference.adoc b/doc/com.minres.scviewer.doc/src/asciidoc/Reference.adoc new file mode 100644 index 0000000..8867c5b --- /dev/null +++ b/doc/com.minres.scviewer.doc/src/asciidoc/Reference.adoc @@ -0,0 +1,39 @@ +// ///////////////////////////////////////////////////////////////////////////////////////////////////// Reference ////////////////////////////////////////////////////// + +[#_reference] +== Reference + +In this section you will find detailed descriptions of all GUI and menu elements of the SCViewer including their functions and keyboard shortcuts. + +[#_keybindings] +=== Key Shortcuts + +Legend: + +* Left Mouse Button: LMB +* Middle Mouse Button: MMB +* Mouse Scroll wheel: MScrl +* Context any means Name List, Value List or Waveform + +| Input | Modifier | Context | Action | +|-----------|----------|----------|-----------------------------------| +| LMB klick | | any | select | +| LMB klick | Shift | Waveform | move selected marker to position | +| LMB klick | Control | Waveform | move cursor to position | +| LMB drag | | Waveform | zoom to range | +| MMB klick | | Waveform | move selected marker to position | +| MScrl | | any | scroll window up/down | +| MScrl | Shift | any | scroll window left/right | +| Key left | | Waveform | scroll window to the left (slow) | +| Key right | | Waveform | scroll window to the right (slow) | +| Key left | Shift | Waveform | scroll window to the left (fast) | +| Key right | Shift | Waveform | scroll window to the right (fast) | +| Key up | | Waveform | move selection up | +| Key down | | Waveform | move selection down | +| Key up | Control | Waveform | move selected track up | +| Key down | Control | Waveform | move selected track down | +| Key + | Control | Waveform | zoom in | +| Key - | Control | Waveform | zoom out | +| Key Pos1 | | Waveform | jump to selected marker | +| Key End | | Waveform | jump to cursor | +| Key Del | | any | delete selected entries | diff --git a/doc/com.minres.scviewer.doc/src/asciidoc/SCViewerHelp.adoc b/doc/com.minres.scviewer.doc/src/asciidoc/SCViewerHelp.adoc new file mode 100644 index 0000000..3c3e6e9 --- /dev/null +++ b/doc/com.minres.scviewer.doc/src/asciidoc/SCViewerHelp.adoc @@ -0,0 +1,28 @@ +[#_start] += SCViewer User Guide +:doctype: book +:source-highlighter: coderay +:coderay-linenums-mode: inline +:coderay-css: class +:listing-caption: Listing +:icons: font +//add table-of-contents (toc) and set its depth +:toc: +:toclevels: 6 +//set directories +:imagesdir: ./images +:iconsdir: ./icons +:stylesdir: ./styles +:scriptsdir: ./js +:title-logo-image: image:Minres_logo_square.png[] +//add math support, also do via cmd-line a 'gem install asciimath' +:stem: + +// unset toc, otherwise it appears in table cells -> known bug, should be fixed in later versions! +:toc!: + +// ///////////////////////////////////////////////////////////////////////////////////////////////////// OVERVIEW /////////////////////////////////////////////////////// +include::Overview.adoc[] + +// ///////////////////////////////////////////////////////////////////////////////////////////////////// Reference ////////////////////////////////////////////////////// +include::Reference.adoc[] diff --git a/doc/com.minres.scviewer.doc/src/asciidoc/images/Minres_logo_square.png b/doc/com.minres.scviewer.doc/src/asciidoc/images/Minres_logo_square.png new file mode 100644 index 0000000000000000000000000000000000000000..981da5e86aa7fd207d0e7138d6e1820770f333b0 GIT binary patch literal 21175 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ⅅ^t<#b+bzCmQPO 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 a0{ + + com.minres.scviewer.e4.help.feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/features/com.minres.scviewer.e4.help.feature/build.properties b/features/com.minres.scviewer.e4.help.feature/build.properties new file mode 100644 index 0000000..64f93a9 --- /dev/null +++ b/features/com.minres.scviewer.e4.help.feature/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/features/com.minres.scviewer.e4.help.feature/feature.xml b/features/com.minres.scviewer.e4.help.feature/feature.xml new file mode 100644 index 0000000..d9d9fb0 --- /dev/null +++ b/features/com.minres.scviewer.e4.help.feature/feature.xml @@ -0,0 +1,204 @@ + + + + + [Enter Feature Description here.] + + + + [Enter Copyright Description here.] + + + + [Enter License Description here.] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/features/com.minres.scviewer.e4.help.feature/pom.xml b/features/com.minres.scviewer.e4.help.feature/pom.xml new file mode 100644 index 0000000..a6a6050 --- /dev/null +++ b/features/com.minres.scviewer.e4.help.feature/pom.xml @@ -0,0 +1,12 @@ + + 4.0.0 + com.minres.scviewer.e4.help.feature + eclipse-feature + + com.minres.scviewer + com.minres.scviewer.parent + 2.15.1 + ../.. + + 1.0.0-SNAPSHOT + diff --git a/plugins/com.minres.scviewer.e4.application.help/.classpath b/plugins/com.minres.scviewer.e4.application.help/.classpath new file mode 100644 index 0000000..e801ebf --- /dev/null +++ b/plugins/com.minres.scviewer.e4.application.help/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/plugins/com.minres.scviewer.e4.application.help/.gitignore b/plugins/com.minres.scviewer.e4.application.help/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/plugins/com.minres.scviewer.e4.application.help/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/plugins/com.minres.scviewer.e4.application.help/.project b/plugins/com.minres.scviewer.e4.application.help/.project new file mode 100644 index 0000000..6204755 --- /dev/null +++ b/plugins/com.minres.scviewer.e4.application.help/.project @@ -0,0 +1,28 @@ + + + com.minres.scviewer.e4.application.help + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/plugins/com.minres.scviewer.e4.application.help/.settings/org.eclipse.jdt.core.prefs b/plugins/com.minres.scviewer.e4.application.help/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..c9545f0 --- /dev/null +++ b/plugins/com.minres.scviewer.e4.application.help/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF new file mode 100644 index 0000000..9b463f6 --- /dev/null +++ b/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF @@ -0,0 +1,8 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: SCViewer Help +Bundle-SymbolicName: com.minres.scviewer.e4.application.help;singleton:=true +Bundle-Version: 2.15.1 +Bundle-Vendor: MINRES Technologies GmbH +Automatic-Module-Name: com.minres.scviewer.e4.application.help +Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/plugins/com.minres.scviewer.e4.application.help/OSGI-INF/l10n/bundle.properties b/plugins/com.minres.scviewer.e4.application.help/OSGI-INF/l10n/bundle.properties new file mode 100644 index 0000000..91ef34c --- /dev/null +++ b/plugins/com.minres.scviewer.e4.application.help/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,5 @@ +#Properties file for com.minres.scviewer.e4.application +Bundle-Vendor = MINRES Technologies GmbH +Bundle-Name = Application Help +product.description = SystemC Transaction and Waveform Viewer +product.name = SCViewer \ No newline at end of file diff --git a/plugins/com.minres.scviewer.e4.application.help/build.properties b/plugins/com.minres.scviewer.e4.application.help/build.properties new file mode 100644 index 0000000..fc53675 --- /dev/null +++ b/plugins/com.minres.scviewer.e4.application.help/build.properties @@ -0,0 +1,7 @@ +source.. = src/ +output.. = bin/ +bin.includes = plugin.xml,\ + META-INF/,\ + .,\ + html/,\ + *.xml diff --git a/plugins/com.minres.scviewer.e4.application.help/html/maintopic.html b/plugins/com.minres.scviewer.e4.application.help/html/maintopic.html new file mode 100644 index 0000000..a476078 --- /dev/null +++ b/plugins/com.minres.scviewer.e4.application.help/html/maintopic.html @@ -0,0 +1,13 @@ + + + + + + Main Topic + + + +

Main Topic

+Please enter your text here. + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.e4.application.help/html/subtopic.html b/plugins/com.minres.scviewer.e4.application.help/html/subtopic.html new file mode 100644 index 0000000..8a61c50 --- /dev/null +++ b/plugins/com.minres.scviewer.e4.application.help/html/subtopic.html @@ -0,0 +1,13 @@ + + + + + + Sub Topic + + + +

Sub Topic

+Please enter your text here. + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.e4.application.help/html/toc.html b/plugins/com.minres.scviewer.e4.application.help/html/toc.html new file mode 100644 index 0000000..326f0a9 --- /dev/null +++ b/plugins/com.minres.scviewer.e4.application.help/html/toc.html @@ -0,0 +1,13 @@ + + + + + + Table of Contents + + + +

Table of Contents

+Please enter your text here. + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.e4.application.help/plugin.xml b/plugins/com.minres.scviewer.e4.application.help/plugin.xml new file mode 100644 index 0000000..00836fc --- /dev/null +++ b/plugins/com.minres.scviewer.e4.application.help/plugin.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/plugins/com.minres.scviewer.e4.application.help/pom.xml b/plugins/com.minres.scviewer.e4.application.help/pom.xml new file mode 100644 index 0000000..614de66 --- /dev/null +++ b/plugins/com.minres.scviewer.e4.application.help/pom.xml @@ -0,0 +1,13 @@ + + 4.0.0 + com.minres.scviewer.e4.application.help + + com.minres.scviewer + com.minres.scviewer.parent + 2.15.1 + ../.. + + eclipse-plugin + diff --git a/plugins/com.minres.scviewer.e4.application.help/testToc.xml b/plugins/com.minres.scviewer.e4.application.help/testToc.xml new file mode 100644 index 0000000..bf1e67a --- /dev/null +++ b/plugins/com.minres.scviewer.e4.application.help/testToc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.e4.application.help/toc.xml b/plugins/com.minres.scviewer.e4.application.help/toc.xml new file mode 100644 index 0000000..1f661a6 --- /dev/null +++ b/plugins/com.minres.scviewer.e4.application.help/toc.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/plugins/com.minres.scviewer.e4.application/Application.e4xmi b/plugins/com.minres.scviewer.e4.application/Application.e4xmi index 56d12d1..cc44340 100644 --- a/plugins/com.minres.scviewer.e4.application/Application.e4xmi +++ b/plugins/com.minres.scviewer.e4.application/Application.e4xmi @@ -57,7 +57,8 @@ - + + @@ -113,8 +114,9 @@ - + + type:user @@ -248,7 +250,7 @@ - + @@ -292,12 +294,13 @@ - - - + + + + diff --git a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF index 86e2263..cfc1e01 100644 --- a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF @@ -35,7 +35,11 @@ Require-Bundle: javax.inject;bundle-version="1.0.0", org.eclipse.equinox.p2.core;bundle-version="2.6.300", org.eclipse.equinox.p2.engine;bundle-version="2.6.600", org.eclipse.equinox.p2.operations;bundle-version="2.5.700", - org.eclipse.equinox.p2.metadata.repository;bundle-version="1.3.400" + org.eclipse.equinox.p2.metadata.repository;bundle-version="1.3.400", + org.eclipse.help;bundle-version="3.8.700", + org.eclipse.help.webapp;bundle-version="3.9.800", + org.eclipse.help.base;bundle-version="4.2.900", + com.minres.scviewer.e4.application.help;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.minres.scviewer.database, javax.annotation;version="1.0.0";resolution:=optional, diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpContentsHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpContentsHandler.java new file mode 100644 index 0000000..d673ba0 --- /dev/null +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpContentsHandler.java @@ -0,0 +1,15 @@ +package com.minres.scviewer.e4.application.handlers; +import org.eclipse.e4.core.di.annotations.Execute; +import org.eclipse.help.internal.base.BaseHelpSystem; +import org.eclipse.help.internal.server.WebappManager; + +public class HelpContentsHandler { + @Execute + public void execute() throws Exception { + BaseHelpSystem.ensureWebappRunning(); + String helpURL = "http://" //$NON-NLS-1$ + + WebappManager.getHost() + ":" //$NON-NLS-1$ + + WebappManager.getPort() + "/help/index.jsp"; //$NON-NLS-1$ + BaseHelpSystem.getHelpBrowser(false).displayURL(helpURL); + } +} \ No newline at end of file diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpHandler.java index 187c7d7..eb00b3a 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpHandler.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpHandler.java @@ -18,7 +18,7 @@ import org.eclipse.e4.ui.workbench.modeling.EModelService; public class HelpHandler { - static final String WINDOW_ID="com.minres.scviewer.e4.application.window.help"; //$NON-NLS-1$ + static final String WINDOW_ID="com.minres.scviewer.e4.application.window.web_help"; //$NON-NLS-1$ @CanExecute public boolean canExecute(MApplication app) { return !app.getChildren().stream().filter(e -> e.getElementId().equals(WINDOW_ID)).findFirst().isPresent(); diff --git a/pom.xml b/pom.xml index 848bb7d..ff64bd9 100644 --- a/pom.xml +++ b/pom.xml @@ -8,6 +8,7 @@ pom releng/com.minres.scviewer.target + doc/com.minres.scviewer.doc plugins/com.minres.scviewer.database plugins/com.minres.scviewer.database.sqlite plugins/com.minres.scviewer.database.text @@ -15,12 +16,14 @@ tests/com.minres.scviewer.database.test plugins/com.minres.scviewer.database.ui.swt plugins/com.minres.scviewer.e4.application + plugins/com.minres.scviewer.e4.application.help plugins/com.minres.scviewer.ui features/com.minres.scviewer.database.feature features/com.minres.scviewer.ui.feature features/com.minres.scviewer.feature features/com.minres.scviewer.e4.platform.feature features/com.minres.scviewer.e4.feature + features/com.minres.scviewer.e4.help.feature releng/com.minres.scviewer.updateSite products/com.minres.scviewer.e4.product diff --git a/products/com.minres.scviewer.e4.product/scviewer.product b/products/com.minres.scviewer.e4.product/scviewer.product index 3e2be35..aed1aa7 100644 --- a/products/com.minres.scviewer.e4.product/scviewer.product +++ b/products/com.minres.scviewer.e4.product/scviewer.product @@ -3,7 +3,6 @@ - @@ -18,7 +17,6 @@ - @@ -35,7 +33,6 @@ - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 @@ -65,6 +62,7 @@ + From 8119c1a4f3dc017c187d02e3fdcf64016f44fc3e Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 8 Jan 2022 17:36:52 +0100 Subject: [PATCH 2/4] direct generation of help plugin --- doc/com.minres.scviewer.doc/pom.xml | 2 +- .../.gitignore | 3 +++ .../build.properties | 7 ++++-- .../html/maintopic.html | 13 ----------- .../html/subtopic.html | 13 ----------- .../html/toc.html | 13 ----------- .../index.xml | 2 ++ .../plugin.xml | 23 +++++++------------ .../testToc.xml | 6 ----- .../toc.xml | 19 +++++++-------- 10 files changed, 29 insertions(+), 72 deletions(-) delete mode 100644 plugins/com.minres.scviewer.e4.application.help/html/maintopic.html delete mode 100644 plugins/com.minres.scviewer.e4.application.help/html/subtopic.html delete mode 100644 plugins/com.minres.scviewer.e4.application.help/html/toc.html create mode 100644 plugins/com.minres.scviewer.e4.application.help/index.xml delete mode 100644 plugins/com.minres.scviewer.e4.application.help/testToc.xml diff --git a/doc/com.minres.scviewer.doc/pom.xml b/doc/com.minres.scviewer.doc/pom.xml index 53d18b8..85f68e7 100644 --- a/doc/com.minres.scviewer.doc/pom.xml +++ b/doc/com.minres.scviewer.doc/pom.xml @@ -17,7 +17,7 @@ 1.5.0-alpha.16 1.5.6 1.7.26 - target/eclipse + ../../plugins/com.minres.scviewer.e4.application.help diff --git a/plugins/com.minres.scviewer.e4.application.help/.gitignore b/plugins/com.minres.scviewer.e4.application.help/.gitignore index b83d222..187a545 100644 --- a/plugins/com.minres.scviewer.e4.application.help/.gitignore +++ b/plugins/com.minres.scviewer.e4.application.help/.gitignore @@ -1 +1,4 @@ /target/ +/css/ +/images/ +/*.html diff --git a/plugins/com.minres.scviewer.e4.application.help/build.properties b/plugins/com.minres.scviewer.e4.application.help/build.properties index fc53675..b439b53 100644 --- a/plugins/com.minres.scviewer.e4.application.help/build.properties +++ b/plugins/com.minres.scviewer.e4.application.help/build.properties @@ -3,5 +3,8 @@ output.. = bin/ bin.includes = plugin.xml,\ META-INF/,\ .,\ - html/,\ - *.xml + images/,\ + css/,\ + *.html,\ + *.xml,\ + OSGI-INF/ diff --git a/plugins/com.minres.scviewer.e4.application.help/html/maintopic.html b/plugins/com.minres.scviewer.e4.application.help/html/maintopic.html deleted file mode 100644 index a476078..0000000 --- a/plugins/com.minres.scviewer.e4.application.help/html/maintopic.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Main Topic - - - -

Main Topic

-Please enter your text here. - - \ No newline at end of file diff --git a/plugins/com.minres.scviewer.e4.application.help/html/subtopic.html b/plugins/com.minres.scviewer.e4.application.help/html/subtopic.html deleted file mode 100644 index 8a61c50..0000000 --- a/plugins/com.minres.scviewer.e4.application.help/html/subtopic.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Sub Topic - - - -

Sub Topic

-Please enter your text here. - - \ No newline at end of file diff --git a/plugins/com.minres.scviewer.e4.application.help/html/toc.html b/plugins/com.minres.scviewer.e4.application.help/html/toc.html deleted file mode 100644 index 326f0a9..0000000 --- a/plugins/com.minres.scviewer.e4.application.help/html/toc.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Table of Contents - - - -

Table of Contents

-Please enter your text here. - - \ No newline at end of file diff --git a/plugins/com.minres.scviewer.e4.application.help/index.xml b/plugins/com.minres.scviewer.e4.application.help/index.xml new file mode 100644 index 0000000..1030b6d --- /dev/null +++ b/plugins/com.minres.scviewer.e4.application.help/index.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.e4.application.help/plugin.xml b/plugins/com.minres.scviewer.e4.application.help/plugin.xml index 00836fc..54d61bf 100644 --- a/plugins/com.minres.scviewer.e4.application.help/plugin.xml +++ b/plugins/com.minres.scviewer.e4.application.help/plugin.xml @@ -1,16 +1,9 @@ - - - - - - - - - + + + + - - + + + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.e4.application.help/testToc.xml b/plugins/com.minres.scviewer.e4.application.help/testToc.xml deleted file mode 100644 index bf1e67a..0000000 --- a/plugins/com.minres.scviewer.e4.application.help/testToc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/plugins/com.minres.scviewer.e4.application.help/toc.xml b/plugins/com.minres.scviewer.e4.application.help/toc.xml index 1f661a6..3e9aedd 100644 --- a/plugins/com.minres.scviewer.e4.application.help/toc.xml +++ b/plugins/com.minres.scviewer.e4.application.help/toc.xml @@ -1,9 +1,10 @@ - - - - - - - - - + + + + + + + + + + \ No newline at end of file From c474ca33d8c4b14f9c1406da512613945b8dda22 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 8 Jan 2022 18:31:27 +0100 Subject: [PATCH 3/4] use internal help browser --- .../Application.e4xmi | 5 +- .../scviewer/e4/application/Messages.java | 14 +- .../handlers/HelpContentsHandler.java | 27 ++- .../e4/application/handlers/HelpHandler.java | 9 +- .../e4/application/messages.properties | 14 +- .../e4/application/parts/HelpDialog.java | 177 ------------------ .../application/parts/help/HelpBrowser.java | 39 ++-- 7 files changed, 61 insertions(+), 224 deletions(-) delete mode 100644 plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/HelpDialog.java diff --git a/plugins/com.minres.scviewer.e4.application/Application.e4xmi b/plugins/com.minres.scviewer.e4.application/Application.e4xmi index cc44340..d8ea1ab 100644 --- a/plugins/com.minres.scviewer.e4.application/Application.e4xmi +++ b/plugins/com.minres.scviewer.e4.application/Application.e4xmi @@ -121,7 +121,7 @@ type:user - + @@ -253,6 +253,9 @@ + + + diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/Messages.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/Messages.java index 3d88974..6e683f4 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/Messages.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/Messages.java @@ -83,16 +83,14 @@ public class Messages extends NLS { public static String cursor; public static String cursor_drag; public static String cursor_text; + public static String HelpBrowser_0; + public static String HelpBrowser_1; + public static String HelpBrowser_2; + public static String HelpBrowser_3; + public static String HelpBrowser_4; + public static String HelpBrowser_5; public static String HelpBrowser_7; public static String HelpBrowser_8; - public static String HelpDialog_0; - public static String HelpDialog_1; - public static String HelpDialog_2; - public static String HelpDialog_3; - public static String HelpDialog_4; - public static String HelpDialog_5; - public static String HelpDialog_6; - public static String HelpDialog_7; public static String marker; public static String marker_text; public static String rel_arrow; diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpContentsHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpContentsHandler.java index d673ba0..fc1969a 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpContentsHandler.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpContentsHandler.java @@ -1,15 +1,34 @@ package com.minres.scviewer.e4.application.handlers; +import org.eclipse.e4.core.contexts.IEclipseContext; +import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; +import org.eclipse.e4.ui.model.application.MApplication; +import org.eclipse.e4.ui.model.application.ui.basic.MWindow; +import org.eclipse.e4.ui.workbench.modeling.EModelService; import org.eclipse.help.internal.base.BaseHelpSystem; import org.eclipse.help.internal.server.WebappManager; public class HelpContentsHandler { - @Execute - public void execute() throws Exception { + + static final String WINDOW_ID="com.minres.scviewer.e4.application.window.help_content"; //$NON-NLS-1$ + + @CanExecute + public boolean canExecute(MApplication app) { + return !app.getChildren().stream().filter(e -> e.getElementId().equals(WINDOW_ID)).findFirst().isPresent(); + } + + @Execute + public void execute(MApplication app, EModelService modelService /*@Named("mdialog01.dialog.0") MDialog dialog*/) { BaseHelpSystem.ensureWebappRunning(); String helpURL = "http://" //$NON-NLS-1$ + WebappManager.getHost() + ":" //$NON-NLS-1$ + WebappManager.getPort() + "/help/index.jsp"; //$NON-NLS-1$ - BaseHelpSystem.getHelpBrowser(false).displayURL(helpURL); - } + // BaseHelpSystem.getHelpBrowser(false).displayURL(helpURL); + MWindow newWin = (MWindow)modelService.cloneSnippet(app, WINDOW_ID, null); + final IEclipseContext ctx=app.getContext(); + if(ctx.containsKey("help_url")) + ctx.remove("help_url"); + ctx.modify("help_url", helpURL); + app.getChildren().add(newWin); + } } \ No newline at end of file diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpHandler.java index eb00b3a..bd6292e 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpHandler.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpHandler.java @@ -10,6 +10,7 @@ *******************************************************************************/ package com.minres.scviewer.e4.application.handlers; +import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.ui.model.application.MApplication; @@ -19,15 +20,19 @@ import org.eclipse.e4.ui.workbench.modeling.EModelService; public class HelpHandler { static final String WINDOW_ID="com.minres.scviewer.e4.application.window.web_help"; //$NON-NLS-1$ + @CanExecute public boolean canExecute(MApplication app) { return !app.getChildren().stream().filter(e -> e.getElementId().equals(WINDOW_ID)).findFirst().isPresent(); } @Execute - public void execute(MApplication app, MWindow window, EModelService modelService /*@Named("mdialog01.dialog.0") MDialog dialog*/) { + public void execute(MApplication app, EModelService modelService /*@Named("mdialog01.dialog.0") MDialog dialog*/) { MWindow newWin = (MWindow)modelService.cloneSnippet(app, WINDOW_ID, null); + final IEclipseContext ctx=app.getContext(); + if(ctx.containsKey("help_url")) + ctx.remove("help_url"); + ctx.modify("help_url", "https://minres.github.io/SCViewer/#key-shortcuts"); app.getChildren().add(newWin); } - } diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties index 6c98d1c..1266f5a 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties @@ -77,16 +77,14 @@ signal_nan=Signal NaN Value cursor=Cursor cursor_drag=dragged Cursor cursor_text=Cursor Text +HelpBrowser_0=Back +HelpBrowser_1=Forward +HelpBrowser_2=Stop +HelpBrowser_3=Refresh +HelpBrowser_4=Go +HelpBrowser_5=Address HelpBrowser_7=Error initializing help browser HelpBrowser_8=An error occurred while initializing the help browser: -HelpDialog_0=Back -HelpDialog_1=Forward -HelpDialog_2=Stop -HelpDialog_3=Refresh -HelpDialog_4=Go -HelpDialog_5=Address -HelpDialog_6=https://minres.github.io/SCViewer/#key-shortcuts -HelpDialog_7=Could not instantiate Browser: marker=Marker marker_text=Marker TExt rel_arrow=Relation arrow diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/HelpDialog.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/HelpDialog.java deleted file mode 100644 index 749ab42..0000000 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/HelpDialog.java +++ /dev/null @@ -1,177 +0,0 @@ -package com.minres.scviewer.e4.application.parts; - -import javax.annotation.PostConstruct; -import javax.inject.Inject; - -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.swt.SWT; -import org.eclipse.swt.SWTError; -import org.eclipse.swt.browser.Browser; -import org.eclipse.swt.browser.LocationListener; -import org.eclipse.swt.browser.ProgressEvent; -import org.eclipse.swt.browser.ProgressListener; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.ProgressBar; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; -import org.eclipse.swt.widgets.ToolBar; -import org.eclipse.swt.widgets.ToolItem; - -import com.minres.scviewer.e4.application.Messages; - -public class HelpDialog extends Dialog { - /** - * Create the dialog. - * - * @param parentShell the parent shell - */ - @Inject - public HelpDialog(Shell parentShell) { - super(parentShell); - setShellStyle(getShellStyle() | SWT.MODELESS | SWT.MAX | SWT.BORDER | SWT.TITLE); - setBlockOnOpen(false); - } - - @Override - protected boolean isResizable() { - return true; - } - - @Override - protected Point getInitialSize() { - return new Point(800, 600); - } - - /** - * Create contents of the dialog. - * - * @param parent the parent - * @return the control - */ - @Override - protected Control createDialogArea(Composite parent) { - Composite container = (Composite) super.createDialogArea(parent); - GridLayout gridLayout = new GridLayout(); - gridLayout.numColumns = 3; - container.setLayout(gridLayout); - ToolBar toolbar = new ToolBar(container, SWT.NONE); - ToolItem itemBack = new ToolItem(toolbar, SWT.PUSH); - itemBack.setText(Messages.HelpDialog_0); - ToolItem itemForward = new ToolItem(toolbar, SWT.PUSH); - itemForward.setText(Messages.HelpDialog_1); - ToolItem itemStop = new ToolItem(toolbar, SWT.PUSH); - itemStop.setText(Messages.HelpDialog_2); - ToolItem itemRefresh = new ToolItem(toolbar, SWT.PUSH); - itemRefresh.setText(Messages.HelpDialog_3); - ToolItem itemGo = new ToolItem(toolbar, SWT.PUSH); - itemGo.setText(Messages.HelpDialog_4); - - GridData data = new GridData(); - data.horizontalSpan = 3; - toolbar.setLayoutData(data); - - Label labelAddress = new Label(container, SWT.NONE); - labelAddress.setText(Messages.HelpDialog_5); - - final Text location = new Text(container, SWT.BORDER); - data = new GridData(); - data.horizontalAlignment = GridData.FILL; - data.horizontalSpan = 2; - data.grabExcessHorizontalSpace = true; - location.setLayoutData(data); - - final Browser browser; - try { - browser = new Browser(container, SWT.NONE); - data = new GridData(); - // data.widthHint = 800; - // data.heightHint =600; - data.horizontalAlignment = GridData.FILL; - data.verticalAlignment = GridData.FILL; - data.horizontalSpan = 3; - data.grabExcessHorizontalSpace = true; - data.grabExcessVerticalSpace = true; - browser.setLayoutData(data); - - final Label status = new Label(container, SWT.NONE); - data = new GridData(GridData.FILL_HORIZONTAL); - data.horizontalSpan = 2; - status.setLayoutData(data); - - final ProgressBar progressBar = new ProgressBar(container, SWT.NONE); - data = new GridData(); - data.horizontalAlignment = GridData.END; - progressBar.setLayoutData(data); - - /* event handling */ - Listener listener = event -> { - ToolItem item = (ToolItem) event.widget; - String string = item.getText(); - if (string.equals(Messages.HelpDialog_0)) - browser.back(); - else if (string.equals(Messages.HelpDialog_1)) - browser.forward(); - else if (string.equals(Messages.HelpDialog_2)) - browser.stop(); - else if (string.equals(Messages.HelpDialog_3)) - browser.refresh(); - else if (string.equals(Messages.HelpDialog_4)) - browser.setUrl(location.getText()); - }; - browser.addProgressListener(new ProgressListener() { - @Override - public void changed(ProgressEvent event) { - if (event.total == 0) return; - int ratio = event.current * 100 / event.total; - progressBar.setSelection(ratio); - } - @Override - public void completed(ProgressEvent event) { - progressBar.setSelection(0); - } - }); - browser.addStatusTextListener(event -> status.setText(event.text)); - browser.addLocationListener(LocationListener.changedAdapter(event -> { - if (event.top) location.setText(event.location); - } - )); - itemBack.addListener(SWT.Selection, listener); - itemForward.addListener(SWT.Selection, listener); - itemStop.addListener(SWT.Selection, listener); - itemRefresh.addListener(SWT.Selection, listener); - itemGo.addListener(SWT.Selection, listener); - location.addListener(SWT.DefaultSelection, e -> browser.setUrl(location.getText())); - - browser.setUrl(Messages.HelpDialog_6); - } catch (SWTError e) { - System.out.println(Messages.HelpDialog_7 + e.getMessage()); - } - return container; - } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) - */ - @Override - protected void createButtonsForButtonBar(Composite parent) { - // create OK button - createButton(parent, IDialogConstants.OK_ID, IDialogConstants.CLOSE_LABEL, true); - } - - /** - * Open the dialog. - * @return the result - */ - @PostConstruct - @Override - public int open() { - return super.open(); - } - -} \ No newline at end of file diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/help/HelpBrowser.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/help/HelpBrowser.java index d962fbb..7f64fe4 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/help/HelpBrowser.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/help/HelpBrowser.java @@ -4,6 +4,7 @@ import java.io.File; import javax.annotation.PostConstruct; import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.ui.model.application.ui.MUIElement; @@ -48,32 +49,28 @@ public class HelpBrowser { } @PostConstruct - protected Control createComposite(Composite container) { -// container.getShell().addListener(SWT.Close, e -> { -// e.doit= false; -// element.setVisible(false); -// }); + protected Control createComposite(Composite container, @Named("help_url") String helpUrl) { GridLayout gridLayout = new GridLayout(); gridLayout.numColumns = 3; container.setLayout(gridLayout); ToolBar toolbar = new ToolBar(container, SWT.NONE); ToolItem itemBack = new ToolItem(toolbar, SWT.PUSH); - decorateItem(itemBack, Messages.HelpDialog_0, "arrow_undo.png"); //$NON-NLS-1$ + decorateItem(itemBack, Messages.HelpBrowser_0, "arrow_undo.png"); //$NON-NLS-1$ ToolItem itemForward = new ToolItem(toolbar, SWT.PUSH); - decorateItem(itemForward, Messages.HelpDialog_1, "arrow_redo.png"); //$NON-NLS-1$ + decorateItem(itemForward, Messages.HelpBrowser_1, "arrow_redo.png"); //$NON-NLS-1$ ToolItem itemStop = new ToolItem(toolbar, SWT.PUSH); - decorateItem(itemStop, Messages.HelpDialog_2, "cross.png"); //$NON-NLS-1$ + decorateItem(itemStop, Messages.HelpBrowser_2, "cross.png"); //$NON-NLS-1$ ToolItem itemRefresh = new ToolItem(toolbar, SWT.PUSH); - decorateItem(itemRefresh, Messages.HelpDialog_3, "arrow_refresh.png"); //$NON-NLS-1$ + decorateItem(itemRefresh, Messages.HelpBrowser_3, "arrow_refresh.png"); //$NON-NLS-1$ ToolItem itemGo = new ToolItem(toolbar, SWT.PUSH); - decorateItem(itemGo, Messages.HelpDialog_4, "accept.png"); //$NON-NLS-1$ + decorateItem(itemGo, Messages.HelpBrowser_4, "accept.png"); //$NON-NLS-1$ GridData data = new GridData(); data.horizontalSpan = 3; toolbar.setLayoutData(data); Label labelAddress = new Label(container, SWT.NONE); - labelAddress.setText(Messages.HelpDialog_5); + labelAddress.setText(Messages.HelpBrowser_5); final Text location = new Text(container, SWT.BORDER); data = new GridData(); @@ -81,10 +78,8 @@ public class HelpBrowser { data.horizontalSpan = 2; data.grabExcessHorizontalSpace = true; location.setLayoutData(data); - - final Browser browser; try { - browser = new Browser(container, SWT.NONE); + final Browser browser = new Browser(container, SWT.NONE); data = new GridData(); // data.widthHint = 800; // data.heightHint =600; @@ -109,15 +104,15 @@ public class HelpBrowser { Listener listener = event -> { ToolItem item = (ToolItem) event.widget; String string = (String) item.getData(); - if (string.equals(Messages.HelpDialog_0)) + if (string.equals(Messages.HelpBrowser_0)) browser.back(); - else if (string.equals(Messages.HelpDialog_1)) + else if (string.equals(Messages.HelpBrowser_1)) browser.forward(); - else if (string.equals(Messages.HelpDialog_2)) + else if (string.equals(Messages.HelpBrowser_2)) browser.stop(); - else if (string.equals(Messages.HelpDialog_3)) + else if (string.equals(Messages.HelpBrowser_3)) browser.refresh(); - else if (string.equals(Messages.HelpDialog_4)) + else if (string.equals(Messages.HelpBrowser_4)) browser.setUrl(location.getText()); }; browser.addProgressListener(new ProgressListener() { @@ -140,14 +135,10 @@ public class HelpBrowser { itemRefresh.addListener(SWT.Selection, listener); itemGo.addListener(SWT.Selection, listener); location.addListener(SWT.DefaultSelection, e -> browser.setUrl(location.getText())); - browser.setUrl(Messages.HelpDialog_6); + browser.setUrl(helpUrl); } catch (SWTError e) { MessageDialog.openWarning(container.getDisplay().getActiveShell(), Messages.HelpBrowser_7,Messages.HelpBrowser_8+e.getMessage()); } return container; } - - void handleShellCloseEvent(){ - - } } \ No newline at end of file From fc64fa781a8307d2553f6bd2cc8f1d4cf9947f86 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 8 Jan 2022 18:31:42 +0100 Subject: [PATCH 4/4] fix adoc syntax --- .../src/asciidoc/Overview.adoc | 1 + .../src/asciidoc/Reference.adoc | 45 ++++++++++--------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/doc/com.minres.scviewer.doc/src/asciidoc/Overview.adoc b/doc/com.minres.scviewer.doc/src/asciidoc/Overview.adoc index 10248d4..3599325 100644 --- a/doc/com.minres.scviewer.doc/src/asciidoc/Overview.adoc +++ b/doc/com.minres.scviewer.doc/src/asciidoc/Overview.adoc @@ -16,6 +16,7 @@ http://www.accellera.org/activities/committees/systemc-verification. === SCViewer features Features include: + * support of VCD files (compressed and uncompressed) ** real numbers ** showing vectors and real numbers as analog (step-wise & continuous) diff --git a/doc/com.minres.scviewer.doc/src/asciidoc/Reference.adoc b/doc/com.minres.scviewer.doc/src/asciidoc/Reference.adoc index 8867c5b..71beeaf 100644 --- a/doc/com.minres.scviewer.doc/src/asciidoc/Reference.adoc +++ b/doc/com.minres.scviewer.doc/src/asciidoc/Reference.adoc @@ -15,25 +15,26 @@ Legend: * Mouse Scroll wheel: MScrl * Context any means Name List, Value List or Waveform -| Input | Modifier | Context | Action | -|-----------|----------|----------|-----------------------------------| -| LMB klick | | any | select | -| LMB klick | Shift | Waveform | move selected marker to position | -| LMB klick | Control | Waveform | move cursor to position | -| LMB drag | | Waveform | zoom to range | -| MMB klick | | Waveform | move selected marker to position | -| MScrl | | any | scroll window up/down | -| MScrl | Shift | any | scroll window left/right | -| Key left | | Waveform | scroll window to the left (slow) | -| Key right | | Waveform | scroll window to the right (slow) | -| Key left | Shift | Waveform | scroll window to the left (fast) | -| Key right | Shift | Waveform | scroll window to the right (fast) | -| Key up | | Waveform | move selection up | -| Key down | | Waveform | move selection down | -| Key up | Control | Waveform | move selected track up | -| Key down | Control | Waveform | move selected track down | -| Key + | Control | Waveform | zoom in | -| Key - | Control | Waveform | zoom out | -| Key Pos1 | | Waveform | jump to selected marker | -| Key End | | Waveform | jump to cursor | -| Key Del | | any | delete selected entries | +[cols="1,1,1,4",options="header"] +|=== +| Input | Modifier | Context | Action +| LMB klick | | any | select +| LMB klick | Shift | Waveform | move selected marker to position +| LMB klick | Control | Waveform | move cursor to position +| LMB drag | | Waveform | zoom to range +| MMB klick | | Waveform | move selected marker to position +| MScrl | | any | scroll window up/down +| MScrl | Shift | any | scroll window left/right +| Key left | | Waveform | scroll window to the left (slow) +| Key right | | Waveform | scroll window to the right (slow) +| Key left | Shift | Waveform | scroll window to the left (fast) +| Key right | Shift | Waveform | scroll window to the right (fast) +| Key up | | Waveform | move selection up +| Key down | | Waveform | move selection down +| Key up | Control | Waveform | move selected track up +| Key down | Control | Waveform | move selected track down +| Key + | Control | Waveform | zoom in +| Key - | Control | Waveform | zoom out +| Key Pos1 | | Waveform | jump to selected marker +| Key End | | Waveform | jump to cursor +| Key Del | | any | delete selected entries