marble:marble.git
6 years agoREVIEW: 6622
Cristian Oneț [Sun, 20 Mar 2011 21:17:55 +0000 (21:17 +0000)]
REVIEW: 6622

Fix sunlight and timezone display in the worldclock plasmoid.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1225421 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoexport MarbleRunnerManager.h
Thibaut Gridel [Sun, 13 Mar 2011 12:04:15 +0000 (12:04 +0000)]
export MarbleRunnerManager.h

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1224683 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agofix typo: downloadig->downloading
Yuri Chornoivan [Sun, 13 Mar 2011 06:21:14 +0000 (06:21 +0000)]
fix typo: downloadig->downloading

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1224663 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoMapWizard: clarify some wording
Bernhard Beschow [Sat, 12 Mar 2011 14:12:43 +0000 (14:12 +0000)]
MapWizard: clarify some wording

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1224592 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoMarking map themes as "favourite" in Marble by Daniel Marth
Thibaut Gridel [Sat, 12 Mar 2011 10:50:53 +0000 (10:50 +0000)]
Marking map themes as "favourite" in Marble by Daniel Marth

Map themes can now be marked as favorite.
GCI-task: http://www.google-melange.com/gci/task/show/google/gci2010/kde/t129303445819
REVIEW: 6303

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1224574 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoMapWizard: have metadata page rather than legend page appear after map source page
Bernhard Beschow [Sat, 12 Mar 2011 09:08:21 +0000 (09:08 +0000)]
MapWizard: have metadata page rather than legend page appear after map source page

pros:
* map source is visualized in metadata page -> better feedback
* legend data is optional, and therefore not as critical as metadata

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1224563 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoMapWizard: rename some pages
Bernhard Beschow [Sat, 12 Mar 2011 09:08:19 +0000 (09:08 +0000)]
MapWizard: rename some pages

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1224562 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoFix mem leak
Laurent Montel [Thu, 10 Mar 2011 12:23:18 +0000 (12:23 +0000)]
Fix mem leak

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1224397 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoAdd a FindPhonon.cmake check to be able to use phonon from kdesupport. Patch by Chris...
Dennis Nienhüser [Wed, 9 Mar 2011 20:30:52 +0000 (20:30 +0000)]
Add a FindPhonon.cmake check to be able to use phonon from kdesupport. Patch by Christoph Feck, thanks! Extended to make phonon an optional dependency and use a null audio output when it's missing so that the routing plugin can still be used without phonon (no sound output then of course).
CCMAIL: christoph@maxiom.de
CCMAIL: marble-devel@kde.org

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1224259 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoMake sound output the default instead of voice navigation - so far we don't have...
Dennis Nienhüser [Wed, 9 Mar 2011 20:30:50 +0000 (20:30 +0000)]
Make sound output the default instead of voice navigation - so far we don't have a default voice to ship.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1224258 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoreplace QModelIndex with const GeoDataPlacemark* where it is due
Thibaut Gridel [Tue, 8 Mar 2011 19:14:10 +0000 (19:14 +0000)]
replace QModelIndex with const GeoDataPlacemark* where it is due

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1224176 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoRemove executable attribute
Laurent Montel [Tue, 1 Mar 2011 12:38:28 +0000 (12:38 +0000)]
Remove executable attribute

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1223224 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agocleanup: merge MarbleWidget*InputHandler::init() into respective constructors
Bernhard Beschow [Mon, 28 Feb 2011 19:05:17 +0000 (19:05 +0000)]
cleanup: merge MarbleWidget*InputHandler::init() into respective constructors

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1223153 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoAdd missing tr(...)
Laurent Montel [Wed, 23 Feb 2011 12:24:27 +0000 (12:24 +0000)]
Add missing tr(...)

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1222390 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoMapWizard: remove image format combo and always require the full URL (incl. file...
Bernhard Beschow [Sun, 20 Feb 2011 15:55:05 +0000 (15:55 +0000)]
MapWizard: remove image format combo and always require the full URL (incl. file extension) to be provided

* clarifies what data is required from users (always full URL, no magic completion of the URL in case of OSM-like server)
* the image format is determined automatically -> no need for combo, which was error-prone

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1221817 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoMapWizard: move most recently used URL on top of static server history (and make...
Bernhard Beschow [Sun, 20 Feb 2011 15:55:03 +0000 (15:55 +0000)]
MapWizard: move most recently used URL on top of static server history (and make sure it is there only once)

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1221816 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agohave the ServerLayouts know the name of their layout mode
Bernhard Beschow [Sun, 20 Feb 2011 15:55:01 +0000 (15:55 +0000)]
have the ServerLayouts know the name of their layout mode

* fixes DgmlTextureTagWriter::write(), which improperly took the *Storage*Layout into account
* allows for the factory design pattern (not implemented yet)

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1221815 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoIgnore fuzzy translations.
Dennis Nienhüser [Sun, 20 Feb 2011 12:57:21 +0000 (12:57 +0000)]
Ignore fuzzy translations.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1221765 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoExtend drawAnnotation() to calculate and use the optimal text height when an invalid...
Dennis Nienhüser [Sat, 19 Feb 2011 21:45:30 +0000 (21:45 +0000)]
Extend drawAnnotation() to calculate and use the optimal text height when an invalid height is passed. Use it for painting driving instructions in the map. Fixes long instructions being cut off. Reduce the rounded corner radius for a better text/bubble ratio.
BUG: 265926
REVIEW: 6525

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1221644 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoAudible announcements of start and destination as well.
Dennis Nienhüser [Tue, 15 Feb 2011 20:12:10 +0000 (20:12 +0000)]
Audible announcements of start and destination as well.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1220936 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoUse doxygen's grouping feature to organize MarbleWidget's functions.
Michael Georg Hansen [Tue, 15 Feb 2011 19:57:22 +0000 (19:57 +0000)]
Use doxygen's grouping feature to organize MarbleWidget's functions.

REVIEW: 5321

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1220934 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoDisable tests on windows.
Dennis Nienhüser [Tue, 15 Feb 2011 18:01:19 +0000 (18:01 +0000)]
Disable tests on windows.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1220918 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoLink against phonon.
Dennis Nienhüser [Mon, 14 Feb 2011 19:54:04 +0000 (19:54 +0000)]
Link against phonon.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1220700 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoVoice navigation support: In route guidance mode, turn points are announced in advanc...
Dennis Nienhüser [Mon, 14 Feb 2011 19:41:38 +0000 (19:41 +0000)]
Voice navigation support: In route guidance mode, turn points are announced in advance using either a sound or some speaker at the user's option. There's no speaker shipped with Marble (yet), but existing TomTom ones can be converted. See userbase.kde.org/Marble/CustomSpeakers.
REVIEW: 6469

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1220699 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoFix the default accuracy color missing a transparency value. Disable the position...
Dennis Nienhüser [Sat, 12 Feb 2011 15:36:08 +0000 (15:36 +0000)]
Fix the default accuracy color missing a transparency value. Disable the position marker trail by default. In most situations (slow movement or medium or low zoom values) the circles overlap, leading to an overcrowded view. This needs to be improved before it can be the default for all users.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1220034 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoThe Qt only build cannot create a kde handbook.
Dennis Nienhüser [Sun, 6 Feb 2011 12:44:15 +0000 (12:44 +0000)]
The Qt only build cannot create a kde handbook.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1219121 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agomove marble documentation from doc/marble to marble/doc
Jeremy Paul Whiting [Sun, 6 Feb 2011 02:19:44 +0000 (02:19 +0000)]
move marble documentation from doc/marble to marble/doc

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1219072 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoRemove extra dot from ellipsis
Alexander Potashev [Fri, 4 Feb 2011 18:27:39 +0000 (18:27 +0000)]
Remove extra dot from ellipsis

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1218798 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoMerge screenX(), screenY() into pixel().
Dennis Nienhüser [Thu, 3 Feb 2011 20:05:41 +0000 (20:05 +0000)]
Merge screenX(), screenY() into pixel().

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1218690 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoMove distance calculation to Coordinate. Merge the lon(), lat() methods into coordina...
Dennis Nienhüser [Thu, 3 Feb 2011 20:05:39 +0000 (20:05 +0000)]
Move distance calculation to Coordinate. Merge the lon(), lat() methods into coordinate().

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1218689 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoAdd a GeoDataCoordinates wrapper exported to QML. Use it inside Placemark (switch...
Dennis Nienhüser [Wed, 2 Feb 2011 21:09:02 +0000 (21:09 +0000)]
Add a GeoDataCoordinates wrapper exported to QML. Use it inside Placemark (switch to GeoDataPlacemark wrapper tbd.).

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1218559 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoinstall the marble part rc where it's expected after the conversion to k
Marco Martin [Wed, 2 Feb 2011 15:15:17 +0000 (15:15 +0000)]
install the marble part rc where it's expected after the conversion to k
plugin factory
CCMAIL:bbeschow@cs.tu-berlin.de

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1218491 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoremove the use of deprecated kpart functions
Marco Martin [Sat, 29 Jan 2011 18:18:16 +0000 (18:18 +0000)]
remove the use of deprecated kpart functions
http://svn.reviewboard.kde.org/r/6413/

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1217937 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoRe-center => Map Adjustment
Dennis Nienhüser [Fri, 28 Jan 2011 19:49:46 +0000 (19:49 +0000)]
Re-center => Map Adjustment

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1217814 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoDo not include private headers in public headers
Christoph Feck [Thu, 27 Jan 2011 23:04:22 +0000 (23:04 +0000)]
Do not include private headers in public headers

Use a forward declaration instead; unbreaks digiKam.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1217579 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoAdd an action to open the bookmark manager to the kde application. Remove the actions...
Dennis Nienhüser [Thu, 27 Jan 2011 22:01:13 +0000 (22:01 +0000)]
Add an action to open the bookmark manager to the kde application. Remove the actions to create a new bookmark folder and to remove all bookmarks from the kde and the qt applications. The bookmark manager provides that functionality.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1217564 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoMarbleModel: signal when treemodel data changes
Thibaut Gridel [Thu, 27 Jan 2011 21:24:43 +0000 (21:24 +0000)]
MarbleModel: signal when treemodel data changes

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1217555 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoGeoDataPoint: use p() to get correct typeinfo, and properly initialise parents
Thibaut Gridel [Thu, 27 Jan 2011 21:24:37 +0000 (21:24 +0000)]
GeoDataPoint: use p() to get correct typeinfo, and properly initialise parents

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1217554 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agodead code
Thibaut Gridel [Thu, 27 Jan 2011 21:24:29 +0000 (21:24 +0000)]
dead code

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1217553 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoPosition Marker trail by Daniel Marth
Thibaut Gridel [Thu, 27 Jan 2011 21:24:20 +0000 (21:24 +0000)]
Position Marker trail by Daniel Marth

Adds a trail to the position marker.
GCI-task: http://www.google-melange.com/gci/task/show/google/gci2010/kde/t129364719879

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1217552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoDelay by 500ms before jumping after a search text is input
Thibaut Gridel [Thu, 27 Jan 2011 21:24:14 +0000 (21:24 +0000)]
Delay by 500ms before jumping after a search text is input

CCBUG: 214197
REVIEW: 6390

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1217551 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoUse stackable windows for the routing dialog, the directions list view inside the...
Dennis Nienhüser [Thu, 27 Jan 2011 20:19:17 +0000 (20:19 +0000)]
Use stackable windows for the routing dialog, the directions list view inside the routing widget, the routing profile settings dialog, the map view dialog and the tracking dialog.
REVIEW: 6417

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1217543 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoBookmark Manager: Delete folders, rename them, create new ones, delete bookmarks...
Dennis Nienhüser [Thu, 27 Jan 2011 20:19:13 +0000 (20:19 +0000)]
Bookmark Manager: Delete folders, rename them, create new ones, delete bookmarks and edit bookmarks (including moving to other folders). Also adds support for importing .kml files. The only missing thing -- which I plan to make a junior job -- is drag & drop support. (Internal move to change the order of folders and bookmarks inside folders. Maybe also D&D between views to support dragging bookmarks quickly to other folders.)

Squashed patch of a local git branch:
- Support importing bookmarks from .kml files. When conflicts arise (imported bookmark already exists), the user is asked whether to skip the new or replace the existing bookmark.
- NewFolderInfoDialog is a misleading name. Rename it NewBookmarkFolderDialog.
- Rename NameDialog to NewBookmarkFolderDialog, the former is too generic. Fix broken license header in NewBookmarkFolderDialog.h. Make it possible to use the dialog without changing existing bookmarks directly. Use a ButtonBox in the .ui to get a consistent interface.
- New bookmark folders can be created within the bookmark manager.
- Deletion of individual folders and bookmarks. Use the first folder as default selection.
- Use the existing dialogs to edit bookmark folders and bookmarks in the bookmark manager.
- Rename BookmarkInfoDialog to EditBookmarkDialog which describes its purpose better.
FEATURE: 261124
REVIEW: 6411

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1217542 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoAllow using absolute source directories in texture layers in .dgml files.
Dennis Nienhüser [Thu, 27 Jan 2011 20:19:08 +0000 (20:19 +0000)]
Allow using absolute source directories in texture layers in .dgml files.
Extend .dgml by a tileSize tag (width and height attribute), usable inside textureLayer tags. Such .dgml files are backwards compatible.
Handle 'base tile missing' case more gracefully and return an empty image instead of triggering an assertion.
Move the default tile size (675) to global.h and replace hardcoded default tile sizes with it.
CCBUG: 249633
CCBUG: 263010
REVIEW: 6334

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1217541 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoWork around gpsmm parsing gpsd output (C locale) with current locale.
Dennis Nienhüser [Thu, 27 Jan 2011 20:19:04 +0000 (20:19 +0000)]
Work around gpsmm parsing gpsd output (C locale) with current locale.
CCBUG: 262330
REVIEW: 6327

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1217540 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoQt macros shouldn't be trailed by semicolons. fixes build with Sun Studio
Pavel Heimlich [Sun, 23 Jan 2011 21:23:23 +0000 (21:23 +0000)]
Qt macros shouldn't be trailed by semicolons. fixes build with Sun Studio

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1216524 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 years agoSupport importing bookmarks from .kml files. When conflicts arise (imported bookmark...
Dennis Nienhüser [Sun, 23 Jan 2011 13:38:59 +0000 (13:38 +0000)]
Support importing bookmarks from .kml files. When conflicts arise (imported bookmark already exists), the user is asked whether to skip the new or replace the existing bookmark.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1216455 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agotake number of base tiles (columns) into account when calculating the tile level
Bernhard Beschow [Thu, 20 Jan 2011 23:11:06 +0000 (23:11 +0000)]
take number of base tiles (columns) into account when calculating the tile level

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1216047 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agofix compile on ARM (hopefully, building aborted when executing tile creator)
Bernhard Beschow [Thu, 20 Jan 2011 23:11:04 +0000 (23:11 +0000)]
fix compile on ARM (hopefully, building aborted when executing tile creator)

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1216046 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoAdd a utility to convert osmosis polygon files (.poly) to .kml, targeted at creating...
Dennis Nienhüser [Thu, 20 Jan 2011 22:57:38 +0000 (22:57 +0000)]
Add a utility to convert osmosis polygon files (.poly) to .kml, targeted at creating metadata from cloudmades country bounding polygon files used in conjunction with monav offline maps.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1216045 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoAdd a C++ utility application to merge .po and .ts files and a script that downloads...
Dennis Nienhüser [Thu, 20 Jan 2011 22:57:36 +0000 (22:57 +0000)]
Add a C++ utility application to merge .po and .ts files and a script that downloads Marble translations from subversion and transforms them into .qm files usable by the Marble Qt application.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1216044 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoGuard against faulty routes.
Dennis Nienhüser [Thu, 20 Jan 2011 22:06:33 +0000 (22:06 +0000)]
Guard against faulty routes.
CCBUG: 263753

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1216036 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoNo need to load this .svg at application startup.
Dennis Nienhüser [Thu, 20 Jan 2011 22:06:32 +0000 (22:06 +0000)]
No need to load this .svg at application startup.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1216035 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoforward-port r1215779: allow panning also outside valid zoom ranges
Bernhard Beschow [Wed, 19 Jan 2011 17:12:00 +0000 (17:12 +0000)]
forward-port r1215779: allow panning also outside valid zoom ranges

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215796 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoforward-port r1215778: don't crash in equirectangular projection when the map doesn...
Bernhard Beschow [Wed, 19 Jan 2011 17:11:57 +0000 (17:11 +0000)]
forward-port r1215778: don't crash in equirectangular projection when the map doesn't cover the whole view

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215795 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoforward-port r1211246: introduce a pixmap cache for texture mapping
Bernhard Beschow [Wed, 19 Jan 2011 17:11:53 +0000 (17:11 +0000)]
forward-port r1211246: introduce a pixmap cache for texture mapping

* have the texture mappers rather than the StackedTileLoader emit signals when tile updates are avialable

REVIEW: 6250

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215794 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoforward-port r1211245: TileScalingTextureMapper: do not paint the background black...
Bernhard Beschow [Wed, 19 Jan 2011 17:11:49 +0000 (17:11 +0000)]
forward-port r1211245: TileScalingTextureMapper: do not paint the background black if the map doesn't cover the whole viewport

* this code doesn't seem to be needed (tested visually)
* this code depended on the canvas image, which we want to get rid of for pixmap caching

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215793 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoforward-port r1211244: move QImage caching of the canvas into texture mappers
Bernhard Beschow [Wed, 19 Jan 2011 17:11:45 +0000 (17:11 +0000)]
forward-port r1211244: move QImage caching of the canvas into texture mappers

* this is another step to allow the texture mappers to paint to the QPaintDevice directly

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215792 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoforward-port r1211243: have the texture mappers colorize the the textures
Bernhard Beschow [Wed, 19 Jan 2011 17:11:41 +0000 (17:11 +0000)]
forward-port r1211243: have the texture mappers colorize the the textures

This modification allows the texture mappers to paint the tiles directly on a QPaintDevice if no TextureColorizer is present.
In a later commit, the TileScalingTextureMapper will paint pixmaps onto the paint device directly.

* pass the TextureColorizer as a parameter to mapTexture()

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215791 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoforward-port r1211242: cleanup TextureLayer::paintGlobe()
Bernhard Beschow [Wed, 19 Jan 2011 17:11:37 +0000 (17:11 +0000)]
forward-port r1211242: cleanup TextureLayer::paintGlobe()

* remove redundant variable redrawBackground
* Do not repaint when viewParams->canvasImage()->isNull(). It seems to have been introduced to fix initialization, but isn't needed any longer since d->m_justModified is
initialized properly in the constructor.
* reduce scope of variable "radius"

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215790 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoforward-port r1211241: TextureLayer: make texColorizer a pointer and instantiate...
Bernhard Beschow [Wed, 19 Jan 2011 17:11:34 +0000 (17:11 +0000)]
forward-port r1211241: TextureLayer: make texColorizer a pointer and instantiate it only when needed

* pass the seaFile and landFile via constructor and remove TextureColorizer::setSeaFileLandFile()

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215789 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoforward-port r1211240: turn GpFifo into a class and rename it to EmbossFifo
Bernhard Beschow [Wed, 19 Jan 2011 17:11:31 +0000 (17:11 +0000)]
forward-port r1211240: turn GpFifo into a class and rename it to EmbossFifo

This patch resolves a small bug in the bumpmapping code where the gradient for the relief wasn't calculated properly.

It also turns the hidden union "GpFifo" in TextureColorizer.cpp into a proper FIFO class in order to make the code less fragile. The patch relies on very basic compiler
optimizations, relinguishing usage of a union.

I get ~3.5 fps on my machine before and after this patch is applied.

REVIEW: 6205

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215788 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoProof-reading: removed space before punctuation.
Andrew Coles [Wed, 19 Jan 2011 12:53:37 +0000 (12:53 +0000)]
Proof-reading: removed space before punctuation.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215731 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoProof-reading strings in the Map Wizard. The term bitmap is not likely to be
Andrew Coles [Wed, 19 Jan 2011 12:53:01 +0000 (12:53 +0000)]
Proof-reading strings in the Map Wizard.  The term bitmap is not likely to be
widely understood, though is necessary in this context to distinguish from
vector images.  As a compromise, following a discussion on IRC, have gone
for 'bitmap image'.

Other minor changes:

* harddisc -> disk
* worldmap -> world map
* can't -> cannot.  See the note on contractions in the HIG:

  http://techbase.kde.org/Projects/Usability/HIG/Contractions

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215730 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoExport of bookmarks to .kml files
Dennis Nienhüser [Tue, 18 Jan 2011 21:34:11 +0000 (21:34 +0000)]
Export of bookmarks to .kml files

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoSet the correct visual category when loading bookmarks.
Dennis Nienhüser [Tue, 18 Jan 2011 20:42:39 +0000 (20:42 +0000)]
Set the correct visual category when loading bookmarks.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215467 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoMake simple editing (renaming of folders and bookmarks) work.
Dennis Nienhüser [Tue, 18 Jan 2011 20:19:09 +0000 (20:19 +0000)]
Make simple editing (renaming of folders and bookmarks) work.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215464 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoAdd a method to set the root document, i.e. use GeoDataTreeModel from memory without...
Dennis Nienhüser [Tue, 18 Jan 2011 20:19:08 +0000 (20:19 +0000)]
Add a method to set the root document, i.e. use GeoDataTreeModel from memory without a FileLoader between.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215463 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoDon't crash when setting an invalid map theme and the fallback theme does not work...
Dennis Nienhüser [Tue, 18 Jan 2011 19:18:44 +0000 (19:18 +0000)]
Don't crash when setting an invalid map theme and the fallback theme does not work either.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215453 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agofix cityplacemarks.cache
Thibaut Gridel [Mon, 17 Jan 2011 23:59:50 +0000 (23:59 +0000)]
fix cityplacemarks.cache

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215195 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years ago- Hotfix for the mile 0-precision bug of the scale bar
Torsten Rahn [Mon, 17 Jan 2011 22:54:26 +0000 (22:54 +0000)]
- Hotfix for the mile 0-precision bug of the scale bar
  reported by Mustali Dalal:

  Unfortunately using "feet" instead of "miles" for
  low values is not trivial, so we use floating point
  representation for values close to 0.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215182 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoAdd a bookmark manager to the Marble Qt application. So far it has view capabilities...
Dennis Nienhüser [Mon, 17 Jan 2011 20:38:29 +0000 (20:38 +0000)]
Add a bookmark manager to the Marble Qt application. So far it has view capabilities and limited, in-memory only edit capabilities.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215155 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoIcon style for folders and bookmarks
Dennis Nienhüser [Mon, 17 Jan 2011 20:38:27 +0000 (20:38 +0000)]
Icon style for folders and bookmarks

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215154 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoDon't crash if no facade has been set
Dennis Nienhüser [Mon, 17 Jan 2011 20:38:26 +0000 (20:38 +0000)]
Don't crash if no facade has been set

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215153 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoMake feature name editable.
Dennis Nienhüser [Mon, 17 Jan 2011 20:38:24 +0000 (20:38 +0000)]
Make feature name editable.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215152 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoShow the feature description in a tooltip.
Dennis Nienhüser [Mon, 17 Jan 2011 20:38:23 +0000 (20:38 +0000)]
Show the feature description in a tooltip.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215151 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoSync with trunk/KDE/kdelibs/kdeui/itemviews/kdescendantsproxymodel.cpp rev. 1214937...
Dennis Nienhüser [Mon, 17 Jan 2011 20:38:22 +0000 (20:38 +0000)]
Sync with trunk/KDE/kdelibs/kdeui/itemviews/kdescendantsproxymodel.cpp rev. 1214937. Contains a small fix by me, to be overwritten later when it's in kdelibs.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215150 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoIcons for bookmark management, bookmark and folder visual categories. All icons from...
Dennis Nienhüser [Mon, 17 Jan 2011 20:35:20 +0000 (20:35 +0000)]
Icons for bookmark management, bookmark and folder visual categories. All icons from oxygen.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1215149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years ago- Fix indentation,
Jens-Michael Hoffmann [Sun, 16 Jan 2011 19:28:47 +0000 (19:28 +0000)]
- Fix indentation,
- Remove trailing whitespace.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214886 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoUse QtModule/QClass for including Qt headers, reported by krazy.
Jens-Michael Hoffmann [Sun, 16 Jan 2011 19:26:52 +0000 (19:26 +0000)]
Use QtModule/QClass for including Qt headers, reported by krazy.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214885 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoInclude own header first, reported by krazy.
Jens-Michael Hoffmann [Sun, 16 Jan 2011 19:24:32 +0000 (19:24 +0000)]
Include own header first, reported by krazy.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214883 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoRemove duplicated file content, reported by krazy as duplicate include directives.
Jens-Michael Hoffmann [Sun, 16 Jan 2011 19:12:30 +0000 (19:12 +0000)]
Remove duplicated file content, reported by krazy as duplicate include directives.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214881 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoAdd missing / fix include guards, reported by krazy.
Jens-Michael Hoffmann [Sun, 16 Jan 2011 19:12:28 +0000 (19:12 +0000)]
Add missing / fix include guards, reported by krazy.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214880 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoRemove duplicate include directives, reported by krazy.
Jens-Michael Hoffmann [Sun, 16 Jan 2011 19:12:26 +0000 (19:12 +0000)]
Remove duplicate include directives, reported by krazy.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214879 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoAdd missing tr(...)
Laurent Montel [Sun, 16 Jan 2011 14:07:54 +0000 (14:07 +0000)]
Add missing tr(...)

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214819 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agodon't check pointer before to delete it
Laurent Montel [Sun, 16 Jan 2011 14:03:20 +0000 (14:03 +0000)]
don't check pointer before to delete it

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214818 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoUse const'ref
Laurent Montel [Sun, 16 Jan 2011 14:01:07 +0000 (14:01 +0000)]
Use const'ref

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214817 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoDon't check pointer before to delete it
Laurent Montel [Sun, 16 Jan 2011 13:59:05 +0000 (13:59 +0000)]
Don't check pointer before to delete it

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214816 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoPass floating point numbers as qreal's to qMin/qMax, reported by krazy.
Jens-Michael Hoffmann [Sat, 15 Jan 2011 15:09:07 +0000 (15:09 +0000)]
Pass floating point numbers as qreal's to qMin/qMax, reported by krazy.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214616 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoGeoDataPlacemark: drop internal GeoDataCoordinates and use geometry always
Thibaut Gridel [Sat, 15 Jan 2011 13:35:04 +0000 (13:35 +0000)]
GeoDataPlacemark: drop internal GeoDataCoordinates and use geometry always

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214594 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agotiming the filemanager loading all files
Thibaut Gridel [Sat, 15 Jan 2011 13:34:58 +0000 (13:34 +0000)]
timing the filemanager loading all files

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214593 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoFileLoader: provide SmallCity attribute to many PPL* tags
Thibaut Gridel [Sat, 15 Jan 2011 13:34:52 +0000 (13:34 +0000)]
FileLoader: provide SmallCity attribute to many PPL* tags

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214592 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoGeoDataTreeModel: checkbox only for Placemarks with a geometry
Thibaut Gridel [Sat, 15 Jan 2011 13:34:47 +0000 (13:34 +0000)]
GeoDataTreeModel: checkbox only for Placemarks with a geometry

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214591 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoLocalDatabase: use a QAbstractItemModel
Thibaut Gridel [Sat, 15 Jan 2011 13:34:41 +0000 (13:34 +0000)]
LocalDatabase: use a QAbstractItemModel

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214590 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agofixes from review
Thibaut Gridel [Sat, 15 Jan 2011 13:34:35 +0000 (13:34 +0000)]
fixes from review

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214589 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agofix position tracking rendering
Thibaut Gridel [Sat, 15 Jan 2011 13:34:29 +0000 (13:34 +0000)]
fix position tracking rendering

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214588 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoPlacemarkManager: get rid of PlacemarkManager
Thibaut Gridel [Sat, 15 Jan 2011 13:34:22 +0000 (13:34 +0000)]
PlacemarkManager: get rid of PlacemarkManager

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214587 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agodefer model connection to last moment.
Thibaut Gridel [Sat, 15 Jan 2011 13:34:15 +0000 (13:34 +0000)]
defer model connection to last moment.
This makes first loading of data happenning without proxies above

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214586 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoplacemarkModel: replace by descendantsProxyModel and filter proxies
Thibaut Gridel [Sat, 15 Jan 2011 13:34:09 +0000 (13:34 +0000)]
placemarkModel: replace by descendantsProxyModel and filter proxies

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214585 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoGeoDataTreeModel: limit geometries if they are not multigeometries
Thibaut Gridel [Sat, 15 Jan 2011 13:34:01 +0000 (13:34 +0000)]
GeoDataTreeModel: limit geometries if they are not multigeometries

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1214584 283d02a7-25f6-0310-bc7c-ecb5cbfe19da