diff --git a/ATTRIBUTION b/ATTRIBUTION new file mode 100644 --- /dev/null +++ b/ATTRIBUTION @@ -0,0 +1,5 @@ +Wikipedia, CC BY-SA 3.0 + +Images included in this subset of data were retrieved from the Wikipedia website (http://www.wikipedia.org). + +The Image content was collected from their website, and annotated for entities and relations by Aditya Mehra. Only minor formatting changes were made to the content in order to get it into a suitable format for presentation (e.g. resize, scale and crop). diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,13 +10,11 @@ find_package(ECM REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_MODULE_PATH}) set(VERSION 2.1.0) -set(AUTHOR "Aditya Mehra") -set(EMAIL "aix.m@outlook.com") -set(BUG_ADDRESS "https://bugs.kde.org/describecomponents.cgi?product=plasma-mycroft") include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) +include(ECMInstallIcons) # Locate plasma_install_package macro. find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS @@ -33,9 +31,7 @@ ) add_subdirectory(plugin) - +add_subdirectory(icons) plasma_install_package(plasmoid org.kde.plasma.mycroftplasmoid) -install( DIRECTORY image/breeze DESTINATION ${ICON_INSTALL_DIR}) -install( DIRECTORY image/breeze-dark DESTINATION ${ICON_INSTALL_DIR}) -install( DIRECTORY mycroft DESTINATION /etc ) +install( DIRECTORY mycroft DESTINATION ${SYSCONF_INSTALL_DIR}) diff --git a/COPYING.APACHE2 b/COPYING.APACHE2 new file mode 100644 --- /dev/null +++ b/COPYING.APACHE2 @@ -0,0 +1,14 @@ +MSM.sh part of this software is licensed under Apache License, Version 2.0 and Copyright 2017 Mycroft AI Inc. +------------------------------------------------------------------------------------------------------------- + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/PACKAGING.readme b/PACKAGING.readme deleted file mode 100644 --- a/PACKAGING.readme +++ /dev/null @@ -1,31 +0,0 @@ -(Plasmoid) Debian Packaging Requirements: - -libkf5notifications-data -libkf5notifications-dev -qml-module-qtquick2 -qml-module-qtquick-controls2 -qml-module-qtquick-controls -qml-module-qtwebsockets -qml-module-qt-websockets -qtdeclarative5-qtquick2-plugin -qtdeclarative5-models-plugin -cmake -cmake-extras -cmake-data -qml-module-qtquick-layouts -libkf5plasma-dev -extra-cmake-modules -qtdeclarative5-dev -build-essential -g++ gettext -libqt5webkit5 -libqt5webkit5-dev -libkf5i18n-data -libkf5i18n-dev -libkf5i18n5 -qml-module-qtgraphicaleffects -libqt5dbus5 -libkf5dbusaddons-dev -libdbus-1-dev -libdbus-glib-1-dev - diff --git a/image/breeze-dark/apps/16/mycroft-plasma-appicon.svg b/icons/16-apps-mycroft-plasma-appicon.svg old mode 100644 new mode 100755 rename from image/breeze-dark/apps/16/mycroft-plasma-appicon.svg rename to icons/16-apps-mycroft-plasma-appicon.svg diff --git a/image/breeze-dark/apps/32/mycroft-plasma-appicon.svg b/icons/32-apps-mycroft-plasma-appicon.svg old mode 100644 new mode 100755 rename from image/breeze-dark/apps/32/mycroft-plasma-appicon.svg rename to icons/32-apps-mycroft-plasma-appicon.svg diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt new file mode 100644 --- /dev/null +++ b/icons/CMakeLists.txt @@ -0,0 +1,7 @@ +ecm_install_icons( + ICONS + 16-apps-mycroft-plasma-appicon.svg + 32-apps-mycroft-plasma-appicon.svg + DESTINATION ${ICON_INSTALL_DIR} + THEME hicolor +) diff --git a/image/breeze/apps/16/mycroft-plasma-appicon.svg b/image/breeze/apps/16/mycroft-plasma-appicon.svg deleted file mode 100644 --- a/image/breeze/apps/16/mycroft-plasma-appicon.svg +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/image/breeze/apps/32/mycroft-plasma-appicon.svg b/image/breeze/apps/32/mycroft-plasma-appicon.svg deleted file mode 100644 --- a/image/breeze/apps/32/mycroft-plasma-appicon.svg +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/plasmoid/contents/images/.directory b/plasmoid/contents/images/.directory deleted file mode 100644 --- a/plasmoid/contents/images/.directory +++ /dev/null @@ -1,4 +0,0 @@ -[Dolphin] -PreviewsShown=true -Timestamp=2017,11,6,14,44,20 -Version=4 diff --git a/plasmoid/contents/ui/AutocompleteBox.qml b/plasmoid/contents/ui/AutocompleteBox.qml --- a/plasmoid/contents/ui/AutocompleteBox.qml +++ b/plasmoid/contents/ui/AutocompleteBox.qml @@ -1,3 +1,22 @@ +/* Copyright 2016 Aditya Mehra + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + import QtQuick 2.7 import QtQuick.Controls 2.2 import org.kde.plasma.core 2.0 as PlasmaCore diff --git a/plasmoid/contents/ui/CustomIndicator.qml b/plasmoid/contents/ui/CustomIndicator.qml --- a/plasmoid/contents/ui/CustomIndicator.qml +++ b/plasmoid/contents/ui/CustomIndicator.qml @@ -1,4 +1,3 @@ - /* Copyright 2016 Aditya Mehra This library is free software; you can redistribute it and/or diff --git a/plasmoid/contents/ui/CustomMicIndicator.qml b/plasmoid/contents/ui/CustomMicIndicator.qml --- a/plasmoid/contents/ui/CustomMicIndicator.qml +++ b/plasmoid/contents/ui/CustomMicIndicator.qml @@ -1,3 +1,22 @@ +/* Copyright 2016 Aditya Mehra + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + import QtQuick 2.9 import org.kde.plasma.components 2.0 as PlasmaComponents diff --git a/plasmoid/contents/ui/Logic.qml b/plasmoid/contents/ui/Logic.qml --- a/plasmoid/contents/ui/Logic.qml +++ b/plasmoid/contents/ui/Logic.qml @@ -1,3 +1,22 @@ +/* Copyright 2016 Aditya Mehra + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + import QtQuick 2.7 Item { diff --git a/plasmoid/contents/ui/StockPriceWidget.qml b/plasmoid/contents/ui/StockPriceWidget.qml --- a/plasmoid/contents/ui/StockPriceWidget.qml +++ b/plasmoid/contents/ui/StockPriceWidget.qml @@ -1,3 +1,22 @@ +/* Copyright 2016 Aditya Mehra + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + import QtQuick 2.0 import QtQuick.Window 2.2 import QtQuick.Layouts 1.3 diff --git a/plasmoid/contents/ui/TomorrowWeatherType.qml b/plasmoid/contents/ui/TomorrowWeatherType.qml --- a/plasmoid/contents/ui/TomorrowWeatherType.qml +++ b/plasmoid/contents/ui/TomorrowWeatherType.qml @@ -1,21 +1,34 @@ -import QtQuick 2.0 +/* Copyright 2016 Aditya Mehra + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + +import QtQuick 2.9 import QtQuick.Window 2.2 import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.2 import QtQml.Models 2.2 -import org.kde.plasma.components 2.0 as PlasmaComponents -import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.plasmoid 2.0 - +import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.extras 2.0 as PlasmaExtras Column { spacing: 6 - //anchors.right: parent.right - //anchors.left: parent.left - - //readonly property bool sentByMe: model.recipient !== "Me" - //property alias cttemp: currenttempitem.text property alias lttemp: lowtempitem.text property alias httemp: hightempitem.text diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt --- a/plugin/CMakeLists.txt +++ b/plugin/CMakeLists.txt @@ -1,5 +1,3 @@ -find_package(PkgConfig) - kde_enable_exceptions() set(mycroftplasmoidplugin_SRCS mycroftplasmoidplugin.cpp launchapp.cpp notify.cpp filereader.cpp msmapp.cpp mycroftplasmoid_dbus.cpp)