Hello community,
here is the log from the commit of package xdg-desktop-portal-kde for
openSUSE:Factory checked in at 2017-06-07 09:56:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xdg-desktop-portal-kde (Old)
and /work/SRC/openSUSE:Factory/.xdg-desktop-portal-kde.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdg-desktop-portal-kde"
Wed Jun 7 09:56:17 2017 rev:3 rq:501509 version:5.10.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/xdg-desktop-portal-kde/xdg-desktop-portal-kde.changes
2017-05-29 22:31:48.640955602 +0200
+++
/work/SRC/openSUSE:Factory/.xdg-desktop-portal-kde.new/xdg-desktop-portal-kde.changes
2017-06-07 09:57:16.582972134 +0200
@@ -1,0 +2,15 @@
+Tue Jun 6 17:19:57 CEST 2017 - [email protected]
+
+- Update to 5.10.1
+ * New bugfix release
+ * For more details please see:
+ * https://www.kde.org/announcements/plasma-5.10.1.php
+- Changes since 5.10.0:
+ * Add missing files
+ * Add Access portal for requesting hardware access
+ * Restore previous version
+ * Fix description
+ * Update AppChooser portal
+ * Fix minor issues spotted by Lamarque
+
+-------------------------------------------------------------------
Old:
----
xdg-desktop-portal-kde-5.10.0.tar.xz
New:
----
xdg-desktop-portal-kde-5.10.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdg-desktop-portal-kde.spec ++++++
--- /var/tmp/diff_new_pack.ELjKmz/_old 2017-06-07 09:57:17.650821234 +0200
+++ /var/tmp/diff_new_pack.ELjKmz/_new 2017-06-07 09:57:17.654820670 +0200
@@ -20,13 +20,13 @@
%define kf5_version 5.26.0
Name: xdg-desktop-portal-kde
-Version: 5.10.0
+Version: 5.10.1
Release: 0
Summary: QT/KF5 backend for xdg-desktop-portal
License: LGPL-2.1+
Group: System/Libraries
Url: http://www.kde.org
-Source: xdg-desktop-portal-kde-%{version}.tar.xz
+Source:
http://download.kde.org/stable/plasma/%{version}/xdg-desktop-portal-kde-%{version}.tar.xz
BuildRequires: extra-cmake-modules >= %{kf5_version}
BuildRequires: libQt5PrintSupport-private-headers-devel
BuildRequires: cmake(KF5CoreAddons) >= %{kf5_version}
++++++ xdg-desktop-portal-kde-5.10.0.tar.xz ->
xdg-desktop-portal-kde-5.10.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdg-desktop-portal-kde-5.10.0/CMakeLists.txt
new/xdg-desktop-portal-kde-5.10.1/CMakeLists.txt
--- old/xdg-desktop-portal-kde-5.10.0/CMakeLists.txt 2017-05-26
11:28:08.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.10.1/CMakeLists.txt 2017-06-06
18:58:57.000000000 +0200
@@ -3,7 +3,7 @@
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
set(QT_MIN_VERSION "5.4.0")
-set(PROJECT_VERSION "5.10.90")
+set(PROJECT_VERSION "5.10.1")
set(PROJECT_VERSION_MAJOR 5)
################# set KDE specific information #################
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdg-desktop-portal-kde-5.10.0/data/kde.portal
new/xdg-desktop-portal-kde-5.10.1/data/kde.portal
--- old/xdg-desktop-portal-kde-5.10.0/data/kde.portal 2017-05-26
11:27:38.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.10.1/data/kde.portal 2017-06-06
18:58:25.000000000 +0200
@@ -1,4 +1,4 @@
[portal]
DBusName=org.freedesktop.impl.portal.desktop.kde
-Interfaces=org.freedesktop.impl.portal.Access;org.freedesktop.impl.portal.AppChooser;org.freedesktop.impl.portal.Email;org.freedesktop.impl.portal.FileChooser;org.freedesktop.impl.portal.Inhibit;org.freedesktop.impl.portal.Notification;org.freedesktop.impl.portal.Print
+Interfaces=org.freedesktop.impl.portal.AppChooser;org.freedesktop.impl.portal.Email;org.freedesktop.impl.portal.FileChooser;org.freedesktop.impl.portal.Inhibit;org.freedesktop.impl.portal.Notification;org.freedesktop.impl.portal.Print
UseIn=KDE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xdg-desktop-portal-kde-5.10.0/po/da/xdg-desktop-portal-kde.po
new/xdg-desktop-portal-kde-5.10.1/po/da/xdg-desktop-portal-kde.po
--- old/xdg-desktop-portal-kde-5.10.0/po/da/xdg-desktop-portal-kde.po
1970-01-01 01:00:00.000000000 +0100
+++ new/xdg-desktop-portal-kde-5.10.1/po/da/xdg-desktop-portal-kde.po
2017-06-06 18:58:40.000000000 +0200
@@ -0,0 +1,45 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Martin Schlander <[email protected]>, 2017.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
+"POT-Creation-Date: 2017-05-17 09:04+0200\n"
+"PO-Revision-Date: 2017-05-30 22:09+0100\n"
+"Last-Translator: Martin Schlander <[email protected]>\n"
+"Language-Team: Danish <[email protected]>\n"
+"Language: da\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"
+
+#: src/appchooserdialog.cpp:66
+#, kde-format
+msgid "Select"
+msgstr ""
+
+#: src/appchooserdialog.cpp:67
+#, kde-format
+msgid "Select application"
+msgstr ""
+
+#. i18n: ectx: property (windowTitle), widget (QDialog, AppChooserDialog)
+#: src/appchooserdialog.ui:14
+#, kde-format
+msgid "Dialog"
+msgstr "Dialog"
+
+#. i18n: ectx: property (text), widget (QLabel, searchLabel)
+#: src/appchooserdialog.ui:22
+#, kde-format
+msgid "Search"
+msgstr ""
+
+#: src/filechooser.cpp:159
+#, kde-format
+msgid "Open"
+msgstr ""
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xdg-desktop-portal-kde-5.10.0/po/sr/xdg-desktop-portal-kde.po
new/xdg-desktop-portal-kde-5.10.1/po/sr/xdg-desktop-portal-kde.po
--- old/xdg-desktop-portal-kde-5.10.0/po/sr/xdg-desktop-portal-kde.po
2017-05-26 11:28:04.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.10.1/po/sr/xdg-desktop-portal-kde.po
2017-06-06 18:58:54.000000000 +0200
@@ -8,12 +8,15 @@
"PO-Revision-Date: 2017-05-21 12:19+0200\n"
"Last-Translator: Chusslove Illich <[email protected]>\n"
"Language-Team: Serbian <[email protected]>\n"
-"Language: \n"
+"Language: sr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+"X-Environment: kde\n"
#: src/appchooserdialog.cpp:66
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xdg-desktop-portal-kde-5.10.0/po/sr@ijekavian/xdg-desktop-portal-kde.po
new/xdg-desktop-portal-kde-5.10.1/po/sr@ijekavian/xdg-desktop-portal-kde.po
--- old/xdg-desktop-portal-kde-5.10.0/po/sr@ijekavian/xdg-desktop-portal-kde.po
2017-05-26 11:28:04.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.10.1/po/sr@ijekavian/xdg-desktop-portal-kde.po
2017-06-06 18:58:54.000000000 +0200
@@ -8,12 +8,15 @@
"PO-Revision-Date: 2017-05-21 12:19+0200\n"
"Last-Translator: Chusslove Illich <[email protected]>\n"
"Language-Team: Serbian <[email protected]>\n"
-"Language: \n"
+"Language: sr@ijekavian\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+"X-Environment: kde\n"
#: src/appchooserdialog.cpp:66
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xdg-desktop-portal-kde-5.10.0/po/sr@ijekavianlatin/xdg-desktop-portal-kde.po
new/xdg-desktop-portal-kde-5.10.1/po/sr@ijekavianlatin/xdg-desktop-portal-kde.po
---
old/xdg-desktop-portal-kde-5.10.0/po/sr@ijekavianlatin/xdg-desktop-portal-kde.po
2017-05-26 11:28:04.000000000 +0200
+++
new/xdg-desktop-portal-kde-5.10.1/po/sr@ijekavianlatin/xdg-desktop-portal-kde.po
2017-06-06 18:58:54.000000000 +0200
@@ -8,12 +8,15 @@
"PO-Revision-Date: 2017-05-21 12:19+0200\n"
"Last-Translator: Chusslove Illich <[email protected]>\n"
"Language-Team: Serbian <[email protected]>\n"
-"Language: \n"
+"Language: sr@ijekavianlatin\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+"X-Environment: kde\n"
#: src/appchooserdialog.cpp:66
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xdg-desktop-portal-kde-5.10.0/po/sr@latin/xdg-desktop-portal-kde.po
new/xdg-desktop-portal-kde-5.10.1/po/sr@latin/xdg-desktop-portal-kde.po
--- old/xdg-desktop-portal-kde-5.10.0/po/sr@latin/xdg-desktop-portal-kde.po
2017-05-26 11:28:05.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.10.1/po/sr@latin/xdg-desktop-portal-kde.po
2017-06-06 18:58:54.000000000 +0200
@@ -8,12 +8,15 @@
"PO-Revision-Date: 2017-05-21 12:19+0200\n"
"Last-Translator: Chusslove Illich <[email protected]>\n"
"Language-Team: Serbian <[email protected]>\n"
-"Language: \n"
+"Language: sr@latin\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+"X-Environment: kde\n"
#: src/appchooserdialog.cpp:66
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xdg-desktop-portal-kde-5.10.0/po/zh_CN/xdg-desktop-portal-kde.po
new/xdg-desktop-portal-kde-5.10.1/po/zh_CN/xdg-desktop-portal-kde.po
--- old/xdg-desktop-portal-kde-5.10.0/po/zh_CN/xdg-desktop-portal-kde.po
2017-05-26 11:28:07.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.10.1/po/zh_CN/xdg-desktop-portal-kde.po
2017-06-06 18:58:57.000000000 +0200
@@ -3,19 +3,25 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
+# Guo Yunhe <[email protected]>, 2017.
msgid ""
msgstr ""
-"Project-Id-Version: xdg-desktop-portal-kde\n"
+"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2017-05-17 09:04+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese Simplified <[email protected]>\n"
-"Language: \n"
+"PO-Revision-Date: 2017-05-27 12:36-0400\n"
+"Last-Translator: guoyunhebrave <[email protected]>\n"
+"Language-Team: Chinese Simplified\n"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: crowdin.com\n"
+"X-Crowdin-Project: kdeorg\n"
+"X-Crowdin-Language: zh-CN\n"
+"X-Crowdin-File: /kf5-stable/messages/kde-workspace/xdg-desktop-portal-kde."
+"pot\n"
#: src/appchooserdialog.cpp:66
#, kde-format
@@ -25,21 +31,21 @@
#: src/appchooserdialog.cpp:67
#, kde-format
msgid "Select application"
-msgstr ""
+msgstr "选择程序"
#. i18n: ectx: property (windowTitle), widget (QDialog, AppChooserDialog)
#: src/appchooserdialog.ui:14
#, kde-format
msgid "Dialog"
-msgstr ""
+msgstr "对话框"
#. i18n: ectx: property (text), widget (QLabel, searchLabel)
#: src/appchooserdialog.ui:22
#, kde-format
msgid "Search"
-msgstr ""
+msgstr "搜索"
#: src/filechooser.cpp:159
#, kde-format
msgid "Open"
-msgstr ""
\ No newline at end of file
+msgstr "打开"
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdg-desktop-portal-kde-5.10.0/src/CMakeLists.txt
new/xdg-desktop-portal-kde-5.10.1/src/CMakeLists.txt
--- old/xdg-desktop-portal-kde-5.10.0/src/CMakeLists.txt 2017-05-26
11:27:38.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.10.1/src/CMakeLists.txt 2017-06-06
18:58:25.000000000 +0200
@@ -6,8 +6,6 @@
set(xdg_desktop_portal_kde_SRCS
xdg-desktop-portal-kde.cpp
- access.cpp
- accessdialog.cpp
appchooser.cpp
appchooserdialog.cpp
desktopportal.cpp
@@ -20,7 +18,6 @@
)
ki18n_wrap_ui(xdg_desktop_portal_kde_SRCS
- accessdialog.ui
appchooserdialog.ui
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdg-desktop-portal-kde-5.10.0/src/access.cpp
new/xdg-desktop-portal-kde-5.10.1/src/access.cpp
--- old/xdg-desktop-portal-kde-5.10.0/src/access.cpp 2017-05-26
11:27:38.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.10.1/src/access.cpp 1970-01-01
01:00:00.000000000 +0100
@@ -1,86 +0,0 @@
-/*
- * Copyright © 2017 Red Hat, Inc
- * This program 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 of the License, or (at your option) any later version.
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Jan Grulich <[email protected]>
- */
-
-#include "access.h"
-#include "accessdialog.h"
-
-#include <QLoggingCategory>
-
-#include <KLocalizedString>
-
-Q_LOGGING_CATEGORY(XdgDesktopPortalKdeAccess, "xdg-desktop-portal-kde-access")
-
-Access::Access(QObject *parent)
- : QObject(parent)
-{
-}
-
-Access::~Access()
-{
-}
-
-uint Access::accessDialog(const QDBusObjectPath &handle,
- const QString &app_id,
- const QString &parent_window,
- const QString &title,
- const QString &subtitle,
- const QString &body,
- const QVariantMap &options,
- QVariantMap &results)
-{
- qCDebug(XdgDesktopPortalKdeAccess) << "AccessDialog called with
parameters:";
- qCDebug(XdgDesktopPortalKdeAccess) << " handle: " << handle.path();
- qCDebug(XdgDesktopPortalKdeAccess) << " app_id: " << app_id;
- qCDebug(XdgDesktopPortalKdeAccess) << " parent_window: " <<
parent_window;
- qCDebug(XdgDesktopPortalKdeAccess) << " title: " << title;
- qCDebug(XdgDesktopPortalKdeAccess) << " subtitle: " << subtitle;
- qCDebug(XdgDesktopPortalKdeAccess) << " body: " << body;
- qCDebug(XdgDesktopPortalKdeAccess) << " options: " << options;
-
- AccessDialog *accessDialog = new AccessDialog();
- accessDialog->setBody(body);
- accessDialog->setTitle(title);
- accessDialog->setSubtitle(subtitle);
-
- if (options.contains(QLatin1String("modal"))) {
- accessDialog->setModal(options.value(QLatin1String("modal")).toBool());
- }
-
- if (options.contains(QLatin1String("deny_label"))) {
-
accessDialog->setRejectLabel(options.value(QLatin1String("deny_label")).toString());
- }
-
- if (options.contains(QLatin1String("grant_label"))) {
-
accessDialog->setAcceptLabel(options.value(QLatin1String("grant_label")).toString());
- }
-
- if (options.contains(QLatin1String("icon"))) {
- accessDialog->setIcon(options.value(QLatin1String("icon")).toString());
- }
-
- // TODO choices
-
- if (accessDialog->exec()) {
- accessDialog->deleteLater();
- return 0;
- }
- accessDialog->deleteLater();
-
- return 1;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdg-desktop-portal-kde-5.10.0/src/access.h
new/xdg-desktop-portal-kde-5.10.1/src/access.h
--- old/xdg-desktop-portal-kde-5.10.0/src/access.h 2017-05-26
11:27:38.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.10.1/src/access.h 1970-01-01
01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-/*
- * Copyright © 2017 Red Hat, Inc
- *
- * This program 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 of the License, or (at your option) any later version.
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Jan Grulich <[email protected]>
- */
-
-#ifndef XDG_DESKTOP_PORTAL_KDE_ACCESS_H
-#define XDG_DESKTOP_PORTAL_KDE_ACCESS_H
-
-#include <QObject>
-#include <QDBusObjectPath>
-
-class Access : public QObject
-{
- Q_OBJECT
- Q_CLASSINFO("D-Bus Interface", "org.freedesktop.impl.portal.Access")
-public:
- Access(QObject *parent = nullptr);
- ~Access();
-
-public Q_SLOTS:
- uint accessDialog(const QDBusObjectPath &handle,
- const QString &app_id,
- const QString &parent_window,
- const QString &title,
- const QString &subtitle,
- const QString &body,
- const QVariantMap &options,
- QVariantMap &results);
-};
-
-#endif // XDG_DESKTOP_PORTAL_KDE_ACCESS_H
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdg-desktop-portal-kde-5.10.0/src/accessdialog.cpp
new/xdg-desktop-portal-kde-5.10.1/src/accessdialog.cpp
--- old/xdg-desktop-portal-kde-5.10.0/src/accessdialog.cpp 2017-05-26
11:27:38.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.10.1/src/accessdialog.cpp 1970-01-01
01:00:00.000000000 +0100
@@ -1,80 +0,0 @@
-/*
- * Copyright © 2017 Red Hat, Inc
- *
- * This program 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 of the License, or (at your option) any later version.
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Jan Grulich <[email protected]>
- */
-
-#include "accessdialog.h"
-#include "ui_accessdialog.h"
-
-#include <QLoggingCategory>
-#include <QSettings>
-#include <QStandardPaths>
-#include <QPushButton>
-
-Q_LOGGING_CATEGORY(XdgDesktopPortalKdeAccessDialog,
"xdg-desktop-portal-kde-access-dialog")
-
-AccessDialog::AccessDialog(QDialog *parent, Qt::WindowFlags flags)
- : QDialog(parent, flags)
- , m_dialog(new Ui::AccessDialog)
-{
- m_dialog->setupUi(this);
-
- connect(m_dialog->buttonBox, &QDialogButtonBox::accepted, this,
&AccessDialog::accept);
- connect(m_dialog->buttonBox, &QDialogButtonBox::rejected, this,
&AccessDialog::reject);
-
-
m_dialog->iconLabel->setPixmap(QIcon::fromTheme(QLatin1String("dialog-question")).pixmap(QSize(64,
64)));
-
- setWindowTitle(i18n("Request device access"));
-}
-
-AccessDialog::~AccessDialog()
-{
- delete m_dialog;
-}
-
-void AccessDialog::setAcceptLabel(const QString &label)
-{
- m_dialog->buttonBox->button(QDialogButtonBox::Ok)->setText(label);
-}
-
-void AccessDialog::setBody(const QString &body)
-{
- m_dialog->bodyLabel->setText(body);
-}
-
-void AccessDialog::setIcon(const QString &icon)
-{
- m_dialog->iconLabel->setPixmap(QIcon::fromTheme(icon).pixmap(QSize(64,
64)));
-}
-
-void AccessDialog::setRejectLabel(const QString &label)
-{
- m_dialog->buttonBox->button(QDialogButtonBox::Cancel)->setText(label);
-}
-
-void AccessDialog::setSubtitle(const QString &subtitle)
-{
- m_dialog->subtitleLabel->setText(subtitle);
-}
-
-void AccessDialog::setTitle(const QString &title)
-{
- m_dialog->titleLabel->setText(title);
-}
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdg-desktop-portal-kde-5.10.0/src/accessdialog.h
new/xdg-desktop-portal-kde-5.10.1/src/accessdialog.h
--- old/xdg-desktop-portal-kde-5.10.0/src/accessdialog.h 2017-05-26
11:27:38.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.10.1/src/accessdialog.h 1970-01-01
01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-/*
- * Copyright © 2017 Red Hat, Inc
- *
- * This program 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 of the License, or (at your option) any later version.
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Jan Grulich <[email protected]>
- */
-
-#ifndef XDG_DESKTOP_PORTAL_KDE_ACCESS_DIALOG_H
-#define XDG_DESKTOP_PORTAL_KDE_ACCESS_DIALOG_H
-
-#include <QDialog>
-
-namespace Ui
-{
-class AccessDialog;
-}
-
-class AccessDialog : public QDialog
-{
- Q_OBJECT
-public:
- AccessDialog(QDialog *parent = nullptr, Qt::WindowFlags flags = 0);
- ~AccessDialog();
-
- void setAcceptLabel(const QString &label);
- void setBody(const QString &body);
- void setIcon(const QString &icon);
- void setRejectLabel(const QString &label);
- void setTitle(const QString &title);
- void setSubtitle(const QString &subtitle);
-
-private:
- Ui::AccessDialog * m_dialog;
-
-};
-
-#endif // XDG_DESKTOP_PORTAL_KDE_ACCESS_DIALOG_H
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdg-desktop-portal-kde-5.10.0/src/accessdialog.ui
new/xdg-desktop-portal-kde-5.10.1/src/accessdialog.ui
--- old/xdg-desktop-portal-kde-5.10.0/src/accessdialog.ui 2017-05-26
11:27:38.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.10.1/src/accessdialog.ui 1970-01-01
01:00:00.000000000 +0100
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>AccessDialog</class>
- <widget class="QDialog" name="AccessDialog">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>392</width>
- <height>162</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="windowTitle">
- <string>Dialog</string>
- </property>
- <layout class="QFormLayout" name="formLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="iconLabel">
- <property name="text">
- <string>Icon</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QLabel" name="titleLabel">
- <property name="styleSheet">
- <string notr="true">font-weight: bold</string>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="subtitleLabel">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="1" column="1">
- <widget class="QLabel" name="bodyLabel">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="3" column="0" colspan="2">
- <widget class="QDialogButtonBox" name="buttonBox">
- <property name="standardButtons">
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xdg-desktop-portal-kde-5.10.0/src/appchooserdialog.cpp
new/xdg-desktop-portal-kde-5.10.1/src/appchooserdialog.cpp
--- old/xdg-desktop-portal-kde-5.10.0/src/appchooserdialog.cpp 2017-05-26
11:27:38.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.10.1/src/appchooserdialog.cpp 2017-06-06
18:58:25.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright © 2017 Red Hat, Inc
+ * Copyright © 2016 Red Hat, Inc
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdg-desktop-portal-kde-5.10.0/src/desktopportal.cpp
new/xdg-desktop-portal-kde-5.10.1/src/desktopportal.cpp
--- old/xdg-desktop-portal-kde-5.10.0/src/desktopportal.cpp 2017-05-26
11:27:38.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.10.1/src/desktopportal.cpp 2017-06-06
18:58:25.000000000 +0200
@@ -30,7 +30,6 @@
DesktopPortal::DesktopPortal(QObject *parent)
: QDBusVirtualObject(parent)
- , m_access(new Access())
, m_appChooser(new AppChooser())
, m_email(new Email())
, m_fileChooser(new FileChooser())
@@ -42,7 +41,6 @@
DesktopPortal::~DesktopPortal()
{
- delete m_access;
delete m_appChooser;
delete m_email;
delete m_fileChooser;
@@ -63,26 +61,7 @@
qCDebug(XdgDesktopPortalKdeDesktopPortal) << message.path();
QList<QVariant> arguments;
- if (message.interface() ==
QLatin1String("org.freedesktop.impl.portal.Access")) {
- if (message.member() == QLatin1String("AccessDialog")) {
- QVariantMap results;
- QVariantMap options;
-
- QDBusArgument dbusArgument =
message.arguments().at(6).value<QDBusArgument>();
- dbusArgument >> options;
-
- uint response =
m_access->accessDialog(qvariant_cast<QDBusObjectPath>(message.arguments().at(0)),
// handle
-
message.arguments().at(1).toString(), // app_id
-
message.arguments().at(2).toString(), // parent_window
-
message.arguments().at(3).toString(), // title
-
message.arguments().at(4).toString(), // subtitle
-
message.arguments().at(5).toString(), // body
- options,
// options
- results);
- arguments << response;
- arguments << results;
- }
- } else if (message.interface() ==
QLatin1String("org.freedesktop.impl.portal.AppChooser")) {
+ if (message.interface() ==
QLatin1String("org.freedesktop.impl.portal.AppChooser")) {
if (message.member() == QLatin1String("ChooseApplication")) {
QVariantMap results;
QVariantMap choices;
@@ -227,19 +206,6 @@
if (path == QLatin1String("/org/freedesktop/portal/desktop/") || path ==
QLatin1String("/org/freedesktop/portal/desktop")) {
nodes = QStringLiteral(
- "<interface name=\"org.freedesktop.impl.portal.Access\">"
- " <method name=\"AccessDialog\">"
- " <arg type=\"o\" name=\"handle\" direction=\"in\"/>"
- " <arg type=\"s\" name=\"app_id\" direction=\"in\"/>"
- " <arg type=\"s\" name=\"parent_window\" direction=\"in\"/>"
- " <arg type=\"s\" name=\"title\" direction=\"in\"/>"
- " <arg type=\"s\" name=\"subtitle\" direction=\"in\"/>"
- " <arg type=\"s\" name=\"body\" direction=\"in\"/>"
- " <arg type=\"a{sv}\" name=\"options\" direction=\"in\"/>"
- " <arg type=\"u\" name=\"response\" direction=\"out\"/>"
- " <arg type=\"a{sv}\" name=\"results\" direction=\"out\"/>"
- " </method>"
- "</interface>"
"<interface name=\"org.freedesktop.impl.portal.AppChooser\">"
" <method name=\"ChooseApplication\">"
" <arg type=\"o\" name=\"handle\" direction=\"in\"/>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdg-desktop-portal-kde-5.10.0/src/desktopportal.h
new/xdg-desktop-portal-kde-5.10.1/src/desktopportal.h
--- old/xdg-desktop-portal-kde-5.10.0/src/desktopportal.h 2017-05-26
11:27:38.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.10.1/src/desktopportal.h 2017-06-06
18:58:25.000000000 +0200
@@ -24,7 +24,6 @@
#include <QObject>
#include <QDBusVirtualObject>
-#include "access.h"
#include "appchooser.h"
#include "email.h"
#include "filechooser.h"
@@ -42,7 +41,6 @@
bool handleMessage(const QDBusMessage &message, const QDBusConnection
&connection) Q_DECL_OVERRIDE;
QString introspect(const QString &path) const Q_DECL_OVERRIDE;
private:
- Access *m_access;
AppChooser *m_appChooser;
Email *m_email;
FileChooser *m_fileChooser;
