[Marble-devel] Review Request: Add an "Edit" button to launch an OSM editor with the current view

[Dennis Nienhüser]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://svn.reviewboard.kde.org/r/4461/
-----------------------------------------------------------

(Updated 2010-09-16 20:48:27.426452)


Review request for marble.


Changes
-------

Trying to finish this one up before it starts bitrotting. Compared to the previous patch this one adds a "first-run" dialog to choose the external map editor. I tried with a simpler, message box like selection dialog, but it didn't look satisfying. I can remove the screenshots though if you think they add too much to the dialog (or are too large, 100kb in total). I'd rather not use icons though as Potlatch has none and the other two have icons which are just awkward.

The dialog tries to behave somewhat intelligent: It examines the PATH to see which applications are installed and is biased towards merkaartor, josm, potlatch (in this order) as the default selection, skipping those not installed. Potlatch is assumed to be always installed since it runs in a web browser.


Summary
-------

Adds an "Edit Map Externally" menu item in the main application (currently Qt only) that does either:
- open a web browser using potlatch (flash based osm builtin map editor) at the current view (default)
- execute josm or merkaartor (whichever is enabled in settings)
- update a running josm or merkaartor if they opened a server at localhost:8111

The choice which application to use (potlatch, josm, merkaartor) is left to the user. A running server is detected automatically if josm or merkaartor is selected by the user. The default choice is potlatch because it will be usable for most users out of the box (requirements are a web browser with flash support).

Most of the implementation is done in ControlView, i.e. outside lib/, but easily shareable between qt and kde main applications. I can implement it in its own class if you think it clutters ControlView too much.

The edit button is visible always currently. It may be better to hide it for map views other than openstreetmap to avoid confusing users.

Please note that josm and merkaartor should not be too outdated, especially for their server applications.


This addresses bug 240968.
    https://bugs.kde.org/show_bug.cgi?id=240968


Diffs (updated)
-----

  /trunk/KDE/kdeedu/marble/src/ControlView.h 1175778 
  /trunk/KDE/kdeedu/marble/src/ControlView.cpp 1175778 
  /trunk/KDE/kdeedu/marble/src/QtMainWindow.h 1175778 
  /trunk/KDE/kdeedu/marble/src/QtMainWindow.cpp 1175778 
  /trunk/KDE/kdeedu/marble/src/lib/CMakeLists.txt 1175778 
  /trunk/KDE/kdeedu/marble/src/lib/ExternalEditor.ui PRE-CREATION 
  /trunk/KDE/kdeedu/marble/src/lib/ExternalEditorDialog.h PRE-CREATION 
  /trunk/KDE/kdeedu/marble/src/lib/ExternalEditorDialog.cpp PRE-CREATION 
  /trunk/KDE/kdeedu/marble/src/lib/MarbleNavigationSettingsWidget.ui 1175778 
  /trunk/KDE/kdeedu/marble/src/lib/QtMarbleConfigDialog.h 1175778 
  /trunk/KDE/kdeedu/marble/src/lib/QtMarbleConfigDialog.cpp 1175778 
  /trunk/KDE/kdeedu/marble/src/marble.qrc 1175778 

Diff: http://svn.reviewboard.kde.org/r/4461/diff


Testing
-------

Tested with konqueror for potlatch. Tested Merkaartor 0.16.1. Merkaartor 0.16.0 may work (not tested), older versions lack the server. Tested josm version 3329. Note that you need to enable the server explicitly for merkaartor (tools => settings => network) and josm (edit => preferences => plugins, install and enable the remotecontrol plugin)


Screenshots
-----------

marble-external-map-editor-selection.png
  http://svn.reviewboard.kde.org/r/4461/s/504/


Thanks,

Dennis

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.kde.org/pipermail/marble-devel/attachments/20100916/b335dd66/attachment.htm