From 29bc7db21e74e937f0769a1940554076136a02dc Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 25 Jun 2018 20:25:50 +0200 Subject: [PATCH] rename to nymea:app --- mea.pri => config.pri | 4 +- .../basicconfiguration.cpp | 0 .../basicconfiguration.h | 0 .../bluetoothinterface.cpp | 0 .../bluetoothinterface.h | 0 .../deviceclasses.cpp | 2 +- .../deviceclasses.h | 2 +- .../deviceclassesproxy.cpp | 2 +- .../deviceclassesproxy.h | 2 +- .../devicediscovery.cpp | 0 .../devicediscovery.h | 0 .../devicemanager.cpp | 8 +- .../devicemanager.h | 8 +- .../devices.cpp | 2 +- {libmea-core => libnymea-app-core}/devices.h | 2 +- .../devicesproxy.cpp | 2 +- .../devicesproxy.h | 2 +- .../discovery/discoverydevice.cpp | 8 +- .../discovery/discoverydevice.h | 8 +- .../discovery/discoverymodel.cpp | 8 +- .../discovery/discoverymodel.h | 8 +- .../discovery/nymeadiscovery.cpp | 0 .../discovery/nymeadiscovery.h | 0 .../discovery/nymeahost.cpp | 8 +- .../discovery/nymeahost.h | 8 +- .../discovery/nymeahosts.cpp | 8 +- .../discovery/nymeahosts.h | 8 +- .../discovery/upnpdiscovery.cpp | 8 +- .../discovery/upnpdiscovery.h | 8 +- .../discovery/zeroconfdiscovery.cpp | 0 .../discovery/zeroconfdiscovery.h | 0 {libmea-core => libnymea-app-core}/engine.cpp | 8 +- {libmea-core => libnymea-app-core}/engine.h | 8 +- .../interfacesmodel.cpp | 0 .../interfacesmodel.h | 0 .../jsonrpc/actionhandler.cpp | 0 .../jsonrpc/jsonhandler.cpp | 8 +- .../jsonrpc/jsonhandler.h | 8 +- .../jsonrpc/jsonrpcclient.cpp | 10 +- .../jsonrpc/jsonrpcclient.h | 8 +- .../jsonrpc/jsontypes.cpp | 8 +- .../jsonrpc/jsontypes.h | 8 +- .../libnymea-app-core.h | 8 +- .../libnymea-app-core.pro | 6 +- .../logmanager.cpp | 0 .../logmanager.h | 0 .../eventdescriptorparamsfiltermodel.cpp | 0 .../models/eventdescriptorparamsfiltermodel.h | 0 .../models/interfacesproxy.cpp | 0 .../models/interfacesproxy.h | 0 .../models/logsmodel.cpp | 0 .../models/logsmodel.h | 0 .../models/logsmodelng.cpp | 0 .../models/logsmodelng.h | 0 .../models/rulesfiltermodel.cpp | 0 .../models/rulesfiltermodel.h | 0 .../models/valuelogsproxymodel.cpp | 0 .../models/valuelogsproxymodel.h | 0 .../nymeaconnection.cpp | 0 .../nymeaconnection.h | 0 .../nymeainterface.cpp | 8 +- .../nymeainterface.h | 8 +- .../pluginsproxy.cpp | 2 +- .../pluginsproxy.h | 2 +- .../rulemanager.cpp | 0 .../rulemanager.h | 0 .../tcpsocketinterface.cpp | 0 .../tcpsocketinterface.h | 0 .../vendorsproxy.cpp | 2 +- .../vendorsproxy.h | 2 +- .../websocketinterface.cpp | 8 +- .../websocketinterface.h | 8 +- .../wifisetup/bluetoothdevice.cpp | 2 +- .../wifisetup/bluetoothdevice.h | 2 +- .../wifisetup/bluetoothdeviceinfo.cpp | 2 +- .../wifisetup/bluetoothdeviceinfo.h | 2 +- .../wifisetup/bluetoothdeviceinfos.cpp | 2 +- .../wifisetup/bluetoothdeviceinfos.h | 2 +- .../wifisetup/bluetoothdiscovery.cpp | 2 +- .../wifisetup/bluetoothdiscovery.h | 2 +- .../wifisetup/networkmanagercontroler.cpp | 2 +- .../wifisetup/networkmanagercontroler.h | 2 +- .../wifisetup/wirelessaccesspoint.cpp | 2 +- .../wifisetup/wirelessaccesspoint.h | 2 +- .../wifisetup/wirelessaccesspoints.cpp | 2 +- .../wifisetup/wirelessaccesspoints.h | 2 +- .../wifisetup/wirelesssetupmanager.cpp | 2 +- .../wifisetup/wirelesssetupmanager.h | 2 +- libnymea-common/libnymea-common.pro | 2 +- libnymea-common/types/actiontype.cpp | 2 +- libnymea-common/types/actiontype.h | 2 +- libnymea-common/types/actiontypes.cpp | 2 +- libnymea-common/types/actiontypes.h | 2 +- libnymea-common/types/device.cpp | 2 +- libnymea-common/types/device.h | 2 +- libnymea-common/types/deviceclass.cpp | 2 +- libnymea-common/types/deviceclass.h | 2 +- libnymea-common/types/eventtype.cpp | 2 +- libnymea-common/types/eventtype.h | 2 +- libnymea-common/types/eventtypes.cpp | 2 +- libnymea-common/types/eventtypes.h | 2 +- libnymea-common/types/param.cpp | 2 +- libnymea-common/types/param.h | 2 +- libnymea-common/types/params.cpp | 2 +- libnymea-common/types/params.h | 2 +- libnymea-common/types/paramtype.cpp | 2 +- libnymea-common/types/paramtype.h | 2 +- libnymea-common/types/paramtypes.cpp | 2 +- libnymea-common/types/paramtypes.h | 2 +- libnymea-common/types/plugin.cpp | 2 +- libnymea-common/types/plugin.h | 2 +- libnymea-common/types/plugins.cpp | 2 +- libnymea-common/types/plugins.h | 2 +- libnymea-common/types/state.cpp | 2 +- libnymea-common/types/state.h | 2 +- libnymea-common/types/states.cpp | 2 +- libnymea-common/types/states.h | 2 +- libnymea-common/types/statesproxy.cpp | 2 +- libnymea-common/types/statesproxy.h | 2 +- libnymea-common/types/statetype.cpp | 2 +- libnymea-common/types/statetype.h | 2 +- libnymea-common/types/statetypes.cpp | 2 +- libnymea-common/types/statetypes.h | 2 +- libnymea-common/types/types.h | 2 +- libnymea-common/types/vendor.cpp | 2 +- libnymea-common/types/vendor.h | 2 +- libnymea-common/types/vendors.cpp | 2 +- libnymea-common/types/vendors.h | 2 +- mea.pro | 66 -- nymea-app.pro | 71 +++ {mea => nymea-app}/main.cpp | 22 +- mea/mea.pro => nymea-app/nymea-app.pro | 22 +- {mea => nymea-app}/qtquickcontrols2.conf | 0 {mea => nymea-app}/resources.qrc | 10 +- {mea => nymea-app}/stylecontroller.cpp | 0 {mea => nymea-app}/stylecontroller.h | 0 .../styles/dark/ApplicationWindow.qml | 2 +- {mea => nymea-app}/styles/dark/Page.qml | 0 .../styles/dark/logo.svg | 22 +- .../styles/light/ApplicationWindow.qml | 2 +- {mea => nymea-app}/styles/light/Page.qml | 0 nymea-app/styles/light/logo.svg | 603 ++++++++++++++++++ .../styles/maveo/ApplicationWindow.qml | 0 nymea-app/styles/maveo/logo.svg | 353 ++++++++++ .../translations/nymea-app-de_DE.ts | 0 .../translations/nymea-app-en_US.ts | 0 {mea => nymea-app}/ui/AboutPage.qml | 6 +- {mea => nymea-app}/ui/AppSettingsPage.qml | 2 +- .../ui/BluetoothDiscoveryPage.qml | 2 +- .../ui/BluetoothLoadingPage.qml | 2 +- {mea => nymea-app}/ui/ConnectPage.qml | 2 +- {mea => nymea-app}/ui/DevicesPage.qml | 2 +- {mea => nymea-app}/ui/EditDevicesPage.qml | 4 +- {mea => nymea-app}/ui/LoginPage.qml | 6 +- {mea => nymea-app}/ui/MagicPage.qml | 2 +- {mea => nymea-app}/ui/MainPage.qml | 4 +- {mea => nymea-app}/ui/NewDeviceWizard.qml | 2 +- mea/ui/Mea.qml => nymea-app/ui/Nymea.qml | 2 +- {mea => nymea-app}/ui/PushButtonAuthPage.qml | 2 +- {mea => nymea-app}/ui/SettingsPage.qml | 2 +- .../ui/WirelessControlerPage.qml | 2 +- .../ui/components/ColorIcon.qml | 0 .../ui/components/ColorPicker.qml | 0 .../ui/components/ColorPickerCt.qml | 0 .../ui/components/ErrorDialog.qml | 0 {mea => nymea-app}/ui/components/Graph.qml | 2 +- .../ui/components/GuhHeader.qml | 0 .../ui/components/HeaderButton.qml | 0 .../ui/components/IconMenuItem.qml | 0 .../ui/components/InterfacesModels.qml | 0 .../ui/components/MeaDialog.qml | 0 .../ui/components/MeaListItemDelegate.qml | 0 .../ui/components/ShutterControls.qml | 2 +- .../ui/components/ThinDivider.qml | 0 .../ui/components/ThrottledSlider.qml | 0 .../ui/customviews/CustomViewBase.qml | 0 .../customviews/ExtendedVolumeController.qml | 2 +- .../ui/customviews/GenericTypeLogView.qml | 2 +- .../ui/customviews/MediaControllerView.qml | 2 +- .../ui/customviews/NotificationsView.qml | 2 +- .../ui/customviews/SensorView.qml | 2 +- .../ui/customviews/WeatherView.qml | 0 .../ui/delegates/ActionDelegate.qml | 2 +- .../ui/delegates/ParamDelegate.qml | 2 +- .../ui/delegates/ParamDescriptorDelegate.qml | 2 +- .../ui/delegates/ThingDelegate.qml | 0 .../devicelistpages/GenericDeviceListPage.qml | 2 +- .../devicelistpages/LightsDeviceListPage.qml | 2 +- .../ui/devicepages/ButtonDevicePage.qml | 2 +- .../ui/devicepages/ColorLightDevicePage.qml | 2 +- .../ui/devicepages/ConfigureThingPage.qml | 2 +- .../ui/devicepages/DevicePageBase.qml | 2 +- .../ui/devicepages/GarageGateDevicePage.qml | 2 +- .../ui/devicepages/GenericDevicePage.qml | 2 +- .../GenericDeviceStateDetailsPage.qml | 2 +- .../ui/devicepages/InputTriggerDevicePage.qml | 2 +- .../ui/devicepages/MediaDevicePage.qml | 2 +- .../ui/devicepages/SensorDevicePage.qml | 2 +- .../ui/devicepages/ShutterDevicePage.qml | 2 +- .../ui/devicepages/StateLogPage.qml | 2 +- .../ui/devicepages/WeatherDevicePage.qml | 2 +- {mea => nymea-app}/ui/fonts/Ubuntu-B.ttf | Bin {mea => nymea-app}/ui/fonts/Ubuntu-BI.ttf | Bin {mea => nymea-app}/ui/fonts/Ubuntu-C.ttf | Bin {mea => nymea-app}/ui/fonts/Ubuntu-L.ttf | Bin {mea => nymea-app}/ui/fonts/Ubuntu-LI.ttf | Bin {mea => nymea-app}/ui/fonts/Ubuntu-M.ttf | Bin {mea => nymea-app}/ui/fonts/Ubuntu-MI.ttf | Bin {mea => nymea-app}/ui/fonts/Ubuntu-R.ttf | Bin {mea => nymea-app}/ui/fonts/Ubuntu-RI.ttf | Bin .../ui/images/Built_with_Qt_RGB_logo.svg | 0 .../Built_with_Qt_RGB_logo_vertical.svg | 0 .../ui/images/action-interface.svg | 0 {mea => nymea-app}/ui/images/action.svg | 0 {mea => nymea-app}/ui/images/add.svg | 0 {mea => nymea-app}/ui/images/alarm-clock.svg | 0 .../images/audio-speakers-muted-symbolic.svg | 0 .../ui/images/audio-speakers-symbolic.svg | 0 {mea => nymea-app}/ui/images/back.svg | 0 .../ui/images/battery/battery-000.svg | 0 .../ui/images/battery/battery-010.svg | 0 .../ui/images/battery/battery-020.svg | 0 .../ui/images/battery/battery-030.svg | 0 .../ui/images/battery/battery-040.svg | 0 .../ui/images/battery/battery-050.svg | 0 .../ui/images/battery/battery-060.svg | 0 .../ui/images/battery/battery-070.svg | 0 .../ui/images/battery/battery-080.svg | 0 .../ui/images/battery/battery-090.svg | 0 .../ui/images/battery/battery-100.svg | 0 {mea => nymea-app}/ui/images/bluetooth.svg | 0 .../ui/images/clock-app-symbolic.svg | 0 {mea => nymea-app}/ui/images/close.svg | 0 {mea => nymea-app}/ui/images/delete.svg | 0 .../ui/images/dialog-error-symbolic.svg | 0 .../ui/images/dialog-warning-symbolic.svg | 0 {mea => nymea-app}/ui/images/down.svg | 0 {mea => nymea-app}/ui/images/edit.svg | 0 .../ui/images/event-interface.svg | 0 {mea => nymea-app}/ui/images/event.svg | 0 {mea => nymea-app}/ui/images/eye.svg | 0 {mea => nymea-app}/ui/images/go-down.svg | 0 {mea => nymea-app}/ui/images/guh-logo.svg | 0 {mea => nymea-app}/ui/images/info.svg | 0 {mea => nymea-app}/ui/images/lock-broken.svg | 0 {mea => nymea-app}/ui/images/logs.svg | 0 {mea => nymea-app}/ui/images/magic.svg | 0 .../magic.svg.2018_05_29_14_21_27.0.svg | 0 .../ui/images/mail-mark-important.svg | 0 .../ui/images/media-playback-pause.svg | 0 .../ui/images/media-playback-start.svg | 0 .../ui/images/media-playback-stop.svg | 0 .../ui/images/media-preview-start.svg | 0 .../ui/images/media-seek-backward.svg | 0 .../ui/images/media-seek-forward.svg | 0 .../ui/images/media-skip-backward.svg | 0 .../ui/images/media-skip-forward.svg | 0 .../ui/images/mediaplayer-app-symbolic.svg | 0 .../ui/images/navigation-menu.svg | 0 .../ui/images/network-secure.svg | 0 {mea => nymea-app}/ui/images/network-vpn.svg | 0 .../ui/images/network-wired-symbolic.svg | 0 {mea => nymea-app}/ui/images/next.svg | 0 .../ui/images/nm-signal-00-secure.svg | 0 {mea => nymea-app}/ui/images/nm-signal-00.svg | 0 .../ui/images/nm-signal-100-secure.svg | 0 .../ui/images/nm-signal-100.svg | 0 .../ui/images/nm-signal-25-secure.svg | 0 {mea => nymea-app}/ui/images/nm-signal-25.svg | 0 .../ui/images/nm-signal-50-secure.svg | 0 {mea => nymea-app}/ui/images/nm-signal-50.svg | 0 .../ui/images/nm-signal-75-secure.svg | 0 {mea => nymea-app}/ui/images/nm-signal-75.svg | 0 {mea => nymea-app}/ui/images/notification.svg | 0 .../ui/images/nymea-box-setup.svg | 0 {mea => nymea-app}/ui/images/plugin.svg | 0 .../ui/images/private-browsing.svg | 0 {mea => nymea-app}/ui/images/refresh.svg | 0 {mea => nymea-app}/ui/images/remove.svg | 0 {mea => nymea-app}/ui/images/rpi-setup.svg | 0 {mea => nymea-app}/ui/images/select-none.svg | 0 {mea => nymea-app}/ui/images/send.svg | 0 {mea => nymea-app}/ui/images/sensors.svg | 0 {mea => nymea-app}/ui/images/settings.svg | 0 {mea => nymea-app}/ui/images/share.svg | 0 {mea => nymea-app}/ui/images/shutter-0.svg | 0 {mea => nymea-app}/ui/images/shutter-1.svg | 0 {mea => nymea-app}/ui/images/shutter-10.svg | 0 {mea => nymea-app}/ui/images/shutter-2.svg | 0 {mea => nymea-app}/ui/images/shutter-3.svg | 0 {mea => nymea-app}/ui/images/shutter-4.svg | 0 {mea => nymea-app}/ui/images/shutter-5.svg | 0 {mea => nymea-app}/ui/images/shutter-6.svg | 0 {mea => nymea-app}/ui/images/shutter-7.svg | 0 {mea => nymea-app}/ui/images/shutter-8.svg | 0 {mea => nymea-app}/ui/images/shutter-9.svg | 0 .../ui/images/sort-listitem.svg | 0 .../ui/images/state-interface.svg | 0 {mea => nymea-app}/ui/images/state.svg | 0 .../ui/images/stock_application.svg | 0 {mea => nymea-app}/ui/images/stock_link.svg | 0 .../ui/images/system-shutdown.svg | 0 {mea => nymea-app}/ui/images/temperature.svg | 0 {mea => nymea-app}/ui/images/tick.svg | 0 {mea => nymea-app}/ui/images/torch-off.svg | 0 {mea => nymea-app}/ui/images/torch-on.svg | 0 {mea => nymea-app}/ui/images/up.svg | 0 .../ui/images/view-collapse.svg | 0 {mea => nymea-app}/ui/images/view-expand.svg | 0 .../ui/images/weather-app-symbolic.svg | 0 .../ui/images/weathericons/humidity.svg | 0 .../images/weathericons/weather-clear-day.svg | 0 .../weathericons/weather-clear-night.svg | 0 .../ui/images/weathericons/weather-clouds.svg | 0 .../weathericons/weather-few-clouds-day.svg | 0 .../weathericons/weather-few-clouds-night.svg | 0 .../ui/images/weathericons/weather-fog.svg | 0 .../weathericons/weather-light-rain.svg | 0 .../images/weathericons/weather-overcast.svg | 0 .../weathericons/weather-shower-rain.svg | 0 .../ui/images/weathericons/weather-snow.svg | 0 .../weathericons/weather-thunderstorm.svg | 0 .../ui/images/weathericons/wind.svg | 0 .../ui/magic/CalendarItemDelegate.qml | 2 +- .../ui/magic/ComposeEventDescriptorPage.qml | 2 +- .../ui/magic/DeviceRulesPage.qml | 2 +- .../ui/magic/EditCalendarItemPage.qml | 2 +- {mea => nymea-app}/ui/magic/EditRulePage.qml | 2 +- .../ui/magic/EditStateEvaluatorPage.qml | 2 +- .../ui/magic/EditTimeEventItemPage.qml | 2 +- .../ui/magic/EventDescriptorDelegate.qml | 2 +- .../ui/magic/RuleActionDelegate.qml | 2 +- .../ui/magic/SelectActionPage.qml | 2 +- .../ui/magic/SelectEventDescriptorPage.qml | 2 +- .../magic/SelectEventDescriptorParamsPage.qml | 2 +- .../ui/magic/SelectRuleActionPage.qml | 2 +- .../ui/magic/SelectRuleActionParamsPage.qml | 2 +- .../ui/magic/SelectStateDescriptorPage.qml | 2 +- .../magic/SelectStateDescriptorParamsPage.qml | 2 +- .../ui/magic/SelectThingPage.qml | 2 +- .../ui/magic/SimpleStateEvaluatorDelegate.qml | 2 +- .../ui/magic/StateEvaluatorDelegate.qml | 2 +- .../ui/magic/TimeEventDelegate.qml | 2 +- .../ui/system/AboutNymeaPage.qml | 2 +- .../ui/system/LogViewerPage.qml | 2 +- .../ui/system/PluginParamsPage.qml | 2 +- {mea => nymea-app}/ui/system/PluginsPage.qml | 2 +- packaging/android/AndroidManifest.xml | 6 +- packaging/ios/AppIcon.svg | 4 +- packaging/ios/AppIcon1024x1024.png | Bin 0 -> 69538 bytes packaging/ios/AppIcon20x20.png | Bin 627 -> 588 bytes packaging/ios/AppIcon20x20@2x.png | Bin 1380 -> 1320 bytes packaging/ios/AppIcon20x20@3x.png | Bin 2264 -> 2181 bytes packaging/ios/AppIcon29x29.png | Bin 930 -> 880 bytes packaging/ios/AppIcon29x29@2x.png | Bin 2141 -> 2081 bytes packaging/ios/AppIcon29x29@3x.png | Bin 3611 -> 3497 bytes packaging/ios/AppIcon40x40.png | Bin 1380 -> 1320 bytes packaging/ios/AppIcon40x40@2x.png | Bin 3272 -> 3234 bytes packaging/ios/AppIcon40x40@3x.png | Bin 5464 -> 5275 bytes packaging/ios/AppIcon60x60@2x.png | Bin 5464 -> 5275 bytes packaging/ios/AppIcon60x60@3x.png | Bin 9006 -> 8666 bytes packaging/ios/AppIcon76x76.png | Bin 3043 -> 3015 bytes packaging/ios/AppIcon76x76@2x.png | Bin 7377 -> 7182 bytes packaging/ios/Info.plist.in | 10 +- packaging/ios/exportappicons.sh | 1 - packaging/osx/Info.plist.in | 8 +- packaging/osx/patchinstaller.sctp | 4 +- packaging/windows/config/config.xml | 8 +- .../meta/installscript.qs | 4 +- .../meta/license-gpl.txt | 0 .../meta/logo.ico | Bin .../meta/package.xml | 4 +- tests/testrunner/testrunner.pro | 8 +- 373 files changed, 1344 insertions(+), 374 deletions(-) rename mea.pri => config.pri (72%) rename {libmea-core => libnymea-app-core}/basicconfiguration.cpp (100%) rename {libmea-core => libnymea-app-core}/basicconfiguration.h (100%) rename {libmea-core => libnymea-app-core}/bluetoothinterface.cpp (100%) rename {libmea-core => libnymea-app-core}/bluetoothinterface.h (100%) rename {libmea-core => libnymea-app-core}/deviceclasses.cpp (98%) rename {libmea-core => libnymea-app-core}/deviceclasses.h (97%) rename {libmea-core => libnymea-app-core}/deviceclassesproxy.cpp (97%) rename {libmea-core => libnymea-app-core}/deviceclassesproxy.h (97%) rename {libmea-core => libnymea-app-core}/devicediscovery.cpp (100%) rename {libmea-core => libnymea-app-core}/devicediscovery.h (100%) rename {libmea-core => libnymea-app-core}/devicemanager.cpp (98%) rename {libmea-core => libnymea-app-core}/devicemanager.h (93%) rename {libmea-core => libnymea-app-core}/devices.cpp (98%) rename {libmea-core => libnymea-app-core}/devices.h (97%) rename {libmea-core => libnymea-app-core}/devicesproxy.cpp (97%) rename {libmea-core => libnymea-app-core}/devicesproxy.h (97%) rename {libmea-core => libnymea-app-core}/discovery/discoverydevice.cpp (93%) rename {libmea-core => libnymea-app-core}/discovery/discoverydevice.h (92%) rename {libmea-core => libnymea-app-core}/discovery/discoverymodel.cpp (91%) rename {libmea-core => libnymea-app-core}/discovery/discoverymodel.h (87%) rename {libmea-core => libnymea-app-core}/discovery/nymeadiscovery.cpp (100%) rename {libmea-core => libnymea-app-core}/discovery/nymeadiscovery.h (100%) rename {libmea-core => libnymea-app-core}/discovery/nymeahost.cpp (85%) rename {libmea-core => libnymea-app-core}/discovery/nymeahost.h (85%) rename {libmea-core => libnymea-app-core}/discovery/nymeahosts.cpp (94%) rename {libmea-core => libnymea-app-core}/discovery/nymeahosts.h (86%) rename {libmea-core => libnymea-app-core}/discovery/upnpdiscovery.cpp (97%) rename {libmea-core => libnymea-app-core}/discovery/upnpdiscovery.h (87%) rename {libmea-core => libnymea-app-core}/discovery/zeroconfdiscovery.cpp (100%) rename {libmea-core => libnymea-app-core}/discovery/zeroconfdiscovery.h (100%) rename {libmea-core => libnymea-app-core}/engine.cpp (91%) rename {libmea-core => libnymea-app-core}/engine.h (90%) rename {libmea-core => libnymea-app-core}/interfacesmodel.cpp (100%) rename {libmea-core => libnymea-app-core}/interfacesmodel.h (100%) rename {libmea-core => libnymea-app-core}/jsonrpc/actionhandler.cpp (100%) rename {libmea-core => libnymea-app-core}/jsonrpc/jsonhandler.cpp (80%) rename {libmea-core => libnymea-app-core}/jsonrpc/jsonhandler.h (82%) rename {libmea-core => libnymea-app-core}/jsonrpc/jsonrpcclient.cpp (97%) rename {libmea-core => libnymea-app-core}/jsonrpc/jsonrpcclient.h (95%) rename {libmea-core => libnymea-app-core}/jsonrpc/jsontypes.cpp (98%) rename {libmea-core => libnymea-app-core}/jsonrpc/jsontypes.h (92%) rename libmea-core/libmea-core.h => libnymea-app-core/libnymea-app-core.h (98%) rename libmea-core/libmea-core.pro => libnymea-app-core/libnymea-app-core.pro (97%) rename {libmea-core => libnymea-app-core}/logmanager.cpp (100%) rename {libmea-core => libnymea-app-core}/logmanager.h (100%) rename {libmea-core => libnymea-app-core}/models/eventdescriptorparamsfiltermodel.cpp (100%) rename {libmea-core => libnymea-app-core}/models/eventdescriptorparamsfiltermodel.h (100%) rename {libmea-core => libnymea-app-core}/models/interfacesproxy.cpp (100%) rename {libmea-core => libnymea-app-core}/models/interfacesproxy.h (100%) rename {libmea-core => libnymea-app-core}/models/logsmodel.cpp (100%) rename {libmea-core => libnymea-app-core}/models/logsmodel.h (100%) rename {libmea-core => libnymea-app-core}/models/logsmodelng.cpp (100%) rename {libmea-core => libnymea-app-core}/models/logsmodelng.h (100%) rename {libmea-core => libnymea-app-core}/models/rulesfiltermodel.cpp (100%) rename {libmea-core => libnymea-app-core}/models/rulesfiltermodel.h (100%) rename {libmea-core => libnymea-app-core}/models/valuelogsproxymodel.cpp (100%) rename {libmea-core => libnymea-app-core}/models/valuelogsproxymodel.h (100%) rename {libmea-core => libnymea-app-core}/nymeaconnection.cpp (100%) rename {libmea-core => libnymea-app-core}/nymeaconnection.h (100%) rename {libmea-core => libnymea-app-core}/nymeainterface.cpp (81%) rename {libmea-core => libnymea-app-core}/nymeainterface.h (87%) rename {libmea-core => libnymea-app-core}/pluginsproxy.cpp (96%) rename {libmea-core => libnymea-app-core}/pluginsproxy.h (96%) rename {libmea-core => libnymea-app-core}/rulemanager.cpp (100%) rename {libmea-core => libnymea-app-core}/rulemanager.h (100%) rename {libmea-core => libnymea-app-core}/tcpsocketinterface.cpp (100%) rename {libmea-core => libnymea-app-core}/tcpsocketinterface.h (100%) rename {libmea-core => libnymea-app-core}/vendorsproxy.cpp (96%) rename {libmea-core => libnymea-app-core}/vendorsproxy.h (96%) rename {libmea-core => libnymea-app-core}/websocketinterface.cpp (91%) rename {libmea-core => libnymea-app-core}/websocketinterface.h (86%) rename {libmea-core => libnymea-app-core}/wifisetup/bluetoothdevice.cpp (98%) rename {libmea-core => libnymea-app-core}/wifisetup/bluetoothdevice.h (97%) rename {libmea-core => libnymea-app-core}/wifisetup/bluetoothdeviceinfo.cpp (96%) rename {libmea-core => libnymea-app-core}/wifisetup/bluetoothdeviceinfo.h (96%) rename {libmea-core => libnymea-app-core}/wifisetup/bluetoothdeviceinfos.cpp (97%) rename {libmea-core => libnymea-app-core}/wifisetup/bluetoothdeviceinfos.h (96%) rename {libmea-core => libnymea-app-core}/wifisetup/bluetoothdiscovery.cpp (97%) rename {libmea-core => libnymea-app-core}/wifisetup/bluetoothdiscovery.h (96%) rename {libmea-core => libnymea-app-core}/wifisetup/networkmanagercontroler.cpp (96%) rename {libmea-core => libnymea-app-core}/wifisetup/networkmanagercontroler.h (96%) rename {libmea-core => libnymea-app-core}/wifisetup/wirelessaccesspoint.cpp (96%) rename {libmea-core => libnymea-app-core}/wifisetup/wirelessaccesspoint.h (96%) rename {libmea-core => libnymea-app-core}/wifisetup/wirelessaccesspoints.cpp (98%) rename {libmea-core => libnymea-app-core}/wifisetup/wirelessaccesspoints.h (97%) rename {libmea-core => libnymea-app-core}/wifisetup/wirelesssetupmanager.cpp (99%) rename {libmea-core => libnymea-app-core}/wifisetup/wirelesssetupmanager.h (99%) delete mode 100644 mea.pro create mode 100644 nymea-app.pro rename {mea => nymea-app}/main.cpp (79%) rename mea/mea.pro => nymea-app/nymea-app.pro (83%) rename {mea => nymea-app}/qtquickcontrols2.conf (100%) rename {mea => nymea-app}/resources.qrc (97%) rename {mea => nymea-app}/stylecontroller.cpp (100%) rename {mea => nymea-app}/stylecontroller.h (100%) rename {mea => nymea-app}/styles/dark/ApplicationWindow.qml (87%) rename {mea => nymea-app}/styles/dark/Page.qml (100%) rename mea/guh-logo.svg => nymea-app/styles/dark/logo.svg (97%) rename {mea => nymea-app}/styles/light/ApplicationWindow.qml (87%) rename {mea => nymea-app}/styles/light/Page.qml (100%) create mode 100644 nymea-app/styles/light/logo.svg rename {mea => nymea-app}/styles/maveo/ApplicationWindow.qml (100%) create mode 100644 nymea-app/styles/maveo/logo.svg rename mea/translations/mea-de_DE.ts => nymea-app/translations/nymea-app-de_DE.ts (100%) rename mea/translations/mea-en_US.ts => nymea-app/translations/nymea-app-en_US.ts (100%) rename {mea => nymea-app}/ui/AboutPage.qml (98%) rename {mea => nymea-app}/ui/AppSettingsPage.qml (99%) rename {mea => nymea-app}/ui/BluetoothDiscoveryPage.qml (99%) rename {mea => nymea-app}/ui/BluetoothLoadingPage.qml (98%) rename {mea => nymea-app}/ui/ConnectPage.qml (99%) rename {mea => nymea-app}/ui/DevicesPage.qml (99%) rename {mea => nymea-app}/ui/EditDevicesPage.qml (96%) rename {mea => nymea-app}/ui/LoginPage.qml (97%) rename {mea => nymea-app}/ui/MagicPage.qml (99%) rename {mea => nymea-app}/ui/MainPage.qml (98%) rename {mea => nymea-app}/ui/NewDeviceWizard.qml (99%) rename mea/ui/Mea.qml => nymea-app/ui/Nymea.qml (99%) rename {mea => nymea-app}/ui/PushButtonAuthPage.qml (99%) rename {mea => nymea-app}/ui/SettingsPage.qml (99%) rename {mea => nymea-app}/ui/WirelessControlerPage.qml (99%) rename {mea => nymea-app}/ui/components/ColorIcon.qml (100%) rename {mea => nymea-app}/ui/components/ColorPicker.qml (100%) rename {mea => nymea-app}/ui/components/ColorPickerCt.qml (100%) rename {mea => nymea-app}/ui/components/ErrorDialog.qml (100%) rename {mea => nymea-app}/ui/components/Graph.qml (99%) rename {mea => nymea-app}/ui/components/GuhHeader.qml (100%) rename {mea => nymea-app}/ui/components/HeaderButton.qml (100%) rename {mea => nymea-app}/ui/components/IconMenuItem.qml (100%) rename {mea => nymea-app}/ui/components/InterfacesModels.qml (100%) rename {mea => nymea-app}/ui/components/MeaDialog.qml (100%) rename {mea => nymea-app}/ui/components/MeaListItemDelegate.qml (100%) rename {mea => nymea-app}/ui/components/ShutterControls.qml (99%) rename {mea => nymea-app}/ui/components/ThinDivider.qml (100%) rename {mea => nymea-app}/ui/components/ThrottledSlider.qml (100%) rename {mea => nymea-app}/ui/customviews/CustomViewBase.qml (100%) rename {mea => nymea-app}/ui/customviews/ExtendedVolumeController.qml (99%) rename {mea => nymea-app}/ui/customviews/GenericTypeLogView.qml (99%) rename {mea => nymea-app}/ui/customviews/MediaControllerView.qml (99%) rename {mea => nymea-app}/ui/customviews/NotificationsView.qml (98%) rename {mea => nymea-app}/ui/customviews/SensorView.qml (99%) rename {mea => nymea-app}/ui/customviews/WeatherView.qml (100%) rename {mea => nymea-app}/ui/delegates/ActionDelegate.qml (99%) rename {mea => nymea-app}/ui/delegates/ParamDelegate.qml (99%) rename {mea => nymea-app}/ui/delegates/ParamDescriptorDelegate.qml (99%) rename {mea => nymea-app}/ui/delegates/ThingDelegate.qml (100%) rename {mea => nymea-app}/ui/devicelistpages/GenericDeviceListPage.qml (99%) rename {mea => nymea-app}/ui/devicelistpages/LightsDeviceListPage.qml (99%) rename {mea => nymea-app}/ui/devicepages/ButtonDevicePage.qml (99%) rename {mea => nymea-app}/ui/devicepages/ColorLightDevicePage.qml (99%) rename {mea => nymea-app}/ui/devicepages/ConfigureThingPage.qml (99%) rename {mea => nymea-app}/ui/devicepages/DevicePageBase.qml (99%) rename {mea => nymea-app}/ui/devicepages/GarageGateDevicePage.qml (99%) rename {mea => nymea-app}/ui/devicepages/GenericDevicePage.qml (99%) rename {mea => nymea-app}/ui/devicepages/GenericDeviceStateDetailsPage.qml (99%) rename {mea => nymea-app}/ui/devicepages/InputTriggerDevicePage.qml (98%) rename {mea => nymea-app}/ui/devicepages/MediaDevicePage.qml (98%) rename {mea => nymea-app}/ui/devicepages/SensorDevicePage.qml (98%) rename {mea => nymea-app}/ui/devicepages/ShutterDevicePage.qml (95%) rename {mea => nymea-app}/ui/devicepages/StateLogPage.qml (99%) rename {mea => nymea-app}/ui/devicepages/WeatherDevicePage.qml (98%) rename {mea => nymea-app}/ui/fonts/Ubuntu-B.ttf (100%) rename {mea => nymea-app}/ui/fonts/Ubuntu-BI.ttf (100%) rename {mea => nymea-app}/ui/fonts/Ubuntu-C.ttf (100%) rename {mea => nymea-app}/ui/fonts/Ubuntu-L.ttf (100%) rename {mea => nymea-app}/ui/fonts/Ubuntu-LI.ttf (100%) rename {mea => nymea-app}/ui/fonts/Ubuntu-M.ttf (100%) rename {mea => nymea-app}/ui/fonts/Ubuntu-MI.ttf (100%) rename {mea => nymea-app}/ui/fonts/Ubuntu-R.ttf (100%) rename {mea => nymea-app}/ui/fonts/Ubuntu-RI.ttf (100%) rename {mea => nymea-app}/ui/images/Built_with_Qt_RGB_logo.svg (100%) rename {mea => nymea-app}/ui/images/Built_with_Qt_RGB_logo_vertical.svg (100%) rename {mea => nymea-app}/ui/images/action-interface.svg (100%) rename {mea => nymea-app}/ui/images/action.svg (100%) rename {mea => nymea-app}/ui/images/add.svg (100%) rename {mea => nymea-app}/ui/images/alarm-clock.svg (100%) rename {mea => nymea-app}/ui/images/audio-speakers-muted-symbolic.svg (100%) rename {mea => nymea-app}/ui/images/audio-speakers-symbolic.svg (100%) rename {mea => nymea-app}/ui/images/back.svg (100%) rename {mea => nymea-app}/ui/images/battery/battery-000.svg (100%) rename {mea => nymea-app}/ui/images/battery/battery-010.svg (100%) rename {mea => nymea-app}/ui/images/battery/battery-020.svg (100%) rename {mea => nymea-app}/ui/images/battery/battery-030.svg (100%) rename {mea => nymea-app}/ui/images/battery/battery-040.svg (100%) rename {mea => nymea-app}/ui/images/battery/battery-050.svg (100%) rename {mea => nymea-app}/ui/images/battery/battery-060.svg (100%) rename {mea => nymea-app}/ui/images/battery/battery-070.svg (100%) rename {mea => nymea-app}/ui/images/battery/battery-080.svg (100%) rename {mea => nymea-app}/ui/images/battery/battery-090.svg (100%) rename {mea => nymea-app}/ui/images/battery/battery-100.svg (100%) rename {mea => nymea-app}/ui/images/bluetooth.svg (100%) rename {mea => nymea-app}/ui/images/clock-app-symbolic.svg (100%) rename {mea => nymea-app}/ui/images/close.svg (100%) rename {mea => nymea-app}/ui/images/delete.svg (100%) rename {mea => nymea-app}/ui/images/dialog-error-symbolic.svg (100%) rename {mea => nymea-app}/ui/images/dialog-warning-symbolic.svg (100%) rename {mea => nymea-app}/ui/images/down.svg (100%) rename {mea => nymea-app}/ui/images/edit.svg (100%) rename {mea => nymea-app}/ui/images/event-interface.svg (100%) rename {mea => nymea-app}/ui/images/event.svg (100%) rename {mea => nymea-app}/ui/images/eye.svg (100%) rename {mea => nymea-app}/ui/images/go-down.svg (100%) rename {mea => nymea-app}/ui/images/guh-logo.svg (100%) rename {mea => nymea-app}/ui/images/info.svg (100%) rename {mea => nymea-app}/ui/images/lock-broken.svg (100%) rename {mea => nymea-app}/ui/images/logs.svg (100%) rename {mea => nymea-app}/ui/images/magic.svg (100%) rename {mea => nymea-app}/ui/images/magic.svg.2018_05_29_14_21_27.0.svg (100%) rename {mea => nymea-app}/ui/images/mail-mark-important.svg (100%) rename {mea => nymea-app}/ui/images/media-playback-pause.svg (100%) rename {mea => nymea-app}/ui/images/media-playback-start.svg (100%) rename {mea => nymea-app}/ui/images/media-playback-stop.svg (100%) rename {mea => nymea-app}/ui/images/media-preview-start.svg (100%) rename {mea => nymea-app}/ui/images/media-seek-backward.svg (100%) rename {mea => nymea-app}/ui/images/media-seek-forward.svg (100%) rename {mea => nymea-app}/ui/images/media-skip-backward.svg (100%) rename {mea => nymea-app}/ui/images/media-skip-forward.svg (100%) rename {mea => nymea-app}/ui/images/mediaplayer-app-symbolic.svg (100%) rename {mea => nymea-app}/ui/images/navigation-menu.svg (100%) rename {mea => nymea-app}/ui/images/network-secure.svg (100%) rename {mea => nymea-app}/ui/images/network-vpn.svg (100%) rename {mea => nymea-app}/ui/images/network-wired-symbolic.svg (100%) rename {mea => nymea-app}/ui/images/next.svg (100%) rename {mea => nymea-app}/ui/images/nm-signal-00-secure.svg (100%) rename {mea => nymea-app}/ui/images/nm-signal-00.svg (100%) rename {mea => nymea-app}/ui/images/nm-signal-100-secure.svg (100%) rename {mea => nymea-app}/ui/images/nm-signal-100.svg (100%) rename {mea => nymea-app}/ui/images/nm-signal-25-secure.svg (100%) rename {mea => nymea-app}/ui/images/nm-signal-25.svg (100%) rename {mea => nymea-app}/ui/images/nm-signal-50-secure.svg (100%) rename {mea => nymea-app}/ui/images/nm-signal-50.svg (100%) rename {mea => nymea-app}/ui/images/nm-signal-75-secure.svg (100%) rename {mea => nymea-app}/ui/images/nm-signal-75.svg (100%) rename {mea => nymea-app}/ui/images/notification.svg (100%) rename {mea => nymea-app}/ui/images/nymea-box-setup.svg (100%) rename {mea => nymea-app}/ui/images/plugin.svg (100%) rename {mea => nymea-app}/ui/images/private-browsing.svg (100%) rename {mea => nymea-app}/ui/images/refresh.svg (100%) rename {mea => nymea-app}/ui/images/remove.svg (100%) rename {mea => nymea-app}/ui/images/rpi-setup.svg (100%) rename {mea => nymea-app}/ui/images/select-none.svg (100%) rename {mea => nymea-app}/ui/images/send.svg (100%) rename {mea => nymea-app}/ui/images/sensors.svg (100%) rename {mea => nymea-app}/ui/images/settings.svg (100%) rename {mea => nymea-app}/ui/images/share.svg (100%) rename {mea => nymea-app}/ui/images/shutter-0.svg (100%) rename {mea => nymea-app}/ui/images/shutter-1.svg (100%) rename {mea => nymea-app}/ui/images/shutter-10.svg (100%) rename {mea => nymea-app}/ui/images/shutter-2.svg (100%) rename {mea => nymea-app}/ui/images/shutter-3.svg (100%) rename {mea => nymea-app}/ui/images/shutter-4.svg (100%) rename {mea => nymea-app}/ui/images/shutter-5.svg (100%) rename {mea => nymea-app}/ui/images/shutter-6.svg (100%) rename {mea => nymea-app}/ui/images/shutter-7.svg (100%) rename {mea => nymea-app}/ui/images/shutter-8.svg (100%) rename {mea => nymea-app}/ui/images/shutter-9.svg (100%) rename {mea => nymea-app}/ui/images/sort-listitem.svg (100%) rename {mea => nymea-app}/ui/images/state-interface.svg (100%) rename {mea => nymea-app}/ui/images/state.svg (100%) rename {mea => nymea-app}/ui/images/stock_application.svg (100%) rename {mea => nymea-app}/ui/images/stock_link.svg (100%) rename {mea => nymea-app}/ui/images/system-shutdown.svg (100%) rename {mea => nymea-app}/ui/images/temperature.svg (100%) rename {mea => nymea-app}/ui/images/tick.svg (100%) rename {mea => nymea-app}/ui/images/torch-off.svg (100%) rename {mea => nymea-app}/ui/images/torch-on.svg (100%) rename {mea => nymea-app}/ui/images/up.svg (100%) rename {mea => nymea-app}/ui/images/view-collapse.svg (100%) rename {mea => nymea-app}/ui/images/view-expand.svg (100%) rename {mea => nymea-app}/ui/images/weather-app-symbolic.svg (100%) rename {mea => nymea-app}/ui/images/weathericons/humidity.svg (100%) rename {mea => nymea-app}/ui/images/weathericons/weather-clear-day.svg (100%) rename {mea => nymea-app}/ui/images/weathericons/weather-clear-night.svg (100%) rename {mea => nymea-app}/ui/images/weathericons/weather-clouds.svg (100%) rename {mea => nymea-app}/ui/images/weathericons/weather-few-clouds-day.svg (100%) rename {mea => nymea-app}/ui/images/weathericons/weather-few-clouds-night.svg (100%) rename {mea => nymea-app}/ui/images/weathericons/weather-fog.svg (100%) rename {mea => nymea-app}/ui/images/weathericons/weather-light-rain.svg (100%) rename {mea => nymea-app}/ui/images/weathericons/weather-overcast.svg (100%) rename {mea => nymea-app}/ui/images/weathericons/weather-shower-rain.svg (100%) rename {mea => nymea-app}/ui/images/weathericons/weather-snow.svg (100%) rename {mea => nymea-app}/ui/images/weathericons/weather-thunderstorm.svg (100%) rename {mea => nymea-app}/ui/images/weathericons/wind.svg (100%) rename {mea => nymea-app}/ui/magic/CalendarItemDelegate.qml (99%) rename {mea => nymea-app}/ui/magic/ComposeEventDescriptorPage.qml (97%) rename {mea => nymea-app}/ui/magic/DeviceRulesPage.qml (99%) rename {mea => nymea-app}/ui/magic/EditCalendarItemPage.qml (99%) rename {mea => nymea-app}/ui/magic/EditRulePage.qml (99%) rename {mea => nymea-app}/ui/magic/EditStateEvaluatorPage.qml (95%) rename {mea => nymea-app}/ui/magic/EditTimeEventItemPage.qml (99%) rename {mea => nymea-app}/ui/magic/EventDescriptorDelegate.qml (99%) rename {mea => nymea-app}/ui/magic/RuleActionDelegate.qml (98%) rename {mea => nymea-app}/ui/magic/SelectActionPage.qml (99%) rename {mea => nymea-app}/ui/magic/SelectEventDescriptorPage.qml (99%) rename {mea => nymea-app}/ui/magic/SelectEventDescriptorParamsPage.qml (99%) rename {mea => nymea-app}/ui/magic/SelectRuleActionPage.qml (99%) rename {mea => nymea-app}/ui/magic/SelectRuleActionParamsPage.qml (99%) rename {mea => nymea-app}/ui/magic/SelectStateDescriptorPage.qml (99%) rename {mea => nymea-app}/ui/magic/SelectStateDescriptorParamsPage.qml (98%) rename {mea => nymea-app}/ui/magic/SelectThingPage.qml (98%) rename {mea => nymea-app}/ui/magic/SimpleStateEvaluatorDelegate.qml (99%) rename {mea => nymea-app}/ui/magic/StateEvaluatorDelegate.qml (99%) rename {mea => nymea-app}/ui/magic/TimeEventDelegate.qml (99%) rename {mea => nymea-app}/ui/system/AboutNymeaPage.qml (98%) rename {mea => nymea-app}/ui/system/LogViewerPage.qml (99%) rename {mea => nymea-app}/ui/system/PluginParamsPage.qml (98%) rename {mea => nymea-app}/ui/system/PluginsPage.qml (97%) create mode 100644 packaging/ios/AppIcon1024x1024.png rename packaging/windows/packages/{io.guh.mea => io.guh.nymeaapp}/meta/installscript.qs (76%) rename packaging/windows/packages/{io.guh.mea => io.guh.nymeaapp}/meta/license-gpl.txt (100%) rename packaging/windows/packages/{io.guh.mea => io.guh.nymeaapp}/meta/logo.ico (100%) rename packaging/windows/packages/{io.guh.mea => io.guh.nymeaapp}/meta/package.xml (74%) diff --git a/mea.pri b/config.pri similarity index 72% rename from mea.pri rename to config.pri index 28520147..091ed17e 100644 --- a/mea.pri +++ b/config.pri @@ -5,6 +5,6 @@ QMAKE_CXXFLAGS += -Wall top_srcdir=$$PWD top_builddir=$$shadowed($$PWD) -MEA_VERSION=$$cat(version.txt) -DEFINES+=MEA_VERSION=\\\"$${MEA_VERSION}\\\" +APP_VERSION=$$cat(version.txt) +DEFINES+=APP_VERSION=\\\"$${APP_VERSION}\\\" android:QMAKE_POST_LINK += cp $$top_srcdir/version.txt $$top_builddir/ diff --git a/libmea-core/basicconfiguration.cpp b/libnymea-app-core/basicconfiguration.cpp similarity index 100% rename from libmea-core/basicconfiguration.cpp rename to libnymea-app-core/basicconfiguration.cpp diff --git a/libmea-core/basicconfiguration.h b/libnymea-app-core/basicconfiguration.h similarity index 100% rename from libmea-core/basicconfiguration.h rename to libnymea-app-core/basicconfiguration.h diff --git a/libmea-core/bluetoothinterface.cpp b/libnymea-app-core/bluetoothinterface.cpp similarity index 100% rename from libmea-core/bluetoothinterface.cpp rename to libnymea-app-core/bluetoothinterface.cpp diff --git a/libmea-core/bluetoothinterface.h b/libnymea-app-core/bluetoothinterface.h similarity index 100% rename from libmea-core/bluetoothinterface.h rename to libnymea-app-core/bluetoothinterface.h diff --git a/libmea-core/deviceclasses.cpp b/libnymea-app-core/deviceclasses.cpp similarity index 98% rename from libmea-core/deviceclasses.cpp rename to libnymea-app-core/deviceclasses.cpp index 39c35c55..5fe31e31 100644 --- a/libmea-core/deviceclasses.cpp +++ b/libnymea-app-core/deviceclasses.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/deviceclasses.h b/libnymea-app-core/deviceclasses.h similarity index 97% rename from libmea-core/deviceclasses.h rename to libnymea-app-core/deviceclasses.h index 8d65abf0..f3e9d6d0 100644 --- a/libmea-core/deviceclasses.h +++ b/libnymea-app-core/deviceclasses.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/deviceclassesproxy.cpp b/libnymea-app-core/deviceclassesproxy.cpp similarity index 97% rename from libmea-core/deviceclassesproxy.cpp rename to libnymea-app-core/deviceclassesproxy.cpp index 898def00..d5b35802 100644 --- a/libmea-core/deviceclassesproxy.cpp +++ b/libnymea-app-core/deviceclassesproxy.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/deviceclassesproxy.h b/libnymea-app-core/deviceclassesproxy.h similarity index 97% rename from libmea-core/deviceclassesproxy.h rename to libnymea-app-core/deviceclassesproxy.h index 1f02cecf..558b21fc 100644 --- a/libmea-core/deviceclassesproxy.h +++ b/libnymea-app-core/deviceclassesproxy.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/devicediscovery.cpp b/libnymea-app-core/devicediscovery.cpp similarity index 100% rename from libmea-core/devicediscovery.cpp rename to libnymea-app-core/devicediscovery.cpp diff --git a/libmea-core/devicediscovery.h b/libnymea-app-core/devicediscovery.h similarity index 100% rename from libmea-core/devicediscovery.h rename to libnymea-app-core/devicediscovery.h diff --git a/libmea-core/devicemanager.cpp b/libnymea-app-core/devicemanager.cpp similarity index 98% rename from libmea-core/devicemanager.cpp rename to libnymea-app-core/devicemanager.cpp index 1fd9f554..8e035da2 100644 --- a/libmea-core/devicemanager.cpp +++ b/libnymea-app-core/devicemanager.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/devicemanager.h b/libnymea-app-core/devicemanager.h similarity index 93% rename from libmea-core/devicemanager.h rename to libnymea-app-core/devicemanager.h index f2824177..10d96a7f 100644 --- a/libmea-core/devicemanager.h +++ b/libnymea-app-core/devicemanager.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/devices.cpp b/libnymea-app-core/devices.cpp similarity index 98% rename from libmea-core/devices.cpp rename to libnymea-app-core/devices.cpp index 9b556f98..365f0d4c 100644 --- a/libmea-core/devices.cpp +++ b/libnymea-app-core/devices.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/devices.h b/libnymea-app-core/devices.h similarity index 97% rename from libmea-core/devices.h rename to libnymea-app-core/devices.h index 0f699667..9d11c49e 100644 --- a/libmea-core/devices.h +++ b/libnymea-app-core/devices.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/devicesproxy.cpp b/libnymea-app-core/devicesproxy.cpp similarity index 97% rename from libmea-core/devicesproxy.cpp rename to libnymea-app-core/devicesproxy.cpp index 05777c25..cf1bfe20 100644 --- a/libmea-core/devicesproxy.cpp +++ b/libnymea-app-core/devicesproxy.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/devicesproxy.h b/libnymea-app-core/devicesproxy.h similarity index 97% rename from libmea-core/devicesproxy.h rename to libnymea-app-core/devicesproxy.h index 4fe7dcfa..e4b9e1f3 100644 --- a/libmea-core/devicesproxy.h +++ b/libnymea-app-core/devicesproxy.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/discovery/discoverydevice.cpp b/libnymea-app-core/discovery/discoverydevice.cpp similarity index 93% rename from libmea-core/discovery/discoverydevice.cpp rename to libnymea-app-core/discovery/discoverydevice.cpp index 38f8e3be..27c011d9 100644 --- a/libmea-core/discovery/discoverydevice.cpp +++ b/libnymea-app-core/discovery/discoverydevice.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2018 Michael Zanetti * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/discovery/discoverydevice.h b/libnymea-app-core/discovery/discoverydevice.h similarity index 92% rename from libmea-core/discovery/discoverydevice.h rename to libnymea-app-core/discovery/discoverydevice.h index de6ac57f..5cf98e29 100644 --- a/libmea-core/discovery/discoverydevice.h +++ b/libnymea-app-core/discovery/discoverydevice.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2018 Michael Zanetti * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/discovery/discoverymodel.cpp b/libnymea-app-core/discovery/discoverymodel.cpp similarity index 91% rename from libmea-core/discovery/discoverymodel.cpp rename to libnymea-app-core/discovery/discoverymodel.cpp index 1a2534b1..0916052e 100644 --- a/libmea-core/discovery/discoverymodel.cpp +++ b/libnymea-app-core/discovery/discoverymodel.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/discovery/discoverymodel.h b/libnymea-app-core/discovery/discoverymodel.h similarity index 87% rename from libmea-core/discovery/discoverymodel.h rename to libnymea-app-core/discovery/discoverymodel.h index ce830765..3f284a79 100644 --- a/libmea-core/discovery/discoverymodel.h +++ b/libnymea-app-core/discovery/discoverymodel.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/discovery/nymeadiscovery.cpp b/libnymea-app-core/discovery/nymeadiscovery.cpp similarity index 100% rename from libmea-core/discovery/nymeadiscovery.cpp rename to libnymea-app-core/discovery/nymeadiscovery.cpp diff --git a/libmea-core/discovery/nymeadiscovery.h b/libnymea-app-core/discovery/nymeadiscovery.h similarity index 100% rename from libmea-core/discovery/nymeadiscovery.h rename to libnymea-app-core/discovery/nymeadiscovery.h diff --git a/libmea-core/discovery/nymeahost.cpp b/libnymea-app-core/discovery/nymeahost.cpp similarity index 85% rename from libmea-core/discovery/nymeahost.cpp rename to libnymea-app-core/discovery/nymeahost.cpp index 1c3bacb4..f07614f0 100644 --- a/libmea-core/discovery/nymeahost.cpp +++ b/libnymea-app-core/discovery/nymeahost.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/discovery/nymeahost.h b/libnymea-app-core/discovery/nymeahost.h similarity index 85% rename from libmea-core/discovery/nymeahost.h rename to libnymea-app-core/discovery/nymeahost.h index 5aae431a..8c6efef9 100644 --- a/libmea-core/discovery/nymeahost.h +++ b/libnymea-app-core/discovery/nymeahost.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/discovery/nymeahosts.cpp b/libnymea-app-core/discovery/nymeahosts.cpp similarity index 94% rename from libmea-core/discovery/nymeahosts.cpp rename to libnymea-app-core/discovery/nymeahosts.cpp index 75fc8bd3..13dccf20 100644 --- a/libmea-core/discovery/nymeahosts.cpp +++ b/libnymea-app-core/discovery/nymeahosts.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/discovery/nymeahosts.h b/libnymea-app-core/discovery/nymeahosts.h similarity index 86% rename from libmea-core/discovery/nymeahosts.h rename to libnymea-app-core/discovery/nymeahosts.h index 79aef0a0..d705b417 100644 --- a/libmea-core/discovery/nymeahosts.h +++ b/libnymea-app-core/discovery/nymeahosts.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/discovery/upnpdiscovery.cpp b/libnymea-app-core/discovery/upnpdiscovery.cpp similarity index 97% rename from libmea-core/discovery/upnpdiscovery.cpp rename to libnymea-app-core/discovery/upnpdiscovery.cpp index 1b9e87fe..8499167b 100644 --- a/libmea-core/discovery/upnpdiscovery.cpp +++ b/libnymea-app-core/discovery/upnpdiscovery.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/discovery/upnpdiscovery.h b/libnymea-app-core/discovery/upnpdiscovery.h similarity index 87% rename from libmea-core/discovery/upnpdiscovery.h rename to libnymea-app-core/discovery/upnpdiscovery.h index 23e45019..b5cab329 100644 --- a/libmea-core/discovery/upnpdiscovery.h +++ b/libnymea-app-core/discovery/upnpdiscovery.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/discovery/zeroconfdiscovery.cpp b/libnymea-app-core/discovery/zeroconfdiscovery.cpp similarity index 100% rename from libmea-core/discovery/zeroconfdiscovery.cpp rename to libnymea-app-core/discovery/zeroconfdiscovery.cpp diff --git a/libmea-core/discovery/zeroconfdiscovery.h b/libnymea-app-core/discovery/zeroconfdiscovery.h similarity index 100% rename from libmea-core/discovery/zeroconfdiscovery.h rename to libnymea-app-core/discovery/zeroconfdiscovery.h diff --git a/libmea-core/engine.cpp b/libnymea-app-core/engine.cpp similarity index 91% rename from libmea-core/engine.cpp rename to libnymea-app-core/engine.cpp index ae04cad2..9ed4510d 100644 --- a/libmea-core/engine.cpp +++ b/libnymea-app-core/engine.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/engine.h b/libnymea-app-core/engine.h similarity index 90% rename from libmea-core/engine.h rename to libnymea-app-core/engine.h index ecbfdc1d..9162b0f5 100644 --- a/libmea-core/engine.h +++ b/libnymea-app-core/engine.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/interfacesmodel.cpp b/libnymea-app-core/interfacesmodel.cpp similarity index 100% rename from libmea-core/interfacesmodel.cpp rename to libnymea-app-core/interfacesmodel.cpp diff --git a/libmea-core/interfacesmodel.h b/libnymea-app-core/interfacesmodel.h similarity index 100% rename from libmea-core/interfacesmodel.h rename to libnymea-app-core/interfacesmodel.h diff --git a/libmea-core/jsonrpc/actionhandler.cpp b/libnymea-app-core/jsonrpc/actionhandler.cpp similarity index 100% rename from libmea-core/jsonrpc/actionhandler.cpp rename to libnymea-app-core/jsonrpc/actionhandler.cpp diff --git a/libmea-core/jsonrpc/jsonhandler.cpp b/libnymea-app-core/jsonrpc/jsonhandler.cpp similarity index 80% rename from libmea-core/jsonrpc/jsonhandler.cpp rename to libnymea-app-core/jsonrpc/jsonhandler.cpp index 2d7a384f..ccce1910 100644 --- a/libmea-core/jsonrpc/jsonhandler.cpp +++ b/libnymea-app-core/jsonrpc/jsonhandler.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/jsonrpc/jsonhandler.h b/libnymea-app-core/jsonrpc/jsonhandler.h similarity index 82% rename from libmea-core/jsonrpc/jsonhandler.h rename to libnymea-app-core/jsonrpc/jsonhandler.h index d91b1ff6..15057a5e 100644 --- a/libmea-core/jsonrpc/jsonhandler.h +++ b/libnymea-app-core/jsonrpc/jsonhandler.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/jsonrpc/jsonrpcclient.cpp b/libnymea-app-core/jsonrpc/jsonrpcclient.cpp similarity index 97% rename from libmea-core/jsonrpc/jsonrpcclient.cpp rename to libnymea-app-core/jsonrpc/jsonrpcclient.cpp index 085e8404..dbc8ae79 100644 --- a/libmea-core/jsonrpc/jsonrpcclient.cpp +++ b/libnymea-app-core/jsonrpc/jsonrpcclient.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -275,7 +275,7 @@ void JsonRpcClient::dataReceived(const QByteArray &data) QJsonParseError error; QJsonDocument jsonDoc = QJsonDocument::fromJson(m_receiveBuffer.left(splitIndex), &error); if (error.error != QJsonParseError::NoError) { - // qWarning() << "Could not parse json data from mea" << data << error.errorString(); + // qWarning() << "Could not parse json data from nymea" << data << error.errorString(); return; } // qDebug() << "received response" << m_receiveBuffer.left(splitIndex); diff --git a/libmea-core/jsonrpc/jsonrpcclient.h b/libnymea-app-core/jsonrpc/jsonrpcclient.h similarity index 95% rename from libmea-core/jsonrpc/jsonrpcclient.h rename to libnymea-app-core/jsonrpc/jsonrpcclient.h index 8256dd19..fab1389a 100644 --- a/libmea-core/jsonrpc/jsonrpcclient.h +++ b/libnymea-app-core/jsonrpc/jsonrpcclient.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/jsonrpc/jsontypes.cpp b/libnymea-app-core/jsonrpc/jsontypes.cpp similarity index 98% rename from libmea-core/jsonrpc/jsontypes.cpp rename to libnymea-app-core/jsonrpc/jsontypes.cpp index 1b1ecd92..e80a99a4 100644 --- a/libmea-core/jsonrpc/jsontypes.cpp +++ b/libnymea-app-core/jsonrpc/jsontypes.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/jsonrpc/jsontypes.h b/libnymea-app-core/jsonrpc/jsontypes.h similarity index 92% rename from libmea-core/jsonrpc/jsontypes.h rename to libnymea-app-core/jsonrpc/jsontypes.h index 3f94daf2..dfe18f7c 100644 --- a/libmea-core/jsonrpc/jsontypes.h +++ b/libnymea-app-core/jsonrpc/jsontypes.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/libmea-core.h b/libnymea-app-core/libnymea-app-core.h similarity index 98% rename from libmea-core/libmea-core.h rename to libnymea-app-core/libnymea-app-core.h index 1aa82ac6..e0eab502 100644 --- a/libmea-core/libmea-core.h +++ b/libnymea-app-core/libnymea-app-core.h @@ -1,5 +1,5 @@ -#ifndef LIBMEACORE_H -#define LIBMEACORE_H +#ifndef LIBNYMEAAPPCORE_H +#define LIBNYMEAAPPCORE_H #include "engine.h" #include "vendorsproxy.h" @@ -56,7 +56,7 @@ QObject* engine_provider(QQmlEngine *qmlEngine, QJSEngine *jsEngine) void registerQmlTypes() { - const char uri[] = "Mea"; + const char uri[] = "Nymea"; qmlRegisterSingletonType(uri, 1, 0, "Engine", engine_provider); @@ -150,4 +150,4 @@ void registerQmlTypes() { } -#endif // LIBMEACORE_H +#endif // LIBNYMEAAPPCORE_H diff --git a/libmea-core/libmea-core.pro b/libnymea-app-core/libnymea-app-core.pro similarity index 97% rename from libmea-core/libmea-core.pro rename to libnymea-app-core/libnymea-app-core.pro index 5c60c40c..50675ea6 100644 --- a/libmea-core/libmea-core.pro +++ b/libnymea-app-core/libnymea-app-core.pro @@ -1,8 +1,8 @@ -TARGET = mea-core +TARGET = nymea-app-core TEMPLATE = lib CONFIG += staticlib -include(../mea.pri) +include(../config.pri) !win32: { # To enable this on Windows we'd need to install Bonjour # https://support.apple.com/kb/DL999 @@ -99,7 +99,7 @@ HEADERS += \ wifisetup/wirelessaccesspoints.h \ wifisetup/wirelesssetupmanager.h \ wifisetup/networkmanagercontroler.h \ - libmea-core.h \ + libnymea-app-core.h \ models/logsmodelng.h \ models/interfacesproxy.h diff --git a/libmea-core/logmanager.cpp b/libnymea-app-core/logmanager.cpp similarity index 100% rename from libmea-core/logmanager.cpp rename to libnymea-app-core/logmanager.cpp diff --git a/libmea-core/logmanager.h b/libnymea-app-core/logmanager.h similarity index 100% rename from libmea-core/logmanager.h rename to libnymea-app-core/logmanager.h diff --git a/libmea-core/models/eventdescriptorparamsfiltermodel.cpp b/libnymea-app-core/models/eventdescriptorparamsfiltermodel.cpp similarity index 100% rename from libmea-core/models/eventdescriptorparamsfiltermodel.cpp rename to libnymea-app-core/models/eventdescriptorparamsfiltermodel.cpp diff --git a/libmea-core/models/eventdescriptorparamsfiltermodel.h b/libnymea-app-core/models/eventdescriptorparamsfiltermodel.h similarity index 100% rename from libmea-core/models/eventdescriptorparamsfiltermodel.h rename to libnymea-app-core/models/eventdescriptorparamsfiltermodel.h diff --git a/libmea-core/models/interfacesproxy.cpp b/libnymea-app-core/models/interfacesproxy.cpp similarity index 100% rename from libmea-core/models/interfacesproxy.cpp rename to libnymea-app-core/models/interfacesproxy.cpp diff --git a/libmea-core/models/interfacesproxy.h b/libnymea-app-core/models/interfacesproxy.h similarity index 100% rename from libmea-core/models/interfacesproxy.h rename to libnymea-app-core/models/interfacesproxy.h diff --git a/libmea-core/models/logsmodel.cpp b/libnymea-app-core/models/logsmodel.cpp similarity index 100% rename from libmea-core/models/logsmodel.cpp rename to libnymea-app-core/models/logsmodel.cpp diff --git a/libmea-core/models/logsmodel.h b/libnymea-app-core/models/logsmodel.h similarity index 100% rename from libmea-core/models/logsmodel.h rename to libnymea-app-core/models/logsmodel.h diff --git a/libmea-core/models/logsmodelng.cpp b/libnymea-app-core/models/logsmodelng.cpp similarity index 100% rename from libmea-core/models/logsmodelng.cpp rename to libnymea-app-core/models/logsmodelng.cpp diff --git a/libmea-core/models/logsmodelng.h b/libnymea-app-core/models/logsmodelng.h similarity index 100% rename from libmea-core/models/logsmodelng.h rename to libnymea-app-core/models/logsmodelng.h diff --git a/libmea-core/models/rulesfiltermodel.cpp b/libnymea-app-core/models/rulesfiltermodel.cpp similarity index 100% rename from libmea-core/models/rulesfiltermodel.cpp rename to libnymea-app-core/models/rulesfiltermodel.cpp diff --git a/libmea-core/models/rulesfiltermodel.h b/libnymea-app-core/models/rulesfiltermodel.h similarity index 100% rename from libmea-core/models/rulesfiltermodel.h rename to libnymea-app-core/models/rulesfiltermodel.h diff --git a/libmea-core/models/valuelogsproxymodel.cpp b/libnymea-app-core/models/valuelogsproxymodel.cpp similarity index 100% rename from libmea-core/models/valuelogsproxymodel.cpp rename to libnymea-app-core/models/valuelogsproxymodel.cpp diff --git a/libmea-core/models/valuelogsproxymodel.h b/libnymea-app-core/models/valuelogsproxymodel.h similarity index 100% rename from libmea-core/models/valuelogsproxymodel.h rename to libnymea-app-core/models/valuelogsproxymodel.h diff --git a/libmea-core/nymeaconnection.cpp b/libnymea-app-core/nymeaconnection.cpp similarity index 100% rename from libmea-core/nymeaconnection.cpp rename to libnymea-app-core/nymeaconnection.cpp diff --git a/libmea-core/nymeaconnection.h b/libnymea-app-core/nymeaconnection.h similarity index 100% rename from libmea-core/nymeaconnection.h rename to libnymea-app-core/nymeaconnection.h diff --git a/libmea-core/nymeainterface.cpp b/libnymea-app-core/nymeainterface.cpp similarity index 81% rename from libmea-core/nymeainterface.cpp rename to libnymea-app-core/nymeainterface.cpp index f83dcbe5..5fd4de15 100644 --- a/libmea-core/nymeainterface.cpp +++ b/libnymea-app-core/nymeainterface.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/nymeainterface.h b/libnymea-app-core/nymeainterface.h similarity index 87% rename from libmea-core/nymeainterface.h rename to libnymea-app-core/nymeainterface.h index 1c4f3e94..f3d9ffa8 100644 --- a/libmea-core/nymeainterface.h +++ b/libnymea-app-core/nymeainterface.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/pluginsproxy.cpp b/libnymea-app-core/pluginsproxy.cpp similarity index 96% rename from libmea-core/pluginsproxy.cpp rename to libnymea-app-core/pluginsproxy.cpp index d5143910..d63a911c 100644 --- a/libmea-core/pluginsproxy.cpp +++ b/libnymea-app-core/pluginsproxy.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/pluginsproxy.h b/libnymea-app-core/pluginsproxy.h similarity index 96% rename from libmea-core/pluginsproxy.h rename to libnymea-app-core/pluginsproxy.h index 5b3bc4cd..ad0df47d 100644 --- a/libmea-core/pluginsproxy.h +++ b/libnymea-app-core/pluginsproxy.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/rulemanager.cpp b/libnymea-app-core/rulemanager.cpp similarity index 100% rename from libmea-core/rulemanager.cpp rename to libnymea-app-core/rulemanager.cpp diff --git a/libmea-core/rulemanager.h b/libnymea-app-core/rulemanager.h similarity index 100% rename from libmea-core/rulemanager.h rename to libnymea-app-core/rulemanager.h diff --git a/libmea-core/tcpsocketinterface.cpp b/libnymea-app-core/tcpsocketinterface.cpp similarity index 100% rename from libmea-core/tcpsocketinterface.cpp rename to libnymea-app-core/tcpsocketinterface.cpp diff --git a/libmea-core/tcpsocketinterface.h b/libnymea-app-core/tcpsocketinterface.h similarity index 100% rename from libmea-core/tcpsocketinterface.h rename to libnymea-app-core/tcpsocketinterface.h diff --git a/libmea-core/vendorsproxy.cpp b/libnymea-app-core/vendorsproxy.cpp similarity index 96% rename from libmea-core/vendorsproxy.cpp rename to libnymea-app-core/vendorsproxy.cpp index 71ec8969..c391c4e3 100644 --- a/libmea-core/vendorsproxy.cpp +++ b/libnymea-app-core/vendorsproxy.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/vendorsproxy.h b/libnymea-app-core/vendorsproxy.h similarity index 96% rename from libmea-core/vendorsproxy.h rename to libnymea-app-core/vendorsproxy.h index 84d05809..e2acc941 100644 --- a/libmea-core/vendorsproxy.h +++ b/libnymea-app-core/vendorsproxy.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/websocketinterface.cpp b/libnymea-app-core/websocketinterface.cpp similarity index 91% rename from libmea-core/websocketinterface.cpp rename to libnymea-app-core/websocketinterface.cpp index 9d91041d..3636932e 100644 --- a/libmea-core/websocketinterface.cpp +++ b/libnymea-app-core/websocketinterface.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/websocketinterface.h b/libnymea-app-core/websocketinterface.h similarity index 86% rename from libmea-core/websocketinterface.h rename to libnymea-app-core/websocketinterface.h index 8349a736..e5b6f386 100644 --- a/libmea-core/websocketinterface.h +++ b/libnymea-app-core/websocketinterface.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/wifisetup/bluetoothdevice.cpp b/libnymea-app-core/wifisetup/bluetoothdevice.cpp similarity index 98% rename from libmea-core/wifisetup/bluetoothdevice.cpp rename to libnymea-app-core/wifisetup/bluetoothdevice.cpp index 4ac7db94..c9cea6dc 100644 --- a/libmea-core/wifisetup/bluetoothdevice.cpp +++ b/libnymea-app-core/wifisetup/bluetoothdevice.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/bluetoothdevice.h b/libnymea-app-core/wifisetup/bluetoothdevice.h similarity index 97% rename from libmea-core/wifisetup/bluetoothdevice.h rename to libnymea-app-core/wifisetup/bluetoothdevice.h index 97392cf3..b2047350 100644 --- a/libmea-core/wifisetup/bluetoothdevice.h +++ b/libnymea-app-core/wifisetup/bluetoothdevice.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/bluetoothdeviceinfo.cpp b/libnymea-app-core/wifisetup/bluetoothdeviceinfo.cpp similarity index 96% rename from libmea-core/wifisetup/bluetoothdeviceinfo.cpp rename to libnymea-app-core/wifisetup/bluetoothdeviceinfo.cpp index 80ca0caf..c9a04edd 100644 --- a/libmea-core/wifisetup/bluetoothdeviceinfo.cpp +++ b/libnymea-app-core/wifisetup/bluetoothdeviceinfo.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/bluetoothdeviceinfo.h b/libnymea-app-core/wifisetup/bluetoothdeviceinfo.h similarity index 96% rename from libmea-core/wifisetup/bluetoothdeviceinfo.h rename to libnymea-app-core/wifisetup/bluetoothdeviceinfo.h index 0d39dc8c..75460f2d 100644 --- a/libmea-core/wifisetup/bluetoothdeviceinfo.h +++ b/libnymea-app-core/wifisetup/bluetoothdeviceinfo.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/bluetoothdeviceinfos.cpp b/libnymea-app-core/wifisetup/bluetoothdeviceinfos.cpp similarity index 97% rename from libmea-core/wifisetup/bluetoothdeviceinfos.cpp rename to libnymea-app-core/wifisetup/bluetoothdeviceinfos.cpp index e749b28d..e3b28452 100644 --- a/libmea-core/wifisetup/bluetoothdeviceinfos.cpp +++ b/libnymea-app-core/wifisetup/bluetoothdeviceinfos.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/bluetoothdeviceinfos.h b/libnymea-app-core/wifisetup/bluetoothdeviceinfos.h similarity index 96% rename from libmea-core/wifisetup/bluetoothdeviceinfos.h rename to libnymea-app-core/wifisetup/bluetoothdeviceinfos.h index 1520b8f6..8b87fdaa 100644 --- a/libmea-core/wifisetup/bluetoothdeviceinfos.h +++ b/libnymea-app-core/wifisetup/bluetoothdeviceinfos.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/bluetoothdiscovery.cpp b/libnymea-app-core/wifisetup/bluetoothdiscovery.cpp similarity index 97% rename from libmea-core/wifisetup/bluetoothdiscovery.cpp rename to libnymea-app-core/wifisetup/bluetoothdiscovery.cpp index 64f99165..322d96da 100644 --- a/libmea-core/wifisetup/bluetoothdiscovery.cpp +++ b/libnymea-app-core/wifisetup/bluetoothdiscovery.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/bluetoothdiscovery.h b/libnymea-app-core/wifisetup/bluetoothdiscovery.h similarity index 96% rename from libmea-core/wifisetup/bluetoothdiscovery.h rename to libnymea-app-core/wifisetup/bluetoothdiscovery.h index 1f7ea2e3..b376ee16 100644 --- a/libmea-core/wifisetup/bluetoothdiscovery.h +++ b/libnymea-app-core/wifisetup/bluetoothdiscovery.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/networkmanagercontroler.cpp b/libnymea-app-core/wifisetup/networkmanagercontroler.cpp similarity index 96% rename from libmea-core/wifisetup/networkmanagercontroler.cpp rename to libnymea-app-core/wifisetup/networkmanagercontroler.cpp index 68fa48b9..eb3b45b0 100644 --- a/libmea-core/wifisetup/networkmanagercontroler.cpp +++ b/libnymea-app-core/wifisetup/networkmanagercontroler.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/networkmanagercontroler.h b/libnymea-app-core/wifisetup/networkmanagercontroler.h similarity index 96% rename from libmea-core/wifisetup/networkmanagercontroler.h rename to libnymea-app-core/wifisetup/networkmanagercontroler.h index dc5a5f75..d8a0cfc6 100644 --- a/libmea-core/wifisetup/networkmanagercontroler.h +++ b/libnymea-app-core/wifisetup/networkmanagercontroler.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/wirelessaccesspoint.cpp b/libnymea-app-core/wifisetup/wirelessaccesspoint.cpp similarity index 96% rename from libmea-core/wifisetup/wirelessaccesspoint.cpp rename to libnymea-app-core/wifisetup/wirelessaccesspoint.cpp index ded8e572..bf83773e 100644 --- a/libmea-core/wifisetup/wirelessaccesspoint.cpp +++ b/libnymea-app-core/wifisetup/wirelessaccesspoint.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/wirelessaccesspoint.h b/libnymea-app-core/wifisetup/wirelessaccesspoint.h similarity index 96% rename from libmea-core/wifisetup/wirelessaccesspoint.h rename to libnymea-app-core/wifisetup/wirelessaccesspoint.h index d9c12205..59833100 100644 --- a/libmea-core/wifisetup/wirelessaccesspoint.h +++ b/libnymea-app-core/wifisetup/wirelessaccesspoint.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/wirelessaccesspoints.cpp b/libnymea-app-core/wifisetup/wirelessaccesspoints.cpp similarity index 98% rename from libmea-core/wifisetup/wirelessaccesspoints.cpp rename to libnymea-app-core/wifisetup/wirelessaccesspoints.cpp index b6a8ec9d..50e5e5ab 100644 --- a/libmea-core/wifisetup/wirelessaccesspoints.cpp +++ b/libnymea-app-core/wifisetup/wirelessaccesspoints.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/wirelessaccesspoints.h b/libnymea-app-core/wifisetup/wirelessaccesspoints.h similarity index 97% rename from libmea-core/wifisetup/wirelessaccesspoints.h rename to libnymea-app-core/wifisetup/wirelessaccesspoints.h index 84b40276..f43c6ce3 100644 --- a/libmea-core/wifisetup/wirelessaccesspoints.h +++ b/libnymea-app-core/wifisetup/wirelessaccesspoints.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/wirelesssetupmanager.cpp b/libnymea-app-core/wifisetup/wirelesssetupmanager.cpp similarity index 99% rename from libmea-core/wifisetup/wirelesssetupmanager.cpp rename to libnymea-app-core/wifisetup/wirelesssetupmanager.cpp index d7746641..74d50e42 100644 --- a/libmea-core/wifisetup/wirelesssetupmanager.cpp +++ b/libnymea-app-core/wifisetup/wirelesssetupmanager.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/wirelesssetupmanager.h b/libnymea-app-core/wifisetup/wirelesssetupmanager.h similarity index 99% rename from libmea-core/wifisetup/wirelesssetupmanager.h rename to libnymea-app-core/wifisetup/wirelesssetupmanager.h index c9c9ec7f..2a82405b 100644 --- a/libmea-core/wifisetup/wirelesssetupmanager.h +++ b/libnymea-app-core/wifisetup/wirelesssetupmanager.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/libnymea-common.pro b/libnymea-common/libnymea-common.pro index 3adc7fff..5574cf14 100644 --- a/libnymea-common/libnymea-common.pro +++ b/libnymea-common/libnymea-common.pro @@ -1,4 +1,4 @@ -include(../mea.pri) +include(../config.pri) TARGET = nymea-common TEMPLATE = lib diff --git a/libnymea-common/types/actiontype.cpp b/libnymea-common/types/actiontype.cpp index e6d8ba95..f90518e8 100644 --- a/libnymea-common/types/actiontype.cpp +++ b/libnymea-common/types/actiontype.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/actiontype.h b/libnymea-common/types/actiontype.h index 0f06f1ed..9347e0ca 100644 --- a/libnymea-common/types/actiontype.h +++ b/libnymea-common/types/actiontype.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/actiontypes.cpp b/libnymea-common/types/actiontypes.cpp index 6ce63844..f2aa43a3 100644 --- a/libnymea-common/types/actiontypes.cpp +++ b/libnymea-common/types/actiontypes.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/actiontypes.h b/libnymea-common/types/actiontypes.h index 3eec6cb1..04aaffb2 100644 --- a/libnymea-common/types/actiontypes.h +++ b/libnymea-common/types/actiontypes.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/device.cpp b/libnymea-common/types/device.cpp index 00eb30ed..ec3ac241 100644 --- a/libnymea-common/types/device.cpp +++ b/libnymea-common/types/device.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/device.h b/libnymea-common/types/device.h index a1e96e06..c5a2594a 100644 --- a/libnymea-common/types/device.h +++ b/libnymea-common/types/device.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/deviceclass.cpp b/libnymea-common/types/deviceclass.cpp index 21a69c62..2b220052 100644 --- a/libnymea-common/types/deviceclass.cpp +++ b/libnymea-common/types/deviceclass.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/deviceclass.h b/libnymea-common/types/deviceclass.h index ef022cbc..82fef48d 100644 --- a/libnymea-common/types/deviceclass.h +++ b/libnymea-common/types/deviceclass.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/eventtype.cpp b/libnymea-common/types/eventtype.cpp index b4a3b77c..834e1ec2 100644 --- a/libnymea-common/types/eventtype.cpp +++ b/libnymea-common/types/eventtype.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/eventtype.h b/libnymea-common/types/eventtype.h index 9979b8cc..98e791c2 100644 --- a/libnymea-common/types/eventtype.h +++ b/libnymea-common/types/eventtype.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/eventtypes.cpp b/libnymea-common/types/eventtypes.cpp index 7fbb8945..af31f39c 100644 --- a/libnymea-common/types/eventtypes.cpp +++ b/libnymea-common/types/eventtypes.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/eventtypes.h b/libnymea-common/types/eventtypes.h index fb1d28cc..3e474912 100644 --- a/libnymea-common/types/eventtypes.h +++ b/libnymea-common/types/eventtypes.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/param.cpp b/libnymea-common/types/param.cpp index e93b85b6..4fc2ecca 100644 --- a/libnymea-common/types/param.cpp +++ b/libnymea-common/types/param.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/param.h b/libnymea-common/types/param.h index 6b38edd0..e747e2af 100644 --- a/libnymea-common/types/param.h +++ b/libnymea-common/types/param.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/params.cpp b/libnymea-common/types/params.cpp index d1bb0d6b..5648ff29 100644 --- a/libnymea-common/types/params.cpp +++ b/libnymea-common/types/params.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/params.h b/libnymea-common/types/params.h index 9ff13989..bb514ef6 100644 --- a/libnymea-common/types/params.h +++ b/libnymea-common/types/params.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/paramtype.cpp b/libnymea-common/types/paramtype.cpp index 025132ad..ea7c7e84 100644 --- a/libnymea-common/types/paramtype.cpp +++ b/libnymea-common/types/paramtype.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/paramtype.h b/libnymea-common/types/paramtype.h index f3458556..7ecf1f6a 100644 --- a/libnymea-common/types/paramtype.h +++ b/libnymea-common/types/paramtype.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/paramtypes.cpp b/libnymea-common/types/paramtypes.cpp index 42b33b95..ba99430d 100644 --- a/libnymea-common/types/paramtypes.cpp +++ b/libnymea-common/types/paramtypes.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/paramtypes.h b/libnymea-common/types/paramtypes.h index 0803c08c..a28abeb1 100644 --- a/libnymea-common/types/paramtypes.h +++ b/libnymea-common/types/paramtypes.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/plugin.cpp b/libnymea-common/types/plugin.cpp index 2dc20d27..76c097c5 100644 --- a/libnymea-common/types/plugin.cpp +++ b/libnymea-common/types/plugin.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/plugin.h b/libnymea-common/types/plugin.h index 4d9685fc..dc03774d 100644 --- a/libnymea-common/types/plugin.h +++ b/libnymea-common/types/plugin.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/plugins.cpp b/libnymea-common/types/plugins.cpp index 524bfc75..214dcb22 100644 --- a/libnymea-common/types/plugins.cpp +++ b/libnymea-common/types/plugins.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/plugins.h b/libnymea-common/types/plugins.h index 281205f8..007417e1 100644 --- a/libnymea-common/types/plugins.h +++ b/libnymea-common/types/plugins.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/state.cpp b/libnymea-common/types/state.cpp index 6fa681f3..2b437bb6 100644 --- a/libnymea-common/types/state.cpp +++ b/libnymea-common/types/state.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/state.h b/libnymea-common/types/state.h index ebe0f9ae..4fa66aba 100644 --- a/libnymea-common/types/state.h +++ b/libnymea-common/types/state.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/states.cpp b/libnymea-common/types/states.cpp index d347c591..4bc09872 100644 --- a/libnymea-common/types/states.cpp +++ b/libnymea-common/types/states.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/states.h b/libnymea-common/types/states.h index a5e53709..582f31af 100644 --- a/libnymea-common/types/states.h +++ b/libnymea-common/types/states.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/statesproxy.cpp b/libnymea-common/types/statesproxy.cpp index 3a732179..c86bee24 100644 --- a/libnymea-common/types/statesproxy.cpp +++ b/libnymea-common/types/statesproxy.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/statesproxy.h b/libnymea-common/types/statesproxy.h index 79d2b0ee..769b6a15 100644 --- a/libnymea-common/types/statesproxy.h +++ b/libnymea-common/types/statesproxy.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/statetype.cpp b/libnymea-common/types/statetype.cpp index 26b6dc8a..c4a546bd 100644 --- a/libnymea-common/types/statetype.cpp +++ b/libnymea-common/types/statetype.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/statetype.h b/libnymea-common/types/statetype.h index 9fe2fe0e..8ab87380 100644 --- a/libnymea-common/types/statetype.h +++ b/libnymea-common/types/statetype.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/statetypes.cpp b/libnymea-common/types/statetypes.cpp index 20b3c11e..745b2eec 100644 --- a/libnymea-common/types/statetypes.cpp +++ b/libnymea-common/types/statetypes.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/statetypes.h b/libnymea-common/types/statetypes.h index 979efa70..b890e046 100644 --- a/libnymea-common/types/statetypes.h +++ b/libnymea-common/types/statetypes.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/types.h b/libnymea-common/types/types.h index 611e84fa..3c651f57 100644 --- a/libnymea-common/types/types.h +++ b/libnymea-common/types/types.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/vendor.cpp b/libnymea-common/types/vendor.cpp index 5b9d25c5..3a6a86d5 100644 --- a/libnymea-common/types/vendor.cpp +++ b/libnymea-common/types/vendor.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/vendor.h b/libnymea-common/types/vendor.h index 0d3afd9c..f7c41fdb 100644 --- a/libnymea-common/types/vendor.h +++ b/libnymea-common/types/vendor.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/vendors.cpp b/libnymea-common/types/vendors.cpp index d8a79c27..48f3d0c3 100644 --- a/libnymea-common/types/vendors.cpp +++ b/libnymea-common/types/vendors.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/vendors.h b/libnymea-common/types/vendors.h index 12dfe8e0..87f99957 100644 --- a/libnymea-common/types/vendors.h +++ b/libnymea-common/types/vendors.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/mea.pro b/mea.pro deleted file mode 100644 index 0848c000..00000000 --- a/mea.pro +++ /dev/null @@ -1,66 +0,0 @@ -include(mea.pri) - -TEMPLATE=subdirs - -SUBDIRS = libnymea-common libmea-core mea -libmea-core.depends = libnymea-common -mea.depends = libmea-core - -withtests: { - SUBDIRS += tests - tests.depends = libmea-core -} - -# Building a Windows installer: -# Install Visual Studio, Qt and NSIS on Windows. Make sure NSIS is in your path. -# Use QtCreator to create a release build, make sure to *disable* shadow build. -# After building, run "make wininstaller" -wininstaller.depends = mea -equals(BRANDING, "") { - APP_NAME = mea - PACKAGE_DIR = $$shell_path($$PWD)\packaging\windows - PACKAGE_NAME = mea-win-installer -} else { - APP_NAME = $${BRANDING} - PACKAGE_NAME = $${BRANDING}-win-installer - PACKAGE_DIR = $$shell_path($$PWD)\packaging\windows_$${APP_NAME} -} -OLDSTRING=".*" -NEWSTRING="$${MEA_VERSION}" -wininstaller.commands += @powershell -Command \"(gc $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\meta\package.xml) -replace \'$${OLDSTRING}\',\'$${NEWSTRING}\' | sc $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\meta\package.xml\" && -wininstaller.commands += rmdir /S /Q $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data & mkdir $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data && -wininstaller.commands += copy $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\meta\logo.ico $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data\logo.ico && -CONFIG(debug,debug|release):wininstaller.commands += copy mea\debug\mea.exe $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data\\$${APP_NAME}.exe && -CONFIG(release,debug|release):wininstaller.commands += copy mea\release\mea.exe $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data\\$${APP_NAME}.exe && -!equals(SSL_LIBS, "") { -message("Deploying SSL libs from $${SSL_LIBS} to package.") -wininstaller.commands += copy $${SSL_LIBS}\libeay32.dll $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data && -wininstaller.commands += copy $${SSL_LIBS}\ssleay32.dll $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data && -} -wininstaller.commands += windeployqt --compiler-runtime --qmldir \"$${top_srcdir}\"\mea\ui $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data\ && -wininstaller.commands += binarycreator -c $${PACKAGE_DIR}\config\config.xml -p $${PACKAGE_DIR}\packages\ $${PACKAGE_NAME} -message("cmd: $${wininstaller.commands}") -QMAKE_EXTRA_TARGETS += wininstaller - - -# OS X installer bundle -osxbundle.commands += cd mea && rm -f mea.dmg mea_writable.dmg mea-osx-bundle.dmg || true && -osxbundle.commands += hdiutil eject /Volumes/mea || true && -osxbundle.commands += macdeployqt mea.app -qmldir=$$top_srcdir/mea/ui -dmg && -osxbundle.commands += hdiutil convert mea.dmg -format UDRW -o mea_writable.dmg && -osxbundle.commands += hdiutil attach -readwrite -noverify mea_writable.dmg && sleep 2 && -osxbundle.commands += mkdir /Volumes/mea/.background/ && cp $$top_srcdir/packaging/osx/installer.tiff /Volumes/mea/.background/ && -osxbundle.commands += ln -s /Applications /Volumes/mea/Applications && -osxbundle.commands += osascript $$top_srcdir/packaging/osx/patchinstaller.sctp && -osxbundle.commands += hdiutil eject /Volumes/mea && -osxbundle.commands += hdiutil convert mea_writable.dmg -format UDRO -o mea-osx-bundle.dmg && -osxbundle.commands += rm mea.dmg mea_writable.dmg -QMAKE_EXTRA_TARGETS += osxbundle - - -# Translations support -TRANSLATIONS += $$files($$absolute_path(mea)/translations/*.ts, true) -lrelease.commands = lrelease $$TRANSLATIONS -lrelease-qmake_all.commands = lrelease $$TRANSLATIONS -QMAKE_EXTRA_TARGETS += lrelease lrelease-make_first lrelease-qmake_all lrelease-install_subtargets -mea.depends += lrelease diff --git a/nymea-app.pro b/nymea-app.pro new file mode 100644 index 00000000..4edfbaf8 --- /dev/null +++ b/nymea-app.pro @@ -0,0 +1,71 @@ +include(config.pri) + +TEMPLATE=subdirs + +SUBDIRS = libnymea-common libnymea-app-core nymea-app +libnymea-app-core.depends = libnymea-common +nymea-app.depends = libnymea-app-core + +withtests: { + SUBDIRS += tests + tests.depends = libnymea-app-core +} + +# Building a Windows installer: +# Qt MinGW including the Qt Install Framework and MinGW runtime from Qt Installer +# Add QT_INSTALL_DIR/bin, QT_IFW_INSTALL_DIR/bin and MINGW_INSTALL_DIR/bin to PATH +# run "make wininstaller" +wininstaller.depends = nymea-app +equals(BRANDING, "") { + APP_NAME = nymea-app + PACKAGE_URN = io.guh.nymeaapp + PACKAGE_DIR = $$shell_path($$PWD)\packaging\windows + PACKAGE_NAME = nymea-app-win-installer +} else { + APP_NAME = $${BRANDING} + PACKAGE_URN = io.guh.$${APP_NAME} + PACKAGE_NAME = $${BRANDING}-win-installer + PACKAGE_DIR = $$shell_path($$PWD)\packaging\windows_$${APP_NAME} +} +OLDSTRING=".*" +NEWSTRING="$${APP_VERSION}" +wininstaller.commands += @powershell -Command \"(gc $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\meta\package.xml) -replace \'$${OLDSTRING}\',\'$${NEWSTRING}\' | sc $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\meta\package.xml\" && +wininstaller.commands += rmdir /S /Q $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data & mkdir $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data && +wininstaller.commands += copy $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\meta\logo.ico $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data\logo.ico && +CONFIG(debug,debug|release):wininstaller.commands += copy nymea-app\debug\nymea-app.exe $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data\\$${APP_NAME}.exe && +CONFIG(release,debug|release):wininstaller.commands += copy nymea-app\release\nymea-app.exe $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data\\$${APP_NAME}.exe && +!equals(SSL_LIBS, "") { +message("Deploying SSL libs from $${SSL_LIBS} to package.") +wininstaller.commands += copy $${SSL_LIBS}\libeay32.dll $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data && +wininstaller.commands += copy $${SSL_LIBS}\ssleay32.dll $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data && +} +wininstaller.commands += windeployqt --compiler-runtime --qmldir \"$${top_srcdir}\"\nymea-app\ui $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data\ && +wininstaller.commands += binarycreator -c $${PACKAGE_DIR}\config\config.xml -p $${PACKAGE_DIR}\packages\ $${PACKAGE_NAME}-$${APP_VERSION} +QMAKE_EXTRA_TARGETS += wininstaller + + +# OS X installer bundle +# Install XCode and Qt clang64, add qmake directory to PATH +# run "make osxbundle" +osxbundle.depends = nymea-app +osxbundle.commands += cd nymea-app && rm -f nymea-app.dmg nymea-app_writable.dmg nymea-app-osx-bundle.dmg || true && +osxbundle.commands += hdiutil eject /Volumes/nymea-app || true && +osxbundle.commands += macdeployqt nymea-app.app -qmldir=$$top_srcdir/nymea-app/ui -dmg && +osxbundle.commands += hdiutil convert nymea-app.dmg -format UDRW -o nymea-app_writable.dmg && +osxbundle.commands += hdiutil attach -readwrite -noverify nymea-app_writable.dmg && sleep 2 && +osxbundle.commands += mkdir /Volumes/nymea-app/.background/ && cp $$top_srcdir/packaging/osx/installer.tiff /Volumes/nymea-app/.background/ && +osxbundle.commands += ln -s /Applications /Volumes/nymea-app/Applications && +osxbundle.commands += mv /Volumes/nymea-app/nymea-app.app /Volumes/nymea-app/nymea\:app.app && +osxbundle.commands += osascript $$top_srcdir/packaging/osx/patchinstaller.sctp && +osxbundle.commands += hdiutil eject /Volumes/nymea-app && +osxbundle.commands += hdiutil convert nymea-app_writable.dmg -format UDRO -o ../nymea-app-osx-bundle-$${APP_VERSION}.dmg && +osxbundle.commands += rm nymea-app.dmg nymea-app_writable.dmg +QMAKE_EXTRA_TARGETS += osxbundle + + +# Translations support +TRANSLATIONS += $$files($$absolute_path(nymea-app)/translations/*.ts, true) +lrelease.commands = lrelease $$TRANSLATIONS +lrelease-qmake_all.commands = lrelease $$TRANSLATIONS +QMAKE_EXTRA_TARGETS += lrelease lrelease-make_first lrelease-qmake_all lrelease-install_subtargets +nymea-app.depends += lrelease diff --git a/mea/main.cpp b/nymea-app/main.cpp similarity index 79% rename from mea/main.cpp rename to nymea-app/main.cpp index 6dd802fc..033701ed 100644 --- a/mea/main.cpp +++ b/nymea-app/main.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -29,7 +29,7 @@ #include #endif -#include "libmea-core.h" +#include "libnymea-app-core.h" #include "stylecontroller.h" @@ -37,7 +37,7 @@ int main(int argc, char *argv[]) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication application(argc, argv); - application.setApplicationName("mea"); + application.setApplicationName("nymea-app"); application.setOrganizationName("nymea"); foreach (const QFileInfo &fi, QDir(":/ui/fonts/").entryInfoList()) { @@ -58,8 +58,8 @@ int main(int argc, char *argv[]) application.installTranslator(&qtTranslator); QTranslator meaTranslator; - qDebug() << "Loading translation file:" << ":/translations/mea-" + QLocale::system().name(); - meaTranslator.load(":/translations/mea-" + QLocale::system().name()); + qDebug() << "Loading translation file:" << ":/translations/nymea-app-" + QLocale::system().name(); + meaTranslator.load(":/translations/nymea-app-" + QLocale::system().name()); application.installTranslator(&meaTranslator); qDebug() << "Running on" << QSysInfo::machineHostName() << QSysInfo::prettyProductName() << QSysInfo::productType() << QSysInfo::productVersion(); @@ -74,13 +74,15 @@ int main(int argc, char *argv[]) #else engine->rootContext()->setContextProperty("appBranding", ""); #endif - engine->rootContext()->setContextProperty("appVersion", MEA_VERSION); + engine->rootContext()->setContextProperty("appVersion", APP_VERSION); engine->rootContext()->setContextProperty("qtVersion", QT_VERSION_STR); StyleController styleController; engine->rootContext()->setContextProperty("styleController", &styleController); - engine->load(QUrl(QLatin1String("qrc:/ui/Mea.qml"))); + application.setWindowIcon(QIcon(QString(":/styles/%1/logo.svg").arg(styleController.currentStyle()))); + + engine->load(QUrl(QLatin1String("qrc:/ui/Nymea.qml"))); #ifdef Q_OS_ANDROID QtAndroid::hideSplashScreen(250); diff --git a/mea/mea.pro b/nymea-app/nymea-app.pro similarity index 83% rename from mea/mea.pro rename to nymea-app/nymea-app.pro index 29678797..62b64be4 100644 --- a/mea/mea.pro +++ b/nymea-app/nymea-app.pro @@ -1,19 +1,19 @@ TEMPLATE=app -TARGET=mea -include(../mea.pri) +TARGET=nymea-app +include(../config.pri) QT += qml quick quickcontrols2 svg websockets bluetooth INCLUDEPATH += $$top_srcdir/libnymea-common \ - $$top_srcdir/libmea-core -LIBS += -L$$top_builddir/libmea-core/ -lmea-core \ + $$top_srcdir/libnymea-app-core +LIBS += -L$$top_builddir/libnymea-app-core/ -lnymea-app-core \ -L$$top_builddir/libnymea-common/ -lnymea-common -win32:Debug:LIBS += -L$$top_builddir/libmea-core/debug \ +win32:Debug:LIBS += -L$$top_builddir/libnymea-app-core/debug \ -L$$top_builddir/libnymea-common/debug -win32:Release:LIBS += -L$$top_builddir/libmea-core/release \ +win32:Release:LIBS += -L$$top_builddir/libnymea-app-core/release \ -L$$top_builddir/libnymea-common/release linux:!android:LIBS += -lavahi-client -lavahi-common -PRE_TARGETDEPS += ../libmea-core ../libnymea-common +PRE_TARGETDEPS += ../libnymea-app-core ../libnymea-common HEADERS += \ stylecontroller.h @@ -47,7 +47,7 @@ android { } macx: { - PRODUCT_NAME=mea + PRODUCT_NAME=$$TARGET plist.input = ../packaging/osx/Info.plist.in plist.output = $$OUT_PWD/Info.plist QMAKE_SUBSTITUTES += plist @@ -59,7 +59,7 @@ macx: { ios: { message("iOS build") QMAKE_TARGET_BUNDLE_PREFIX = io.guh - QMAKE_BUNDLE = mea + QMAKE_BUNDLE = $$TARGET # Configure generated xcode project to have our bundle id xcode_product_bundle_identifier_setting.value = $${QMAKE_TARGET_BUNDLE_PREFIX}.$${QMAKE_BUNDLE} plist.input = ../packaging/ios/Info.plist.in @@ -71,8 +71,6 @@ ios: { ios_icon_files.files += $$files(../packaging/ios/AppIcon*.png) ios_launch_images.files += $$files(../packaging/ios/LaunchImage*.png) ../packaging/ios/LaunchScreen1.xib QMAKE_BUNDLE_DATA += ios_icon_files ios_launch_images - - message("ls: $${qmake_launch_screen}") } BR=$$BRANDING @@ -80,7 +78,7 @@ BR=$$BRANDING DEFINES += BRANDING=\\\"$${BR}\\\" win32:RCC_ICONS += ../packaging/windows_$${BR}/packages/io.guh.$${BR}/meta/logo.ico } else { - win32:RCC_ICONS += ../packaging/windows/packages/io.guh.mea/meta/logo.ico + win32:RCC_ICONS += ../packaging/windows/packages/io.guh.nymeaapp/meta/logo.ico } target.path = /usr/bin diff --git a/mea/qtquickcontrols2.conf b/nymea-app/qtquickcontrols2.conf similarity index 100% rename from mea/qtquickcontrols2.conf rename to nymea-app/qtquickcontrols2.conf diff --git a/mea/resources.qrc b/nymea-app/resources.qrc similarity index 97% rename from mea/resources.qrc rename to nymea-app/resources.qrc index b15b0998..7a4a337f 100644 --- a/mea/resources.qrc +++ b/nymea-app/resources.qrc @@ -1,8 +1,8 @@ + ui/Nymea.qml ui/ConnectPage.qml ui/DevicesPage.qml - ui/Mea.qml ui/NewDeviceWizard.qml ui/SettingsPage.qml ui/components/GuhHeader.qml @@ -135,7 +135,6 @@ ui/images/clock-app-symbolic.svg ui/devicepages/StateLogPage.qml ui/customviews/GenericTypeLogView.qml - guh-logo.svg qtquickcontrols2.conf styles/dark/ApplicationWindow.qml styles/light/ApplicationWindow.qml @@ -158,8 +157,8 @@ ui/images/nm-signal-100.svg ui/images/nm-signal-100-secure.svg ui/images/network-vpn.svg - translations/mea-de_DE.qm - translations/mea-en_US.qm + translations/nymea-app-de_DE.qm + translations/nymea-app-en_US.qm ui/AppSettingsPage.qml ui/images/stock_application.svg ui/delegates/ThingDelegate.qml @@ -209,5 +208,8 @@ ui/images/rpi-setup.svg ui/images/eye.svg ui/images/private-browsing.svg + styles/dark/logo.svg + styles/light/logo.svg + styles/maveo/logo.svg diff --git a/mea/stylecontroller.cpp b/nymea-app/stylecontroller.cpp similarity index 100% rename from mea/stylecontroller.cpp rename to nymea-app/stylecontroller.cpp diff --git a/mea/stylecontroller.h b/nymea-app/stylecontroller.h similarity index 100% rename from mea/stylecontroller.h rename to nymea-app/stylecontroller.h diff --git a/mea/styles/dark/ApplicationWindow.qml b/nymea-app/styles/dark/ApplicationWindow.qml similarity index 87% rename from mea/styles/dark/ApplicationWindow.qml rename to nymea-app/styles/dark/ApplicationWindow.qml index 183293fe..cea9b461 100644 --- a/mea/styles/dark/ApplicationWindow.qml +++ b/nymea-app/styles/dark/ApplicationWindow.qml @@ -5,7 +5,7 @@ import QtQuick.Controls.Material 2.2 ApplicationWindow { property color guhAccent: "#ff57baae" property string systemName: "nymea" - property string appName: "mea" + property string appName: "nymea:app" Material.theme: Material.Dark Material.accent: guhAccent diff --git a/mea/styles/dark/Page.qml b/nymea-app/styles/dark/Page.qml similarity index 100% rename from mea/styles/dark/Page.qml rename to nymea-app/styles/dark/Page.qml diff --git a/mea/guh-logo.svg b/nymea-app/styles/dark/logo.svg similarity index 97% rename from mea/guh-logo.svg rename to nymea-app/styles/dark/logo.svg index 2985cebe..9d1907c3 100644 --- a/mea/guh-logo.svg +++ b/nymea-app/styles/dark/logo.svg @@ -13,8 +13,8 @@ height="256" id="svg2" version="1.1" - inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" - sodipodi:docname="guh-logo.svg" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="logo.svg" inkscape:export-filename="/home/micha/Develop/mea/mea/guh-logo-256x256.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96"> @@ -251,12 +251,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1.979899" - inkscape:cx="-128.90044" - inkscape:cy="115.43739" + inkscape:zoom="3.959798" + inkscape:cx="83.152338" + inkscape:cy="132.37098" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="false" + showgrid="true" inkscape:window-width="2880" inkscape:window-height="1698" inkscape:window-x="0" @@ -265,7 +265,11 @@ fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" - fit-margin-bottom="0" /> + fit-margin-bottom="0"> + + @@ -274,7 +278,7 @@ image/svg+xml - + @@ -284,7 +288,7 @@ id="layer1" transform="translate(-143.41788,-709.27353)"> diff --git a/mea/styles/light/ApplicationWindow.qml b/nymea-app/styles/light/ApplicationWindow.qml similarity index 87% rename from mea/styles/light/ApplicationWindow.qml rename to nymea-app/styles/light/ApplicationWindow.qml index bc7fba6a..eebfc30f 100644 --- a/mea/styles/light/ApplicationWindow.qml +++ b/nymea-app/styles/light/ApplicationWindow.qml @@ -5,7 +5,7 @@ import QtQuick.Controls.Material 2.2 ApplicationWindow { property color guhAccent: "#ff57baae" property string systemName: "nymea" - property string appName: "mea" + property string appName: "nymea:app" Material.theme: Material.Light Material.accent: guhAccent diff --git a/mea/styles/light/Page.qml b/nymea-app/styles/light/Page.qml similarity index 100% rename from mea/styles/light/Page.qml rename to nymea-app/styles/light/Page.qml diff --git a/nymea-app/styles/light/logo.svg b/nymea-app/styles/light/logo.svg new file mode 100644 index 00000000..9d1907c3 --- /dev/null +++ b/nymea-app/styles/light/logo.svg @@ -0,0 +1,603 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mea/styles/maveo/ApplicationWindow.qml b/nymea-app/styles/maveo/ApplicationWindow.qml similarity index 100% rename from mea/styles/maveo/ApplicationWindow.qml rename to nymea-app/styles/maveo/ApplicationWindow.qml diff --git a/nymea-app/styles/maveo/logo.svg b/nymea-app/styles/maveo/logo.svg new file mode 100644 index 00000000..9fec2008 --- /dev/null +++ b/nymea-app/styles/maveo/logo.svg @@ -0,0 +1,353 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mea/translations/mea-de_DE.ts b/nymea-app/translations/nymea-app-de_DE.ts similarity index 100% rename from mea/translations/mea-de_DE.ts rename to nymea-app/translations/nymea-app-de_DE.ts diff --git a/mea/translations/mea-en_US.ts b/nymea-app/translations/nymea-app-en_US.ts similarity index 100% rename from mea/translations/mea-en_US.ts rename to nymea-app/translations/nymea-app-en_US.ts diff --git a/mea/ui/AboutPage.qml b/nymea-app/ui/AboutPage.qml similarity index 98% rename from mea/ui/AboutPage.qml rename to nymea-app/ui/AboutPage.qml index 24981386..c35f13a7 100644 --- a/mea/ui/AboutPage.qml +++ b/nymea-app/ui/AboutPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "components" Page { @@ -30,7 +30,7 @@ Page { Layout.preferredHeight: app.iconSize * 2 Layout.preferredWidth: height fillMode: Image.PreserveAspectFit - source: "../guh-logo.svg" + source: "qrc:/styles/%1/logo.svg".arg(styleController.currentStyle) } GridLayout { @@ -118,7 +118,7 @@ Page { } } onClicked: { - Qt.openUrlExternally("https://github.com/guh/mea") + Qt.openUrlExternally("https://github.com/guh/nymea-app") } } diff --git a/mea/ui/AppSettingsPage.qml b/nymea-app/ui/AppSettingsPage.qml similarity index 99% rename from mea/ui/AppSettingsPage.qml rename to nymea-app/ui/AppSettingsPage.qml index e44057f3..93fc0259 100644 --- a/mea/ui/AppSettingsPage.qml +++ b/nymea-app/ui/AppSettingsPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "components" Page { diff --git a/mea/ui/BluetoothDiscoveryPage.qml b/nymea-app/ui/BluetoothDiscoveryPage.qml similarity index 99% rename from mea/ui/BluetoothDiscoveryPage.qml rename to nymea-app/ui/BluetoothDiscoveryPage.qml index e15bd2aa..4b596cca 100644 --- a/mea/ui/BluetoothDiscoveryPage.qml +++ b/nymea-app/ui/BluetoothDiscoveryPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "components" -import Mea 1.0 +import Nymea 1.0 Page { diff --git a/mea/ui/BluetoothLoadingPage.qml b/nymea-app/ui/BluetoothLoadingPage.qml similarity index 98% rename from mea/ui/BluetoothLoadingPage.qml rename to nymea-app/ui/BluetoothLoadingPage.qml index dad7d364..619f12e7 100644 --- a/mea/ui/BluetoothLoadingPage.qml +++ b/nymea-app/ui/BluetoothLoadingPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "components" -import Mea 1.0 +import Nymea 1.0 Page { diff --git a/mea/ui/ConnectPage.qml b/nymea-app/ui/ConnectPage.qml similarity index 99% rename from mea/ui/ConnectPage.qml rename to nymea-app/ui/ConnectPage.qml index 9b290155..bac1390f 100644 --- a/mea/ui/ConnectPage.qml +++ b/nymea-app/ui/ConnectPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 import QtQuick.Controls.Material 2.2 import QtQuick.Layouts 1.3 -import Mea 1.0 +import Nymea 1.0 import "components" Page { diff --git a/mea/ui/DevicesPage.qml b/nymea-app/ui/DevicesPage.qml similarity index 99% rename from mea/ui/DevicesPage.qml rename to nymea-app/ui/DevicesPage.qml index d5122487..10570646 100644 --- a/mea/ui/DevicesPage.qml +++ b/nymea-app/ui/DevicesPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.2 -import Mea 1.0 +import Nymea 1.0 import "components" Item { diff --git a/mea/ui/EditDevicesPage.qml b/nymea-app/ui/EditDevicesPage.qml similarity index 96% rename from mea/ui/EditDevicesPage.qml rename to nymea-app/ui/EditDevicesPage.qml index 7762f990..53c67f1f 100644 --- a/mea/ui/EditDevicesPage.qml +++ b/nymea-app/ui/EditDevicesPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "components" import "delegates" -import Mea 1.0 +import Nymea 1.0 Page { id: root @@ -55,7 +55,7 @@ Page { horizontalAlignment: Text.AlignHCenter } Image { - source: "../guh-logo.svg" + source: "qrc:/styles/%1/logo.svg".arg(styleController.currentStyle) Layout.preferredWidth: app.iconSize * 5 Layout.preferredHeight: width Layout.alignment: Qt.AlignHCenter diff --git a/mea/ui/LoginPage.qml b/nymea-app/ui/LoginPage.qml similarity index 97% rename from mea/ui/LoginPage.qml rename to nymea-app/ui/LoginPage.qml index 82b8cbe2..9451a57d 100644 --- a/mea/ui/LoginPage.qml +++ b/nymea-app/ui/LoginPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "components" Page { @@ -121,8 +121,8 @@ Page { print("create user") Engine.jsonRpcClient.createUser(usernameTextField.text, passwordTextField.text); } else { - print("authenticate", usernameTextField.text, passwordTextField.text, "mea") - Engine.jsonRpcClient.authenticate(usernameTextField.text, passwordTextField.text, "mea"); + print("authenticate", usernameTextField.text, passwordTextField.text, "nymea-app") + Engine.jsonRpcClient.authenticate(usernameTextField.text, passwordTextField.text, "nymea-app"); } } } diff --git a/mea/ui/MagicPage.qml b/nymea-app/ui/MagicPage.qml similarity index 99% rename from mea/ui/MagicPage.qml rename to nymea-app/ui/MagicPage.qml index 0993d06f..93530d41 100644 --- a/mea/ui/MagicPage.qml +++ b/nymea-app/ui/MagicPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "components" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/MainPage.qml b/nymea-app/ui/MainPage.qml similarity index 98% rename from mea/ui/MainPage.qml rename to nymea-app/ui/MainPage.qml index 557c064b..807c504c 100644 --- a/mea/ui/MainPage.qml +++ b/nymea-app/ui/MainPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.2 -import Mea 1.0 +import Nymea 1.0 import "components" import "delegates" @@ -144,7 +144,7 @@ Page { horizontalAlignment: Text.AlignHCenter } Image { - source: "../guh-logo.svg" + source: "qrc:/styles/%1/logo.svg".arg(styleController.currentStyle) Layout.preferredWidth: app.iconSize * 5 Layout.preferredHeight: width Layout.alignment: Qt.AlignHCenter diff --git a/mea/ui/NewDeviceWizard.qml b/nymea-app/ui/NewDeviceWizard.qml similarity index 99% rename from mea/ui/NewDeviceWizard.qml rename to nymea-app/ui/NewDeviceWizard.qml index 86d483e2..31695ce9 100644 --- a/mea/ui/NewDeviceWizard.qml +++ b/nymea-app/ui/NewDeviceWizard.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.1 -import Mea 1.0 +import Nymea 1.0 import "components" import "delegates" diff --git a/mea/ui/Mea.qml b/nymea-app/ui/Nymea.qml similarity index 99% rename from mea/ui/Mea.qml rename to nymea-app/ui/Nymea.qml index d7a7c25e..69d01f12 100644 --- a/mea/ui/Mea.qml +++ b/nymea-app/ui/Nymea.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.2 import Qt.labs.settings 1.0 -import Mea 1.0 +import Nymea 1.0 ApplicationWindow { id: app diff --git a/mea/ui/PushButtonAuthPage.qml b/nymea-app/ui/PushButtonAuthPage.qml similarity index 99% rename from mea/ui/PushButtonAuthPage.qml rename to nymea-app/ui/PushButtonAuthPage.qml index 6db9fa49..5fd673a1 100644 --- a/mea/ui/PushButtonAuthPage.qml +++ b/nymea-app/ui/PushButtonAuthPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "components" Page { diff --git a/mea/ui/SettingsPage.qml b/nymea-app/ui/SettingsPage.qml similarity index 99% rename from mea/ui/SettingsPage.qml rename to nymea-app/ui/SettingsPage.qml index 74462dac..13a29eef 100644 --- a/mea/ui/SettingsPage.qml +++ b/nymea-app/ui/SettingsPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "components" Page { diff --git a/mea/ui/WirelessControlerPage.qml b/nymea-app/ui/WirelessControlerPage.qml similarity index 99% rename from mea/ui/WirelessControlerPage.qml rename to nymea-app/ui/WirelessControlerPage.qml index 4d937e63..b2ad556d 100644 --- a/mea/ui/WirelessControlerPage.qml +++ b/nymea-app/ui/WirelessControlerPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import QtQuick.Controls.Material 2.1 -import Mea 1.0 +import Nymea 1.0 import "components" Page { diff --git a/mea/ui/components/ColorIcon.qml b/nymea-app/ui/components/ColorIcon.qml similarity index 100% rename from mea/ui/components/ColorIcon.qml rename to nymea-app/ui/components/ColorIcon.qml diff --git a/mea/ui/components/ColorPicker.qml b/nymea-app/ui/components/ColorPicker.qml similarity index 100% rename from mea/ui/components/ColorPicker.qml rename to nymea-app/ui/components/ColorPicker.qml diff --git a/mea/ui/components/ColorPickerCt.qml b/nymea-app/ui/components/ColorPickerCt.qml similarity index 100% rename from mea/ui/components/ColorPickerCt.qml rename to nymea-app/ui/components/ColorPickerCt.qml diff --git a/mea/ui/components/ErrorDialog.qml b/nymea-app/ui/components/ErrorDialog.qml similarity index 100% rename from mea/ui/components/ErrorDialog.qml rename to nymea-app/ui/components/ErrorDialog.qml diff --git a/mea/ui/components/Graph.qml b/nymea-app/ui/components/Graph.qml similarity index 99% rename from mea/ui/components/Graph.qml rename to nymea-app/ui/components/Graph.qml index ee04e630..974709c3 100644 --- a/mea/ui/components/Graph.qml +++ b/nymea-app/ui/components/Graph.qml @@ -1,6 +1,6 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 -import Mea 1.0 +import Nymea 1.0 import QtQuick.Controls.Material 2.2 Item { diff --git a/mea/ui/components/GuhHeader.qml b/nymea-app/ui/components/GuhHeader.qml similarity index 100% rename from mea/ui/components/GuhHeader.qml rename to nymea-app/ui/components/GuhHeader.qml diff --git a/mea/ui/components/HeaderButton.qml b/nymea-app/ui/components/HeaderButton.qml similarity index 100% rename from mea/ui/components/HeaderButton.qml rename to nymea-app/ui/components/HeaderButton.qml diff --git a/mea/ui/components/IconMenuItem.qml b/nymea-app/ui/components/IconMenuItem.qml similarity index 100% rename from mea/ui/components/IconMenuItem.qml rename to nymea-app/ui/components/IconMenuItem.qml diff --git a/mea/ui/components/InterfacesModels.qml b/nymea-app/ui/components/InterfacesModels.qml similarity index 100% rename from mea/ui/components/InterfacesModels.qml rename to nymea-app/ui/components/InterfacesModels.qml diff --git a/mea/ui/components/MeaDialog.qml b/nymea-app/ui/components/MeaDialog.qml similarity index 100% rename from mea/ui/components/MeaDialog.qml rename to nymea-app/ui/components/MeaDialog.qml diff --git a/mea/ui/components/MeaListItemDelegate.qml b/nymea-app/ui/components/MeaListItemDelegate.qml similarity index 100% rename from mea/ui/components/MeaListItemDelegate.qml rename to nymea-app/ui/components/MeaListItemDelegate.qml diff --git a/mea/ui/components/ShutterControls.qml b/nymea-app/ui/components/ShutterControls.qml similarity index 99% rename from mea/ui/components/ShutterControls.qml rename to nymea-app/ui/components/ShutterControls.qml index e818f4a2..3751a058 100644 --- a/mea/ui/components/ShutterControls.qml +++ b/nymea-app/ui/components/ShutterControls.qml @@ -2,7 +2,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 import QtQuick.Controls.Material 2.2 import QtQuick.Layouts 1.3 -import Mea 1.0 +import Nymea 1.0 RowLayout { id: root diff --git a/mea/ui/components/ThinDivider.qml b/nymea-app/ui/components/ThinDivider.qml similarity index 100% rename from mea/ui/components/ThinDivider.qml rename to nymea-app/ui/components/ThinDivider.qml diff --git a/mea/ui/components/ThrottledSlider.qml b/nymea-app/ui/components/ThrottledSlider.qml similarity index 100% rename from mea/ui/components/ThrottledSlider.qml rename to nymea-app/ui/components/ThrottledSlider.qml diff --git a/mea/ui/customviews/CustomViewBase.qml b/nymea-app/ui/customviews/CustomViewBase.qml similarity index 100% rename from mea/ui/customviews/CustomViewBase.qml rename to nymea-app/ui/customviews/CustomViewBase.qml diff --git a/mea/ui/customviews/ExtendedVolumeController.qml b/nymea-app/ui/customviews/ExtendedVolumeController.qml similarity index 99% rename from mea/ui/customviews/ExtendedVolumeController.qml rename to nymea-app/ui/customviews/ExtendedVolumeController.qml index 131cc605..671c4322 100644 --- a/mea/ui/customviews/ExtendedVolumeController.qml +++ b/nymea-app/ui/customviews/ExtendedVolumeController.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.1 -import Mea 1.0 +import Nymea 1.0 import "../components" CustomViewBase { diff --git a/mea/ui/customviews/GenericTypeLogView.qml b/nymea-app/ui/customviews/GenericTypeLogView.qml similarity index 99% rename from mea/ui/customviews/GenericTypeLogView.qml rename to nymea-app/ui/customviews/GenericTypeLogView.qml index 00d0e463..49ae9ebd 100644 --- a/mea/ui/customviews/GenericTypeLogView.qml +++ b/nymea-app/ui/customviews/GenericTypeLogView.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" Item { diff --git a/mea/ui/customviews/MediaControllerView.qml b/nymea-app/ui/customviews/MediaControllerView.qml similarity index 99% rename from mea/ui/customviews/MediaControllerView.qml rename to nymea-app/ui/customviews/MediaControllerView.qml index 1c47e5f3..c93a6309 100644 --- a/mea/ui/customviews/MediaControllerView.qml +++ b/nymea-app/ui/customviews/MediaControllerView.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.1 -import Mea 1.0 +import Nymea 1.0 import "../components" CustomViewBase { diff --git a/mea/ui/customviews/NotificationsView.qml b/nymea-app/ui/customviews/NotificationsView.qml similarity index 98% rename from mea/ui/customviews/NotificationsView.qml rename to nymea-app/ui/customviews/NotificationsView.qml index 9f3c75e5..9b420d68 100644 --- a/mea/ui/customviews/NotificationsView.qml +++ b/nymea-app/ui/customviews/NotificationsView.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.1 import "../components" -import Mea 1.0 +import Nymea 1.0 CustomViewBase { id: root diff --git a/mea/ui/customviews/SensorView.qml b/nymea-app/ui/customviews/SensorView.qml similarity index 99% rename from mea/ui/customviews/SensorView.qml rename to nymea-app/ui/customviews/SensorView.qml index 262fe56e..8e0f63fe 100644 --- a/mea/ui/customviews/SensorView.qml +++ b/nymea-app/ui/customviews/SensorView.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.3 import "../components" -import Mea 1.0 +import Nymea 1.0 CustomViewBase { id: root diff --git a/mea/ui/customviews/WeatherView.qml b/nymea-app/ui/customviews/WeatherView.qml similarity index 100% rename from mea/ui/customviews/WeatherView.qml rename to nymea-app/ui/customviews/WeatherView.qml diff --git a/mea/ui/delegates/ActionDelegate.qml b/nymea-app/ui/delegates/ActionDelegate.qml similarity index 99% rename from mea/ui/delegates/ActionDelegate.qml rename to nymea-app/ui/delegates/ActionDelegate.qml index 6f585bc5..de099023 100644 --- a/mea/ui/delegates/ActionDelegate.qml +++ b/nymea-app/ui/delegates/ActionDelegate.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Layouts 1.2 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 -import Mea 1.0 +import Nymea 1.0 import "../components" ItemDelegate { diff --git a/mea/ui/delegates/ParamDelegate.qml b/nymea-app/ui/delegates/ParamDelegate.qml similarity index 99% rename from mea/ui/delegates/ParamDelegate.qml rename to nymea-app/ui/delegates/ParamDelegate.qml index 54116a44..fb06ee7b 100644 --- a/mea/ui/delegates/ParamDelegate.qml +++ b/nymea-app/ui/delegates/ParamDelegate.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Layouts 1.2 import QtQuick.Controls 2.2 import QtQuick.Controls.Material 2.1 -import Mea 1.0 +import Nymea 1.0 import "../components" ItemDelegate { diff --git a/mea/ui/delegates/ParamDescriptorDelegate.qml b/nymea-app/ui/delegates/ParamDescriptorDelegate.qml similarity index 99% rename from mea/ui/delegates/ParamDescriptorDelegate.qml rename to nymea-app/ui/delegates/ParamDescriptorDelegate.qml index b90d938d..68a1286e 100644 --- a/mea/ui/delegates/ParamDescriptorDelegate.qml +++ b/nymea-app/ui/delegates/ParamDescriptorDelegate.qml @@ -1,7 +1,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 -import Mea 1.0 +import Nymea 1.0 ItemDelegate { id: root diff --git a/mea/ui/delegates/ThingDelegate.qml b/nymea-app/ui/delegates/ThingDelegate.qml similarity index 100% rename from mea/ui/delegates/ThingDelegate.qml rename to nymea-app/ui/delegates/ThingDelegate.qml diff --git a/mea/ui/devicelistpages/GenericDeviceListPage.qml b/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml similarity index 99% rename from mea/ui/devicelistpages/GenericDeviceListPage.qml rename to nymea-app/ui/devicelistpages/GenericDeviceListPage.qml index eb87d2e8..d3c6c9f3 100644 --- a/mea/ui/devicelistpages/GenericDeviceListPage.qml +++ b/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../delegates" diff --git a/mea/ui/devicelistpages/LightsDeviceListPage.qml b/nymea-app/ui/devicelistpages/LightsDeviceListPage.qml similarity index 99% rename from mea/ui/devicelistpages/LightsDeviceListPage.qml rename to nymea-app/ui/devicelistpages/LightsDeviceListPage.qml index 604bf73d..df18da14 100644 --- a/mea/ui/devicelistpages/LightsDeviceListPage.qml +++ b/nymea-app/ui/devicelistpages/LightsDeviceListPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" Page { diff --git a/mea/ui/devicepages/ButtonDevicePage.qml b/nymea-app/ui/devicepages/ButtonDevicePage.qml similarity index 99% rename from mea/ui/devicepages/ButtonDevicePage.qml rename to nymea-app/ui/devicepages/ButtonDevicePage.qml index 988769b2..43f89875 100644 --- a/mea/ui/devicepages/ButtonDevicePage.qml +++ b/nymea-app/ui/devicepages/ButtonDevicePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../customviews" diff --git a/mea/ui/devicepages/ColorLightDevicePage.qml b/nymea-app/ui/devicepages/ColorLightDevicePage.qml similarity index 99% rename from mea/ui/devicepages/ColorLightDevicePage.qml rename to nymea-app/ui/devicepages/ColorLightDevicePage.qml index edf11220..eccb95c0 100644 --- a/mea/ui/devicepages/ColorLightDevicePage.qml +++ b/nymea-app/ui/devicepages/ColorLightDevicePage.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 import QtQuick.Controls.Material 2.1 -import Mea 1.0 +import Nymea 1.0 import "../components" DevicePageBase { diff --git a/mea/ui/devicepages/ConfigureThingPage.qml b/nymea-app/ui/devicepages/ConfigureThingPage.qml similarity index 99% rename from mea/ui/devicepages/ConfigureThingPage.qml rename to nymea-app/ui/devicepages/ConfigureThingPage.qml index 7e981fda..57dacc6b 100644 --- a/mea/ui/devicepages/ConfigureThingPage.qml +++ b/nymea-app/ui/devicepages/ConfigureThingPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../delegates" diff --git a/mea/ui/devicepages/DevicePageBase.qml b/nymea-app/ui/devicepages/DevicePageBase.qml similarity index 99% rename from mea/ui/devicepages/DevicePageBase.qml rename to nymea-app/ui/devicepages/DevicePageBase.qml index d3f7cdba..612c22c5 100644 --- a/mea/ui/devicepages/DevicePageBase.qml +++ b/nymea-app/ui/devicepages/DevicePageBase.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" Page { diff --git a/mea/ui/devicepages/GarageGateDevicePage.qml b/nymea-app/ui/devicepages/GarageGateDevicePage.qml similarity index 99% rename from mea/ui/devicepages/GarageGateDevicePage.qml rename to nymea-app/ui/devicepages/GarageGateDevicePage.qml index 5b62bd3e..2ae01c55 100644 --- a/mea/ui/devicepages/GarageGateDevicePage.qml +++ b/nymea-app/ui/devicepages/GarageGateDevicePage.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.2 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../customviews" diff --git a/mea/ui/devicepages/GenericDevicePage.qml b/nymea-app/ui/devicepages/GenericDevicePage.qml similarity index 99% rename from mea/ui/devicepages/GenericDevicePage.qml rename to nymea-app/ui/devicepages/GenericDevicePage.qml index 874b2454..b18de5f2 100644 --- a/mea/ui/devicepages/GenericDevicePage.qml +++ b/nymea-app/ui/devicepages/GenericDevicePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" DevicePageBase { diff --git a/mea/ui/devicepages/GenericDeviceStateDetailsPage.qml b/nymea-app/ui/devicepages/GenericDeviceStateDetailsPage.qml similarity index 99% rename from mea/ui/devicepages/GenericDeviceStateDetailsPage.qml rename to nymea-app/ui/devicepages/GenericDeviceStateDetailsPage.qml index 94bca07a..426bc9c2 100644 --- a/mea/ui/devicepages/GenericDeviceStateDetailsPage.qml +++ b/nymea-app/ui/devicepages/GenericDeviceStateDetailsPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" Page { diff --git a/mea/ui/devicepages/InputTriggerDevicePage.qml b/nymea-app/ui/devicepages/InputTriggerDevicePage.qml similarity index 98% rename from mea/ui/devicepages/InputTriggerDevicePage.qml rename to nymea-app/ui/devicepages/InputTriggerDevicePage.qml index d6e5feb0..2cc98680 100644 --- a/mea/ui/devicepages/InputTriggerDevicePage.qml +++ b/nymea-app/ui/devicepages/InputTriggerDevicePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../customviews" diff --git a/mea/ui/devicepages/MediaDevicePage.qml b/nymea-app/ui/devicepages/MediaDevicePage.qml similarity index 98% rename from mea/ui/devicepages/MediaDevicePage.qml rename to nymea-app/ui/devicepages/MediaDevicePage.qml index 6d1ed49e..682222b4 100644 --- a/mea/ui/devicepages/MediaDevicePage.qml +++ b/nymea-app/ui/devicepages/MediaDevicePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../customviews" diff --git a/mea/ui/devicepages/SensorDevicePage.qml b/nymea-app/ui/devicepages/SensorDevicePage.qml similarity index 98% rename from mea/ui/devicepages/SensorDevicePage.qml rename to nymea-app/ui/devicepages/SensorDevicePage.qml index a36bcce1..a4951a42 100644 --- a/mea/ui/devicepages/SensorDevicePage.qml +++ b/nymea-app/ui/devicepages/SensorDevicePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../customviews" diff --git a/mea/ui/devicepages/ShutterDevicePage.qml b/nymea-app/ui/devicepages/ShutterDevicePage.qml similarity index 95% rename from mea/ui/devicepages/ShutterDevicePage.qml rename to nymea-app/ui/devicepages/ShutterDevicePage.qml index 06a35201..e4bb5c7c 100644 --- a/mea/ui/devicepages/ShutterDevicePage.qml +++ b/nymea-app/ui/devicepages/ShutterDevicePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../customviews" diff --git a/mea/ui/devicepages/StateLogPage.qml b/nymea-app/ui/devicepages/StateLogPage.qml similarity index 99% rename from mea/ui/devicepages/StateLogPage.qml rename to nymea-app/ui/devicepages/StateLogPage.qml index a9251509..3ad421ea 100644 --- a/mea/ui/devicepages/StateLogPage.qml +++ b/nymea-app/ui/devicepages/StateLogPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../customviews" diff --git a/mea/ui/devicepages/WeatherDevicePage.qml b/nymea-app/ui/devicepages/WeatherDevicePage.qml similarity index 98% rename from mea/ui/devicepages/WeatherDevicePage.qml rename to nymea-app/ui/devicepages/WeatherDevicePage.qml index fd88c0a8..8354c579 100644 --- a/mea/ui/devicepages/WeatherDevicePage.qml +++ b/nymea-app/ui/devicepages/WeatherDevicePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../customviews" diff --git a/mea/ui/fonts/Ubuntu-B.ttf b/nymea-app/ui/fonts/Ubuntu-B.ttf similarity index 100% rename from mea/ui/fonts/Ubuntu-B.ttf rename to nymea-app/ui/fonts/Ubuntu-B.ttf diff --git a/mea/ui/fonts/Ubuntu-BI.ttf b/nymea-app/ui/fonts/Ubuntu-BI.ttf similarity index 100% rename from mea/ui/fonts/Ubuntu-BI.ttf rename to nymea-app/ui/fonts/Ubuntu-BI.ttf diff --git a/mea/ui/fonts/Ubuntu-C.ttf b/nymea-app/ui/fonts/Ubuntu-C.ttf similarity index 100% rename from mea/ui/fonts/Ubuntu-C.ttf rename to nymea-app/ui/fonts/Ubuntu-C.ttf diff --git a/mea/ui/fonts/Ubuntu-L.ttf b/nymea-app/ui/fonts/Ubuntu-L.ttf similarity index 100% rename from mea/ui/fonts/Ubuntu-L.ttf rename to nymea-app/ui/fonts/Ubuntu-L.ttf diff --git a/mea/ui/fonts/Ubuntu-LI.ttf b/nymea-app/ui/fonts/Ubuntu-LI.ttf similarity index 100% rename from mea/ui/fonts/Ubuntu-LI.ttf rename to nymea-app/ui/fonts/Ubuntu-LI.ttf diff --git a/mea/ui/fonts/Ubuntu-M.ttf b/nymea-app/ui/fonts/Ubuntu-M.ttf similarity index 100% rename from mea/ui/fonts/Ubuntu-M.ttf rename to nymea-app/ui/fonts/Ubuntu-M.ttf diff --git a/mea/ui/fonts/Ubuntu-MI.ttf b/nymea-app/ui/fonts/Ubuntu-MI.ttf similarity index 100% rename from mea/ui/fonts/Ubuntu-MI.ttf rename to nymea-app/ui/fonts/Ubuntu-MI.ttf diff --git a/mea/ui/fonts/Ubuntu-R.ttf b/nymea-app/ui/fonts/Ubuntu-R.ttf similarity index 100% rename from mea/ui/fonts/Ubuntu-R.ttf rename to nymea-app/ui/fonts/Ubuntu-R.ttf diff --git a/mea/ui/fonts/Ubuntu-RI.ttf b/nymea-app/ui/fonts/Ubuntu-RI.ttf similarity index 100% rename from mea/ui/fonts/Ubuntu-RI.ttf rename to nymea-app/ui/fonts/Ubuntu-RI.ttf diff --git a/mea/ui/images/Built_with_Qt_RGB_logo.svg b/nymea-app/ui/images/Built_with_Qt_RGB_logo.svg similarity index 100% rename from mea/ui/images/Built_with_Qt_RGB_logo.svg rename to nymea-app/ui/images/Built_with_Qt_RGB_logo.svg diff --git a/mea/ui/images/Built_with_Qt_RGB_logo_vertical.svg b/nymea-app/ui/images/Built_with_Qt_RGB_logo_vertical.svg similarity index 100% rename from mea/ui/images/Built_with_Qt_RGB_logo_vertical.svg rename to nymea-app/ui/images/Built_with_Qt_RGB_logo_vertical.svg diff --git a/mea/ui/images/action-interface.svg b/nymea-app/ui/images/action-interface.svg similarity index 100% rename from mea/ui/images/action-interface.svg rename to nymea-app/ui/images/action-interface.svg diff --git a/mea/ui/images/action.svg b/nymea-app/ui/images/action.svg similarity index 100% rename from mea/ui/images/action.svg rename to nymea-app/ui/images/action.svg diff --git a/mea/ui/images/add.svg b/nymea-app/ui/images/add.svg similarity index 100% rename from mea/ui/images/add.svg rename to nymea-app/ui/images/add.svg diff --git a/mea/ui/images/alarm-clock.svg b/nymea-app/ui/images/alarm-clock.svg similarity index 100% rename from mea/ui/images/alarm-clock.svg rename to nymea-app/ui/images/alarm-clock.svg diff --git a/mea/ui/images/audio-speakers-muted-symbolic.svg b/nymea-app/ui/images/audio-speakers-muted-symbolic.svg similarity index 100% rename from mea/ui/images/audio-speakers-muted-symbolic.svg rename to nymea-app/ui/images/audio-speakers-muted-symbolic.svg diff --git a/mea/ui/images/audio-speakers-symbolic.svg b/nymea-app/ui/images/audio-speakers-symbolic.svg similarity index 100% rename from mea/ui/images/audio-speakers-symbolic.svg rename to nymea-app/ui/images/audio-speakers-symbolic.svg diff --git a/mea/ui/images/back.svg b/nymea-app/ui/images/back.svg similarity index 100% rename from mea/ui/images/back.svg rename to nymea-app/ui/images/back.svg diff --git a/mea/ui/images/battery/battery-000.svg b/nymea-app/ui/images/battery/battery-000.svg similarity index 100% rename from mea/ui/images/battery/battery-000.svg rename to nymea-app/ui/images/battery/battery-000.svg diff --git a/mea/ui/images/battery/battery-010.svg b/nymea-app/ui/images/battery/battery-010.svg similarity index 100% rename from mea/ui/images/battery/battery-010.svg rename to nymea-app/ui/images/battery/battery-010.svg diff --git a/mea/ui/images/battery/battery-020.svg b/nymea-app/ui/images/battery/battery-020.svg similarity index 100% rename from mea/ui/images/battery/battery-020.svg rename to nymea-app/ui/images/battery/battery-020.svg diff --git a/mea/ui/images/battery/battery-030.svg b/nymea-app/ui/images/battery/battery-030.svg similarity index 100% rename from mea/ui/images/battery/battery-030.svg rename to nymea-app/ui/images/battery/battery-030.svg diff --git a/mea/ui/images/battery/battery-040.svg b/nymea-app/ui/images/battery/battery-040.svg similarity index 100% rename from mea/ui/images/battery/battery-040.svg rename to nymea-app/ui/images/battery/battery-040.svg diff --git a/mea/ui/images/battery/battery-050.svg b/nymea-app/ui/images/battery/battery-050.svg similarity index 100% rename from mea/ui/images/battery/battery-050.svg rename to nymea-app/ui/images/battery/battery-050.svg diff --git a/mea/ui/images/battery/battery-060.svg b/nymea-app/ui/images/battery/battery-060.svg similarity index 100% rename from mea/ui/images/battery/battery-060.svg rename to nymea-app/ui/images/battery/battery-060.svg diff --git a/mea/ui/images/battery/battery-070.svg b/nymea-app/ui/images/battery/battery-070.svg similarity index 100% rename from mea/ui/images/battery/battery-070.svg rename to nymea-app/ui/images/battery/battery-070.svg diff --git a/mea/ui/images/battery/battery-080.svg b/nymea-app/ui/images/battery/battery-080.svg similarity index 100% rename from mea/ui/images/battery/battery-080.svg rename to nymea-app/ui/images/battery/battery-080.svg diff --git a/mea/ui/images/battery/battery-090.svg b/nymea-app/ui/images/battery/battery-090.svg similarity index 100% rename from mea/ui/images/battery/battery-090.svg rename to nymea-app/ui/images/battery/battery-090.svg diff --git a/mea/ui/images/battery/battery-100.svg b/nymea-app/ui/images/battery/battery-100.svg similarity index 100% rename from mea/ui/images/battery/battery-100.svg rename to nymea-app/ui/images/battery/battery-100.svg diff --git a/mea/ui/images/bluetooth.svg b/nymea-app/ui/images/bluetooth.svg similarity index 100% rename from mea/ui/images/bluetooth.svg rename to nymea-app/ui/images/bluetooth.svg diff --git a/mea/ui/images/clock-app-symbolic.svg b/nymea-app/ui/images/clock-app-symbolic.svg similarity index 100% rename from mea/ui/images/clock-app-symbolic.svg rename to nymea-app/ui/images/clock-app-symbolic.svg diff --git a/mea/ui/images/close.svg b/nymea-app/ui/images/close.svg similarity index 100% rename from mea/ui/images/close.svg rename to nymea-app/ui/images/close.svg diff --git a/mea/ui/images/delete.svg b/nymea-app/ui/images/delete.svg similarity index 100% rename from mea/ui/images/delete.svg rename to nymea-app/ui/images/delete.svg diff --git a/mea/ui/images/dialog-error-symbolic.svg b/nymea-app/ui/images/dialog-error-symbolic.svg similarity index 100% rename from mea/ui/images/dialog-error-symbolic.svg rename to nymea-app/ui/images/dialog-error-symbolic.svg diff --git a/mea/ui/images/dialog-warning-symbolic.svg b/nymea-app/ui/images/dialog-warning-symbolic.svg similarity index 100% rename from mea/ui/images/dialog-warning-symbolic.svg rename to nymea-app/ui/images/dialog-warning-symbolic.svg diff --git a/mea/ui/images/down.svg b/nymea-app/ui/images/down.svg similarity index 100% rename from mea/ui/images/down.svg rename to nymea-app/ui/images/down.svg diff --git a/mea/ui/images/edit.svg b/nymea-app/ui/images/edit.svg similarity index 100% rename from mea/ui/images/edit.svg rename to nymea-app/ui/images/edit.svg diff --git a/mea/ui/images/event-interface.svg b/nymea-app/ui/images/event-interface.svg similarity index 100% rename from mea/ui/images/event-interface.svg rename to nymea-app/ui/images/event-interface.svg diff --git a/mea/ui/images/event.svg b/nymea-app/ui/images/event.svg similarity index 100% rename from mea/ui/images/event.svg rename to nymea-app/ui/images/event.svg diff --git a/mea/ui/images/eye.svg b/nymea-app/ui/images/eye.svg similarity index 100% rename from mea/ui/images/eye.svg rename to nymea-app/ui/images/eye.svg diff --git a/mea/ui/images/go-down.svg b/nymea-app/ui/images/go-down.svg similarity index 100% rename from mea/ui/images/go-down.svg rename to nymea-app/ui/images/go-down.svg diff --git a/mea/ui/images/guh-logo.svg b/nymea-app/ui/images/guh-logo.svg similarity index 100% rename from mea/ui/images/guh-logo.svg rename to nymea-app/ui/images/guh-logo.svg diff --git a/mea/ui/images/info.svg b/nymea-app/ui/images/info.svg similarity index 100% rename from mea/ui/images/info.svg rename to nymea-app/ui/images/info.svg diff --git a/mea/ui/images/lock-broken.svg b/nymea-app/ui/images/lock-broken.svg similarity index 100% rename from mea/ui/images/lock-broken.svg rename to nymea-app/ui/images/lock-broken.svg diff --git a/mea/ui/images/logs.svg b/nymea-app/ui/images/logs.svg similarity index 100% rename from mea/ui/images/logs.svg rename to nymea-app/ui/images/logs.svg diff --git a/mea/ui/images/magic.svg b/nymea-app/ui/images/magic.svg similarity index 100% rename from mea/ui/images/magic.svg rename to nymea-app/ui/images/magic.svg diff --git a/mea/ui/images/magic.svg.2018_05_29_14_21_27.0.svg b/nymea-app/ui/images/magic.svg.2018_05_29_14_21_27.0.svg similarity index 100% rename from mea/ui/images/magic.svg.2018_05_29_14_21_27.0.svg rename to nymea-app/ui/images/magic.svg.2018_05_29_14_21_27.0.svg diff --git a/mea/ui/images/mail-mark-important.svg b/nymea-app/ui/images/mail-mark-important.svg similarity index 100% rename from mea/ui/images/mail-mark-important.svg rename to nymea-app/ui/images/mail-mark-important.svg diff --git a/mea/ui/images/media-playback-pause.svg b/nymea-app/ui/images/media-playback-pause.svg similarity index 100% rename from mea/ui/images/media-playback-pause.svg rename to nymea-app/ui/images/media-playback-pause.svg diff --git a/mea/ui/images/media-playback-start.svg b/nymea-app/ui/images/media-playback-start.svg similarity index 100% rename from mea/ui/images/media-playback-start.svg rename to nymea-app/ui/images/media-playback-start.svg diff --git a/mea/ui/images/media-playback-stop.svg b/nymea-app/ui/images/media-playback-stop.svg similarity index 100% rename from mea/ui/images/media-playback-stop.svg rename to nymea-app/ui/images/media-playback-stop.svg diff --git a/mea/ui/images/media-preview-start.svg b/nymea-app/ui/images/media-preview-start.svg similarity index 100% rename from mea/ui/images/media-preview-start.svg rename to nymea-app/ui/images/media-preview-start.svg diff --git a/mea/ui/images/media-seek-backward.svg b/nymea-app/ui/images/media-seek-backward.svg similarity index 100% rename from mea/ui/images/media-seek-backward.svg rename to nymea-app/ui/images/media-seek-backward.svg diff --git a/mea/ui/images/media-seek-forward.svg b/nymea-app/ui/images/media-seek-forward.svg similarity index 100% rename from mea/ui/images/media-seek-forward.svg rename to nymea-app/ui/images/media-seek-forward.svg diff --git a/mea/ui/images/media-skip-backward.svg b/nymea-app/ui/images/media-skip-backward.svg similarity index 100% rename from mea/ui/images/media-skip-backward.svg rename to nymea-app/ui/images/media-skip-backward.svg diff --git a/mea/ui/images/media-skip-forward.svg b/nymea-app/ui/images/media-skip-forward.svg similarity index 100% rename from mea/ui/images/media-skip-forward.svg rename to nymea-app/ui/images/media-skip-forward.svg diff --git a/mea/ui/images/mediaplayer-app-symbolic.svg b/nymea-app/ui/images/mediaplayer-app-symbolic.svg similarity index 100% rename from mea/ui/images/mediaplayer-app-symbolic.svg rename to nymea-app/ui/images/mediaplayer-app-symbolic.svg diff --git a/mea/ui/images/navigation-menu.svg b/nymea-app/ui/images/navigation-menu.svg similarity index 100% rename from mea/ui/images/navigation-menu.svg rename to nymea-app/ui/images/navigation-menu.svg diff --git a/mea/ui/images/network-secure.svg b/nymea-app/ui/images/network-secure.svg similarity index 100% rename from mea/ui/images/network-secure.svg rename to nymea-app/ui/images/network-secure.svg diff --git a/mea/ui/images/network-vpn.svg b/nymea-app/ui/images/network-vpn.svg similarity index 100% rename from mea/ui/images/network-vpn.svg rename to nymea-app/ui/images/network-vpn.svg diff --git a/mea/ui/images/network-wired-symbolic.svg b/nymea-app/ui/images/network-wired-symbolic.svg similarity index 100% rename from mea/ui/images/network-wired-symbolic.svg rename to nymea-app/ui/images/network-wired-symbolic.svg diff --git a/mea/ui/images/next.svg b/nymea-app/ui/images/next.svg similarity index 100% rename from mea/ui/images/next.svg rename to nymea-app/ui/images/next.svg diff --git a/mea/ui/images/nm-signal-00-secure.svg b/nymea-app/ui/images/nm-signal-00-secure.svg similarity index 100% rename from mea/ui/images/nm-signal-00-secure.svg rename to nymea-app/ui/images/nm-signal-00-secure.svg diff --git a/mea/ui/images/nm-signal-00.svg b/nymea-app/ui/images/nm-signal-00.svg similarity index 100% rename from mea/ui/images/nm-signal-00.svg rename to nymea-app/ui/images/nm-signal-00.svg diff --git a/mea/ui/images/nm-signal-100-secure.svg b/nymea-app/ui/images/nm-signal-100-secure.svg similarity index 100% rename from mea/ui/images/nm-signal-100-secure.svg rename to nymea-app/ui/images/nm-signal-100-secure.svg diff --git a/mea/ui/images/nm-signal-100.svg b/nymea-app/ui/images/nm-signal-100.svg similarity index 100% rename from mea/ui/images/nm-signal-100.svg rename to nymea-app/ui/images/nm-signal-100.svg diff --git a/mea/ui/images/nm-signal-25-secure.svg b/nymea-app/ui/images/nm-signal-25-secure.svg similarity index 100% rename from mea/ui/images/nm-signal-25-secure.svg rename to nymea-app/ui/images/nm-signal-25-secure.svg diff --git a/mea/ui/images/nm-signal-25.svg b/nymea-app/ui/images/nm-signal-25.svg similarity index 100% rename from mea/ui/images/nm-signal-25.svg rename to nymea-app/ui/images/nm-signal-25.svg diff --git a/mea/ui/images/nm-signal-50-secure.svg b/nymea-app/ui/images/nm-signal-50-secure.svg similarity index 100% rename from mea/ui/images/nm-signal-50-secure.svg rename to nymea-app/ui/images/nm-signal-50-secure.svg diff --git a/mea/ui/images/nm-signal-50.svg b/nymea-app/ui/images/nm-signal-50.svg similarity index 100% rename from mea/ui/images/nm-signal-50.svg rename to nymea-app/ui/images/nm-signal-50.svg diff --git a/mea/ui/images/nm-signal-75-secure.svg b/nymea-app/ui/images/nm-signal-75-secure.svg similarity index 100% rename from mea/ui/images/nm-signal-75-secure.svg rename to nymea-app/ui/images/nm-signal-75-secure.svg diff --git a/mea/ui/images/nm-signal-75.svg b/nymea-app/ui/images/nm-signal-75.svg similarity index 100% rename from mea/ui/images/nm-signal-75.svg rename to nymea-app/ui/images/nm-signal-75.svg diff --git a/mea/ui/images/notification.svg b/nymea-app/ui/images/notification.svg similarity index 100% rename from mea/ui/images/notification.svg rename to nymea-app/ui/images/notification.svg diff --git a/mea/ui/images/nymea-box-setup.svg b/nymea-app/ui/images/nymea-box-setup.svg similarity index 100% rename from mea/ui/images/nymea-box-setup.svg rename to nymea-app/ui/images/nymea-box-setup.svg diff --git a/mea/ui/images/plugin.svg b/nymea-app/ui/images/plugin.svg similarity index 100% rename from mea/ui/images/plugin.svg rename to nymea-app/ui/images/plugin.svg diff --git a/mea/ui/images/private-browsing.svg b/nymea-app/ui/images/private-browsing.svg similarity index 100% rename from mea/ui/images/private-browsing.svg rename to nymea-app/ui/images/private-browsing.svg diff --git a/mea/ui/images/refresh.svg b/nymea-app/ui/images/refresh.svg similarity index 100% rename from mea/ui/images/refresh.svg rename to nymea-app/ui/images/refresh.svg diff --git a/mea/ui/images/remove.svg b/nymea-app/ui/images/remove.svg similarity index 100% rename from mea/ui/images/remove.svg rename to nymea-app/ui/images/remove.svg diff --git a/mea/ui/images/rpi-setup.svg b/nymea-app/ui/images/rpi-setup.svg similarity index 100% rename from mea/ui/images/rpi-setup.svg rename to nymea-app/ui/images/rpi-setup.svg diff --git a/mea/ui/images/select-none.svg b/nymea-app/ui/images/select-none.svg similarity index 100% rename from mea/ui/images/select-none.svg rename to nymea-app/ui/images/select-none.svg diff --git a/mea/ui/images/send.svg b/nymea-app/ui/images/send.svg similarity index 100% rename from mea/ui/images/send.svg rename to nymea-app/ui/images/send.svg diff --git a/mea/ui/images/sensors.svg b/nymea-app/ui/images/sensors.svg similarity index 100% rename from mea/ui/images/sensors.svg rename to nymea-app/ui/images/sensors.svg diff --git a/mea/ui/images/settings.svg b/nymea-app/ui/images/settings.svg similarity index 100% rename from mea/ui/images/settings.svg rename to nymea-app/ui/images/settings.svg diff --git a/mea/ui/images/share.svg b/nymea-app/ui/images/share.svg similarity index 100% rename from mea/ui/images/share.svg rename to nymea-app/ui/images/share.svg diff --git a/mea/ui/images/shutter-0.svg b/nymea-app/ui/images/shutter-0.svg similarity index 100% rename from mea/ui/images/shutter-0.svg rename to nymea-app/ui/images/shutter-0.svg diff --git a/mea/ui/images/shutter-1.svg b/nymea-app/ui/images/shutter-1.svg similarity index 100% rename from mea/ui/images/shutter-1.svg rename to nymea-app/ui/images/shutter-1.svg diff --git a/mea/ui/images/shutter-10.svg b/nymea-app/ui/images/shutter-10.svg similarity index 100% rename from mea/ui/images/shutter-10.svg rename to nymea-app/ui/images/shutter-10.svg diff --git a/mea/ui/images/shutter-2.svg b/nymea-app/ui/images/shutter-2.svg similarity index 100% rename from mea/ui/images/shutter-2.svg rename to nymea-app/ui/images/shutter-2.svg diff --git a/mea/ui/images/shutter-3.svg b/nymea-app/ui/images/shutter-3.svg similarity index 100% rename from mea/ui/images/shutter-3.svg rename to nymea-app/ui/images/shutter-3.svg diff --git a/mea/ui/images/shutter-4.svg b/nymea-app/ui/images/shutter-4.svg similarity index 100% rename from mea/ui/images/shutter-4.svg rename to nymea-app/ui/images/shutter-4.svg diff --git a/mea/ui/images/shutter-5.svg b/nymea-app/ui/images/shutter-5.svg similarity index 100% rename from mea/ui/images/shutter-5.svg rename to nymea-app/ui/images/shutter-5.svg diff --git a/mea/ui/images/shutter-6.svg b/nymea-app/ui/images/shutter-6.svg similarity index 100% rename from mea/ui/images/shutter-6.svg rename to nymea-app/ui/images/shutter-6.svg diff --git a/mea/ui/images/shutter-7.svg b/nymea-app/ui/images/shutter-7.svg similarity index 100% rename from mea/ui/images/shutter-7.svg rename to nymea-app/ui/images/shutter-7.svg diff --git a/mea/ui/images/shutter-8.svg b/nymea-app/ui/images/shutter-8.svg similarity index 100% rename from mea/ui/images/shutter-8.svg rename to nymea-app/ui/images/shutter-8.svg diff --git a/mea/ui/images/shutter-9.svg b/nymea-app/ui/images/shutter-9.svg similarity index 100% rename from mea/ui/images/shutter-9.svg rename to nymea-app/ui/images/shutter-9.svg diff --git a/mea/ui/images/sort-listitem.svg b/nymea-app/ui/images/sort-listitem.svg similarity index 100% rename from mea/ui/images/sort-listitem.svg rename to nymea-app/ui/images/sort-listitem.svg diff --git a/mea/ui/images/state-interface.svg b/nymea-app/ui/images/state-interface.svg similarity index 100% rename from mea/ui/images/state-interface.svg rename to nymea-app/ui/images/state-interface.svg diff --git a/mea/ui/images/state.svg b/nymea-app/ui/images/state.svg similarity index 100% rename from mea/ui/images/state.svg rename to nymea-app/ui/images/state.svg diff --git a/mea/ui/images/stock_application.svg b/nymea-app/ui/images/stock_application.svg similarity index 100% rename from mea/ui/images/stock_application.svg rename to nymea-app/ui/images/stock_application.svg diff --git a/mea/ui/images/stock_link.svg b/nymea-app/ui/images/stock_link.svg similarity index 100% rename from mea/ui/images/stock_link.svg rename to nymea-app/ui/images/stock_link.svg diff --git a/mea/ui/images/system-shutdown.svg b/nymea-app/ui/images/system-shutdown.svg similarity index 100% rename from mea/ui/images/system-shutdown.svg rename to nymea-app/ui/images/system-shutdown.svg diff --git a/mea/ui/images/temperature.svg b/nymea-app/ui/images/temperature.svg similarity index 100% rename from mea/ui/images/temperature.svg rename to nymea-app/ui/images/temperature.svg diff --git a/mea/ui/images/tick.svg b/nymea-app/ui/images/tick.svg similarity index 100% rename from mea/ui/images/tick.svg rename to nymea-app/ui/images/tick.svg diff --git a/mea/ui/images/torch-off.svg b/nymea-app/ui/images/torch-off.svg similarity index 100% rename from mea/ui/images/torch-off.svg rename to nymea-app/ui/images/torch-off.svg diff --git a/mea/ui/images/torch-on.svg b/nymea-app/ui/images/torch-on.svg similarity index 100% rename from mea/ui/images/torch-on.svg rename to nymea-app/ui/images/torch-on.svg diff --git a/mea/ui/images/up.svg b/nymea-app/ui/images/up.svg similarity index 100% rename from mea/ui/images/up.svg rename to nymea-app/ui/images/up.svg diff --git a/mea/ui/images/view-collapse.svg b/nymea-app/ui/images/view-collapse.svg similarity index 100% rename from mea/ui/images/view-collapse.svg rename to nymea-app/ui/images/view-collapse.svg diff --git a/mea/ui/images/view-expand.svg b/nymea-app/ui/images/view-expand.svg similarity index 100% rename from mea/ui/images/view-expand.svg rename to nymea-app/ui/images/view-expand.svg diff --git a/mea/ui/images/weather-app-symbolic.svg b/nymea-app/ui/images/weather-app-symbolic.svg similarity index 100% rename from mea/ui/images/weather-app-symbolic.svg rename to nymea-app/ui/images/weather-app-symbolic.svg diff --git a/mea/ui/images/weathericons/humidity.svg b/nymea-app/ui/images/weathericons/humidity.svg similarity index 100% rename from mea/ui/images/weathericons/humidity.svg rename to nymea-app/ui/images/weathericons/humidity.svg diff --git a/mea/ui/images/weathericons/weather-clear-day.svg b/nymea-app/ui/images/weathericons/weather-clear-day.svg similarity index 100% rename from mea/ui/images/weathericons/weather-clear-day.svg rename to nymea-app/ui/images/weathericons/weather-clear-day.svg diff --git a/mea/ui/images/weathericons/weather-clear-night.svg b/nymea-app/ui/images/weathericons/weather-clear-night.svg similarity index 100% rename from mea/ui/images/weathericons/weather-clear-night.svg rename to nymea-app/ui/images/weathericons/weather-clear-night.svg diff --git a/mea/ui/images/weathericons/weather-clouds.svg b/nymea-app/ui/images/weathericons/weather-clouds.svg similarity index 100% rename from mea/ui/images/weathericons/weather-clouds.svg rename to nymea-app/ui/images/weathericons/weather-clouds.svg diff --git a/mea/ui/images/weathericons/weather-few-clouds-day.svg b/nymea-app/ui/images/weathericons/weather-few-clouds-day.svg similarity index 100% rename from mea/ui/images/weathericons/weather-few-clouds-day.svg rename to nymea-app/ui/images/weathericons/weather-few-clouds-day.svg diff --git a/mea/ui/images/weathericons/weather-few-clouds-night.svg b/nymea-app/ui/images/weathericons/weather-few-clouds-night.svg similarity index 100% rename from mea/ui/images/weathericons/weather-few-clouds-night.svg rename to nymea-app/ui/images/weathericons/weather-few-clouds-night.svg diff --git a/mea/ui/images/weathericons/weather-fog.svg b/nymea-app/ui/images/weathericons/weather-fog.svg similarity index 100% rename from mea/ui/images/weathericons/weather-fog.svg rename to nymea-app/ui/images/weathericons/weather-fog.svg diff --git a/mea/ui/images/weathericons/weather-light-rain.svg b/nymea-app/ui/images/weathericons/weather-light-rain.svg similarity index 100% rename from mea/ui/images/weathericons/weather-light-rain.svg rename to nymea-app/ui/images/weathericons/weather-light-rain.svg diff --git a/mea/ui/images/weathericons/weather-overcast.svg b/nymea-app/ui/images/weathericons/weather-overcast.svg similarity index 100% rename from mea/ui/images/weathericons/weather-overcast.svg rename to nymea-app/ui/images/weathericons/weather-overcast.svg diff --git a/mea/ui/images/weathericons/weather-shower-rain.svg b/nymea-app/ui/images/weathericons/weather-shower-rain.svg similarity index 100% rename from mea/ui/images/weathericons/weather-shower-rain.svg rename to nymea-app/ui/images/weathericons/weather-shower-rain.svg diff --git a/mea/ui/images/weathericons/weather-snow.svg b/nymea-app/ui/images/weathericons/weather-snow.svg similarity index 100% rename from mea/ui/images/weathericons/weather-snow.svg rename to nymea-app/ui/images/weathericons/weather-snow.svg diff --git a/mea/ui/images/weathericons/weather-thunderstorm.svg b/nymea-app/ui/images/weathericons/weather-thunderstorm.svg similarity index 100% rename from mea/ui/images/weathericons/weather-thunderstorm.svg rename to nymea-app/ui/images/weathericons/weather-thunderstorm.svg diff --git a/mea/ui/images/weathericons/wind.svg b/nymea-app/ui/images/weathericons/wind.svg similarity index 100% rename from mea/ui/images/weathericons/wind.svg rename to nymea-app/ui/images/weathericons/wind.svg diff --git a/mea/ui/magic/CalendarItemDelegate.qml b/nymea-app/ui/magic/CalendarItemDelegate.qml similarity index 99% rename from mea/ui/magic/CalendarItemDelegate.qml rename to nymea-app/ui/magic/CalendarItemDelegate.qml index 6de94570..079e0974 100644 --- a/mea/ui/magic/CalendarItemDelegate.qml +++ b/nymea-app/ui/magic/CalendarItemDelegate.qml @@ -1,7 +1,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 -import Mea 1.0 +import Nymea 1.0 import "../components" MeaListItemDelegate { diff --git a/mea/ui/magic/ComposeEventDescriptorPage.qml b/nymea-app/ui/magic/ComposeEventDescriptorPage.qml similarity index 97% rename from mea/ui/magic/ComposeEventDescriptorPage.qml rename to nymea-app/ui/magic/ComposeEventDescriptorPage.qml index 35baceea..866f46d2 100644 --- a/mea/ui/magic/ComposeEventDescriptorPage.qml +++ b/nymea-app/ui/magic/ComposeEventDescriptorPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.2 import QtQuick.Controls 2.1 import "../components" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/DeviceRulesPage.qml b/nymea-app/ui/magic/DeviceRulesPage.qml similarity index 99% rename from mea/ui/magic/DeviceRulesPage.qml rename to nymea-app/ui/magic/DeviceRulesPage.qml index fb691334..6f80a65c 100644 --- a/mea/ui/magic/DeviceRulesPage.qml +++ b/nymea-app/ui/magic/DeviceRulesPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "../components" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/EditCalendarItemPage.qml b/nymea-app/ui/magic/EditCalendarItemPage.qml similarity index 99% rename from mea/ui/magic/EditCalendarItemPage.qml rename to nymea-app/ui/magic/EditCalendarItemPage.qml index 0e4ea449..f93a0021 100644 --- a/mea/ui/magic/EditCalendarItemPage.qml +++ b/nymea-app/ui/magic/EditCalendarItemPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.2 import Qt.labs.calendar 1.0 import QtQuick.Layouts 1.3 import "../components" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/EditRulePage.qml b/nymea-app/ui/magic/EditRulePage.qml similarity index 99% rename from mea/ui/magic/EditRulePage.qml rename to nymea-app/ui/magic/EditRulePage.qml index e2083fa0..5c5e8981 100644 --- a/mea/ui/magic/EditRulePage.qml +++ b/nymea-app/ui/magic/EditRulePage.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Layouts 1.3 import QtQuick.Controls 2.1 import "../components" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/EditStateEvaluatorPage.qml b/nymea-app/ui/magic/EditStateEvaluatorPage.qml similarity index 95% rename from mea/ui/magic/EditStateEvaluatorPage.qml rename to nymea-app/ui/magic/EditStateEvaluatorPage.qml index e746e216..84b00059 100644 --- a/mea/ui/magic/EditStateEvaluatorPage.qml +++ b/nymea-app/ui/magic/EditStateEvaluatorPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 -import Mea 1.0 +import Nymea 1.0 import "../components" Page { diff --git a/mea/ui/magic/EditTimeEventItemPage.qml b/nymea-app/ui/magic/EditTimeEventItemPage.qml similarity index 99% rename from mea/ui/magic/EditTimeEventItemPage.qml rename to nymea-app/ui/magic/EditTimeEventItemPage.qml index 6f305546..93c1a77b 100644 --- a/mea/ui/magic/EditTimeEventItemPage.qml +++ b/nymea-app/ui/magic/EditTimeEventItemPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.2 import Qt.labs.calendar 1.0 import QtQuick.Layouts 1.3 import "../components" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/EventDescriptorDelegate.qml b/nymea-app/ui/magic/EventDescriptorDelegate.qml similarity index 99% rename from mea/ui/magic/EventDescriptorDelegate.qml rename to nymea-app/ui/magic/EventDescriptorDelegate.qml index ece75a97..140eae97 100644 --- a/mea/ui/magic/EventDescriptorDelegate.qml +++ b/nymea-app/ui/magic/EventDescriptorDelegate.qml @@ -1,7 +1,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 -import Mea 1.0 +import Nymea 1.0 import "../components" MeaListItemDelegate { diff --git a/mea/ui/magic/RuleActionDelegate.qml b/nymea-app/ui/magic/RuleActionDelegate.qml similarity index 98% rename from mea/ui/magic/RuleActionDelegate.qml rename to nymea-app/ui/magic/RuleActionDelegate.qml index 6e21c2c9..5658db80 100644 --- a/mea/ui/magic/RuleActionDelegate.qml +++ b/nymea-app/ui/magic/RuleActionDelegate.qml @@ -1,7 +1,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 -import Mea 1.0 +import Nymea 1.0 import "../components" MeaListItemDelegate { diff --git a/mea/ui/magic/SelectActionPage.qml b/nymea-app/ui/magic/SelectActionPage.qml similarity index 99% rename from mea/ui/magic/SelectActionPage.qml rename to nymea-app/ui/magic/SelectActionPage.qml index 8a082028..6475218d 100644 --- a/mea/ui/magic/SelectActionPage.qml +++ b/nymea-app/ui/magic/SelectActionPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../paramdelegates" diff --git a/mea/ui/magic/SelectEventDescriptorPage.qml b/nymea-app/ui/magic/SelectEventDescriptorPage.qml similarity index 99% rename from mea/ui/magic/SelectEventDescriptorPage.qml rename to nymea-app/ui/magic/SelectEventDescriptorPage.qml index 34cfaf0f..583b8915 100644 --- a/mea/ui/magic/SelectEventDescriptorPage.qml +++ b/nymea-app/ui/magic/SelectEventDescriptorPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 import "../components" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/SelectEventDescriptorParamsPage.qml b/nymea-app/ui/magic/SelectEventDescriptorParamsPage.qml similarity index 99% rename from mea/ui/magic/SelectEventDescriptorParamsPage.qml rename to nymea-app/ui/magic/SelectEventDescriptorParamsPage.qml index 271000e4..d33fbd81 100644 --- a/mea/ui/magic/SelectEventDescriptorParamsPage.qml +++ b/nymea-app/ui/magic/SelectEventDescriptorParamsPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "../components" import "../delegates" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/SelectRuleActionPage.qml b/nymea-app/ui/magic/SelectRuleActionPage.qml similarity index 99% rename from mea/ui/magic/SelectRuleActionPage.qml rename to nymea-app/ui/magic/SelectRuleActionPage.qml index 54009821..bc499c78 100644 --- a/mea/ui/magic/SelectRuleActionPage.qml +++ b/nymea-app/ui/magic/SelectRuleActionPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 import "../components" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/SelectRuleActionParamsPage.qml b/nymea-app/ui/magic/SelectRuleActionParamsPage.qml similarity index 99% rename from mea/ui/magic/SelectRuleActionParamsPage.qml rename to nymea-app/ui/magic/SelectRuleActionParamsPage.qml index b41b0844..e5556a47 100644 --- a/mea/ui/magic/SelectRuleActionParamsPage.qml +++ b/nymea-app/ui/magic/SelectRuleActionParamsPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "../components" import "../delegates" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/SelectStateDescriptorPage.qml b/nymea-app/ui/magic/SelectStateDescriptorPage.qml similarity index 99% rename from mea/ui/magic/SelectStateDescriptorPage.qml rename to nymea-app/ui/magic/SelectStateDescriptorPage.qml index 8a89c8b1..530db46b 100644 --- a/mea/ui/magic/SelectStateDescriptorPage.qml +++ b/nymea-app/ui/magic/SelectStateDescriptorPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 import "../components" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/SelectStateDescriptorParamsPage.qml b/nymea-app/ui/magic/SelectStateDescriptorParamsPage.qml similarity index 98% rename from mea/ui/magic/SelectStateDescriptorParamsPage.qml rename to nymea-app/ui/magic/SelectStateDescriptorParamsPage.qml index aef46289..fa2786dd 100644 --- a/mea/ui/magic/SelectStateDescriptorParamsPage.qml +++ b/nymea-app/ui/magic/SelectStateDescriptorParamsPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "../components" import "../delegates" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/SelectThingPage.qml b/nymea-app/ui/magic/SelectThingPage.qml similarity index 98% rename from mea/ui/magic/SelectThingPage.qml rename to nymea-app/ui/magic/SelectThingPage.qml index 5fd7ef48..29ead27b 100644 --- a/mea/ui/magic/SelectThingPage.qml +++ b/nymea-app/ui/magic/SelectThingPage.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts 1.2 import QtQuick.Controls 2.1 import "../components" import "../delegates" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/SimpleStateEvaluatorDelegate.qml b/nymea-app/ui/magic/SimpleStateEvaluatorDelegate.qml similarity index 99% rename from mea/ui/magic/SimpleStateEvaluatorDelegate.qml rename to nymea-app/ui/magic/SimpleStateEvaluatorDelegate.qml index 6c641f20..d06d6c55 100644 --- a/mea/ui/magic/SimpleStateEvaluatorDelegate.qml +++ b/nymea-app/ui/magic/SimpleStateEvaluatorDelegate.qml @@ -1,7 +1,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 -import Mea 1.0 +import Nymea 1.0 import "../components" SwipeDelegate { diff --git a/mea/ui/magic/StateEvaluatorDelegate.qml b/nymea-app/ui/magic/StateEvaluatorDelegate.qml similarity index 99% rename from mea/ui/magic/StateEvaluatorDelegate.qml rename to nymea-app/ui/magic/StateEvaluatorDelegate.qml index 08cca33d..1264bfd2 100644 --- a/mea/ui/magic/StateEvaluatorDelegate.qml +++ b/nymea-app/ui/magic/StateEvaluatorDelegate.qml @@ -1,7 +1,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 -import Mea 1.0 +import Nymea 1.0 import "../components" ItemDelegate { diff --git a/mea/ui/magic/TimeEventDelegate.qml b/nymea-app/ui/magic/TimeEventDelegate.qml similarity index 99% rename from mea/ui/magic/TimeEventDelegate.qml rename to nymea-app/ui/magic/TimeEventDelegate.qml index b7240c00..ea47bef8 100644 --- a/mea/ui/magic/TimeEventDelegate.qml +++ b/nymea-app/ui/magic/TimeEventDelegate.qml @@ -1,7 +1,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 -import Mea 1.0 +import Nymea 1.0 import "../components" MeaListItemDelegate{ diff --git a/mea/ui/system/AboutNymeaPage.qml b/nymea-app/ui/system/AboutNymeaPage.qml similarity index 98% rename from mea/ui/system/AboutNymeaPage.qml rename to nymea-app/ui/system/AboutNymeaPage.qml index d819cf3e..90f7171a 100644 --- a/mea/ui/system/AboutNymeaPage.qml +++ b/nymea-app/ui/system/AboutNymeaPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 -import Mea 1.0 +import Nymea 1.0 import "../components" Page { diff --git a/mea/ui/system/LogViewerPage.qml b/nymea-app/ui/system/LogViewerPage.qml similarity index 99% rename from mea/ui/system/LogViewerPage.qml rename to nymea-app/ui/system/LogViewerPage.qml index 15858f71..b0d577fb 100644 --- a/mea/ui/system/LogViewerPage.qml +++ b/nymea-app/ui/system/LogViewerPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Layouts 1.2 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 -import Mea 1.0 +import Nymea 1.0 import "../components" Page { diff --git a/mea/ui/system/PluginParamsPage.qml b/nymea-app/ui/system/PluginParamsPage.qml similarity index 98% rename from mea/ui/system/PluginParamsPage.qml rename to nymea-app/ui/system/PluginParamsPage.qml index 970f256c..b50a1f57 100644 --- a/mea/ui/system/PluginParamsPage.qml +++ b/nymea-app/ui/system/PluginParamsPage.qml @@ -4,7 +4,7 @@ import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.3 import "../components" import "../delegates" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/system/PluginsPage.qml b/nymea-app/ui/system/PluginsPage.qml similarity index 97% rename from mea/ui/system/PluginsPage.qml rename to nymea-app/ui/system/PluginsPage.qml index 3dcaf7e4..ffd73ada 100644 --- a/mea/ui/system/PluginsPage.qml +++ b/nymea-app/ui/system/PluginsPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.3 import "../components" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/packaging/android/AndroidManifest.xml b/packaging/android/AndroidManifest.xml index 169e4f32..d72575a6 100644 --- a/packaging/android/AndroidManifest.xml +++ b/packaging/android/AndroidManifest.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/packaging/ios/AppIcon.svg b/packaging/ios/AppIcon.svg index c4cbfba6..ede49d69 100644 --- a/packaging/ios/AppIcon.svg +++ b/packaging/ios/AppIcon.svg @@ -249,10 +249,10 @@ pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0" + inkscape:pageopacity="1" inkscape:pageshadow="2" inkscape:zoom="3.959798" - inkscape:cx="83.152338" + inkscape:cx="14.967042" inkscape:cy="132.37098" inkscape:document-units="px" inkscape:current-layer="layer1" diff --git a/packaging/ios/AppIcon1024x1024.png b/packaging/ios/AppIcon1024x1024.png new file mode 100644 index 0000000000000000000000000000000000000000..62973d4423da28b4fa05843259113f553be53633 GIT binary patch literal 69538 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 Sd}#mx00{s|MNUMnLSTXi$OZ)f diff --git a/packaging/ios/AppIcon20x20@2x.png b/packaging/ios/AppIcon20x20@2x.png index fba9593c156b7dcf2a08f8d88f708073015796e1..fce7979be8320adf819ff1857365199515f2a907 100644 GIT binary patch delta 1226 zcmV;*1U38Q3aAQ@ZhxgoL_t(oh3%NlZxm%1z<=*Mvpf6I{b);DpcV>P+w!3lCDI5g z0b|67Mi0i5%Aeqgf5593L9eV+v^uA3`X$w%cyIAKjVVnRy=% zOPd%326tGzuZ>BzbT22!r{J>o0g};w;yScNp#7#$vt3@6`nqf&w-qvmAT! z03+R7)=%*C<$tf4EZo9~fKJe#>7?4IQEn`w0ELjY9p2e_nBlI0e_wE>y1<#M7r9ZK z#@BJQQdmmJ$5MD<9pCsU)m+iR%w|sPd;Ol`4#i-pM{m241TWm4V9~9Rjwd;PYXTpI zMzEAYBPbD+VpX!kO7YS7yHp!B&Rze3n@iKwL!Wdk!GGAsr+9hmJ`#4keS)`^{@}A8 zzarw4KCwE~Ox3ISdI=grYE_F{tJx&8zI!@B@P%81haI zjpEYHYbb%xm?){Etsp?wN%3o8ilOc&Fd|$lEl?svM1g8169G%DJRzVVpU5y@En%w| zmeRPsj{wPdv>J>o*w@j?!L57v^2!Co2*!ZK6Mw|gDG-e)0Zh|Nt!#~80IwcW^Xgby zGupQa$F|6)vyt*X(szGk#~5#n93V7cj1amtyi%D!z=$G56QY}2e7BW*;^EZ|Hwy(C zzE9GQ(cjsNt*!P80=zc7pZA|VietqwMhM(GwYfzajc`>gL=)bvNi2oy251wb;Ws!u z^nWzjL^^W5NNwitD0?-&_~il@Z%pEcAqGV|bBOgdGE=kuYG+o#D`~ewG?OfiKvB#qfsK2HMDt`aw8$5)Yq- z=QBltXLfWlRTe(neW2yoZTTsXVW4A@{)$MzMrhlUe zL*^Gft`vS_syx?n?6wFFW_xfF89)%AQmWGsi|?l{w;a1|M<2&WURb?v_#pwB$>L1& zKc)rRCOE!%J6*YEEgB>EVzC?;Dh;=#xNSW=I(g_VY$u5oixG&%7mZfx;SWB5whHE) z1SgNaO{TjWUo0FuNk@dS{z0_;_(N@X?X+H~;_u07*qoM6N<$f^r5|od5s; delta 1286 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 YZ}Qu}#*H=?=Kufz07*qoM6N<$g1cZ0vH$=8 delta 2177 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 Dx%4=H diff --git a/packaging/ios/AppIcon29x29.png b/packaging/ios/AppIcon29x29.png index b4475cbae460e4429055a0089e2c57c786d5b009..eefd2276364ce2d02cf04d7ec505b0ce536773fc 100644 GIT binary patch delta 784 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 ba|8NsNYA59Ru~!J00000NkvXXu0mjfyYSpg delta 2053 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 JPDHLkV1jL`?|}dS diff --git a/packaging/ios/AppIcon40x40.png b/packaging/ios/AppIcon40x40.png index fba9593c156b7dcf2a08f8d88f708073015796e1..fce7979be8320adf819ff1857365199515f2a907 100644 GIT binary patch delta 1226 zcmV;*1U38Q3aAQ@ZhxgoL_t(oh3%NlZxm%1z<=*Mvpf6I{b);DpcV>P+w!3lCDI5g z0b|67Mi0i5%Aeqgf5593L9eV+v^uA3`X$w%cyIAKjVVnRy=% zOPd%326tGzuZ>BzbT22!r{J>o0g};w;yScNp#7#$vt3@6`nqf&w-qvmAT! z03+R7)=%*C<$tf4EZo9~fKJe#>7?4IQEn`w0ELjY9p2e_nBlI0e_wE>y1<#M7r9ZK z#@BJQQdmmJ$5MD<9pCsU)m+iR%w|sPd;Ol`4#i-pM{m241TWm4V9~9Rjwd;PYXTpI zMzEAYBPbD+VpX!kO7YS7yHp!B&Rze3n@iKwL!Wdk!GGAsr+9hmJ`#4keS)`^{@}A8 zzarw4KCwE~Ox3ISdI=grYE_F{tJx&8zI!@B@P%81haI zjpEYHYbb%xm?){Etsp?wN%3o8ilOc&Fd|$lEl?svM1g8169G%DJRzVVpU5y@En%w| zmeRPsj{wPdv>J>o*w@j?!L57v^2!Co2*!ZK6Mw|gDG-e)0Zh|Nt!#~80IwcW^Xgby zGupQa$F|6)vyt*X(szGk#~5#n93V7cj1amtyi%D!z=$G56QY}2e7BW*;^EZ|Hwy(C zzE9GQ(cjsNt*!P80=zc7pZA|VietqwMhM(GwYfzajc`>gL=)bvNi2oy251wb;Ws!u z^nWzjL^^W5NNwitD0?-&_~il@Z%pEcAqGV|bBOgdGE=kuYG+o#D`~ewG?OfiKvB#qfsK2HMDt`aw8$5)Yq- z=QBltXLfWlRTe(neW2yoZTTsXVW4A@{)$MzMrhlUe zL*^Gft`vS_syx?n?6wFFW_xfF89)%AQmWGsi|?l{w;a1|M<2&WURb?v_#pwB$>L1& zKc)rRCOE!%J6*YEEgB>EVzC?;Dh;=#xNSW=I(g_VY$u5oixG&%7mZfx;SWB5whHE) z1SgNaO{TjWUo0FuNk@dS{z0_;_(N@X?X+H~;_u07*qoM6N<$f^r5|od5s; delta 1286 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 diff --git a/packaging/ios/AppIcon40x40@3x.png b/packaging/ios/AppIcon40x40@3x.png index 3ea466437b09a23ba87cad880c7297a763b98251..0502426a2ccd7c76665a365e3a9febff62637148 100644 GIT binary patch delta 5212 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 OV5q&)Rw@HqMf@MX_ZO%D literal 9006 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 diff --git a/packaging/ios/AppIcon76x76@2x.png b/packaging/ios/AppIcon76x76@2x.png index 8c5ef05d59fd3c7351401b96e28e2ee973fc75e8..88641cde81df9b34eae5de0091b1603bce09e935 100644 GIT binary patch delta 7135 zcmb7}Wl+>%*Tz{wSQ;c0kVYDjlx~S7q&pNrx|XHkPbo@B$0FUZ^h$Rly(qb)(p^f! z%kzAFXWp6j{&>%sGjq;;o!@h&ZIr5_oSsj{ex|P*-Av%7Ox0!<=+U`c z95yIn1t*S~Q>}mxl1GtQ1D#dVt9iz*>Ab(u!FpflfM~sUVyn|PHEmg!;=!}a42!35)nWAs!Fbe(0rfgZ%Uq=$h{?wFVi2hV#w%yXej9CFxE;Xq z;qB7yjJz7>@j60NC#40m-Jl_$Ghj+z+Nynri-F$~mQ0dX)jWhdVragOwSlNS0iEg_ zUIt&5A^z_$9xLC9>IMCyI=mAeD;eoiJ_bvPx`nAD*f)GWZ=ABy5(HgS&?i8vUlUo> zlz8BS_AvZ0!#k8nwKsd=>){X*YOv-%5F{_h&F7sQu$U(ao@JlWM5C>tobAAGq8nOV zgCa@XG(MPgcKdH}ud^$$rJI{0fvLfn{XuAOOi@*0)o*gZ?~YWtD%<=M&1Lg5U*c+H zDMUXO!g_x*rzIv5X1W29Qo*vWcdG0gi88pcqWoe>Wa_xww7 z|CbsVpZm4WR@zWCfAYl2*WYwX_-=I&k&)fp-9IfI1kC&t`j}r&8FtAuOmP~p`G?`S zL&hh*bYYMD*OH;IZyEKaC_{U1A6zF-ACrk}4gL&w4nT=@>hX<2v+rp0p_~~2E!&6f zg%_%1{FB0if@u2ZIX*kC4pYOr!MA<6)Q#ef*xQvRU>}E{QVT6E>^K#Jmh@L3LxG>4 z%ibiTg-=`Ku$6*eoE>h&hqV252(1$E#jkelxF3(U(IIXu2#IRy@E#Ruf91&_$JPl| zw%FY21#qeb-w}inGL~RBHMpi(&NY%KT~JkIolscapSB&kO9?t3sHRdPWp_2dAMYKp zoQc5PJa3>`GXEYanZvr)JmGbWf@5HjhRSt_=|R3!irL=AMYnbEZLIhGi^p?MdtCH? zz>Lw6c-5u(*;TQUn4J%$hW{x=rN<@z8+Bdn`~-N#t#i-#77#zK?*`<=n^EA0-Cl=lxwB*RAfY67yrC=aL$_ue{Lv zPOQH8{QUha_Xml$Y2(wx1lWM&Z_>ey25TH#HwA=SgbcMkKx|% zk#UdHxTln)I!CiBi;~r=UzP0atsjs8q7X_3#Q%va_m7mKY}`~iQAwoDL<^ohE#4Pl&x`5!=G%D;6~ zmLd1qJ&pDGJK|r`?2=kjhKRy2>BK*CC4}QB8-WGl_Exj%BpSsd~ z)>!#q*FC?480WyK$$wJ-mlnv&-8Q=8W<`nq*}_0qmjqd7;n}NkhD)$DlCvd)?1CUN z*NDxikqO#oXG6suoFj_rPgle>+;~pZu*dO+H|FhBXMp2@WkbY(=rRnlpZR0l-I=e? z$1C#7o>2N963(Yzev&!nRy9S984dHcbx=P*0^cOwwe8rvAiM&|r1kMyW2~{l)}OhU zYwEcoNz|I-_3O zI-84-0iW9irdr!rgU{)G2sJYPUrXcGw1*Zia~{~ zd&_#XnylOEagthaV*EWWUZljKE!w+O#X2b!ngTma{SJ^0iZk!uphBwjzT1n-44f)k z{P{gncj8^a(L%aK!8D6*NoE&$b`+r80}a02`X$loey8BStkx_NVJ#`<85|gBN+$ni zLT~BnhQ&e}ps>F)a8TIT!uy4HmucfF76UpH{d>%CaHD^{)l|wY39Jd*63o?}m;EK; zp=++U69mScWK;l%R)wgk*FzDBkEt)mR#QW`dX&hgpG){Uotp1$(a2)J<+Bc--Fr)C zJyBwI2!^8<;#ugW! zK_))@=qWE;nqpTgyT19Kvc+vaJpL|8P$&EcWGW(RD526BW$S0+@9Sg5u29itd$)%N zxPA?K%_Z~U{z0MmBp46D%YSQ-8(w!bFQ*A^zeKt)L9B5ICD0v&L<(pwXp1OyX zR4iL^a`J)&j9As>rvbCAFjv~kg@5jaLe5X5?v9Cm-&p69Gv0VgW zR(}P=^(jS{E@TACCsAgQG)LebJg37m41RCSS1hc{&olR_Qkr~q$Gi7Mgd`Y9!@k?A z==i|=t@0&OU%Z~Ew2K3qMX%RlLsOAM=p(bI;*Hp``b7hB=AkL>8TKS^vn ztle2liK*g=9|?AAy#M8chfF~bfl)C30_aUG%m`i3_#=0YC<2XSQ{G_vOH)0NHJJ=YjZF1VF=4MEVm{ci)X-QB4Trp>a_7dy0%Mq;_(lfBP-m~DMsWF&ubDSoj|F=bJNbX z1xi$^LPM!DuY{jy%kT13=^LEX54Idb7&R)PGL5_RCd{bF3m$U9mlJLE{i4lhCu@n) zJnK`Kz&Q%xbU5F6u%tlb59A7i8Y6DCXM-|CQM@9E?Do|iB z;Y{AG6Y$uTYhw@yzBPHx#Pzj#NjuF@_s)KD=V|&3*946tv#_XRQsN|^S@YP14B3}C ze}fERX$j|Stxb;rpG$HQ5*Lp?OH5UctqRN11_#|DJN^+XG>yfpE2?Fgf6%MMMZ$B! z>N=>DsrXDy1p>%k#_ZoL5)%vh^1vRkmm))+(qVd-qym1)!L$taq0AXRqgYR;a>Fl~ zu&{&(YD4w*!HMJ{ZWLbf)CQrHE)6YB$*Aq^Nf7r8W|6Sao{KJg)omwV{i%o}f3M(3a$6yF#)dZjxge*dOS>u?#|><&O4GJUZ;)PhBI7eB(<+&z@<^bSCcO zYMar{&<=EA+$IR?;%r{*ZXCBtuitcCPMQ=PuJZb^P(*%j_sdGEQ*~-+$*Vs#=#X;1 zCLLqM^C^IdV4JMJsQ6j`fJb4Whvkz6C2#15(em4Si7Rl+^|atG)LU;%jC2&KN-+4)JERwG zjTlL88gAJ)Z1N|KWPBQvyPLC1u93Pm#sG#+Uld-eVHDLqW$wZ_b{i}y<(HPAB76+? zbp=jVBS86!nxI z8&Ju1iJd{$T$r@1ym2T&@)lIl~S4eQ2{{W|sW$dlaY*pHAd`J-Xsu z8%J3Ar}Z$JI2;(ZnuaKRY<&V&!F(tFQbf%anvh~NazV#Q8YvGbA2J6Z|DqxREW(wQ zqD9H3zm+>~#_nk>7cWBWGITd>wSOXo7c<(-AHmTl$>yeSFE@5|@#nvhpEm!1tM}_$ z{1jf2_D;ZkR6pyY%T?VpEMa`@U=kk;3UI#$(Lb9v#o=pU!(x#}nwR)$4%>1T>1?GR zcqArut%VbEF(Il0^oPWTO>#a0-Cb&p?|-Dn6c(Eu&)`yP3eGNRcq7FQHNe$1h;d{k zYBCasaAla~{B%kRSNjduYOO`Zh%a0zQ74ZwisCuDHbGx)8saJ``;w`pY3_-9V}(JJ zu!OYN4^4S9t>Rbi&PlkU`?8FmKQcS*?6A;B^89WvW~lfqIUC?-sQ`?J@QlHb3n@GBbX(zfwBdxcK#nvlV7K5m_iumZC^5;XC~Z#@k%2?kmv^Pnm0eBH#90W#>_K(X-2GI1U`9t! z%GV-d`laTGyJ?qqZx2m*iw%gZtfEctR<^T?>_ z>NXFTAG(sr&ORdGGRU)aVAS$;>3zoX!Y!%uadH#>zcS2`$z(zRv^ z1VPT<*+_Q&)AHo%N31ri!YLhAH(OpyP4hYYi}!a@JdOrJI3i%qDH>T^G)NWgK5!eR z5D<7zJv)J_OS1%eY8|IAZSCK=e4>{2{njuZ`03zt14qPgR`Evy0ZjZa|ERia-1cXO zK~ME+Ecgc1Hpep5bIZhmvq4?SR+tY8eSlNp*U6Jf-_d;RrWXuW7oQZLoLMCiVhayxVoJy>5!kFp`FtA3|N+?|V6T-5PlJ zD!s_ih!;9Tc>$3HW2<;IJpM|<*^6$1Zg)tX#pvJjS57T9`+je)OO$E7SAB$jwDs9L z5s%G`5A_7-_3HVEtuduyPQxzYD3y7>QFLQ87igY}py#u*>f{-vip-$NUU|o*&`!!k z<{&r2(e=h!Ht=eP6{!mq;itq}CLa(}7-K33_LSKRs&nWgpL%+i*HJ* z!Ip!*iq5lBQQ{`T6H`f)y}A`;1pCo26KdmSxF`?9TP$x*TNk+F}pBOjW5mTz)zo8r)dtB|8XQ=G8sTv zIQUR=hRfph`RG$n48*>nI7uH<*UXQjrikpR)dFac1l5@nrT0IX0B`r~YtLMLSMkuD5LdNJO0Yf=>Ra!mLaOtau0v9@(uhAW{pn3ue2{1=>v$=bHYNv1kPi!g4)f9} zM1@D)eighs#f78gJcmruFf$Nt#nBx>_fW7#j%ed)BJCBT&2Js?a6-NCdm{TNfC%AX zd-3MV#*_ER((myq$(YZ)Ln*N%pFgp4q$8L<3dT|7T;+`8FadE!mBc^&B+B-5=b+pz zb!aD5bxr@lg=?04awkX+$j zmeusGj=b==4MG$1sUJ23mGt>IaDWe|qrR<%USRnsn9V^l%#zE2=ZEupgviP2X*56J@1oZ4mf6` zp3vKQPeEHv)p$6MvY@H@MS{GD`Ns9l07FxTI`jC_;55>p)Jz7^ULi(<#!R&qt>thNUYYny7?KVU&%dep*k` zt0K-gT%r_C&QYOcD_5inv^P5fi|F4 z_g+XGjLj4!T(L%9xDt{Dk`L)myVtM$giFXsV=+54($_k);M4^oS^H6I6Bxc>M3IYU z4RbX1h>_Dci806BL1T~%;}RPE{AGMy;Mu4SMhY57DlM9sjtm0MrOX3IpPtKyFzQ~? zVTaap-)qDTYGdmQsdu=AxssO$1+RfxS9pSf|VQ( z#gja#E^ayTojF}}D5MgyErR|#ip5E%$*|pQwlFbC=+*DaUb?nxD{FoCkWn#=Nj}$S zJ2VXg3)8IdQJoCTro6@TO4vJ~cUjOJ%8gtxY6d zvtKPA%p3rpfVh7?ruAk@BIS$R7;a8ahYyK$dJMcfG!r){p7*nqwzAO)@2(U!-M^g| zGu-xre;aP`iyzCmpI;El-`<5)G#IX987PhKHR6^oEb!)EW;iSr*-F1h@NC_0&BOil zrcO^lh&(&S!TN)5rV{cqY<-~zwPp_q^vYgBfp^kY!e=cKhqy0eDG}tU>mFq-)T*3Y z9pa)&&2bf`fo)t2)ijY2%zF&2e~KzmLW^1bx*oCJp5OS>>8l{-Z9ELszGo5=#H5iz z64A-!OZh^vbI{&`7Ha#Zp_-9j3BS;g6VNwhdAuO+b2+tL1=-!i<0#86K;M-#$WWY|;5o`?&0|CH)~LamU$VHJ0HLrZ}gA5x?PMbBAz( z^?Wt5t{{3OZPid9;eUPEcAX`gMuH@dlz$cPR`5K-@po$Z{CrWpO~tv#ATF>+_4n5V zF+JM4T#U@cMIJxGKk0ypnGfz(p?fLPwtgVb^*NB=5 ztEq`U9#_oy`GOCx#rxZB1+Am?)kS^7B(F!eEYCz6YrK<(8myvnK8TWpg)?NxgfJ5} zlmx$&=8UGB8yo94Xm+(~Gu! zf3l>klUx>`>Z+GntyYo{>@+g(hz--Q&tX#{P)Nm~1_i)CK$UsKEI|LJP|Z}Y3{o~LD#+@;&)(1R%O?AYx&X#Lm$wgx2d}{x zz_5J8Tn2XBR$)BB8$6}nfJ-L6>gz&SOh~m7b~qEQ%?u)zCBKsh-4X~pdg2?<*29th z-KYNGTN2e_j~8huG*R4RXGh&22XkB0(o)glmx;12{T3l=C8cSUBW4hwb>@}}oMdCN z#h$Q{5roSX=={I0iO8P2)pFT1?$Gr)Xd1VSL&m^g?T*>j1MxKO$o08=HOhRdrdDsD zLCm6!Cg=^}-MS>k@;wIbbNi%0T-Z;DUiwguIuaQf(r=u<0d0m zq{+wz+PKpErMA|5Q{OX320vCsgW+#1`C?`u#QE!aN5(tqpkm>tScp-;6$``{rE1>f z;yi_36so@bR!3o~n~cCGl8~xDy4^I(LjQZ$9kPo5R~W<;6k9`;h|-WzdV6rGP~y^2jzPrcp$8~mNzKug{vNfc)v;9P7B zT+PX%p&2xMuc!-V<_!WOK6t}OPERiyg>rl@d{3IXN~uAIb_oN2G;FolpV(-+STufd zy58rhq@Thl8j&$0z$s@dk~rl|M<0ip1TF412&?^`OkTkrxv3s+$~wTXK(MP2%MtN( zA>q3}EqzKwV=-tpwN7j$U7sPF&xJ&nS>jo<%QqW@ZVOI{x8wl0ZRl|!?ENi252vc5 z!s>rwD6==Klm9}cszSPy^Z#2rbanPm2>zUHfG7THU{8IV5lL;)TF;!E&D(0nC~r=z ztx%cqyA>k3GaOa_!bmYzyMx|2$|OLa_A%Jud;WD#8paKJ^7Fam(N*ykR#~-6hBWT4 zp+{=G?!K*)>@~IkDxMiyuBft<)b*)nawM+9qORm9wY_4plSPNZ#n)pa62!tUGM3~c zR44aJO})T%MSFo9#2YfQ8nnIp`?FSiPb;|>7wRIT!MAMW_|A`~#oFNTrwUYn5XlBH z>f@}<>LOwxR*f?0e*QErai-~@?N`e@&K?})Tjp1wH!2OlFS~4sWE=%X$G=!D)qdd% zyykEY1aIXpX9cR}zk!8rJYEkmGJn&O0z(xhHz*?oq;J~obpNanZY4NuJw`NajqbKa zqImdm7_befp9k#JZS|cm3RfA>hS)F}gKbzdOc}V(qX>hhx^xZ6hF`^0IlHYk+TA)I zVY`{lza0S(ya%tg-uozQNuu$gf<#cWM!WssMN3m3C%2#P@}X=G6r;krHs@4%&I4={6$AGhhh>X52>s`nhbZq2x&!a)B%%h#D`ivrPg#)4?LoeJPFfII_m z7I)H~%;q9gMU~Yq9mY2OQ%R_0#=VYAx*>U-^9|?7mGVOw2AwvQ^hL|SR@13PdfXJa zVCHQI!hWtRhzzF{-rb+}pKs$M-o+Oxfyn(+J>u}Lt}ZOOZbb#TLrz2F^2NSro?Ye* zpcRR_8~kJP(af)`?+4EV?^PVLe+X4S*VMx5foW0}B~bMBubKa7Y-V&SbCBfqII3vVzuicd!QVUQavp>A zb-*FtF1mIPaiBc&lmC2GF0nJTJx)XcDa!8xh2dQxR<>w{R@jiGvb(9;bwc9%EP*4F zINls=yJei}@t9~0ei2l|LCd|faNh^LRpXN@KBujz@Q5iY3264UJgn;tSgHZrwF6Tz zd+VT$rpJE3+W16X5Z|mJM3(4-R26Ic$w`D+d`~8QoM*8(l5c{RC~WC`avCTCP4Gnz zYuW^rFh5OXfV_)ifO?G{4rgwnr;_S~mw=-#j&FuP`m9+_3^YzP!J~Ve^p_nd3+x*= z2;JR;FX770AO<^J2A>Fod}I18CAb!~+@bO-^V)u?<_QSddOS`&+(6t(N&WVQmrK7j z8v7S1#pMr9{L7hvjxh!n5g-?Mk<@%WklJ?E{*lsh&ZOOG9zI<*nhBuc1YoK(HZ-Hy zv4t~)K~}cCC%z|F7apFPwlg#r7XBNQ1b?Pm17kB0C&tN&Iuz@Q{8aX zczm)1&aRN(MF#5BaD#iypd2vY+H}=+Lm&76=Q;1DpB&?EUyBxcDQ(bsMOU1vC3Q&l zy4u{`ny5_p&lrZ5?a--mIPEo4C2%)GN$)?9br@fziE)~|!-9`)X?*Gx&(FI*-a5jZ z6$CrBqc=u2%`$=Z>75ZGP;fm$-O|^QMTQ5f7j^{-T}8<41)~T7LRkC8XMlP^H|uq3 z*VkAT$H3j6ZFHpNuQ%{2# z{X*GR^BO{J@HD7_Lp6%`IP52FlJAuJVy=xcDK*yThBn!$o~Glc7oCS8S_^(t5!yn^ zKZ&H}A+kXXQHi`Md9A=-9(w=DMz>6+_O)C>G*Iqmbm#|WKuRP(}Tx zsb3Or6j^S0JsF*shbDx&hlN*mHVl8`+Q%}JzPuH$GW^r`Z7i#!=(H>?z4HGt0;G9+T2c72Cj)l|n_A7465 zYnw0aNLE3D$ud$K=4YA2vV0ettM!dbQ#1sARAF2DxuUVGYsW;k} zzW9a%FH|K;RY5=fHaVO0gJi6=3BT(iFo{p>AQg7ZPq8R0urWf|m$(1VJlDSVFYR3b zg|jvdJkYxAqH!2|G9)-k_Egj z1>zNdr54GT*hVp)!W)792$2Cis;KH`-T92&`|9j0snvx`y>0ytHkSLKik1g}w1X8M zcT~4QGJ=38Na@_veg*V)VZ-gwUt!jHFZSXv-jv7fsT}-P_1mQwOen{aUM)Z7>Mo#( zGbhHS!PeeLXZY{O@~G`TqGzIfRvOGS|237#P_6iu9+M8UOm-(@=$|fi(KSD6bN~^?n_5-Zorq#p4C*bFkFy!e>mpXO>bN-X!wh z-%h$Yl8g^sj{4L}NA@qHmQ$4D#A{E)O)W#Xck*DrF3~44EDKaFuW$ zv0PQfYa%aT9_KtNf$O!V5)3FQ(C3JKxCt9|d+j^HVG*Rqxx6I6cG(q51Nv}OdKZM#-xhUT;?GIaHas!Ql~Bk*>5GiMbscZ2RLTb<1T?J>FYPll?m>GS>2DtWYwE@ z7u*8b{xM_s?v(-o(lnlP>-AN%CEZHO)zWyTyqS?j z-F5^nkBLCMOD>-3iL5&oTuM<4U+AT12SE_eO7HL5_kq$xY$N~&2cFIEZ7nMK*`7p~ z4A|}|BPK-^V;mKRT5X8^M4Rnnt$i^yWirv3K!4VUOp+la0+BQxdEj{S%Lly`f*;^) zOA|Ldac$n2|2aaKXVRwk`i9x@eRpyHjbJ(#9dq#13us5U=E>Nw3ni%uIubt*@=^4k ziEdX`$8~L;jtcNGADi{-EXmzY^afzi$zI*Ai;)Bkg~BaOg^{& zrg1Ex)TssHsiQ`QH$-kBk;6_!=U(l@G!a~bE?~D6VJ;bVP`~S*t|eXFAC=_7y;VXu zZ>`L|!M|MXTw04@ZIye)t>F=lw;16fNz}L}Aq{Y7OVByASHL)s^lW4g|7f%m?c=WG zAdVIVF^ilp#=iqt_vV^#QzGO33U&yo!%5;(Z!Ch88?k@#EX-r{@77Nnb*BDC5NPy0JfQ9*kv+Jg@0ko<4l2 z)tTGu6ch^R>zkwLx8B`($a%(_9C;hN0{b~a9`pMWNtaw!E6vLp$5;>|tZOyF6#B!} zrrE4jq>$zHw)D}@qm=p)`)4z<&o3(!$mR^5U6*u%5X+mw0KI}V2U+@R@}qbF=_&{R zv8MpuTI)`1JQYkSd1WV4&`-c=mE^zDiXIn`hZFYniaMW96twM~bu%do#bBK#qse^SNAK1aX48*|+|Q!#vs-{6F>$*JzUN$VVbd zMkMkooUMs`zOh;pS&%-j{yErW@3$DA4ekU7-MU5|eP7XjyYk{?4o=EZ%ZUF0HDlj> z?Ztup>Ui~I98jFm(o)Z_`C$=2uc0~2${cj9!0L*BG7c?X-0&T-94o!~I?F}g2Lf5l zmVd+_BF}L>`h9!UD6F~IQ+i>g++FO1x6|@CI&a2wp?T_u)*zaU%=Su=se@zq`mFpj z_}B@QLf{X7-@CbdQH(V%XRQ!H6asPfy2TTv8R57TgTf=y@yS5fk>2*d+Ei& zMXy>E$A*H*XR>v_r(GJQ5)}Q1Mqa|P6DE}!!eKSc-HjzSy)HlQ-7j3Tj*h--M}`q? zgu?r@zOH+)YD!gfL=yrc@thgy6~OJs>YCI9ej8ZgNq4sEq2G5AmL<9}-Iw8x%M1?Z zLNT$bUD6RIh_>U#k0$N3fLLdcO*jASE0R-o<2$AFf->Qix4Y<-7S^=&uVhpp^V{J; zQxx8EZ!#qq@3PE<@??a-ufS9!th~T$TwuZ`>GBxE)mdlr;|?Hx(afH5UfI{Mj#3=D z>Mdlk*!)VKF(jzHBs?1S4;pk>1E)(Rhx~eKXPY7k3uV!a3SUjf{JZ$KKd-m?8{6xh!)HOhU&$eUh4*Kx=pT9*_K4C4!}e;5NEDzH@RJVkYt@C1PBCZRZ^j zFO3DsjF4sg1C0?$fd4m?qWmo79%nOaQg>W1fEZ<@Fg zm1h@1!5Ic>q2%y5QCVyRq&600q&=r-{<|QTV3(tL1qaZQ%->b#3kiLB%cqPrS!w@< zi5x58nMz4w`x(=g;~Ftu_+&yM4!H{MwA^G;&9)}|mZPr?V;=GFlIY{&%izfrj@IeU zzUGSpHVYDi--;;wG`V~~OoipRxC+J#{v&(9pX;0OwRYpi1Da$abe`5$NB$rpu@O89 z%6U$simif=tdl|^RZ901m=wr}ouF=r8FG`|mF{uRCrRuMQ2FY95cpVOt2C?h%usaK z@H#2+O z5o)gM_#jbM?);2?yq)4pfJ1MdfcMv97G_74X>^u|sYaFvnqBf!-<%ecm@FRx-x3)>u>-iXi zMlf4&Fae-Hts!qJ)D=M`boqPRK`8;RO);!-G#gNd4NTVRPA03cOy<(rprcbYYV^)6 z?9i_sWW3NhGl69RYm}CY^ETqP{w0e7l>OC+3LYf-)5!FiR+|v1Q^$Q8)Px;%W!s%b zh;^G`;#P#+H>J@b?M7l5bsAqOCl!`0=e_lWPfP*EwX z>>>5ok~S`V{rG=ll=bgRA#Po_c&x1%Nh1dT@0Hm8>3|K;<)=CxcnBdC2+cu}c*}l* zQET6Nd>`z@3VL{BLcWU3GyDWrY88C6Xb}Pm`@_z6(C}`J3`*O7Wy|y@LtqrGh=ihC zRpBJU$WvcCaDNcx+@E^NCN&cK9djZi$$k}nnJ^w}2tEEszL$OBnv?FxSb=@F$wrS6 zMpCf_Ffzx|+GtK>fPDI|XU(@SlFd8Tb%{E*V!XCku# znJ?N+C>AlLhM`Q-=M_PNc1z08B~iKT71T-VOur0ByMOOJ>j-@>L$B*OOJ>W6!9V`=x}pw?F8Ts5uaG~abE++K%@&_Mm z@5H=*nX0xqcb~f#Yx1=T7PWQ2CpB9)hpo9GDT#5e<~Pv#BWJn*6Ouv;~g$UVM*waMA=dCfPL!mk^De^YFkX+Z1=ZwyyMjc?}mM;r=-)0R(a_& zTI-6+=}U2@tEY$q<*q3AKH*eDFjLjvZe(ddrIO)>=B>&o)uB=7#*Jn1x0nivs{b~L zNgiCHdS6WzkGC%Iw-cNH4&Q^ZiRzMz+%mDGH4~64B z+4(UM9F8jU1ay$p&K4Q7x;HF@j9v}?nFW-zr{_epKhFZ3Lc>XnDd$9d4xYpHyv`;9 z4P^+aO)56UE&|IsIBdW_DAf=azmKZN78#0uj$yH}lfoX2jKkqCVu(IqA*2>g(tpsa zA(jzcS>HOo7i^aSz46or1%*dEc~jb+pXQo>z#ps(6dzS*dYZ?-Ecsu@3c||^eQS9J z1rq4WtO{4}I~{!<;9;S;Tf2JtxzU?gU}RP&!nuNA!^*dUhJPZ+l!izLybJAU*;~MT zYPm!1J^e};tmE~CRbUO8IlJTV4AOD1rifn|>5?seND1f*|F#C<{hSFJU@bQ1Au%bF zMwjfaqFp`@C6LVV{hb!Zj0yk2k#;7cGpD*Av;t++dYx68D94r1y0Hb*GTvi4R^NWM zByTI5ix=(RYK8hoy|br!;S}wy~znJQ|#>$(OwU hzug|~|21yo-T)@>@!d~4&cvXHqpGN-fR;mq{2!b{E)oC$ diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in index 5e3c40cb..f021cceb 100644 --- a/packaging/ios/Info.plist.in +++ b/packaging/ios/Info.plist.in @@ -3,9 +3,9 @@ CFBundleDisplayName - mea + nymea:app CFBundleExecutable - mea + nymea-app CFBundleGetInfoString Created by Qt/QMake CFBundleIcons @@ -32,13 +32,13 @@ CFBundleIdentifier - io.guh.mea + io.guh.nymeaapp CFBundleName - mea + nymea-app CFBundlePackageType APPL CFBundleShortVersionString - $$MEA_VERSION + $$APP_VERSION CFBundleSignature ${QMAKE_PKGINFO_TYPEINFO} CFBundleVersion diff --git a/packaging/ios/exportappicons.sh b/packaging/ios/exportappicons.sh index 72c64146..28849524 100755 --- a/packaging/ios/exportappicons.sh +++ b/packaging/ios/exportappicons.sh @@ -27,7 +27,6 @@ SIZES=( "60:3" "76:1" "76:2" - "83.5:2" "1024:1" ) diff --git a/packaging/osx/Info.plist.in b/packaging/osx/Info.plist.in index b3f2e52a..ea104fc5 100644 --- a/packaging/osx/Info.plist.in +++ b/packaging/osx/Info.plist.in @@ -2,14 +2,18 @@ + CFBundleName + nymea:app + CFBundleDisplayName + nymea:app CFBundleExecutable - mea + nymea-app CFBundleGetInfoString Created by Qt/QMake CFBundleIconFile icon.icns CFBundleIdentifier - io.guh.mea + io.guh.nymea-app CFBundlePackageType APPL CFBundleSignature diff --git a/packaging/osx/patchinstaller.sctp b/packaging/osx/patchinstaller.sctp index 4e85d1ec..ba4f6a66 100644 --- a/packaging/osx/patchinstaller.sctp +++ b/packaging/osx/patchinstaller.sctp @@ -1,5 +1,5 @@ tell app "Finder" - tell disk "mea" + tell disk "nymea-app" open set current view of container window to icon view set toolbar visible of container window to false @@ -9,7 +9,7 @@ tell app "Finder" set arrangement of viewOptions to not arranged set icon size of viewOptions to 128 set background picture of viewOptions to file ".background:installer.tiff" - set position of item "mea.app" of container window to {135, 224} + set position of every item of container window whose name ends with "app" to {135, 224} set position of item "Applications" of container window to {412, 224} close open diff --git a/packaging/windows/config/config.xml b/packaging/windows/config/config.xml index 73f3d0db..7f342879 100644 --- a/packaging/windows/config/config.xml +++ b/packaging/windows/config/config.xml @@ -1,9 +1,9 @@ - Mea + nymea:app 1.0.0 - Mea Windows Installer + nymea:app Windows Installer guh GmbH - Mea - @ApplicationsDir@/Mea + nymea + @ApplicationsDir@/nymea-app diff --git a/packaging/windows/packages/io.guh.mea/meta/installscript.qs b/packaging/windows/packages/io.guh.nymeaapp/meta/installscript.qs similarity index 76% rename from packaging/windows/packages/io.guh.mea/meta/installscript.qs rename to packaging/windows/packages/io.guh.nymeaapp/meta/installscript.qs index 1c31699d..cbbe14cd 100644 --- a/packaging/windows/packages/io.guh.mea/meta/installscript.qs +++ b/packaging/windows/packages/io.guh.nymeaapp/meta/installscript.qs @@ -15,8 +15,8 @@ Component.prototype.createOperations = function() component.createOperations(); if (systemInfo.productType === "windows") { - component.addOperation("CreateShortcut", "@TargetDir@/mea.exe", "@StartMenuDir@/Mea.lnk", + component.addOperation("CreateShortcut", "@TargetDir@/nymea-app.exe", "@StartMenuDir@/nymea app.lnk", "workingDirectory=@TargetDir@", "iconPath=@TargetDir@/logo.ico", - "description=mea - The nymea frontend"); + "description=nymea:app - The nymea frontend"); } } diff --git a/packaging/windows/packages/io.guh.mea/meta/license-gpl.txt b/packaging/windows/packages/io.guh.nymeaapp/meta/license-gpl.txt similarity index 100% rename from packaging/windows/packages/io.guh.mea/meta/license-gpl.txt rename to packaging/windows/packages/io.guh.nymeaapp/meta/license-gpl.txt diff --git a/packaging/windows/packages/io.guh.mea/meta/logo.ico b/packaging/windows/packages/io.guh.nymeaapp/meta/logo.ico similarity index 100% rename from packaging/windows/packages/io.guh.mea/meta/logo.ico rename to packaging/windows/packages/io.guh.nymeaapp/meta/logo.ico diff --git a/packaging/windows/packages/io.guh.mea/meta/package.xml b/packaging/windows/packages/io.guh.nymeaapp/meta/package.xml similarity index 74% rename from packaging/windows/packages/io.guh.mea/meta/package.xml rename to packaging/windows/packages/io.guh.nymeaapp/meta/package.xml index 0599e920..a24d9d8d 100644 --- a/packaging/windows/packages/io.guh.mea/meta/package.xml +++ b/packaging/windows/packages/io.guh.nymeaapp/meta/package.xml @@ -1,7 +1,7 @@ - Mea application - Install the mea application. + nymea:app + Install the nymea:app. 0.1.0-1 2018-05-16 diff --git a/tests/testrunner/testrunner.pro b/tests/testrunner/testrunner.pro index 0d07b927..0a1fbf28 100644 --- a/tests/testrunner/testrunner.pro +++ b/tests/testrunner/testrunner.pro @@ -1,14 +1,14 @@ TEMPLATE = app TARGET = meatestrunner -include(../../mea.pri) +include(../../nymea-app.pri) QT += core gui testlib bluetooth websockets CONFIG += qmltestcase -INCLUDEPATH += ../../mea/ \ +INCLUDEPATH += ../../nymea-app/ \ ../../libnymea-common/ \ - ../../libmea-core/ + ../../libnymea-app-core/ LIBS += -L$$top_builddir/libmea-core/ -lmea-core \ -L$$top_builddir/libnymea-common/ -lnymea-common @@ -20,4 +20,4 @@ win32:Release:LIBS += -L$$top_builddir/libmea-core/release \ SOURCES += testrunner.cpp RESOURCES += \ - $$top_srcdir/mea/resources.qrc + $$top_srcdir/nymea-app/resources.qrc