diff --git a/desktop-widgets/CMakeLists.txt b/desktop-widgets/CMakeLists.txt index 6a7e1313b..b94b840d1 100644 --- a/desktop-widgets/CMakeLists.txt +++ b/desktop-widgets/CMakeLists.txt @@ -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 diff --git a/desktop-widgets/mapwidget.cpp b/desktop-widgets/mapwidget.cpp index 806b82c2d..aefda2a32 100644 --- a/desktop-widgets/mapwidget.cpp +++ b/desktop-widgets/mapwidget.cpp @@ -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" diff --git a/mobile-widgets/qml/MapWidget.qml b/map-widget/qml/MapWidget.qml similarity index 100% rename from mobile-widgets/qml/MapWidget.qml rename to map-widget/qml/MapWidget.qml diff --git a/mobile-widgets/qml/MapWidgetContextMenu.qml b/map-widget/qml/MapWidgetContextMenu.qml similarity index 100% rename from mobile-widgets/qml/MapWidgetContextMenu.qml rename to map-widget/qml/MapWidgetContextMenu.qml diff --git a/mobile-widgets/qml/MapWidgetError.qml b/map-widget/qml/MapWidgetError.qml similarity index 100% rename from mobile-widgets/qml/MapWidgetError.qml rename to map-widget/qml/MapWidgetError.qml diff --git a/mobile-widgets/qml/icons/mapwidget-context-menu.png b/map-widget/qml/icons/mapwidget-context-menu.png similarity index 100% rename from mobile-widgets/qml/icons/mapwidget-context-menu.png rename to map-widget/qml/icons/mapwidget-context-menu.png diff --git a/mobile-widgets/qml/icons/mapwidget-marker-gray.png b/map-widget/qml/icons/mapwidget-marker-gray.png similarity index 100% rename from mobile-widgets/qml/icons/mapwidget-marker-gray.png rename to map-widget/qml/icons/mapwidget-marker-gray.png diff --git a/mobile-widgets/qml/icons/mapwidget-marker-selected.png b/map-widget/qml/icons/mapwidget-marker-selected.png similarity index 100% rename from mobile-widgets/qml/icons/mapwidget-marker-selected.png rename to map-widget/qml/icons/mapwidget-marker-selected.png diff --git a/mobile-widgets/qml/icons/mapwidget-marker.png b/map-widget/qml/icons/mapwidget-marker.png similarity index 100% rename from mobile-widgets/qml/icons/mapwidget-marker.png rename to map-widget/qml/icons/mapwidget-marker.png diff --git a/mobile-widgets/qml/icons/mapwidget-toggle-satellite.png b/map-widget/qml/icons/mapwidget-toggle-satellite.png similarity index 100% rename from mobile-widgets/qml/icons/mapwidget-toggle-satellite.png rename to map-widget/qml/icons/mapwidget-toggle-satellite.png diff --git a/mobile-widgets/qml/icons/mapwidget-toggle-street.png b/map-widget/qml/icons/mapwidget-toggle-street.png similarity index 100% rename from mobile-widgets/qml/icons/mapwidget-toggle-street.png rename to map-widget/qml/icons/mapwidget-toggle-street.png diff --git a/mobile-widgets/qml/icons/mapwidget-zoom-in.png b/map-widget/qml/icons/mapwidget-zoom-in.png similarity index 100% rename from mobile-widgets/qml/icons/mapwidget-zoom-in.png rename to map-widget/qml/icons/mapwidget-zoom-in.png diff --git a/mobile-widgets/qml/icons/mapwidget-zoom-out.png b/map-widget/qml/icons/mapwidget-zoom-out.png similarity index 100% rename from mobile-widgets/qml/icons/mapwidget-zoom-out.png rename to map-widget/qml/icons/mapwidget-zoom-out.png diff --git a/mobile-widgets/qmlmapwidgethelper.cpp b/map-widget/qmlmapwidgethelper.cpp similarity index 100% rename from mobile-widgets/qmlmapwidgethelper.cpp rename to map-widget/qmlmapwidgethelper.cpp diff --git a/mobile-widgets/qmlmapwidgethelper.h b/map-widget/qmlmapwidgethelper.h similarity index 100% rename from mobile-widgets/qmlmapwidgethelper.h rename to map-widget/qmlmapwidgethelper.h diff --git a/subsurface.qrc b/subsurface.qrc index 6bfb7785d..83b93cc29 100644 --- a/subsurface.qrc +++ b/subsurface.qrc @@ -1,16 +1,16 @@ - mobile-widgets/qml/MapWidget.qml - mobile-widgets/qml/MapWidgetError.qml - mobile-widgets/qml/MapWidgetContextMenu.qml - mobile-widgets/qml/icons/mapwidget-marker.png - mobile-widgets/qml/icons/mapwidget-marker-gray.png - mobile-widgets/qml/icons/mapwidget-marker-selected.png - mobile-widgets/qml/icons/mapwidget-toggle-satellite.png - mobile-widgets/qml/icons/mapwidget-toggle-street.png - mobile-widgets/qml/icons/mapwidget-context-menu.png - mobile-widgets/qml/icons/mapwidget-zoom-in.png - mobile-widgets/qml/icons/mapwidget-zoom-out.png + map-widget/qml/MapWidget.qml + map-widget/qml/MapWidgetError.qml + map-widget/qml/MapWidgetContextMenu.qml + map-widget/qml/icons/mapwidget-marker.png + map-widget/qml/icons/mapwidget-marker-gray.png + map-widget/qml/icons/mapwidget-marker-selected.png + map-widget/qml/icons/mapwidget-toggle-satellite.png + map-widget/qml/icons/mapwidget-toggle-street.png + map-widget/qml/icons/mapwidget-context-menu.png + map-widget/qml/icons/mapwidget-zoom-in.png + map-widget/qml/icons/mapwidget-zoom-out.png icons/satellite.svg icons/star.svg icons/subsurface-icon.png