Skip to content

Commit

Permalink
add context help for the "add oracle layers" dialog and use QTextBrow…
Browse files Browse the repository at this point in the history
…ser in qgis_help (fixes #8477)
  • Loading branch information
jef-n committed Jun 21, 2016
1 parent e0c9733 commit 3c06341
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 11 deletions.
40 changes: 40 additions & 0 deletions resources/context_help/QgsOracleSourceSelect
@@ -0,0 +1,40 @@
<h3>Add Oracle Tables</h3>
This dialog allows you to add Oracle layers (tables with a geometry column) to the QGIS map canvas.
<p>
<a href="#connect">Connections</a><br/>
<a href="#add">Adding Layers</a><br/>
<a href="#filter">Filtering a Layer</a><br/>
<a href="#search">Search options</a><br/>

<a href="#connect">
<h4>Connections</h4>
</a>
<ul>
<li>Choose the connection to use from the drop-down box and click <label>Connect</label>.
<li>If there are no connections, use the <label>New</label> button to create a connection.
<li>To modify a connection, click the <label>Edit</label> button.
</ul>
<a name="add">
<h4>Adding Layers</h4>
</a>
To add a layer:
<ol>
<li>Choose the desired connection from the drop-down box.
<li>Click <label>Connect</label>.
<li>Find the layer you want to add in the list and click on it to select it.
<li>You can select additional layers by holding down the Ctrl key and clicking.
<li>Click <label>Add</label> to add the layer(s) to the map.
</ol>
<a name="filter">
<h4>Filtering a Layer</h4>
</a>
To filter a layer before adding it to the map, double click on its name or use <label>Build query</label> button. This will open the Query Builder, allowing you to build up a SQL statement to use in filtering the records.

<a name="search">
<h4>Options</h4>
</a>
<ul>
<li><label>Also list tables with no geometry</label> Indicates that tables without geometry should also be listed.
<li><label>Keep dialog open</label> Indicated that the dialog should not be closed when tables are added.
<li>Ticking <label>Search options</label> enables additional options for searching in different column types and using 2 search modes: <label>Wildcard</label> or <label>RegExp</label>.
</ul>
8 changes: 6 additions & 2 deletions resources/context_help/QgsPgSourceSelect
Expand Up @@ -31,6 +31,10 @@ To add a layer:
To filter a layer before adding it to the map, double click on its name or use <label>Build query</label> button. This will open the Query Builder, allowing you to build up a SQL statement to use in filtering the records.

<a name="search">
<h4>Search options</h4>
<h4>Options</h4>
</a>
Ticking <label>Search options</label> enables additional options for searching in different column types and using 2 search modes: <label>Wildcard</label> or <label>RegExp</label>.
<ul>
<li><label>Also list tables with no geometry</label> Indicates that tables without geometry should also be listed.
<li><label>Keep dialog open</label> Indicated that the dialog should not be closed when tables are added.
<li>Ticking <label>Search options</label> enables additional options for searching in different column types and using 2 search modes: <label>Wildcard</label> or <label>RegExp</label>.
</ul>
11 changes: 2 additions & 9 deletions src/helpviewer/qgshelpviewerbase.ui
Expand Up @@ -26,8 +26,8 @@
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QgsWebView" name="webView">
<property name="url">
<widget class="QTextBrowser" name="webView">
<property name="url" stdset="0">
<url>
<string>about:blank</string>
</url>
Expand All @@ -44,13 +44,6 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>QgsWebView</class>
<extends>QWidget</extends>
<header>qgswebview.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections>
<connection>
Expand Down

0 comments on commit 3c06341

Please sign in to comment.