diff --git a/org.eclipse.wb.doc.user/book.css b/org.eclipse.wb.doc.user/book.css
index b892121d9..ea1c8c482 100644
--- a/org.eclipse.wb.doc.user/book.css
+++ b/org.eclipse.wb.doc.user/book.css
@@ -63,6 +63,8 @@ EM.CodeName {
font-family: "Courier New", Courier, monospace;
}
+img { vertical-align: top; }
+
body, html { border: 0px }
diff --git a/org.eclipse.wb.doc.user/html-src/preferences/index.asciidoc b/org.eclipse.wb.doc.user/html-src/preferences/index.asciidoc
index 30089fe25..2b4a6aba4 100644
--- a/org.eclipse.wb.doc.user/html-src/preferences/index.asciidoc
+++ b/org.eclipse.wb.doc.user/html-src/preferences/index.asciidoc
@@ -1,90 +1,90 @@
-= Preferences - WindowBuilder
+ifdef::env-github[]
+:imagesdir: ../../html/preferences/
+endif::[]
+
+= Preferences
image:images/preferences_windowbuilder.png[image]
Here is the list of core preference pages:
-* *link:preferences_code_parsing.html[Code Parsing]*
+* xref:preferences_code_parsing.adoc[*Code Parsing*]
-Preferences maybe link:preferences_export.html[exported and imported]
+Preferences maybe xref:preferences_export.adoc[exported and imported]
using the Eclipse Preference Export/Import facility.
== General Comments
-The positions of the *link:../userinterface/palette.html[Palette]* and
-*link:../userinterface/structure_view.html[Structure View]* may be
+The positions of the xref:../userinterface/palette.adoc[*Palette*] and
+xref:../userinterface/structure_view.adoc[*Structure View*] may be
configured via drag and drop or by right-clicking on the header and
selecting the *Dock On* command. The
-*link:../userinterface/palette.html[Palette]* may be docked to either
+xref:../userinterface/palette.adoc[*Palette*] may be docked to either
the left or right side of the
-*link:../userinterface/design_view.html[Design View]*.
+xref:../userinterface/design_view.adoc[*Design View*].
-++++
-
- 
- 
-
-++++
+--
+image:images/flyout_palette1.png[image]
+image:../userinterface/images/palette_dock_on.png[image]
+--
-The *link:../userinterface/structure_view.html[Structure View]* may be
+The xref:../userinterface/structure_view.adoc[*Structure View*] may be
docked to the top, bottom, left or right of the
-*link:../userinterface/design_view.html[Design View]*.
-
-++++
-
- 
- 
- 
-
-++++
-
-The *link:../userinterface/palette.html[Palette]* and
-*link:../userinterface/structure_view.html[Structure View]* are also
+xref:../userinterface/design_view.adoc[*Design View*].
+
+--
+image:images/dock_left.png[image]
+image:images/dock_top.png[image]
+image:../userinterface/images/structure_view_dock_on.png[image]
+--
+
+The xref:../userinterface/palette.adoc[*Palette*] and
+xref:../userinterface/structure_view.adoc[*Structure View*] are also
available as standalone views. Use the *Window > Show View > Other...*
command and open the *WindowBuilder* category or right-click on the
header and select the *Extract as view* command. Closing the view will
make it reappear as embedded view within the editor.
-++++
-
- 
- 
- 
- 
- 
-
-++++
+
+--
+image:images/windowbuilder_views.png[WindowBuilder View]
+image:images/palette_view.png[Palette View]
+image:images/structure_view.png[Structure View]
+image:../userinterface/images/palette_extract_as_view.png[Extract Palette as View]
+image:../userinterface/images/structure_extract_as_view.png[Extract Structure as View]
+--
== Editor Layout
This preference controls the position of the
-*link:../userinterface/source_view.html[Source View]* relative to the
-*link:../userinterface/design_view.html[Design View]*. By default, they
+xref:../userinterface/source_view.adoc[*Source View*] relative to the
+xref:../userinterface/design_view.adoc[*Design View*]. By default, they
are "on separate notebook tabs" labeled *Source* and *Design* (you can
select which page is first). Additional options are provided to show the
-*link:../userinterface/source_view.html[Source View]* and
-*link:../userinterface/design_view.html[Design View]* side by side or
+xref:../userinterface/source_view.adoc[*Source View*] and
+xref:../userinterface/design_view.adoc[*Design View*] side by side or
one above the other.
-image:../userinterface/images/source_view_right.png[image,width=902,height=305]
-
-image:../userinterface/images/source_view_bottom.png[image,width=545,height=456]
-image:../userinterface/images/source_view.png[image,width=442,height=456]
+--
+image:../userinterface/images/source_view_right.png[image]
+image:../userinterface/images/source_view_bottom.png[image]
+image:../userinterface/images/source_view.png[image]
+--
== Sync Delay (ms)
-When the *link:../userinterface/source_view.html[Source View]* and
-*link:../userinterface/design_view.html[Design View]* are both visible,
+When the xref:../userinterface/source_view.adoc[*Source View*] and
+xref:../userinterface/design_view.adoc[*Design View*] are both visible,
this preference determines the delay used to synchronize the two panes.
-If the user types in the *link:../userinterface/source_view.html[Source
-View]*, the source will be re-parsed and the
-*link:../userinterface/design_view.html[Design View]* will be updated
+If the user types in the xref:../userinterface/source_view.adoc[*Source
+View*], the source will be re-parsed and the
+xref:../userinterface/design_view.adoc[*Design View*] will be updated
after a period specified by the sync delay. Use "-1" to synchronize only
on save.
== Associate WindowBuilder editor with automatically recognized Java GUI files
-This preference determines whether *WindowBuilder Pro* will attempt to
+This preference determines whether *WindowBuilder* will attempt to
automatically recognize GUI files and associate the *WindowBuilder*
editor with them.
@@ -92,7 +92,7 @@ editor with them.
This preference determines whether the *WindowBuilder* editor will be
automatically maximized when switching to the
-*link:../userinterface/design_view.html[Design View]*.
+xref:../userinterface/design_view.adoc[*Design View*].
== Format source code (and reparse) on editor save
@@ -104,7 +104,7 @@ formatted using your Eclipse code formatting preferences whenever the
This preference controls whether the source definition of a component is
highlighted any time a component is selected in the
-*link:../userinterface/design_view.html[Design View]*.
+xref:../userinterface/design_view.adoc[*Design View*].
== Automatically add to palette when using Choose Component
diff --git a/org.eclipse.wb.doc.user/html-src/preferences/preferences_code_parsing.asciidoc b/org.eclipse.wb.doc.user/html-src/preferences/preferences_code_parsing.asciidoc
index 43ee0a659..116998930 100644
--- a/org.eclipse.wb.doc.user/html-src/preferences/preferences_code_parsing.asciidoc
+++ b/org.eclipse.wb.doc.user/html-src/preferences/preferences_code_parsing.asciidoc
@@ -1,4 +1,8 @@
-= Preferences - Common > Code Parsing
+ifdef::env-github[]
+:imagesdir: ../../html/preferences/
+endif::[]
+
+= Code Parsing
image:images/preferences_code_parsing.png[image]
diff --git a/org.eclipse.wb.doc.user/html-src/preferences/preferences_export.asciidoc b/org.eclipse.wb.doc.user/html-src/preferences/preferences_export.asciidoc
index ff172a0c0..cdd5c70ab 100644
--- a/org.eclipse.wb.doc.user/html-src/preferences/preferences_export.asciidoc
+++ b/org.eclipse.wb.doc.user/html-src/preferences/preferences_export.asciidoc
@@ -1,21 +1,24 @@
-= Preferences - Export / Import
+ifdef::env-github[]
+:imagesdir: ../../html/preferences/
+endif::[]
+
+
+= Export / Import
Preferences may be exported using the Eclipse *File > Export > General >
Preferences* command. Choose the *WindowBuilder Preferences* category,
enter an export file name, and click Finish.
-++++
-
- 
- 
-
-++++
+--
+image:images/export_preferences1.png[image]
+image:images/export_preferences2.png[image]
+--
Preferences are exported in Eclipse preference format.
-image:images/designer_epf.png[image] +
+image:images/designer_epf.png[image]
Preferences may be imported using the Eclipse *File > Import > General >
-Preferences* command. +
+Preferences* command.
image:images/import_preferences.png[image]
\ No newline at end of file
diff --git a/org.eclipse.wb.doc.user/html-src/preferences/preferences_uitoolkits.asciidoc b/org.eclipse.wb.doc.user/html-src/preferences/preferences_uitoolkits.asciidoc
index 9ae23f62d..b12dfa97e 100644
--- a/org.eclipse.wb.doc.user/html-src/preferences/preferences_uitoolkits.asciidoc
+++ b/org.eclipse.wb.doc.user/html-src/preferences/preferences_uitoolkits.asciidoc
@@ -1,6 +1,10 @@
-= Preferences - UI Toolkits
+ifdef::env-github[]
+:imagesdir: ../../html/preferences/
+endif::[]
-image:images/preferences_uitoolkits.png[image,width=495,height=464]
+= UI Toolkits
+
+image:images/preferences_uitoolkits.png[image]
This page is used to control various *UI Toolkits* options.
@@ -16,7 +20,7 @@ click the *Install Toolkits...* button. WindowBuilder will verify that
the toolkit's update site is live and then hand off the installation
process to the standard Eclipse install dialog.
-image:images/install_toolkit.png[image,width=568,height=345]
+image:images/install_toolkit.png[image]
Installed tookits may be uninstalled using he *Uninstall Toolkit*
button.
@@ -25,11 +29,11 @@ The *Show uninstalled toolkits in the new wizard dialog* determines
whether uninstalled toolkits show up with a placeholder in the *New
Wizard* under the *WindowBuilder* category.
-image:images/new_wizard_uninstalled_toolkit1.png[image,width=365,height=474]
+image:images/new_wizard_uninstalled_toolkit1.png[image]
Selecting an uninstalled toolkit and clicking *Next* will present the
user with the option of installing editing support for that toolkit.
Clicking Finish will hand off the installation process to the standard
Eclipse install dialog as shown above.
-image:images/new_wizard_uninstalled_toolkit2.png[image,width=452,height=272]
\ No newline at end of file
+image:images/new_wizard_uninstalled_toolkit2.png[image]
\ No newline at end of file
diff --git a/org.eclipse.wb.doc.user/html-src/preferences/preferences_usage_profiler.asciidoc b/org.eclipse.wb.doc.user/html-src/preferences/preferences_usage_profiler.asciidoc
index a9ba2205a..611b2ade6 100644
--- a/org.eclipse.wb.doc.user/html-src/preferences/preferences_usage_profiler.asciidoc
+++ b/org.eclipse.wb.doc.user/html-src/preferences/preferences_usage_profiler.asciidoc
@@ -1,4 +1,8 @@
-= Preferences - Usage Profiler
+ifdef::env-github[]
+:imagesdir: ../../html/preferences/
+endif::[]
+
+= Usage Profiler
image:images/preferences_usage_profiler.png[image]
@@ -15,4 +19,4 @@ The Usage Profiler may be enabled with automatic data uploading, enabled
with prompting prior to uploading (approximately once per week), or
disabled.
-image:images/enable_usage_profiling.png[image,width=250,height=70]
+image:images/enable_usage_profiling.png[image]
diff --git a/org.eclipse.wb.doc.user/html-src/userinterface/palette.asciidoc b/org.eclipse.wb.doc.user/html-src/userinterface/palette.asciidoc
index 093d2f15a..dda41165b 100644
--- a/org.eclipse.wb.doc.user/html-src/userinterface/palette.asciidoc
+++ b/org.eclipse.wb.doc.user/html-src/userinterface/palette.asciidoc
@@ -103,7 +103,7 @@ the *link:design_view.html[Design View]*.
++++
- 
+ 
++++
@@ -121,6 +121,6 @@ embedded view within the editor.
- 
+ 
++++
\ No newline at end of file
diff --git a/org.eclipse.wb.doc.user/html-src/userinterface/structure_view.asciidoc b/org.eclipse.wb.doc.user/html-src/userinterface/structure_view.asciidoc
index 0c4b3acc8..beb3ab401 100644
--- a/org.eclipse.wb.doc.user/html-src/userinterface/structure_view.asciidoc
+++ b/org.eclipse.wb.doc.user/html-src/userinterface/structure_view.asciidoc
@@ -13,7 +13,7 @@ The position of the *Structure View* may be configured via drag and drop
or by right-clicking on the *Structure View* header and selecting the
*Dock On* command.
-image:images/structure_view_dock_on.gif[image,width=269,height=242]
+image:images/structure_view_dock_on.png[image]
The *Structure View* may be docked to the top, bottom, left or right of
the *link:design_view.html[Design View]*.
@@ -35,6 +35,6 @@ Structure* view or right-click on the *Structure View* and select the
- 
+ 
++++
\ No newline at end of file
diff --git a/org.eclipse.wb.doc.user/html/userinterface/images/palette_dock_on.gif b/org.eclipse.wb.doc.user/html/userinterface/images/palette_dock_on.gif
deleted file mode 100644
index a716334de..000000000
Binary files a/org.eclipse.wb.doc.user/html/userinterface/images/palette_dock_on.gif and /dev/null differ
diff --git a/org.eclipse.wb.doc.user/html/userinterface/images/palette_dock_on.png b/org.eclipse.wb.doc.user/html/userinterface/images/palette_dock_on.png
new file mode 100644
index 000000000..b9678a1f7
Binary files /dev/null and b/org.eclipse.wb.doc.user/html/userinterface/images/palette_dock_on.png differ
diff --git a/org.eclipse.wb.doc.user/html/userinterface/images/palette_extract_as_view.gif b/org.eclipse.wb.doc.user/html/userinterface/images/palette_extract_as_view.gif
deleted file mode 100644
index e13a1facc..000000000
Binary files a/org.eclipse.wb.doc.user/html/userinterface/images/palette_extract_as_view.gif and /dev/null differ
diff --git a/org.eclipse.wb.doc.user/html/userinterface/images/palette_extract_as_view.png b/org.eclipse.wb.doc.user/html/userinterface/images/palette_extract_as_view.png
new file mode 100644
index 000000000..ee9b47667
Binary files /dev/null and b/org.eclipse.wb.doc.user/html/userinterface/images/palette_extract_as_view.png differ
diff --git a/org.eclipse.wb.doc.user/html/userinterface/images/structure_extract_as_view.gif b/org.eclipse.wb.doc.user/html/userinterface/images/structure_extract_as_view.gif
deleted file mode 100644
index eb95a923b..000000000
Binary files a/org.eclipse.wb.doc.user/html/userinterface/images/structure_extract_as_view.gif and /dev/null differ
diff --git a/org.eclipse.wb.doc.user/html/userinterface/images/structure_extract_as_view.png b/org.eclipse.wb.doc.user/html/userinterface/images/structure_extract_as_view.png
new file mode 100644
index 000000000..a7a6b381d
Binary files /dev/null and b/org.eclipse.wb.doc.user/html/userinterface/images/structure_extract_as_view.png differ
diff --git a/org.eclipse.wb.doc.user/html/userinterface/images/structure_view_dock_on.gif b/org.eclipse.wb.doc.user/html/userinterface/images/structure_view_dock_on.gif
deleted file mode 100644
index 96b3dc6df..000000000
Binary files a/org.eclipse.wb.doc.user/html/userinterface/images/structure_view_dock_on.gif and /dev/null differ
diff --git a/org.eclipse.wb.doc.user/html/userinterface/images/structure_view_dock_on.png b/org.eclipse.wb.doc.user/html/userinterface/images/structure_view_dock_on.png
new file mode 100644
index 000000000..bd9b4a685
Binary files /dev/null and b/org.eclipse.wb.doc.user/html/userinterface/images/structure_view_dock_on.png differ