Skip to content

Commit

Permalink
Merge pull request #7 from orbisgis/UpdateAllImageSize
Browse files Browse the repository at this point in the history
Udpate all images size
  • Loading branch information
ebocher committed Nov 2, 2015
2 parents d7679a0 + 376f7a3 commit 2a9ee5b
Show file tree
Hide file tree
Showing 6 changed files with 84 additions and 37 deletions.
19 changes: 18 additions & 1 deletion docs/users/attributes.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@

.. _show_attributes:


Show attributes
========

Expand All @@ -21,9 +25,11 @@ A new tab appears in the UI with all the attributes.

.. |OpenAttributes| image:: ../_images/table.png
:alt: Open attributes icon
:width: 16 pt

.. |PK| image:: ../_images/key.png
:alt: Primary key icon
:width: 16 pt


Operation on lines
Expand All @@ -41,18 +47,23 @@ With a right-click on a line, the user can access to several options:

.. |ZoomToSelection| image:: ../_images/zoom_selected.png
:alt: Zoom to selection tool
:width: 16 pt

.. |FilterSelection| image:: ../_images/row_filter.png
:alt: Filter selection icon
:width: 16 pt

.. |CreateDataFromSel| image:: ../_images/table_go.png
:alt: Create Datasource from selection icon
:width: 16 pt

.. |Unselect| image:: ../_images/edit-clear.png
:alt: Unselection icon
:width: 16 pt

.. |ReverseSelection| image:: ../_images/reverse_selection.png
:alt: Reverse selection icon
:width: 16 pt



Expand All @@ -69,21 +80,27 @@ With a right-click on a field, the user can access to several options:

.. |SelectSameRows| image:: ../_images/selectsame_row.png
:alt: Selection same rows icon
:width: 16 pt

.. |Asc| image:: ../_images/spinner_up.png
:alt: Sort ascending icon
:width: 16 pt

.. |Desc| image:: ../_images/spinner_down.png
:alt: Sort ascending icon
:width: 16 pt

.. |Unsort| image:: ../_images/table_refresh.png
:alt: Unsort icon
:width: 16 pt

.. |Info| image:: ../_images/information.png
:alt: Information icon
:width: 16 pt

.. |Statistics| image:: ../_images/statistics.png
:alt: Statistics icon
:width: 16 pt


Search engine
Expand All @@ -95,7 +112,7 @@ In the lower part of the window, there is a search engine that can be used in tw
- "SQL" mode: just write an SQL instruction and press the "Execute" ( |SQLExecute| ) icon.



.. |SQLExecute| image:: ../_images/execute.png
:alt: Execute SQL instruction icon
:width: 16 pt

19 changes: 18 additions & 1 deletion docs/users/components.rst
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ The map ( |Map| ) is the place where geographic informations (vector or raster)

.. |Map| image:: ../_images/map.png
:alt: Map icon

:width: 16 pt

TOC
---------------
Expand All @@ -93,30 +93,39 @@ Moreover, several features are available via a right-click:

.. |TOC| image:: ../_images/toc.png
:alt: TOC icon
:width: 16 pt

.. |AddWMS| image:: ../_images/world_add.png
:alt: Add a WMS icon
:width: 16 pt

.. |ZoomLayer| image:: ../_images/zoom_layer.png
:alt: Zoom to layer icon
:width: 16 pt

.. |ImportStyle| image:: ../_images/palette_import.png
:alt: Import a style icon
:width: 16 pt

.. |Thematic| image:: ../_images/palette_add.png
:alt: Create a thematic analysis icon
:width: 16 pt

.. |ExportStyle| image:: ../_images/palette_export.png
:alt: Export a style icon
:width: 16 pt

.. |EditStyle| image:: ../_images/palette_edit.png
:alt: Edit a style icon
:width: 16 pt

.. |RemoveStyle| image:: ../_images/palette_remove.png
:alt: Remove a style icon
:width: 16 pt

.. |Edit| image:: ../_images/pencil.png
:alt: Edit icon
:width: 16 pt

DB Tree
---------------
Expand All @@ -130,12 +139,15 @@ Specific options allows the user to:

.. |DBTree| image:: ../_images/db_tree.png
:alt: DB Tree icon
:width: 16 pt

.. |GeoIndex| image:: ../_images/index_geo.png
:alt: Geographic index icon
:width: 16 pt

.. |AlphaIndex| image:: ../_images/index_alpha.png
:alt: Alphanumeric index icon
:width: 16 pt


Output console
Expand All @@ -145,6 +157,7 @@ The output ( |Output| ) console is the place where all messages (informations, w

.. |Output| image:: ../_images/output.png
:alt: Output icon
:width: 16 pt


SQL console
Expand All @@ -171,12 +184,16 @@ N.B: This component is available through the "Tools" menu.

.. |SQLConsole| image:: ../_images/sql_code.png
:alt: SQL Console icon
:width: 16 pt

.. |SQLExecute| image:: ../_images/execute.png
:alt: Execute SQL instruction icon
:width: 16 pt

.. |SQLfunctions| image:: ../_images/builtinfunctionmap.png
:alt: SQL functions icon
:width: 16 pt

.. |Search| image:: ../_images/find.png
:alt: Search icon
:width: 16 pt
9 changes: 8 additions & 1 deletion docs/users/components.rst~
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,31 @@ The Geocatalog ( |GeoCatalog| ) is the place where datasources are managed. Thro

.. |GeoCatalog| image:: ../_images/geocatalog.png
:alt: Geocatalog icon
:width: 16 pt

.. |AddFile| image:: ../_images/page_white_add.png
:alt: Add a file icon
:width: 16 pt

.. |AddFolder| image:: ../_images/folder_add.png
:alt: Add a file icon
:width: 16 pt

.. |Export| image:: ../_images/page_white_save.png
:alt: Export a file icon
:width: 16 pt

.. |OpenAttributes| image:: ../_images/table.png
:alt: Open attributes icon
:width: 16 pt

.. |Remove| image:: ../_images/remove.png
:alt: Remove icon
:width: 16 pt

.. |Refresh| image:: ../_images/refresh.png
:alt: Refresh icon
:width: 16 pt


Map
Expand Down Expand Up @@ -119,7 +126,7 @@ Specific options allows the user to:

- Create spatial index (|GeoIndex| ),
- Create alphanumeric index ( |AlphaIndex| ),
- Remove columns.
- Remove columns ( |Remove| ).

.. |DBTree| image:: ../_images/db_tree.png
:alt: DB Tree icon
Expand Down
24 changes: 13 additions & 11 deletions docs/users/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,29 @@ Quickstart
The workspace
---------------

The workspace is a configuration of your environment that you have define.

It is saved automatically (via an option in the Configuration Panel) or manually via a click on the appropriate button in the toolbar or at the closing of OrbisGIS.
The workspace is the configuration of your User Interface *(UI)*.

The following items are saved in the workspace:

- open windows
- size and location
- data loaded into the Geocatalog
- maps created
- loaded data in TOC (One TOC per map)

- opened windows (with their size and place in the UI),
- datasources loaded into the Geocatalog,
- loaded layers in the TOC.


Load data
---------------

To load data, just choose "Add" or "Import".
To load data, just choose "Add" or "Import" in the Geocatalog.


Display on the map
---------------

To display a geographic layer, just drag & drop it into the TOC.
To display a geographic layer, just drag & drop it from the Geocatalog to the TOC.


Display attributes
---------------

To see how to display attributes, have a look at :ref:`show_attributes` page.

35 changes: 27 additions & 8 deletions docs/users/quickstart.rst~
Original file line number Diff line number Diff line change
@@ -1,14 +1,33 @@
Workspace
Quickstart
========

The workspace is a configuration of your environment that you have define.

It is saved automatically (via an option in the Configuration Panel) or manually via a click on the appropriate button in the toolbar or at the closing of OrbisGIS.
The workspace
---------------

The workspace is the configuration of your User Interface *(UI)*.

The following items are saved in the workspace:

- open windows
- size and location
- data loaded into the Geocatalog
- maps created
- loaded data in TOC (One TOC per map)
- opened windows (with their size and place in the UI),
- datasources loaded into the Geocatalog,
- loaded layers in the TOC.


Load data
---------------

To load data, just choose "Add" or "Import" in the Geocatalog.


Display on the map
---------------

To display a geographic layer, just drag & drop it from the Geocatalog to the TOC.


Display attributes
---------------

To see how to display attributes layer, have a look at :ref:`show_attributes` page.

15 changes: 0 additions & 15 deletions docs/users/workspace.rst~

This file was deleted.

0 comments on commit 2a9ee5b

Please sign in to comment.