diffstat for plasma-integration-5.8.6 plasma-integration-5.9.3 CMakeLists.txt | 30 - COPYING.LGPL-2 | 481 ---------------- COPYING.LGPL-3 | 165 +++++ COPYING.LIB | 510 ----------------- autotests/CMakeLists.txt | 13 autotests/kfiledialog_unittest.cpp | 52 - cmake/modules/FindQt5PlatformSupport.cmake | 121 ++++ cmake/modules/FindQt5ThemeSupport.cmake | 122 ++++ debian/changelog | 125 +--- debian/control | 47 - debian/copyright | 93 +-- debian/patches/Drop-the-patch-version-for-breeze.patch | 33 - debian/patches/series | 1 debian/plasma-integration.install | 3 debian/rules | 7 debian/upstream/metadata | 7 debian/watch | 2 po/ar/plasmaintegration5.po | 14 po/ast/plasmaintegration5.po | 40 - po/ca/plasmaintegration5.po | 14 po/ca@valencia/plasmaintegration5.po | 14 po/cs/plasmaintegration5.po | 14 po/da/plasmaintegration5.po | 14 po/de/plasmaintegration5.po | 14 po/el/plasmaintegration5.po | 14 po/en_GB/plasmaintegration5.po | 14 po/es/plasmaintegration5.po | 14 po/et/plasmaintegration5.po | 14 po/fi/plasmaintegration5.po | 14 po/fr/plasmaintegration5.po | 14 po/gl/plasmaintegration5.po | 22 po/it/plasmaintegration5.po | 14 po/ja/plasmaintegration5.po | 14 po/ko/plasmaintegration5.po | 14 po/nb/plasmaintegration5.po | 14 po/nl/plasmaintegration5.po | 14 po/nn/plasmaintegration5.po | 14 po/pa/plasmaintegration5.po | 14 po/pl/plasmaintegration5.po | 14 po/pt/plasmaintegration5.po | 14 po/pt_BR/plasmaintegration5.po | 14 po/ru/plasmaintegration5.po | 14 po/sk/plasmaintegration5.po | 14 po/sl/plasmaintegration5.po | 14 po/sr/plasmaintegration5.po | 14 po/sr@ijekavian/plasmaintegration5.po | 14 po/sr@ijekavianlatin/plasmaintegration5.po | 14 po/sr@latin/plasmaintegration5.po | 14 po/sv/plasmaintegration5.po | 14 po/uk/plasmaintegration5.po | 14 po/zh_CN/plasmaintegration5.po | 14 po/zh_TW/plasmaintegration5.po | 14 src/platformtheme/CMakeLists.txt | 25 src/platformtheme/kdeplatformfiledialoghelper.cpp | 4 src/platformtheme/kdeplatformtheme.cpp | 91 ++- src/platformtheme/kdeplatformtheme.h | 10 src/platformtheme/kwaylandintegration.cpp | 42 + src/platformtheme/kwaylandintegration.h | 5 src/platformtheme/qdbusmenubar.cpp | 229 +++++++ src/platformtheme/qdbusmenubar_p.h | 112 +++ src/platformtheme/x11integration.cpp | 97 +++ src/platformtheme/x11integration.h | 10 62 files changed, 1464 insertions(+), 1497 deletions(-) diff -Nru plasma-integration-5.8.6/CMakeLists.txt plasma-integration-5.9.3/CMakeLists.txt --- plasma-integration-5.8.6/CMakeLists.txt 2017-02-21 12:11:22.000000000 +0000 +++ plasma-integration-5.9.3/CMakeLists.txt 2017-02-28 13:04:09.000000000 +0000 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8.12) project(PlasmaIntegration) -set(PROJECT_VERSION "5.8.6") +set(PROJECT_VERSION "5.9.3") set(PROJECT_VERSION_MAJOR 5) include(FeatureSummary) @@ -9,8 +9,7 @@ set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) - -set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(GenerateExportHeader) @@ -38,11 +37,36 @@ find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED) find_package(KF5Wayland 5.5 CONFIG REQUIRED) +find_package(XCB COMPONENTS XCB) +set_package_properties(XCB PROPERTIES + DESCRIPTION "X protocol C-language Binding" + URL "http://xcb.freedesktop.org" + TYPE REQUIRED + PURPOSE "Required to pass style properties to native Windows on X11 Platform" +) + find_package(Breeze ${PROJECT_VERSION} CONFIG) set_package_properties(Breeze PROPERTIES TYPE REQUIRED PURPOSE "For setting the default QStyle name") +# dependencies for QPA plugin +if(Qt5Core_VERSION VERSION_LESS "5.8.0") + find_package(Qt5PlatformSupport REQUIRED) +else() + find_package(Qt5ThemeSupport REQUIRED) +endif() + +if(Qt5Core_VERSION VERSION_LESS "5.8.0") + add_definitions(-DQ_FONTCONFIGDATABASE) + set(QT5PLATFORMSUPPORT_LIBS Qt5PlatformSupport::Qt5PlatformSupport) +else() + set(QT5PLATFORMSUPPORT_LIBS + Qt5ThemeSupport::Qt5ThemeSupport +) +endif() + + add_definitions(-DTRANSLATION_DOMAIN=\"plasmaintegration5\") if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") ki18n_install(po) diff -Nru plasma-integration-5.8.6/COPYING.LGPL-2 plasma-integration-5.9.3/COPYING.LGPL-2 --- plasma-integration-5.8.6/COPYING.LGPL-2 2017-02-21 12:11:12.000000000 +0000 +++ plasma-integration-5.9.3/COPYING.LGPL-2 1970-01-01 00:00:00.000000000 +0000 @@ -1,481 +0,0 @@ - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if -you distribute copies of the library, or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal -permission to copy, distribute and/or modify the library. - - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, so that any problems introduced by others will not reflect on -the original authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. - - GNU LIBRARY GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -General Public License (also called "this License"). Each licensee is -addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also compile or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - c) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - d) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the source code distributed need not include anything that is normally -distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Library General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff -Nru plasma-integration-5.8.6/COPYING.LGPL-3 plasma-integration-5.9.3/COPYING.LGPL-3 --- plasma-integration-5.8.6/COPYING.LGPL-3 1970-01-01 00:00:00.000000000 +0000 +++ plasma-integration-5.9.3/COPYING.LGPL-3 2017-02-28 13:04:03.000000000 +0000 @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff -Nru plasma-integration-5.8.6/COPYING.LIB plasma-integration-5.9.3/COPYING.LIB --- plasma-integration-5.8.6/COPYING.LIB 2017-02-21 12:11:12.000000000 +0000 +++ plasma-integration-5.9.3/COPYING.LIB 1970-01-01 00:00:00.000000000 +0000 @@ -1,510 +0,0 @@ - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations -below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it -becomes a de-facto standard. To achieve this, non-free programs must -be allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control -compilation and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at least - three years, to give the same user the materials specified in - Subsection 6a, above, for a charge no more than the cost of - performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply, and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License -may add an explicit geographical distribution limitation excluding those -countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms -of the ordinary General Public License). - - To apply these terms, attach the following notices to the library. -It is safest to attach them to the start of each source file to most -effectively convey the exclusion of warranty; and each file should -have at least the "copyright" line and a pointer to where the full -notice is found. - - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) 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, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or -your school, if any, to sign a "copyright disclaimer" for the library, -if necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James - Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff -Nru plasma-integration-5.8.6/autotests/CMakeLists.txt plasma-integration-5.9.3/autotests/CMakeLists.txt --- plasma-integration-5.8.6/autotests/CMakeLists.txt 2017-02-21 12:11:12.000000000 +0000 +++ plasma-integration-5.9.3/autotests/CMakeLists.txt 2017-02-28 13:04:03.000000000 +0000 @@ -13,13 +13,15 @@ message(STATUS "Qt5Qml not found, QML autotests will not be built.") endif() -include_directories( ${Qt5Gui_PRIVATE_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/src/platformtheme ) +include_directories( ${Qt5Gui_PRIVATE_INCLUDE_DIRS} ${Qt5PlatformSupport_PRIVATE_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/src/platformtheme ) set(CONFIGFILE "${CMAKE_CURRENT_SOURCE_DIR}/kdeplatformtheme_kdeglobals") set(CHANGED_CONFIGFILE "${CMAKE_CURRENT_SOURCE_DIR}/kdeplatformtheme_changed_kdeglobals") configure_file(kdeplatformtheme_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/kdeplatformtheme_config.h) remove_definitions(-DQT_NO_CAST_FROM_ASCII) +# qdbusmenubar uses them +remove_definitions(-DQT_NO_SIGNALS_SLOTS_KEYWORDS) macro(FRAMEWORKINTEGRATION_TESTS _testname) add_executable(${_testname} ${_testname}.cpp ${ARGN}) @@ -27,7 +29,7 @@ add_test(frameworkintegration-${_testname} ${_testname}) ecm_mark_as_test(${_testname}) ecm_mark_nongui_executable(${_testname}) - target_link_libraries(${_testname} Qt5::Test Qt5::DBus Qt5::X11Extras KF5::ConfigWidgets KF5::ConfigCore KF5::IconThemes KF5::KIOFileWidgets KF5::I18n KF5::Notifications KF5::WindowSystem KF5::WaylandClient) + target_link_libraries(${_testname} Qt5::Test Qt5::DBus Qt5::X11Extras ${QT5PLATFORMSUPPORT_LIBS} KF5::ConfigWidgets KF5::ConfigCore KF5::IconThemes KF5::KIOFileWidgets KF5::I18n KF5::Notifications KF5::WindowSystem KF5::WaylandClient XCB::XCB) endmacro() set(platformThemeSRCS @@ -43,6 +45,13 @@ ../src/platformtheme/x11integration.cpp ) +if(Qt5Core_VERSION VERSION_EQUAL "5.7.0" OR Qt5Core_VERSION VERSION_GREATER "5.7.0") +set(platformThemeSRCS + ../src/platformtheme/qdbusmenubar.cpp # fork of Qt's qdbusmenubar with some added setters for our convenience + ${platformThemeSRCS} +) +endif() + frameworkintegration_tests( kdeplatformtheme_unittest ${platformThemeSRCS} diff -Nru plasma-integration-5.8.6/autotests/kfiledialog_unittest.cpp plasma-integration-5.9.3/autotests/kfiledialog_unittest.cpp --- plasma-integration-5.8.6/autotests/kfiledialog_unittest.cpp 2017-02-21 12:11:12.000000000 +0000 +++ plasma-integration-5.9.3/autotests/kfiledialog_unittest.cpp 2017-02-28 13:04:03.000000000 +0000 @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -40,6 +41,10 @@ qputenv("KDE_FORK_SLAVES", "yes"); } + void init() + { + } + void cleanupTestCase() { } @@ -79,7 +84,7 @@ void testSelectUrl() { - QTemporaryFile tempFile(QDir::tempPath()+"/kfiledialogtest_XXXXXX"); + QTemporaryFile tempFile(m_tempDir.path()+"/kfiledialogtest_XXXXXX"); tempFile.setAutoRemove(true); tempFile.open(); QString tempName = tempFile.fileName(); @@ -98,7 +103,7 @@ void testGetSaveFileUrl() { QObject lambdaGuard; - QTemporaryFile tempFile(QDir::tempPath()+"/kfiledialogtest_XXXXXX"); + QTemporaryFile tempFile(m_tempDir.path()+"/kfiledialogtest_XXXXXX"); tempFile.open(); const QString tempName = tempFile.fileName(); const QUrl url = QUrl::fromLocalFile(tempName); @@ -257,47 +262,48 @@ { QFETCH(bool, qtOverwriteOption); QFETCH(bool, messageBoxExpected); - - QTemporaryFile tempFile(QDir::tempPath()+"/kfiledialogtest_XXXXXX"); + + QTemporaryFile tempFile(m_tempDir.path()+"/kfiledialogtest_XXXXXX"); tempFile.setAutoRemove(true); tempFile.open(); QString tempName = tempFile.fileName(); tempFile.close(); int idx = tempName.lastIndexOf('/'); - + QFileDialog dialog; dialog.setAcceptMode(QFileDialog::AcceptSave); if (qtOverwriteOption) dialog.setOption(QFileDialog::DontConfirmOverwrite); dialog.setDirectory(tempName.left(idx+1)); dialog.selectFile(tempName.mid(idx+1)); dialog.open(); - + KFileWidget *fw = findFileWidget(); QVERIFY(fw); QTest::qWaitForWindowExposed(fw->window()); QCOMPARE(fw->isVisible(), true); + + bool timerRun = false; - messageBoxSeen = false; - QTimer::singleShot(500, this, SLOT(checkMessageBox())); + QTimer::singleShot(3500, this, [&] { + timerRun = true; + QDialog *msgbox = findMessageBox(); + if (msgbox) + { + QTest::qWaitForWindowExposed(msgbox); + QCOMPARE(msgbox->isVisible(), true); + msgbox->close(); + QVERIFY(messageBoxExpected); + } else { + QVERIFY(!messageBoxExpected); + } + }); fw->slotOk(); - - fw->slotCancel(); - QVERIFY(messageBoxSeen == messageBoxExpected); - } - -protected Q_SLOTS: - void checkMessageBox() - { - QDialog *msgbox = findMessageBox(); - if (!msgbox) return; - QTest::qWaitForWindowExposed(msgbox); - QCOMPARE(msgbox->isVisible(), true); - messageBoxSeen = true; - msgbox->close(); + + QTRY_VERIFY(timerRun); } private: - bool messageBoxSeen; + QTemporaryDir m_tempDir; static QString fileViewToString(KFile::FileView fv) { diff -Nru plasma-integration-5.8.6/cmake/modules/FindQt5PlatformSupport.cmake plasma-integration-5.9.3/cmake/modules/FindQt5PlatformSupport.cmake --- plasma-integration-5.8.6/cmake/modules/FindQt5PlatformSupport.cmake 1970-01-01 00:00:00.000000000 +0000 +++ plasma-integration-5.9.3/cmake/modules/FindQt5PlatformSupport.cmake 2017-02-28 13:04:03.000000000 +0000 @@ -0,0 +1,121 @@ +#.rst: +# FindQt5PlatformSupport +# ------- +# +# Try to find Qt5PlatformSupport on a Unix system. +# +# This will define the following variables: +# +# ``Qt5PlatformSupport_FOUND`` +# True if (the requested version of) Qt5PlatformSupport is available +# ``Qt5PlatformSupport_VERSION`` +# The version of Qt5PlatformSupport +# ``Qt5PlatformSupport_LIBRARIES`` +# This can be passed to target_link_libraries() instead of the ``Qt5PlatformSupport::Qt5PlatformSupport`` +# target +# ``Qt5PlatformSupport_INCLUDE_DIRS`` +# This should be passed to target_include_directories() if the target is not +# used for linking +# ``Qt5PlatformSupport_DEFINITIONS`` +# This should be passed to target_compile_options() if the target is not +# used for linking +# +# If ``Qt5PlatformSupport_FOUND`` is TRUE, it will also define the following imported target: +# +# ``Qt5PlatformSupport::Qt5PlatformSupport`` +# The Qt5PlatformSupport library +# +# In general we recommend using the imported target, as it is easier to use. +# Bear in mind, however, that if the target is in the link interface of an +# exported library, it must be made available by the package config file. + +#============================================================================= +# Copyright 2014 Alex Merry +# Copyright 2014 Martin Gräßlin +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#============================================================================= + +if(CMAKE_VERSION VERSION_LESS 2.8.12) + message(FATAL_ERROR "CMake 2.8.12 is required by FindQt5PlatformSupport.cmake") +endif() +if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12) + message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindQt5PlatformSupport.cmake") +endif() + +# Use pkg-config to get the directories and then use these values +# in the FIND_PATH() and FIND_LIBRARY() calls +find_package(PkgConfig) +pkg_check_modules(PKG_Qt5PlatformSupport QUIET Qt5Gui) + +set(Qt5PlatformSupport_DEFINITIONS ${PKG_Qt5PlatformSupport_CFLAGS_OTHER}) +set(Qt5PlatformSupport_VERSION ${PKG_Qt5PlatformSupport_VERSION}) + +find_path(Qt5PlatformSupport_INCLUDE_DIR + NAMES + QtPlatformSupport/private/qfontconfigdatabase_p.h + HINTS + ${PKG_Qt5PlatformSupport_INCLUDEDIR}/QtPlatformSupport/${PKG_Qt5PlatformSupport_VERSION}/ +) +find_library(Qt5PlatformSupport_LIBRARY + NAMES + Qt5PlatformSupport + HINTS + ${PKG_Qt5PlatformSupport_LIBRARY_DIRS} +) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Qt5PlatformSupport + FOUND_VAR + Qt5PlatformSupport_FOUND + REQUIRED_VARS + Qt5PlatformSupport_LIBRARY + Qt5PlatformSupport_INCLUDE_DIR + VERSION_VAR + Qt5PlatformSupport_VERSION +) + +if(Qt5PlatformSupport_FOUND AND NOT TARGET Qt5PlatformSupport::Qt5PlatformSupport) + add_library(Qt5PlatformSupport::Qt5PlatformSupport UNKNOWN IMPORTED) + set_target_properties(Qt5PlatformSupport::Qt5PlatformSupport PROPERTIES + IMPORTED_LOCATION "${Qt5PlatformSupport_LIBRARY}" + INTERFACE_COMPILE_OPTIONS "${Qt5PlatformSupport_DEFINITIONS}" + INTERFACE_INCLUDE_DIRECTORIES "${Qt5PlatformSupport_INCLUDE_DIR}" + ) +endif() + +mark_as_advanced(Qt5PlatformSupport_LIBRARY Qt5PlatformSupport_INCLUDE_DIR) + +# compatibility variables +set(Qt5PlatformSupport_LIBRARIES ${Qt5PlatformSupport_LIBRARY}) +set(Qt5PlatformSupport_INCLUDE_DIRS ${Qt5PlatformSupport_INCLUDE_DIR}) +set(Qt5PlatformSupport_VERSION_STRING ${Qt5PlatformSupport_VERSION}) + + +include(FeatureSummary) +set_package_properties(Qt5PlatformSupport PROPERTIES + URL "http://www.qt.io" + DESCRIPTION "Qt PlatformSupport module." +) + diff -Nru plasma-integration-5.8.6/cmake/modules/FindQt5ThemeSupport.cmake plasma-integration-5.9.3/cmake/modules/FindQt5ThemeSupport.cmake --- plasma-integration-5.8.6/cmake/modules/FindQt5ThemeSupport.cmake 1970-01-01 00:00:00.000000000 +0000 +++ plasma-integration-5.9.3/cmake/modules/FindQt5ThemeSupport.cmake 2017-02-28 13:04:03.000000000 +0000 @@ -0,0 +1,122 @@ +#.rst: +# FindQt5ThemeSupport +# ------- +# +# Try to find Qt5ThemeSupport on a Unix system. +# +# This will define the following variables: +# +# ``Qt5ThemeSupport_FOUND`` +# True if (the requested version of) Qt5ThemeSupport is available +# ``Qt5ThemeSupport_VERSION`` +# The version of Qt5ThemeSupport +# ``Qt5ThemeSupport_LIBRARIES`` +# This can be passed to target_link_libraries() instead of the ``Qt5ThemeSupport::Qt5ThemeSupport`` +# target +# ``Qt5ThemeSupport_INCLUDE_DIRS`` +# This should be passed to target_include_directories() if the target is not +# used for linking +# ``Qt5ThemeSupport_DEFINITIONS`` +# This should be passed to target_compile_options() if the target is not +# used for linking +# +# If ``Qt5ThemeSupport_FOUND`` is TRUE, it will also define the following imported target: +# +# ``Qt5ThemeSupport::Qt5ThemeSupport`` +# The Qt5ThemeSupport library +# +# In general we recommend using the imported target, as it is easier to use. +# Bear in mind, however, that if the target is in the link interface of an +# exported library, it must be made available by the package config file. + +#============================================================================= +# Copyright 2014 Alex Merry +# Copyright 2014 Martin Gräßlin +# Copyright 2016 Takahiro Hashimoto +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#============================================================================= + +if(CMAKE_VERSION VERSION_LESS 2.8.12) + message(FATAL_ERROR "CMake 2.8.12 is required by FindQt5ThemeSupport.cmake") +endif() +if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12) + message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindQt5ThemeSupport.cmake") +endif() + +# Use pkg-config to get the directories and then use these values +# in the FIND_PATH() and FIND_LIBRARY() calls +find_package(PkgConfig) +pkg_check_modules(PKG_Qt5ThemeSupport QUIET Qt5Gui) + +set(Qt5ThemeSupport_DEFINITIONS ${PKG_Qt5ThemeSupport_CFLAGS_OTHER}) +set(Qt5ThemeSupport_VERSION ${PKG_Qt5ThemeSupport_VERSION}) + +find_path(Qt5ThemeSupport_INCLUDE_DIR + NAMES + QtThemeSupport/private/qgenericunixthemes_p.h + HINTS + ${PKG_Qt5ThemeSupport_INCLUDEDIR}/QtThemeSupport/${PKG_Qt5ThemeSupport_VERSION}/ +) +find_library(Qt5ThemeSupport_LIBRARY + NAMES + Qt5ThemeSupport + HINTS + ${PKG_Qt5ThemeSupport_LIBRARY_DIRS} +) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Qt5ThemeSupport + FOUND_VAR + Qt5ThemeSupport_FOUND + REQUIRED_VARS + Qt5ThemeSupport_LIBRARY + Qt5ThemeSupport_INCLUDE_DIR + VERSION_VAR + Qt5ThemeSupport_VERSION +) + +if(Qt5ThemeSupport_FOUND AND NOT TARGET Qt5ThemeSupport::Qt5ThemeSupport) + add_library(Qt5ThemeSupport::Qt5ThemeSupport UNKNOWN IMPORTED) + set_target_properties(Qt5ThemeSupport::Qt5ThemeSupport PROPERTIES + IMPORTED_LOCATION "${Qt5ThemeSupport_LIBRARY}" + INTERFACE_COMPILE_OPTIONS "${Qt5ThemeSupport_DEFINITIONS}" + INTERFACE_INCLUDE_DIRECTORIES "${Qt5ThemeSupport_INCLUDE_DIR}" + ) +endif() + +mark_as_advanced(Qt5ThemeSupport_LIBRARY Qt5ThemeSupport_INCLUDE_DIR) + +# compatibility variables +set(Qt5ThemeSupport_LIBRARIES ${Qt5ThemeSupport_LIBRARY}) +set(Qt5ThemeSupport_INCLUDE_DIRS ${Qt5ThemeSupport_INCLUDE_DIR}) +set(Qt5ThemeSupport_VERSION_STRING ${Qt5ThemeSupport_VERSION}) + + +include(FeatureSummary) +set_package_properties(Qt5ThemeSupport PROPERTIES + URL "http://www.qt.io" + DESCRIPTION "Qt ThemeSupport module." +) + diff -Nru plasma-integration-5.8.6/debian/changelog plasma-integration-5.9.3/debian/changelog --- plasma-integration-5.8.6/debian/changelog 2017-03-26 13:40:34.000000000 +0000 +++ plasma-integration-5.9.3/debian/changelog 2017-04-11 19:37:51.000000000 +0000 @@ -1,87 +1,80 @@ -plasma-integration (5.8.6-1) unstable; urgency=medium +plasma-integration (5.9.3-0neon+9+build6) netrunner-backports; urgency=medium - * New upstream release (5.8.6) - * Update build-deps and deps with the info from cmake - * Add new patch: Drop-the-patch-version-for-breeze.patch + * Automatic CI Build - -- Maximiliano Curia Sun, 26 Mar 2017 15:40:34 +0200 + -- Debian CI Tue, 11 Apr 2017 19:37:51 +0000 -plasma-integration (5.8.5-2) experimental; urgency=medium +plasma-integration (5.9.3-0neon) xenial; urgency=medium - * Team upload - * Bump minimum breeze-dev requirement to 4:5.8.5 to match new requirement + * New release + + -- Neon CI Tue, 28 Feb 2017 16:27:55 +0000 - -- Scott Kitterman Sat, 28 Jan 2017 12:10:33 -0500 +plasma-integration (5.9.2-0neon) xenial; urgency=medium -plasma-integration (5.8.5-1) experimental; urgency=medium + * New release - * New upstream release (5.8.5). + -- Neon CI Tue, 14 Feb 2017 17:38:06 +0000 - -- Maximiliano Curia Fri, 30 Dec 2016 18:46:21 +0100 +plasma-integration (5.9.1-0neon) xenial; urgency=medium + + * New release -plasma-integration (5.8.4-1) unstable; urgency=medium + -- Neon CI Tue, 07 Feb 2017 15:10:25 +0000 - [ Automatic packaging ] - * Update build-deps and deps with the info from cmake +plasma-integration (5.9.0-0neon) xenial; urgency=medium - [ Maximiliano Curia ] - * New upstream release (5.8.4) + * New release - -- Maximiliano Curia Wed, 23 Nov 2016 18:37:50 +0100 + -- Neon CI Mon, 30 Jan 2017 11:51:08 +0000 -plasma-integration (5.8.2-1) unstable; urgency=medium +plasma-integration (5.8.6-0neon) xenial; urgency=medium - [ Automatic packaging ] - * Update build-deps and deps with the info from cmake + * New Plasma LTS release - [ Maximiliano Curia ] - * New upstream release (5.8.2) + -- Jonathan Riddell Tue, 21 Feb 2017 17:16:32 +0000 - -- Maximiliano Curia Wed, 19 Oct 2016 15:26:54 +0200 +plasma-integration (5.8.5-0neon) xenial; urgency=medium -plasma-integration (5.8.1-1) unstable; urgency=medium + * New release - [ Automatic packaging ] - * Update build-deps and deps with the info from cmake + -- Neon CI Tue, 27 Dec 2016 13:12:36 +0000 - [ Maximiliano Curia ] - * New upstream release (5.8.1) +plasma-integration (5.8.4-0neon) xenial; urgency=medium - -- Maximiliano Curia Sun, 16 Oct 2016 23:01:02 +0200 + * New release -plasma-integration (5.8.0-1) unstable; urgency=medium + -- Neon CI Tue, 22 Nov 2016 14:36:44 +0000 - [ Automatic packaging ] - * Update build-deps and deps with the info from cmake +plasma-integration (5.8.3-0neon) xenial; urgency=medium - [ Maximiliano Curia ] - * New upstream release (5.8.0) - * Bump group breaks (5.8) + * New release - -- Maximiliano Curia Fri, 07 Oct 2016 14:09:33 +0200 + -- Neon CI Tue, 01 Nov 2016 13:27:36 +0000 -plasma-integration (5.8.0-0neon) xenial; urgency=medium +plasma-integration (5.8.2-0neon) xenial; urgency=medium * New release - -- Neon CI Fri, 30 Sep 2016 11:29:15 +0000 + -- Neon CI Tue, 18 Oct 2016 15:25:54 +0000 -plasma-integration (5.7.5-0neon) xenial; urgency=medium +plasma-integration (5.8.1-0neon) xenial; urgency=medium * New release - -- Neon CI Tue, 13 Sep 2016 13:47:25 +0000 + -- Neon CI Tue, 11 Oct 2016 14:38:27 +0000 -plasma-integration (5.7.4-1) unstable; urgency=medium +plasma-integration (5.8.0-0neon) xenial; urgency=medium - [ Maximiliano Curia ] - * New upstream release (5.7.4) - * Bump group breaks (5.7) + * New release + + -- Neon CI Fri, 30 Sep 2016 11:29:15 +0000 + +plasma-integration (5.7.5-0neon) xenial; urgency=medium - [ Automatic packaging ] - * Update build-deps and deps with the info from cmake + * New release - -- Maximiliano Curia Sat, 27 Aug 2016 17:26:33 +0200 + -- Neon CI Tue, 13 Sep 2016 13:47:25 +0000 plasma-integration (5.7.4-0neon) xenial; urgency=medium @@ -107,49 +100,18 @@ -- Neon CI Tue, 12 Jul 2016 16:06:54 +0000 -plasma-integration (5.7.0-1) unstable; urgency=medium - - [ Automatic packaging ] - * Update build-deps and deps with the info from cmake - - [ Maximiliano Curia ] - * Add new build dependency - - -- Maximiliano Curia Mon, 11 Jul 2016 10:25:06 +0200 - plasma-integration (5.7.0-0neon) xenial; urgency=medium * New release -- Neon CI Mon, 04 Jul 2016 13:14:46 +0000 -plasma-integration (5.6.5-1) unstable; urgency=medium - - * New upstream release. - - -- Maximiliano Curia Wed, 22 Jun 2016 16:23:55 +0200 - plasma-integration (5.6.5-0neon) xenial; urgency=medium * New release -- Neon CI Tue, 14 Jun 2016 14:14:27 +0000 -plasma-integration (5.6.4-2) unstable; urgency=medium - - * Release to unstable - - -- Maximiliano Curia Tue, 31 May 2016 16:26:00 +0200 - -plasma-integration (5.6.4-1) experimental; urgency=medium - - [ Jonathan Riddell ] - * Initial release. - - [ Maximiliano Curia ] - * New upstream release (5.6.4). - - -- Maximiliano Curia Wed, 25 May 2016 12:09:16 +0200 plasma-integration (5.6.4-0neon) xenial; urgency=medium * New release @@ -168,3 +130,8 @@ -- Neon CI Fri, 08 Apr 2016 11:44:46 +0000 +plasma-integration (5.5.90-0ubuntu1) UNRELEASED; urgency=medium + + * Initial release. + + -- Jonathan Riddell Tue, 01 Mar 2016 10:11:10 +0000 diff -Nru plasma-integration-5.8.6/debian/control plasma-integration-5.9.3/debian/control --- plasma-integration-5.8.6/debian/control 2017-03-26 13:40:34.000000000 +0000 +++ plasma-integration-5.9.3/debian/control 2017-04-11 19:37:51.000000000 +0000 @@ -2,29 +2,28 @@ Section: kde Priority: optional Maintainer: Debian/Kubuntu Qt/KDE Maintainers -Uploaders: Maximiliano Curia -Build-Depends: breeze-dev (>= 4:5.8.0~), +Build-Depends: breeze-dev, cmake (>= 2.8.12), + dbus-x11, debhelper (>= 9), - extra-cmake-modules (>= 5.17.0~), - libkf5config-dev (>= 5.17.0~), - libkf5configwidgets-dev (>= 5.17.0~), - libkf5i18n-dev (>= 5.17.0~), - libkf5iconthemes-dev (>= 5.17.0~), - libkf5kio-dev (>= 5.17.0~), - libkf5notifications-dev (>= 5.17.0~), - libkf5wayland-dev (>= 4:5.5~), - libkf5widgetsaddons-dev (>= 5.17.0~), - libkf5windowsystem-dev (>= 5.17.0~), - libqt5x11extras5-dev (>= 5.5.0~), + extra-cmake-modules (>= 1.3.0~), + kio-dev, + kwayland-dev, + libkf5config-dev (>= 5.2.0), + libkf5configwidgets-dev (>= 5.2.0), + libkf5i18n-dev (>= 5.2.0), + libkf5iconthemes-dev (>= 5.2.0), + libkf5notifications-dev (>= 5.2.0), + libkf5widgetsaddons-dev (>= 5.2.0), + libqt5x11extras5-dev, libxcursor-dev, pkg-kde-tools (>= 0.15.18~), - qtbase5-dev (>= 5.5.0~), + qtbase5-dev (>= 5.4), qtbase5-private-dev -Standards-Version: 3.9.8 +Standards-Version: 3.9.6 Homepage: https://projects.kde.org/projects/kde/workspace/plasma-integration -Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/plasma/plasma-integration.git -Vcs-Git: https://anonscm.debian.org/git/pkg-kde/plasma/plasma-integration.git +Vcs-Git: https://github.com/ds9-debian-plasma/plasma-integration +Vcs-Browser: https://github.com/ds9-debian-plasma/plasma-integration Package: plasma-integration Architecture: any @@ -34,4 +33,16 @@ Description: Qt Platform Theme integration plugins for KDE Plasma A plugin to provide Qt Platform Theme integration for the Plasma workspace. -Breaks: plasma-desktop (<< 4:5.8), plasma-workspace (<< 4:5.8) + +Package: plasma-integration-dbg +Section: debug +Priority: extra +Architecture: any +Depends: plasma-integration (= ${binary:Version}), ${misc:Depends} +Recommends: qtbase5-dbg +Description: Qt Platform Theme integration plugins for KDE Plasma + A plugin to provide Qt Platform Theme integration for the Plasma + workspace. + . + This package contains the debugging symbols. + diff -Nru plasma-integration-5.8.6/debian/copyright plasma-integration-5.9.3/debian/copyright --- plasma-integration-5.8.6/debian/copyright 2017-03-26 13:40:34.000000000 +0000 +++ plasma-integration-5.9.3/debian/copyright 2017-04-11 19:37:51.000000000 +0000 @@ -3,56 +3,21 @@ Source: https://projects.kde.org/projects/kde/workspace/plasma-integration Files: * -Copyright: 2013, Aleix Pol Gonzalez - 2013-2015, Alejandro Fiestas Olivares - 2015, David Rosca - 2014, Dominik Haumann - 2013, Kevin Ottens - 2014, Lukáš Tinkl - 2014-2015, Martin Gräßlin - 2014, Martin Klapetek +Copyright: 2000, 2006 David Faure + 2001 Michael Jarrett + 2007 Tobias Koenig + 2013 Aleix Pol Gonzalez + 2013 Alejandro Fiestas Olivares + 2015 Martin Gräßlin + 2014 Martin Klapetek License: LGPL-2+3+KDEeV - -Files: src/platformtheme/kdirselectdialog.cpp - src/platformtheme/kdirselectdialog_p.h - src/platformtheme/kfontsettingsdata.cpp - src/platformtheme/kfontsettingsdata.h -Copyright: 2013, Aleix Pol Gonzalez - 2001-2002, Carsten Pfeiffer - 2000-2006, David Faure - 2008, Friedrich W. H. Kossebau - 2001, Michael Jarrett - 2009, Shaun Reich -License: LGPL-2 - -Files: COPYING.LGPL-2 - src/platformtheme/kfiletreeview.cpp - src/platformtheme/kfiletreeview_p.h -Copyright: 1991, Free Software Foundation, Inc - 2007, Tobias Koenig -License: LGPL-2+ - -Files: po/ca/plasmaintegration5.po - po/ca@valencia/plasmaintegration5.po - po/uk/plasmaintegration5.po -Copyright: 2014-2016, This_file_is_part_of_KDE -License: LGPL-2.1+3+KDEeV - This file is distributed under the license LGPL version 2.1 or - version 3 or later versions approved by the membership of KDE e.V. - . - The complete text of the GNU Lesser General Public License version 2 can be - found in `/usr/share/common-licenses/LGPL-2', likewise, the complete text of - the GNU Lesser General Public License version 3 can be found in - `/usr/share/common-licensese/LGPL-3'. - -Files: debian/* -Copyright: 2016, Debian/Kubuntu Qt/KDE Maintainers -License: LGPL-2+ - -License: LGPL-2 This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License version 2 as published by the Free Software Foundation. + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. . This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -61,10 +26,10 @@ . You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . - . - The complete text of the GNU Library General Public License version 2 can be - found in `/usr/share/common-licenses/LGPL-2'. +Files: src/platformtheme/kfiletreeview.cpp + src/platformtheme/kfiletreeview_p.h +Copyright: 2007 Tobias Koenig License: LGPL-2+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -79,24 +44,28 @@ You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . . - The complete text of the GNU Library General Public License version 2 can be - found in `/usr/share/common-licenses/LGPL-2'. + On Debian systems, the complete text of the GNU Library General + Public License version 2 can be found in `/usr/share/common-licenses/LGPL-2'. -License: LGPL-2+3+KDEeV +Files: src/platformtheme/kfontsettingsdata.h + src/platformtheme/kdirselectdialog.cpp + src/platformtheme/kfontsettingsdata.cpp + src/platformtheme/kdirselectdialog_p.h +Copyright: 2000, 2006 David Faure + 2008 Friedrich W. H. Kossebau + 2013 Aleix Pol Gonzalez +License: LGPL-2 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 any - later version accepted by the membership of KDE e.V. (or its - successor approved by the membership of KDE e.V.), which shall - act as a proxy defined in Section 6 of version 3 of the license. + License version 2 as published by the Free Software Foundation. . 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. . - The complete text of the GNU Library General Public License version 2 can be - found in `/usr/share/common-licenses/LGPL-2', likewise, the complete text of - the GNU Lesser General Public License version 3 can be found in - `/usr/share/common-licensese/LGPL-3'. + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . + . + On Debian systems, the complete text of the GNU Library General + Public License version 2 can be found in `/usr/share/common-licenses/LGPL-2'. diff -Nru plasma-integration-5.8.6/debian/patches/Drop-the-patch-version-for-breeze.patch plasma-integration-5.9.3/debian/patches/Drop-the-patch-version-for-breeze.patch --- plasma-integration-5.8.6/debian/patches/Drop-the-patch-version-for-breeze.patch 2017-03-26 13:40:34.000000000 +0000 +++ plasma-integration-5.9.3/debian/patches/Drop-the-patch-version-for-breeze.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -From: Maximiliano Curia -Date: Sun, 26 Mar 2017 14:30:55 +0200 -Subject: Drop the patch version for breeze - -Breeze doesn't even receive changes on every point release, and really lts -components shouldn't introduce incompatible changes in the same -major.minor, so dropping this unnecessary requirement. ---- - CMakeLists.txt | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 800a523..369c797 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 2.8.12) - project(PlasmaIntegration) - set(PROJECT_VERSION "5.8.6") - set(PROJECT_VERSION_MAJOR 5) -+string(REGEX MATCHALL "[0-9]+" PROJECT_VERSION_COMPONENTS ${PROJECT_VERSION}) -+list(GET PROJECT_VERSION_COMPONENTS 1 PROJECT_VERSION_MINOR) - - include(FeatureSummary) - find_package(ECM 5.17.0 NO_MODULE) -@@ -38,7 +40,7 @@ find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED) - find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED) - find_package(KF5Wayland 5.5 CONFIG REQUIRED) - --find_package(Breeze ${PROJECT_VERSION} CONFIG) -+find_package(Breeze ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} CONFIG) - set_package_properties(Breeze PROPERTIES - TYPE REQUIRED - PURPOSE "For setting the default QStyle name") diff -Nru plasma-integration-5.8.6/debian/patches/series plasma-integration-5.9.3/debian/patches/series --- plasma-integration-5.8.6/debian/patches/series 2017-03-26 13:40:34.000000000 +0000 +++ plasma-integration-5.9.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -Drop-the-patch-version-for-breeze.patch diff -Nru plasma-integration-5.8.6/debian/plasma-integration.install plasma-integration-5.9.3/debian/plasma-integration.install --- plasma-integration-5.8.6/debian/plasma-integration.install 1970-01-01 00:00:00.000000000 +0000 +++ plasma-integration-5.9.3/debian/plasma-integration.install 2017-04-11 19:37:51.000000000 +0000 @@ -0,0 +1,3 @@ +usr/lib/*/qt5/plugins/platformthemes/KDEPlasmaPlatformTheme.so +usr/share/kconf_update/ +usr/share/locale/ diff -Nru plasma-integration-5.8.6/debian/rules plasma-integration-5.9.3/debian/rules --- plasma-integration-5.8.6/debian/rules 2017-03-26 13:40:34.000000000 +0000 +++ plasma-integration-5.9.3/debian/rules 2017-04-11 19:37:51.000000000 +0000 @@ -3,6 +3,7 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk -override_dh_auto_test: - # Disable auto tests at build time - : +override_dh_strip: + $(overridden_command) --dbg-package=plasma-integration-dbg + +.PHONY: override_dh_auto_test diff -Nru plasma-integration-5.8.6/debian/upstream/metadata plasma-integration-5.9.3/debian/upstream/metadata --- plasma-integration-5.8.6/debian/upstream/metadata 2017-03-26 13:40:34.000000000 +0000 +++ plasma-integration-5.9.3/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -Name: plasma-integration -Changelog: https://quickgit.kde.org/?p=plasma-integration.git&a=log -Contact: kde-devel@kde.org -Donation: https://www.kde.org/community/donations/index.php -Repository: https://anongit.kde.org/plasma-integration.git -Repository-Browse: https://quickgit.kde.org/?p=plasma-integration.git -Security-Contact: security@kde.org diff -Nru plasma-integration-5.8.6/debian/watch plasma-integration-5.9.3/debian/watch --- plasma-integration-5.8.6/debian/watch 2017-03-26 13:40:34.000000000 +0000 +++ plasma-integration-5.9.3/debian/watch 2017-04-11 19:37:51.000000000 +0000 @@ -1,2 +1,2 @@ version=4 -opts=pgpsigurlmangle=s/$/.sig/ http://download.kde.org/stable/plasma/([\d.]+)/plasma-integration-([\d.]+)\.tar\.xz +opts=pgpsigurlmangle=s/$/.sig/ http://download.kde.org/stable/plasma/([\d.]+)/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ diff -Nru plasma-integration-5.8.6/po/ar/plasmaintegration5.po plasma-integration-5.9.3/po/ar/plasmaintegration5.po --- plasma-integration-5.8.6/po/ar/plasmaintegration5.po 2017-02-21 12:11:13.000000000 +0000 +++ plasma-integration-5.9.3/po/ar/plasmaintegration5.po 2017-02-28 13:04:04.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: ٢٠١٦-٠٢-٠٨ ٠٨:١٩+0300\n" "Last-Translator: Safa Alfulaij \n" "Language-Team: Arabic \n" @@ -32,37 +32,37 @@ msgid "Save File" msgstr "احفظ الكلّ" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "احفظ الكلّ" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "نعم للكلّ" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "لا للكلّ" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "أجهض" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "حاول مجدّدًا" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/ast/plasmaintegration5.po plasma-integration-5.9.3/po/ast/plasmaintegration5.po --- plasma-integration-5.8.6/po/ast/plasmaintegration5.po 2017-02-21 12:11:13.000000000 +0000 +++ plasma-integration-5.9.3/po/ast/plasmaintegration5.po 2017-02-28 13:04:04.000000000 +0000 @@ -1,15 +1,15 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# enolp , 2016. +# enolp , 2016. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" -"PO-Revision-Date: 2016-03-06 22:20+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" +"PO-Revision-Date: 2016-12-19 03:55+0100\n" "Last-Translator: enolp \n" -"Language-Team: Asturian <>\n" +"Language-Team: Asturian \n" "Language: ast\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,60 +24,58 @@ msgstr "" #: platformtheme/kdeplatformfiledialoghelper.cpp:256 -#, fuzzy, kde-format -#| msgctxt "@action:button" -#| msgid "Save All" +#, kde-format msgctxt "@title:window" msgid "Save File" -msgstr "Guardar too" +msgstr "" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" -msgstr "Guardar too" +msgstr "" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Non a too" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" -msgstr "Albortar" +msgstr "" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" -msgstr "Retentar" +msgstr "" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" -msgstr "Inorar" +msgstr "" #: platformtheme/kdirselectdialog.cpp:132 #, kde-format msgctxt "folder name" msgid "New Folder" -msgstr "Carpeta nueva" +msgstr "" #: platformtheme/kdirselectdialog.cpp:137 #, kde-format msgctxt "@title:window" msgid "New Folder" -msgstr "Carpeta nueva" +msgstr "" #: platformtheme/kdirselectdialog.cpp:138 #, kde-format @@ -95,7 +93,7 @@ #: platformtheme/kdirselectdialog.cpp:171 #, kde-format msgid "You do not have permission to create that folder." -msgstr "Nun tienes permisu pa crear esa carpeta." +msgstr "" #: platformtheme/kdirselectdialog.cpp:285 #, kde-format diff -Nru plasma-integration-5.8.6/po/ca/plasmaintegration5.po plasma-integration-5.9.3/po/ca/plasmaintegration5.po --- plasma-integration-5.8.6/po/ca/plasmaintegration5.po 2017-02-21 12:11:14.000000000 +0000 +++ plasma-integration-5.9.3/po/ca/plasmaintegration5.po 2017-02-28 13:04:04.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: plasmaintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-04-09 15:40+0200\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" @@ -32,37 +32,37 @@ msgid "Save File" msgstr "Desa el fitxer" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Desa-ho tot" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Sí a tot" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "No a tot" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Interromp" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Reintenta" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/ca@valencia/plasmaintegration5.po plasma-integration-5.9.3/po/ca@valencia/plasmaintegration5.po --- plasma-integration-5.8.6/po/ca@valencia/plasmaintegration5.po 2017-02-21 12:11:14.000000000 +0000 +++ plasma-integration-5.9.3/po/ca@valencia/plasmaintegration5.po 2017-02-28 13:04:04.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: plasmaintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-04-09 15:40+0200\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" @@ -32,37 +32,37 @@ msgid "Save File" msgstr "Guarda el fitxer" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Guarda-ho tot" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Sí a tot" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "No a tot" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Interromp" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Reintenta" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/cs/plasmaintegration5.po plasma-integration-5.9.3/po/cs/plasmaintegration5.po --- plasma-integration-5.8.6/po/cs/plasmaintegration5.po 2017-02-21 12:11:14.000000000 +0000 +++ plasma-integration-5.9.3/po/cs/plasmaintegration5.po 2017-02-28 13:04:04.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2014-12-05 13:22+0100\n" "Last-Translator: Vít Pelčák \n" "Language-Team: Czech \n" @@ -29,37 +29,37 @@ msgid "Save File" msgstr "Uložit soubor" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Uložit vše" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Ano všem" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Ne všem" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Přerušit" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Zkusit znovu" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/da/plasmaintegration5.po plasma-integration-5.9.3/po/da/plasmaintegration5.po --- plasma-integration-5.8.6/po/da/plasmaintegration5.po 2017-02-21 12:11:14.000000000 +0000 +++ plasma-integration-5.9.3/po/da/plasmaintegration5.po 2017-02-28 13:04:04.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-06-18 14:51+0100\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" @@ -29,37 +29,37 @@ msgid "Save File" msgstr "Gem fil" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Gem alt" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Ja til alle" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Nej til alle" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Afbryd" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Prøv igen" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/de/plasmaintegration5.po plasma-integration-5.9.3/po/de/plasmaintegration5.po --- plasma-integration-5.8.6/po/de/plasmaintegration5.po 2017-02-21 12:11:14.000000000 +0000 +++ plasma-integration-5.9.3/po/de/plasmaintegration5.po 2017-02-28 13:04:04.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-04-10 19:54+0100\n" "Last-Translator: Frederik Schwarzer \n" "Language-Team: German \n" @@ -30,37 +30,37 @@ msgid "Save File" msgstr "Datei speichern" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Alle speichern" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Ja für alle" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Nein für alle" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Abbrechen" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Erneut versuchen" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/el/plasmaintegration5.po plasma-integration-5.9.3/po/el/plasmaintegration5.po --- plasma-integration-5.8.6/po/el/plasmaintegration5.po 2017-02-21 12:11:14.000000000 +0000 +++ plasma-integration-5.9.3/po/el/plasmaintegration5.po 2017-02-28 13:04:04.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-07-29 20:02+0200\n" "Last-Translator: Dimitris Kardarakos \n" "Language-Team: Greek \n" @@ -29,37 +29,37 @@ msgid "Save File" msgstr "Αποθήκευση αρχείου" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Αποθήκευση όλων" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Ναι σε όλα" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Όχι σε όλα" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Εγκατάλειψη" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Επανάληψη" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/en_GB/plasmaintegration5.po plasma-integration-5.9.3/po/en_GB/plasmaintegration5.po --- plasma-integration-5.8.6/po/en_GB/plasmaintegration5.po 2017-02-21 12:11:15.000000000 +0000 +++ plasma-integration-5.9.3/po/en_GB/plasmaintegration5.po 2017-02-28 13:04:05.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-09-18 15:46+0000\n" "Last-Translator: Steve Allewell \n" "Language-Team: English \n" @@ -29,37 +29,37 @@ msgid "Save File" msgstr "Save File" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Save All" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Yes to All" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "No to All" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Abort" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Retry" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/es/plasmaintegration5.po plasma-integration-5.9.3/po/es/plasmaintegration5.po --- plasma-integration-5.8.6/po/es/plasmaintegration5.po 2017-02-21 12:11:15.000000000 +0000 +++ plasma-integration-5.9.3/po/es/plasmaintegration5.po 2017-02-28 13:04:05.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-04-09 13:34+0200\n" "Last-Translator: Eloy Cuadra \n" "Language-Team: Spanish \n" @@ -31,37 +31,37 @@ msgid "Save File" msgstr "Guardar archivo" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Guardar todo" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Sí a todo" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "No a todo" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Interrumpir" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Reintentar" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/et/plasmaintegration5.po plasma-integration-5.9.3/po/et/plasmaintegration5.po --- plasma-integration-5.8.6/po/et/plasmaintegration5.po 2017-02-21 12:11:15.000000000 +0000 +++ plasma-integration-5.9.3/po/et/plasmaintegration5.po 2017-02-28 13:04:05.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-08-18 19:28+0300\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" @@ -29,37 +29,37 @@ msgid "Save File" msgstr "Faili salvestamine" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Salvesta kõik" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Jah kõigile" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Ei kõigile" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Katkesta" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Proovi uuesti" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/fi/plasmaintegration5.po plasma-integration-5.9.3/po/fi/plasmaintegration5.po --- plasma-integration-5.8.6/po/fi/plasmaintegration5.po 2017-02-21 12:11:15.000000000 +0000 +++ plasma-integration-5.9.3/po/fi/plasmaintegration5.po 2017-02-28 13:04:05.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-04-30 23:40+0200\n" "Last-Translator: Lasse Liehu \n" "Language-Team: Finnish \n" @@ -29,37 +29,37 @@ msgid "Save File" msgstr "Tallenna tiedosto" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Tallenna kaikki" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Kyllä kaikkiin" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Ei kaikkiin" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Keskeytä" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Yritä uudelleen" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/fr/plasmaintegration5.po plasma-integration-5.9.3/po/fr/plasmaintegration5.po --- plasma-integration-5.8.6/po/fr/plasmaintegration5.po 2017-02-21 12:11:15.000000000 +0000 +++ plasma-integration-5.9.3/po/fr/plasmaintegration5.po 2017-02-28 13:04:05.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-11-23 18:17+0100\n" "Last-Translator: Vincent Pinon \n" "Language-Team: French \n" @@ -33,37 +33,37 @@ msgid "Save File" msgstr "Enregistrer le fichier" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Tout enregistrer" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Oui pour tout" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Non pour tout" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Annuler" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Rééssayer" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/gl/plasmaintegration5.po plasma-integration-5.9.3/po/gl/plasmaintegration5.po --- plasma-integration-5.8.6/po/gl/plasmaintegration5.po 2017-02-21 12:11:15.000000000 +0000 +++ plasma-integration-5.9.3/po/gl/plasmaintegration5.po 2017-02-28 13:04:05.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-04-21 07:00+0100\n" "Last-Translator: Adrián Chaves Fernández (Gallaecio) \n" @@ -30,37 +30,37 @@ msgid "Save File" msgstr "Gardar o ficheiro" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Gardar todo" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Si a todo" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Non a todo" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Cancelar" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" -msgstr "Tentar de novo" +msgstr "Intentar de novo" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" @@ -120,7 +120,7 @@ #, kde-format msgctxt "@action:inmenu" msgid "Move to Trash" -msgstr "Deitar no lixo" +msgstr "Botar no lixo" #: platformtheme/kdirselectdialog.cpp:354 #, kde-format @@ -132,7 +132,7 @@ #, kde-format msgctxt "@option:check" msgid "Show Hidden Folders" -msgstr "Mostrar os cartafoles acochados" +msgstr "Mostrar os cartafoles agochados" #: platformtheme/kdirselectdialog.cpp:370 #, kde-format @@ -143,4 +143,4 @@ #: platformtheme/kfiletreeview.cpp:192 #, kde-format msgid "Show Hidden Folders" -msgstr "Mostrar os cartafoles acochados" \ No newline at end of file +msgstr "Mostrar os cartafoles agochados" \ No newline at end of file diff -Nru plasma-integration-5.8.6/po/it/plasmaintegration5.po plasma-integration-5.9.3/po/it/plasmaintegration5.po --- plasma-integration-5.8.6/po/it/plasmaintegration5.po 2017-02-21 12:11:16.000000000 +0000 +++ plasma-integration-5.9.3/po/it/plasmaintegration5.po 2017-02-28 13:04:06.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-04-11 21:00+0200\n" "Last-Translator: Vincenzo Reale \n" "Language-Team: Italian \n" @@ -29,37 +29,37 @@ msgid "Save File" msgstr "Salva file" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Salva tutto" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Sì a tutto" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "No a tutto" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Interrompi" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Riprova" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/ja/plasmaintegration5.po plasma-integration-5.9.3/po/ja/plasmaintegration5.po --- plasma-integration-5.8.6/po/ja/plasmaintegration5.po 2017-02-21 12:11:17.000000000 +0000 +++ plasma-integration-5.9.3/po/ja/plasmaintegration5.po 2017-02-28 13:04:06.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2014-05-01 01:02-0700\n" "Last-Translator: Japanese KDE translation team \n" "Language-Team: Japanese \n" @@ -26,37 +26,37 @@ msgid "Save File" msgstr "" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/ko/plasmaintegration5.po plasma-integration-5.9.3/po/ko/plasmaintegration5.po --- plasma-integration-5.8.6/po/ko/plasmaintegration5.po 2017-02-21 12:11:18.000000000 +0000 +++ plasma-integration-5.9.3/po/ko/plasmaintegration5.po 2017-02-28 13:04:06.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-10-20 22:52+0100\n" "Last-Translator: Shinjo Park \n" "Language-Team: Korean \n" @@ -29,37 +29,37 @@ msgid "Save File" msgstr "파일 저장" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "모두 저장" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "모두 예" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "모두 아니요" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "중지" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "다시 시도" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/nb/plasmaintegration5.po plasma-integration-5.9.3/po/nb/plasmaintegration5.po --- plasma-integration-5.8.6/po/nb/plasmaintegration5.po 2017-02-21 12:11:18.000000000 +0000 +++ plasma-integration-5.9.3/po/nb/plasmaintegration5.po 2017-02-28 13:04:07.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2015-02-24 20:41+0100\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" @@ -31,37 +31,37 @@ msgid "Save File" msgstr "Lagre fil" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Lagre alle" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Ja til alt" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Nei til alt" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Avbryt" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Prøv igjen" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/nl/plasmaintegration5.po plasma-integration-5.9.3/po/nl/plasmaintegration5.po --- plasma-integration-5.8.6/po/nl/plasmaintegration5.po 2017-02-21 12:11:18.000000000 +0000 +++ plasma-integration-5.9.3/po/nl/plasmaintegration5.po 2017-02-28 13:04:07.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-04-09 17:04+0200\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" @@ -29,37 +29,37 @@ msgid "Save File" msgstr "Bestand opslaan" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Alles opslaan" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Ja op alles" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Nee op alles" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Afbreken" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Opnieuw proberen" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/nn/plasmaintegration5.po plasma-integration-5.9.3/po/nn/plasmaintegration5.po --- plasma-integration-5.8.6/po/nn/plasmaintegration5.po 2017-02-21 12:11:19.000000000 +0000 +++ plasma-integration-5.9.3/po/nn/plasmaintegration5.po 2017-02-28 13:04:07.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-04-24 21:22+0100\n" "Last-Translator: Karl Ove Hufthammer \n" "Language-Team: Norwegian Nynorsk \n" @@ -31,37 +31,37 @@ msgid "Save File" msgstr "Lagra fil" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Lagra alt" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Ja til alt" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Nei til alt" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Avbryt" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Prøv på nytt" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/pa/plasmaintegration5.po plasma-integration-5.9.3/po/pa/plasmaintegration5.po --- plasma-integration-5.8.6/po/pa/plasmaintegration5.po 2017-02-21 12:11:19.000000000 +0000 +++ plasma-integration-5.9.3/po/pa/plasmaintegration5.po 2017-02-28 13:04:07.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-06-09 17:13-0600\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi \n" @@ -29,37 +29,37 @@ msgid "Save File" msgstr "ਫਾਇਲ ਨੂੰ ਸੰਭਾਲੋ" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "ਸਾਰਿਆਂ ਨੂੰ ਸੰਭਾਲੋ" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "ਸਾਰਿਆਂ ਲਈ ਹਾਂ" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "ਸਾਰਿਆਂ ਲਈ ਨਾਂਹ" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "ਛੱਡੋ" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/pl/plasmaintegration5.po plasma-integration-5.9.3/po/pl/plasmaintegration5.po --- plasma-integration-5.8.6/po/pl/plasmaintegration5.po 2017-02-21 12:11:19.000000000 +0000 +++ plasma-integration-5.9.3/po/pl/plasmaintegration5.po 2017-02-28 13:04:07.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-04-16 06:28+0100\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" @@ -30,37 +30,37 @@ msgid "Save File" msgstr "Zapisz plik" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Zapisz wszystko" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Tak dla wszystkich" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Nie dla wszystkich" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Przerwij" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Ponów" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/pt/plasmaintegration5.po plasma-integration-5.9.3/po/pt/plasmaintegration5.po --- plasma-integration-5.8.6/po/pt/plasmaintegration5.po 2017-02-21 12:11:19.000000000 +0000 +++ plasma-integration-5.9.3/po/pt/plasmaintegration5.po 2017-02-28 13:04:07.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: plasmaintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-01-12 11:24+0000\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" @@ -29,37 +29,37 @@ msgid "Save File" msgstr "Gravar o Ficheiro" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Gravar Tudo" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Sim a Tudo" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Não a Tudo" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Interromper" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Repetir" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/pt_BR/plasmaintegration5.po plasma-integration-5.9.3/po/pt_BR/plasmaintegration5.po --- plasma-integration-5.8.6/po/pt_BR/plasmaintegration5.po 2017-02-21 12:11:19.000000000 +0000 +++ plasma-integration-5.9.3/po/pt_BR/plasmaintegration5.po 2017-02-28 13:04:07.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: plasmaintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-04-09 10:40-0300\n" "Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" @@ -30,37 +30,37 @@ msgid "Save File" msgstr "Salvar arquivo" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Salvar tudo" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Sim para tudo" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Não para tudo" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Cancelar" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Repetir" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/ru/plasmaintegration5.po plasma-integration-5.9.3/po/ru/plasmaintegration5.po --- plasma-integration-5.8.6/po/ru/plasmaintegration5.po 2017-02-21 12:11:20.000000000 +0000 +++ plasma-integration-5.9.3/po/ru/plasmaintegration5.po 2017-02-28 13:04:08.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-09-29 04:54+0300\n" "Last-Translator: Alexander Potashev \n" "Language-Team: Russian \n" @@ -30,37 +30,37 @@ msgid "Save File" msgstr "Сохранение файла" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Сохранить все" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Да для всех" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Нет для всех" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Прервать" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Повторить" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/sk/plasmaintegration5.po plasma-integration-5.9.3/po/sk/plasmaintegration5.po --- plasma-integration-5.8.6/po/sk/plasmaintegration5.po 2017-02-21 12:11:20.000000000 +0000 +++ plasma-integration-5.9.3/po/sk/plasmaintegration5.po 2017-02-28 13:04:08.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-04-09 13:33+0100\n" "Last-Translator: Roman Paholik \n" "Language-Team: Slovak \n" @@ -27,37 +27,37 @@ msgid "Save File" msgstr "Uložiť súbor" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Uložiť všetko" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Áno všetkým" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Nie všetkým" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Prerušiť" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Skúsiť znova" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/sl/plasmaintegration5.po plasma-integration-5.9.3/po/sl/plasmaintegration5.po --- plasma-integration-5.8.6/po/sl/plasmaintegration5.po 2017-02-21 12:11:20.000000000 +0000 +++ plasma-integration-5.9.3/po/sl/plasmaintegration5.po 2017-02-28 13:04:08.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-05-15 10:32+0200\n" "Last-Translator: Andrej Mernik \n" "Language-Team: Slovenian \n" @@ -30,37 +30,37 @@ msgid "Save File" msgstr "Shrani datoteko" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Shrani vse" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Da za vse" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Ne za vse" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Prekini" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Poskusi znova" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/sr/plasmaintegration5.po plasma-integration-5.9.3/po/sr/plasmaintegration5.po --- plasma-integration-5.8.6/po/sr/plasmaintegration5.po 2017-02-21 12:11:20.000000000 +0000 +++ plasma-integration-5.9.3/po/sr/plasmaintegration5.po 2017-02-28 13:04:08.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-04-15 23:42+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" @@ -30,37 +30,37 @@ msgid "Save File" msgstr "Уписивање фајла" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Сачувај све" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Да за све" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Не за све" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Обустави" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Покушај поново" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/sr@ijekavian/plasmaintegration5.po plasma-integration-5.9.3/po/sr@ijekavian/plasmaintegration5.po --- plasma-integration-5.8.6/po/sr@ijekavian/plasmaintegration5.po 2017-02-21 12:11:20.000000000 +0000 +++ plasma-integration-5.9.3/po/sr@ijekavian/plasmaintegration5.po 2017-02-28 13:04:08.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-04-15 23:42+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" @@ -30,37 +30,37 @@ msgid "Save File" msgstr "Уписивање фајла" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Сачувај све" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Да за све" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Не за све" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Обустави" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Покушај поново" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/sr@ijekavianlatin/plasmaintegration5.po plasma-integration-5.9.3/po/sr@ijekavianlatin/plasmaintegration5.po --- plasma-integration-5.8.6/po/sr@ijekavianlatin/plasmaintegration5.po 2017-02-21 12:11:20.000000000 +0000 +++ plasma-integration-5.9.3/po/sr@ijekavianlatin/plasmaintegration5.po 2017-02-28 13:04:08.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-04-15 23:42+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" @@ -30,37 +30,37 @@ msgid "Save File" msgstr "Upisivanje fajla" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Sačuvaj sve" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Da za sve" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Ne za sve" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Obustavi" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Pokušaj ponovo" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/sr@latin/plasmaintegration5.po plasma-integration-5.9.3/po/sr@latin/plasmaintegration5.po --- plasma-integration-5.8.6/po/sr@latin/plasmaintegration5.po 2017-02-21 12:11:21.000000000 +0000 +++ plasma-integration-5.9.3/po/sr@latin/plasmaintegration5.po 2017-02-28 13:04:08.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-04-15 23:42+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" @@ -30,37 +30,37 @@ msgid "Save File" msgstr "Upisivanje fajla" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Sačuvaj sve" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Da za sve" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Ne za sve" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Obustavi" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Pokušaj ponovo" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/sv/plasmaintegration5.po plasma-integration-5.9.3/po/sv/plasmaintegration5.po --- plasma-integration-5.8.6/po/sv/plasmaintegration5.po 2017-02-21 12:11:21.000000000 +0000 +++ plasma-integration-5.9.3/po/sv/plasmaintegration5.po 2017-02-28 13:04:08.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-04-10 08:12+0100\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" @@ -29,37 +29,37 @@ msgid "Save File" msgstr "Spara fil" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Spara alla" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Ja till alla" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Nej till alla" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Avbryt" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Försök igen" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/uk/plasmaintegration5.po plasma-integration-5.9.3/po/uk/plasmaintegration5.po --- plasma-integration-5.8.6/po/uk/plasmaintegration5.po 2017-02-21 12:11:21.000000000 +0000 +++ plasma-integration-5.9.3/po/uk/plasmaintegration5.po 2017-02-28 13:04:09.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: plasmaintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-04-09 18:05+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -32,37 +32,37 @@ msgid "Save File" msgstr "Збереження файла" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "Зберегти всі" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "Так для всіх" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "Ні для всіх" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "Перервати" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "Повторити" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/zh_CN/plasmaintegration5.po plasma-integration-5.9.3/po/zh_CN/plasmaintegration5.po --- plasma-integration-5.8.6/po/zh_CN/plasmaintegration5.po 2017-02-21 12:11:22.000000000 +0000 +++ plasma-integration-5.9.3/po/zh_CN/plasmaintegration5.po 2017-02-28 13:04:09.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-04-18 16:49-0800\n" "Last-Translator: Weng Xuetian \n" "Language-Team: Chinese \n" @@ -29,37 +29,37 @@ msgid "Save File" msgstr "保存文件" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "全部保存" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "全部是" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "全部否" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "中止" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "重试" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/po/zh_TW/plasmaintegration5.po plasma-integration-5.9.3/po/zh_TW/plasmaintegration5.po --- plasma-integration-5.8.6/po/zh_TW/plasmaintegration5.po 2017-02-21 12:11:22.000000000 +0000 +++ plasma-integration-5.9.3/po/zh_TW/plasmaintegration5.po 2017-02-28 13:04:09.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: plasmaintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:53+0100\n" +"POT-Creation-Date: 2017-01-19 06:54+0100\n" "PO-Revision-Date: 2016-09-23 10:55+0800\n" "Last-Translator: Jeff Huang \n" "Language-Team: Chinese \n" @@ -29,37 +29,37 @@ msgid "Save File" msgstr "儲存檔案" -#: platformtheme/kdeplatformtheme.cpp:237 +#: platformtheme/kdeplatformtheme.cpp:274 #, kde-format msgctxt "@action:button" msgid "Save All" msgstr "全部儲存" -#: platformtheme/kdeplatformtheme.cpp:243 +#: platformtheme/kdeplatformtheme.cpp:280 #, kde-format msgctxt "@action:button" msgid "Yes to All" msgstr "全部答是" -#: platformtheme/kdeplatformtheme.cpp:247 +#: platformtheme/kdeplatformtheme.cpp:284 #, kde-format msgctxt "@action:button" msgid "No to All" msgstr "全部答否" -#: platformtheme/kdeplatformtheme.cpp:250 +#: platformtheme/kdeplatformtheme.cpp:287 #, kde-format msgctxt "@action:button" msgid "Abort" msgstr "中止" -#: platformtheme/kdeplatformtheme.cpp:252 +#: platformtheme/kdeplatformtheme.cpp:289 #, kde-format msgctxt "@action:button" msgid "Retry" msgstr "重試" -#: platformtheme/kdeplatformtheme.cpp:254 +#: platformtheme/kdeplatformtheme.cpp:291 #, kde-format msgctxt "@action:button" msgid "Ignore" diff -Nru plasma-integration-5.8.6/src/platformtheme/CMakeLists.txt plasma-integration-5.9.3/src/platformtheme/CMakeLists.txt --- plasma-integration-5.8.6/src/platformtheme/CMakeLists.txt 2017-02-21 12:11:12.000000000 +0000 +++ plasma-integration-5.9.3/src/platformtheme/CMakeLists.txt 2017-02-28 13:04:03.000000000 +0000 @@ -6,10 +6,22 @@ set(HAVE_X11 ${X11_FOUND}) if(HAVE_X11) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) + + find_package(XCB COMPONENTS XCB) + set_package_properties(XCB PROPERTIES DESCRIPTION "Required for exposing the global menu on X11" + TYPE REQUIRED + ) endif() configure_file(config-platformtheme.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-platformtheme.h ) +# qdbusmenubar uses them +remove_definitions(-DQT_NO_SIGNALS_SLOTS_KEYWORDS) + + +include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) +include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS}) + set(platformtheme_SRCS kdeplatformtheme.cpp kfontsettingsdata.cpp @@ -24,9 +36,13 @@ main.cpp ) -include_directories( - ${Qt5Gui_PRIVATE_INCLUDE_DIRS} +if(Qt5Core_VERSION VERSION_EQUAL "5.7.0" OR Qt5Core_VERSION VERSION_GREATER "5.7.0") +set(platformtheme_SRCS + qdbusmenubar.cpp # fork of Qt's qdbusmenubar with some added setters for our convenience + ${platformtheme_SRCS} ) +endif() + add_library(KDEPlasmaPlatformTheme MODULE ${platformtheme_SRCS}) target_link_libraries(KDEPlasmaPlatformTheme @@ -43,10 +59,13 @@ KF5::Notifications KF5::WindowSystem KF5::WaylandClient + XCB::XCB + ${QT5PLATFORMSUPPORT_LIBS} + ) if(HAVE_X11) - target_link_libraries(KDEPlasmaPlatformTheme PRIVATE Qt5::X11Extras ${X11_Xcursor_LIB}) + target_link_libraries(KDEPlasmaPlatformTheme PRIVATE Qt5::X11Extras ${X11_Xcursor_LIB} ${XCB_XCB_LIBRARY}) endif() install(TARGETS KDEPlasmaPlatformTheme DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/platformthemes) diff -Nru plasma-integration-5.8.6/src/platformtheme/kdeplatformfiledialoghelper.cpp plasma-integration-5.9.3/src/platformtheme/kdeplatformfiledialoghelper.cpp --- plasma-integration-5.8.6/src/platformtheme/kdeplatformfiledialoghelper.cpp 2017-02-21 12:11:12.000000000 +0000 +++ plasma-integration-5.9.3/src/platformtheme/kdeplatformfiledialoghelper.cpp 2017-02-28 13:04:03.000000000 +0000 @@ -370,7 +370,9 @@ void KDEPlatformFileDialogHelper::setDirectory(const QUrl &directory) { - m_dialog->setDirectory(directory); + if (!directory.isEmpty()) { + m_dialog->setDirectory(directory); + } } void KDEPlatformFileDialogHelper::selectNameFilter(const QString &filter) diff -Nru plasma-integration-5.8.6/src/platformtheme/kdeplatformtheme.cpp plasma-integration-5.9.3/src/platformtheme/kdeplatformtheme.cpp --- plasma-integration-5.8.6/src/platformtheme/kdeplatformtheme.cpp 2017-02-21 12:11:12.000000000 +0000 +++ plasma-integration-5.9.3/src/platformtheme/kdeplatformtheme.cpp 2017-02-28 13:04:03.000000000 +0000 @@ -20,6 +20,8 @@ * Boston, MA 02110-1301, USA. */ +#include + #include "kdeplatformtheme.h" #include "kfontsettingsdata.h" #include "khintssettings.h" @@ -28,32 +30,67 @@ #include "kwaylandintegration.h" #include "x11integration.h" -#include -#include +#include #include +#include +#include +#include #include #include #include +#include #include +#include +#include #include -#include #include #include #include #include #include +#include + +#if QT_VERSION >= QT_VERSION_CHECK(5,7,0) +#include "qdbusmenubar_p.h" +#endif + +static const QByteArray s_x11AppMenuServiceNamePropertyName = QByteArrayLiteral("_KDE_NET_WM_APPMENU_SERVICE_NAME"); +static const QByteArray s_x11AppMenuObjectPathPropertyName = QByteArrayLiteral("_KDE_NET_WM_APPMENU_OBJECT_PATH"); + +static const QByteArray s_waylandAppMenuServiceNamePropertyName = QByteArrayLiteral("KDE_APPMENU_SERVICE_NAME"); +static const QByteArray s_waylandAppMenuObjectPathPropertyName = QByteArrayLiteral("KDE_APPMENU_OBJECT_PATH"); + +static bool checkDBusGlobalMenuAvailable() +{ + QDBusConnection connection = QDBusConnection::sessionBus(); + QString registrarService = QStringLiteral("com.canonical.AppMenu.Registrar"); + return connection.interface()->isServiceRegistered(registrarService); +} + +static bool isDBusGlobalMenuAvailable() +{ + static bool dbusGlobalMenuAvailable = checkDBusGlobalMenuAvailable(); + return dbusGlobalMenuAvailable; +} KdePlatformTheme::KdePlatformTheme() { loadSettings(); - if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"))) { + + if (KWindowSystem::isPlatformWayland()) { m_kwaylandIntegration.reset(new KWaylandIntegration()); m_kwaylandIntegration->init(); - } else if (QX11Info::isPlatformX11()) { + } + +#if HAVE_X11 + if (KWindowSystem::isPlatformX11()) { m_x11Integration.reset(new X11Integration()); m_x11Integration->init(); } +#endif + + QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, false); } KdePlatformTheme::~KdePlatformTheme() @@ -288,3 +325,47 @@ { return new KDEPlatformSystemTrayIcon; } + +#if QT_VERSION >= QT_VERSION_CHECK(5,7,0) +QPlatformMenuBar *KdePlatformTheme::createPlatformMenuBar() const +{ + if (isDBusGlobalMenuAvailable()) { + auto *menu = new QDBusMenuBar(); + + QObject::connect(menu, &QDBusMenuBar::windowChanged, menu, [this, menu](QWindow *newWindow, QWindow *oldWindow) { + const QString &serviceName = QDBusConnection::sessionBus().baseService(); + const QString &objectPath = menu->objectPath(); + + if (m_x11Integration) { + if (oldWindow) { + m_x11Integration->setWindowProperty(oldWindow, s_x11AppMenuServiceNamePropertyName, {}); + m_x11Integration->setWindowProperty(oldWindow, s_x11AppMenuObjectPathPropertyName, {}); + } + + if (newWindow) { + m_x11Integration->setWindowProperty(newWindow, s_x11AppMenuServiceNamePropertyName, serviceName.toUtf8()); + m_x11Integration->setWindowProperty(newWindow, s_x11AppMenuObjectPathPropertyName, objectPath.toUtf8()); + } + } + + if (m_kwaylandIntegration) { + if (oldWindow) { + m_kwaylandIntegration->setWindowProperty(oldWindow, s_waylandAppMenuServiceNamePropertyName, {}); + m_kwaylandIntegration->setWindowProperty(oldWindow, s_waylandAppMenuObjectPathPropertyName, {}); + } + + if (newWindow) { + m_kwaylandIntegration->setWindowProperty(newWindow, s_waylandAppMenuServiceNamePropertyName, serviceName.toUtf8()); + m_kwaylandIntegration->setWindowProperty(newWindow, s_waylandAppMenuObjectPathPropertyName, objectPath.toUtf8()); + } + } + }); + + return menu; + } + + return nullptr; +} +#endif + +#include "kdeplatformtheme.moc" diff -Nru plasma-integration-5.8.6/src/platformtheme/kdeplatformtheme.h plasma-integration-5.9.3/src/platformtheme/kdeplatformtheme.h --- plasma-integration-5.8.6/src/platformtheme/kdeplatformtheme.h 2017-02-21 12:11:12.000000000 +0000 +++ plasma-integration-5.9.3/src/platformtheme/kdeplatformtheme.h 2017-02-28 13:04:03.000000000 +0000 @@ -32,6 +32,9 @@ class KWaylandIntegration; class X11Integration; class QIconEngine; +class QWindow; + +class AltKeyEventListener; class KdePlatformTheme : public QPlatformTheme { @@ -52,13 +55,20 @@ QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE; +#if QT_VERSION >= QT_VERSION_CHECK(5,7,0) + QPlatformMenuBar *createPlatformMenuBar() const Q_DECL_OVERRIDE; +#endif + private: void loadSettings(); + static void setWindowProperty(QWindow *window, const QByteArray &name, const QByteArray &value); + KHintsSettings *m_hints; KFontSettingsData *m_fontsData; QScopedPointer m_kwaylandIntegration; QScopedPointer m_x11Integration; + }; #endif // KDEPLATFORMTHEME_H diff -Nru plasma-integration-5.8.6/src/platformtheme/kwaylandintegration.cpp plasma-integration-5.9.3/src/platformtheme/kwaylandintegration.cpp --- plasma-integration-5.8.6/src/platformtheme/kwaylandintegration.cpp 2017-02-21 12:11:12.000000000 +0000 +++ plasma-integration-5.9.3/src/platformtheme/kwaylandintegration.cpp 2017-02-28 13:04:03.000000000 +0000 @@ -19,16 +19,23 @@ */ #include "kwaylandintegration.h" -#include +#include #include +#include + +#include #include #include #include #include +#include using namespace KWayland::Client; +static const QByteArray s_schemePropertyName = QByteArrayLiteral("KDE_COLOR_SCHEME_PATH"); +static const QByteArray s_blurBehindPropertyName = QByteArrayLiteral("ENABLE_BLUR_BEHIND_HINT"); + KWaylandIntegration::KWaylandIntegration() : QObject() , m_decoration(Q_NULLPTR) @@ -73,6 +80,15 @@ if (auto e = dynamic_cast(event)) { switch (e->surfaceEventType()) { case QPlatformSurfaceEvent::SurfaceCreated: { + // set colorscheme hint + if (qApp->property(s_schemePropertyName.constData()).isValid()) { + installColorScheme(w); + } + const auto blurBehindProperty = w->property(s_blurBehindPropertyName.constData()); + if (blurBehindProperty.isValid()) { + KWindowEffects::enableBlurBehind(w->winId(), blurBehindProperty.toBool()); + } + // create deco Surface *s = Surface::fromWindow(w); if (!s) { return false; @@ -105,5 +121,29 @@ } } } + if (event->type() == QEvent::ApplicationPaletteChange) { + const auto topLevelWindows = QGuiApplication::topLevelWindows(); + for (QWindow *w : topLevelWindows) { + installColorScheme(w); + } + } return false; } + +void KWaylandIntegration::installColorScheme(QWindow *w) +{ + if (QPlatformNativeInterface *native = qApp->platformNativeInterface()) { + if (QPlatformWindow *pw = w->handle()) { + native->setWindowProperty(pw, QString::fromUtf8(s_schemePropertyName), qApp->property(s_schemePropertyName.constData())); + } + } +} + +void KWaylandIntegration::setWindowProperty(QWindow *window, const QByteArray &name, const QByteArray &value) +{ + if (QPlatformNativeInterface *nativeInterface = qApp->platformNativeInterface()) { + if (QPlatformWindow *platformWindow = window->handle()) { + nativeInterface->setWindowProperty(platformWindow, QString::fromUtf8(name), QString::fromUtf8(value)); + } + } +} diff -Nru plasma-integration-5.8.6/src/platformtheme/kwaylandintegration.h plasma-integration-5.9.3/src/platformtheme/kwaylandintegration.h --- plasma-integration-5.8.6/src/platformtheme/kwaylandintegration.h 2017-02-21 12:11:12.000000000 +0000 +++ plasma-integration-5.9.3/src/platformtheme/kwaylandintegration.h 2017-02-28 13:04:03.000000000 +0000 @@ -22,6 +22,8 @@ #include +class QWindow; + namespace KWayland { namespace Client @@ -38,9 +40,12 @@ virtual ~KWaylandIntegration(); void init(); + void setWindowProperty(QWindow *window, const QByteArray &name, const QByteArray &value); + bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; private: + void installColorScheme(QWindow *w); KWayland::Client::ServerSideDecorationManager *m_decoration; }; diff -Nru plasma-integration-5.8.6/src/platformtheme/qdbusmenubar.cpp plasma-integration-5.9.3/src/platformtheme/qdbusmenubar.cpp --- plasma-integration-5.8.6/src/platformtheme/qdbusmenubar.cpp 1970-01-01 00:00:00.000000000 +0000 +++ plasma-integration-5.9.3/src/platformtheme/qdbusmenubar.cpp 2017-02-28 13:04:03.000000000 +0000 @@ -0,0 +1,229 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Dmitry Shachnev +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qdbusmenubar_p.h" + +#if QT_VERSION == QT_VERSION_CHECK(5,7,0) +#include +#include + #endif + +QT_BEGIN_NAMESPACE + +/* note: do not change these to QStringLiteral; + we are unloaded before QtDBus is done using the strings. + */ +#define REGISTRAR_SERVICE QLatin1String("com.canonical.AppMenu.Registrar") +#define REGISTRAR_PATH QLatin1String("/com/canonical/AppMenu/Registrar") + +QDBusMenuBar::QDBusMenuBar() + : QPlatformMenuBar() + , m_menu(new QDBusPlatformMenu()) + , m_menuAdaptor(new QDBusMenuAdaptor(m_menu)) +{ + QDBusMenuItem::registerDBusTypes(); + connect(m_menu, &QDBusPlatformMenu::propertiesUpdated, + m_menuAdaptor, &QDBusMenuAdaptor::ItemsPropertiesUpdated); + connect(m_menu, &QDBusPlatformMenu::updated, + m_menuAdaptor, &QDBusMenuAdaptor::LayoutUpdated); + /*Qt 5.7.0 contains a nasty bug + * + * QMenuBar::setVisible() only checks isNativeMenuBar on OS X + * leading to the menu always being visible. + * Initial creation of the menubar does work properly however. + * + * This patch finds QMenuBars and blocks show events + * + * This is fixed in 5.7.1 + */ + + #if QT_VERSION == QT_VERSION_CHECK(5,7,0) + if (!QApplication::instance()) { + return; + } + //Platform menu bars are created from within QMenuBar therefore we know it exists when + //this method is run. By putting it in here, we don't need any invasive event filtering that affects non menubar users + for (QWidget *widget: QApplication::allWidgets()) { + if (auto menubar = qobject_cast(widget)) { + menubar->installEventFilter(this); + } + } + #endif +} + +bool QDBusMenuBar::eventFilter(QObject *watched, QEvent *event) { +//see ctor +#if QT_VERSION == QT_VERSION_CHECK(5,7,0) + if (event->type() == QEvent::ShowToParent) { + if (auto menubar = qobject_cast(watched)) { + if (menubar->platformMenuBar() == this) { + menubar->hide(); + } + return true; + } + } +#endif + return QPlatformMenuBar::eventFilter(watched, event); +} + +QDBusMenuBar::~QDBusMenuBar() +{ + unregisterMenuBar(); + delete m_menuAdaptor; + delete m_menu; + qDeleteAll(m_menuItems); +} + +QDBusPlatformMenuItem *QDBusMenuBar::menuItemForMenu(QPlatformMenu *menu) +{ + if (!menu) + return nullptr; + quintptr tag = menu->tag(); + const auto it = m_menuItems.constFind(tag); + if (it != m_menuItems.cend()) { + return *it; + } else { + QDBusPlatformMenuItem *item = new QDBusPlatformMenuItem; + updateMenuItem(item, menu); + m_menuItems.insert(tag, item); + return item; + } +} + +void QDBusMenuBar::updateMenuItem(QDBusPlatformMenuItem *item, QPlatformMenu *menu) +{ + const QDBusPlatformMenu *ourMenu = qobject_cast(menu); + item->setText(ourMenu->text()); + item->setIcon(ourMenu->icon()); + item->setEnabled(ourMenu->isEnabled()); + item->setVisible(ourMenu->isVisible()); + item->setMenu(menu); +} + +void QDBusMenuBar::insertMenu(QPlatformMenu *menu, QPlatformMenu *before) +{ + QDBusPlatformMenuItem *menuItem = menuItemForMenu(menu); + QDBusPlatformMenuItem *beforeItem = menuItemForMenu(before); + m_menu->insertMenuItem(menuItem, beforeItem); + m_menu->emitUpdated(); +} + +void QDBusMenuBar::removeMenu(QPlatformMenu *menu) +{ + QDBusPlatformMenuItem *menuItem = menuItemForMenu(menu); + m_menu->removeMenuItem(menuItem); + m_menu->emitUpdated(); +} + +void QDBusMenuBar::syncMenu(QPlatformMenu *menu) +{ + QDBusPlatformMenuItem *menuItem = menuItemForMenu(menu); + updateMenuItem(menuItem, menu); +} + +void QDBusMenuBar::handleReparent(QWindow *newParentWindow) +{ + if (newParentWindow && newParentWindow != m_window) { + QWindow *oldWindow = m_window; + + unregisterMenuBar(); + m_window = newParentWindow; + registerMenuBar(); + + emit windowChanged(newParentWindow, oldWindow); + } +} + +QPlatformMenu *QDBusMenuBar::menuForTag(quintptr tag) const +{ + QDBusPlatformMenuItem *menuItem = m_menuItems.value(tag); + if (menuItem) + return const_cast(menuItem->menu()); + return nullptr; +} + +QPlatformMenu *QDBusMenuBar::createMenu() const +{ + return new QDBusPlatformMenu; +} + +void QDBusMenuBar::registerMenuBar() +{ + static uint menuBarId = 0; + + if (!m_window) { + qWarning("Cannot register window menu without window"); + return; + } + + QDBusConnection connection = QDBusConnection::sessionBus(); + m_objectPath = QStringLiteral("/MenuBar/%1").arg(++menuBarId); + if (!connection.registerObject(m_objectPath, m_menu)) + return; + + QDBusMenuRegistrarInterface registrar(REGISTRAR_SERVICE, REGISTRAR_PATH, connection, this); + QDBusPendingReply<> r = registrar.RegisterWindow(static_cast(window()->winId()), QDBusObjectPath(m_objectPath)); + r.waitForFinished(); + if (r.isError()) { + qWarning("Failed to register window menu, reason: %s (\"%s\")", + qUtf8Printable(r.error().name()), qUtf8Printable(r.error().message())); + connection.unregisterObject(m_objectPath); + } +} + +void QDBusMenuBar::unregisterMenuBar() +{ + QDBusConnection connection = QDBusConnection::sessionBus(); + + if (m_window) { + QDBusMenuRegistrarInterface registrar(REGISTRAR_SERVICE, REGISTRAR_PATH, connection, this); + QDBusPendingReply<> r = registrar.UnregisterWindow(static_cast(window()->winId())); + r.waitForFinished(); + if (r.isError()) + qWarning("Failed to unregister window menu, reason: %s (\"%s\")", + qUtf8Printable(r.error().name()), qUtf8Printable(r.error().message())); + } + + if (!m_objectPath.isEmpty()) + connection.unregisterObject(m_objectPath); +} + +#include "qdbusmenubar.moc" + +QT_END_NAMESPACE diff -Nru plasma-integration-5.8.6/src/platformtheme/qdbusmenubar_p.h plasma-integration-5.9.3/src/platformtheme/qdbusmenubar_p.h --- plasma-integration-5.8.6/src/platformtheme/qdbusmenubar_p.h 1970-01-01 00:00:00.000000000 +0000 +++ plasma-integration-5.9.3/src/platformtheme/qdbusmenubar_p.h 2017-02-28 13:04:03.000000000 +0000 @@ -0,0 +1,112 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Dmitry Shachnev +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QDBUSMENUBAR_P_H +#define QDBUSMENUBAR_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include +#include +#include + + +#if (QT_VERSION < QT_VERSION_CHECK(5, 8, 0)) +#include +#include +#include +#include +#else +#include +#include +#include +#include +#endif + + +QT_BEGIN_NAMESPACE + +class QDBusMenuBar : public QPlatformMenuBar +{ + Q_OBJECT + +public: + QDBusMenuBar(); + virtual ~QDBusMenuBar(); + + void insertMenu(QPlatformMenu *menu, QPlatformMenu *before) Q_DECL_OVERRIDE; + void removeMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE; + void syncMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE; + void handleReparent(QWindow *newParentWindow) Q_DECL_OVERRIDE; + QPlatformMenu *menuForTag(quintptr tag) const Q_DECL_OVERRIDE; + QPlatformMenu *createMenu() const Q_DECL_OVERRIDE; + + QWindow *window() const { return m_window; } + QString objectPath() const { return m_objectPath; } + +Q_SIGNALS: + void windowChanged(QWindow *newWindow, QWindow *oldWindow); + +protected: + bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; +private: + QDBusPlatformMenu *m_menu; + QDBusMenuAdaptor *m_menuAdaptor; + QHash m_menuItems; + QWindow *m_window = nullptr; + QString m_objectPath; + + QDBusPlatformMenuItem *menuItemForMenu(QPlatformMenu *menu); + static void updateMenuItem(QDBusPlatformMenuItem *item, QPlatformMenu *menu); + void registerMenuBar(); + void unregisterMenuBar(); +}; + +QT_END_NAMESPACE + +#endif // QDBUSMENUBAR_P_H diff -Nru plasma-integration-5.8.6/src/platformtheme/x11integration.cpp plasma-integration-5.9.3/src/platformtheme/x11integration.cpp --- plasma-integration-5.8.6/src/platformtheme/x11integration.cpp 2017-02-21 12:11:12.000000000 +0000 +++ plasma-integration-5.9.3/src/platformtheme/x11integration.cpp 2017-02-28 13:04:03.000000000 +0000 @@ -22,9 +22,18 @@ #include #include +#include +#include #include #include +#include + +#include + +static const char s_schemePropertyName[] = "KDE_COLOR_SCHEME_PATH"; +static const QByteArray s_blurBehindPropertyName = QByteArrayLiteral("ENABLE_BLUR_BEHIND_HINT"); + X11Integration::X11Integration() : QObject() { @@ -48,6 +57,94 @@ info.setWindowType(NET::DNDIcon); // TODO: does this flash the xcb connection? } + if (event->type() == QEvent::PlatformSurface) { + if (QWindow *w = qobject_cast(watched)) { + QPlatformSurfaceEvent *pe = static_cast(event); + if (pe->surfaceEventType() == QPlatformSurfaceEvent::SurfaceCreated) { + if (qApp->property(s_schemePropertyName).isValid()) { + installColorScheme(w); + } + const auto blurBehindProperty = w->property(s_blurBehindPropertyName.constData()); + if (blurBehindProperty.isValid()) { + KWindowEffects::enableBlurBehind(w->winId(), blurBehindProperty.toBool()); + } + installDesktopFileName(w); + } + } + } + if (event->type() == QEvent::ApplicationPaletteChange) { + const auto topLevelWindows = QGuiApplication::topLevelWindows(); + for (QWindow *w : topLevelWindows) { + installColorScheme(w); + } + } return false; } +void X11Integration::installColorScheme(QWindow *w) +{ + if (!w->isTopLevel()) { + return; + } + static xcb_atom_t atom = XCB_ATOM_NONE; + xcb_connection_t *c = QX11Info::connection(); + if (atom == XCB_ATOM_NONE) { + const QByteArray name = QByteArrayLiteral("_KDE_NET_WM_COLOR_SCHEME"); + const xcb_intern_atom_cookie_t cookie = xcb_intern_atom(c, false, name.length(), name.constData()); + QScopedPointer reply(xcb_intern_atom_reply(c, cookie, Q_NULLPTR)); + if (!reply.isNull()) { + atom = reply->atom; + } else { + // no point in continuing, we don't have the atom + return; + } + } + const QString path = qApp->property(s_schemePropertyName).toString(); + if (path.isEmpty()) { + xcb_delete_property(c, w->winId(), atom); + } else { + xcb_change_property(c, XCB_PROP_MODE_REPLACE, w->winId(), atom, XCB_ATOM_STRING, + 8, path.size(), qPrintable(path)); + } +} + +void X11Integration::installDesktopFileName(QWindow *w) +{ + if (!w->isTopLevel()) { + return; + } +#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)) + if (QGuiApplication::desktopFileName().isEmpty()) { + return; + } + NETWinInfo info(QX11Info::connection(), w->winId(), QX11Info::appRootWindow(), NET::Properties(), NET::Properties2()); + info.setDesktopFileName(QGuiApplication::desktopFileName().toUtf8().constData()); +#endif +} + +void X11Integration::setWindowProperty(QWindow *window, const QByteArray &name, const QByteArray &value) +{ + auto *c = QX11Info::connection(); + + xcb_atom_t atom; + auto it = m_atoms.find(name); + if (it == m_atoms.end()) { + const xcb_intern_atom_cookie_t cookie = xcb_intern_atom(c, false, name.length(), name.constData()); + QScopedPointer reply(xcb_intern_atom_reply(c, cookie, Q_NULLPTR)); + if (!reply.isNull()) { + atom = reply->atom; + m_atoms[name] = atom; + } else { + return; + } + } else { + atom = *it; + } + + if (value.isEmpty()) { + xcb_delete_property(c, window->winId(), atom); + } else { + xcb_change_property(c, XCB_PROP_MODE_REPLACE, window->winId(), atom, XCB_ATOM_STRING, + 8, value.length(), value.constData()); + } +} diff -Nru plasma-integration-5.8.6/src/platformtheme/x11integration.h plasma-integration-5.9.3/src/platformtheme/x11integration.h --- plasma-integration-5.8.6/src/platformtheme/x11integration.h 2017-02-21 12:11:12.000000000 +0000 +++ plasma-integration-5.9.3/src/platformtheme/x11integration.h 2017-02-28 13:04:03.000000000 +0000 @@ -22,6 +22,10 @@ #define X11INTEGRATION_H #include +#include +#include + +class QWindow; class X11Integration : public QObject { @@ -31,10 +35,14 @@ virtual ~X11Integration(); void init(); + void setWindowProperty(QWindow *window, const QByteArray &name, const QByteArray &value); + bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; private: - + void installColorScheme(QWindow *w); + void installDesktopFileName(QWindow *w); + QHash m_atoms; }; #endif