From 1b62f963c9a3be4af981fd3ece17a6fcb00c659d Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Thu, 4 Dec 2014 11:03:18 +0100 Subject: [PATCH] turn wireless settings into an activesettings module --- CMakeLists.txt | 3 +-- settingsmodules/CMakeLists.txt | 4 ++++ .../contents/ui}/NetworkSettingsSheet.qml | 0 .../contents/ui}/SettingsSheet.qml | 0 .../contents/ui}/WirelessSettings.qml | 2 -- .../{ => wireless/contents/ui}/mustache.js | 0 settingsmodules/wireless/metadata.desktop | 18 ++++++++++++++++++ 7 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 settingsmodules/CMakeLists.txt rename settingsmodules/{ => wireless/contents/ui}/NetworkSettingsSheet.qml (100%) rename settingsmodules/{ => wireless/contents/ui}/SettingsSheet.qml (100%) rename settingsmodules/{ => wireless/contents/ui}/WirelessSettings.qml (99%) rename settingsmodules/{ => wireless/contents/ui}/mustache.js (100%) create mode 100644 settingsmodules/wireless/metadata.desktop diff --git a/CMakeLists.txt b/CMakeLists.txt index 90a6164a..644ee2fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,5 +41,4 @@ install(DIRECTORY wallpaper/ DESTINATION "${WALLPAPER_INSTALL_DIR}/org.kde.satel add_subdirectory(bin) add_subdirectory(qmlcomponents) add_subdirectory(services) - -install(DIRECTORY settingsmodules DESTINATION ${DATA_INSTALL_DIR}) \ No newline at end of file +add_subdirectory(settingsmodules) diff --git a/settingsmodules/CMakeLists.txt b/settingsmodules/CMakeLists.txt new file mode 100644 index 00000000..aa6f2d41 --- /dev/null +++ b/settingsmodules/CMakeLists.txt @@ -0,0 +1,4 @@ +plasma_install_package(wireless org.kde.satellite.settings.wifi packages package) + + + diff --git a/settingsmodules/NetworkSettingsSheet.qml b/settingsmodules/wireless/contents/ui/NetworkSettingsSheet.qml similarity index 100% rename from settingsmodules/NetworkSettingsSheet.qml rename to settingsmodules/wireless/contents/ui/NetworkSettingsSheet.qml diff --git a/settingsmodules/SettingsSheet.qml b/settingsmodules/wireless/contents/ui/SettingsSheet.qml similarity index 100% rename from settingsmodules/SettingsSheet.qml rename to settingsmodules/wireless/contents/ui/SettingsSheet.qml diff --git a/settingsmodules/WirelessSettings.qml b/settingsmodules/wireless/contents/ui/WirelessSettings.qml similarity index 99% rename from settingsmodules/WirelessSettings.qml rename to settingsmodules/wireless/contents/ui/WirelessSettings.qml index 7407ee01..fa0c5f40 100644 --- a/settingsmodules/WirelessSettings.qml +++ b/settingsmodules/wireless/contents/ui/WirelessSettings.qml @@ -42,8 +42,6 @@ import QtQuick.Controls 1.2 StackView { id: stackView initialItem: mainView - width: 1080 - height: 1815 Component { id: mainView diff --git a/settingsmodules/mustache.js b/settingsmodules/wireless/contents/ui/mustache.js similarity index 100% rename from settingsmodules/mustache.js rename to settingsmodules/wireless/contents/ui/mustache.js diff --git a/settingsmodules/wireless/metadata.desktop b/settingsmodules/wireless/metadata.desktop new file mode 100644 index 00000000..8a20ea81 --- /dev/null +++ b/settingsmodules/wireless/metadata.desktop @@ -0,0 +1,18 @@ +[Desktop Entry] +Name=Wireless +Comment=Connect to a wireless network + +Encoding=UTF-8 +Type=Service +Icon=network-wireless +X-KDE-ServiceTypes=Active/SettingsModule +X-KDE-PluginInfo-Author=Marco Martin +X-KDE-PluginInfo-Email=mart@kde.org +X-KDE-PluginInfo-Name=org.kde.satellite.settings.wifi +X-KDE-PluginInfo-Version=1.0 +X-KDE-PluginInfo-Website= +X-KDE-PluginInfo-Category=Networking +X-KDE-PluginInfo-Depends= +X-KDE-PluginInfo-License=GPL +X-KDE-PluginInfo-EnabledByDefault=true +X-Plasma-MainScript=ui/WirelessSettings.qml