From 40e7b692bdcf97600f1fe68de8d0898eca228391 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Tue, 23 Oct 2018 00:51:42 +0200 Subject: [PATCH] split resource files --- nymea-app/images.qrc | 152 +++++++++++++++++++ nymea-app/nymea-app.pro | 3 +- nymea-app/resources.qrc | 255 +++++++------------------------- nymea-app/ui/RootItem.qml | 2 +- nymea-app/ui/images/filters.svg | 174 ++++++++++++++++++++++ nymea-app/ui/images/tab-new.svg | 177 ++++++++++++++++++++++ 6 files changed, 560 insertions(+), 203 deletions(-) create mode 100644 nymea-app/images.qrc create mode 100644 nymea-app/ui/images/filters.svg create mode 100644 nymea-app/ui/images/tab-new.svg diff --git a/nymea-app/images.qrc b/nymea-app/images.qrc new file mode 100644 index 00000000..0c1fbb22 --- /dev/null +++ b/nymea-app/images.qrc @@ -0,0 +1,152 @@ + + + ui/images/awning/awning-000.svg + ui/images/awning/awning-010.svg + ui/images/awning/awning-020.svg + ui/images/awning/awning-030.svg + ui/images/awning/awning-040.svg + ui/images/awning/awning-050.svg + ui/images/awning/awning-060.svg + ui/images/awning/awning-070.svg + ui/images/awning/awning-080.svg + ui/images/awning/awning-090.svg + ui/images/awning/awning-100.svg + ui/images/battery/battery-000.svg + ui/images/battery/battery-010.svg + ui/images/battery/battery-020.svg + ui/images/battery/battery-030.svg + ui/images/battery/battery-040.svg + ui/images/battery/battery-050.svg + ui/images/battery/battery-060.svg + ui/images/battery/battery-070.svg + ui/images/battery/battery-080.svg + ui/images/battery/battery-090.svg + ui/images/battery/battery-100.svg + ui/images/fingerprint/fingerprint_boxes.json + ui/images/fingerprint/fingerprint_segmented.png + ui/images/sensors/conductivity.svg + ui/images/sensors/humidity.svg + ui/images/sensors/light.svg + ui/images/sensors/moisture.svg + ui/images/sensors/pressure.svg + ui/images/sensors/temperature.svg + ui/images/shutter/shutter-000.svg + ui/images/shutter/shutter-010.svg + ui/images/shutter/shutter-020.svg + ui/images/shutter/shutter-030.svg + ui/images/shutter/shutter-040.svg + ui/images/shutter/shutter-050.svg + ui/images/shutter/shutter-060.svg + ui/images/shutter/shutter-070.svg + ui/images/shutter/shutter-080.svg + ui/images/shutter/shutter-090.svg + ui/images/shutter/shutter-100.svg + ui/images/weathericons/humidity.svg + ui/images/weathericons/weather-clear-day.svg + ui/images/weathericons/weather-clear-night.svg + ui/images/weathericons/weather-clouds.svg + ui/images/weathericons/weather-few-clouds-day.svg + ui/images/weathericons/weather-few-clouds-night.svg + ui/images/weathericons/weather-fog.svg + ui/images/weathericons/weather-light-rain.svg + ui/images/weathericons/weather-overcast.svg + ui/images/weathericons/weather-shower-rain.svg + ui/images/weathericons/weather-snow.svg + ui/images/weathericons/weather-thunderstorm.svg + ui/images/weathericons/wind.svg + ui/images/account.svg + ui/images/action-interface.svg + ui/images/action.svg + ui/images/add.svg + ui/images/alarm-clock.svg + ui/images/attention.svg + ui/images/audio-speakers-muted-symbolic.svg + ui/images/audio-speakers-symbolic.svg + ui/images/back.svg + ui/images/bluetooth.svg + ui/images/Built_with_Qt_RGB_logo_vertical.svg + ui/images/Built_with_Qt_RGB_logo.svg + ui/images/clock-app-symbolic.svg + ui/images/close.svg + ui/images/cloud-error.svg + ui/images/cloud-offline.svg + ui/images/cloud.svg + ui/images/configure.svg + ui/images/contact-new.svg + ui/images/delete.svg + ui/images/DeviceIconBlind.svg + ui/images/DeviceIconRollerShutter.svg + ui/images/dialog-error-symbolic.svg + ui/images/dialog-warning-symbolic.svg + ui/images/down.svg + ui/images/edit.svg + ui/images/erase.svg + ui/images/event-interface.svg + ui/images/event.svg + ui/images/eye.svg + ui/images/filters.svg + ui/images/find.svg + ui/images/fingerprint.svg + ui/images/go-down.svg + ui/images/guh-logo.svg + ui/images/info.svg + ui/images/light-off.svg + ui/images/light-on.svg + ui/images/lock-broken.svg + ui/images/logs.svg + ui/images/magic.svg + ui/images/media-playback-pause.svg + ui/images/media-playback-start.svg + ui/images/media-playback-stop.svg + ui/images/media-preview-start.svg + ui/images/media-seek-backward.svg + ui/images/media-seek-forward.svg + ui/images/media-skip-backward.svg + ui/images/media-skip-forward.svg + ui/images/mediaplayer-app-symbolic.svg + ui/images/navigation-menu.svg + ui/images/network-secure.svg + ui/images/network-vpn.svg + ui/images/network-wifi-symbolic.svg + ui/images/network-wired-symbolic.svg + ui/images/next.svg + ui/images/nm-signal-00-secure.svg + ui/images/nm-signal-00.svg + ui/images/nm-signal-25-secure.svg + ui/images/nm-signal-25.svg + ui/images/nm-signal-50-secure.svg + ui/images/nm-signal-50.svg + ui/images/nm-signal-75-secure.svg + ui/images/nm-signal-75.svg + ui/images/nm-signal-100-secure.svg + ui/images/nm-signal-100.svg + ui/images/non-starred.svg + ui/images/notification.svg + ui/images/nymea-box-setup.svg + ui/images/plugin.svg + ui/images/private-browsing.svg + ui/images/question.svg + ui/images/refresh.svg + ui/images/remove.svg + ui/images/rpi-setup.svg + ui/images/select-none.svg + ui/images/send.svg + ui/images/sensors.svg + ui/images/settings.svg + ui/images/share.svg + ui/images/slideshow.svg + ui/images/sort-listitem.svg + ui/images/starred.svg + ui/images/state-interface.svg + ui/images/state.svg + ui/images/stock_application.svg + ui/images/stock_link.svg + ui/images/system-shutdown.svg + ui/images/tab-new.svg + ui/images/tick.svg + ui/images/up.svg + ui/images/view-collapse.svg + ui/images/view-expand.svg + ui/images/weather-app-symbolic.svg + + diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro index 86c2b022..5f2313bc 100644 --- a/nymea-app/nymea-app.pro +++ b/nymea-app/nymea-app.pro @@ -29,7 +29,8 @@ SOURCES += main.cpp \ platformintegration/generic/platformhelpergeneric.cpp \ RESOURCES += resources.qrc \ - ruletemplates.qrc + ruletemplates.qrc \ + images.qrc equals(STYLES_PATH, "") { RESOURCES += styles.qrc } else { diff --git a/nymea-app/resources.qrc b/nymea-app/resources.qrc index fef6a472..a6ffdafa 100644 --- a/nymea-app/resources.qrc +++ b/nymea-app/resources.qrc @@ -1,6 +1,19 @@ ui/Nymea.qml + ui/NewDeviceWizard.qml + ui/SettingsPage.qml + ui/LoginPage.qml + ui/MagicPage.qml + ui/EditDevicesPage.qml + ui/PushButtonAuthPage.qml + ui/KeyboardLoader.qml + ui/MainPage.qml + ui/RootItem.qml + ui/mainviews/ScenesView.qml + ui/mainviews/FavoritesView.qml + ui/mainviews/DevicesPageDelegate.qml + ui/mainviews/DevicesPage.qml ui/connection/ConnectPage.qml ui/connection/ManualConnectPage.qml ui/connection/ConnectingPage.qml @@ -8,9 +21,7 @@ ui/connection/wifisetup/WirelessSetupPage.qml ui/connection/wifisetup/ConnectWiFiPage.qml ui/connection/wifisetup/NetworkSettingsPage.qml - ui/mainviews/DevicesPage.qml - ui/NewDeviceWizard.qml - ui/SettingsPage.qml + ui/connection/wifisetup/BoxInfoPage.qml ui/components/GuhHeader.qml ui/components/HeaderButton.qml ui/components/ColorPicker.qml @@ -40,98 +51,68 @@ ui/components/FingerprintVisual.qml ui/components/ListSectionHeader.qml ui/components/ListFilterInput.qml - ui/images/add.svg - ui/images/back.svg - ui/images/close.svg - ui/images/info.svg + ui/customviews/GenericTypeLogView.qml ui/customviews/CustomViewBase.qml ui/customviews/WeatherView.qml ui/customviews/MediaControllerView.qml - ui/LoginPage.qml ui/customviews/SensorView.qml - ui/devicepages/GenericDevicePage.qml + ui/customviews/NotificationsView.qml ui/devicepages/MediaDevicePage.qml + ui/devicepages/ButtonDevicePage.qml + ui/devicepages/GenericDeviceStateDetailsPage.qml + ui/devicepages/WeatherDevicePage.qml + ui/devicepages/SensorDevicePage.qml + ui/devicepages/DevicePageBase.qml + ui/devicepages/ConfigureThingPage.qml + ui/devicepages/InputTriggerDevicePage.qml + ui/devicepages/StateLogPage.qml + ui/devicepages/ShutterDevicePage.qml + ui/devicepages/GarageGateDevicePage.qml + ui/devicepages/AwningDevicePage.qml + ui/devicepages/NotificationsDevicePage.qml + ui/devicepages/LightDevicePage.qml + ui/devicepages/FingerprintReaderDevicePage.qml ui/devicelistpages/GenericDeviceListPage.qml ui/devicelistpages/LightsDeviceListPage.qml - ui/customviews/ExtendedVolumeController.qml - ui/images/light-on.svg - ui/images/light-off.svg - ui/images/media-preview-start.svg - ui/MagicPage.qml - ui/images/mediaplayer-app-symbolic.svg - ui/images/system-shutdown.svg - ui/devicepages/ButtonDevicePage.qml + ui/devicelistpages/SensorsDeviceListPage.qml + ui/devicelistpages/WeatherDeviceListPage.qml + ui/devicelistpages/DeviceListPageBase.qml ui/magic/SelectActionPage.qml - ui/devicepages/GenericDeviceStateDetailsPage.qml - ui/images/delete.svg - ui/images/audio-speakers-muted-symbolic.svg - ui/images/audio-speakers-symbolic.svg - ui/images/media-playback-pause.svg - ui/images/media-playback-start.svg - ui/images/media-playback-stop.svg - ui/images/media-seek-backward.svg - ui/images/media-seek-forward.svg - ui/images/media-skip-backward.svg - ui/images/media-skip-forward.svg - ui/images/weather-app-symbolic.svg - ui/images/weathericons/weather-clear-day.svg - ui/images/weathericons/weather-clear-night.svg - ui/images/weathericons/weather-clouds.svg - ui/images/weathericons/weather-few-clouds-day.svg - ui/images/weathericons/weather-few-clouds-night.svg - ui/images/weathericons/weather-fog.svg - ui/images/weathericons/weather-light-rain.svg - ui/images/weathericons/weather-overcast.svg - ui/images/weathericons/weather-shower-rain.svg - ui/images/weathericons/weather-snow.svg - ui/images/weathericons/weather-thunderstorm.svg - ui/images/weathericons/humidity.svg - ui/images/weathericons/wind.svg - ui/devicepages/WeatherDevicePage.qml - ui/images/navigation-menu.svg - ui/images/settings.svg - ui/images/stock_link.svg - ui/images/share.svg - ui/devicepages/SensorDevicePage.qml - ui/images/sensors.svg - ui/images/network-wired-symbolic.svg - ui/images/notification.svg - ui/customviews/NotificationsView.qml - ui/devicepages/DevicePageBase.qml - ui/images/battery/battery-000.svg - ui/images/battery/battery-010.svg - ui/images/battery/battery-020.svg - ui/images/battery/battery-030.svg - ui/images/battery/battery-040.svg - ui/images/battery/battery-050.svg - ui/images/battery/battery-060.svg - ui/images/battery/battery-070.svg - ui/images/battery/battery-080.svg - ui/images/battery/battery-090.svg - ui/images/battery/battery-100.svg - ui/images/dialog-warning-symbolic.svg - ui/images/magic.svg - ui/EditDevicesPage.qml - ui/devicepages/ConfigureThingPage.qml ui/magic/DeviceRulesPage.qml ui/magic/EditRulePage.qml ui/magic/SelectThingPage.qml ui/magic/ComposeEventDescriptorPage.qml - ui/images/view-expand.svg - ui/images/view-collapse.svg ui/magic/SelectRuleActionPage.qml ui/magic/SelectRuleActionParamsPage.qml - ui/images/tick.svg ui/magic/SelectEventDescriptorParamsPage.qml ui/magic/SelectEventDescriptorPage.qml + ui/magic/StateEvaluatorDelegate.qml + ui/magic/EditStateEvaluatorPage.qml + ui/magic/SimpleStateEvaluatorDelegate.qml + ui/magic/SelectStateDescriptorParamsPage.qml + ui/magic/SelectStateDescriptorPage.qml + ui/magic/TimeEventDelegate.qml + ui/magic/EditTimeEventItemPage.qml + ui/magic/EventDescriptorDelegate.qml + ui/magic/RuleActionDelegate.qml + ui/magic/EditCalendarItemPage.qml + ui/magic/CalendarItemDelegate.qml + ui/magic/NewThingMagicPage.qml ui/delegates/ParamDescriptorDelegate.qml ui/delegates/ParamDelegate.qml ui/delegates/ActionDelegate.qml + ui/delegates/ThingDelegate.qml ui/system/LogViewerPage.qml - ui/images/next.svg - ui/images/go-down.svg ui/system/PluginsPage.qml ui/system/PluginParamsPage.qml + ui/system/AboutNymeaPage.qml + ui/system/CloudSettingsPage.qml + ui/system/ConnectionInterfacesPage.qml + ui/system/ConnectionInterfaceDelegate.qml + ui/appsettings/AboutPage.qml + ui/appsettings/AppSettingsPage.qml + ui/appsettings/DeveloperOptionsPage.qml + ui/appsettings/CloudLoginPage.qml ui/fonts/Ubuntu-B.ttf ui/fonts/Ubuntu-BI.ttf ui/fonts/Ubuntu-C.ttf @@ -141,137 +122,9 @@ ui/fonts/Ubuntu-MI.ttf ui/fonts/Ubuntu-R.ttf ui/fonts/Ubuntu-RI.ttf - ui/magic/StateEvaluatorDelegate.qml - ui/magic/EditStateEvaluatorPage.qml - ui/magic/SimpleStateEvaluatorDelegate.qml - ui/magic/SelectStateDescriptorParamsPage.qml - ui/magic/SelectStateDescriptorPage.qml - ui/images/select-none.svg - ui/images/edit.svg - ui/PushButtonAuthPage.qml - ui/images/dialog-error-symbolic.svg - ui/images/send.svg - ui/images/attention.svg - ui/images/question.svg - ui/devicepages/InputTriggerDevicePage.qml - ui/images/clock-app-symbolic.svg - ui/devicepages/StateLogPage.qml - ui/customviews/GenericTypeLogView.qml qtquickcontrols2.conf - ui/images/bluetooth.svg - ui/images/refresh.svg - ui/images/nm-signal-00.svg - ui/images/nm-signal-00-secure.svg - ui/images/nm-signal-25.svg - ui/images/nm-signal-25-secure.svg - ui/images/nm-signal-50.svg - ui/images/nm-signal-50-secure.svg - ui/images/nm-signal-75.svg - ui/images/nm-signal-75-secure.svg - ui/images/nm-signal-100.svg - ui/images/nm-signal-100-secure.svg - ui/images/network-vpn.svg translations/nymea-app-de_DE.qm translations/nymea-app-en_US.qm - ui/images/stock_application.svg - ui/delegates/ThingDelegate.qml - ui/images/network-secure.svg - ui/images/lock-broken.svg - ui/images/sort-listitem.svg - ui/devicepages/ShutterDevicePage.qml - ui/images/shutter/shutter-000.svg - ui/images/shutter/shutter-010.svg - ui/images/shutter/shutter-020.svg - ui/images/shutter/shutter-030.svg - ui/images/shutter/shutter-040.svg - ui/images/shutter/shutter-050.svg - ui/images/shutter/shutter-060.svg - ui/images/shutter/shutter-070.svg - ui/images/shutter/shutter-080.svg - ui/images/shutter/shutter-090.svg - ui/images/shutter/shutter-100.svg - ui/images/down.svg - ui/images/up.svg - ui/devicepages/GarageGateDevicePage.qml - ui/images/remove.svg ../LICENSE - ui/images/Built_with_Qt_RGB_logo.svg - ui/images/Built_with_Qt_RGB_logo_vertical.svg - ui/magic/TimeEventDelegate.qml - ui/magic/EditTimeEventItemPage.qml - ui/magic/EventDescriptorDelegate.qml - ui/magic/RuleActionDelegate.qml - ui/magic/EditCalendarItemPage.qml - ui/magic/CalendarItemDelegate.qml - ui/images/alarm-clock.svg - ui/images/action.svg - ui/images/event.svg - ui/images/state.svg - ui/images/event-interface.svg - ui/images/state-interface.svg - ui/images/action-interface.svg - ui/system/AboutNymeaPage.qml - ui/images/logs.svg - ui/images/plugin.svg - ui/images/nymea-box-setup.svg - ui/images/rpi-setup.svg - ui/images/eye.svg - ui/images/private-browsing.svg - ui/images/starred.svg - ui/images/non-starred.svg - ui/images/slideshow.svg - ui/mainviews/ScenesView.qml - ui/mainviews/FavoritesView.qml - ui/mainviews/DevicesPageDelegate.qml - ui/images/awning/awning-100.svg - ui/devicepages/AwningDevicePage.qml - ui/images/awning/awning-000.svg - ui/images/awning/awning-010.svg - ui/images/awning/awning-020.svg - ui/images/awning/awning-030.svg - ui/images/awning/awning-040.svg - ui/images/awning/awning-050.svg - ui/images/awning/awning-060.svg - ui/images/awning/awning-070.svg - ui/images/awning/awning-080.svg - ui/images/awning/awning-090.svg - ui/magic/NewThingMagicPage.qml - ui/images/DeviceIconBlind.svg - ui/images/DeviceIconRollerShutter.svg - ui/images/sensors/conductivity.svg - ui/images/sensors/humidity.svg - ui/images/sensors/light.svg - ui/images/sensors/moisture.svg - ui/images/sensors/pressure.svg - ui/images/sensors/temperature.svg - ui/images/configure.svg - ui/images/network-wifi-symbolic.svg - ui/KeyboardLoader.qml - ui/images/cloud.svg - ui/system/CloudSettingsPage.qml - ui/images/cloud-offline.svg - ui/images/cloud-error.svg - ui/appsettings/AboutPage.qml - ui/appsettings/AppSettingsPage.qml - ui/appsettings/DeveloperOptionsPage.qml - ui/appsettings/CloudLoginPage.qml - ui/devicepages/NotificationsDevicePage.qml - ui/devicepages/LightDevicePage.qml - ui/devicelistpages/SensorsDeviceListPage.qml - ui/devicelistpages/WeatherDeviceListPage.qml - ui/devicelistpages/DeviceListPageBase.qml - ui/MainPage.qml - ui/RootItem.qml - ui/devicepages/FingerprintReaderDevicePage.qml - ui/images/account.svg - ui/images/contact-new.svg - ui/images/fingerprint/fingerprint_boxes.json - ui/images/fingerprint/fingerprint_segmented.png - ui/images/fingerprint.svg - ui/images/find.svg - ui/images/erase.svg - ui/system/ConnectionInterfacesPage.qml - ui/system/ConnectionInterfaceDelegate.qml - ui/connection/wifisetup/BoxInfoPage.qml diff --git a/nymea-app/ui/RootItem.qml b/nymea-app/ui/RootItem.qml index f2dd08d0..0ef4a56f 100644 --- a/nymea-app/ui/RootItem.qml +++ b/nymea-app/ui/RootItem.qml @@ -315,7 +315,7 @@ Item { contentItem: ColorIcon { height: parent.height width: parent.width - name: "../images/add.svg" + name: "../images/tab-new.svg" } onClicked: { tabModel.addTab() diff --git a/nymea-app/ui/images/filters.svg b/nymea-app/ui/images/filters.svg new file mode 100644 index 00000000..fe0300ce --- /dev/null +++ b/nymea-app/ui/images/filters.svg @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/nymea-app/ui/images/tab-new.svg b/nymea-app/ui/images/tab-new.svg new file mode 100644 index 00000000..a9721857 --- /dev/null +++ b/nymea-app/ui/images/tab-new.svg @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + +