diff -Nru plasma-gmailfeed-1.1/cmake/FindAccountsFileDir.cmake plasma-gmailfeed-1.2/cmake/FindAccountsFileDir.cmake
--- plasma-gmailfeed-1.1/cmake/FindAccountsFileDir.cmake 1970-01-01 00:00:00.000000000 +0000
+++ plasma-gmailfeed-1.2/cmake/FindAccountsFileDir.cmake 2022-06-03 09:10:04.000000000 +0000
@@ -0,0 +1,51 @@
+find_package(PkgConfig REQUIRED)
+
+execute_process(
+ COMMAND "${PKG_CONFIG_EXECUTABLE}" --variable=prefix libaccounts-glib
+ OUTPUT_VARIABLE _pkgconfig_invoke_result
+ RESULT_VARIABLE _pkgconfig_failed)
+
+if (_pkgconfig_failed)
+ message(FAILED "Couldn't find the prefix for libaccounts-glib")
+else()
+ string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+ string(REGEX REPLACE " +$" "" _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+ set(ACCOUNTS_PREFIX_DIR ${_pkgconfig_invoke_result})
+endif()
+
+execute_process(
+ COMMAND "${PKG_CONFIG_EXECUTABLE}" --variable=providerfilesdir libaccounts-glib
+ OUTPUT_VARIABLE _pkgconfig_invoke_result
+ RESULT_VARIABLE _pkgconfig_failed)
+
+if (_pkgconfig_failed)
+ message(FAILED "Couldn't find the providerfilesdir for libaccounts-glib")
+else()
+ string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+ string(REGEX REPLACE " +$" "" _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+ if (NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ string(REPLACE ${ACCOUNTS_PREFIX_DIR} ${CMAKE_INSTALL_PREFIX} _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+ endif()
+ set(ACCOUNTS_PROVIDERS_DIR ${_pkgconfig_invoke_result})
+endif()
+
+execute_process(
+ COMMAND "${PKG_CONFIG_EXECUTABLE}" --variable=servicefilesdir libaccounts-glib
+ OUTPUT_VARIABLE _pkgconfig_invoke_result
+ RESULT_VARIABLE _pkgconfig_failed)
+
+if (_pkgconfig_failed)
+ message(FAILED "Couldn't find the servicefilesdir for libaccounts-glib")
+else()
+ string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+ string(REGEX REPLACE " +$" "" _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+ if (NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ message("yooo")
+ string(REPLACE ${ACCOUNTS_PREFIX_DIR} ${CMAKE_INSTALL_PREFIX} _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+ endif()
+ set(ACCOUNTS_SERVICES_DIR ${_pkgconfig_invoke_result})
+endif()
+
+find_package_handle_standard_args(AccountsFileDir DEFAULT_MSG
+ ACCOUNTS_SERVICES_DIR ACCOUNTS_PROVIDERS_DIR)
+
diff -Nru plasma-gmailfeed-1.1/cmake/modules/FindIntltool.cmake plasma-gmailfeed-1.2/cmake/modules/FindIntltool.cmake
--- plasma-gmailfeed-1.1/cmake/modules/FindIntltool.cmake 1970-01-01 00:00:00.000000000 +0000
+++ plasma-gmailfeed-1.2/cmake/modules/FindIntltool.cmake 2022-06-03 09:10:04.000000000 +0000
@@ -0,0 +1,50 @@
+#
+# cmake/Intltool.cmake
+# Copyright (C) 2013, Valama development team
+#
+# Valama is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Valama is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see .
+#
+##
+find_program(INTLTOOL_EXTRACT_EXECUTABLE intltool-extract)
+find_program(INTLTOOL_MERGE_EXECUTABLE intltool-merge)
+mark_as_advanced(INTLTOOL_EXTRACT_EXECUTABLE)
+mark_as_advanced(INTLTOOL_MERGE_EXECUTABLE)
+
+if(INTLTOOL_EXTRACT_EXECUTABLE)
+ execute_process(
+ COMMAND
+ ${INTLTOOL_EXTRACT_EXECUTABLE} "--version"
+ OUTPUT_VARIABLE
+ intltool_version
+ ERROR_QUIET
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ if(intltool_version MATCHES "^intltool-extract \\(.*\\) [0-9]")
+ string(REGEX REPLACE "^intltool-extract \\([^\\)]*\\) ([0-9\\.]+[^ \n]*).*" "\\1" INTLTOOL_VERSION_STRING "${intltool_version}")
+ endif()
+ unset(intltool_version)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Intltool
+ REQUIRED_VARS
+ INTLTOOL_EXTRACT_EXECUTABLE
+ INTLTOOL_MERGE_EXECUTABLE
+ VERSION_VAR
+ INTLTOOL_VERSION_STRING
+)
+
+set(INTLTOOL_OPTIONS_DEFAULT
+ "--quiet"
+)
diff -Nru plasma-gmailfeed-1.1/CMakeLists.txt plasma-gmailfeed-1.2/CMakeLists.txt
--- plasma-gmailfeed-1.1/CMakeLists.txt 2015-03-19 17:04:54.000000000 +0000
+++ plasma-gmailfeed-1.2/CMakeLists.txt 2022-06-03 09:10:04.000000000 +0000
@@ -3,10 +3,10 @@
cmake_minimum_required(VERSION 2.8.12)
set(QT_MIN_VERSION "5.3.0")
-set(KF5_MIN_VERSION "5.0.0")
+set(KF5_MIN_VERSION "5.9.0")
find_package(ECM 0.0.11 REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
include(KDEInstallDirs)
include(KDECMakeSettings)
@@ -14,6 +14,7 @@
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Quick)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Plasma)
+find_package(KF5I18n NO_MODULE)
plasma_install_package(package org.kde.plasma.gmailfeed)
diff -Nru plasma-gmailfeed-1.1/debian/changelog plasma-gmailfeed-1.2/debian/changelog
--- plasma-gmailfeed-1.1/debian/changelog 2018-05-04 22:22:23.000000000 +0000
+++ plasma-gmailfeed-1.2/debian/changelog 2022-06-03 20:29:51.000000000 +0000
@@ -1,3 +1,33 @@
+plasma-gmailfeed (1.2-1) unstable; urgency=low
+
+ * Team upload.
+
+ [ Debian Janitor ]
+ * Bump debhelper from old 11 to 12.
+ * Set debhelper-compat version in Build-Depends.
+ * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+ Repository-Browse.
+
+ [ Nicholas D Steeves ]
+ * Declare Standards-Version: 4.5.1 (no changes required).
+
+ [ Pino Toscano ]
+ * New upstream release.
+ * Update Vcs-* fields.
+ * Bump the debhelper compatibility to 13:
+ - switch the debhelper-compat build dependency to 13
+ * Add the configuration for the CI on salsa.
+ * Add Rules-Requires-Root: no.
+ * Bump Standards-Version to 4.6.1, no changes required.
+ * Update the build dependencies according to the upstream build system:
+ - bump KF packages to 5.9.0
+ - add intltool, libkaccounts-dev, libkf5i18n-dev, and pkg-config
+ - explicitly add gettext
+ * Add needed runtime dependencies: qml-module-qtquick-controls,
+ qml-module-qtquick-layouts, and qml-module-org-kde-kquickcontrolsaddons.
+
+ -- Pino Toscano Fri, 03 Jun 2022 22:29:51 +0200
+
plasma-gmailfeed (1.1-2) unstable; urgency=medium
[ Nicholas D Steeves ]
diff -Nru plasma-gmailfeed-1.1/debian/compat plasma-gmailfeed-1.2/debian/compat
--- plasma-gmailfeed-1.1/debian/compat 2018-05-04 22:22:23.000000000 +0000
+++ plasma-gmailfeed-1.2/debian/compat 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-11
diff -Nru plasma-gmailfeed-1.1/debian/control plasma-gmailfeed-1.2/debian/control
--- plasma-gmailfeed-1.1/debian/control 2018-05-04 22:22:23.000000000 +0000
+++ plasma-gmailfeed-1.2/debian/control 2022-06-03 20:19:27.000000000 +0000
@@ -5,21 +5,31 @@
Uploaders: Nicholas D Steeves
Build-Depends:
cmake (>= 2.8.12~),
- debhelper (>= 11~),
+ debhelper-compat (= 13),
extra-cmake-modules (>= 0.0.11~),
+ gettext,
+ intltool,
libappstream-dev,
- libkf5notifications-dev,
- libkf5plasma-dev (>= 5.0.0~),
+ libkaccounts-dev,
+ libkf5i18n-dev,
+ libkf5notifications-dev (>= 5.9.0~),
+ libkf5plasma-dev (>= 5.9.0~),
+ pkg-config,
qtbase5-dev (>= 5.3.0~),
qtdeclarative5-dev,
-Standards-Version: 4.1.4
+Standards-Version: 4.6.1
+Rules-Requires-Root: no
Homepage: https://github.com/anthon38/gmailfeed
-Vcs-Git: https://salsa.debian.org/qt-kde-team/3rdparty/plasma-gmailfeed.git
-Vcs-Browser: https://salsa.debian.org/qt-kde-team/3rdparty/plasma-gmailfeed
+Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/plasma-gmailfeed.git
+Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/plasma-gmailfeed
Package: plasma-gmailfeed
Architecture: any
-Depends: qml-module-qtquick-xmllistmodel, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ qml-module-org-kde-kquickcontrolsaddons,
+ qml-module-qtquick-controls,
+ qml-module-qtquick-layouts,
+ qml-module-qtquick-xmllistmodel,
Description: plasmoid that shows your Gmail feed with notifications
Gmail Feed is a lightweight plasmoid for Plasma 5. It provides a
list of unread emails from your Gmail inbox. It also notifies you
diff -Nru plasma-gmailfeed-1.1/debian/gbp.conf plasma-gmailfeed-1.2/debian/gbp.conf
--- plasma-gmailfeed-1.1/debian/gbp.conf 2018-05-04 22:22:23.000000000 +0000
+++ plasma-gmailfeed-1.2/debian/gbp.conf 2022-06-03 20:08:19.000000000 +0000
@@ -1,5 +1,5 @@
[DEFAULT]
-# upstream-branch = upstream
+upstream-branch = upstream
debian-branch = debian/master
upstream-tag = upstream/%(version)s
debian-tag = debian/%(version)s
@@ -9,4 +9,4 @@
pristine-tar-commit = False
compression = xz
-compression-level = 9
\ No newline at end of file
+compression-level = 9
diff -Nru plasma-gmailfeed-1.1/debian/salsa-ci.yml plasma-gmailfeed-1.2/debian/salsa-ci.yml
--- plasma-gmailfeed-1.1/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000
+++ plasma-gmailfeed-1.2/debian/salsa-ci.yml 2022-06-03 19:27:35.000000000 +0000
@@ -0,0 +1,7 @@
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+variables:
+ SALSA_CI_DISABLE_MISSING_BREAKS: 'no'
+ SALSA_CI_DISABLE_RC_BUGS: 'no'
+ SALSA_CI_REPROTEST_ARGS: '--variations=-build-path'
diff -Nru plasma-gmailfeed-1.1/debian/upstream/metadata plasma-gmailfeed-1.2/debian/upstream/metadata
--- plasma-gmailfeed-1.1/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000
+++ plasma-gmailfeed-1.2/debian/upstream/metadata 2021-01-17 14:07:57.000000000 +0000
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://github.com/anthon38/gmailfeed/issues
+Bug-Submit: https://github.com/anthon38/gmailfeed/issues/new
+Repository: https://github.com/anthon38/gmailfeed.git
+Repository-Browse: https://github.com/anthon38/gmailfeed
diff -Nru plasma-gmailfeed-1.1/package/contents/config/config.qml plasma-gmailfeed-1.2/package/contents/config/config.qml
--- plasma-gmailfeed-1.1/package/contents/config/config.qml 2015-03-19 17:04:54.000000000 +0000
+++ plasma-gmailfeed-1.2/package/contents/config/config.qml 2022-06-03 09:10:04.000000000 +0000
@@ -21,6 +21,11 @@
ConfigModel {
ConfigCategory {
+ name: i18n("Accounts")
+ icon: "user-identity"
+ source: "configAccounts.qml"
+ }
+ ConfigCategory {
name: i18n("General")
icon: "configure"
source: "configGeneral.qml"
diff -Nru plasma-gmailfeed-1.1/package/contents/config/main.xml plasma-gmailfeed-1.2/package/contents/config/main.xml
--- plasma-gmailfeed-1.1/package/contents/config/main.xml 2015-03-19 17:04:54.000000000 +0000
+++ plasma-gmailfeed-1.2/package/contents/config/main.xml 2022-06-03 09:10:04.000000000 +0000
@@ -4,6 +4,12 @@
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
+
+
+ The id of the current account.
+ 0
+
+
Polling interval (in minutes).
diff -Nru plasma-gmailfeed-1.1/package/contents/ui/CompactRepresentation.qml plasma-gmailfeed-1.2/package/contents/ui/CompactRepresentation.qml
--- plasma-gmailfeed-1.1/package/contents/ui/CompactRepresentation.qml 2015-03-19 17:04:54.000000000 +0000
+++ plasma-gmailfeed-1.2/package/contents/ui/CompactRepresentation.qml 2022-06-03 09:10:04.000000000 +0000
@@ -37,4 +37,14 @@
}
}
}
+
+ PlasmaCore.IconItem {
+
+ anchors.right: parent.right
+ anchors.bottom: parent.bottom
+ anchors.top: parent.verticalCenter
+ anchors.left: parent.horizontalCenter
+ source: "emblem-important"
+ visible: !account.isConfigured
+ }
}
diff -Nru plasma-gmailfeed-1.1/package/contents/ui/configAccounts.qml plasma-gmailfeed-1.2/package/contents/ui/configAccounts.qml
--- plasma-gmailfeed-1.1/package/contents/ui/configAccounts.qml 1970-01-01 00:00:00.000000000 +0000
+++ plasma-gmailfeed-1.2/package/contents/ui/configAccounts.qml 2022-06-03 09:10:04.000000000 +0000
@@ -0,0 +1,71 @@
+/****************************************************************************
+ * Copyright (c) 2015 Anthony Vital *
+ * *
+ * This file is part of Gmail Feed. *
+ * *
+ * Gmail Feed is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation, either version 3 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * Gmail Feed is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with Gmail Feed. If not, see . *
+ ****************************************************************************/
+
+import QtQuick 2.0
+import QtQuick.Layouts 1.0 as QtLayouts
+import org.kde.plasma.components 2.0 as PlasmaComponents
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
+import org.kde.plasma.private.gmailfeed 0.1
+
+Item {
+ id: accountsPage
+
+ property int cfg_accountId
+
+ onCfg_accountIdChanged: comboBox.currentIndex = accountsModel.indexOf(cfg_accountId)
+
+ AccountsModel {
+ id: accountsModel
+
+ onRowsInserted: {
+ comboBox.currentIndex = first
+ cfg_accountId = accountsModel.getId(first)
+ }
+ onRowsRemoved: {
+ comboBox.currentIndex = -1
+ cfg_accountId = 0
+ }
+ }
+
+ QtLayouts.RowLayout {
+ id: currentAccountGroup
+
+ PlasmaComponents.Label {
+ text: i18n("Current account: ")
+ }
+
+ PlasmaComponents.ComboBox {
+ id: comboBox
+
+ model: accountsModel
+ textRole: "name"
+ onActivated: cfg_accountId = accountsModel.getId(index)
+ }
+ }
+
+ PlasmaComponents.Button {
+ anchors.right: parent.right
+ anchors.top: currentAccountGroup.top
+ anchors.bottom: currentAccountGroup.bottom
+
+ iconSource: "applications-internet"
+ text: i18n("Manage accounts...")
+ onClicked: KQuickControlsAddons.KCMShell.open("kcm_kaccounts")
+ }
+}
diff -Nru plasma-gmailfeed-1.1/package/contents/ui/ConfigNeededPanel.qml plasma-gmailfeed-1.2/package/contents/ui/ConfigNeededPanel.qml
--- plasma-gmailfeed-1.1/package/contents/ui/ConfigNeededPanel.qml 1970-01-01 00:00:00.000000000 +0000
+++ plasma-gmailfeed-1.2/package/contents/ui/ConfigNeededPanel.qml 2022-06-03 09:10:04.000000000 +0000
@@ -0,0 +1,43 @@
+/****************************************************************************
+ * Copyright (c) 2015 Anthony Vital *
+ * *
+ * This file is part of Gmail Feed. *
+ * *
+ * Gmail Feed is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation, either version 3 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * Gmail Feed is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with Gmail Feed. If not, see . *
+ ****************************************************************************/
+
+import QtQuick 2.0
+import QtQuick.Layouts 1.0 as QtLayouts
+import org.kde.plasma.components 2.0 as PlasmaComponents
+
+Item {
+
+ QtLayouts.ColumnLayout {
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.horizontalCenter: parent.horizontalCenter
+
+ PlasmaComponents.Label {
+ anchors.horizontalCenter: parent.horizontalCenter
+ text: i18n("Please configure an account")
+ }
+
+// PlasmaComponents.Button {
+// anchors.horizontalCenter: parent.horizontalCenter
+// iconSource: "configure"
+// text: i18n("Configure...")
+// // onClicked:
+// }
+ }
+}
+
diff -Nru plasma-gmailfeed-1.1/package/contents/ui/FeedPanel.qml plasma-gmailfeed-1.2/package/contents/ui/FeedPanel.qml
--- plasma-gmailfeed-1.1/package/contents/ui/FeedPanel.qml 1970-01-01 00:00:00.000000000 +0000
+++ plasma-gmailfeed-1.2/package/contents/ui/FeedPanel.qml 2022-06-03 09:10:04.000000000 +0000
@@ -0,0 +1,98 @@
+/****************************************************************************
+ * Copyright (c) 2014 Anthony Vital *
+ * *
+ * This file is part of Gmail Feed. *
+ * *
+ * Gmail Feed is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation, either version 3 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * Gmail Feed is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with Gmail Feed. If not, see . *
+ ****************************************************************************/
+
+import QtQuick 2.0
+import org.kde.plasma.extras 2.0 as PlasmaExtras
+import org.kde.plasma.components 2.0 as PlasmaComponents
+
+Item {
+
+ focus: true
+
+ PlasmaExtras.Heading {
+ id: heading
+
+ anchors.top: parent.top
+ anchors.left: parent.left
+ anchors.right: inboxIcon.left
+ level: 3
+ opacity: 0.6
+ text: mainItem.subtext
+ }
+
+ PlasmaComponents.ToolButton {
+ id: inboxIcon
+
+ anchors.right: parent.right
+ anchors.top: parent.top
+ height: units.iconSizes.medium
+ iconSource: "folder-mail"
+ tooltip: i18n("Open inbox")
+ onClicked: mainItem.action_openInbox()
+ }
+
+ PlasmaExtras.ScrollArea {
+ id: scrollView;
+
+ anchors.top: heading.height > inboxIcon.height ? heading.bottom : inboxIcon.bottom
+ anchors.bottom: parent.bottom
+ anchors.left: parent.left
+ anchors.right: parent.right
+
+ ListView {
+ id: inboxView;
+
+ anchors.rightMargin: units.gridUnit
+ clip: true
+ model: xmlModel;
+ currentIndex: -1;
+ boundsBehavior: Flickable.StopAtBounds;
+ focus: true
+ highlight: PlasmaComponents.Highlight {}
+ delegate: MessageDelegate {
+ onContainsMouseChanged: inboxView.currentIndex = containsMouse ? index : -1
+ }
+ }
+ }
+
+ Keys.onPressed: {
+ switch(event.key) {
+ case Qt.Key_Up: {
+ if (inboxView.currentIndex > 0) --inboxView.currentIndex;
+ event.accepted = true;
+ break;
+ }
+ case Qt.Key_Down: {
+ if (inboxView.currentIndex < inboxView.count-1) ++inboxView.currentIndex;
+ event.accepted = true;
+ break;
+ }
+
+ case Qt.Key_Enter:
+ case Qt.Key_Return: {
+ if (inboxView.currentIndex != -1) inboxView.currentItem.activate();
+ event.accepted = true;
+ break;
+ }
+ default:
+ break;
+ }
+ }
+}
+
diff -Nru plasma-gmailfeed-1.1/package/contents/ui/FullRepresentation.qml plasma-gmailfeed-1.2/package/contents/ui/FullRepresentation.qml
--- plasma-gmailfeed-1.1/package/contents/ui/FullRepresentation.qml 2015-03-19 17:04:54.000000000 +0000
+++ plasma-gmailfeed-1.2/package/contents/ui/FullRepresentation.qml 2022-06-03 09:10:04.000000000 +0000
@@ -18,80 +18,10 @@
****************************************************************************/
import QtQuick 2.0
-import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.plasma.components 2.0 as PlasmaComponents
Item {
-
- focus: true
-
- PlasmaExtras.Heading {
- id: heading
-
- anchors.top: parent.top
- anchors.left: parent.left
- anchors.right: inboxIcon.left
- level: 3
- opacity: 0.6
- text: mainItem.subtext
- }
-
- PlasmaComponents.ToolButton {
- id: inboxIcon
-
- anchors.right: parent.right
- anchors.top: parent.top
- height: units.iconSizes.medium
- iconSource: "folder-mail"
- tooltip: i18n("Open inbox")
- onClicked: mainItem.action_openInbox()
- }
-
- PlasmaExtras.ScrollArea {
- id: scrollView;
-
- anchors.top: heading.height > inboxIcon.height ? heading.bottom : inboxIcon.bottom
- anchors.bottom: parent.bottom
- anchors.left: parent.left
- anchors.right: parent.right
-
- ListView {
- id: inboxView;
-
- anchors.rightMargin: units.gridUnit
- clip: true
- model: xmlModel;
- currentIndex: -1;
- boundsBehavior: Flickable.StopAtBounds;
- focus: true
- highlight: PlasmaComponents.Highlight {}
- delegate: MessageDelegate {
- onContainsMouseChanged: inboxView.currentIndex = containsMouse ? index : -1
- }
- }
- }
-
- Keys.onPressed: {
- switch(event.key) {
- case Qt.Key_Up: {
- if (inboxView.currentIndex > 0) --inboxView.currentIndex;
- event.accepted = true;
- break;
- }
- case Qt.Key_Down: {
- if (inboxView.currentIndex < inboxView.count-1) ++inboxView.currentIndex;
- event.accepted = true;
- break;
- }
-
- case Qt.Key_Enter:
- case Qt.Key_Return: {
- if (inboxView.currentIndex != -1) inboxView.currentItem.activate();
- event.accepted = true;
- break;
- }
- default:
- break;
- }
+ Loader {
+ anchors.fill: parent
+ source: account.isConfigured ? "FeedPanel.qml" : "ConfigNeededPanel.qml"
}
}
diff -Nru plasma-gmailfeed-1.1/package/contents/ui/main.qml plasma-gmailfeed-1.2/package/contents/ui/main.qml
--- plasma-gmailfeed-1.1/package/contents/ui/main.qml 2015-03-19 17:04:54.000000000 +0000
+++ plasma-gmailfeed-1.2/package/contents/ui/main.qml 2022-06-03 09:10:04.000000000 +0000
@@ -36,6 +36,20 @@
Plasmoid.switchWidth: units.gridUnit * 8
Plasmoid.switchHeight: units.gridUnit * 8
+ Account {
+ id: account
+
+ accountId: plasmoid.configuration.accountId
+ onAccountIdChanged: {
+ if (accountId == 0) {
+ plasmoid.status = PlasmaCore.Types.ActiveStatus
+ } else {
+ plasmoid.status = PlasmaCore.Types.PassiveStatus
+ action_checkMail()
+ }
+ }
+ }
+
NetworkStatus {
id: networkStatus
@@ -59,7 +73,7 @@
property int newMailCount: 0
property int newMailId: -1
- source: "https://gmail.google.com/gmail/feed/atom"
+ xml: account.feed
namespaceDeclarations: "declare default element namespace 'http://purl.org/atom/ns#';"
query: "/feed/entry"
@@ -114,7 +128,7 @@
repeat: true
triggeredOnStart: true
interval: plasmoid.configuration.pollinterval * 60000
- onTriggered: networkStatus.isOnline ? xmlModel.reload() : mainItem.subtext = i18n("Offline")
+ onTriggered: networkStatus.isOnline ? account.updateFeed() : mainItem.subtext = i18n("Offline")
}
function action_checkMail() {
@@ -126,11 +140,10 @@
}
Component.onCompleted: {
- plasmoid.status = PlasmaCore.Types.PassiveStatus
+ plasmoid.status = PlasmaCore.Types.ActiveStatus
plasmoid.setAction("openInbox", i18n("Open inbox"), "folder-mail")
plasmoid.setAction("checkMail", i18n("Check mail"), "mail-receive")
plasmoid.setActionSeparator("separator0")
- polltimer.start()
}
}
diff -Nru plasma-gmailfeed-1.1/package/metadata.desktop plasma-gmailfeed-1.2/package/metadata.desktop
--- plasma-gmailfeed-1.1/package/metadata.desktop 2015-03-19 17:04:54.000000000 +0000
+++ plasma-gmailfeed-1.2/package/metadata.desktop 2022-06-03 09:10:04.000000000 +0000
@@ -14,7 +14,7 @@
X-KDE-PluginInfo-Website=https://github.com/anthon38/gmailfeed
X-KDE-PluginInfo-Category=Online Services
X-KDE-PluginInfo-Name=org.kde.plasma.gmailfeed
-X-KDE-PluginInfo-Version=1.1
+X-KDE-PluginInfo-Version=1.2
X-KDE-PluginInfo-Depends=
X-KDE-PluginInfo-License=GPL
diff -Nru plasma-gmailfeed-1.1/plugin/account.cpp plasma-gmailfeed-1.2/plugin/account.cpp
--- plasma-gmailfeed-1.1/plugin/account.cpp 1970-01-01 00:00:00.000000000 +0000
+++ plasma-gmailfeed-1.2/plugin/account.cpp 2022-06-03 09:10:04.000000000 +0000
@@ -0,0 +1,110 @@
+/****************************************************************************
+ * Copyright (c) 2015 Anthony Vital *
+ * *
+ * This file is part of Gmail Feed. *
+ * *
+ * Gmail Feed is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation, either version 3 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * Gmail Feed is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with Gmail Feed. If not, see . *
+ ****************************************************************************/
+
+#include "account.h"
+
+#include
+#include
+
+#include
+#include
+
+#include
+
+Account::Account(QObject *parent)
+ : QObject(parent)
+ , m_id(0)
+ , m_isConfigured(false)
+{
+}
+
+Account::~Account()
+{
+}
+
+void Account::updateFeed()
+{
+ if (!m_isConfigured) {
+ qWarning()<<"No Gmail account configured";
+ return;
+ }
+
+ auto job = new GetCredentialsJob(m_id, this);
+ connect(job, &GetCredentialsJob::result, this, &Account::credentialsReceived);
+ job->start();
+}
+
+void Account::credentialsReceived(KJob *job)
+{
+ GetCredentialsJob* credentials = qobject_cast(job);
+ if (credentials->error()) {
+ qWarning() << "Couldn't fetch credentials";
+ return;
+ }
+
+ auto accessToken = credentials->credentialsData()[QStringLiteral("AccessToken")].toByteArray();
+
+ QNetworkRequest req(QUrl("https://mail.google.com/mail/feed/atom"));
+ req.setRawHeader("Authorization", "Bearer "+accessToken);
+
+#if QT_VERSION == 0x050501
+ // Workaround QTBUG-49760
+ // If the network is not accessible this shouldn't be called anyway
+ m_networkManager.setNetworkAccessible(QNetworkAccessManager::Accessible);
+#endif
+ auto reply = m_networkManager.get(req);
+ connect(reply, &QNetworkReply::finished, this, &Account::newData);
+}
+
+void Account::newData()
+{
+ QNetworkReply* reply = qobject_cast(sender());
+ if (reply->error()) {
+ qWarning() << "couldn't read data" << reply->readAll();
+ return;
+ }
+
+ m_feed = QString(reply->readAll());
+ Q_EMIT(feedChanged());
+}
+
+void Account::setId(int id)
+{
+ if (id == 0) {
+ m_id = 0;
+ m_name.clear();
+ m_isConfigured = false;
+ Q_EMIT(isConfiguredChanged());
+ Q_EMIT(idChanged());
+ qWarning() << "account id set to 0.";
+ return;
+ }
+
+ auto account = KAccounts::accountsManager()->account(qint32(id));
+ if (!account) {
+ qWarning() << "account id " << qint32(id) << "doesn't exist";
+ return;
+ }
+
+ m_id = qint32(id);
+ m_name = account->displayName();
+ m_isConfigured = true;
+ Q_EMIT(isConfiguredChanged());
+ Q_EMIT(idChanged());
+}
diff -Nru plasma-gmailfeed-1.1/plugin/account.h plasma-gmailfeed-1.2/plugin/account.h
--- plasma-gmailfeed-1.1/plugin/account.h 1970-01-01 00:00:00.000000000 +0000
+++ plasma-gmailfeed-1.2/plugin/account.h 2022-06-03 09:10:04.000000000 +0000
@@ -0,0 +1,68 @@
+/****************************************************************************
+ * Copyright (c) 2015 Anthony Vital *
+ * *
+ * This file is part of Gmail Feed. *
+ * *
+ * Gmail Feed is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation, either version 3 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * Gmail Feed is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with Gmail Feed. If not, see . *
+ ****************************************************************************/
+
+#ifndef ACCOUNT_H
+#define ACCOUNT_H
+
+#include
+#include
+
+#include
+
+class KJob;
+
+class Account : public QObject
+{
+ Q_OBJECT
+
+public:
+ Q_PROPERTY(QString feed READ feed NOTIFY feedChanged)
+ Q_PROPERTY(bool isConfigured READ isConfigured NOTIFY isConfiguredChanged)
+ Q_PROPERTY(QString name READ name)
+ Q_PROPERTY(int accountId READ id WRITE setId NOTIFY idChanged)
+
+ Q_INVOKABLE void updateFeed();
+
+ explicit Account(QObject *parent = 0);
+ ~Account();
+
+ QString feed() const {return m_feed;}
+ bool isConfigured() const {return m_isConfigured;}
+ QString name() const {return m_name;}
+ int id() const {return int(m_id);}
+ void setId(int id);
+
+Q_SIGNALS:
+ void feedChanged();
+ void isConfiguredChanged();
+ void idChanged();
+
+private Q_SLOTS:
+ void credentialsReceived(KJob *job);
+ void newData();
+
+private:
+ Accounts::AccountId m_id;
+ QNetworkAccessManager m_networkManager;
+ QString m_feed;
+ bool m_isConfigured;
+ QString m_name;
+};
+
+#endif
diff -Nru plasma-gmailfeed-1.1/plugin/accountsModel.cpp plasma-gmailfeed-1.2/plugin/accountsModel.cpp
--- plasma-gmailfeed-1.1/plugin/accountsModel.cpp 1970-01-01 00:00:00.000000000 +0000
+++ plasma-gmailfeed-1.2/plugin/accountsModel.cpp 2022-06-03 09:10:04.000000000 +0000
@@ -0,0 +1,103 @@
+/****************************************************************************
+ * Copyright (c) 2015 Anthony Vital *
+ * *
+ * This file is part of Gmail Feed. *
+ * *
+ * Gmail Feed is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation, either version 3 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * Gmail Feed is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with Gmail Feed. If not, see . *
+ ****************************************************************************/
+
+#include "accountsModel.h"
+
+#include
+
+#include
+
+AccountsModel::AccountsModel(QObject *parent)
+ : QAbstractListModel(parent)
+{
+ auto accounts = KAccounts::accountsManager()->accountList(QStringLiteral("gmail-feed"));
+ Q_FOREACH(Accounts::AccountId id, accounts) {
+ m_accounts.append(id);
+ }
+
+ connect(KAccounts::accountsManager(), &Accounts::Manager::accountCreated, this, &AccountsModel::accountCreated);
+ connect(KAccounts::accountsManager(), &Accounts::Manager::accountRemoved, this, &AccountsModel::accountRemoved);
+}
+
+AccountsModel::~AccountsModel()
+{
+}
+
+QHash AccountsModel::roleNames() const
+{
+ QHash roles;
+ roles[NameRole] = "name";
+ roles[IdRole] = "id";
+ return roles;
+}
+
+
+int AccountsModel::rowCount(const QModelIndex & parent) const
+{
+ Q_UNUSED(parent)
+ return m_accounts.size();
+}
+
+QVariant AccountsModel::data(const QModelIndex & index, int role) const
+{
+ if (!index.isValid()) {
+ return QVariant();
+ }
+
+ if (index.row() >= m_accounts.size() || index.row() < 0) {
+ return QVariant();
+ }
+
+ switch (role) {
+ case IdRole:
+ return m_accounts.at(index.row());
+ case NameRole:
+ return KAccounts::accountsManager()->account(m_accounts.at(index.row()))->displayName();
+ default:
+ return QVariant();
+ }
+}
+
+void AccountsModel::accountCreated(Accounts::AccountId id)
+{
+ beginInsertRows(QModelIndex(), m_accounts.size(), m_accounts.size());
+ m_accounts.append(id);
+ endInsertRows();
+}
+
+void AccountsModel::accountRemoved(Accounts::AccountId id)
+{
+ int i = m_accounts.indexOf(id);
+ if (i < 0) {
+ return;
+ }
+ beginRemoveRows(QModelIndex(), i, i);
+ m_accounts.removeAt(i);
+ endRemoveRows();
+}
+
+int AccountsModel::getId(int index) const
+{
+ return int(m_accounts.at(index));
+}
+
+int AccountsModel::indexOf(int id) const
+{
+ return m_accounts.indexOf(id);
+}
diff -Nru plasma-gmailfeed-1.1/plugin/accountsModel.h plasma-gmailfeed-1.2/plugin/accountsModel.h
--- plasma-gmailfeed-1.1/plugin/accountsModel.h 1970-01-01 00:00:00.000000000 +0000
+++ plasma-gmailfeed-1.2/plugin/accountsModel.h 2022-06-03 09:10:04.000000000 +0000
@@ -0,0 +1,55 @@
+/****************************************************************************
+ * Copyright (c) 2015 Anthony Vital *
+ * *
+ * This file is part of Gmail Feed. *
+ * *
+ * Gmail Feed is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation, either version 3 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * Gmail Feed is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with Gmail Feed. If not, see . *
+ ****************************************************************************/
+
+#ifndef ACCOUNTSMODEL_H
+#define ACCOUNTSMODEL_H
+
+#include
+
+#include
+
+class AccountsModel : public QAbstractListModel
+{
+ Q_OBJECT
+
+public:
+ enum AccountRoles {
+ NameRole = Qt::UserRole,
+ IdRole = Qt::UserRole + 1
+ };
+
+ explicit AccountsModel(QObject *parent = 0);
+ ~AccountsModel();
+
+ QHash roleNames() const;
+ int rowCount(const QModelIndex & parent = QModelIndex()) const;
+ QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const;
+
+ Q_INVOKABLE int getId(int index) const;
+ Q_INVOKABLE int indexOf(int id) const;
+
+private Q_SLOTS:
+ void accountCreated(Accounts::AccountId id);
+ void accountRemoved(Accounts::AccountId id);
+
+private:
+ QList m_accounts;
+};
+
+#endif
diff -Nru plasma-gmailfeed-1.1/plugin/CMakeLists.txt plasma-gmailfeed-1.2/plugin/CMakeLists.txt
--- plasma-gmailfeed-1.1/plugin/CMakeLists.txt 2015-03-19 17:04:54.000000000 +0000
+++ plasma-gmailfeed-1.2/plugin/CMakeLists.txt 2022-06-03 09:10:04.000000000 +0000
@@ -4,10 +4,43 @@
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Network)
find_package(KF5Notifications)
+find_package(KAccounts REQUIRED)
+find_package(Intltool REQUIRED)
+set(ACCOUNTS_MIN_VERSION "1.13")
+find_package(AccountsQt5 ${ACCOUNTS_MIN_VERSION} REQUIRED CONFIG)
+include_directories(
+ ${ACCOUNTSQT_INCLUDE_DIRS}
+)
+
+# TODO: remove when depending on KDE Applications 15.08
+if (NOT DEFINED kaccounts_add_service)
+ include(../cmake/FindAccountsFileDir.cmake)
+
+ function(kaccounts_add_service service_file_in)
+ get_filename_component(service_filename ${service_file_in} NAME_WE)
+ set(service_file ${CMAKE_CURRENT_BINARY_DIR}/${service_filename}.service)
+ execute_process(COMMAND intltool-merge -x -u --no-translations ${service_file_in} ${service_file})
+ install(FILES ${service_file} DESTINATION ${ACCOUNTS_SERVICES_DIR})
+ endfunction()
+
+ function(kaccounts_add_provider provider_in_file)
+ get_filename_component(provider_filename ${provider_in_file} NAME_WE)
+ set(provider_file ${CMAKE_CURRENT_BINARY_DIR}/${provider_filename}.provider)
+ execute_process(COMMAND intltool-merge -x -u --no-translations ${provider_in_file} ${provider_file})
+ install(FILES ${provider_file} DESTINATION ${ACCOUNTS_PROVIDERS_DIR})
+ endfunction()
+
+endif ()
+
+kaccounts_add_service(${CMAKE_CURRENT_SOURCE_DIR}/gmail-feed.service.in)
+kaccounts_add_provider(${CMAKE_CURRENT_SOURCE_DIR}/google-gmail.provider.in)
+
set(gmailfeedplugin_SRCS
gmailfeedplugin.cpp
networkstatus.cpp
notification.cpp
+ account.cpp
+ accountsModel.cpp
)
install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/gmailfeed)
@@ -17,6 +50,7 @@
Qt5::Quick
Qt5::Network
KF5::Notifications
+ KAccounts
)
-install(TARGETS gmailfeedplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/gmailfeed)
\ No newline at end of file
+install(TARGETS gmailfeedplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/gmailfeed)
diff -Nru plasma-gmailfeed-1.1/plugin/gmailfeedplugin.cpp plasma-gmailfeed-1.2/plugin/gmailfeedplugin.cpp
--- plasma-gmailfeed-1.1/plugin/gmailfeedplugin.cpp 2015-03-19 17:04:54.000000000 +0000
+++ plasma-gmailfeed-1.2/plugin/gmailfeedplugin.cpp 2022-06-03 09:10:04.000000000 +0000
@@ -20,12 +20,16 @@
#include "gmailfeedplugin.h"
#include "networkstatus.h"
#include "notification.h"
-
+#include "account.h"
+#include "accountsModel.h"
+
#include
-
+
void GmailFeedPlugin::registerTypes (const char *uri)
{
Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.gmailfeed"));
qmlRegisterType(uri, 0, 1, "NetworkStatus");
qmlRegisterType(uri, 0, 1, "Notification");
-}
\ No newline at end of file
+ qmlRegisterType(uri, 0, 1, "Account");
+ qmlRegisterType(uri, 0, 1, "AccountsModel");
+}
diff -Nru plasma-gmailfeed-1.1/plugin/gmail-feed.service.in plasma-gmailfeed-1.2/plugin/gmail-feed.service.in
--- plasma-gmailfeed-1.1/plugin/gmail-feed.service.in 1970-01-01 00:00:00.000000000 +0000
+++ plasma-gmailfeed-1.2/plugin/gmail-feed.service.in 2022-06-03 09:10:04.000000000 +0000
@@ -0,0 +1,8 @@
+
+
+ gmail-feed
+ Gmail Feed
+ gmailfeed
+ google-gmail
+ kaccounts-providers
+
\ No newline at end of file
diff -Nru plasma-gmailfeed-1.1/plugin/google-gmail.provider.in plasma-gmailfeed-1.2/plugin/google-gmail.provider.in
--- plasma-gmailfeed-1.1/plugin/google-gmail.provider.in 1970-01-01 00:00:00.000000000 +0000
+++ plasma-gmailfeed-1.2/plugin/google-gmail.provider.in 2022-06-03 09:10:04.000000000 +0000
@@ -0,0 +1,34 @@
+
+
+ <_name>GMail
+
+ <_description>Gmail Feed
+ gmailfeed
+ kaccounts-providers
+ .*google\.com
+
+
+
+ oauth2
+ web_server
+
+
+ accounts.google.com
+ o/oauth2/auth?access_type=offline&approval_prompt=force
+ o/oauth2/token
+ http://localhost/oauth2callback
+
+ code
+ [
+ 'https://mail.google.com/mail/feed/atom'
+ ]
+ ['https','http']
+ 722576520700-s76fk9s03goef1qcjqq4i290rsdinc3o.apps.googleusercontent.com
+ smhBM_JqEZHAZZlYrVtO7ZnP
+ true
+
+
+
+
+
\ No newline at end of file
diff -Nru plasma-gmailfeed-1.1/plugin/qmldir plasma-gmailfeed-1.2/plugin/qmldir
--- plasma-gmailfeed-1.1/plugin/qmldir 2015-03-19 17:04:54.000000000 +0000
+++ plasma-gmailfeed-1.2/plugin/qmldir 2022-06-03 09:10:04.000000000 +0000
@@ -1 +1,2 @@
+module org.kde.plasma.private.gmailfeed
plugin gmailfeedplugin
\ No newline at end of file
diff -Nru plasma-gmailfeed-1.1/po/CMakeLists.txt plasma-gmailfeed-1.2/po/CMakeLists.txt
--- plasma-gmailfeed-1.1/po/CMakeLists.txt 2015-03-19 17:04:54.000000000 +0000
+++ plasma-gmailfeed-1.2/po/CMakeLists.txt 2022-06-03 09:10:04.000000000 +0000
@@ -19,7 +19,7 @@
STRING(REGEX REPLACE "\\.po$" "" _langCode ${_langCode} )
IF( _langCode )
- GET_FILENAME_COMPONENT(_lang ${_poFile} NAME_WE)
+ STRING(REGEX REPLACE "\\.po$" "" _lang ${_poFileName} )
SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo)
ADD_CUSTOM_COMMAND(TARGET translations
diff -Nru plasma-gmailfeed-1.1/po/plasma_applet_gmail-feed.pot plasma-gmailfeed-1.2/po/plasma_applet_gmail-feed.pot
--- plasma-gmailfeed-1.1/po/plasma_applet_gmail-feed.pot 2015-03-19 17:04:54.000000000 +0000
+++ plasma-gmailfeed-1.2/po/plasma_applet_gmail-feed.pot 2022-06-03 09:10:04.000000000 +0000
@@ -1,6 +1,6 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the gmailfeed package.
# FIRST AUTHOR , YEAR.
#
#, fuzzy
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gmailfeed 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-18 13:44+0100\n"
+"POT-Creation-Date: 2020-10-26 18:50+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -21,31 +21,37 @@
#: package/contents/ui/FullRepresentation.qml:44
#: package/contents/ui/main.qml:132
#: package/contents/ui/FullRepresentation.qml:46
-#: package/contents/ui/main.qml:130
+#: package/contents/ui/main.qml:130 package/contents/ui/FeedPanel.qml:46
+#: package/contents/ui/main.qml:144
msgid "Open inbox"
msgstr ""
#: package/contents/ui/main.qml:81 package/contents/ui/main.qml:84
+#: package/contents/ui/main.qml:98
msgid "1 unread message"
msgid_plural "%1 unread messages"
msgstr[0] ""
msgstr[1] ""
#: package/contents/ui/main.qml:83 package/contents/ui/main.qml:86
+#: package/contents/ui/main.qml:100
msgid "No unread messages"
msgstr ""
#: package/contents/ui/main.qml:90 package/contents/ui/main.qml:93
+#: package/contents/ui/main.qml:107
msgid "1 new message"
msgid_plural "%1 new messages"
msgstr[0] ""
msgstr[1] ""
#: package/contents/ui/main.qml:97 package/contents/ui/main.qml:99
+#: package/contents/ui/main.qml:113
msgid "Checking for new messages..."
msgstr ""
#: package/contents/ui/main.qml:133 package/contents/ui/main.qml:131
+#: package/contents/ui/main.qml:145
msgid "Check mail"
msgstr ""
@@ -62,15 +68,33 @@
msgstr[0] ""
msgstr[1] ""
-#: package/contents/config/config.qml:24 package/contents/config/config.qml:24
+#: package/contents/config/config.qml:24 package/contents/config/config.qml:29
msgid "General"
msgstr ""
#: package/contents/ui/main.qml:70 package/contents/ui/main.qml:117
+#: package/contents/ui/main.qml:131
msgid "Offline"
msgstr ""
#: package/contents/ui/MessageDelegate.qml:33
+#: package/contents/ui/MessageDelegate.qml:33
msgctxt "Message delegate, author: title"
msgid "%1: %2"
msgstr ""
+
+#: package/contents/ui/ConfigNeededPanel.qml:32
+msgid "Please configure an account"
+msgstr ""
+
+#: package/contents/ui/configAccounts.qml:50
+msgid "Current account: "
+msgstr ""
+
+#: package/contents/ui/configAccounts.qml:68
+msgid "Manage accounts..."
+msgstr ""
+
+#: package/contents/config/config.qml:24
+msgid "Accounts"
+msgstr ""
diff -Nru plasma-gmailfeed-1.1/po/plasma_applet_org.kde.plasma.gmailfeed_fr.po plasma-gmailfeed-1.2/po/plasma_applet_org.kde.plasma.gmailfeed_fr.po
--- plasma-gmailfeed-1.1/po/plasma_applet_org.kde.plasma.gmailfeed_fr.po 2015-03-19 17:04:54.000000000 +0000
+++ plasma-gmailfeed-1.2/po/plasma_applet_org.kde.plasma.gmailfeed_fr.po 2022-06-03 09:10:04.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gmailfeed 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-18 13:44+0100\n"
+"POT-Creation-Date: 2020-10-26 18:50+0100\n"
"PO-Revision-Date: 2014-12-19 13:48+0100\n"
"Last-Translator: Anthony Vital \n"
"Language-Team: French \n"
@@ -17,32 +17,40 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: package/contents/ui/FullRepresentation.qml:44
+#: package/contents/ui/main.qml:132
#: package/contents/ui/FullRepresentation.qml:46
-#: package/contents/ui/main.qml:130
+#: package/contents/ui/main.qml:130 package/contents/ui/FeedPanel.qml:46
+#: package/contents/ui/main.qml:144
msgid "Open inbox"
msgstr "Ouvrir la boîte de réception"
#: package/contents/ui/main.qml:81 package/contents/ui/main.qml:84
+#: package/contents/ui/main.qml:98
msgid "1 unread message"
msgid_plural "%1 unread messages"
msgstr[0] "1 message non lu"
msgstr[1] "%1 messages non lus"
#: package/contents/ui/main.qml:83 package/contents/ui/main.qml:86
+#: package/contents/ui/main.qml:100
msgid "No unread messages"
msgstr "Aucun message non lu"
#: package/contents/ui/main.qml:90 package/contents/ui/main.qml:93
+#: package/contents/ui/main.qml:107
msgid "1 new message"
msgid_plural "%1 new messages"
msgstr[0] "1 nouveau message"
msgstr[1] "%1 nouveaux messages"
#: package/contents/ui/main.qml:97 package/contents/ui/main.qml:99
+#: package/contents/ui/main.qml:113
msgid "Checking for new messages..."
msgstr "Recherche de nouveaux messages..."
#: package/contents/ui/main.qml:133 package/contents/ui/main.qml:131
+#: package/contents/ui/main.qml:145
msgid "Check mail"
msgstr "Relever le courrier"
@@ -57,11 +65,12 @@
msgstr[0] "min"
msgstr[1] "min"
-#: package/contents/config/config.qml:24
+#: package/contents/config/config.qml:24 package/contents/config/config.qml:29
msgid "General"
msgstr "Général"
#: package/contents/ui/main.qml:70 package/contents/ui/main.qml:117
+#: package/contents/ui/main.qml:131
msgid "Offline"
msgstr "Hors-ligne"
@@ -69,3 +78,19 @@
msgctxt "Message delegate, author: title"
msgid "%1: %2"
msgstr "%1 : %2"
+
+#: package/contents/ui/ConfigNeededPanel.qml:32
+msgid "Please configure an account"
+msgstr ""
+
+#: package/contents/ui/configAccounts.qml:50
+msgid "Current account: "
+msgstr ""
+
+#: package/contents/ui/configAccounts.qml:68
+msgid "Manage accounts..."
+msgstr ""
+
+#: package/contents/config/config.qml:24
+msgid "Accounts"
+msgstr ""
diff -Nru plasma-gmailfeed-1.1/po/plasma_applet_org.kde.plasma.gmailfeed_it.po plasma-gmailfeed-1.2/po/plasma_applet_org.kde.plasma.gmailfeed_it.po
--- plasma-gmailfeed-1.1/po/plasma_applet_org.kde.plasma.gmailfeed_it.po 1970-01-01 00:00:00.000000000 +0000
+++ plasma-gmailfeed-1.2/po/plasma_applet_org.kde.plasma.gmailfeed_it.po 2022-06-03 09:10:04.000000000 +0000
@@ -0,0 +1,96 @@
+# gmailfeed french translations.
+# Copyright (C) 2014 Anthony Vital
+# This file is distributed under the same license as the Gmail Feed package.
+# Anthony Vital , 2014
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gmailfeed 1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-10-26 18:50+0100\n"
+"PO-Revision-Date: 2014-12-19 13:48+0100\n"
+"Last-Translator: Martino Pilia \n"
+"Language-Team: Italian \n"
+"Language: Italian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: package/contents/ui/FullRepresentation.qml:44
+#: package/contents/ui/main.qml:132
+#: package/contents/ui/FullRepresentation.qml:46
+#: package/contents/ui/main.qml:130 package/contents/ui/FeedPanel.qml:46
+#: package/contents/ui/main.qml:144
+msgid "Open inbox"
+msgstr "Apri la casella di posta"
+
+#: package/contents/ui/main.qml:81 package/contents/ui/main.qml:84
+#: package/contents/ui/main.qml:98
+msgid "1 unread message"
+msgid_plural "%1 unread messages"
+msgstr[0] "1 messaggio non letto"
+msgstr[1] "%1 messaggi non letti"
+
+#: package/contents/ui/main.qml:83 package/contents/ui/main.qml:86
+#: package/contents/ui/main.qml:100
+msgid "No unread messages"
+msgstr "Nessun messaggio non letto"
+
+#: package/contents/ui/main.qml:90 package/contents/ui/main.qml:93
+#: package/contents/ui/main.qml:107
+msgid "1 new message"
+msgid_plural "%1 new messages"
+msgstr[0] "1 nuovo messaggio"
+msgstr[1] "%1 nuovi messaggi"
+
+#: package/contents/ui/main.qml:97 package/contents/ui/main.qml:99
+#: package/contents/ui/main.qml:113
+msgid "Checking for new messages..."
+msgstr "Controllo in corso per nuovi messaggi..."
+
+#: package/contents/ui/main.qml:133 package/contents/ui/main.qml:131
+#: package/contents/ui/main.qml:145
+msgid "Check mail"
+msgstr "Controlla la posta"
+
+#: package/contents/ui/configGeneral.qml:35
+msgid "Polling interval: "
+msgstr "Controlla ogni: "
+
+#: package/contents/ui/configGeneral.qml:41
+msgctxt "Polling interval in minutes"
+msgid "min"
+msgid_plural "min"
+msgstr[0] "min"
+msgstr[1] "min"
+
+#: package/contents/config/config.qml:24 package/contents/config/config.qml:29
+msgid "General"
+msgstr "Impostazioni generali"
+
+#: package/contents/ui/main.qml:70 package/contents/ui/main.qml:117
+#: package/contents/ui/main.qml:131
+msgid "Offline"
+msgstr "Non in linea"
+
+#: package/contents/ui/MessageDelegate.qml:33
+msgctxt "Message delegate, author: title"
+msgid "%1: %2"
+msgstr "%1 : %2"
+
+#: package/contents/ui/ConfigNeededPanel.qml:32
+msgid "Please configure an account"
+msgstr ""
+
+#: package/contents/ui/configAccounts.qml:50
+msgid "Current account: "
+msgstr ""
+
+#: package/contents/ui/configAccounts.qml:68
+msgid "Manage accounts..."
+msgstr ""
+
+#: package/contents/config/config.qml:24
+msgid "Accounts"
+msgstr ""
diff -Nru plasma-gmailfeed-1.1/po/plasma_applet_org.kde.plasma.gmailfeed_pl.po plasma-gmailfeed-1.2/po/plasma_applet_org.kde.plasma.gmailfeed_pl.po
--- plasma-gmailfeed-1.1/po/plasma_applet_org.kde.plasma.gmailfeed_pl.po 1970-01-01 00:00:00.000000000 +0000
+++ plasma-gmailfeed-1.2/po/plasma_applet_org.kde.plasma.gmailfeed_pl.po 2022-06-03 09:10:04.000000000 +0000
@@ -0,0 +1,97 @@
+# gmailfeed polish translations.
+# Copyright (C) 2015 Daniel Winiarski
+# This file is distributed under the same license as the Gmail Feed package.
+#
+# Daniel Winiarski , 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: gmailfeed 1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-10-26 18:50+0100\n"
+"PO-Revision-Date: 2015-05-26 21:28+0100\n"
+"Last-Translator: Daniel Winiarski \n"
+"Language-Team: Polish \n"
+"Language: Polish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Lokalize 2.0\n"
+
+#: package/contents/ui/FullRepresentation.qml:44
+#: package/contents/ui/main.qml:132
+#: package/contents/ui/FullRepresentation.qml:46
+#: package/contents/ui/main.qml:130 package/contents/ui/FeedPanel.qml:46
+#: package/contents/ui/main.qml:144
+msgid "Open inbox"
+msgstr "Otwórz skrzynkę odbiorczą"
+
+#: package/contents/ui/main.qml:81 package/contents/ui/main.qml:84
+#: package/contents/ui/main.qml:98
+msgid "1 unread message"
+msgid_plural "%1 unread messages"
+msgstr[0] "1 nieprzeczytana wiadomość"
+msgstr[1] "%1 nieprzeczytane wiadomości"
+
+#: package/contents/ui/main.qml:83 package/contents/ui/main.qml:86
+#: package/contents/ui/main.qml:100
+msgid "No unread messages"
+msgstr "Brak nieprzeczytanych wiadomości"
+
+#: package/contents/ui/main.qml:90 package/contents/ui/main.qml:93
+#: package/contents/ui/main.qml:107
+msgid "1 new message"
+msgid_plural "%1 new messages"
+msgstr[0] "1 nowa wiadomość"
+msgstr[1] "%1 nowe wiadomości"
+
+#: package/contents/ui/main.qml:97 package/contents/ui/main.qml:99
+#: package/contents/ui/main.qml:113
+msgid "Checking for new messages..."
+msgstr "Sprawdzanie nowych wiadomości..."
+
+#: package/contents/ui/main.qml:133 package/contents/ui/main.qml:131
+#: package/contents/ui/main.qml:145
+msgid "Check mail"
+msgstr "Sprawdź pocztę"
+
+#: package/contents/ui/configGeneral.qml:35
+msgid "Polling interval: "
+msgstr "Częstotliwość sprawdzania:"
+
+#: package/contents/ui/configGeneral.qml:41
+msgctxt "Polling interval in minutes"
+msgid "min"
+msgid_plural "min"
+msgstr[0] "min"
+msgstr[1] "min"
+
+#: package/contents/config/config.qml:24 package/contents/config/config.qml:29
+msgid "General"
+msgstr "Ogólne"
+
+#: package/contents/ui/main.qml:70 package/contents/ui/main.qml:117
+#: package/contents/ui/main.qml:131
+msgid "Offline"
+msgstr "Tryb offline"
+
+#: package/contents/ui/MessageDelegate.qml:33
+msgctxt "Message delegate, author: title"
+msgid "%1: %2"
+msgstr "%1 : %2"
+
+#: package/contents/ui/ConfigNeededPanel.qml:32
+msgid "Please configure an account"
+msgstr ""
+
+#: package/contents/ui/configAccounts.qml:50
+msgid "Current account: "
+msgstr ""
+
+#: package/contents/ui/configAccounts.qml:68
+msgid "Manage accounts..."
+msgstr ""
+
+#: package/contents/config/config.qml:24
+msgid "Accounts"
+msgstr ""
diff -Nru plasma-gmailfeed-1.1/po/plasma_applet_org.kde.plasma.gmailfeed_ru.po plasma-gmailfeed-1.2/po/plasma_applet_org.kde.plasma.gmailfeed_ru.po
--- plasma-gmailfeed-1.1/po/plasma_applet_org.kde.plasma.gmailfeed_ru.po 1970-01-01 00:00:00.000000000 +0000
+++ plasma-gmailfeed-1.2/po/plasma_applet_org.kde.plasma.gmailfeed_ru.po 2022-06-03 09:10:04.000000000 +0000
@@ -0,0 +1,96 @@
+# gmailfeed russian translations.
+# Copyright (C) 2017 Jacobtey
+# This file is distributed under the same license as the Gmail Feed package.
+# Jacobtey , 2017
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gmailfeed 1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-10-26 18:50+0100\n"
+"PO-Revision-Date: 2017-07-13 13:48+0100\n"
+"Last-Translator: Jacobtey \n"
+"Language-Team: Russian \n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: package/contents/ui/FullRepresentation.qml:44
+#: package/contents/ui/main.qml:132
+#: package/contents/ui/FullRepresentation.qml:46
+#: package/contents/ui/main.qml:130 package/contents/ui/FeedPanel.qml:46
+#: package/contents/ui/main.qml:144
+msgid "Open inbox"
+msgstr "Открыть Входящие"
+
+#: package/contents/ui/main.qml:81 package/contents/ui/main.qml:84
+#: package/contents/ui/main.qml:98
+msgid "1 unread message"
+msgid_plural "%1 unread messages"
+msgstr[0] "1 непрочитанное сообщение"
+msgstr[1] "%1 непрочитанных сообщений"
+
+#: package/contents/ui/main.qml:83 package/contents/ui/main.qml:86
+#: package/contents/ui/main.qml:100
+msgid "No unread messages"
+msgstr "Нет непрочитанных сообщений"
+
+#: package/contents/ui/main.qml:90 package/contents/ui/main.qml:93
+#: package/contents/ui/main.qml:107
+msgid "1 new message"
+msgid_plural "%1 new messages"
+msgstr[0] "1 новое сообщение"
+msgstr[1] "%1 новых сообщений"
+
+#: package/contents/ui/main.qml:97 package/contents/ui/main.qml:99
+#: package/contents/ui/main.qml:113
+msgid "Checking for new messages..."
+msgstr "Проверка новых сообщений..."
+
+#: package/contents/ui/main.qml:133 package/contents/ui/main.qml:131
+#: package/contents/ui/main.qml:145
+msgid "Check mail"
+msgstr "Проверить почту"
+
+#: package/contents/ui/configGeneral.qml:35
+msgid "Polling interval: "
+msgstr "Интервал проверки: "
+
+#: package/contents/ui/configGeneral.qml:41
+msgctxt "Polling interval in minutes"
+msgid "min"
+msgid_plural "min"
+msgstr[0] "мин"
+msgstr[1] "мин"
+
+#: package/contents/config/config.qml:24 package/contents/config/config.qml:29
+msgid "General"
+msgstr "Общие"
+
+#: package/contents/ui/main.qml:70 package/contents/ui/main.qml:117
+#: package/contents/ui/main.qml:131
+msgid "Offline"
+msgstr "Нет связи"
+
+#: package/contents/ui/MessageDelegate.qml:33
+msgctxt "Message delegate, author: title"
+msgid "%1: %2"
+msgstr "%1 : %2"
+
+#: package/contents/ui/ConfigNeededPanel.qml:32
+msgid "Please configure an account"
+msgstr ""
+
+#: package/contents/ui/configAccounts.qml:50
+msgid "Current account: "
+msgstr ""
+
+#: package/contents/ui/configAccounts.qml:68
+msgid "Manage accounts..."
+msgstr ""
+
+#: package/contents/config/config.qml:24
+msgid "Accounts"
+msgstr ""