Hello community,
here is the log from the commit of package frameworkintegration for
openSUSE:Factory checked in at 2015-05-11 19:35:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/frameworkintegration (Old)
and /work/SRC/openSUSE:Factory/.frameworkintegration.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "frameworkintegration"
Changes:
--------
---
/work/SRC/openSUSE:Factory/frameworkintegration/frameworkintegration.changes
2015-04-18 10:40:57.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.frameworkintegration.new/frameworkintegration.changes
2015-05-11 19:47:55.000000000 +0200
@@ -1,0 +2,15 @@
+Sun May 3 19:45:36 UTC 2015 - [email protected]
+
+- Update to 5.10.0
+ * Fix native file dialogs from widgets QFileDialog:
+ ** File dialogs opened with exec() and without parent were
+ opened, but any user-interaction was blocked in a way that no
+ file could be selected nor the dialog closed.
+ ** File dialogs opened with open() or show() with parent were
+ not opened at all.
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.10.0.php
+- Drop 0001-Fix-native-file-dialogs-from-widgets-QFileDialog.patch,
+ merged upstream
+
+-------------------------------------------------------------------
Old:
----
0001-Fix-native-file-dialogs-from-widgets-QFileDialog.patch
frameworkintegration-5.9.0.tar.xz
New:
----
frameworkintegration-5.10.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ frameworkintegration.spec ++++++
--- /var/tmp/diff_new_pack.X14iYN/_old 2015-05-11 19:47:55.000000000 +0200
+++ /var/tmp/diff_new_pack.X14iYN/_new 2015-05-11 19:47:55.000000000 +0200
@@ -18,9 +18,9 @@
%bcond_without lang
%define lname libKF5Style5
-%define _tar_path 5.9
+%define _tar_path 5.10
Name: frameworkintegration
-Version: 5.9.0
+Version: 5.10.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 2.8.12
@@ -47,8 +47,6 @@
Url: http://www.kde.org
Source:
http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
Source1: baselibs.conf
-# PATCH-FIX-UPSTREAM
0001-Fix-native-file-dialogs-from-widgets-QFileDialog.patch
-Patch0: 0001-Fix-native-file-dialogs-from-widgets-QFileDialog.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -105,7 +103,6 @@
%lang_package -n %lname
%prep
%setup -q
-%patch0 -p1
%build
%cmake_kf5 -d build
++++++ frameworkintegration-5.9.0.tar.xz -> frameworkintegration-5.10.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.9.0/CMakeLists.txt
new/frameworkintegration-5.10.0/CMakeLists.txt
--- old/frameworkintegration-5.9.0/CMakeLists.txt 2015-04-04
13:58:07.000000000 +0200
+++ new/frameworkintegration-5.10.0/CMakeLists.txt 2015-05-03
17:02:29.000000000 +0200
@@ -2,7 +2,7 @@
project(FrameworkIntegration)
-find_package(ECM 5.9.0 REQUIRED NO_MODULE)
+find_package(ECM 5.10.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
@@ -19,8 +19,8 @@
set(REQUIRED_QT_VERSION 5.2.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus)
-set(KF5_VERSION "5.9.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.9.0") # handled by release scripts
+set(KF5_VERSION "5.10.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.10.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX FRAMEWORKINTEGRATION
VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/frameworkintegration_version.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.9.0/autotests/CMakeLists.txt
new/frameworkintegration-5.10.0/autotests/CMakeLists.txt
--- old/frameworkintegration-5.9.0/autotests/CMakeLists.txt 2015-04-04
13:58:07.000000000 +0200
+++ new/frameworkintegration-5.10.0/autotests/CMakeLists.txt 2015-05-03
17:02:29.000000000 +0200
@@ -1,12 +1,17 @@
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")
@@ -51,3 +56,8 @@
frameworkintegration_tests(
ksni_unittest
)
+
+if(Qt5Qml_FOUND)
+ frameworkintegration_tests(kfiledialogqml_unittest)
+ target_link_libraries(kfiledialogqml_unittest Qt5::Qml)
+endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.9.0/autotests/kfiledialog_unittest.cpp
new/frameworkintegration-5.10.0/autotests/kfiledialog_unittest.cpp
--- old/frameworkintegration-5.9.0/autotests/kfiledialog_unittest.cpp
2015-04-04 13:58:07.000000000 +0200
+++ new/frameworkintegration-5.10.0/autotests/kfiledialog_unittest.cpp
2015-05-03 17:02:29.000000000 +0200
@@ -111,6 +111,60 @@
}
}
+ 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");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.9.0/autotests/kfiledialogqml_unittest.cpp
new/frameworkintegration-5.10.0/autotests/kfiledialogqml_unittest.cpp
--- old/frameworkintegration-5.9.0/autotests/kfiledialogqml_unittest.cpp
1970-01-01 01:00:00.000000000 +0100
+++ new/frameworkintegration-5.10.0/autotests/kfiledialogqml_unittest.cpp
2015-05-03 17:02:29.000000000 +0200
@@ -0,0 +1,92 @@
+/* This file is part of the KDE libraries
+ * Copyright 2014 Dominik Haumann <[email protected]>
+ * Copyright 2015 David Rosca <[email protected]>
+ *
+ * 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"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.9.0/autotests/qml/filedialog_parentless.qml
new/frameworkintegration-5.10.0/autotests/qml/filedialog_parentless.qml
--- old/frameworkintegration-5.9.0/autotests/qml/filedialog_parentless.qml
1970-01-01 01:00:00.000000000 +0100
+++ new/frameworkintegration-5.10.0/autotests/qml/filedialog_parentless.qml
2015-05-03 17:02:29.000000000 +0200
@@ -0,0 +1,27 @@
+/* This file is part of the KDE libraries
+ * Copyright 2015 David Rosca <[email protected]>
+ *
+ * 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
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.9.0/autotests/qml/filedialog_withparent.qml
new/frameworkintegration-5.10.0/autotests/qml/filedialog_withparent.qml
--- old/frameworkintegration-5.9.0/autotests/qml/filedialog_withparent.qml
1970-01-01 01:00:00.000000000 +0100
+++ new/frameworkintegration-5.10.0/autotests/qml/filedialog_withparent.qml
2015-05-03 17:02:29.000000000 +0200
@@ -0,0 +1,35 @@
+/* This file is part of the KDE libraries
+ * Copyright 2015 David Rosca <[email protected]>
+ *
+ * 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
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.9.0/plasma_workspace.notifyrc
new/frameworkintegration-5.10.0/plasma_workspace.notifyrc
--- old/frameworkintegration-5.9.0/plasma_workspace.notifyrc 2015-04-04
13:58:07.000000000 +0200
+++ new/frameworkintegration-5.10.0/plasma_workspace.notifyrc 2015-05-03
17:02:29.000000000 +0200
@@ -2,7 +2,6 @@
IconName=kde
Comment=Plasma Workspace
Comment[ar]=مساحة عمل بلازما
-Comment[ast]=Estaya de trabayu Plasma
Comment[bs]=Plazma radni prostor
Comment[ca]=Espai de treball del Plasma
Comment[cs]=Pracovní plocha Plasma
@@ -13,6 +12,7 @@
Comment[fi]=Plasma-työtila
Comment[gd]=Rum-obrach Plasma
Comment[gl]=Espazo de traballo de Plasma
+Comment[he]= סביבת העבודה של Plasma
Comment[hu]=Plasma munkaterület
Comment[it]=Spazio di lavoro Plasma
Comment[ko]=Plasma 작업 공간
@@ -41,7 +41,6 @@
[Event/Trash: emptied]
Name=Trash: Emptied
Name[ar]=المهملات: أُفرغت
-Name[ast]=Papelera: balerada
Name[bs]=Smeće: ispražnjeno
Name[ca]=Paperera: s'ha buidat
Name[cs]=Koš: vyprázdněn
@@ -52,6 +51,7 @@
Name[fi]=Roskakori: Tyhjennetty
Name[gd]=An sgudal: falamh
Name[gl]=Lixo: Baleiro
+Name[he]=אשפה: רוקנה
Name[hu]=Kuka: kiürítve
Name[it]=Cestino: svuotato
Name[ko]=휴지통: 비워짐
@@ -78,7 +78,6 @@
Name[zh_TW]=資源回收筒：已清空
Comment=The trash has been emptied
Comment[ar]=أُفرغت المهملات
-Comment[ast]=La papelera baleróse
Comment[bs]=Smeće je ispražnjeno
Comment[ca]=S'ha buidat la paperera
Comment[cs]=Koš byl vyprázdněn
@@ -89,6 +88,7 @@
Comment[fi]=Roskakori on tyhjennetty
Comment[gd]=Chaidh an sgudal fhalamhachadh
Comment[gl]=Baleirouse o lixo
+Comment[he]=האשפה רוקנה
Comment[hu]=A kuka kiürült
Comment[it]=Il cestino è stato svuotato
Comment[ko]=휴지통이 비워짐
@@ -129,6 +129,7 @@
Name[fi]=Tekstin täydennys: kiertävä
Name[gd]=Coileanadh teacsa: cuairteachadh
Name[gl]=Completación de texto: rotación
+Name[he]=השלמת טקסט: סיבו
Name[hu]=Szövegkiegészítés: rotáció
Name[it]=Completamento del testo: rotazione
Name[ko]=텍스트 완성: 회전
@@ -164,6 +165,7 @@
Comment[fi]=Sopivien sanojen luettelo on käyty läpi
Comment[gd]=Ràinig thu an deireadh de na tha de sheisean ann
Comment[gl]=Acadouse a fin da lista de coincidencias
+Comment[he]=הגעת אל סוף רשימת ההתאמות
Comment[hu]=A találatok végére értem
Comment[it]=La fine dell'elenco di corrispondenze è stata raggiunta
Comment[ko]=일치하는 항목 목록의 끝에 도달함
@@ -203,6 +205,7 @@
Name[fi]=Tekstin täydennys: Ei sopivia
Name[gd]=Coileanadh teacsa: cha do lorg sinn gin
Name[gl]=Completación de texto: sen coincidencias
+Name[he]=השלמת טקסט: אין התאמה
Name[hu]=Szövegkiegészítés: nincs találat
Name[it]=Completamento del testo: nessuna corrispondenza
Name[ko]=텍스트 완성: 일치하는 것 없음
@@ -238,6 +241,7 @@
Comment[fi]=Sopivaa täydennystä ei löytynyt
Comment[gd]=Cha deach coileanadh a fhreagras a lorg
Comment[gl]=Non se atopou ningún acabamento
+Comment[he]=לא נמצאה התאמה
Comment[hu]=Nincs illeszthető szó
Comment[it]=Non è stato trovato alcun completamento corrispondente
Comment[ko]=일치하는 항목을 찾을 수 없음
@@ -277,6 +281,7 @@
Name[fi]=Tekstin täydennys: Osittainen osuma
Name[gd]=Coileanadh teacsa: pàirt dheth co-ionnann
Name[gl]=Completación de texto: coincidencia parcial
+Name[he]=השלמת טקסט: התאמה חלקי
Name[hu]=Szövegkiegészítés: részleges találat
Name[it]=Completamento del testo: corrispondenza parziale
Name[ko]=텍스트 완성: 부분적 일치
@@ -312,6 +317,7 @@
Comment[fi]=Löytyi useampi kuin yksi mahdollinen osuma
Comment[gd]=Lorg sinn barrachd air aon nì a fhreagradh
Comment[gl]=Hai máis dun posíbel acabamento
+Comment[he]=יש יותר מהתאמה אחת
Comment[hu]=Egynél több szó illeszkedik
Comment[it]=C'è più di una corrispondenza possibile
Comment[ko]=하나 이상의 일치하는 항목이 있음
@@ -341,7 +347,6 @@
[Event/fatalerror]
Name=Fatal Error
Name[ar]=خطأ فادح
-Name[ast]=Fallu fatal
Name[bs]=Kobna greška
Name[ca]=Error fatal
Name[cs]=Kritická chyba
@@ -352,6 +357,7 @@
Name[fi]=Vakava virhe
Name[gd]=Mearachd mharbhtach
Name[gl]=Erro fatal
+Name[he]=שגיאה חמורה
Name[hu]=Végzetes hiba
Name[it]=Errore grave
Name[ko]=치명적 오류
@@ -377,7 +383,6 @@
Name[zh_TW]=嚴重錯誤
Comment=There was a serious error causing the program to exit
Comment[ar]=حدث خطأ جادّ سببّ للبرنامج بإغلاقه
-Comment[ast]=Hebo un fallu seriu causando que'l programa colara
Comment[bs]=Došlo je do ozbiljne greške zbog koje je program obustavljen
Comment[ca]=S'ha produït un error seriós que ha provocat la sortida del
programa
Comment[cs]=Nastala závažná chyba, v důsledku které byl program ukončen
@@ -388,6 +393,7 @@
Comment[fi]=Vakava virhe aiheutti ohjelman päättymisen
Comment[gd]=Chaidh am prògram fhàgail ri linn mearachd dona
Comment[gl]=Produciuse un erro grave que fixo que o programa se pechase
+Comment[he]=ארעה שגיאה חמורה הגורמה ליישום להיסגר
Comment[hu]=Olyan hiba történt a programban, melynek hatására a program futása
befejeződött
Comment[it]=Si è verificato un errore grave, che ha causato la chiusura del
programma
Comment[ko]=프로그램이 종료될 정도의 큰 오류가 발생함
@@ -418,7 +424,6 @@
[Event/notification]
Name=Notification
Name[ar]=إخطار
-Name[ast]=Notificación
Name[bs]=Obavještenje
Name[ca]=Notificació
Name[cs]=Upozornění
@@ -429,6 +434,7 @@
Name[fi]=Ilmoitus
Name[gd]=Brath
Name[gl]=Notificación
+Name[he]=התראה
Name[hu]=Értesítés
Name[it]=Notifica
Name[ko]=알림
@@ -442,7 +448,7 @@
Name[pt_BR]=Notificação
Name[ru]=Уведомление
Name[sk]=Pripomienka
-Name[sl]=Obvestilo
+Name[sl]=Obvestila
Name[sr]=Обавештење
Name[sr@ijekavian]=Обавештење
Name[sr@ijekavianlatin]=Obaveštenje
@@ -455,7 +461,6 @@
Name[zh_TW]=通知
Comment=Something special happened in the program
Comment[ar]=حدث شيء خاصّ في البرنامج
-Comment[ast]=Daqué especial asocedió nel programa
Comment[bs]=Nešto posebno se dogodilo u programu
Comment[ca]=Quelcom especial ha passat en el programa
Comment[cs]=Něco zvláštního se stalo s programem
@@ -466,6 +471,7 @@
Comment[fi]=Ohjelmassa tapahtui jotakin erikoista
Comment[gd]=Thachair rudeigin sònraichte sa phrògram
Comment[gl]=Aconteceu algo especial no programa
+Comment[he]=משהו מיוחד קרה ביישום
Comment[hu]=Valamilyen esemény következett be a programban
Comment[it]=Si è verificato qualcosa di speciale nel programma
Comment[ko]=프로그램에서 특별한 일이 발생함
@@ -495,7 +501,6 @@
[Event/warning]
Name=Warning
Name[ar]=تحذير
-Name[ast]=Avisu
Name[bs]=Upozorenje
Name[ca]=Avís
Name[cs]=Varování
@@ -506,6 +511,7 @@
Name[fi]=Varoitus
Name[gd]=Rabhadh
Name[gl]=Aviso
+Name[he]=אזהרה
Name[hu]=Figyelmeztetés
Name[it]=Avviso
Name[ko]=경고
@@ -532,7 +538,6 @@
Name[zh_TW]=警告
Comment=There was an error in the program which may cause problems
Comment[ar]=حدث خطأ في البرنامج مما تسبّب بمشاكل
-Comment[ast]=Hebo un fallu nel programa que podría causar problemes
Comment[bs]=Došlo je do greške u programu koja može izazvati probleme
Comment[ca]=S'ha produït un error en el programa que pot provocar problemes
Comment[cs]=V programu nastala chyba, která může způsobit problémy
@@ -543,6 +548,7 @@
Comment[fi]=Ohjelmassa oli virhe, joka voi aiheuttaa ongelmia
Comment[gd]=Bha mearachd sa phrògram a dh'adhbharaicheas trioblaid ma
dh'fhaoidte
Comment[gl]=Produciuse un erro no programa que pode causar problemas
+Comment[he]=אירעה שגיאה ביישום, דבר העלול לגרום לבעיות
Comment[hu]=Hiba történt a programban, de a program futása folytatódhat
Comment[it]=Si è verificato un errore nel programma che potrebbe causare
problemi
Comment[ko]=프로그램에 문제를 가져올 수 있는 오류가 발생함
@@ -572,7 +578,6 @@
[Event/catastrophe]
Name=Catastrophe
Name[ar]=كارثة
-Name[ast]=Catástrofe
Name[bs]=Katastrofa
Name[ca]=Catàstrofe
Name[cs]=Katastrofa
@@ -583,6 +588,7 @@
Name[fi]=Katastrofi
Name[gd]=Tubaist
Name[gl]=Catástrofe
+Name[he]=קטטסטרופה
Name[hu]=Súlyos hiba
Name[it]=Catastrofe
Name[ko]=중대한 오류
@@ -618,6 +624,7 @@
Comment[fi]=Tapahtui erittäin vakava virhe, joka aiheutti ainakin ohjelman
päättymisen
Comment[gd]=Thachair mearachd glè dhona agus chaidh am prògram fhàgail air a
char as lugha
Comment[gl]=Produciuse un erro moi grave, que como mínimo fixo que o programa
se pechase
+Comment[he]=אירעה שגיאה חמורה מאוד, הגרמה ליישום כנראה להיסגר
Comment[hu]=Hiba történt a programban, a program futása befejeződött
Comment[it]=Si è verificato un errore molto grave, che ha causato almeno la
chiusura del programma
Comment[ko]=프로그램이 종료될 정도의 매우 큰 오류가 발생함
@@ -648,7 +655,6 @@
[Event/startkde]
Name=Login
Name[ar]=ولوج
-Name[ast]=Aniciar sesión
Name[bs]=Prijava
Name[ca]=Entrada
Name[cs]=Přihlášení
@@ -659,6 +665,7 @@
Name[fi]=Kirjautuminen
Name[gd]=Logadh a-steach
Name[gl]=Acceso
+Name[he]=כניסה
Name[hu]=Bejelentkezés
Name[it]=Accesso
Name[ko]=로그인
@@ -685,7 +692,6 @@
Name[zh_TW]=登入
Comment=A new session is starting
Comment[ar]=جلسة جديدة تبدأ
-Comment[ast]=Ta aniciándose una sesión nueva
Comment[bs]=Nova sesija započinje
Comment[ca]=S'està iniciat una sessió nova
Comment[cs]=Spouští se nové sezení
@@ -696,6 +702,7 @@
Comment[fi]=Uusi istunto alkaa
Comment[gd]=Tha seisean ùr a' tòiseachadh
Comment[gl]=Estase a iniciar unha sesión nova
+Comment[he]=מופעלת כעת הפעלה חדשה
Comment[hu]=Egy új munkamenet kezdődött
Comment[it]=Una nuova sessione sta per essere iniziata
Comment[ko]=새 세션이 시작됨
@@ -725,7 +732,6 @@
[Event/exitkde]
Name=Logout
Name[ar]=خروج
-Name[ast]=Zarrar sesión
Name[bs]=Odjavi se
Name[ca]=Sortida
Name[cs]=Odhlášení
@@ -736,6 +742,7 @@
Name[fi]=Uloskirjautuminen
Name[gd]=Logadh a-mach
Name[gl]=Saír
+Name[he]=יציאה
Name[hu]=Kijelentkezés
Name[it]=Chiudi sessione
Name[ko]=로그아웃
@@ -762,7 +769,6 @@
Name[zh_TW]=登出
Comment=Session is exiting
Comment[ar]=الجلسة تخرج
-Comment[ast]=La sesión ta colando
Comment[bs]=Izlaz iz sesije
Comment[ca]=La sessió està finalitzant
Comment[cs]=Sezení se ukončuje
@@ -773,6 +779,7 @@
Comment[fi]=Istunto päättyy
Comment[gd]=Tha an seisean 'ga fhàgail
Comment[gl]=Estase a saír da sesión
+Comment[he]=הפעלה נסגרת כעת
Comment[hu]=A munkamenet létezik
Comment[it]=La sessione sta per essere terminata
Comment[ko]=세션이 종료됨
@@ -803,7 +810,6 @@
[Event/cancellogout]
Name=Logout Canceled
Name[ar]=أُلغِيَ الخروج
-Name[ast]=Zarru de sesión encaboxáu
Name[bs]=Odjava otkazana
Name[ca]=S'ha cancel·lat la sortida
Name[cs]=Odhlášení přerušeno
@@ -814,6 +820,7 @@
Name[fi]=Uloskirjautuminen peruttu
Name[gd]=Chaidh sgur dhen logadh a-mach
Name[gl]=Cancelouse a saída
+Name[he]=היצאה בוטלה
Name[hu]=Kijelentkezés megszakítva
Name[it]=Chiusura della sessione annullata
Name[ko]=로그아웃 취소됨
@@ -840,7 +847,6 @@
Name[zh_TW]=登出已取消
Comment=Plasma logout was canceled
Comment[ar]=أُلغِيَ الخروج من بلازما
-Comment[ast]=Encaboxóse'l zarru de sesión de Plasma
Comment[bs]=Plazma odjava je prekinuta
Comment[ca]=S'ha cancel·lat la sortida del Plasma
Comment[cs]=Odhlášení z Plazmy bylo zrušeno
@@ -851,6 +857,7 @@
Comment[fi]=Plasmasta uloskirjautuminen on peruttu
Comment[gd]=Chaidh sgur dhen logadh a-mach à Plasma
Comment[gl]=Cancelouse a saída de Plasma
+Comment[he]=היציאה מאת Plasma בוטלה
Comment[hu]=A KDE kijelentkezési folyamata megszakadt
Comment[it]=La chiusura di Plasma è stata annullata
Comment[ko]=Plasma 로그아웃 취소됨
@@ -880,7 +887,6 @@
[Event/printerror]
Name=Print Error
Name[ar]=خطأ طباعة
-Name[ast]=Fallu d'imprentación
Name[bs]=Greška štampanja
Name[ca]=Error d'impressió
Name[cs]=Chyba tisku
@@ -891,6 +897,7 @@
Name[fi]=Tulostusvirhe
Name[gd]=Mearachd clò-bhualaidh
Name[gl]=Erro de impresión
+Name[he]=שגיאת הדפסה
Name[hu]=Nyomtatási hiba
Name[it]=Errore di stampa
Name[ko]=인쇄 오류
@@ -917,7 +924,6 @@
Name[zh_TW]=列印錯誤
Comment=A print error has occurred
Comment[ar]=حدث خطأ في الطباعة
-Comment[ast]=Asocedió un fallu d'imprentación
Comment[bs]=Došlo je do greške pri štampanju
Comment[ca]=S'ha produït un error d'impressió
Comment[cs]=Nastala chyba v tisku
@@ -928,6 +934,7 @@
Comment[fi]=Tapahtui tulostusvirhe
Comment[gd]=Thachair mearachd leis a' chlò-bhualadh
Comment[gl]=Produciuse un erro na impresión
+Comment[he]=אירעה שגיאת הדפסה
Comment[hu]=Nyomtatási hiba történt
Comment[it]=Si è verificato un errore di stampa
Comment[ko]=인쇄 오류가 발생함
@@ -957,7 +964,6 @@
[Event/messageInformation]
Name=Information Message
Name[ar]=رسالة معلومات
-Name[ast]=Mensaxe d'información
Name[bs]=Informativna poruka
Name[ca]=Missatge d'informació
Name[cs]=Informační zpráva
@@ -968,6 +974,7 @@
Name[fi]=Ilmoitus
Name[gd]=Teachdaireachd fiosrachaidh
Name[gl]=Mensaxe de información
+Name[he]=הודעת מידע
Name[hu]=Tájékoztató üzenet
Name[it]=Messaggio informativo
Name[ko]=정보 메시지
@@ -994,7 +1001,6 @@
Name[zh_TW]=資訊訊息
Comment=An information message is being shown
Comment[ar]=رسالة معلومات تظهر
-Comment[ast]=Ta amosándose un mensaxe d'información
Comment[bs]=Prikazana je informativna poruka
Comment[ca]=Es mostra un missatge d'informació
Comment[cs]=Je zobrazována informační zpráva
@@ -1005,6 +1011,7 @@
Comment[fi]=Ilmoitus näytetään
Comment[gd]=Tha teachdaireachd fiosrachaidh 'ga sealltainn
Comment[gl]=Está a mostrarse unha mensaxe de información
+Comment[he]=מוצגת כרגע הודעת מידע
Comment[hu]=Tájékoztató üzenet jelenik meg
Comment[it]=Un messaggio informativo viene mostrato
Comment[ko]=정보 메시지가 표시됨
@@ -1034,7 +1041,6 @@
[Event/messageWarning]
Name=Warning Message
Name[ar]=رسالة تحذيريّة
-Name[ast]=Mensaxe d'avisu
Name[bs]=Upozoravajuća poruka
Name[ca]=Missatge d'avís
Name[cs]=Varovná zpráva
@@ -1045,6 +1051,7 @@
Name[fi]=Varoitus
Name[gd]=Teachdaireachd rabhaidh
Name[gl]=Mensaxe de aviso
+Name[he]=הודעת אזהרה
Name[hu]=Figyelmeztető üzenet
Name[it]=Messaggio di avviso
Name[ko]=경고 메시지
@@ -1071,7 +1078,6 @@
Name[zh_TW]=警告訊息
Comment=A warning message is being shown
Comment[ar]=رسالة تحذير تظهر
-Comment[ast]=Ta amosándose un mensaxe d'avisu
Comment[bs]=Prikazana je upozoravajuća poruka
Comment[ca]=Es mostra un missatge d'avís
Comment[cs]=Je zobrazována výstražná zpráva
@@ -1082,6 +1088,7 @@
Comment[fi]=Varoitus näytetään
Comment[gd]=Tha teachdaireachd rabhaidh 'ga sealltainn
Comment[gl]=Está a mostrarse unha mensaxe de aviso
+Comment[he]=מוצגת כעת הודעת אזהרה
Comment[hu]=Figyelmeztető üzenet jelenik meg
Comment[it]=Un messaggio di avviso viene mostrato
Comment[ko]=경고 메시지가 표시됨
@@ -1111,7 +1118,6 @@
[Event/messageCritical]
Name=Critical Message
Name[ar]=رسالة حرِجة
-Name[ast]=Mensaxe críticu
Name[bs]=Kritična poruka
Name[ca]=Missatge crític
Name[cs]=Kritická zpráva
@@ -1122,6 +1128,7 @@
Name[fi]=Hälytys
Name[gd]=Teachdaireachd èiginneach
Name[gl]=Mensaxe crítica
+Name[he]=הודעה קריטית
Name[hu]=Kritikus fontosságú üzenet
Name[it]=Messaggio critico
Name[ko]=치명적 오류 메시지
@@ -1148,7 +1155,6 @@
Name[zh_TW]=嚴重訊息
Comment=A critical message is being shown
Comment[ar]=رسالة حرِجة تظهر
-Comment[ast]=Ta amosándose un mensaxe críticu
Comment[bs]=Prikazana je kritična poruka
Comment[ca]=Es mostra un missatge crític
Comment[cs]=Je zobrazována kritická zpráva
@@ -1159,6 +1165,7 @@
Comment[fi]=Hälytys näytetään
Comment[gd]=Tha teachdaireachd èiginneach 'ga sealltainn
Comment[gl]=Está a mostrarse unha mensaxe crítica
+Comment[he]=מוצגת כעת הודעה קריטית
Comment[hu]=Kritikus fontosságú hibaüzenet jelenik meg
Comment[it]=Un messaggio critico è stato mostrato
Comment[ko]=치명적 오류 메시지가 표시됨
@@ -1188,7 +1195,6 @@
[Event/messageboxQuestion]
Name=Question
Name[ar]=سؤال
-Name[ast]=Entruga
Name[bs]=Pitanje
Name[ca]=Pregunta
Name[cs]=Dotaz
@@ -1199,6 +1205,7 @@
Name[fi]=Kysymys
Name[gd]=Ceist
Name[gl]=Pregunta
+Name[he]=שאלה
Name[hu]=Kérdés
Name[it]=Domanda
Name[ko]=질문
@@ -1225,7 +1232,6 @@
Name[zh_TW]=詢問
Comment=A question is being asked
Comment[ar]=سؤال يُسأل
-Comment[ast]=Ta faciéndose una entruga
Comment[bs]=Nešto ste upitani
Comment[ca]=Es pregunta una qüestió
Comment[cs]=Je položen dotaz
@@ -1236,6 +1242,7 @@
Comment[fi]=Esitetään kysymys
Comment[gd]=Tha ceist 'ga fhaighneachd
Comment[gl]=Está a facerse unha pregunta
+Comment[he]=נשאלת כרגע שאלה
Comment[hu]=Kérdés jelenik meg
Comment[it]=Una domanda viene posta
Comment[ko]=질문을 해 오고 있음
@@ -1266,7 +1273,6 @@
[Event/beep]
Name=Beep
Name[ar]=جرس
-Name[ast]=Bip
Name[bs]=Bip
Name[ca]=Timbre
Name[cs]=Pípnutí
@@ -1277,6 +1283,7 @@
Name[fi]=Äänimerkki
Name[gd]=Bìd
Name[gl]=Badalada
+Name[he]=ביפ
Name[hu]=Csipogás
Name[it]=Bip
Name[ko]=삑 소리
@@ -1313,6 +1320,7 @@
Comment[fi]=Äänimerkki
Comment[gd]=Fuaim cluig
Comment[gl]=Badalada audíbel
+Comment[he]=צילצול פעמון
Comment[hu]=Hangjelzés
Comment[it]=Campanella
Comment[ko]=소리 벨
@@ -1341,13 +1349,19 @@
[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
Name[fi]=Sovelma poistettu
Name[gl]=Eliminouse o trebello
+Name[he]=וידג'ט נמחק
Name[it]=Oggetto eliminato
+Name[ko]=위젯 삭제됨
+Name[nb]=Skjermelement slettet
Name[nl]=Widget verwijderd
Name[pl]=Usunięto element interfejsu
Name[pt]=Elemento apagado
@@ -1364,14 +1378,19 @@
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
Comment[fi]=Sovelma on poistettu
Comment[gl]=Eliminouse un trebello.
+Comment[he]=וידג'ט נמחק
Comment[it]=Un oggetto è stato eliminato
+Comment[ko]=위젯이 삭제됨
+Comment[nb]=Et skjermelement er slettet
Comment[nl]=Er is een widget verwijderd
Comment[pl]=Element interfejsu został usunięty
Comment[pt]=Foi apagado um elemento
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.9.0/po/ast/frameworkintegration5.po
new/frameworkintegration-5.10.0/po/ast/frameworkintegration5.po
--- old/frameworkintegration-5.9.0/po/ast/frameworkintegration5.po
2015-04-04 13:58:07.000000000 +0200
+++ new/frameworkintegration-5.10.0/po/ast/frameworkintegration5.po
2015-05-03 17:02:29.000000000 +0200
@@ -7,7 +7,7 @@
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2014-12-02 09:50+0000\n"
-"PO-Revision-Date: 2015-02-28 23:39+0100\n"
+"PO-Revision-Date: 2015-04-06 15:19+0100\n"
"Last-Translator: enolp <[email protected]>\n"
"Language-Team: Asturian <[email protected]>\n"
"Language: ast\n"
@@ -18,55 +18,65 @@
"X-Generator: Lokalize 2.0\n"
#: platformtheme/kdeplatformfiledialoghelper.cpp:234
+#, fuzzy
msgid "Opening..."
msgstr "Abriendo..."
#: platformtheme/kdeplatformfiledialoghelper.cpp:234
+#, fuzzy
msgid "Saving..."
msgstr "Guardando..."
#: platformtheme/kdeplatformtheme.cpp:227
+#, fuzzy
msgctxt "@action:button"
msgid "Save All"
msgstr "Guardar too"
#: platformtheme/kdeplatformtheme.cpp:233
+#, fuzzy
msgctxt "@action:button"
msgid "Yes to All"
msgstr "Sí a too"
#: platformtheme/kdeplatformtheme.cpp:237
+#, fuzzy
msgctxt "@action:button"
msgid "No to All"
msgstr "Non a too"
#: platformtheme/kdeplatformtheme.cpp:240
+#, fuzzy
msgctxt "@action:button"
msgid "Abort"
msgstr "Albortar"
#: platformtheme/kdeplatformtheme.cpp:242
+#, fuzzy
msgctxt "@action:button"
msgid "Retry"
msgstr "Reintentar"
#: platformtheme/kdeplatformtheme.cpp:244
+#, fuzzy
msgctxt "@action:button"
msgid "Ignore"
msgstr "Inorar"
#: platformtheme/kdirselectdialog.cpp:132
+#, fuzzy
msgctxt "folder name"
msgid "New Folder"
msgstr "Carpeta nueva"
#: platformtheme/kdirselectdialog.cpp:137
+#, fuzzy
msgctxt "@title:window"
msgid "New Folder"
msgstr "Carpeta nueva"
#: platformtheme/kdirselectdialog.cpp:138
-#, kde-format
+#, fuzzy, kde-format
msgctxt "@label:textbox"
msgid ""
"Create new folder in:\n"
@@ -76,45 +86,53 @@
"%1"
#: platformtheme/kdirselectdialog.cpp:168
-#, kde-format
+#, fuzzy, kde-format
msgid "A file or folder named %1 already exists."
msgstr "Yá esiste un ficheru o carpeta nomáu %1."
#: platformtheme/kdirselectdialog.cpp:171
+#, fuzzy
msgid "You do not have permission to create that folder."
msgstr "Nun tienes permisu pa crear esa carpeta."
#: platformtheme/kdirselectdialog.cpp:285
+#, fuzzy
msgctxt "@title:window"
msgid "Select Folder"
msgstr "Esbillar carpeta"
#: platformtheme/kdirselectdialog.cpp:294
+#, fuzzy
msgctxt "@action:button"
msgid "New Folder..."
msgstr "Carpeta nueva..."
#: platformtheme/kdirselectdialog.cpp:340
+#, fuzzy
msgctxt "@action:inmenu"
msgid "New Folder..."
msgstr "Carpeta nuva..."
#: platformtheme/kdirselectdialog.cpp:347
+#, fuzzy
msgctxt "@action:inmenu"
msgid "Move to Trash"
msgstr "Mover a la papelera"
#: platformtheme/kdirselectdialog.cpp:354
+#, fuzzy
msgctxt "@action:inmenu"
msgid "Delete"
msgstr "Desanciar"
#: platformtheme/kdirselectdialog.cpp:363
+#, fuzzy
msgctxt "@option:check"
msgid "Show Hidden Folders"
msgstr "Amosar carpetes anubríes"
#: platformtheme/kdirselectdialog.cpp:370
+#, fuzzy
msgctxt "@action:inmenu"
msgid "Properties"
msgstr "Propiedaes"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.9.0/po/ko/frameworkintegration5.po
new/frameworkintegration-5.10.0/po/ko/frameworkintegration5.po
--- old/frameworkintegration-5.9.0/po/ko/frameworkintegration5.po
2015-04-04 13:58:07.000000000 +0200
+++ new/frameworkintegration-5.10.0/po/ko/frameworkintegration5.po
2015-05-03 17:02:29.000000000 +0200
@@ -1,6 +1,6 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
-# Park Shinjo <[email protected]>, 2014, 2015.
+# Shinjo Park <[email protected]>, 2014, 2015.
#
msgid ""
msgstr ""
@@ -8,7 +8,7 @@
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2014-12-02 09:50+0000\n"
"PO-Revision-Date: 2015-01-02 03:23+0900\n"
-"Last-Translator: Park Shinjo <[email protected]>\n"
+"Last-Translator: Shinjo Park <[email protected]>\n"
"Language-Team: Korean <[email protected]>\n"
"Language: ko\n"
"MIME-Version: 1.0\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.9.0/po/nb/frameworkintegration5.po
new/frameworkintegration-5.10.0/po/nb/frameworkintegration5.po
--- old/frameworkintegration-5.9.0/po/nb/frameworkintegration5.po
2015-04-04 13:58:07.000000000 +0200
+++ new/frameworkintegration-5.10.0/po/nb/frameworkintegration5.po
2015-05-03 17:02:29.000000000 +0200
@@ -1,12 +1,12 @@
# Translation of frameworkintegration5 to Norwegian Bokmål
#
-# Bjørn Steensrud <[email protected]>, 2014.
+# Bjørn Steensrud <[email protected]>, 2014, 2015.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2014-12-02 09:50+0000\n"
-"PO-Revision-Date: 2014-09-14 22:12+0200\n"
+"PO-Revision-Date: 2015-02-24 20:41+0100\n"
"Last-Translator: Bjørn Steensrud <[email protected]>\n"
"Language-Team: Norwegian Bokmål <[email protected]>\n"
"Language: nb\n"
@@ -30,32 +30,32 @@
#: platformtheme/kdeplatformtheme.cpp:227
msgctxt "@action:button"
msgid "Save All"
-msgstr ""
+msgstr "Lagre alle"
#: platformtheme/kdeplatformtheme.cpp:233
msgctxt "@action:button"
msgid "Yes to All"
-msgstr ""
+msgstr "Ja til alt"
#: platformtheme/kdeplatformtheme.cpp:237
msgctxt "@action:button"
msgid "No to All"
-msgstr ""
+msgstr "Nei til alt"
#: platformtheme/kdeplatformtheme.cpp:240
msgctxt "@action:button"
msgid "Abort"
-msgstr ""
+msgstr "Avbryt"
#: platformtheme/kdeplatformtheme.cpp:242
msgctxt "@action:button"
msgid "Retry"
-msgstr ""
+msgstr "Prøv igjen"
#: platformtheme/kdeplatformtheme.cpp:244
msgctxt "@action:button"
msgid "Ignore"
-msgstr ""
+msgstr "Ignorer"
#: platformtheme/kdirselectdialog.cpp:132
msgctxt "folder name"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.9.0/src/platformtheme/kdeplatformfiledialoghelper.cpp
new/frameworkintegration-5.10.0/src/platformtheme/kdeplatformfiledialoghelper.cpp
---
old/frameworkintegration-5.9.0/src/platformtheme/kdeplatformfiledialoghelper.cpp
2015-04-04 13:58:07.000000000 +0200
+++
new/frameworkintegration-5.10.0/src/platformtheme/kdeplatformfiledialoghelper.cpp
2015-05-03 17:02:29.000000000 +0200
@@ -272,6 +272,7 @@
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"));
@@ -296,11 +297,11 @@
bool KDEPlatformFileDialogHelper::show(Qt::WindowFlags windowFlags,
Qt::WindowModality windowModality, QWindow *parent)
{
+ Q_UNUSED(parent)
initializeDialog();
m_dialog->setWindowFlags(windowFlags);
m_dialog->setWindowModality(windowModality);
- if (!parent || (parent && !parent->inherits("QWidgetWindow"))) // see
#334963 and #344586 for details
- m_dialog->show();
+ m_dialog->show();
KSharedConfig::Ptr conf = KSharedConfig::openConfig();
KWindowConfig::restoreWindowSize(m_dialog->windowHandle(),
conf->group("FileDialogSize"));
return true;
