map-widget: move the widget and its resources to 'map-widget'

Move all the map widget platform agnostic files to the
<subsurface-root>/map-widget folder.

This avoids the confusion about the desktop version of subsurface
using mobile components. The map widget is planned as a shared
component between the mobile and desktop versions.

desktop-widgets/mapwidget[.h/.cpp] still remain as those are specific
to the desktop version.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
This commit is contained in:
Lubomir I. Ivanov 2017-11-04 21:23:37 +02:00 committed by Dirk Hohndel
parent 6ce4239884
commit 956b45ddfd
16 changed files with 13 additions and 13 deletions

View file

@ -69,7 +69,7 @@ set(SUBSURFACE_INTERFACE
kmessagewidget.cpp
mainwindow.cpp
mapwidget.cpp
../mobile-widgets/qmlmapwidgethelper.cpp
../map-widget/qmlmapwidgethelper.cpp
modeldelegates.cpp
notificationwidget.cpp
simplewidgets.cpp

View file

@ -7,7 +7,7 @@
#include "mapwidget.h"
#include "core/dive.h"
#include "core/divesite.h"
#include "mobile-widgets/qmlmapwidgethelper.h"
#include "map-widget/qmlmapwidgethelper.h"
#include "qt-models/maplocationmodel.h"
#include "mainwindow.h"
#include "divelistview.h"

View file

Before

Width:  |  Height:  |  Size: 242 B

After

Width:  |  Height:  |  Size: 242 B

View file

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2 KiB

View file

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View file

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View file

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

View file

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

View file

Before

Width:  |  Height:  |  Size: 256 B

After

Width:  |  Height:  |  Size: 256 B

View file

Before

Width:  |  Height:  |  Size: 242 B

After

Width:  |  Height:  |  Size: 242 B

View file

@ -1,16 +1,16 @@
<RCC>
<qresource prefix="/">
<file alias="MapWidget.qml">mobile-widgets/qml/MapWidget.qml</file>
<file alias="MapWidgetError.qml">mobile-widgets/qml/MapWidgetError.qml</file>
<file alias="MapWidgetContextMenu.qml">mobile-widgets/qml/MapWidgetContextMenu.qml</file>
<file alias="mapwidget-marker">mobile-widgets/qml/icons/mapwidget-marker.png</file>
<file alias="mapwidget-marker-gray">mobile-widgets/qml/icons/mapwidget-marker-gray.png</file>
<file alias="mapwidget-marker-selected">mobile-widgets/qml/icons/mapwidget-marker-selected.png</file>
<file alias="mapwidget-toggle-satellite">mobile-widgets/qml/icons/mapwidget-toggle-satellite.png</file>
<file alias="mapwidget-toggle-street">mobile-widgets/qml/icons/mapwidget-toggle-street.png</file>
<file alias="mapwidget-context-menu">mobile-widgets/qml/icons/mapwidget-context-menu.png</file>
<file alias="mapwidget-zoom-in">mobile-widgets/qml/icons/mapwidget-zoom-in.png</file>
<file alias="mapwidget-zoom-out">mobile-widgets/qml/icons/mapwidget-zoom-out.png</file>
<file alias="MapWidget.qml">map-widget/qml/MapWidget.qml</file>
<file alias="MapWidgetError.qml">map-widget/qml/MapWidgetError.qml</file>
<file alias="MapWidgetContextMenu.qml">map-widget/qml/MapWidgetContextMenu.qml</file>
<file alias="mapwidget-marker">map-widget/qml/icons/mapwidget-marker.png</file>
<file alias="mapwidget-marker-gray">map-widget/qml/icons/mapwidget-marker-gray.png</file>
<file alias="mapwidget-marker-selected">map-widget/qml/icons/mapwidget-marker-selected.png</file>
<file alias="mapwidget-toggle-satellite">map-widget/qml/icons/mapwidget-toggle-satellite.png</file>
<file alias="mapwidget-toggle-street">map-widget/qml/icons/mapwidget-toggle-street.png</file>
<file alias="mapwidget-context-menu">map-widget/qml/icons/mapwidget-context-menu.png</file>
<file alias="mapwidget-zoom-in">map-widget/qml/icons/mapwidget-zoom-in.png</file>
<file alias="mapwidget-zoom-out">map-widget/qml/icons/mapwidget-zoom-out.png</file>
<file alias="satellite.svg">icons/satellite.svg</file>
<file alias="star">icons/star.svg</file>
<file alias="subsurface-icon">icons/subsurface-icon.png</file>