From 15ac9af2680d63321403f49eca03cdb192851bd3 Mon Sep 17 00:00:00 2001 From: Kimmo Ollila Date: Wed, 11 May 2016 12:52:49 +0300 Subject: Separated SettingsUI to its own plugin. Change-Id: I7893231ab2d18270183f9838456d0e48cdc63186 Reviewed-by: Samuli Piippo Reviewed-by: Teemu Holappa --- src/settingsui/AutoScroller.qml | 113 ++++++++ src/settingsui/bluetooth/Bluetooth.qml | 4 +- src/settingsui/bluetooth/Discovery.qml | 6 +- src/settingsui/common/CustomTableView.qml | 4 +- src/settingsui/display/Display.qml | 4 +- src/settingsui/icons.qrc | 21 -- src/settingsui/icons/Alert_yellow_1x.png | Bin 775 -> 0 bytes src/settingsui/icons/Audio_qt_6x.png | Bin 444 -> 0 bytes src/settingsui/icons/Bluetooth_qt_1x.png | Bin 858 -> 0 bytes src/settingsui/icons/Bluetooth_qt_6x.png | Bin 2349 -> 0 bytes src/settingsui/icons/Camcorder_qt_1x.png | Bin 719 -> 0 bytes src/settingsui/icons/Camera_qt_1x.png | Bin 1003 -> 0 bytes src/settingsui/icons/Chevron-left_black_1x.png | Bin 707 -> 0 bytes src/settingsui/icons/Clock_qt_1x.png | Bin 1185 -> 0 bytes src/settingsui/icons/Clock_qt_6x.png | Bin 3438 -> 0 bytes src/settingsui/icons/Display_qt_6x.png | Bin 1157 -> 0 bytes src/settingsui/icons/Flag_qt_6x.png | Bin 1888 -> 0 bytes src/settingsui/icons/FloatingButton_Active.png | Bin 3584 -> 0 bytes src/settingsui/icons/FloatingButton_Available.png | Bin 3554 -> 0 bytes .../icons/FloatingButton_Unavailable.png | Bin 3134 -> 0 bytes src/settingsui/icons/Headphones_qt_1x.png | Bin 1041 -> 0 bytes src/settingsui/icons/Heartbeat_qt_1x.png | Bin 1061 -> 0 bytes src/settingsui/icons/Keyboard_qt_1x.png | Bin 1116 -> 0 bytes src/settingsui/icons/Laptop_qt_1x.png | Bin 861 -> 0 bytes src/settingsui/icons/Microphone_qt_1x.png | Bin 943 -> 0 bytes src/settingsui/icons/MobilePhone_qt_1x.png | Bin 785 -> 0 bytes src/settingsui/icons/Mouse_qt_1x.png | Bin 732 -> 0 bytes src/settingsui/icons/Power_black_1x.png | Bin 1161 -> 0 bytes src/settingsui/icons/Tablet_qt_1x.png | Bin 721 -> 0 bytes src/settingsui/icons/Volume_down_qt_1x.png | Bin 571 -> 0 bytes src/settingsui/icons/Volume_mute_qt_1x.png | Bin 778 -> 0 bytes src/settingsui/icons/Volume_up_qt_1x.png | Bin 632 -> 0 bytes src/settingsui/icons/WifiAnim_black_2x.png | Bin 1673 -> 0 bytes src/settingsui/icons/Wifi_lightgray_2x.png | Bin 924 -> 0 bytes src/settingsui/icons/World_qt_6x.png | Bin 5789 -> 0 bytes src/settingsui/icons/generate_icons.sh | 27 -- src/settingsui/icons/ref/Audio.png | Bin 135 -> 0 bytes src/settingsui/icons/ref/Back.png | Bin 1725 -> 0 bytes src/settingsui/icons/ref/Bluetooth.png | Bin 1364 -> 0 bytes src/settingsui/icons/ref/Camcorder.png | Bin 1036 -> 0 bytes src/settingsui/icons/ref/Camera.png | Bin 1889 -> 0 bytes src/settingsui/icons/ref/Chevron-left.png | Bin 1475 -> 0 bytes src/settingsui/icons/ref/Chevron-right.png | Bin 1463 -> 0 bytes src/settingsui/icons/ref/Circle-x.png | Bin 3358 -> 0 bytes src/settingsui/icons/ref/Clock.png | Bin 2438 -> 0 bytes src/settingsui/icons/ref/Cogs.png | Bin 2756 -> 0 bytes src/settingsui/icons/ref/Connections.png | Bin 3226 -> 0 bytes src/settingsui/icons/ref/Display.png | Bin 754 -> 0 bytes src/settingsui/icons/ref/Flag.png | Bin 1395 -> 0 bytes src/settingsui/icons/ref/Headphones.png | Bin 2141 -> 0 bytes src/settingsui/icons/ref/Heartbeat.png | Bin 2280 -> 0 bytes src/settingsui/icons/ref/Keyboard.png | Bin 571 -> 0 bytes src/settingsui/icons/ref/Laptop.png | Bin 753 -> 0 bytes src/settingsui/icons/ref/Lock.png | Bin 1043 -> 0 bytes src/settingsui/icons/ref/Microphone.png | Bin 1891 -> 0 bytes src/settingsui/icons/ref/MobilePhone.png | Bin 1034 -> 0 bytes src/settingsui/icons/ref/Mouse.png | Bin 1560 -> 0 bytes src/settingsui/icons/ref/Plus.png | Bin 2888 -> 0 bytes src/settingsui/icons/ref/Power.png | Bin 2466 -> 0 bytes src/settingsui/icons/ref/Settings.png | Bin 2630 -> 0 bytes src/settingsui/icons/ref/Tablet.png | Bin 892 -> 0 bytes src/settingsui/icons/ref/Volume_down.png | Bin 505 -> 0 bytes src/settingsui/icons/ref/Volume_mute.png | Bin 1000 -> 0 bytes src/settingsui/icons/ref/Volume_up.png | Bin 513 -> 0 bytes src/settingsui/icons/ref/Wifi.png | Bin 2102 -> 0 bytes src/settingsui/icons/ref/Wifi1.png | Bin 824 -> 0 bytes src/settingsui/icons/ref/Wifi2.png | Bin 987 -> 0 bytes src/settingsui/icons/ref/Wifi3.png | Bin 1195 -> 0 bytes src/settingsui/icons/ref/Wifi4.png | Bin 2102 -> 0 bytes src/settingsui/icons/ref/WifiAnim.png | Bin 2830 -> 0 bytes src/settingsui/icons/ref/World.png | Bin 4559 -> 0 bytes src/settingsui/icons/ref/Wrench.png | Bin 1677 -> 0 bytes src/settingsui/icons/ref/extra/Alert.png | Bin 1502 -> 0 bytes src/settingsui/icons/scripts/cimage.sh | 45 --- src/settingsui/icons/scripts/cimages.sh | 28 -- src/settingsui/icons/scripts/rimage.sh | 37 --- src/settingsui/icons/scripts/rimages.sh | 25 -- src/settingsui/locale/Language.qml | 4 +- src/settingsui/locale/RegionSelect.qml | 4 +- src/settingsui/main.cpp | 32 ++- src/settingsui/main.qml | 302 +++++++-------------- src/settingsui/network/AddressListEntry.qml | 4 +- src/settingsui/network/ComboBoxEntry.qml | 4 +- src/settingsui/network/EditWiredSettings.qml | 4 +- src/settingsui/network/IpAddressTextField.qml | 4 +- src/settingsui/network/NetworkDetails.qml | 2 +- src/settingsui/network/NetworkSettings.qml | 7 +- src/settingsui/network/WifiSelectorDelegate.qml | 5 +- src/settingsui/network/WifiSettings.qml | 6 +- src/settingsui/network/WifiSignalMonitor.qml | 4 +- src/settingsui/network/WiredSettings.qml | 10 +- src/settingsui/qml.qrc | 28 -- src/settingsui/settingsui.pro | 6 +- src/settingsui/settingsuiapp.qrc | 7 + src/settingsui/settingsuiplugin/icons.qrc | 33 +++ .../settingsuiplugin/icons/Alert_yellow_1x.png | Bin 0 -> 775 bytes .../settingsuiplugin/icons/Audio_qt_6x.png | Bin 0 -> 444 bytes .../settingsuiplugin/icons/Bluetooth_qt_1x.png | Bin 0 -> 858 bytes .../settingsuiplugin/icons/Bluetooth_qt_6x.png | Bin 0 -> 2349 bytes .../settingsuiplugin/icons/Camcorder_qt_1x.png | Bin 0 -> 719 bytes .../settingsuiplugin/icons/Camera_qt_1x.png | Bin 0 -> 1003 bytes .../icons/Chevron-left_black_1x.png | Bin 0 -> 707 bytes .../settingsuiplugin/icons/Clock_qt_1x.png | Bin 0 -> 1185 bytes .../settingsuiplugin/icons/Clock_qt_6x.png | Bin 0 -> 3438 bytes .../settingsuiplugin/icons/Display_qt_6x.png | Bin 0 -> 1157 bytes .../settingsuiplugin/icons/Flag_qt_6x.png | Bin 0 -> 1888 bytes .../icons/FloatingButton_Active.png | Bin 0 -> 3584 bytes .../icons/FloatingButton_Available.png | Bin 0 -> 3554 bytes .../icons/FloatingButton_Unavailable.png | Bin 0 -> 3134 bytes .../settingsuiplugin/icons/Headphones_qt_1x.png | Bin 0 -> 1041 bytes .../settingsuiplugin/icons/Heartbeat_qt_1x.png | Bin 0 -> 1061 bytes .../settingsuiplugin/icons/Keyboard_qt_1x.png | Bin 0 -> 1116 bytes .../settingsuiplugin/icons/Laptop_qt_1x.png | Bin 0 -> 861 bytes .../settingsuiplugin/icons/Microphone_qt_1x.png | Bin 0 -> 943 bytes .../settingsuiplugin/icons/MobilePhone_qt_1x.png | Bin 0 -> 785 bytes .../settingsuiplugin/icons/Mouse_qt_1x.png | Bin 0 -> 732 bytes .../settingsuiplugin/icons/Power_black_1x.png | Bin 0 -> 1161 bytes .../settingsuiplugin/icons/Tablet_qt_1x.png | Bin 0 -> 721 bytes .../settingsuiplugin/icons/Volume_down_qt_1x.png | Bin 0 -> 571 bytes .../settingsuiplugin/icons/Volume_mute_qt_1x.png | Bin 0 -> 778 bytes .../settingsuiplugin/icons/Volume_up_qt_1x.png | Bin 0 -> 632 bytes .../settingsuiplugin/icons/WifiAnim_black_2x.png | Bin 0 -> 1673 bytes .../settingsuiplugin/icons/Wifi_lightgray_2x.png | Bin 0 -> 924 bytes .../settingsuiplugin/icons/World_qt_6x.png | Bin 0 -> 5789 bytes .../settingsuiplugin/icons/generate_icons.sh | 27 ++ .../settingsuiplugin/icons/ref/Audio.png | Bin 0 -> 135 bytes src/settingsui/settingsuiplugin/icons/ref/Back.png | Bin 0 -> 1725 bytes .../settingsuiplugin/icons/ref/Bluetooth.png | Bin 0 -> 1364 bytes .../settingsuiplugin/icons/ref/Camcorder.png | Bin 0 -> 1036 bytes .../settingsuiplugin/icons/ref/Camera.png | Bin 0 -> 1889 bytes .../settingsuiplugin/icons/ref/Chevron-left.png | Bin 0 -> 1475 bytes .../settingsuiplugin/icons/ref/Chevron-right.png | Bin 0 -> 1463 bytes .../settingsuiplugin/icons/ref/Circle-x.png | Bin 0 -> 3358 bytes .../settingsuiplugin/icons/ref/Clock.png | Bin 0 -> 2438 bytes src/settingsui/settingsuiplugin/icons/ref/Cogs.png | Bin 0 -> 2756 bytes .../settingsuiplugin/icons/ref/Connections.png | Bin 0 -> 3226 bytes .../settingsuiplugin/icons/ref/Display.png | Bin 0 -> 754 bytes src/settingsui/settingsuiplugin/icons/ref/Flag.png | Bin 0 -> 1395 bytes .../settingsuiplugin/icons/ref/Headphones.png | Bin 0 -> 2141 bytes .../settingsuiplugin/icons/ref/Heartbeat.png | Bin 0 -> 2280 bytes .../settingsuiplugin/icons/ref/Keyboard.png | Bin 0 -> 571 bytes .../settingsuiplugin/icons/ref/Laptop.png | Bin 0 -> 753 bytes src/settingsui/settingsuiplugin/icons/ref/Lock.png | Bin 0 -> 1043 bytes .../settingsuiplugin/icons/ref/Microphone.png | Bin 0 -> 1891 bytes .../settingsuiplugin/icons/ref/MobilePhone.png | Bin 0 -> 1034 bytes .../settingsuiplugin/icons/ref/Mouse.png | Bin 0 -> 1560 bytes src/settingsui/settingsuiplugin/icons/ref/Plus.png | Bin 0 -> 2888 bytes .../settingsuiplugin/icons/ref/Power.png | Bin 0 -> 2466 bytes .../settingsuiplugin/icons/ref/Settings.png | Bin 0 -> 2630 bytes .../settingsuiplugin/icons/ref/Tablet.png | Bin 0 -> 892 bytes .../settingsuiplugin/icons/ref/Volume_down.png | Bin 0 -> 505 bytes .../settingsuiplugin/icons/ref/Volume_mute.png | Bin 0 -> 1000 bytes .../settingsuiplugin/icons/ref/Volume_up.png | Bin 0 -> 513 bytes src/settingsui/settingsuiplugin/icons/ref/Wifi.png | Bin 0 -> 2102 bytes .../settingsuiplugin/icons/ref/Wifi1.png | Bin 0 -> 824 bytes .../settingsuiplugin/icons/ref/Wifi2.png | Bin 0 -> 987 bytes .../settingsuiplugin/icons/ref/Wifi3.png | Bin 0 -> 1195 bytes .../settingsuiplugin/icons/ref/Wifi4.png | Bin 0 -> 2102 bytes .../settingsuiplugin/icons/ref/WifiAnim.png | Bin 0 -> 2830 bytes .../settingsuiplugin/icons/ref/World.png | Bin 0 -> 4559 bytes .../settingsuiplugin/icons/ref/Wrench.png | Bin 0 -> 1677 bytes .../settingsuiplugin/icons/ref/extra/Alert.png | Bin 0 -> 1502 bytes .../settingsuiplugin/icons/scripts/cimage.sh | 45 +++ .../settingsuiplugin/icons/scripts/cimages.sh | 28 ++ .../settingsuiplugin/icons/scripts/rimage.sh | 37 +++ .../settingsuiplugin/icons/scripts/rimages.sh | 25 ++ src/settingsui/settingsuiplugin/plugin.qrc | 28 ++ src/settingsui/settingsuiplugin/pluginMain.qml | 174 ++++++++++++ src/settingsui/settingsuiplugin/qmldir | 2 + .../settingsuiplugin/settingsuiplugin.pro | 38 +++ .../settingsuiplugin/settingsuiplugin_plugin.cpp | 10 + .../settingsuiplugin/settingsuiplugin_plugin.h | 50 ++++ src/settingsui/settingsuiplugin/settingsview.xml | 35 +++ src/settingsui/settingsview.xml | 35 --- src/settingsui/timedate/AnalogClock.qml | 4 +- src/settingsui/timedate/CustomCalendar.qml | 8 +- src/settingsui/timedate/TimeDate.qml | 4 +- src/settingsui/timedate/TimezonesView.qml | 5 +- src/src.pro | 3 +- 179 files changed, 808 insertions(+), 530 deletions(-) create mode 100644 src/settingsui/AutoScroller.qml delete mode 100644 src/settingsui/icons.qrc delete mode 100644 src/settingsui/icons/Alert_yellow_1x.png delete mode 100644 src/settingsui/icons/Audio_qt_6x.png delete mode 100644 src/settingsui/icons/Bluetooth_qt_1x.png delete mode 100644 src/settingsui/icons/Bluetooth_qt_6x.png delete mode 100644 src/settingsui/icons/Camcorder_qt_1x.png delete mode 100644 src/settingsui/icons/Camera_qt_1x.png delete mode 100644 src/settingsui/icons/Chevron-left_black_1x.png delete mode 100644 src/settingsui/icons/Clock_qt_1x.png delete mode 100644 src/settingsui/icons/Clock_qt_6x.png delete mode 100644 src/settingsui/icons/Display_qt_6x.png delete mode 100644 src/settingsui/icons/Flag_qt_6x.png delete mode 100755 src/settingsui/icons/FloatingButton_Active.png delete mode 100755 src/settingsui/icons/FloatingButton_Available.png delete mode 100755 src/settingsui/icons/FloatingButton_Unavailable.png delete mode 100644 src/settingsui/icons/Headphones_qt_1x.png delete mode 100644 src/settingsui/icons/Heartbeat_qt_1x.png delete mode 100644 src/settingsui/icons/Keyboard_qt_1x.png delete mode 100644 src/settingsui/icons/Laptop_qt_1x.png delete mode 100644 src/settingsui/icons/Microphone_qt_1x.png delete mode 100644 src/settingsui/icons/MobilePhone_qt_1x.png delete mode 100644 src/settingsui/icons/Mouse_qt_1x.png delete mode 100644 src/settingsui/icons/Power_black_1x.png delete mode 100644 src/settingsui/icons/Tablet_qt_1x.png delete mode 100644 src/settingsui/icons/Volume_down_qt_1x.png delete mode 100644 src/settingsui/icons/Volume_mute_qt_1x.png delete mode 100644 src/settingsui/icons/Volume_up_qt_1x.png delete mode 100644 src/settingsui/icons/WifiAnim_black_2x.png delete mode 100644 src/settingsui/icons/Wifi_lightgray_2x.png delete mode 100644 src/settingsui/icons/World_qt_6x.png delete mode 100755 src/settingsui/icons/generate_icons.sh delete mode 100644 src/settingsui/icons/ref/Audio.png delete mode 100644 src/settingsui/icons/ref/Back.png delete mode 100644 src/settingsui/icons/ref/Bluetooth.png delete mode 100644 src/settingsui/icons/ref/Camcorder.png delete mode 100644 src/settingsui/icons/ref/Camera.png delete mode 100644 src/settingsui/icons/ref/Chevron-left.png delete mode 100644 src/settingsui/icons/ref/Chevron-right.png delete mode 100644 src/settingsui/icons/ref/Circle-x.png delete mode 100644 src/settingsui/icons/ref/Clock.png delete mode 100644 src/settingsui/icons/ref/Cogs.png delete mode 100644 src/settingsui/icons/ref/Connections.png delete mode 100644 src/settingsui/icons/ref/Display.png delete mode 100644 src/settingsui/icons/ref/Flag.png delete mode 100644 src/settingsui/icons/ref/Headphones.png delete mode 100644 src/settingsui/icons/ref/Heartbeat.png delete mode 100644 src/settingsui/icons/ref/Keyboard.png delete mode 100644 src/settingsui/icons/ref/Laptop.png delete mode 100644 src/settingsui/icons/ref/Lock.png delete mode 100644 src/settingsui/icons/ref/Microphone.png delete mode 100644 src/settingsui/icons/ref/MobilePhone.png delete mode 100644 src/settingsui/icons/ref/Mouse.png delete mode 100644 src/settingsui/icons/ref/Plus.png delete mode 100644 src/settingsui/icons/ref/Power.png delete mode 100644 src/settingsui/icons/ref/Settings.png delete mode 100644 src/settingsui/icons/ref/Tablet.png delete mode 100644 src/settingsui/icons/ref/Volume_down.png delete mode 100644 src/settingsui/icons/ref/Volume_mute.png delete mode 100644 src/settingsui/icons/ref/Volume_up.png delete mode 100644 src/settingsui/icons/ref/Wifi.png delete mode 100644 src/settingsui/icons/ref/Wifi1.png delete mode 100644 src/settingsui/icons/ref/Wifi2.png delete mode 100644 src/settingsui/icons/ref/Wifi3.png delete mode 100644 src/settingsui/icons/ref/Wifi4.png delete mode 100644 src/settingsui/icons/ref/WifiAnim.png delete mode 100644 src/settingsui/icons/ref/World.png delete mode 100644 src/settingsui/icons/ref/Wrench.png delete mode 100644 src/settingsui/icons/ref/extra/Alert.png delete mode 100755 src/settingsui/icons/scripts/cimage.sh delete mode 100755 src/settingsui/icons/scripts/cimages.sh delete mode 100755 src/settingsui/icons/scripts/rimage.sh delete mode 100755 src/settingsui/icons/scripts/rimages.sh delete mode 100644 src/settingsui/qml.qrc create mode 100644 src/settingsui/settingsuiapp.qrc create mode 100644 src/settingsui/settingsuiplugin/icons.qrc create mode 100644 src/settingsui/settingsuiplugin/icons/Alert_yellow_1x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Audio_qt_6x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Bluetooth_qt_1x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Bluetooth_qt_6x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Camcorder_qt_1x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Camera_qt_1x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Chevron-left_black_1x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Clock_qt_1x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Clock_qt_6x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Display_qt_6x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Flag_qt_6x.png create mode 100755 src/settingsui/settingsuiplugin/icons/FloatingButton_Active.png create mode 100755 src/settingsui/settingsuiplugin/icons/FloatingButton_Available.png create mode 100755 src/settingsui/settingsuiplugin/icons/FloatingButton_Unavailable.png create mode 100644 src/settingsui/settingsuiplugin/icons/Headphones_qt_1x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Heartbeat_qt_1x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Keyboard_qt_1x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Laptop_qt_1x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Microphone_qt_1x.png create mode 100644 src/settingsui/settingsuiplugin/icons/MobilePhone_qt_1x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Mouse_qt_1x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Power_black_1x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Tablet_qt_1x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Volume_down_qt_1x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Volume_mute_qt_1x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Volume_up_qt_1x.png create mode 100644 src/settingsui/settingsuiplugin/icons/WifiAnim_black_2x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Wifi_lightgray_2x.png create mode 100644 src/settingsui/settingsuiplugin/icons/World_qt_6x.png create mode 100755 src/settingsui/settingsuiplugin/icons/generate_icons.sh create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Audio.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Back.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Bluetooth.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Camcorder.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Camera.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Chevron-left.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Chevron-right.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Circle-x.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Clock.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Cogs.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Connections.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Display.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Flag.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Headphones.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Heartbeat.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Keyboard.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Laptop.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Lock.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Microphone.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/MobilePhone.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Mouse.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Plus.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Power.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Settings.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Tablet.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Volume_down.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Volume_mute.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Volume_up.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Wifi.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Wifi1.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Wifi2.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Wifi3.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Wifi4.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/WifiAnim.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/World.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/Wrench.png create mode 100644 src/settingsui/settingsuiplugin/icons/ref/extra/Alert.png create mode 100755 src/settingsui/settingsuiplugin/icons/scripts/cimage.sh create mode 100755 src/settingsui/settingsuiplugin/icons/scripts/cimages.sh create mode 100755 src/settingsui/settingsuiplugin/icons/scripts/rimage.sh create mode 100755 src/settingsui/settingsuiplugin/icons/scripts/rimages.sh create mode 100644 src/settingsui/settingsuiplugin/plugin.qrc create mode 100644 src/settingsui/settingsuiplugin/pluginMain.qml create mode 100644 src/settingsui/settingsuiplugin/qmldir create mode 100644 src/settingsui/settingsuiplugin/settingsuiplugin.pro create mode 100644 src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp create mode 100644 src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h create mode 100644 src/settingsui/settingsuiplugin/settingsview.xml delete mode 100644 src/settingsui/settingsview.xml (limited to 'src') diff --git a/src/settingsui/AutoScroller.qml b/src/settingsui/AutoScroller.qml new file mode 100644 index 0000000..14c7717 --- /dev/null +++ b/src/settingsui/AutoScroller.qml @@ -0,0 +1,113 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Device Utilities module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +import QtQuick 2.6 +import QtQuick.Enterprise.VirtualKeyboard 2.0 + +Item { + + property var innerFlickable + property var outerFlickable + property var inputItem: InputContext.inputItem + + onInputItemChanged: { + innerFlickable = null + outerFlickable = null + if (inputItem !== null) { + var parent_ = inputItem.parent + while (parent_) { + if (parent_.maximumFlickVelocity) { + if (innerFlickable) { + outerFlickable = parent_ + break + } else { + innerFlickable = parent_ + } + } + parent_ = parent_.parent + } + delayedLoading.triggered() + } + } + + function ensureVisible(flickable) { + if (Qt.inputMethod.visible && inputItem && flickable && flickable.visible && flickable.interactive) { + + var verticallyFlickable = (flickable.flickableDirection === Flickable.HorizontalAndVerticalFlick || flickable.flickableDirection === Flickable.VerticalFlick + || (flickable.flickableDirection === Flickable.AutoFlickDirection && flickable.contentHeight > flickable.height)) + var horizontallyFlickable = (flickable.flickableDirection === Flickable.HorizontalAndVerticalFlick || flickable.flickableDirection === Flickable.HorizontalFlick + || (flickable.flickableDirection === Flickable.AutoFlickDirection && flickable.contentWidth > flickable.width)) + + if ((!verticallyFlickable && !horizontallyFlickable) || !inputItem.hasOwnProperty("cursorRectangle")) + return + + var cursorRectangle = flickable.contentItem.mapFromItem(inputItem, inputItem.cursorRectangle.x, inputItem.cursorRectangle.y) + + var oldContentY = flickable.contentY + if (verticallyFlickable) { + var scrollMarginVertical = (flickable && flickable.scrollMarginVertical) ? flickable.scrollMarginVertical : 10 + if (flickable.contentY >= cursorRectangle.y - scrollMarginVertical) + flickable.contentY = Math.max(0, cursorRectangle.y - scrollMarginVertical) + else if (flickable.contentY + flickable.height <= cursorRectangle.y + inputItem.cursorRectangle.height + scrollMarginVertical) + flickable.contentY = Math.min(flickable.contentHeight - flickable.height, cursorRectangle.y + inputItem.cursorRectangle.height - flickable.height + scrollMarginVertical) + } + if (horizontallyFlickable) { + var scrollMarginHorizontal = (flickable && flickable.scrollMarginHorizontal) ? flickable.scrollMarginHorizontal : 10 + if (flickable.contentX >= cursorRectangle.x - scrollMarginHorizontal) + flickable.contentX = Math.max(0, cursorRectangle.x - scrollMarginHorizontal) + else if (flickable.contentX + flickable.width <= cursorRectangle.x + inputItem.cursorRectangle.width + scrollMarginHorizontal) + flickable.contentX = Math.min(flickable.contentWidth - flickable.width, cursorRectangle.x + inputItem.cursorRectangle.width - flickable.width + scrollMarginHorizontal) + } + } + } + Timer { + id: delayedLoading + interval: 10 + onTriggered: { + ensureVisible(innerFlickable) + ensureVisible(outerFlickable) + } + } + Connections { + ignoreUnknownSignals: true + target: inputItem && !Qt.inputMethod.animating ? Qt.inputMethod : null + onKeyboardRectangleChanged: delayedLoading.triggered() + } + Connections { + ignoreUnknownSignals: true + target: inputItem && inputItem.activeFocus ? inputItem : null + onCursorRectangleChanged: delayedLoading.triggered() + } +} diff --git a/src/settingsui/bluetooth/Bluetooth.qml b/src/settingsui/bluetooth/Bluetooth.qml index 2bffe5b..ee14247 100644 --- a/src/settingsui/bluetooth/Bluetooth.qml +++ b/src/settingsui/bluetooth/Bluetooth.qml @@ -35,9 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 import com.theqtcompany.settings.bluetooth 1.0 Item { diff --git a/src/settingsui/bluetooth/Discovery.qml b/src/settingsui/bluetooth/Discovery.qml index 9c1b674..5a51214 100644 --- a/src/settingsui/bluetooth/Discovery.qml +++ b/src/settingsui/bluetooth/Discovery.qml @@ -35,9 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 import com.theqtcompany.settings.bluetooth 1.0 Item { @@ -91,7 +89,7 @@ Item { anchors.left: parent.left anchors.top: parent.top anchors.topMargin: 4 - source: mainList.getIcon(type) + source: mainList.getIcon(deviceType) } Column { id: column diff --git a/src/settingsui/common/CustomTableView.qml b/src/settingsui/common/CustomTableView.qml index 6073683..aa57011 100644 --- a/src/settingsui/common/CustomTableView.qml +++ b/src/settingsui/common/CustomTableView.qml @@ -35,9 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 ColumnLayout { id: root diff --git a/src/settingsui/display/Display.qml b/src/settingsui/display/Display.qml index 69be8f3..a871666 100644 --- a/src/settingsui/display/Display.qml +++ b/src/settingsui/display/Display.qml @@ -35,9 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 import com.theqtcompany.settings.display 1.0 Item { diff --git a/src/settingsui/icons.qrc b/src/settingsui/icons.qrc deleted file mode 100644 index 29d0e1a..0000000 --- a/src/settingsui/icons.qrc +++ /dev/null @@ -1,21 +0,0 @@ - - - icons/Audio_qt_6x.png - icons/Chevron-left_black_1x.png - icons/Power_black_1x.png - icons/Display_qt_6x.png - icons/Clock_qt_6x.png - icons/Flag_qt_6x.png - icons/World_qt_6x.png - icons/Bluetooth_qt_6x.png - icons/Bluetooth_qt_1x.png - icons/Headphones_qt_1x.png - icons/Keyboard_qt_1x.png - icons/Laptop_qt_1x.png - icons/Microphone_qt_1x.png - icons/Mouse_qt_1x.png - icons/FloatingButton_Active.png - icons/FloatingButton_Available.png - icons/FloatingButton_Unavailable.png - - diff --git a/src/settingsui/icons/Alert_yellow_1x.png b/src/settingsui/icons/Alert_yellow_1x.png deleted file mode 100644 index 2306ff6..0000000 Binary files a/src/settingsui/icons/Alert_yellow_1x.png and /dev/null differ diff --git a/src/settingsui/icons/Audio_qt_6x.png b/src/settingsui/icons/Audio_qt_6x.png deleted file mode 100644 index 8251129..0000000 Binary files a/src/settingsui/icons/Audio_qt_6x.png and /dev/null differ diff --git a/src/settingsui/icons/Bluetooth_qt_1x.png b/src/settingsui/icons/Bluetooth_qt_1x.png deleted file mode 100644 index af6968d..0000000 Binary files a/src/settingsui/icons/Bluetooth_qt_1x.png and /dev/null differ diff --git a/src/settingsui/icons/Bluetooth_qt_6x.png b/src/settingsui/icons/Bluetooth_qt_6x.png deleted file mode 100644 index 55e4fb1..0000000 Binary files a/src/settingsui/icons/Bluetooth_qt_6x.png and /dev/null differ diff --git a/src/settingsui/icons/Camcorder_qt_1x.png b/src/settingsui/icons/Camcorder_qt_1x.png deleted file mode 100644 index 7ffb2c8..0000000 Binary files a/src/settingsui/icons/Camcorder_qt_1x.png and /dev/null differ diff --git a/src/settingsui/icons/Camera_qt_1x.png b/src/settingsui/icons/Camera_qt_1x.png deleted file mode 100644 index b84e53a..0000000 Binary files a/src/settingsui/icons/Camera_qt_1x.png and /dev/null differ diff --git a/src/settingsui/icons/Chevron-left_black_1x.png b/src/settingsui/icons/Chevron-left_black_1x.png deleted file mode 100644 index 225176b..0000000 Binary files a/src/settingsui/icons/Chevron-left_black_1x.png and /dev/null differ diff --git a/src/settingsui/icons/Clock_qt_1x.png b/src/settingsui/icons/Clock_qt_1x.png deleted file mode 100644 index ee58f95..0000000 Binary files a/src/settingsui/icons/Clock_qt_1x.png and /dev/null differ diff --git a/src/settingsui/icons/Clock_qt_6x.png b/src/settingsui/icons/Clock_qt_6x.png deleted file mode 100644 index aba8b60..0000000 Binary files a/src/settingsui/icons/Clock_qt_6x.png and /dev/null differ diff --git a/src/settingsui/icons/Display_qt_6x.png b/src/settingsui/icons/Display_qt_6x.png deleted file mode 100644 index e45c45c..0000000 Binary files a/src/settingsui/icons/Display_qt_6x.png and /dev/null differ diff --git a/src/settingsui/icons/Flag_qt_6x.png b/src/settingsui/icons/Flag_qt_6x.png deleted file mode 100644 index f549ebd..0000000 Binary files a/src/settingsui/icons/Flag_qt_6x.png and /dev/null differ diff --git a/src/settingsui/icons/FloatingButton_Active.png b/src/settingsui/icons/FloatingButton_Active.png deleted file mode 100755 index 9b55146..0000000 Binary files a/src/settingsui/icons/FloatingButton_Active.png and /dev/null differ diff --git a/src/settingsui/icons/FloatingButton_Available.png b/src/settingsui/icons/FloatingButton_Available.png deleted file mode 100755 index 1479881..0000000 Binary files a/src/settingsui/icons/FloatingButton_Available.png and /dev/null differ diff --git a/src/settingsui/icons/FloatingButton_Unavailable.png b/src/settingsui/icons/FloatingButton_Unavailable.png deleted file mode 100755 index 33aa87d..0000000 Binary files a/src/settingsui/icons/FloatingButton_Unavailable.png and /dev/null differ diff --git a/src/settingsui/icons/Headphones_qt_1x.png b/src/settingsui/icons/Headphones_qt_1x.png deleted file mode 100644 index 82b04e7..0000000 Binary files a/src/settingsui/icons/Headphones_qt_1x.png and /dev/null differ diff --git a/src/settingsui/icons/Heartbeat_qt_1x.png b/src/settingsui/icons/Heartbeat_qt_1x.png deleted file mode 100644 index 16a94bc..0000000 Binary files a/src/settingsui/icons/Heartbeat_qt_1x.png and /dev/null differ diff --git a/src/settingsui/icons/Keyboard_qt_1x.png b/src/settingsui/icons/Keyboard_qt_1x.png deleted file mode 100644 index cc6417d..0000000 Binary files a/src/settingsui/icons/Keyboard_qt_1x.png and /dev/null differ diff --git a/src/settingsui/icons/Laptop_qt_1x.png b/src/settingsui/icons/Laptop_qt_1x.png deleted file mode 100644 index 2924015..0000000 Binary files a/src/settingsui/icons/Laptop_qt_1x.png and /dev/null differ diff --git a/src/settingsui/icons/Microphone_qt_1x.png b/src/settingsui/icons/Microphone_qt_1x.png deleted file mode 100644 index f76a963..0000000 Binary files a/src/settingsui/icons/Microphone_qt_1x.png and /dev/null differ diff --git a/src/settingsui/icons/MobilePhone_qt_1x.png b/src/settingsui/icons/MobilePhone_qt_1x.png deleted file mode 100644 index 363d667..0000000 Binary files a/src/settingsui/icons/MobilePhone_qt_1x.png and /dev/null differ diff --git a/src/settingsui/icons/Mouse_qt_1x.png b/src/settingsui/icons/Mouse_qt_1x.png deleted file mode 100644 index 24d057d..0000000 Binary files a/src/settingsui/icons/Mouse_qt_1x.png and /dev/null differ diff --git a/src/settingsui/icons/Power_black_1x.png b/src/settingsui/icons/Power_black_1x.png deleted file mode 100644 index cca0fe8..0000000 Binary files a/src/settingsui/icons/Power_black_1x.png and /dev/null differ diff --git a/src/settingsui/icons/Tablet_qt_1x.png b/src/settingsui/icons/Tablet_qt_1x.png deleted file mode 100644 index e218184..0000000 Binary files a/src/settingsui/icons/Tablet_qt_1x.png and /dev/null differ diff --git a/src/settingsui/icons/Volume_down_qt_1x.png b/src/settingsui/icons/Volume_down_qt_1x.png deleted file mode 100644 index 2068819..0000000 Binary files a/src/settingsui/icons/Volume_down_qt_1x.png and /dev/null differ diff --git a/src/settingsui/icons/Volume_mute_qt_1x.png b/src/settingsui/icons/Volume_mute_qt_1x.png deleted file mode 100644 index 1a41927..0000000 Binary files a/src/settingsui/icons/Volume_mute_qt_1x.png and /dev/null differ diff --git a/src/settingsui/icons/Volume_up_qt_1x.png b/src/settingsui/icons/Volume_up_qt_1x.png deleted file mode 100644 index 45a8b61..0000000 Binary files a/src/settingsui/icons/Volume_up_qt_1x.png and /dev/null differ diff --git a/src/settingsui/icons/WifiAnim_black_2x.png b/src/settingsui/icons/WifiAnim_black_2x.png deleted file mode 100644 index 76c850d..0000000 Binary files a/src/settingsui/icons/WifiAnim_black_2x.png and /dev/null differ diff --git a/src/settingsui/icons/Wifi_lightgray_2x.png b/src/settingsui/icons/Wifi_lightgray_2x.png deleted file mode 100644 index 3e6183a..0000000 Binary files a/src/settingsui/icons/Wifi_lightgray_2x.png and /dev/null differ diff --git a/src/settingsui/icons/World_qt_6x.png b/src/settingsui/icons/World_qt_6x.png deleted file mode 100644 index 9024031..0000000 Binary files a/src/settingsui/icons/World_qt_6x.png and /dev/null differ diff --git a/src/settingsui/icons/generate_icons.sh b/src/settingsui/icons/generate_icons.sh deleted file mode 100755 index 55867b8..0000000 --- a/src/settingsui/icons/generate_icons.sh +++ /dev/null @@ -1,27 +0,0 @@ -############################################################################ -## -## Copyright (C) 2015 Digia Plc -## All rights reserved. -## For any questions to Digia, please use the contact form at -## http://www.qt.io -## -## This file is part of Qt Enterprise Embedded. -## -## Licensees holding valid Qt Enterprise licenses may use this file in -## accordance with the Qt Enterprise License Agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. -## -## If you have questions regarding the use of this file, please use -## the contact form at http://www.qt.io -## -############################################################################# -#!/bin/bash -# -# This script resizes and sets correct brand colors for the icons in ref folder -# - -./scripts/cimages.sh ./ref/*.png -./scripts/cimage.sh ./ref/extra/Alert.png red -./scripts/cimage.sh ./ref/extra/Alert.png yellow -./scripts/rimages.sh *.png diff --git a/src/settingsui/icons/ref/Audio.png b/src/settingsui/icons/ref/Audio.png deleted file mode 100644 index 8434f0a..0000000 Binary files a/src/settingsui/icons/ref/Audio.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Back.png b/src/settingsui/icons/ref/Back.png deleted file mode 100644 index 9029fd0..0000000 Binary files a/src/settingsui/icons/ref/Back.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Bluetooth.png b/src/settingsui/icons/ref/Bluetooth.png deleted file mode 100644 index e7c80a9..0000000 Binary files a/src/settingsui/icons/ref/Bluetooth.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Camcorder.png b/src/settingsui/icons/ref/Camcorder.png deleted file mode 100644 index 8c317a2..0000000 Binary files a/src/settingsui/icons/ref/Camcorder.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Camera.png b/src/settingsui/icons/ref/Camera.png deleted file mode 100644 index c71ab25..0000000 Binary files a/src/settingsui/icons/ref/Camera.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Chevron-left.png b/src/settingsui/icons/ref/Chevron-left.png deleted file mode 100644 index 95006f4..0000000 Binary files a/src/settingsui/icons/ref/Chevron-left.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Chevron-right.png b/src/settingsui/icons/ref/Chevron-right.png deleted file mode 100644 index 2860e9a..0000000 Binary files a/src/settingsui/icons/ref/Chevron-right.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Circle-x.png b/src/settingsui/icons/ref/Circle-x.png deleted file mode 100644 index 2bbfa97..0000000 Binary files a/src/settingsui/icons/ref/Circle-x.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Clock.png b/src/settingsui/icons/ref/Clock.png deleted file mode 100644 index 1dae63e..0000000 Binary files a/src/settingsui/icons/ref/Clock.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Cogs.png b/src/settingsui/icons/ref/Cogs.png deleted file mode 100644 index feaae50..0000000 Binary files a/src/settingsui/icons/ref/Cogs.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Connections.png b/src/settingsui/icons/ref/Connections.png deleted file mode 100644 index b042d3c..0000000 Binary files a/src/settingsui/icons/ref/Connections.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Display.png b/src/settingsui/icons/ref/Display.png deleted file mode 100644 index cf1251a..0000000 Binary files a/src/settingsui/icons/ref/Display.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Flag.png b/src/settingsui/icons/ref/Flag.png deleted file mode 100644 index 485ed48..0000000 Binary files a/src/settingsui/icons/ref/Flag.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Headphones.png b/src/settingsui/icons/ref/Headphones.png deleted file mode 100644 index 9e5c483..0000000 Binary files a/src/settingsui/icons/ref/Headphones.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Heartbeat.png b/src/settingsui/icons/ref/Heartbeat.png deleted file mode 100644 index 168135e..0000000 Binary files a/src/settingsui/icons/ref/Heartbeat.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Keyboard.png b/src/settingsui/icons/ref/Keyboard.png deleted file mode 100644 index c814e8e..0000000 Binary files a/src/settingsui/icons/ref/Keyboard.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Laptop.png b/src/settingsui/icons/ref/Laptop.png deleted file mode 100644 index 465bb54..0000000 Binary files a/src/settingsui/icons/ref/Laptop.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Lock.png b/src/settingsui/icons/ref/Lock.png deleted file mode 100644 index 6afb6ac..0000000 Binary files a/src/settingsui/icons/ref/Lock.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Microphone.png b/src/settingsui/icons/ref/Microphone.png deleted file mode 100644 index 63cb500..0000000 Binary files a/src/settingsui/icons/ref/Microphone.png and /dev/null differ diff --git a/src/settingsui/icons/ref/MobilePhone.png b/src/settingsui/icons/ref/MobilePhone.png deleted file mode 100644 index b186c09..0000000 Binary files a/src/settingsui/icons/ref/MobilePhone.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Mouse.png b/src/settingsui/icons/ref/Mouse.png deleted file mode 100644 index 146305b..0000000 Binary files a/src/settingsui/icons/ref/Mouse.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Plus.png b/src/settingsui/icons/ref/Plus.png deleted file mode 100644 index 391fe94..0000000 Binary files a/src/settingsui/icons/ref/Plus.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Power.png b/src/settingsui/icons/ref/Power.png deleted file mode 100644 index b54a084..0000000 Binary files a/src/settingsui/icons/ref/Power.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Settings.png b/src/settingsui/icons/ref/Settings.png deleted file mode 100644 index d8b255c..0000000 Binary files a/src/settingsui/icons/ref/Settings.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Tablet.png b/src/settingsui/icons/ref/Tablet.png deleted file mode 100644 index 71b0065..0000000 Binary files a/src/settingsui/icons/ref/Tablet.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Volume_down.png b/src/settingsui/icons/ref/Volume_down.png deleted file mode 100644 index 0773b1d..0000000 Binary files a/src/settingsui/icons/ref/Volume_down.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Volume_mute.png b/src/settingsui/icons/ref/Volume_mute.png deleted file mode 100644 index 36ab384..0000000 Binary files a/src/settingsui/icons/ref/Volume_mute.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Volume_up.png b/src/settingsui/icons/ref/Volume_up.png deleted file mode 100644 index 61eebbd..0000000 Binary files a/src/settingsui/icons/ref/Volume_up.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Wifi.png b/src/settingsui/icons/ref/Wifi.png deleted file mode 100644 index 5d1e0d9..0000000 Binary files a/src/settingsui/icons/ref/Wifi.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Wifi1.png b/src/settingsui/icons/ref/Wifi1.png deleted file mode 100644 index f1b1489..0000000 Binary files a/src/settingsui/icons/ref/Wifi1.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Wifi2.png b/src/settingsui/icons/ref/Wifi2.png deleted file mode 100644 index a22b472..0000000 Binary files a/src/settingsui/icons/ref/Wifi2.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Wifi3.png b/src/settingsui/icons/ref/Wifi3.png deleted file mode 100644 index 76d412b..0000000 Binary files a/src/settingsui/icons/ref/Wifi3.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Wifi4.png b/src/settingsui/icons/ref/Wifi4.png deleted file mode 100644 index 5d1e0d9..0000000 Binary files a/src/settingsui/icons/ref/Wifi4.png and /dev/null differ diff --git a/src/settingsui/icons/ref/WifiAnim.png b/src/settingsui/icons/ref/WifiAnim.png deleted file mode 100644 index 0694f63..0000000 Binary files a/src/settingsui/icons/ref/WifiAnim.png and /dev/null differ diff --git a/src/settingsui/icons/ref/World.png b/src/settingsui/icons/ref/World.png deleted file mode 100644 index cf6eaf0..0000000 Binary files a/src/settingsui/icons/ref/World.png and /dev/null differ diff --git a/src/settingsui/icons/ref/Wrench.png b/src/settingsui/icons/ref/Wrench.png deleted file mode 100644 index 5b6e1c6..0000000 Binary files a/src/settingsui/icons/ref/Wrench.png and /dev/null differ diff --git a/src/settingsui/icons/ref/extra/Alert.png b/src/settingsui/icons/ref/extra/Alert.png deleted file mode 100644 index 80914fc..0000000 Binary files a/src/settingsui/icons/ref/extra/Alert.png and /dev/null differ diff --git a/src/settingsui/icons/scripts/cimage.sh b/src/settingsui/icons/scripts/cimage.sh deleted file mode 100755 index ae73622..0000000 --- a/src/settingsui/icons/scripts/cimage.sh +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################ -## -## Copyright (C) 2015 Digia Plc -## All rights reserved. -## For any questions to Digia, please use the contact form at -## http://www.qt.io -## -## This file is part of Qt Enterprise Embedded. -## -## Licensees holding valid Qt Enterprise licenses may use this file in -## accordance with the Qt Enterprise License Agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. -## -## If you have questions regarding the use of this file, please use -## the contact form at http://www.qt.io -## -############################################################################# -#!/bin/bash - -fullfile=$1 -filename=$(basename "$fullfile") -extension="${filename##*.}" -filename="${filename%.*}" - -color=$2 -if [ "$color" = "qt" ]; then - fill='rgb(128,195,66)' -elif [ "$color" = "black" ]; then - fill='rgb(32,40,42)' -elif [ "$color" = "white" ]; then - fill='rgb(255,255,255)' -elif [ "$color" = "lightgray" ]; then - fill='rgb(214,214,214)' -elif [ "$color" = "red" ]; then - fill='rgb(228,30,37)' -elif [ "$color" = "yellow" ]; then - fill='rgb(250,206,32)' -else - fill="black" -fi - -separator="_" - -convert $fullfile -fuzz 100% -fill $fill -opaque black $filename$separator$color.$extension diff --git a/src/settingsui/icons/scripts/cimages.sh b/src/settingsui/icons/scripts/cimages.sh deleted file mode 100755 index 94ac1cd..0000000 --- a/src/settingsui/icons/scripts/cimages.sh +++ /dev/null @@ -1,28 +0,0 @@ -############################################################################ -## -## Copyright (C) 2015 Digia Plc -## All rights reserved. -## For any questions to Digia, please use the contact form at -## http://www.qt.io -## -## This file is part of Qt Enterprise Embedded. -## -## Licensees holding valid Qt Enterprise licenses may use this file in -## accordance with the Qt Enterprise License Agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. -## -## If you have questions regarding the use of this file, please use -## the contact form at http://www.qt.io -## -############################################################################# -#!/bin/bash - -for dir in "$@" -do - echo "$dir" - scripts/cimage.sh $dir qt - scripts/cimage.sh $dir black - scripts/cimage.sh $dir white - scripts/cimage.sh $dir lightgray -done diff --git a/src/settingsui/icons/scripts/rimage.sh b/src/settingsui/icons/scripts/rimage.sh deleted file mode 100755 index d98088f..0000000 --- a/src/settingsui/icons/scripts/rimage.sh +++ /dev/null @@ -1,37 +0,0 @@ -############################################################################ -## -## Copyright (C) 2015 Digia Plc -## All rights reserved. -## For any questions to Digia, please use the contact form at -## http://www.qt.io -## -## This file is part of Qt Enterprise Embedded. -## -## Licensees holding valid Qt Enterprise licenses may use this file in -## accordance with the Qt Enterprise License Agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. -## -## If you have questions regarding the use of this file, please use -## the contact form at http://www.qt.io -## -############################################################################# -#!/bin/bash -fullfile=$1 -filename=$(basename "$fullfile") -extension="${filename##*.}" -filename="${filename%.*}" - -postix="_1x" -convert $fullfile -resize x16 $filename$postix.$extension -postix="_2x" -convert $fullfile -resize x32 $filename$postix.$extension -postix="_3x" -convert $fullfile -resize x48 $filename$postix.$extension -postix="_4x" -convert $fullfile -resize x64 $filename$postix.$extension -postix="_5x" -convert $fullfile -resize x80 $filename$postix.$extension -postix="_6x" -convert $fullfile -resize x96 $filename$postix.$extension - diff --git a/src/settingsui/icons/scripts/rimages.sh b/src/settingsui/icons/scripts/rimages.sh deleted file mode 100755 index 7b76da8..0000000 --- a/src/settingsui/icons/scripts/rimages.sh +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################ -## -## Copyright (C) 2015 Digia Plc -## All rights reserved. -## For any questions to Digia, please use the contact form at -## http://www.qt.io -## -## This file is part of Qt Enterprise Embedded. -## -## Licensees holding valid Qt Enterprise licenses may use this file in -## accordance with the Qt Enterprise License Agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. -## -## If you have questions regarding the use of this file, please use -## the contact form at http://www.qt.io -## -############################################################################# -#!/bin/bash - -for dir in "$@" -do - echo "$dir" - scripts/rimage.sh $dir -done diff --git a/src/settingsui/locale/Language.qml b/src/settingsui/locale/Language.qml index bdcfbef..feee1b8 100644 --- a/src/settingsui/locale/Language.qml +++ b/src/settingsui/locale/Language.qml @@ -35,9 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 import com.theqtcompany.settings.locale 1.0 import QtQml 2.2 diff --git a/src/settingsui/locale/RegionSelect.qml b/src/settingsui/locale/RegionSelect.qml index 9282177..9f998c6 100644 --- a/src/settingsui/locale/RegionSelect.qml +++ b/src/settingsui/locale/RegionSelect.qml @@ -35,9 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 import com.theqtcompany.settings.locale 1.0 import "../common" diff --git a/src/settingsui/main.cpp b/src/settingsui/main.cpp index 9b26327..d2150ac 100644 --- a/src/settingsui/main.cpp +++ b/src/settingsui/main.cpp @@ -1,38 +1,46 @@ /**************************************************************************** ** ** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ +** Contact: http://www.qt.io/licensing/ ** -** This file is part of the FOO module of the Qt Toolkit. +** This file is part of the Qt Device Utilities module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. ** ** $QT_END_LICENSE$ ** ****************************************************************************/ - #include #include int main(int argc, char *argv[]) { + qputenv("QT_IM_MODULE", QByteArray("qtvirtualkeyboard")); QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QGuiApplication app(argc, argv); QQmlApplicationEngine engine; diff --git a/src/settingsui/main.qml b/src/settingsui/main.qml index 1ed1138..a194c4f 100644 --- a/src/settingsui/main.qml +++ b/src/settingsui/main.qml @@ -1,241 +1,143 @@ /**************************************************************************** ** ** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ +** Contact: http://www.qt.io/licensing/ ** -** This file is part of the FOO module of the Qt Toolkit. +** This file is part of the Qt Device Utilities module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. ** ** $QT_END_LICENSE$ ** ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 -import Qt.labs.settings 1.0 -import QtQuick.XmlListModel 2.0 +import QtQuick.Window 2.2 +import com.theqtcompany.settingsui 1.0 import QtQuick.Enterprise.VirtualKeyboard 2.0 -import com.theqtcompany.localdevice 1.0 import "common" -ApplicationWindow { - id: root - title: qsTr("Device settings") - width: 800 - height: 600 +Window { + id: window visible: true - property var service - - header: ToolBar { - id: titlebar - property string title: "" - - RowLayout { - spacing: 20 - anchors.fill: parent - - ToolButton { - label: Image { - source: "../icons/Chevron-left_black_1x.png" - anchors.centerIn: parent - } - visible: stackView.depth > 1 - onClicked: stackView.pop(); - } - Label { - id: titleText - font.pixelSize: 20 - text: stackView.currentItem.title - horizontalAlignment: Qt.AlignHCenter - verticalAlignment: Qt.AlignVCenter - anchors.centerIn: parent - } - ToolButton { - label: Image { - source: "../icons/Power_black_1x.png" - anchors.centerIn: parent - } - anchors.right: parent.right - - visible: stackView.depth === 1 - onClicked: menu.open(); - - Menu { - id: menu - x: parent.width - width - - MenuItem { - text: qsTr("Reboot") - onTriggered: LocalDevice.reboot() - } - MenuItem { - text: qsTr("Shutdown") - onTriggered: LocalDevice.powerOff() - } - } - } - } - } - StackView { - id: stackView - initialItem: mainView - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.left: parent.left - anchors.right: parent.right - - Behavior on anchors.topMargin { NumberAnimation { duration: 250; easing.type: Easing.InOutQuad }} - - Component { - id: mainView - - Item { - property string title: qsTr("Device Settings") - - XmlListModel { - id: xmlModel - source: "settingsview.xml" - query: "/xml/settings/item" - XmlRole { name: "title"; query: "title/string()"} - XmlRole { name: "icon"; query: "icon/string()"} - XmlRole { name: "view"; query: "view/string()"} - XmlRole { name: "path"; query: "path/string()"} - } - GridView { - id: grid - anchors.fill: parent - anchors.margins: 40 - cellHeight: 133 + spacing - cellWidth: 117 + spacing - model: xmlModel - property int spacing: 20 - delegate: MouseArea { - width: grid.cellWidth - grid.spacing - height: grid.cellHeight - grid.spacing - Rectangle { - anchors.fill: parent - color: "#d6d6d6" - radius: 5 - visible: pressed - } - Column { - anchors.fill: parent - anchors.topMargin: 10 - Image { - id: image - source: icon - anchors.horizontalCenter: parent.horizontalCenter - width: grid.cellWidth - fillMode: Image.PreserveAspectFit - } - Label { - text: title - anchors.horizontalCenter: parent.horizontalCenter - font.pixelSize: grid.cellHeight * .1 - } - } - onClicked: { - var component = Qt.createComponent(path + '/' +view+'.qml'); - stackView.push(component.createObject(stackView)); - titlebar.title = title - } - } - } - } - } - } - - property var inputItem: InputContext.inputItem - - HandwritingInputPanel { - - id: handwritingInputPanel + Item { + id: root anchors.fill: parent - inputPanel: inputPanel - Rectangle { - z: -1 + SettingsUI { + id: settingsUI anchors.fill: parent - color: "black" - opacity: 0.10 + anchors.bottomMargin: parent.height - inputPanel.y } - onAvailableChanged: { - if (!available) - inputPanel.ensureVisible() - } - } - Item { - visible: handwritingInputPanel.enabled && Qt.inputMethod.visible - anchors { left: parent.left; top: parent.top; right: parent.right; bottom: inputPanel.top; } + /* Handwriting input panel for full screen handwriting input. - HandwritingModeButton { - id: handwritingModeButton - anchors.top: parent.top - anchors.right: parent.right - anchors.margins: 10 - floating: true - flipable: true - width: 76 - height: width - state: handwritingInputPanel.state - onClicked: handwritingInputPanel.active = !handwritingInputPanel.active - onDoubleClicked: handwritingInputPanel.available = !handwritingInputPanel.available - } - } - InputPanel { - id: inputPanel - y: active ? parent.height - inputPanel.height : parent.height - anchors.left: parent.left - anchors.right: parent.right - - Behavior on y { NumberAnimation {duration: 250; easing.type: Easing.InOutQuad}} + This component is an optional add-on for the InputPanel component, that + is, its use does not affect the operation of the InputPanel component, + but it also can not be used as a standalone component. - property var inputItem: InputContext.inputItem + The handwriting input panel is positioned to cover the entire area of + application. The panel itself is transparent, but once it is active the + user can draw handwriting on it. + */ - onInputItemChanged: { - if (handwritingInputPanel.available) - return; - - if (inputItem) { - ensureVisible() + HandwritingInputPanel { + z: 79 + id: handwritingInputPanel + anchors.fill: parent + inputPanel: inputPanel + Rectangle { + z: -1 + anchors.fill: parent + color: "black" + opacity: 0.10 } } - onActiveChanged: { - if (!active) { - stackView.anchors.topMargin = 0 - - if (!handwritingInputPanel.available && inputItem) - inputItem.focus = false + /* Container area for the handwriting mode button. + + Handwriting mode button can be moved freely within the container area. + In this example, a single click changes the handwriting mode and a + double-click changes the availability of the full screen handwriting input. + */ + Item { + z: 89 + visible: handwritingInputPanel.enabled && Qt.inputMethod.visible + anchors { left: parent.left; top: parent.top; right: parent.right; bottom: inputPanel.top; } + HandwritingModeButton { + id: handwritingModeButton + anchors.top: parent.top + anchors.right: parent.right + anchors.margins: 10 + floating: true + flipable: true + width: 76 + height: width + state: handwritingInputPanel.state + onClicked: handwritingInputPanel.active = !handwritingInputPanel.active + onDoubleClicked: handwritingInputPanel.available = !handwritingInputPanel.available } } - function ensureVisible() { - var mapped = inputItem.mapToItem(handwritingInputPanel, 0,0) - if (mapped.y > (handwritingInputPanel.height-inputPanel.height-40)) { - stackView.anchors.topMargin = -inputPanel.height + /* Keyboard input panel. + The keyboard is anchored to the bottom of the application. + */ + InputPanel { + id: inputPanel + z: 99 + y: root.height + anchors.left: root.left + anchors.right: root.right + + states: State { + name: "visible" + /* The visibility of the InputPanel can be bound to the Qt.inputMethod.visible property, + but then the handwriting input panel and the keyboard input panel can be visible + at the same time. Here the visibility is bound to InputPanel.active property instead, + which allows the handwriting panel to control the visibility when necessary. + */ + when: inputPanel.active + PropertyChanges { + target: inputPanel + y: root.height - inputPanel.height + } + } + transitions: Transition { + from: "" + to: "visible" + reversible: true + ParallelAnimation { + NumberAnimation { + properties: "y" + duration: 250 + easing.type: Easing.InOutQuad + } + } } + AutoScroller {} } } } diff --git a/src/settingsui/network/AddressListEntry.qml b/src/settingsui/network/AddressListEntry.qml index 45c161f..312fc36 100644 --- a/src/settingsui/network/AddressListEntry.qml +++ b/src/settingsui/network/AddressListEntry.qml @@ -35,9 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 RowLayout { id: root diff --git a/src/settingsui/network/ComboBoxEntry.qml b/src/settingsui/network/ComboBoxEntry.qml index 791f2d5..edefcd3 100644 --- a/src/settingsui/network/ComboBoxEntry.qml +++ b/src/settingsui/network/ComboBoxEntry.qml @@ -35,9 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 RowLayout { id: root diff --git a/src/settingsui/network/EditWiredSettings.qml b/src/settingsui/network/EditWiredSettings.qml index 48a6abb..b2420ff 100644 --- a/src/settingsui/network/EditWiredSettings.qml +++ b/src/settingsui/network/EditWiredSettings.qml @@ -35,9 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 import com.theqtcompany.settings.network 1.0 Item { diff --git a/src/settingsui/network/IpAddressTextField.qml b/src/settingsui/network/IpAddressTextField.qml index e7e90ab..b76598c 100644 --- a/src/settingsui/network/IpAddressTextField.qml +++ b/src/settingsui/network/IpAddressTextField.qml @@ -35,9 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 TextField { Layout.fillWidth: true diff --git a/src/settingsui/network/NetworkDetails.qml b/src/settingsui/network/NetworkDetails.qml index 3e71be0..33bdf69 100644 --- a/src/settingsui/network/NetworkDetails.qml +++ b/src/settingsui/network/NetworkDetails.qml @@ -33,7 +33,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.6 Loader { id: root diff --git a/src/settingsui/network/NetworkSettings.qml b/src/settingsui/network/NetworkSettings.qml index 4fb1c0f..87df833 100644 --- a/src/settingsui/network/NetworkSettings.qml +++ b/src/settingsui/network/NetworkSettings.qml @@ -35,9 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 import com.theqtcompany.settings.network 1.0 Item { @@ -81,9 +79,8 @@ Item { id: btn Layout.fillWidth: true implicitHeight: 54 - checkable: true - label: Rectangle { + contentItem: Rectangle { color: checked ? "#80c342" : "white" border.color: "#bdbebf" border.width: 1 diff --git a/src/settingsui/network/WifiSelectorDelegate.qml b/src/settingsui/network/WifiSelectorDelegate.qml index 17ec931..1f08d4b 100644 --- a/src/settingsui/network/WifiSelectorDelegate.qml +++ b/src/settingsui/network/WifiSelectorDelegate.qml @@ -35,15 +35,12 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 import com.theqtcompany.settings.network 1.0 ItemDelegate { id: root autoExclusive: true - checkable: true property bool connect: modelData["connected"] width: parent.width contentItem: Item { diff --git a/src/settingsui/network/WifiSettings.qml b/src/settingsui/network/WifiSettings.qml index 8ad1517..a78a5e5 100644 --- a/src/settingsui/network/WifiSettings.qml +++ b/src/settingsui/network/WifiSettings.qml @@ -35,9 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 import com.theqtcompany.settings.network 1.0 Item { @@ -107,7 +105,7 @@ Item { property alias text: text.text Image { - source: "Alert_yellow_1x.png" + source: "../icons/Alert_yellow_1x.png" Layout.alignment: Qt.AlignVCenter } Text { diff --git a/src/settingsui/network/WifiSignalMonitor.qml b/src/settingsui/network/WifiSignalMonitor.qml index 40a0837..6059e96 100644 --- a/src/settingsui/network/WifiSignalMonitor.qml +++ b/src/settingsui/network/WifiSignalMonitor.qml @@ -65,7 +65,7 @@ Item { id: sprite property int currentFrame: 0 anchors.fill: parent - source: "Wifi_lightgray_2x.png" + source: "../icons/Wifi_lightgray_2x.png" clip: true Timer { @@ -84,7 +84,7 @@ Item { Image { height: parent.height width: parent.width * 4 - source: "WifiAnim_black_2x.png" + source: "../icons/WifiAnim_black_2x.png" x: -parent.currentFrame * width / 4 } } diff --git a/src/settingsui/network/WiredSettings.qml b/src/settingsui/network/WiredSettings.qml index 9359484..294e1a2 100644 --- a/src/settingsui/network/WiredSettings.qml +++ b/src/settingsui/network/WiredSettings.qml @@ -35,9 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 import com.theqtcompany.settings.network 1.0 Item { @@ -132,10 +130,14 @@ Item { onAccepted: if (text.length > 0) service.ipv4.gateway = text } Label { + Layout.alignment: Qt.AlignTop text: qsTr("DNS server: ") } - Row { + Column { spacing: 10 + Layout.fillWidth: true + Layout.alignment: Qt.AlignTop + Repeater { model: service.nameservers diff --git a/src/settingsui/qml.qrc b/src/settingsui/qml.qrc deleted file mode 100644 index cd5d5af..0000000 --- a/src/settingsui/qml.qrc +++ /dev/null @@ -1,28 +0,0 @@ - - - main.qml - settingsview.xml - network/EditWiredSettings.qml - network/IpAddressTextField.qml - network/NetworkDetails.qml - network/NetworkSettings.qml - network/WifiSelectorDelegate.qml - network/WifiSettings.qml - network/WifiSignalMonitor.qml - network/WiredSettings.qml - bluetooth/Bluetooth.qml - bluetooth/Discovery.qml - display/Display.qml - locale/RegionSelect.qml - locale/Language.qml - timedate/AnalogClock.qml - timedate/TimeDate.qml - timedate/TimezonesView.qml - network/AddressListEntry.qml - network/ComboBoxEntry.qml - timedate/CustomCalendar.qml - common/CustomTableView.qml - common/HandwritingModeButton.qml - timedate/ClockHand.qml - - diff --git a/src/settingsui/settingsui.pro b/src/settingsui/settingsui.pro index 026d911..51b6dca 100644 --- a/src/settingsui/settingsui.pro +++ b/src/settingsui/settingsui.pro @@ -4,14 +4,10 @@ QT += qml quick SOURCES += main.cpp RESOURCES += \ - qml.qrc \ - icons.qrc + settingsuiapp.qrc # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = # Default rules for deployment. include(deployment.pri) - -DISTFILES += \ - settingsview.xml diff --git a/src/settingsui/settingsuiapp.qrc b/src/settingsui/settingsuiapp.qrc new file mode 100644 index 0000000..58687e0 --- /dev/null +++ b/src/settingsui/settingsuiapp.qrc @@ -0,0 +1,7 @@ + + + main.qml + common/HandwritingModeButton.qml + AutoScroller.qml + + diff --git a/src/settingsui/settingsuiplugin/icons.qrc b/src/settingsui/settingsuiplugin/icons.qrc new file mode 100644 index 0000000..639af66 --- /dev/null +++ b/src/settingsui/settingsuiplugin/icons.qrc @@ -0,0 +1,33 @@ + + + icons/Alert_yellow_1x.png + icons/Audio_qt_6x.png + icons/Bluetooth_qt_1x.png + icons/Bluetooth_qt_6x.png + icons/Camcorder_qt_1x.png + icons/Camera_qt_1x.png + icons/Chevron-left_black_1x.png + icons/Clock_qt_1x.png + icons/Clock_qt_6x.png + icons/Display_qt_6x.png + icons/Flag_qt_6x.png + icons/FloatingButton_Active.png + icons/FloatingButton_Available.png + icons/FloatingButton_Unavailable.png + icons/Headphones_qt_1x.png + icons/Heartbeat_qt_1x.png + icons/Keyboard_qt_1x.png + icons/Laptop_qt_1x.png + icons/Microphone_qt_1x.png + icons/MobilePhone_qt_1x.png + icons/Mouse_qt_1x.png + icons/Power_black_1x.png + icons/Tablet_qt_1x.png + icons/Volume_down_qt_1x.png + icons/Volume_mute_qt_1x.png + icons/Volume_up_qt_1x.png + icons/WifiAnim_black_2x.png + icons/Wifi_lightgray_2x.png + icons/World_qt_6x.png + + diff --git a/src/settingsui/settingsuiplugin/icons/Alert_yellow_1x.png b/src/settingsui/settingsuiplugin/icons/Alert_yellow_1x.png new file mode 100644 index 0000000..2306ff6 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Alert_yellow_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Audio_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Audio_qt_6x.png new file mode 100644 index 0000000..8251129 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Audio_qt_6x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_1x.png new file mode 100644 index 0000000..af6968d Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_6x.png new file mode 100644 index 0000000..55e4fb1 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_6x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Camcorder_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Camcorder_qt_1x.png new file mode 100644 index 0000000..7ffb2c8 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Camcorder_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Camera_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Camera_qt_1x.png new file mode 100644 index 0000000..b84e53a Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Camera_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Chevron-left_black_1x.png b/src/settingsui/settingsuiplugin/icons/Chevron-left_black_1x.png new file mode 100644 index 0000000..225176b Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Chevron-left_black_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Clock_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Clock_qt_1x.png new file mode 100644 index 0000000..ee58f95 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Clock_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Clock_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Clock_qt_6x.png new file mode 100644 index 0000000..aba8b60 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Clock_qt_6x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Display_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Display_qt_6x.png new file mode 100644 index 0000000..e45c45c Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Display_qt_6x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Flag_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Flag_qt_6x.png new file mode 100644 index 0000000..f549ebd Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Flag_qt_6x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/FloatingButton_Active.png b/src/settingsui/settingsuiplugin/icons/FloatingButton_Active.png new file mode 100755 index 0000000..9b55146 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/FloatingButton_Active.png differ diff --git a/src/settingsui/settingsuiplugin/icons/FloatingButton_Available.png b/src/settingsui/settingsuiplugin/icons/FloatingButton_Available.png new file mode 100755 index 0000000..1479881 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/FloatingButton_Available.png differ diff --git a/src/settingsui/settingsuiplugin/icons/FloatingButton_Unavailable.png b/src/settingsui/settingsuiplugin/icons/FloatingButton_Unavailable.png new file mode 100755 index 0000000..33aa87d Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/FloatingButton_Unavailable.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Headphones_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Headphones_qt_1x.png new file mode 100644 index 0000000..82b04e7 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Headphones_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Heartbeat_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Heartbeat_qt_1x.png new file mode 100644 index 0000000..16a94bc Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Heartbeat_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Keyboard_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Keyboard_qt_1x.png new file mode 100644 index 0000000..cc6417d Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Keyboard_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Laptop_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Laptop_qt_1x.png new file mode 100644 index 0000000..2924015 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Laptop_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Microphone_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Microphone_qt_1x.png new file mode 100644 index 0000000..f76a963 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Microphone_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/MobilePhone_qt_1x.png b/src/settingsui/settingsuiplugin/icons/MobilePhone_qt_1x.png new file mode 100644 index 0000000..363d667 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/MobilePhone_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Mouse_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Mouse_qt_1x.png new file mode 100644 index 0000000..24d057d Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Mouse_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Power_black_1x.png b/src/settingsui/settingsuiplugin/icons/Power_black_1x.png new file mode 100644 index 0000000..cca0fe8 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Power_black_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Tablet_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Tablet_qt_1x.png new file mode 100644 index 0000000..e218184 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Tablet_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Volume_down_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Volume_down_qt_1x.png new file mode 100644 index 0000000..2068819 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Volume_down_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Volume_mute_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Volume_mute_qt_1x.png new file mode 100644 index 0000000..1a41927 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Volume_mute_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Volume_up_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Volume_up_qt_1x.png new file mode 100644 index 0000000..45a8b61 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Volume_up_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/WifiAnim_black_2x.png b/src/settingsui/settingsuiplugin/icons/WifiAnim_black_2x.png new file mode 100644 index 0000000..76c850d Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/WifiAnim_black_2x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Wifi_lightgray_2x.png b/src/settingsui/settingsuiplugin/icons/Wifi_lightgray_2x.png new file mode 100644 index 0000000..3e6183a Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Wifi_lightgray_2x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/World_qt_6x.png b/src/settingsui/settingsuiplugin/icons/World_qt_6x.png new file mode 100644 index 0000000..9024031 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/World_qt_6x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/generate_icons.sh b/src/settingsui/settingsuiplugin/icons/generate_icons.sh new file mode 100755 index 0000000..55867b8 --- /dev/null +++ b/src/settingsui/settingsuiplugin/icons/generate_icons.sh @@ -0,0 +1,27 @@ +############################################################################ +## +## Copyright (C) 2015 Digia Plc +## All rights reserved. +## For any questions to Digia, please use the contact form at +## http://www.qt.io +## +## This file is part of Qt Enterprise Embedded. +## +## Licensees holding valid Qt Enterprise licenses may use this file in +## accordance with the Qt Enterprise License Agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and Digia. +## +## If you have questions regarding the use of this file, please use +## the contact form at http://www.qt.io +## +############################################################################# +#!/bin/bash +# +# This script resizes and sets correct brand colors for the icons in ref folder +# + +./scripts/cimages.sh ./ref/*.png +./scripts/cimage.sh ./ref/extra/Alert.png red +./scripts/cimage.sh ./ref/extra/Alert.png yellow +./scripts/rimages.sh *.png diff --git a/src/settingsui/settingsuiplugin/icons/ref/Audio.png b/src/settingsui/settingsuiplugin/icons/ref/Audio.png new file mode 100644 index 0000000..8434f0a Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Audio.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Back.png b/src/settingsui/settingsuiplugin/icons/ref/Back.png new file mode 100644 index 0000000..9029fd0 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Back.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Bluetooth.png b/src/settingsui/settingsuiplugin/icons/ref/Bluetooth.png new file mode 100644 index 0000000..e7c80a9 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Bluetooth.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Camcorder.png b/src/settingsui/settingsuiplugin/icons/ref/Camcorder.png new file mode 100644 index 0000000..8c317a2 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Camcorder.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Camera.png b/src/settingsui/settingsuiplugin/icons/ref/Camera.png new file mode 100644 index 0000000..c71ab25 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Camera.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Chevron-left.png b/src/settingsui/settingsuiplugin/icons/ref/Chevron-left.png new file mode 100644 index 0000000..95006f4 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Chevron-left.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Chevron-right.png b/src/settingsui/settingsuiplugin/icons/ref/Chevron-right.png new file mode 100644 index 0000000..2860e9a Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Chevron-right.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Circle-x.png b/src/settingsui/settingsuiplugin/icons/ref/Circle-x.png new file mode 100644 index 0000000..2bbfa97 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Circle-x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Clock.png b/src/settingsui/settingsuiplugin/icons/ref/Clock.png new file mode 100644 index 0000000..1dae63e Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Clock.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Cogs.png b/src/settingsui/settingsuiplugin/icons/ref/Cogs.png new file mode 100644 index 0000000..feaae50 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Cogs.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Connections.png b/src/settingsui/settingsuiplugin/icons/ref/Connections.png new file mode 100644 index 0000000..b042d3c Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Connections.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Display.png b/src/settingsui/settingsuiplugin/icons/ref/Display.png new file mode 100644 index 0000000..cf1251a Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Display.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Flag.png b/src/settingsui/settingsuiplugin/icons/ref/Flag.png new file mode 100644 index 0000000..485ed48 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Flag.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Headphones.png b/src/settingsui/settingsuiplugin/icons/ref/Headphones.png new file mode 100644 index 0000000..9e5c483 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Headphones.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Heartbeat.png b/src/settingsui/settingsuiplugin/icons/ref/Heartbeat.png new file mode 100644 index 0000000..168135e Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Heartbeat.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Keyboard.png b/src/settingsui/settingsuiplugin/icons/ref/Keyboard.png new file mode 100644 index 0000000..c814e8e Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Keyboard.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Laptop.png b/src/settingsui/settingsuiplugin/icons/ref/Laptop.png new file mode 100644 index 0000000..465bb54 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Laptop.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Lock.png b/src/settingsui/settingsuiplugin/icons/ref/Lock.png new file mode 100644 index 0000000..6afb6ac Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Lock.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Microphone.png b/src/settingsui/settingsuiplugin/icons/ref/Microphone.png new file mode 100644 index 0000000..63cb500 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Microphone.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/MobilePhone.png b/src/settingsui/settingsuiplugin/icons/ref/MobilePhone.png new file mode 100644 index 0000000..b186c09 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/MobilePhone.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Mouse.png b/src/settingsui/settingsuiplugin/icons/ref/Mouse.png new file mode 100644 index 0000000..146305b Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Mouse.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Plus.png b/src/settingsui/settingsuiplugin/icons/ref/Plus.png new file mode 100644 index 0000000..391fe94 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Plus.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Power.png b/src/settingsui/settingsuiplugin/icons/ref/Power.png new file mode 100644 index 0000000..b54a084 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Power.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Settings.png b/src/settingsui/settingsuiplugin/icons/ref/Settings.png new file mode 100644 index 0000000..d8b255c Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Settings.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Tablet.png b/src/settingsui/settingsuiplugin/icons/ref/Tablet.png new file mode 100644 index 0000000..71b0065 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Tablet.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Volume_down.png b/src/settingsui/settingsuiplugin/icons/ref/Volume_down.png new file mode 100644 index 0000000..0773b1d Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Volume_down.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Volume_mute.png b/src/settingsui/settingsuiplugin/icons/ref/Volume_mute.png new file mode 100644 index 0000000..36ab384 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Volume_mute.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Volume_up.png b/src/settingsui/settingsuiplugin/icons/ref/Volume_up.png new file mode 100644 index 0000000..61eebbd Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Volume_up.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Wifi.png b/src/settingsui/settingsuiplugin/icons/ref/Wifi.png new file mode 100644 index 0000000..5d1e0d9 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Wifi.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Wifi1.png b/src/settingsui/settingsuiplugin/icons/ref/Wifi1.png new file mode 100644 index 0000000..f1b1489 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Wifi1.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Wifi2.png b/src/settingsui/settingsuiplugin/icons/ref/Wifi2.png new file mode 100644 index 0000000..a22b472 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Wifi2.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Wifi3.png b/src/settingsui/settingsuiplugin/icons/ref/Wifi3.png new file mode 100644 index 0000000..76d412b Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Wifi3.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Wifi4.png b/src/settingsui/settingsuiplugin/icons/ref/Wifi4.png new file mode 100644 index 0000000..5d1e0d9 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Wifi4.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/WifiAnim.png b/src/settingsui/settingsuiplugin/icons/ref/WifiAnim.png new file mode 100644 index 0000000..0694f63 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/WifiAnim.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/World.png b/src/settingsui/settingsuiplugin/icons/ref/World.png new file mode 100644 index 0000000..cf6eaf0 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/World.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/Wrench.png b/src/settingsui/settingsuiplugin/icons/ref/Wrench.png new file mode 100644 index 0000000..5b6e1c6 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/Wrench.png differ diff --git a/src/settingsui/settingsuiplugin/icons/ref/extra/Alert.png b/src/settingsui/settingsuiplugin/icons/ref/extra/Alert.png new file mode 100644 index 0000000..80914fc Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/ref/extra/Alert.png differ diff --git a/src/settingsui/settingsuiplugin/icons/scripts/cimage.sh b/src/settingsui/settingsuiplugin/icons/scripts/cimage.sh new file mode 100755 index 0000000..ae73622 --- /dev/null +++ b/src/settingsui/settingsuiplugin/icons/scripts/cimage.sh @@ -0,0 +1,45 @@ +############################################################################ +## +## Copyright (C) 2015 Digia Plc +## All rights reserved. +## For any questions to Digia, please use the contact form at +## http://www.qt.io +## +## This file is part of Qt Enterprise Embedded. +## +## Licensees holding valid Qt Enterprise licenses may use this file in +## accordance with the Qt Enterprise License Agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and Digia. +## +## If you have questions regarding the use of this file, please use +## the contact form at http://www.qt.io +## +############################################################################# +#!/bin/bash + +fullfile=$1 +filename=$(basename "$fullfile") +extension="${filename##*.}" +filename="${filename%.*}" + +color=$2 +if [ "$color" = "qt" ]; then + fill='rgb(128,195,66)' +elif [ "$color" = "black" ]; then + fill='rgb(32,40,42)' +elif [ "$color" = "white" ]; then + fill='rgb(255,255,255)' +elif [ "$color" = "lightgray" ]; then + fill='rgb(214,214,214)' +elif [ "$color" = "red" ]; then + fill='rgb(228,30,37)' +elif [ "$color" = "yellow" ]; then + fill='rgb(250,206,32)' +else + fill="black" +fi + +separator="_" + +convert $fullfile -fuzz 100% -fill $fill -opaque black $filename$separator$color.$extension diff --git a/src/settingsui/settingsuiplugin/icons/scripts/cimages.sh b/src/settingsui/settingsuiplugin/icons/scripts/cimages.sh new file mode 100755 index 0000000..94ac1cd --- /dev/null +++ b/src/settingsui/settingsuiplugin/icons/scripts/cimages.sh @@ -0,0 +1,28 @@ +############################################################################ +## +## Copyright (C) 2015 Digia Plc +## All rights reserved. +## For any questions to Digia, please use the contact form at +## http://www.qt.io +## +## This file is part of Qt Enterprise Embedded. +## +## Licensees holding valid Qt Enterprise licenses may use this file in +## accordance with the Qt Enterprise License Agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and Digia. +## +## If you have questions regarding the use of this file, please use +## the contact form at http://www.qt.io +## +############################################################################# +#!/bin/bash + +for dir in "$@" +do + echo "$dir" + scripts/cimage.sh $dir qt + scripts/cimage.sh $dir black + scripts/cimage.sh $dir white + scripts/cimage.sh $dir lightgray +done diff --git a/src/settingsui/settingsuiplugin/icons/scripts/rimage.sh b/src/settingsui/settingsuiplugin/icons/scripts/rimage.sh new file mode 100755 index 0000000..d98088f --- /dev/null +++ b/src/settingsui/settingsuiplugin/icons/scripts/rimage.sh @@ -0,0 +1,37 @@ +############################################################################ +## +## Copyright (C) 2015 Digia Plc +## All rights reserved. +## For any questions to Digia, please use the contact form at +## http://www.qt.io +## +## This file is part of Qt Enterprise Embedded. +## +## Licensees holding valid Qt Enterprise licenses may use this file in +## accordance with the Qt Enterprise License Agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and Digia. +## +## If you have questions regarding the use of this file, please use +## the contact form at http://www.qt.io +## +############################################################################# +#!/bin/bash +fullfile=$1 +filename=$(basename "$fullfile") +extension="${filename##*.}" +filename="${filename%.*}" + +postix="_1x" +convert $fullfile -resize x16 $filename$postix.$extension +postix="_2x" +convert $fullfile -resize x32 $filename$postix.$extension +postix="_3x" +convert $fullfile -resize x48 $filename$postix.$extension +postix="_4x" +convert $fullfile -resize x64 $filename$postix.$extension +postix="_5x" +convert $fullfile -resize x80 $filename$postix.$extension +postix="_6x" +convert $fullfile -resize x96 $filename$postix.$extension + diff --git a/src/settingsui/settingsuiplugin/icons/scripts/rimages.sh b/src/settingsui/settingsuiplugin/icons/scripts/rimages.sh new file mode 100755 index 0000000..7b76da8 --- /dev/null +++ b/src/settingsui/settingsuiplugin/icons/scripts/rimages.sh @@ -0,0 +1,25 @@ +############################################################################ +## +## Copyright (C) 2015 Digia Plc +## All rights reserved. +## For any questions to Digia, please use the contact form at +## http://www.qt.io +## +## This file is part of Qt Enterprise Embedded. +## +## Licensees holding valid Qt Enterprise licenses may use this file in +## accordance with the Qt Enterprise License Agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and Digia. +## +## If you have questions regarding the use of this file, please use +## the contact form at http://www.qt.io +## +############################################################################# +#!/bin/bash + +for dir in "$@" +do + echo "$dir" + scripts/rimage.sh $dir +done diff --git a/src/settingsui/settingsuiplugin/plugin.qrc b/src/settingsui/settingsuiplugin/plugin.qrc new file mode 100644 index 0000000..58cb4af --- /dev/null +++ b/src/settingsui/settingsuiplugin/plugin.qrc @@ -0,0 +1,28 @@ + + + pluginMain.qml + ../bluetooth/Bluetooth.qml + ../bluetooth/Discovery.qml + ../common/CustomTableView.qml + ../common/HandwritingModeButton.qml + ../display/Display.qml + ../locale/Language.qml + ../locale/RegionSelect.qml + ../network/AddressListEntry.qml + ../network/ComboBoxEntry.qml + ../network/EditWiredSettings.qml + ../network/IpAddressTextField.qml + ../network/NetworkDetails.qml + ../network/NetworkSettings.qml + ../network/WifiSelectorDelegate.qml + ../network/WifiSettings.qml + ../network/WifiSignalMonitor.qml + ../network/WiredSettings.qml + ../timedate/AnalogClock.qml + ../timedate/ClockHand.qml + ../timedate/CustomCalendar.qml + ../timedate/TimeDate.qml + ../timedate/TimezonesView.qml + settingsview.xml + + diff --git a/src/settingsui/settingsuiplugin/pluginMain.qml b/src/settingsui/settingsuiplugin/pluginMain.qml new file mode 100644 index 0000000..c465e52 --- /dev/null +++ b/src/settingsui/settingsuiplugin/pluginMain.qml @@ -0,0 +1,174 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Device Utilities module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +import QtQuick 2.5 +import QtQuick.Layouts 1.2 +import QtQuick.Controls 2.0 +import Qt.labs.settings 1.0 +import QtQuick.XmlListModel 2.0 +import QtQuick.Enterprise.VirtualKeyboard 2.0 +import com.theqtcompany.localdevice 1.0 + +Rectangle { + id: root + anchors.fill: parent + color: "white" + visible: true + property var service + + ToolBar { + id: titlebar + property string title: "" + width: parent.width + height: 40 + z: 2 + + RowLayout { + spacing: 20 + anchors.fill: parent + + ToolButton { + contentItem: Image { + fillMode: Image.PreserveAspectFit + source: "../icons/Chevron-left_black_1x.png" + anchors.centerIn: parent + } + + visible: stackView.depth > 1 + onClicked: stackView.pop(); + } + Label { + id: titleText + font.pixelSize: 20 + text: stackView.currentItem.title + horizontalAlignment: Qt.AlignHCenter + verticalAlignment: Qt.AlignVCenter + anchors.centerIn: parent + } + ToolButton { + contentItem: Image { + fillMode: Image.PreserveAspectFit + source: "../icons/Power_black_1x.png" + anchors.centerIn: parent + } + anchors.right: parent.right + + visible: stackView.depth === 1 + onClicked: menu.open(); + + Menu { + id: menu + x: parent.width - width + + MenuItem { + text: qsTr("Reboot") + onTriggered: LocalDevice.reboot() + } + MenuItem { + text: qsTr("Shutdown") + onTriggered: LocalDevice.powerOff() + } + } + } + } + } + + StackView { + id: stackView + initialItem: mainView + anchors.top: titlebar.bottom + anchors.bottom: parent.bottom + anchors.left: parent.left + anchors.right: parent.right + + Component { + id: mainView + + Item { + property string title: qsTr("Device Settings") + + XmlListModel { + id: xmlModel + source: "settingsview.xml" + query: "/xml/settings/item" + XmlRole { name: "title"; query: "title/string()"} + XmlRole { name: "icon"; query: "icon/string()"} + XmlRole { name: "view"; query: "view/string()"} + XmlRole { name: "path"; query: "path/string()"} + } + GridView { + id: grid + anchors.fill: parent + anchors.margins: 40 + cellHeight: 133 + spacing + cellWidth: 117 + spacing + model: xmlModel + property int spacing: 20 + delegate: MouseArea { + width: grid.cellWidth - grid.spacing + height: grid.cellHeight - grid.spacing + + Rectangle { + anchors.fill: parent + color: "#d6d6d6" + radius: 5 + visible: pressed + } + Column { + anchors.fill: parent + anchors.topMargin: 10 + Image { + id: image + source: icon + anchors.horizontalCenter: parent.horizontalCenter + width: grid.cellWidth + fillMode: Image.PreserveAspectFit + } + Label { + text: title + anchors.horizontalCenter: parent.horizontalCenter + font.pixelSize: grid.cellHeight * .1 + } + } + onClicked: { + var component = Qt.createComponent(path+'/'+view+'.qml'); + stackView.push(component.createObject(stackView)); + } + } + } + } + } + } +} diff --git a/src/settingsui/settingsuiplugin/qmldir b/src/settingsui/settingsuiplugin/qmldir new file mode 100644 index 0000000..0a883ed --- /dev/null +++ b/src/settingsui/settingsuiplugin/qmldir @@ -0,0 +1,2 @@ +module com.theqtcompany.settingsui +plugin settingsuiplugin diff --git a/src/settingsui/settingsuiplugin/settingsuiplugin.pro b/src/settingsui/settingsuiplugin/settingsuiplugin.pro new file mode 100644 index 0000000..40f4ce3 --- /dev/null +++ b/src/settingsui/settingsuiplugin/settingsuiplugin.pro @@ -0,0 +1,38 @@ +TEMPLATE = lib +TARGET = settingsuiplugin +QT += qml quick +CONFIG += qt plugin c++11 + +TARGET = $$qtLibraryTarget($$TARGET) +uri = com.theqtcompany.settingsui + +# Input +SOURCES += \ + settingsuiplugin_plugin.cpp + +HEADERS += \ + settingsuiplugin_plugin.h + +DISTFILES += \ + qmldir + +!equals(_PRO_FILE_PWD_, $$OUT_PWD) { + copy_qmldir.target = $$OUT_PWD/qmldir + copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir + copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\" + QMAKE_EXTRA_TARGETS += copy_qmldir + PRE_TARGETDEPS += $$copy_qmldir.target +} + +qmldir.files = qmldir + +unix { + installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /) + qmldir.path = $$installPath + target.path = $$installPath + INSTALLS += target qmldir +} + +RESOURCES += \ + icons.qrc \ + plugin.qrc diff --git a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp new file mode 100644 index 0000000..8a8c1ee --- /dev/null +++ b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp @@ -0,0 +1,10 @@ +#include "settingsuiplugin_plugin.h" + +#include + +void SettingsuipluginPlugin::registerTypes(const char *uri) +{ + // @uri com.theqtcompany.settingsui + qmlRegisterType(QUrl("qrc:/pluginMain.qml"), uri, 1, 0, "SettingsUI"); +} + diff --git a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h new file mode 100644 index 0000000..826c171 --- /dev/null +++ b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h @@ -0,0 +1,50 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Device Utilities module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef SETTINGSUIPLUGIN_PLUGIN_H +#define SETTINGSUIPLUGIN_PLUGIN_H + +#include + +class SettingsuipluginPlugin : public QQmlExtensionPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") + +public: + void registerTypes(const char *uri); +}; + +#endif // SETTINGSUIPLUGIN_PLUGIN_H diff --git a/src/settingsui/settingsuiplugin/settingsview.xml b/src/settingsui/settingsuiplugin/settingsview.xml new file mode 100644 index 0000000..23915db --- /dev/null +++ b/src/settingsui/settingsuiplugin/settingsview.xml @@ -0,0 +1,35 @@ + + + + + Network + NetworkSettings + network + icons/World_qt_6x.png + + + Display + Display + display + icons/Display_qt_6x.png + + + Date and Time + TimeDate + timedate + icons/Clock_qt_6x.png + + + Language + Language + locale + icons/Flag_qt_6x.png + + + Bluetooth + Bluetooth + bluetooth + icons/Bluetooth_qt_6x.png + + + diff --git a/src/settingsui/settingsview.xml b/src/settingsui/settingsview.xml deleted file mode 100644 index 4f3b52e..0000000 --- a/src/settingsui/settingsview.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Network - NetworkSettings - network - ../icons/World_qt_6x.png - - - Display - Display - display - ../icons/Display_qt_6x.png - - - Date and Time - TimeDate - timedate - ../icons/Clock_qt_6x.png - - - Language - Language - locale - ../icons/Flag_qt_6x.png - - - Bluetooth - Bluetooth - bluetooth - ../icons/Bluetooth_qt_6x.png - - - diff --git a/src/settingsui/timedate/AnalogClock.qml b/src/settingsui/timedate/AnalogClock.qml index ff43347..b57ac7f 100644 --- a/src/settingsui/timedate/AnalogClock.qml +++ b/src/settingsui/timedate/AnalogClock.qml @@ -34,9 +34,7 @@ ** ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 import com.theqtcompany.settings.timedate 1.0 Item { diff --git a/src/settingsui/timedate/CustomCalendar.qml b/src/settingsui/timedate/CustomCalendar.qml index 09d4e3e..b720a44 100644 --- a/src/settingsui/timedate/CustomCalendar.qml +++ b/src/settingsui/timedate/CustomCalendar.qml @@ -35,9 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 import Qt.labs.calendar 1.0 import QtQml 2.2 import com.theqtcompany.settings.timedate 1.0 @@ -70,7 +68,7 @@ Rectangle { id: previousMonth Layout.preferredWidth: height visible: enabled - label: Rectangle { + contentItem: Rectangle { anchors.fill: parent color: "#d6d6d6" @@ -105,7 +103,7 @@ Rectangle { id: nextMonth Layout.preferredWidth: height visible: enabled - label: Rectangle { + contentItem: Rectangle { anchors.fill: parent color: "#d6d6d6" diff --git a/src/settingsui/timedate/TimeDate.qml b/src/settingsui/timedate/TimeDate.qml index cc46b78..2426f4a 100644 --- a/src/settingsui/timedate/TimeDate.qml +++ b/src/settingsui/timedate/TimeDate.qml @@ -35,9 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 import com.theqtcompany.settings.timedate 1.0 Item { diff --git a/src/settingsui/timedate/TimezonesView.qml b/src/settingsui/timedate/TimezonesView.qml index 16ac10e..5d81121 100644 --- a/src/settingsui/timedate/TimezonesView.qml +++ b/src/settingsui/timedate/TimezonesView.qml @@ -35,12 +35,9 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 import com.theqtcompany.settings.timedate 1.0 import "../common" - Item { id: root property string title: qsTr("Timezone settings") diff --git a/src/src.pro b/src/src.pro index 1cbf0ed..faa9a6d 100644 --- a/src/src.pro +++ b/src/src.pro @@ -7,6 +7,7 @@ SUBDIRS += \ displaysettings \ timedatesettings \ localdevice \ + settingsui/settingsuiplugin \ settingsui \ imports \ - doc + doc \ -- cgit v1.2.3