[-]
[+]
|
Changed |
frameworkintegration.spec
|
|
[-]
[+]
|
Changed |
frameworkintegration-5.9.0.tar.xz/CMakeLists.txt
^
|
@@ -19,7 +19,7 @@
set(REQUIRED_QT_VERSION 5.2.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus)
-set(KF5_VERSION "5.10.0") # handled by release scripts
+set(KF5_VERSION "5.9.0") # handled by release scripts
set(KF5_DEP_VERSION "5.9.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX FRAMEWORKINTEGRATION
|
[-]
[+]
|
Changed |
frameworkintegration-5.9.0.tar.xz/autotests/CMakeLists.txt
^
|
@@ -1,17 +1,12 @@
include(ECMMarkAsTest)
find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG QUIET)
-find_package(Qt5Qml ${REQUIRED_QT_VERSION} CONFIG QUIET)
if(NOT Qt5Test_FOUND)
message(STATUS "Qt5Test not found, autotests will not be built.")
return()
endif()
-if(NOT Qt5Qml_FOUND)
- message(STATUS "Qt5Qml not found, QML autotests will not be built.")
-endif()
-
include_directories( ${Qt5Gui_PRIVATE_INCLUDE_DIRS} )
set(CONFIGFILE "${CMAKE_CURRENT_SOURCE_DIR}/kdeplatformtheme_kdeglobals")
@@ -56,8 +51,3 @@
frameworkintegration_tests(
ksni_unittest
)
-
-if(Qt5Qml_FOUND)
- frameworkintegration_tests(kfiledialogqml_unittest)
- target_link_libraries(kfiledialogqml_unittest Qt5::Qml)
-endif()
|
[-]
[+]
|
Changed |
frameworkintegration-5.9.0.tar.xz/autotests/kfiledialog_unittest.cpp
^
|
@@ -111,60 +111,6 @@
}
}
- void testOpenDialog()
- {
- // Open parentless
- {
- QFileDialog dialog;
- dialog.open();
-
- KFileWidget *fw = findFileWidget();
- QVERIFY(fw);
- QCOMPARE(fw->isVisible(), true);
- fw->slotCancel();
- }
- // Open with parent
- {
- QWidget w;
- w.show();
-
- QFileDialog dialog(&w);
- dialog.open();
-
- KFileWidget *fw = findFileWidget();
- QVERIFY(fw);
- QCOMPARE(fw->isVisible(), true);
- fw->slotCancel();
- }
- }
-
- void testShowDialog()
- {
- // Show parentless
- {
- QFileDialog dialog;
- dialog.show();
-
- KFileWidget *fw = findFileWidget();
- QVERIFY(fw);
- QCOMPARE(fw->isVisible(), true);
- fw->slotCancel();
- }
- // Show with parent
- {
- QWidget w;
- w.show();
-
- QFileDialog dialog(&w);
- dialog.show();
-
- KFileWidget *fw = findFileWidget();
- QVERIFY(fw);
- QCOMPARE(fw->isVisible(), true);
- fw->slotCancel();
- }
- }
-
void testSetFileMode_data()
{
QTest::addColumn<QFileDialog::FileMode>("qtFileMode");
|
[-]
[+]
|
Deleted |
frameworkintegration-5.9.0.tar.xz/autotests/kfiledialogqml_unittest.cpp
^
|
@@ -1,92 +0,0 @@
-/* This file is part of the KDE libraries
- * Copyright 2014 Dominik Haumann <dhaumann@kde.org>
- * Copyright 2015 David Rosca <nowrep@gmail.com>
- *
- * 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 of the License or ( at
- * your option ) version 3 or, at the discretion of KDE e.V. ( which shall
- * act as a proxy as in section 14 of the GPLv3 ), 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <QTest>
-#include <QQmlEngine>
-#include <QQmlComponent>
-#include <KFileWidget>
-
-class KFileDialogQml_UnitTest : public QObject
-{
- Q_OBJECT
-
-private Q_SLOTS:
- void initTestCase()
- {
- }
-
- void cleanupTestCase()
- {
- }
-
- void testShowDialogParentless()
- {
- KFileWidget *fw;
- {
- QQmlEngine engine;
- QQmlComponent component(&engine);
- component.loadUrl(QUrl::fromLocalFile(QFINDTESTDATA("qml/filedialog_parentless.qml")));
- component.create();
-
- fw = findFileWidget();
- QVERIFY(fw);
- QCOMPARE(fw->isVisible(), true);
- fw->slotCancel();
- }
- delete fw;
- }
-
- void testShowDialogWithParent()
- {
- KFileWidget *fw;
- {
- QQmlEngine engine;
- QQmlComponent component(&engine);
- component.loadUrl(QUrl::fromLocalFile(QFINDTESTDATA("qml/filedialog_withparent.qml")));
- component.create();
-
- fw = findFileWidget();
- QVERIFY(fw);
- QCOMPARE(fw->isVisible(), true);
- fw->slotCancel();
- }
- delete fw;
- }
-
-private:
- static KFileWidget *findFileWidget()
- {
- QList<KFileWidget *> widgets;
- foreach (QWidget *widget, QApplication::topLevelWidgets()) {
- KFileWidget *fw = widget->findChild<KFileWidget *>();
- if (fw) {
- widgets.append(fw);
- }
- }
- Q_ASSERT(widgets.count() == 1);
- return (widgets.count() == 1) ? widgets.first() : Q_NULLPTR;
- }
-};
-
-QTEST_MAIN(KFileDialogQml_UnitTest)
-
-#include "kfiledialogqml_unittest.moc"
-
|
[-]
[+]
|
Deleted |
frameworkintegration-5.9.0.tar.xz/autotests/qml
^
|
-(directory)
|
[-]
[+]
|
Deleted |
frameworkintegration-5.9.0.tar.xz/autotests/qml/filedialog_parentless.qml
^
|
@@ -1,27 +0,0 @@
-/* This file is part of the KDE libraries
- * Copyright 2015 David Rosca <nowrep@gmail.com>
- *
- * 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 of the License or ( at
- * your option ) version 3 or, at the discretion of KDE e.V. ( which shall
- * act as a proxy as in section 14 of the GPLv3 ), 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-import QtQuick 2.2
-import QtQuick.Dialogs 1.0
-
-FileDialog {
- id: fileDialog
- Component.onCompleted: visible = true
-}
|
[-]
[+]
|
Deleted |
frameworkintegration-5.9.0.tar.xz/autotests/qml/filedialog_withparent.qml
^
|
@@ -1,35 +0,0 @@
-/* This file is part of the KDE libraries
- * Copyright 2015 David Rosca <nowrep@gmail.com>
- *
- * 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 of the License or ( at
- * your option ) version 3 or, at the discretion of KDE e.V. ( which shall
- * act as a proxy as in section 14 of the GPLv3 ), 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-import QtQuick 2.2
-import QtQuick.Window 2.2
-import QtQuick.Dialogs 1.0
-
-Window {
- x: 100
- y: 100
- width: 100
- height: 100
-
- FileDialog {
- id: fileDialog
- Component.onCompleted: visible = true
- }
-}
|
[-]
[+]
|
Changed |
frameworkintegration-5.9.0.tar.xz/plasma_workspace.notifyrc
^
|
@@ -448,7 +448,7 @@
Name[pt_BR]=Notificação
Name[ru]=Уведомление
Name[sk]=Pripomienka
-Name[sl]=Obvestila
+Name[sl]=Obvestilo
Name[sr]=Обавештење
Name[sr@ijekavian]=Обавештење
Name[sr@ijekavianlatin]=Obaveštenje
@@ -1349,10 +1349,7 @@
[Event/plasmoidDeleted]
Name=Widget deleted
-Name[ar]=حُذفت ودجة
Name[ca]=Estri suprimit
-Name[cs]=Widget byl smazán
-Name[da]=Widget slettet
Name[de]=Miniprogramm wurde gelöscht
Name[en_GB]=Widget deleted
Name[es]=Elemento gráfico borrado
@@ -1360,7 +1357,6 @@
Name[gl]=Eliminouse o trebello
Name[he]=וידג'ט נמחק
Name[it]=Oggetto eliminato
-Name[ko]=위젯 삭제됨
Name[nl]=Widget verwijderd
Name[pl]=Usunięto element interfejsu
Name[pt]=Elemento apagado
@@ -1377,10 +1373,8 @@
Name[x-test]=xxWidget deletedxx
Name[zh_CN]=部件已删除
Comment=A widget has been deleted
-Comment[ar]=حُذفت ودجة ما
Comment[ca]=S'ha suprimit un estri
Comment[cs]=Widget byl smazán
-Comment[da]=En widget er blevet slettet
Comment[de]=Ein Miniprogramm wurde gelöscht
Comment[en_GB]=A widget has been deleted
Comment[es]=Se ha borrado un elemento gráfico
@@ -1388,7 +1382,6 @@
Comment[gl]=Eliminouse un trebello.
Comment[he]=וידג'ט נמחק
Comment[it]=Un oggetto è stato eliminato
-Comment[ko]=위젯이 삭제됨
Comment[nl]=Er is een widget verwijderd
Comment[pl]=Element interfejsu został usunięty
Comment[pt]=Foi apagado um elemento
|
[-]
[+]
|
Changed |
frameworkintegration-5.9.0.tar.xz/src/platformtheme/kdeplatformfiledialoghelper.cpp
^
|
@@ -272,7 +272,6 @@
void KDEPlatformFileDialogHelper::exec()
{
- m_dialog->hide(); // ensure dialog is not shown (exec would block input)
m_dialog->winId(); // ensure there's a window created
KSharedConfig::Ptr conf = KSharedConfig::openConfig();
KWindowConfig::restoreWindowSize(m_dialog->windowHandle(), conf->group("FileDialogSize"));
@@ -297,11 +296,11 @@
bool KDEPlatformFileDialogHelper::show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent)
{
- Q_UNUSED(parent)
initializeDialog();
m_dialog->setWindowFlags(windowFlags);
m_dialog->setWindowModality(windowModality);
- m_dialog->show();
+ if (!parent || (parent && !parent->inherits("QWidgetWindow"))) // see #334963 and #344586 for details
+ m_dialog->show();
KSharedConfig::Ptr conf = KSharedConfig::openConfig();
KWindowConfig::restoreWindowSize(m_dialog->windowHandle(), conf->group("FileDialogSize"));
return true;
|
[-]
[+]
|
Changed |
frameworkintegration.yaml
^
|
@@ -44,6 +44,7 @@
- Qt5Concurrent
- Qt5Test
- Qt5X11Extras
+ - xcursor
Requires:
- kf5-filesystem
- oxygen-fonts
|