Skip to content

Commit 0101c68

Browse files
dg0ytdg0yt
committed
Merge branch 'release-0.6.1' into release
2 parents 6421973 + ccd41bf commit 0101c68

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+24502
-9541
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ set(Mapper_VERSION_MAJOR 0)
3535
set(Mapper_VERSION_MINOR 6)
3636
if(NOT Mapper_VERSION_PATCH)
3737
# This can be configured when running cmake
38-
set(Mapper_VERSION_PATCH 0)
38+
set(Mapper_VERSION_PATCH 1)
3939
endif()
4040

4141
set(MAPPER_VERSION_PRI "${PROJECT_SOURCE_DIR}/oo-mapper-version.pri")

‎README.md

Lines changed: 44 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,46 @@
1-
OpenOrienteering Mapper is an orienteering mapmaking program and provides a free alternative to existing commercial software. Its main advantages compared to it are:
1+
# OpenOrienteering Mapper
22

3-
- Open Source: the program is completely free, every programmer can improve it.
4-
- Cross-platform: the program works on Android, Windows, Mac OS X and Linux.
3+
![Mapper Screenshot](http://openorienteering.github.io/mapper-manual/pages/images/main_window.png)
54

6-
While it is under continuous development and considered in beta state, it has been used to produce maps for classical orienteering, MTBO and radio orienteering races. All required functions for drawing maps are implemented and the program works very stable. So it can be considered ready for productive use, although it is like always a good idea to keep backups of your files. We are happy about feedback to the program.
5+
OpenOrienteering Mapper is an orienteering mapmaking program and provides a free and open source alternative to existing commercial software. OpenOrienteering Mapper runs on Android, Windows, Mac OS X and Linux.
6+
7+
- [Manual](http://openorienteering.org/mapper-manual/)
8+
- [Downloads](https://github.com/OpenOrienteering/mapper/releases)
9+
- [Blog](http://openorienteering.github.io/)
10+
11+
12+
## Contributing
13+
14+
### Writing Code
15+
16+
For building Mapper from source see [`INSTALL.md`](https://github.com/OpenOrienteering/mapper/blob/master/INSTALL.md). Pull requests are very welcome.
17+
18+
- [Ticket system](https://github.com/OpenOrienteering/mapper/issues)
19+
- [API documentation](http://openorienteering.github.io/api-docs/mapper/)
20+
- [Unstable Builds](http://openorienteering.github.io/news/2015/mapper-unstable-packages/)
21+
- [Developer mailing list](https://lists.sourceforge.net/lists/listinfo/oorienteering-devel)
22+
- [Developer wiki](https://github.com/OpenOrienteering/mapper/wiki)
23+
24+
25+
### Translating
26+
27+
The translations for Mapper are stored in `translations/OpenOrienteering_lang.ts`. The easiest way to edit those files is by using [Qt Linguist for translation](http://doc.qt.io/qt-5/linguist-translators.html). The translations can also be edited with any XML editor.
28+
29+
Adding a new translation is done by making a new copy of `OpenOrienteering_template.ts` and replacing `template` in the file name with the relevant language code. The new file also has to be added to `translations/CMakeLists.txt`.
30+
31+
Some strings such as basic buttons and colors has its translation within the Qt Framework, for translating those see [Qt Localization](https://wiki.qt.io/Qt_Localization).
32+
33+
34+
### Writing Documentation
35+
36+
The Mapper manual lives in its [own repository](https://github.com/OpenOrienteering/mapper-manual) witch contains all information for you to get started.
37+
38+
39+
### Reporting Issues
40+
41+
Issues and possible improvements can be posted to our public [Ticket system](https://github.com/OpenOrienteering/mapper/issues), please make sure you provide all relevant information about your problem or idea.
42+
43+
44+
## License
45+
46+
Mapper is licensed under the [GNU GENERAL PUBLIC LICENSE Version 3](https://www.gnu.org/licenses/gpl.html).

‎android/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.6.0" android:versionCode="2" package="org.openorienteering.mapper" android:installLocation="auto">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.6.1" android:versionCode="2" package="org.openorienteering.mapper" android:installLocation="auto">
33
<application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/long_app_name" android:icon="@drawable/icon">
44
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
55
android:name="org.openorienteering.mapper.MapperActivity"

‎doc/manual/pages/edit_menu.md

Lines changed: 71 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,78 @@ title: Edit Menu
33
authors:
44
- Peter Hoban
55
- Thomas Schoeps
6+
- Kai Pastor
67
keywords: Menus
7-
edited: 24 February 2013
8+
edited: 10 Januar 2016
89
---
910

10-
<table><tr><td width="40"><img class="small" src="../mapper-images/undo.png" width="32" height="32" border="0" alt="" /></td><td width="100"><h4>Undo</h4></td><td width="70"><h4>Ctrl+Z</h4></td><td width="400">
11-
<p>This most important function reverses the last change made to the map. Repeating 'Undo' will undo earlier changes, one step at a time.<br/><br/>
12-
<b>Attention</b>: while changes to map objects can be undone this way, not all map changes are covered by the undo system. This includes changes to colors, symbols or templates. Because of this, it is very advisable to make a backup of your map before making such changes.</p>
13-
</td></tr>
14-
15-
<tr><td><img class="small" src="../mapper-images/redo.png" width="32" height="32" border="0" alt="" /></td><td><h4>Redo</h4></td><td><h4>Ctrl+Y</h4></td><td>
16-
<p>When you have taken Undo too far this will reverse the process &#8212; again one step at a time.</p></td></tr>
17-
18-
<tr><td><img class="small" src="../mapper-images/cut.png" width="32" height="32" border="0" alt="" /></td><td><h4>Cut</h4></td><td><h4>Ctrl+X</h4></td><td>
19-
<p>This removes the selected object(s) and moves them to the clipboard.</p></td></tr>
20-
21-
<tr><td><img class="small" src="../mapper-images/copy.png" width="32" height="32" border="0" alt="" /></td><td><h4>Copy</h4></td><td><h4>Ctrl+C</h4></td><td>
22-
<p>This copies the selected object(s) to the clipboard.</p></td></tr>
23-
24-
<tr><td><img class="small" src="../mapper-images/paste.png" width="32" height="32" border="0" alt="" /></td><td><h4>Paste</h4></td><td><h4>Ctrl+V</h4></td><td>
25-
<p>This inserts the map object(s) on the clipboard into the map. They will be centered at the view midpoint. <br/><br/>
26-
<b>Note</b>: when copying ojects between different maps, their symbols and colors may be copied too in order to be able to display the objects in the new map in the same way as in the source map.</p></td></tr>
27-
28-
<tr><td></td><td><h4>Clear undo / redo history</h4></td><td><h4></h4></td><td>
29-
<p>Clears the undo / redo history, i.e. all undo and redo steps will be deleted. This reduces the file size for map file formats where the last undo and redo steps are stored, e.g. the omap format.</p></td></tr>
30-
11+
<table>
12+
<tr>
13+
<td width="40"><img class="small" src="../mapper-images/undo.png" width="32" height="32" border="0" alt="" /></td>
14+
<td width="100"><b>Undo</b></td>
15+
<td width="70"><b>Ctrl+Z</b></td>
16+
<td width="400">This most important function reverses the last change made to the map. Repeating 'Undo' will undo earlier changes, one step at a time.<br/>
17+
<b>Attention:</b> While changes to map objects can be undone this way, not all map changes are covered by the undo system. This includes changes to colors, symbols or templates.</td>
18+
</tr>
19+
<tr>
20+
<td><img class="small" src="../mapper-images/redo.png" width="32" height="32" border="0" alt="" /></td>
21+
<td><b>Redo</b></td>
22+
<td><b>Ctrl+Y, Ctrl+Shift+Z</b></td>
23+
<td>When you have taken Undo too far this will reverse the process &#8212; again one step at a time.</td>
24+
</tr>
25+
<tr>
26+
<td><img class="small" src="../mapper-images/cut.png" width="32" height="32" border="0" alt="" /></td>
27+
<td><b>Cut</b></td>
28+
<td><b>Ctrl+X</b></td>
29+
<td>This removes the selected object(s) and moves them to the clipboard.</td>
30+
</tr>
31+
<tr>
32+
<td><img class="small" src="../mapper-images/copy.png" width="32" height="32" border="0" alt="" /></td>
33+
<td><b>Copy</b></td>
34+
<td><b>Ctrl+C</b></td>
35+
<td>This copies the selected object(s) to the clipboard.</td>
36+
</tr>
37+
<tr>
38+
<td><img class="small" src="../mapper-images/paste.png" width="32" height="32" border="0" alt="" /></td>
39+
<td><b>Paste</b></td>
40+
<td><b>Ctrl+V</b></td>
41+
<td>This inserts the map object(s) on the clipboard into the map. They will be centered at the view midpoint.<br/>
42+
<b>Note:</b> When copying objects between different maps, their symbols and colors may be copied too in order to be able to display the objects in the new map in the same way as in the source map.</td>
43+
</tr>
44+
<tr>
45+
<td><img class="small" src="../mapper-images/delete.png" width="32" height="32" border="0" alt="" /></td>
46+
<td><b>Delete</b></td>
47+
<td><b>Del</b></td>
48+
<td>This action deletes the selected object(s).</td>
49+
</tr>
50+
<tr>
51+
<td></td>
52+
<td><b>Select all</b></td>
53+
<td><b>Ctrl+A</b></td>
54+
<td>This selects all objects in the current map part.</td>
55+
</tr>
56+
<tr>
57+
<td></td>
58+
<td><b>Select nothing</b></td>
59+
<td><b>Ctrl+Shift+A</b></td>
60+
<td>After this action, no object is selected.</td>
61+
</tr>
62+
<tr>
63+
<td></td>
64+
<td><b>Invert selection</b></td>
65+
<td><b>Ctrl+I</b></td>
66+
<td>This action inverts the selection in the current map part.</td>
67+
</tr>
68+
<tr>
69+
<td></td>
70+
<td><b>Select all objects with selected symbols</b></td>
71+
<td></td>
72+
<td>After this action, the selection consists of all objects in the current map part which have the selected symbol(s).</td>
73+
</tr>
74+
<tr>
75+
<td></td>
76+
<td><b>Clear undo / redo history</b></td>
77+
<td></td>
78+
<td>Clears the history of undo and redo steps, i.e. all undo and redo steps will be deleted. This reduces the file size for map file formats where the last undo and redo steps are stored, e.g. the omap format.</td>
79+
</tr>
3180
</table>
32-
33-
34-
<h3>Editing tools</h3>
35-
<p>OOMapper offers many editing tools which may be accessed through the <a href="tools_menu.md">Tools menu</a> or the <a href="toolbars.md">toolbars</a>.</p>
36-

‎doc/manual/pages/images/grid_settings.png

250 Bytes
Loading

‎doc/manual/pages/index.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ Contents {#index_contents}
1616
[Map Screen](main_window.md){: .subpage} <br/>
1717
Explanation of the main drawing window.
1818

19+
[Reference](reference.md){: .subpage} <br/>
20+
Toolbar and menu items, including explanations for [all drawing tools](toolbars.md#drawing)
21+
1922
[Starting a new map](new_map.md){: .subpage} <br/>
2023
First steps
2124

@@ -25,15 +28,15 @@ Defining the relationship between map paper coordinates and real world coordinat
2528
[Map grid](grid.md){: .subpage} <br />
2629
Showing a helper grid in the map view.
2730

28-
[Reference](reference.md){: .subpage} <br/>
29-
Toolbar and menu items, including explanations for [all drawing tools](toolbars.md#drawing)
30-
3131
[Templates](templates-index.md){: .subpage} <br/>
3232
Working with templates
3333

3434
[Colors and Symbols](colors_symbols.md){: .subpage} <br/>
3535
Modifying map colors and symbols
3636

37+
[Map Parts](map_parts.md){: .subpage} <br/>
38+
Organizing objects in maps
39+
3740
[Tag Editor](tag_editor.md){: .subpage} <br/>
3841
Attaching arbitrary key-value pairs to objects
3942

‎doc/manual/pages/map_menu.md

Lines changed: 69 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,76 @@ title: Map Menu
33
authors:
44
- Peter Hoban
55
- Thomas Schoeps
6+
- Kai Pastor
67
keywords: Menus
7-
edited: 26 February 2013
8+
edited: 10 January 2016
89
---
910

10-
<table><tr><td width="40"> </td><td width="150"><h4>Georeferencing</h4></td><td width="70"><h4> </h4></td><td width="400">
11-
<p>Opens the <a href="georeferencing.md">georeferencing dialog</a>. </p> </td></tr>
12-
13-
<tr><td width="40"> </td><td width="150"><h4>Configure grid...</h4></td><td width="70"><h4> </h4></td><td width="400">
14-
<p>Shows the <a href="grid.md">grid configuration dialog</a>.</p></td></tr>
15-
16-
<tr><td width="40"> </td><td width="150"><h4>Change map scale...</h4></td><td width="70"><h4> </h4></td><td width="400">
17-
<p>Shows a dialog to change the map scale.</p> </td></tr>
18-
19-
<tr><td width="40"> </td><td width="150"><h4>Rotate map...</h4></td><td width="70"><h4> </h4></td><td width="400">
20-
<p>Shows a dialog to rotate the whole map.</p> </td></tr>
21-
22-
<tr><td width="40"> </td><td width="150"><h4>Map notes...</h4></td><td width="70"><h4> </h4></td><td width="400">
23-
<p>Shows a text field where any text can be entered which will be saved in the map file, without appearing on the map itself. This can for example be used to store information about map revisions.</p> </td></tr>
24-
11+
<table>
12+
<tr>
13+
<td width="40"></td>
14+
<td width="150"><b>Georeferencing...</b></td>
15+
<td width="70"></td>
16+
<td width="400">Opens the <a href="georeferencing.md">georeferencing dialog</a>.</td>
17+
</tr>
18+
<tr>
19+
<td><img class="small" src="../mapper-images/grid.png" width="32" height="32" border="0" alt="" /></td>
20+
<td><b>Configure grid...</b></td>
21+
<td></td>
22+
<td>Shows the <a href="grid.md">grid configuration dialog</a>.</td>
23+
</tr>
24+
<tr>
25+
<td><img class="small" src="../mapper-images/tool-scale.png" width="32" height="32" border="0" alt="" /></td>
26+
<td><b>Change map scale...</b></td>
27+
<td></td>
28+
<td>Shows a dialog to change the map scale.</td>
29+
</tr>
30+
<tr>
31+
<td><img class="small" src="../mapper-images/tool-rotate.png" width="32" height="32" border="0" alt="" /></td>
32+
<td><b>Rotate map...</b></td>
33+
<td></td>
34+
<td>Shows a dialog to rotate the whole map.</td>
35+
</tr>
36+
<tr>
37+
<td></td>
38+
<td><b>Map notes...</b></td>
39+
<td></td>
40+
<td>Shows a text field for entering additional text which will be saved in the map file, without appearing on the map itself. This can for example be used to store information about map revisions.</td>
41+
</tr>
42+
<tr>
43+
<td></td>
44+
<td><b>Add new part...</b></td>
45+
<td></td>
46+
<td>Opens a dialog for entering the name of a new map part which is to be created.</td>
47+
</tr>
48+
<tr>
49+
<td></td>
50+
<td><b>Rename current part...</b></td>
51+
<td></td>
52+
<td>Opens a dialog for changing the name of the current map part.</td>
53+
</tr>
54+
<tr>
55+
<td></td>
56+
<td><b>Remove current part</b></td>
57+
<td></td>
58+
<td>Removes the current map part and all objects it contains.</td>
59+
</tr>
60+
<tr>
61+
<td></td>
62+
<td><b>Move select objects to</b></td>
63+
<td></td>
64+
<td>Moves the selected objects to another map part.</td>
65+
</tr>
66+
<tr>
67+
<td></td>
68+
<td><b>Merge this part with</b></td>
69+
<td></td>
70+
<td>Moves the current part's objects to another map part, and then removes the current map part.</td>
71+
</tr>
72+
<tr>
73+
<td></td>
74+
<td><b>Merge all parts</b></td>
75+
<td></td>
76+
<td>Moves all other parts' objects to the current part, and then removes all other map parts.</td>
77+
</tr>
2578
</table>
26-

‎doc/manual/pages/map_parts.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
title: Map Parts
3+
authors:
4+
- Kai Pastor
5+
keywords: Map parts
6+
edited: 10 January 2016
7+
---
8+
9+
Map parts partition the map in different collections of objects which can be worked on independently.
10+
This can be used to organize the work of different people in a map making team.
11+
Map parts are also used to separate imported objects from existing map content.
12+
13+
Every map object belongs to a particular map part.
14+
Selected objects may be moved to a different map part.
15+
You may also move all objects of the current part to another one,
16+
or merge all other parts into the current one in a single step.
17+
See the [Map menu](map_menu.md) for actions which create and change map parts.
18+
19+
Only a single map part can be the "current" one.
20+
It is the context where all selection, editing and drawing operations take place.
21+
The current map part is displayed and selected in the map part toolbar.
22+
This toolbar is not displayed as long as the map has only one part.
23+
24+
Other than templates, map parts are not drawn sequentially one after the other,
25+
but simultaneously according to the symbols and colors.
26+
All map parts share the map's colors and symbol sets.

‎doc/manual/pages/view_menu.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Note that key F6 starts panning immediately.</td></tr>
4242
<p>The coordinates of the cursor on the map are shown in the position box at the bottom right corner of the program window. Paper coordinates refer to positions on a paper print, from an arbitrary origin. If your map has been <a href="georeferencing.md">georeferenced</a>, additional coordinate systems will be available. Projected coordinates are meters of easting and northing. Latitude &amp; longitude may be expressed in decimal degrees or in degrees, minutes and seconds.</p>
4343
<p>The coordinate system may also be selected by a right-click on the position box at the bottom right corner of your screen which will provide the same choices.<br/><br/></p></td></tr>
4444

45-
<tr><td></td><td><a name="fullscreen"><h4>Toggle Fullscreen</h4></a></td><td><h4>F11</h4></td><td>
45+
<tr><td></td><td><a name="fullscreen"><h4>Toggle fullscreen mode</h4></a></td><td><h4>F11</h4></td><td>
4646
<p>This toggle switches the display to full-screen mode and back.</p></td></tr>
4747

4848
<tr><td><img class="small" src="../mapper-images/window-new.png" width="32" height="32" border="0" alt="" /></td><td><h4>Tag editor</h4></td><td><h4>Ctrl+Shift+6</h4></td><td>

‎oo-mapper-version.pri

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Generated in CMakeLists.txt, do not edit here.
22
Mapper_VERSION_MAJOR = 0
33
Mapper_VERSION_MINOR = 6
4-
Mapper_VERSION_PATCH = 0
4+
Mapper_VERSION_PATCH = 1

0 commit comments

Comments
 (0)