diff options
-rw-r--r-- | desktop-widgets/CMakeLists.txt | 2 | ||||
-rw-r--r-- | desktop-widgets/mapwidget.cpp | 2 | ||||
-rw-r--r-- | map-widget/qml/MapWidget.qml (renamed from mobile-widgets/qml/MapWidget.qml) | 0 | ||||
-rw-r--r-- | map-widget/qml/MapWidgetContextMenu.qml (renamed from mobile-widgets/qml/MapWidgetContextMenu.qml) | 0 | ||||
-rw-r--r-- | map-widget/qml/MapWidgetError.qml (renamed from mobile-widgets/qml/MapWidgetError.qml) | 0 | ||||
-rw-r--r-- | map-widget/qml/icons/mapwidget-context-menu.png (renamed from mobile-widgets/qml/icons/mapwidget-context-menu.png) | bin | 242 -> 242 bytes | |||
-rw-r--r-- | map-widget/qml/icons/mapwidget-marker-gray.png (renamed from mobile-widgets/qml/icons/mapwidget-marker-gray.png) | bin | 2033 -> 2033 bytes | |||
-rw-r--r-- | map-widget/qml/icons/mapwidget-marker-selected.png (renamed from mobile-widgets/qml/icons/mapwidget-marker-selected.png) | bin | 1995 -> 1995 bytes | |||
-rw-r--r-- | map-widget/qml/icons/mapwidget-marker.png (renamed from mobile-widgets/qml/icons/mapwidget-marker.png) | bin | 1801 -> 1801 bytes | |||
-rw-r--r-- | map-widget/qml/icons/mapwidget-toggle-satellite.png (renamed from mobile-widgets/qml/icons/mapwidget-toggle-satellite.png) | bin | 6288 -> 6288 bytes | |||
-rw-r--r-- | map-widget/qml/icons/mapwidget-toggle-street.png (renamed from mobile-widgets/qml/icons/mapwidget-toggle-street.png) | bin | 5916 -> 5916 bytes | |||
-rw-r--r-- | map-widget/qml/icons/mapwidget-zoom-in.png (renamed from mobile-widgets/qml/icons/mapwidget-zoom-in.png) | bin | 256 -> 256 bytes | |||
-rw-r--r-- | map-widget/qml/icons/mapwidget-zoom-out.png (renamed from mobile-widgets/qml/icons/mapwidget-zoom-out.png) | bin | 242 -> 242 bytes | |||
-rw-r--r-- | map-widget/qmlmapwidgethelper.cpp (renamed from mobile-widgets/qmlmapwidgethelper.cpp) | 0 | ||||
-rw-r--r-- | map-widget/qmlmapwidgethelper.h (renamed from mobile-widgets/qmlmapwidgethelper.h) | 0 | ||||
-rw-r--r-- | subsurface.qrc | 22 |
16 files changed, 13 insertions, 13 deletions
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 index 2a3283482..2a3283482 100644 --- a/mobile-widgets/qml/MapWidget.qml +++ b/map-widget/qml/MapWidget.qml diff --git a/mobile-widgets/qml/MapWidgetContextMenu.qml b/map-widget/qml/MapWidgetContextMenu.qml index 17450a729..17450a729 100644 --- a/mobile-widgets/qml/MapWidgetContextMenu.qml +++ b/map-widget/qml/MapWidgetContextMenu.qml diff --git a/mobile-widgets/qml/MapWidgetError.qml b/map-widget/qml/MapWidgetError.qml index 346e95f07..346e95f07 100644 --- a/mobile-widgets/qml/MapWidgetError.qml +++ b/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 Binary files differindex 6ab7cf77d..6ab7cf77d 100644 --- a/mobile-widgets/qml/icons/mapwidget-context-menu.png +++ b/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 Binary files differindex 856db9f5b..856db9f5b 100644 --- a/mobile-widgets/qml/icons/mapwidget-marker-gray.png +++ b/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 Binary files differindex 57f4efa27..57f4efa27 100644 --- a/mobile-widgets/qml/icons/mapwidget-marker-selected.png +++ b/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 Binary files differindex a1be73866..a1be73866 100644 --- a/mobile-widgets/qml/icons/mapwidget-marker.png +++ b/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 Binary files differindex 7ee536929..7ee536929 100644 --- a/mobile-widgets/qml/icons/mapwidget-toggle-satellite.png +++ b/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 Binary files differindex 04a668c3f..04a668c3f 100644 --- a/mobile-widgets/qml/icons/mapwidget-toggle-street.png +++ b/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 Binary files differindex 8c2521c3e..8c2521c3e 100644 --- a/mobile-widgets/qml/icons/mapwidget-zoom-in.png +++ b/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 Binary files differindex bd372f17d..bd372f17d 100644 --- a/mobile-widgets/qml/icons/mapwidget-zoom-out.png +++ b/map-widget/qml/icons/mapwidget-zoom-out.png diff --git a/mobile-widgets/qmlmapwidgethelper.cpp b/map-widget/qmlmapwidgethelper.cpp index ba197f63f..ba197f63f 100644 --- a/mobile-widgets/qmlmapwidgethelper.cpp +++ b/map-widget/qmlmapwidgethelper.cpp diff --git a/mobile-widgets/qmlmapwidgethelper.h b/map-widget/qmlmapwidgethelper.h index 36d25d178..36d25d178 100644 --- a/mobile-widgets/qmlmapwidgethelper.h +++ b/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 @@ <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> |