Update Standards-Version to 4.7.1, no changes needed.

Summary:
Packaged new upstream 0.17.0 of lxqt-qtplugin
Updated changelog and control
Fixed copyright based on source files

Test Plan:
1. Wait for D116
2. Build passed on https://launchpad.net/~apt-ghetto/+archive/ubuntu/ludev

Reviewers: kc2bez

Reviewed By: kc2bez

Differential Revision: https://phab.lubuntu.me/D118

AUTHORS

@@ -1,9 +0,0 @@
-Upstream Authors:
-    LXQt team: http://lxqt.org
-    Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
-
-Copyright:
-    Copyright (c) 2013-2017 LXQt team
-
-License: LGPL-2.1+
-The full text of the licenses can be found in the 'COPYING' file.

CHANGELOG

@@ -1,109 +0,0 @@
-
-lxqt-qtplugin-0.12.0 / 2017-10-21
-=================================
-
-  * Set an informal patch version
-  * Don't export github templates
-  * Flag unused vars in onServiceOwnerChanged
-  * Fix missing variable declaration
-  * Handle QML (as @PCMan suggested)
-  * Use mime functions added by @PCMan
-  * Loading and saving window/splitter size
-  * Central positioning with respect to parent
-  * Set window title correctly
-  * Qt version conditions
-  * Just made it compilable
-  * Handle mime-type filters for file dialog. Set custom file dialog labels.
-  * Update options properly.
-  * Implement a basic file dialog helper using libfm-qt's Fm::FileDialog.
-  * Avoid using Qt-specific keywords such as signal/slot and foreach. Instead, use macros.
-  * LXQtPlatformTheme: Make Qt use default palette (#22)
-  * LXQtPlatformTheme: Add icon FollowColorScheme config (#21)
-  * Prevent a possible C++11 range for detach (#20)
-  * Use the CMake MODULE library type.
-  * LXQtPlatformTheme: Propagate wheelScrollLines
-  * LXQtPlatformTheme: Do not provide own palette
-  * Fix multiple StatusNotifierItems.
-  * Bump year
-  * Updates lxqt-build-tools required version
-
-0.11.1 / 2016-12-11
-===================
-
-  * Release 0.11.1: Update changelog
-  * Use lxqt-build-tools
-  * Use the new lxqt-build-tools package
-  * Remove cpack (#14)
-
-0.11.0 / 2016-09-24
-===================
-
-  * Release 0.11.0: Add changelog
-  * Add Qt5XdgIconLoader as dependency (#13)
-  * Update README.md
-  * statusnotifieritem: Correctly handle menu
-  * Cleaned up licenses
-  * Use XdgIconLoader library (#10)
-  * xdgIconThemePaths: Use QString::SkipEmptyParts
-  * xdgIconThemePaths: Remove duplicated paths
-  * Adds $XDG_DATA_HOME to the XdgIconThemePaths
-  * Bump year in AUTHORS
-
-0.10.0 / 2015-11-02
-===================
-
-  * Remove unnecessary qDebug calls
-  * Use markdown for README
-  * Fix license file
-  * Fix mixed indents
-  * Remove Qt >= 5.3 check
-  * Removed GPL2, added Digia Qt LGPL Exception version 1.1
-  * SNI: don't create a SNI if support isn't available
-  * SNI: monitor the watcher in case the host restarts
-  * SNI: implement scroll, showMessage and improve icons
-  * SNI: create default context menu
-  * Support the StatusNotifierItem spec natively
-  * Use the standard palette of the current Qt theme
-  * Handles CMake policy CMP0063
-  * Use the LXQtCompilerSettings CMake module
-  * Add .gitignore
-  * Updates the build system to use the Targets infrastructure
-  * Remove trailing whitespaces
-  * removed debug (which makes every app too verbose)
-
-0.9.0 / 2015-01-19
-==================
-
-  * Try to workaround bug #441 - All LXQt::Settings and QSettings file change monitoring stop working.
-  * - Unify naming for a unique lxqt. No more suffixes
-  * Qt5: Use XDG_DATA_DIR for themeHint::IconThemeSearchPaths
-  * CMakeLists.txt cleanuop and drop Qt4 support
-
-0.8.0 / 2014-07-18
-==================
-
-  * Apply the default application font on program startup.
-  * Apply the new font to all apps correctly and fix lxde/lxde-qt bug #212 - Changing font or theme in lxqt-config-appearance has no effect.
-  * Make the code compile with Qt 5.2, fix lxde-qt bug #207.
-  * Fix lxde-qt bug #207: lxqt-qtplugin fail to build with Qt5.
-  * Use qmake to query the path of Qt5 plugin dir, which is much more reliable.
-  * Update README and provide information for usage and debugging.
-  * Use a more reliable and portable way to get the path of Qt5 plugin dir.
-  * Support setting default UI font.
-  * Make "oxygen" the default icon theme name. * Apply new style name and icon theme name when the config file is changed.
-  * Simplify the Qt5 plugin and remove liblxqt dependency from it.
-  * Correctly read config values.
-  * Try to load some Qt settings.
-  * Implement a very basic Qt5 platform theme plugin.
-  * Prepare for Qt5 support.
-  * Use preferred header style.
-  * Remove unnecessary debug messages.
-  * Fix int-to-enum casting
-
-0.7.0 / 2014-04-29
-==================
-
-  * Update AUTHORS and COPYING
-  * Add CPack rules for creating tarball
-  * Support toolbar styles and activating items with single click.
-  * Initial import.

CMakeLists.txt

@@ -1,31 +0,0 @@
-cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
-project(lxqt-qtplugin)
-
-include(GNUInstallDirs)
-
-set(LXQTBT_MINIMUM_VERSION "0.4.0")
-
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-
-find_package(Qt5Widgets REQUIRED)
-find_package(Qt5LinguistTools REQUIRED)
-find_package(Qt5DBus REQUIRED)
-find_package(dbusmenu-qt5 REQUIRED)
-find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
-find_package(Qt5XdgIconLoader REQUIRED)
-
-# Patch Version 0
-
-# for file dialog support
-find_package(Qt5X11Extras REQUIRED)
-find_package(fm-qt REQUIRED)
-
-include(LXQtCompilerSettings NO_POLICY_SCOPE)
-
-if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE Release)
-endif()
-
-add_subdirectory(src)

LICENSE

@@ -1,458 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 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 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

README.md

@@ -1,27 +0,0 @@
-# lxqt-qtplugin
-
-## Overview
-
-This repository is providing a library `libqtlxqt` to integrate Qt with LXQt.
-
-With this plugin, all Qt-based programs can adopt settings of LXQt, such as the icon theme.
-
-## Installation
-
-### Compiling source code
-
-Runtime dependencies are libdbusmenu-qt5 and [liblxqt](https://github.com/lxde/liblxqt).   
-Additional build dependencies are CMake and qttools, optionally Git to pull latest VCS checkouts.   
-
-Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` has to be set to `/usr` on most operating systems.   
-
-To build run `make`, to install `make install` which accepts variable `DESTDIR` as usual.   
-
-### Binary packages
-
-Official binary packages are provided by all major Linux distributions like Arch Linux, Debian (as of Debian stretch only), Fedora and openSUSE. Just use your package manager to search for string `lxqt-qtplugin`.
-
-## Configuration, Usage
-
-To use the plugin in Qt 5, we have to export environment variable `QT_QPA_PLATFORMTHEME=lxqt`. Then every Qt5 program can load the theme plugin.   
-If, for some unknown reasons, the plugin is not loaded, we can debug the plugin by exporting `QT_DEBUG_PLUGINS=1`. Then, Qt5 will print detailed information and error messages about all plugins in the console when running any Qt5 programs.

debian/changelog

@@ -1,13 +1,190 @@
-lxqt-qtplugin (0.12.0-6ubuntu1) bionic; urgency=medium
+lxqt-qtplugin (2.1.0-0ubuntu5) plucky; urgency=medium
 
-  * Merge from Debian Sid. Remaining changes:
-    - Cherry-pick an upstream commit because the upstream release cycle is too
-      slow:
-      + Remember the view mode.
-        * remember-view-mode.patch
-        * Upstream commit dfa18ac.
+  * Update Standards-Version to 4.7.1, no changes needed.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 18 Feb 2018 22:48:24 -0600
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 21 Feb 2025 16:28:41 -0600
+
+lxqt-qtplugin (2.1.0-0ubuntu4) plucky; urgency=medium
+
+  * No-change rebuild for Qt 6.8.2.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 04 Feb 2025 18:31:36 -0600
+
+lxqt-qtplugin (2.1.0-0ubuntu3) plucky; urgency=medium
+
+  * No-change rebuild for lxqt-build-tools C++17 -> C++20.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 03 Jan 2025 03:58:37 -0600
+
+lxqt-qtplugin (2.1.0-0ubuntu2) plucky; urgency=medium
+
+  * No-change rebuild for Qt 6.8.1.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 05 Dec 2024 00:45:09 -0600
+
+lxqt-qtplugin (2.1.0-0ubuntu1) plucky; urgency=medium
+
+  * New upstream release.
+    - Bump build dependencies.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:33:06 -0600
+
+lxqt-qtplugin (2.0.0-0ubuntu3) plucky; urgency=medium
+
+  * No-change rebuild against Qt 6.7.2 private-abi.
+
+ -- Rik Mills <rikmills@kde.org>  Thu, 17 Oct 2024 17:53:25 +0100
+
+lxqt-qtplugin (2.0.0-0ubuntu2) oracular; urgency=medium
+
+  * Temporary fix for FTBFS on arm64.
+    - d/patches: Add set-qt-plugin-dir-via-configure.patch.
+    - d/rules: Pass QT_PLUGINS_DIR to configure.
+
+ -- Rik Mills <rikmills@kde.org>  Wed, 28 Aug 2024 14:06:13 +0100
+
+lxqt-qtplugin (2.0.0-0ubuntu1) oracular; urgency=medium
+
+  * New upstream release.
+  * Update copyright file.
+  * Bump Standards-Version to 4.7.0, no changes necessary.
+  * Adjust build dependencies.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:23:05 -0500
+
+lxqt-qtplugin (1.4.0-0ubuntu2) noble; urgency=medium
+
+  * Bump dependency for new upstream version.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 13 Nov 2023 12:52:43 -0600
+
+lxqt-qtplugin (1.4.0-0ubuntu1) noble; urgency=medium
+
+  * New upstream release.
+  * Fixed copyright file.
+  * Bumped and fixed build dependency versions.
+
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Wed, 08 Nov 2023 16:52:40 -0600
+
+lxqt-qtplugin (1.3.0-0ubuntu1) mantic; urgency=medium
+
+  * New upstream release.
+  * Bump build dependencies.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 03 Aug 2023 10:43:09 -0500
+
+lxqt-qtplugin (1.2.0-0ubuntu4) lunar; urgency=medium
+
+  * Removed trailing whitespace from changelog.
+  * Updated copyright file.
+  * Bumped Standards-Version to 4.6.2, no changes necessary.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 09 Feb 2023 22:34:25 -0600
+
+lxqt-qtplugin (1.2.0-0ubuntu3) lunar; urgency=medium
+
+  * No-change rebuild against Qt 5.15.8.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 14 Jan 2023 13:10:25 +0300
+
+lxqt-qtplugin (1.2.0-0ubuntu2) lunar; urgency=medium
+
+  * No-change rebuild against Qt 5.15.7.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 10 Dec 2022 15:59:29 +0300
+
+lxqt-qtplugin (1.2.0-0ubuntu1) lunar; urgency=medium
+
+  * New upstream release.
+  * Fix the watch file, for real this time.
+  * Lubuntuify the package slightly, to make debhelper happy.
+  * Bump build and runtime dependencies in debian/control.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 17 Nov 2022 16:40:59 -0600
+
+lxqt-qtplugin (1.1.0-1) experimental; urgency=medium
+
+  [ Aaron Rainbolt ]
+  * New upstream release 1.1.0.
+  * Removed obsolete debian/compat file.
+  * Switched to GBP.
+  * Upstreamed non-Ubuntu-specific packaging changes from Ubuntu, modifying
+    the following files:
+    - control
+    - copyright
+    - upstream/*
+
+  [ Simon Quigley ]
+  * Re-add the existing uploaders to debian/control.
+
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Sun, 10 Jul 2022 00:29:24 -0500
+
+lxqt-qtplugin (0.16.0-1) unstable; urgency=medium
+
+  [ Alf Gaida ]
+  * Switched to gbp
+  * Bumped Standards-Version to 4.4.0, no changes needed
+  * Removed no longer needed patches, applied upstream
+
+  [ Andrew Lee (李健秋) ]
+  * New upstream release. (Closes: #977329)
+
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Thu, 07 Jan 2021 17:53:47 +0800
+
+lxqt-qtplugin (0.14.0-3) unstable; urgency=medium
+
+  * Try to load the versioned libfm-qt.so.6 instead of libfm-qt.so
+    (Closes: #927905)
+
+ -- Alf Gaida <agaida@siduction.org>  Wed, 24 Apr 2019 23:05:04 +0200
+
+lxqt-qtplugin (0.14.0-2) unstable; urgency=medium
+
+  * Added missed direct dependency libqt5xdgiconloader-dev, the new
+    build-tools don't depend on it any longer to prevent circular
+    dependencies with libqtxdg (Closes: #924474).
+
+ -- Alf Gaida <agaida@siduction.org>  Wed, 13 Mar 2019 17:59:00 +0100
+
+lxqt-qtplugin (0.14.0-1) unstable; urgency=medium
+
+  * Cherry-picking upstream release 0.14.0.
+  * Bumped Standards to 4.3.0, no changes needed
+  * Dropped d/compat, use debhelper-compat = 12, no changes needed
+  * Fixed years in d/copyright
+  * Bumped minimum version liblxqt0-dev (>= 0.14.0~)
+  * Removed build dependency libfm-qt-dev
+  * Recommend libfm-qt6
+  * Added d/upstream/metadata
+
+ -- Alf Gaida <agaida@siduction.org>  Sun, 27 Jan 2019 18:08:59 +0100
+
+lxqt-qtplugin (0.13.0-2) unstable; urgency=medium
+
+  * Switched to unstable
+  * Bumped build dependency libfm-qt-dev to >= 0.13.1~
+  * Bumped Standards to 4.1.5, no changes needed
+
+ -- Alf Gaida <agaida@siduction.org>  Sat, 07 Jul 2018 14:13:08 +0200
+
+lxqt-qtplugin (0.13.0-1) experimental; urgency=medium
+
+  * Cherry-picking upstream release 0.13.0.
+  * Switched to experimental
+  * Bumped build dependency libfm-qt-dev to >= 0.13.0~
+  * Bumped build dependency lxqt-build-tools to >= 0.5.0~
+  * Removed the ported back upstream patches
+
+ -- Alf Gaida <agaida@siduction.org>  Sat, 26 May 2018 01:13:13 +0200
+
+lxqt-qtplugin (0.12.0-7) unstable; urgency=medium
+
+  * Relax debhelper minimum version to >= 11~
+  * Bumped Standard to 4.1.4, no changes needed
+  * Fixde glitches in VCS fields
+  * Changed Homepage, Source and watch for lxqt
+
+ -- Alf Gaida <agaida@siduction.org>  Sat, 28 Apr 2018 16:10:41 +0200
 
 lxqt-qtplugin (0.12.0-6) unstable; urgency=medium
 
@@ -28,16 +205,6 @@ lxqt-qtplugin (0.12.0-5) unstable; urgency=medium
 
  -- Alf Gaida <agaida@siduction.org>  Mon, 12 Feb 2018 19:52:16 +0100
 
-lxqt-qtplugin (0.12.0-4ubuntu1) bionic; urgency=medium
-
-  * Cherry-pick an upstream commit because the upstream release cycle is too
-    slow:
-    - Remember the view mode.
-      + remember-view-mode.patch
-      + Upstream commit dfa18ac.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 05 Feb 2018 21:33:02 -0600
-
 lxqt-qtplugin (0.12.0-4) unstable; urgency=medium
 
   * Bumped Standards to 4.1.2, no changes needed

debian/compat

@@ -1 +0,0 @@
-11

debian/control

@@ -1,32 +1,37 @@
 Source: lxqt-qtplugin
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
 Uploaders: Alf Gaida <agaida@siduction.org>,
+           Andrew Lee (李健秋) <ajqlee@debian.org>,
            ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
-           Yukiharu YABUKI <yyabuki@debian.org>
+           Yukiharu YABUKI <yyabuki@debian.org>,
+           Simon Quigley <tsimonq2@debian.org>,
+           Aaron Rainbolt <arraybolt3@gmail.com>
 Section: x11
 Priority: optional
-Build-Depends: debhelper (>= 11),
-               libdbusmenu-qt5-dev,
-               libfm-qt-dev (>= 0.12.0),
-               libkf5windowsystem-dev,
-               libqt5svg5-dev,
-               libqt5x11extras5-dev,
+Build-Depends: debhelper-compat (= 13),
+               libdbusmenu-lxqt0-dev (>= 0.2.0),
+               libfm-qt6-dev (>= 2.1.0),
+               libkf6windowsystem-dev,
+               libqt6xdg-dev (>= 4.1.0),
+               libqt6xdgiconloader-dev (>= 4.1.0),
                libx11-dev,
-               lxqt-build-tools (>= 0.4.0),
-               qtbase5-private-dev
-Standards-Version: 4.1.3
-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-qtplugin
-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-qtplugin
-Homepage: https://github.com/lxde/lxqt-qtplugin
+               lxqt-build-tools (>= 2.1.0),
+               qt6-base-private-dev (>= 6.6.0),
+               qt6-svg-dev (>= 6.6.0)
+Standards-Version: 4.7.1
+Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-qtplugin-packaging
+Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-qtplugin-packaging.git
+Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-qtplugin
+Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-qtplugin.git
+Homepage: https://github.com/lxqt/lxqt-qtplugin
+Rules-Requires-Root: no
 
 Package: lxqt-qtplugin
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Recommends: lxqt-session,
-            lxqt-config
+Depends: libfm-qt6-15, ${misc:Depends}, ${shlibs:Depends}
+Recommends: lxqt-config, lxqt-session
 Suggests: lxqt | lxqt-core
 Description: LXQt system integration plugin for Qt
  With this plugin, all Qt-based programs can adopt settings of

debian/copyright

@@ -1,16 +1,22 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: lxqt-qtplugin
-Source: https://github.com/lxde/lxqt-qtplugin
+Source: https://github.com/lxqt/lxqt-qtplugin
 
 Files: *
-Copyright: 2013-2018 LXQt team
-           2010-2012 Razor team
+Copyright: 2013-2024 LXQt team
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2014-2018 Alf Gaida <agaida@siduction.org>
+Copyright: 2021-2024 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
            2015      ChangZhuo Chen (陳昌倬) <czchen@debian.org>
            2015      Yukiharu YABUKI <yyabuki@debian.org>
+           2014-2019 Alf Gaida <agaida@siduction.org>
+           2019      Rik Mills <rikmills@kubuntu.org>
+           2021      Raman Sarda <theloudspeaker@lubuntu.me>
+           2019-2021 apt-ghetto <apt-ghetto@protonmail.com>
+           2021      Dan Simmons <kc2bez@lubuntu.me>
+           2018-2025 Simon Quigley <tsimonq2@ubuntu.com>
+           2023      Aaron Rainbolt <arraybolt3@gmail.com>
 License: LGPL-2.1+
 
 License: LGPL-2.1+

debian/gbp.conf

@@ -0,0 +1,5 @@
+[DEFAULT]
+debian-branch = debian/sid
+upstream-branch = upstream/latest
+pristine-tar = True
+compression = xz

debian/patches/colorizing-at-startup.patch

@@ -1,20 +0,0 @@
-commit 2283f5ee3c344fc62a74e41a127e3eee53fb2c37
-Author: Tsu Jan <tsujan2000@gmail.com>
-Date:   Mon Feb 12 13:10:02 2018 +0330
-
-    Fix icon colorizing at startup
-    
-    Fixes https://github.com/lxde/lxqt/issues/1445.
-
-diff --git a/src/lxqtplatformtheme.cpp b/src/lxqtplatformtheme.cpp
-index 83786f0..8291eab 100644
---- a/src/lxqtplatformtheme.cpp
-+++ b/src/lxqtplatformtheme.cpp
-@@ -315,6 +315,7 @@ QVariant LXQtPlatformTheme::themeHint(ThemeHint hint) const {
- 
- QIconEngine *LXQtPlatformTheme::createIconEngine(const QString &iconName) const
- {
-+    XdgIconLoader::instance()->setFollowColorScheme(iconFollowColorScheme_);
-     return new XdgIconLoaderEngine(iconName);
- }
-  

debian/patches/lxqtplatformtheme-follow-color-scheme.patch

@@ -1,80 +0,0 @@
-From c78433c32c327d09507976a7b5cecff87c224252 Mon Sep 17 00:00:00 2001
-From: Palo Kisa <palo.kisa@gmail.com>
-Date: Tue, 13 Feb 2018 10:01:10 +0100
-Subject: [PATCH] lxqtplatformtheme: Initialize "folowColorScheme" once
-
----
- src/lxqtplatformtheme.cpp | 18 +++++++++++++-----
- src/lxqtplatformtheme.h   |  4 +++-
- 2 files changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/src/lxqtplatformtheme.cpp b/src/lxqtplatformtheme.cpp
-index 8291eab..467cf07 100644
---- a/src/lxqtplatformtheme.cpp
-+++ b/src/lxqtplatformtheme.cpp
-@@ -52,13 +52,20 @@ LXQtPlatformTheme::LXQtPlatformTheme():
-     iconFollowColorScheme_(true)
-     , settingsWatcher_(NULL)
- {
--    // When the plugin is loaded, it seems that the app is not yet running and
-+    loadSettings();
-+    // Note: When the plugin is loaded, it seems that the app is not yet running and
-     // QThread environment is not completely set up. So creating filesystem watcher
-     // does not work since it uses QSocketNotifier internally which can only be
-     // created within QThread thread. So let's schedule a idle handler to initialize
-     // the watcher in the main event loop.
--    loadSettings();
--    QTimer::singleShot(0, this, SLOT(initWatch()));
-+
-+    // Note2: the QTimer::singleShot with also needs a QThread environment
-+    // (there is a workaround in qtcore for the 0-timer with the old SLOT notation)
-+
-+    // TODO: use the "PointerToMemberFunction" overloads of invokeMethod(), but they
-+    // are available from Qt v5.10
-+    //QMetaObject::ivokeMethod(this, &LXQtPlatformTheme::lazyInit, Qt::QueuedConnection);
-+    QMetaObject::invokeMethod(this, "lazyInit", Qt::QueuedConnection);
- }
- 
- LXQtPlatformTheme::~LXQtPlatformTheme() {
-@@ -66,11 +73,13 @@ LXQtPlatformTheme::~LXQtPlatformTheme() {
-         delete settingsWatcher_;
- }
- 
--void LXQtPlatformTheme::initWatch()
-+void LXQtPlatformTheme::lazyInit()
- {
-     settingsWatcher_ = new QFileSystemWatcher();
-     settingsWatcher_->addPath(settingsFile_);
-     connect(settingsWatcher_, &QFileSystemWatcher::fileChanged, this, &LXQtPlatformTheme::onSettingsChanged);
-+
-+    XdgIconLoader::instance()->setFollowColorScheme(iconFollowColorScheme_);
- }
- 
- void LXQtPlatformTheme::loadSettings() {
-@@ -315,7 +324,6 @@ QVariant LXQtPlatformTheme::themeHint(ThemeHint hint) const {
- 
- QIconEngine *LXQtPlatformTheme::createIconEngine(const QString &iconName) const
- {
--    XdgIconLoader::instance()->setFollowColorScheme(iconFollowColorScheme_);
-     return new XdgIconLoaderEngine(iconName);
- }
-  
-diff --git a/src/lxqtplatformtheme.h b/src/lxqtplatformtheme.h
-index 3c07c46..d0e7b6e 100644
---- a/src/lxqtplatformtheme.h
-+++ b/src/lxqtplatformtheme.h
-@@ -78,11 +78,13 @@ class Q_GUI_EXPORT LXQtPlatformTheme : public QObject, public QPlatformTheme {
- 
-     // virtual QString standardButtonText(int button) const;
- 
-+public Q_SLOTS:
-+    void lazyInit();
-+
- private:
-     void loadSettings();
- 
- private Q_SLOTS:
--    void initWatch();
-     void onSettingsChanged();
- 
- private:

debian/patches/remember-view-mode.patch

@@ -1,119 +0,0 @@
-Description: Remember the view mode
- Since the LXQt file dialog has richer modes than the Qt file dialog does, it
- is better to remember the user's choice on closing the dialog, as is the case
- in KDE.
-Author: Tsu Jan <tsujan2000@gmail.com>
-Origin: backport
-Bug: https://github.com/lxde/lxqt/issues/1358
-Applied-Upstream: commit:dfa18ac
-Last-Update: 2018-02-05
---- a/src/lxqtfiledialoghelper.cpp
-+++ b/src/lxqtfiledialoghelper.cpp
-@@ -12,6 +12,9 @@
- 
- static std::unique_ptr<Fm::LibFmQt> libfmQtContext_;
- 
-+inline static const QString viewModeToString(Fm::FolderView::ViewMode value);
-+inline static Fm::FolderView::ViewMode viewModeFromString(const QString& str);
-+
- LXQtFileDialogHelper::LXQtFileDialogHelper() {
-     if(!libfmQtContext_) {
-         // initialize libfm-qt only once
-@@ -53,6 +56,8 @@ bool LXQtFileDialogHelper::show(Qt::Wind
-     // https://github.com/KDE/plasma-integration/blob/master/src/platformtheme/kdeplatformfiledialoghelper.cpp
-     dlg_->windowHandle()->setTransientParent(parent);
- 
-+    applyOptions();
-+
-     loadSettings();
-     // central positioning with respect to the parent window
-     if(parent && parent->isVisible()) {
-@@ -60,8 +65,6 @@ bool LXQtFileDialogHelper::show(Qt::Wind
-                    parent->y() + (parent->height() - dlg_->height()) / 2);
-     }
- 
--    applyOptions();
--
-     // NOTE: the timer here is required as a workaround borrowed from KDE. Without this, the dialog UI will be blocked.
-     // QFileDialog calls our platform plugin to show our own native file dialog instead of showing its widget.
-     // However, it still creates a hidden dialog internally, and then make it modal.
-@@ -139,8 +142,6 @@ void LXQtFileDialogHelper::applyOptions(
-     }
- 
-     dlg_->setFilter(opt->filter());
--    dlg_->setViewMode(opt->viewMode() == QFileDialogOptions::Detail ? Fm::FolderView::DetailedListMode
--                                                                    : Fm::FolderView::CompactMode);
-     dlg_->setFileMode(QFileDialog::FileMode(opt->fileMode()));
-     dlg_->setAcceptMode(QFileDialog::AcceptMode(opt->acceptMode())); // also sets a default label for accept button
-     // bool useDefaultNameFilters() const;
-@@ -191,12 +192,56 @@ void LXQtFileDialogHelper::applyOptions(
-     // QStringList supportedSchemes() const;
- }
- 
-+static const QString viewModeToString(Fm::FolderView::ViewMode value) {
-+    QString ret;
-+    switch(value) {
-+    case Fm::FolderView::DetailedListMode:
-+    default:
-+        ret = QLatin1String("Detailed");
-+        break;
-+    case Fm::FolderView::CompactMode:
-+        ret = QLatin1String("Compact");
-+        break;
-+    case Fm::FolderView::IconMode:
-+        ret = QLatin1String("Icon");
-+        break;
-+    case Fm::FolderView::ThumbnailMode:
-+        ret = QLatin1String("Thumbnail");
-+        break;
-+    }
-+    return ret;
-+}
-+
-+Fm::FolderView::ViewMode viewModeFromString(const QString& str) {
-+    Fm::FolderView::ViewMode ret;
-+    if(str == QLatin1String("Detailed")) {
-+        ret = Fm::FolderView::DetailedListMode;
-+    }
-+    else if(str == QLatin1String("Compact")) {
-+        ret = Fm::FolderView::CompactMode;
-+    }
-+    else if(str == QLatin1String("Icon")) {
-+        ret = Fm::FolderView::IconMode;
-+    }
-+    else if(str == QLatin1String("Thumbnail")) {
-+        ret = Fm::FolderView::ThumbnailMode;
-+    }
-+    else {
-+        ret = Fm::FolderView::DetailedListMode;
-+    }
-+    return ret;
-+}
-+
- void LXQtFileDialogHelper::loadSettings() {
-     QSettings settings(QSettings::UserScope, "lxqt", "filedialog");
-     settings.beginGroup ("Sizes");
-     dlg_->resize(settings.value("WindowSize", QSize(700, 500)).toSize());
-     dlg_->setSplitterPos(settings.value("SplitterPos", 200).toInt());
-     settings.endGroup();
-+
-+   settings.beginGroup ("View");
-+   dlg_->setViewMode(viewModeFromString(settings.value("Mode", "Detailed").toString()));
-+   settings.endGroup();
- }
- 
- void LXQtFileDialogHelper::saveSettings() {
-@@ -211,6 +256,13 @@ void LXQtFileDialogHelper::saveSettings(
-         settings.setValue("SplitterPos", splitterPos);
-     }
-     settings.endGroup();
-+
-+    settings.beginGroup ("View");
-+    QString mode = viewModeToString(dlg_->viewMode());
-+    if(settings.value("Mode") != mode) {
-+        settings.setValue("Mode", mode);
-+    }
-+    settings.endGroup();
- }
- 
- /*

debian/patches/series

@@ -1,5 +0,0 @@
-colorizing-at-startup.patch
-lxqtplatformtheme-follow-color-scheme.patch
-
-# Ubuntu-specific patches
-remember-view-mode.patch

debian/rules

@@ -2,7 +2,6 @@
 # export DH_VERBOSE=1
 
 export LC_ALL=C.UTF-8
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
@@ -10,4 +9,5 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 override_dh_auto_configure:
 	dh_auto_configure --\
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-DQT_PLUGINS_DIR=/usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins

debian/source/options

@@ -1,2 +1 @@
 tar-ignore=.gitignore
-

debian/upstream/metadata

@@ -0,0 +1,5 @@
+Name: lxqt-qtplugin
+Bug-Database: https://github.com/lxqt/lxqt-qtplugin/issues
+Bug-Submit: https://github.com/lxqt/lxqt-qtplugin/issues/new
+Changelog: https://github.com/lxqt/lxqt-qtplugin/blob/master/CHANGELOG
+Repository: https://github.com/lxqt/lxqt-qtplugin

debian/upstream/signing-key.asc

@@ -1,50 +1,52 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQINBFXQeMMBEACif4+9pTrC6uNmRng0ZbzLh7p3cazmbnp2YFgDQDJZ7ZNmebxy
-ngRuRhjGuDcFAL/37BwJnrBpfZFK9ljoH4Fo5Jm9cOELaTy7AIcEiV9dKMyrKF1E
-C76d8jHVuzuPbI92DkFdLZAdk+qjrrAy0x43PvUd+aaBGLcFs1ZMk7gOvElc2d95
-zWWSp5anjukmGbp+EsStnWJkF6VHj56qmklfYy5ioiVBOSpXo/RsACAcIlz8C8A1
-d4tNMiB2uF2OrUfrL8DD6m3nBqep+AYbIQrxMl9kUQH3I33e9kH/L+SHQyE6phS8
-Czq06WjV4TcJ9VWxm7hQCNLYSxhZYYr1AW45lS5+xmfBOq2qeLgvjbFxa8PPrsp6
-Bqgt8MjwUkXjU5IB7YulUBvFU2l0MJZWDBuNy0oNtCe1cU3JyIqLKjvzQQQ9eD5L
-o3Ul704TLHz0z+67Rxh05Mi4JvyFMjnooSJkNH8/7yXoBN0ZGOh1/5zMU1gK5bmP
-6hKgis2exSZNIS74mF6/PqGgcwk3PyI4T3keUQoNPj11M2EznLHxY19QZfQ5oMed
-8xOlHKjpcm8PYMB4gduNXlV7gI9h7UxuC5GuPiP2lmM6wUyHu48divxDk5UYgPEC
-xlPI2wHCNDsuy0EruCYIvrMSZfpYCCSrmXiOORBLO5qXkauILLkJarHqjQARAQAB
-tCBBbGYgR2FpZGEgPGFnYWlkYUBzaWR1Y3Rpb24ub3JnPokCOAQTAQIAIgUCVdB4
-wwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQQsnI069epeOT2xAAgSHf
-41103cnElGf6TokPl4J6hdRPy2CUAjmBtMfr8eajYvGDGgnmsh9AGYGURjfFVCCf
-Ag+8b6nF3xg03UmgsuSO8H78HGv9kKzF9aHmLt+SXq3jUX+LnIkFHErZWjFAKdJr
-luu1j6ltxLe9PQljxZnugzMaUbW8eEPKvcriiDn3S4/DtikW/jpGA0MTY4ZWs9pZ
-L/6iRRH99L2X/cWO4sCgDXCTt4oK0f5OvwiuCoVOM+PYoIm31JICCKOlqamkCn7d
-2KH3nsy0v7tXgnrnb/zr8jVGsZLzUE51AFOzb5Ec74/2SAq8X4gbTppttLXEIooq
-nbepitW/PePkPY5gpfwHtFbl88qFnir+ABMefqRZkzeh0tsxJVLVHGP1KZykXpv7
-96A6Q1h7Zo9Ny7WwN5Xl02g35LVCaPyzd3A8A4315uMuP3iziq57UktKqh9d5S3t
-jfK7e9UfFQZBLfxn2sNPsjdYSNUQp/PXTTk/599h359WVuUIR866T8K7N7EEon3p
-qLItZljQ9Nmr/yGwKi9iQgi2LtZj5KUcF1zBLzZKf95FvoqSZqBXdFSjm+eYGaCH
-Q2IBnhyP92lEknSK9ystUJXmY69tQKBFqJxScwaS+7a/rfLKssQjSWxqk+SX4QeW
-e9z9FUpo71bq0Zkc/M9aOCoEEmhg4Ob/JWy08oC5Ag0EVdB4wwEQAKZDCc/C41y0
-omLFCAJybvHiFScM+jOpyGpQvceoviEhIT7h1br/pnSEMkgPQEDPWJGtKueg1/94
-sXTH24uefr3Y6JdZoBtprxl4JXUoOndgq1QH1xuUsy3/9YWU8Qboy9j8a8w0oCDE
-T8Z03KHCwqzD3K+44jhmhF+0eLoaaY8ohS8ziP+DcFKVHyatmS5yCCdjVrj6PxMp
-uy/y5SXT1kmiPdVAIzQlM5DlN6o46TV+BH0pPvVYjtwf31o0FckJxy5S1v0koCNB
-vX2b7tTDPKzn8G18eUVhGoUTZBUCp1gg36wJ0YY4xgZ9vI/xDCeHeAkyvGtaTAoy
-qP4rHoUO5KVRSDh7frSlrdbLGWHaQwOhcqoKd4qP/164wHPGkgHL1vztdOc7l1wx
-q3gMh2uwmJR0NRrw4WVuaIqL9lEbGBNijlmGsuqXfsMRhc/qoqgVDWvrcCtEoOwl
-TONGobW3jpCCjpa9SeGNjxuY6IVLn0lfX4hItNVY9sFA+H+yj4uBQ7zsmMUXafxt
-Yllm0f98yGNg5lnJg4bLOYu3IkpogUKNA3qkZ+6vRtwH70/bJGp7qdx/3G4W5dMX
-asd/rJjdELW+R/NVULAmK1ETSklaa3Z6vbTu8bN8gvP8pmMJ8f/U8+qzkuAqc201
-Z4O+s7ZsQfTiz5mm7zPGIYTnppDSno/rABEBAAGJAh8EGAECAAkFAlXQeMMCGwwA
-CgkQQsnI069epeMt0g/+JrwLhULD6NOxaLgxboh/KZkh/7ViU4cB+QPT8JIcWxkZ
-zj8uk85TUitEUzKmjp/ItCrhQE5WNNWbz/FBnAuLtaQuHhcHMA3Vu95UUCGi1vyZ
-ZRlS3YRM6S9BOzrjG7fGQJmO/RU3g6rb0TAwGFxDHj8t4JEDTc3zASG7wV/VTn06
-d8XIH9CZOw3kUuhkQ3OR/PEj1BCeCC+caC+tBjO0fgvDp8RV7NFQQ9kH8R3/xlWd
-6KMPtILE6fUft6LubWRGd1P5JBuzXivELolASajewbYtL/s87CCji3ngq0aT9raK
-m02wqFzNbX1iv+w2iqPQXq6pdRyxtJ8+Q8Z7zEBGJS5nkrYjsLTduZIjJHYHYH7f
-3/ydVjQ3z12iqHKElgaRI7RUmpNiNxVIr+TtuxzeC6G+CF++XNkUtJODvCmRaoJS
-waYsitz8+LSv3tawZJ0iQkKc9nerQMuBD+AzIr3i4NgXiEIN513esUtnKzeyIIsL
-ntUcBjXKuLCj8OZrZtexjq7edWWbN57/3ikyS2Z7y0i3O30qk5jmccSaS6kA7xTY
-WCDFzbN2v2y+vGu9KYn+2HtrP2BtNa8JTh3waNeLUTpn4GV4mMrsZjOy6vhhHb91
-1TKfI1gvjk7lE9xaWmcDjdI55dw3jIq8kK9SdgORGq9/S3g7KJNRjme+6GjqQfk=
-=h7ww
+mQINBF6cxrwBEADfl3ydxNfLBbWGPesXty2baQgixZ3D6aCxadI2kX+aikmT8rd0
+ttDKN18cXV52Ssxnj0qhgf4hwnu/b0be6BzqSEyGM+UQR3X2CYpxrMakfW32Q18K
+X5ec0RPR2ucBq9G0r9t6FYC8FkJ4uQUU3xxrLW3z302S0Makjgzm8BV9WrFQ7oFF
+uJQj0BHbHYC4RyaZb2AfxY4Y92BPGTjtGekWqgw6vEXCCnvAbGYVQzvxZt3nw21/
+1YmV4g7xhGFQPbOf9v3ejFUJeJIGzuJf5NAh7kvfCdUBAGYH0gnj0GpOve4ftnaG
+sAId2CQwm3oYF4Tu7yBPTOBpkaKkNaT+UdwTyeKERuCZ9ocZWX++/YF9ItRkJ5mM
+zoP1GluWn2atNWpRh/K97gyAGgr2fSmrAA4d1JrVbMujZAHoHAOKwJKqX9jPziPZ
+BFHfhcIOzG3ZhXAuumHsd7uwfPBVt20g+G+cOjBghbSSu9EOtMkAZl1g3ybvZixu
+Jtxa5exZWEmU7vtytEb8eq9Dj5XcGoTDbErE2RpJ/20HPzhyRKg9RN4iGS+0OiHS
+oRbDi5IEOizvQjp2bsBmfa3rsoDSOqF2pevp+u8I56I6bU1GFpxxNC5IGvgo2Q79
+quz0oIk5hs3eLlUdEYsLGwR6pWJaJyf36vuDsq7iLrLyvHI5irAowO4r1QARAQAB
+tCVQZWRyYW0gUG91cmFuZyA8dHN1amFuMjAwMEBnbWFpbC5jb20+iQJOBBMBCAA4
+FiEEGd/fOleb1QnbtXLYvnkwB60i334FAl6cxrwCGwMFCwkIBwIGFQoJCAsCBBYC
+AwECHgECF4AACgkQvnkwB60i335f9RAAgRpn8gUa/l10UkVAnpM2Cz0MuNMwwCOq
+IfVnuZuPBtYYiTU5Su++/aPZe3fF5B4v61F+XjNi7qeVL2t52X3jZ/iIx9Syasb+
+vDAIfQ5t6lKXvOptWxf6vteOg6CHbXwpGHbPjUkUS2vQwRikjBnR0SnkrMoXtgSX
+amPFqsitNrOhEJfeDfo0NzKESZuliWrCFt2v8c5q18G8cCZAvPLBlGuwRl58cDep
+3EIibMI/9MUSJbKoiHlK+LcHtG7BQTNis/e7Pe1PkRmExfhxe1lNajtOx8FO72Tq
+B6zY6drippM9VaIc1M+zp9BRpsFu8whOmapCqlXHRgAK8xTdQRIGInQFqLWPOxSC
+f0B6N+EvQvgkyFQ1rW+u91OJBma46uKkhrwf+mDttVRncaIAkgE6e6pqm18yIPFk
+D42rt/yHcOl+2qkcJS3gPcg5UvlCzqOwg1rKZQIk+TcPuDx3r2UghDEYZN9X6vw3
+zCBufr7ygZNf4tkbnVARFWTR4GzyCseFkWgOVZL9DccAhs8NeMy1WLkUzB75adeR
+3LONmEL7xOI8FuknKY4e6EcWhmstNIDgXfRe0hwO0VBdW3unoZC/K2ZM/ZuZyMdK
+TFjvYJrNewmymKge68wo0054bGZn8oz17i2AosJz7kW+ITsxmxhVcpfl4bav9Neq
+RpQwhnhK9bC5Ag0EXpzGvAEQANbeRHFbpgQVIqV9WVOVnTj4FIqrTPTPKKa02vJA
+7tGpgFapgvjdxnMxJfV6wuwOBUUFLR7DrXlV8EVFAYc5qTIeSQXvJsWw6gQ3+f0D
+z13oGOhZPBIzIKnV/MZI/jhIio8kSPWAuM5hR2X9Hvw3/CLo+H+hZZ6cFYoCxrQS
+tTzcKMkdQizLLa+WNbqUSxg6I/P5k/smUDY9gKW7RtI5t/PupA3WTnsVD6CYWa3Q
+c1O/1mUgqT6nQ5N9KCPpjZQRT6D6eIMmePtS85z4PPeYMJxPsKRYWPGRxKhCSdZl
+/0wsC8aRtmwYT729e0ZgTAmUnj+rQp5hboF/ZPFjIoXR9G+0HnoY0a/nqVO4lUON
+AV25GnMFGVyiHHlbH/0gboywwnzEg8BZbk+Z/61oOzBIW09sfG8fn8bsbkpL+nHf
+Mi/Vauge6wSfw7I5AfSiwrSDNHmKVsu39koWV6JGxEeFr2MffF+CuaoJCNOr/ZII
+SYR5ku3Y/lMKyUH1Oas0RWzFrdRcInqYK90A0x083zP4V445MvCwbRPzQAkm9wOP
+kILLhE5FW+9/O0/9bpx4joJUDLV4d3hFZy7GSHKiZUs1QW6BV75JQKqoi+cVt+/L
++o1S8CMNekjqdC2mWRosM3doo51zT/FWNzQA1QcoZP2hORJDfw66y+4wPq6o8y1W
+jR35ABEBAAGJAjYEGAEIACAWIQQZ3986V5vVCdu1cti+eTAHrSLffgUCXpzGvAIb
+DAAKCRC+eTAHrSLffgbJD/4qW5YOo/BayBhaUh2L7VP7JNlECb/2xNNOFKI1NjNr
+nOmgSJLzf74Uhmt5W+iVjmJBHrDceprIPkizmPrn90kIsPIMtHIDNxzUgKZHbnza
+j1vZyAeC+JV79X1hOVpprj1TJwy65lpxXNyYnGqeIOgyFokn9fOHXv8aMQwpNuUr
+bdUJ1C75jYrvwy/NR1DczIFFYgsbkDGDtjVBjyMc5JAgvUBz37/iVPJfWP6dKVnf
+abRnUVzHgvgK7bnab00SA1TiWvjHURGjo+5rnRtv8X/AgStc2Phjq68TMIgMn0F2
+kjUVvfQotNqzo9madNshvUDmsGtAzKh4e0dS1ear7u3nRp4Z7fqSrTEtXKNbEPwZ
+wdWrWmmQLacNQBSe/FtcMzGF6xIVr4lnrL0bFjqBdQpdTC7vns3QSKk8/GFiEfpv
+kzXrDbGV7jX2OWDjNHKcmXX2+E1CsNaJgS7zOgZw5jvbvlTLJUwyYNlM1VLI2OFW
+Oa86l8pqli+B7rpTbsAE9Ut8qUaWjm87oUNSJbaKgqNnMaE+b/8VJaEeWHgQJwsD
+bJSJ/O/vzlRtDjOJ1JDlMRLs7TnOFeUh5pgwyaJoidYbJEiGlMGJbI6BjwhDTBFO
+NLJtd3SsRjc7ICtGdCvej59IvCDTjxtkhx5okF03APi1aXpHQrE18/arFD7BpoGO
+sw==
+=gSIv
 -----END PGP PUBLIC KEY BLOCK-----

debian/watch

@@ -1,3 +1,5 @@
 version=4
-opts="pgpsigurlmangle=s/$/.asc/" \
-    https://github.com/lxde/lxqt-qtplugin/releases .*/lxqt-qtplugin-([\d\.]+).tar.xz
+opts="searchmode=plain, \
+pgpsigurlmangle=s/$/.asc/, \
+uversionmangle=s/(\d+\.\d+\.\d+).*/$1/" \
+  https://api.github.com/repos/lxqt/@PACKAGE@/releases https:\/\/github.com\/lxqt\/@PACKAGE@\/releases\/download\/@ANY_VERSION@\/@PACKAGE@-@ANY_VERSION@.tar.xz

src/CMakeLists.txt

@@ -1,61 +0,0 @@
-include_directories(
-    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
-    "${CMAKE_CURRENT_BINARY_DIR}"
-)
-
-set(qtlxqt_HDRS
-    lxqtplatformtheme.h
-    lxqtsystemtrayicon.h
-    lxqtfiledialoghelper.h
-    statusnotifieritem/statusnotifieritem.h
-    statusnotifieritem/dbustypes.h
-)
-
-set(qtlxqt_SRCS
-    main.cpp
-    lxqtplatformtheme.cpp
-    lxqtsystemtrayicon.cpp
-    lxqtfiledialoghelper.cpp
-    statusnotifieritem/statusnotifieritem.cpp
-    statusnotifieritem/dbustypes.cpp
-)
-
-qt5_add_dbus_adaptor(qtlxqt_SRCS
-    statusnotifieritem/org.kde.StatusNotifierItem.xml
-    statusnotifieritem/statusnotifieritem.h
-    StatusNotifierItem
-)
-
-add_library(qtlxqt MODULE ${qtlxqt_HDRS} ${qtlxqt_SRCS})
-
-target_link_libraries(qtlxqt
-    Qt5::Widgets
-    Qt5::DBus
-    dbusmenu-qt5
-    Qt5XdgIconLoader
-    fm-qt
-)
-
-
-# there is no standard way to get the plugin dir of Qt5 with cmake
-# The best way is get_target_property(QT_PLUGINS_DIR Qt5::QGtk2ThemePlugin LOCATION).
-# This directly returns the platformthemes dir. However, this does not work
-# in some distros, such as ubuntu.
-# Finally, I came up with a more reliable way by using qmake.
-get_target_property(QT_QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE} IMPORTED_LOCATION)
-if(NOT QT_QMAKE_EXECUTABLE)
-    message(FATAL_ERROR "qmake is not found.")
-endif()
-
-# execute the command "qmake -query QT_INSTALL_PLUGINS" to get the path of plugins dir.
-execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_PLUGINS
-    OUTPUT_VARIABLE QT_PLUGINS_DIR
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-if(QT_PLUGINS_DIR)
-    message(STATUS "Qt5 plugin directory:" "${QT_PLUGINS_DIR}")
-else()
-    message(FATAL_ERROR "Qt5 plugin directory cannot be detected.")
-endif()
-
-install(TARGETS qtlxqt LIBRARY DESTINATION "${QT_PLUGINS_DIR}/platformthemes")

src/lxqtfiledialoghelper.cpp

@@ -1,224 +0,0 @@
-#include "lxqtfiledialoghelper.h"
-
-#include <libfm-qt/libfmqt.h>
-#include <libfm-qt/filedialog.h>
-
-#include <QWindow>
-#include <QDebug>
-#include <QTimer>
-#include <QSettings>
-
-#include <memory>
-
-static std::unique_ptr<Fm::LibFmQt> libfmQtContext_;
-
-LXQtFileDialogHelper::LXQtFileDialogHelper() {
-    if(!libfmQtContext_) {
-        // initialize libfm-qt only once
-        libfmQtContext_ = std::unique_ptr<Fm::LibFmQt>{new Fm::LibFmQt()};
-    }
-
-    // can only be used after libfm-qt initialization
-    dlg_ = std::unique_ptr<Fm::FileDialog>(new Fm::FileDialog());
-    connect(dlg_.get(), &Fm::FileDialog::accepted, [this]() {
-        saveSettings();
-        accept();
-    });
-    connect(dlg_.get(), &Fm::FileDialog::rejected, [this]() {
-        saveSettings();
-        reject();
-    });
-
-    connect(dlg_.get(), &Fm::FileDialog::fileSelected, this, &LXQtFileDialogHelper::fileSelected);
-    connect(dlg_.get(), &Fm::FileDialog::filesSelected, this, &LXQtFileDialogHelper::filesSelected);
-    connect(dlg_.get(), &Fm::FileDialog::currentChanged, this, &LXQtFileDialogHelper::currentChanged);
-    connect(dlg_.get(), &Fm::FileDialog::directoryEntered, this, &LXQtFileDialogHelper::directoryEntered);
-    connect(dlg_.get(), &Fm::FileDialog::filterSelected, this, &LXQtFileDialogHelper::filterSelected);
-}
-
-LXQtFileDialogHelper::~LXQtFileDialogHelper() {
-}
-
-void LXQtFileDialogHelper::exec() {
-    dlg_->exec();
-}
-
-bool LXQtFileDialogHelper::show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow* parent) {
-    dlg_->setAttribute(Qt::WA_NativeWindow, true); // without this, sometimes windowHandle() will return nullptr
-
-    dlg_->setWindowFlags(windowFlags);
-    dlg_->setWindowModality(windowModality);
-
-    // Reference: KDE implementation
-    // https://github.com/KDE/plasma-integration/blob/master/src/platformtheme/kdeplatformfiledialoghelper.cpp
-    dlg_->windowHandle()->setTransientParent(parent);
-
-    loadSettings();
-    // central positioning with respect to the parent window
-    if(parent && parent->isVisible()) {
-        dlg_->move(parent->x() + (parent->width() - dlg_->width()) / 2,
-                   parent->y() + (parent->height() - dlg_->height()) / 2);
-    }
-
-    applyOptions();
-
-    // NOTE: the timer here is required as a workaround borrowed from KDE. Without this, the dialog UI will be blocked.
-    // QFileDialog calls our platform plugin to show our own native file dialog instead of showing its widget.
-    // However, it still creates a hidden dialog internally, and then make it modal.
-    // So user input from all other windows that are not the children of the QFileDialog widget will be blocked.
-    // This includes our own dialog. After the return of this show() method, QFileDialog creates its own window and
-    // then make it modal, which blocks our UI. The timer schedule a delayed popup of our file dialog, so we can
-    // show again after QFileDialog and override the modal state. Then our UI can be unblocked.
-    QTimer::singleShot(0, dlg_.get(), &QDialog::show);
-    dlg_->setFocus();
-    return true;
-}
-
-void LXQtFileDialogHelper::hide() {
-    dlg_->hide();
-}
-
-bool LXQtFileDialogHelper::defaultNameFilterDisables() const {
-    return false;
-}
-
-void LXQtFileDialogHelper::setDirectory(const QUrl& directory) {
-    dlg_->setDirectory(directory);
-}
-
-QUrl LXQtFileDialogHelper::directory() const {
-    return dlg_->directory();
-}
-
-void LXQtFileDialogHelper::selectFile(const QUrl& filename) {
-    dlg_->selectFile(filename);
-}
-
-QList<QUrl> LXQtFileDialogHelper::selectedFiles() const {
-    return dlg_->selectedFiles();
-}
-
-void LXQtFileDialogHelper::setFilter() {
-    // FIXME: what's this?
-    // The gtk+ 3 file dialog helper in Qt5 update options in this method.
-    applyOptions();
-}
-
-void LXQtFileDialogHelper::selectNameFilter(const QString& filter) {
-    dlg_->selectNameFilter(filter);
-}
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
-QString LXQtFileDialogHelper::selectedMimeTypeFilter() const {
-    return dlg_->selectedMimeTypeFilter();
-}
-
-void LXQtFileDialogHelper::selectMimeTypeFilter(const QString& filter) {
-    dlg_->selectMimeTypeFilter(filter);
-}
-#endif
-
-QString LXQtFileDialogHelper::selectedNameFilter() const {
-    return dlg_->selectedNameFilter();
-}
-
-bool LXQtFileDialogHelper::isSupportedUrl(const QUrl& url) const {
-    return dlg_->isSupportedUrl(url);
-}
-
-void LXQtFileDialogHelper::applyOptions() {
-    auto& opt = options();
-
-    // set title
-    if(opt->windowTitle().isEmpty()) {
-        dlg_->setWindowTitle(opt->acceptMode() == QFileDialogOptions::AcceptOpen ? tr("Open File")
-                                                                                 : tr("Save File"));
-    }
-    else {
-        dlg_->setWindowTitle(opt->windowTitle());
-    }
-
-    dlg_->setFilter(opt->filter());
-    dlg_->setViewMode(opt->viewMode() == QFileDialogOptions::Detail ? Fm::FolderView::DetailedListMode
-                                                                    : Fm::FolderView::CompactMode);
-    dlg_->setFileMode(QFileDialog::FileMode(opt->fileMode()));
-    dlg_->setAcceptMode(QFileDialog::AcceptMode(opt->acceptMode())); // also sets a default label for accept button
-    // bool useDefaultNameFilters() const;
-    dlg_->setNameFilters(opt->nameFilters());
-    if(!opt->mimeTypeFilters().empty()) {
-        dlg_->setMimeTypeFilters(opt->mimeTypeFilters());
-    }
-
-    dlg_->setDefaultSuffix(opt->defaultSuffix());
-    // QStringList history() const;
-
-    // explicitly set labels
-    for(int i = 0; i < QFileDialogOptions::DialogLabelCount; ++i) {
-        auto label = static_cast<QFileDialogOptions::DialogLabel>(i);
-        if(opt->isLabelExplicitlySet(label)) {
-            dlg_->setLabelText(static_cast<QFileDialog::DialogLabel>(label), opt->labelText(label));
-        }
-    }
-
-    auto url = opt->initialDirectory();
-    if(url.isValid()) {
-        dlg_->setDirectory(url);
-    }
-
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
-    auto filter = opt->initiallySelectedMimeTypeFilter();
-    if(!filter.isEmpty()) {
-        selectMimeTypeFilter(filter);
-    }
-    else {
-        filter = opt->initiallySelectedNameFilter();
-        if(!filter.isEmpty()) {
-            selectNameFilter(opt->initiallySelectedNameFilter());
-        }
-    }
-#else
-    auto filter = opt->initiallySelectedNameFilter();
-    if(!filter.isEmpty()) {
-        selectNameFilter(filter);
-    }
-#endif
-
-    auto selectedFiles = opt->initiallySelectedFiles();
-    for(const auto& selectedFile: selectedFiles) {
-        selectFile(selectedFile);
-    }
-    // QStringList supportedSchemes() const;
-}
-
-void LXQtFileDialogHelper::loadSettings() {
-    QSettings settings(QSettings::UserScope, "lxqt", "filedialog");
-    settings.beginGroup ("Sizes");
-    dlg_->resize(settings.value("WindowSize", QSize(700, 500)).toSize());
-    dlg_->setSplitterPos(settings.value("SplitterPos", 200).toInt());
-    settings.endGroup();
-}
-
-void LXQtFileDialogHelper::saveSettings() {
-    QSettings settings(QSettings::UserScope, "lxqt", "filedialog");
-    settings.beginGroup ("Sizes");
-    QSize windowSize = dlg_->size();
-    if(settings.value("WindowSize") != windowSize) { // no redundant write
-        settings.setValue("WindowSize", windowSize);
-    }
-    int splitterPos = dlg_->splitterPos();
-    if(settings.value("SplitterPos") != splitterPos) {
-        settings.setValue("SplitterPos", splitterPos);
-    }
-    settings.endGroup();
-}
-
-/*
-FileDialogPlugin::FileDialogPlugin() {
-
-}
-
-QPlatformFileDialogHelper *FileDialogPlugin::createHelper() {
-    return new LXQtFileDialogHelper();
-}
-*/

src/lxqtfiledialoghelper.h

@@ -1,50 +0,0 @@
-#ifndef LXQTFILEDIALOGHELPER_H
-#define LXQTFILEDIALOGHELPER_H
-
-#include <qpa/qplatformdialoghelper.h> // this private header is subject to changes
-#include <memory>
-
-namespace Fm {
-class FileDialog;
-}
-
-class Q_GUI_EXPORT LXQtFileDialogHelper : public QPlatformFileDialogHelper {
-    Q_OBJECT
-
-public:
-    LXQtFileDialogHelper();
-
-    virtual ~LXQtFileDialogHelper();
-
-    // QPlatformDialogHelper
-    void exec() override;
-    bool show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent) override;
-    void hide() override;
-
-    // QPlatformFileDialogHelper
-    bool defaultNameFilterDisables() const override;
-    void setDirectory(const QUrl &directory) override;
-    QUrl directory() const override;
-    void selectFile(const QUrl &filename) override;
-    QList<QUrl> selectedFiles() const override;
-    void setFilter() override;
-    void selectNameFilter(const QString &filter) override;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
-    QString selectedMimeTypeFilter() const override;
-    void selectMimeTypeFilter(const QString &filter) override;
-#endif
-    QString selectedNameFilter() const override;
-
-    bool isSupportedUrl(const QUrl &url) const override;
-
-private:
-    void applyOptions();
-    void loadSettings();
-    void saveSettings();
-
-private:
-    std::unique_ptr<Fm::FileDialog> dlg_;
-};
-
-
-#endif // LXQTFILEDIALOGHELPER_H

src/lxqtplatformtheme.cpp

@@ -1,348 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXDE-Qt - a lightweight, Qt based, desktop toolset
- * http://lxde.org/
- *
- * Copyright: 2014 LXQt team
- * Authors:
- *   Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
- *
- * This program or 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 Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- *
- * END_COMMON_COPYRIGHT_HEADER */
-
-#include "lxqtplatformtheme.h"
-#include <QVariant>
-#include <QDebug>
-
-#include <QIcon>
-#include <QStandardPaths>
-#include <QApplication>
-#include <QWidget>
-
-#include <QMetaObject>
-#include <QMetaProperty>
-#include <QMetaEnum>
-#include <QToolBar>
-#include <QSettings>
-#include <QTimer>
-#include <QDir>
-#include <QFileInfo>
-#include <QFileSystemWatcher>
-#include <QStyle>
-#include <private/xdgiconloader/xdgiconloader_p.h>
-
-#include "lxqtfiledialoghelper.h"
-
-LXQtPlatformTheme::LXQtPlatformTheme():
-    iconFollowColorScheme_(true)
-    , settingsWatcher_(NULL)
-{
-    // When the plugin is loaded, it seems that the app is not yet running and
-    // QThread environment is not completely set up. So creating filesystem watcher
-    // does not work since it uses QSocketNotifier internally which can only be
-    // created within QThread thread. So let's schedule a idle handler to initialize
-    // the watcher in the main event loop.
-    loadSettings();
-    QTimer::singleShot(0, this, SLOT(initWatch()));
-}
-
-LXQtPlatformTheme::~LXQtPlatformTheme() {
-    if(settingsWatcher_)
-        delete settingsWatcher_;
-}
-
-void LXQtPlatformTheme::initWatch()
-{
-    settingsWatcher_ = new QFileSystemWatcher();
-    settingsWatcher_->addPath(settingsFile_);
-    connect(settingsWatcher_, &QFileSystemWatcher::fileChanged, this, &LXQtPlatformTheme::onSettingsChanged);
-}
-
-void LXQtPlatformTheme::loadSettings() {
-    // QSettings is really handy. It tries to read from /etc/xdg/lxqt/lxqt.conf
-    // as a fallback if a key is missing from the user config file ~/.config/lxqt/lxqt.conf.
-    // So we can customize the default values in /etc/xdg/lxqt/lxqt.conf and does
-    // not necessarily to hard code the default values here.
-    QSettings settings(QSettings::UserScope, "lxqt", "lxqt");
-    settingsFile_ = settings.fileName();
-
-    // icon theme
-    iconTheme_ = settings.value("icon_theme", "oxygen").toString();
-    iconFollowColorScheme_ = settings.value("icon_follow_color_scheme", iconFollowColorScheme_).toBool();
-
-    // read other widget related settings form LxQt settings.
-    QByteArray tb_style = settings.value("tool_button_style").toByteArray();
-    // convert toolbar style name to value
-    QMetaEnum me = QToolBar::staticMetaObject.property(QToolBar::staticMetaObject.indexOfProperty("toolButtonStyle")).enumerator();
-    int value = me.keyToValue(tb_style.constData());
-    if(value == -1)
-        toolButtonStyle_ = Qt::ToolButtonTextBesideIcon;
-    else
-        toolButtonStyle_ = static_cast<Qt::ToolButtonStyle>(value);
-
-    // single click activation
-    singleClickActivate_ = settings.value("single_click_activate").toBool();
-
-    // load Qt settings
-    settings.beginGroup(QLatin1String("Qt"));
-
-    // widget style
-    style_ = settings.value(QLatin1String("style"), QLatin1String("fusion")).toString();
-
-    // SystemFont
-    fontStr_ = settings.value(QLatin1String("font")).toString();
-    if(!fontStr_.isEmpty()) {
-        if(font_.fromString(fontStr_))
-            QApplication::setFont(font_); // it seems that we need to do this manually.
-    }
-
-    // FixedFont
-    fixedFontStr_ = settings.value(QLatin1String("fixedFont")).toString();
-    if(!fixedFontStr_.isEmpty()) {
-        fixedFont_.fromString(fixedFontStr_);
-    }
-
-    // mouse
-    doubleClickInterval_ = settings.value(QLatin1String("doubleClickInterval"));
-    wheelScrollLines_ = settings.value(QLatin1String("wheelScrollLines"));
-
-    // keyboard
-    cursorFlashTime_ = settings.value(QLatin1String("cursorFlashTime"));
-    settings.endGroup();
-}
-
-// this is called whenever the config file is changed.
-void LXQtPlatformTheme::onSettingsChanged() {
-    // D*mn! yet another Qt 5.4 regression!!!
-    // See the bug report: https://github.com/lxde/lxqt/issues/441
-    // Since Qt 5.4, QSettings uses QSaveFile to save the config files.
-    // https://github.com/qtproject/qtbase/commit/8d15068911d7c0ba05732e2796aaa7a90e34a6a1#diff-e691c0405f02f3478f4f50a27bdaecde
-    // QSaveFile will save the content to a new temp file, and replace the old file later.
-    // Hence the existing config file is not changed. Instead, it's deleted and then replaced.
-    // This new behaviour unfortunately breaks QFileSystemWatcher.
-    // After file deletion, we can no longer receive any new change notifications.
-    // The most ridiculous thing is, QFileSystemWatcher does not provide a
-    // way for us to know if a file is deleted. WT*?
-    // Luckily, I found a workaround: If the file path no longer exists
-    // in the watcher's files(), this file is deleted.
-    bool file_deleted = !settingsWatcher_->files().contains(settingsFile_);
-    if(file_deleted) // if our config file is already deleted, reinstall a new watcher
-        settingsWatcher_->addPath(settingsFile_);
-
-    // NOTE: in Qt4, Qt monitors the change of _QT_SETTINGS_TIMESTAMP root property and
-    // reload Trolltech.conf when the value is changed. Then, it automatically
-    // applies the new settings.
-    // Unfortunately, this is no longer the case in Qt5. Yes, yet another regression.
-    // We're free to provide our own platform plugin, but Qt5 does not
-    // update the settings and repaint the UI. We need to do it ourselves
-    // through dirty hacks and private Qt internal APIs.
-    QString oldStyle = style_;
-    QString oldIconTheme = iconTheme_;
-    QString oldFont = fontStr_;
-    QString oldFixedFont = fixedFontStr_;
-
-    loadSettings(); // reload the config file
-
-    if(style_ != oldStyle) // the widget style is changed
-    {
-        // ask Qt5 to apply the new style
-        if (qobject_cast<QApplication *>(QCoreApplication::instance()))
-            QApplication::setStyle(style_);
-    }
-
-    if(iconTheme_ != oldIconTheme) { // the icon theme is changed
-        XdgIconLoader::instance()->updateSystemTheme(); // this is a private internal API of Qt5.
-    }
-    XdgIconLoader::instance()->setFollowColorScheme(iconFollowColorScheme_);
-
-    // if font is changed
-    if(oldFont != fontStr_ || oldFixedFont != fixedFontStr_){
-        // FIXME: to my knowledge there is no way to ask Qt to reload the fonts.
-        // Should we call QApplication::setFont() to override the font?
-        // This does not work with QSS, though.
-        //
-        // After reading the source code of Qt, I think the right method to call
-        // here is QApplicationPrivate::setSystemFont(). However, this is an
-        // internal API and should not be used. Let's call QApplication::setFont()
-        // instead since it approximately does the same thing.
-        // Internally, QApplication will emit QEvent::ApplicationFontChange so
-        // all of the widgets will update their fonts.
-        // FIXME: should we call the internal API: QApplicationPrivate::setFont() instead?
-        // QGtkStyle does this internally.
-        fixedFont_.fromString(fixedFontStr_); // FIXME: how to set this to the app?
-        if(font_.fromString(fontStr_))
-            QApplication::setFont(font_);
-    }
-
-    QApplication::setWheelScrollLines(wheelScrollLines_.toInt());
-
-    // emit a ThemeChange event to all widgets
-    Q_FOREACH(QWidget* widget, QApplication::allWidgets()) {
-        // Qt5 added a QEvent::ThemeChange event.
-        QEvent event(QEvent::ThemeChange);
-        QApplication::sendEvent(widget, &event);
-    }
-}
-
-bool LXQtPlatformTheme::usePlatformNativeDialog(DialogType type) const {
-    if(type == FileDialog
-       && qobject_cast<QApplication *>(QCoreApplication::instance())) { // QML may not have qApp
-        // use our own file dialog
-        return true;
-    }
-    return false;
-}
-
-
-QPlatformDialogHelper *LXQtPlatformTheme::createPlatformDialogHelper(DialogType type) const {
-    if(type == FileDialog
-       && qobject_cast<QApplication *>(QCoreApplication::instance())) { // QML may not have qApp
-        // use our own file dialog
-        return new LXQtFileDialogHelper();
-    }
-    return nullptr;
-}
-
-const QPalette *LXQtPlatformTheme::palette(Palette type) const {
-    return nullptr;
-}
-
-const QFont *LXQtPlatformTheme::font(Font type) const {
-    if(type == SystemFont && !fontStr_.isEmpty()) {
-        // NOTE: for some reason, this is not called by Qt when program startup.
-        // So we do QApplication::setFont() manually.
-        return &font_;
-    }
-    else if(type == FixedFont && !fixedFontStr_.isEmpty()) {
-        return &fixedFont_;
-    }
-    return QPlatformTheme::font(type);
-}
-
-QVariant LXQtPlatformTheme::themeHint(ThemeHint hint) const {
-    switch (hint) {
-    case CursorFlashTime:
-        return cursorFlashTime_;
-    case KeyboardInputInterval:
-        break;
-    case MouseDoubleClickInterval:
-        return doubleClickInterval_;
-    case StartDragDistance:
-        break;
-    case StartDragTime:
-        break;
-    case KeyboardAutoRepeatRate:
-        break;
-    case PasswordMaskDelay:
-        break;
-    case StartDragVelocity:
-        break;
-    case TextCursorWidth:
-        break;
-    case DropShadow:
-        return QVariant(true);
-    case MaximumScrollBarDragDistance:
-        break;
-    case ToolButtonStyle:
-        return QVariant(toolButtonStyle_);
-    case ToolBarIconSize:
-        break;
-    case ItemViewActivateItemOnSingleClick:
-        return QVariant(singleClickActivate_);
-    case SystemIconThemeName:
-        return iconTheme_;
-    case SystemIconFallbackThemeName:
-        return "hicolor";
-    case IconThemeSearchPaths:
-        return xdgIconThemePaths();
-    case StyleNames:
-        return QStringList() << style_;
-    case WindowAutoPlacement:
-        break;
-    case DialogButtonBoxLayout:
-        break;
-    case DialogButtonBoxButtonsHaveIcons:
-        return QVariant(true);
-    case UseFullScreenForPopupMenu:
-        break;
-    case KeyboardScheme:
-        return QVariant(X11KeyboardScheme);
-    case UiEffects:
-        break;
-    case SpellCheckUnderlineStyle:
-        break;
-    case TabAllWidgets:
-        break;
-    case IconPixmapSizes:
-        break;
-    case PasswordMaskCharacter:
-        break;
-    case DialogSnapToDefaultButton:
-        break;
-    case ContextMenuOnMouseRelease:
-        break;
-    case MousePressAndHoldInterval:
-        break;
-    case MouseDoubleClickDistance:
-        break;
-    case WheelScrollLines:
-        return wheelScrollLines_;
-        break;
-    default:
-        break;
-    }
-    return QPlatformTheme::themeHint(hint);
-}
-
-QIconEngine *LXQtPlatformTheme::createIconEngine(const QString &iconName) const
-{
-    return new XdgIconLoaderEngine(iconName);
-}
- 
-// Helper to return the icon theme paths from XDG.
-QStringList LXQtPlatformTheme::xdgIconThemePaths() const
-{
-    QStringList paths;
-    QStringList xdgDirs;
-
-    // Add home directory first in search path
-    const QFileInfo homeIconDir(QDir::homePath() + QStringLiteral("/.icons"));
-    if (homeIconDir.isDir())
-        paths.prepend(homeIconDir.absoluteFilePath());
-
-    QString xdgDataHome = QFile::decodeName(qgetenv("XDG_DATA_HOME"));
-    if (xdgDataHome.isEmpty())
-        xdgDataHome = QDir::homePath() + QLatin1String("/.local/share");
-    xdgDirs.append(xdgDataHome);
-
-    QString xdgDataDirs = QFile::decodeName(qgetenv("XDG_DATA_DIRS"));
-    if (xdgDataDirs.isEmpty())
-        xdgDataDirs = QLatin1String("/usr/local/share/:/usr/share/");
-    xdgDirs.append(xdgDataDirs);
-
-    for (const auto &s: xdgDirs) {
-        const QStringList r = s.split(QLatin1Char(':'), QString::SkipEmptyParts);
-        for (const auto& xdgDir: r) {
-            const QFileInfo xdgIconsDir(xdgDir + QStringLiteral("/icons"));
-            if (xdgIconsDir.isDir())
-                paths.append(xdgIconsDir.absoluteFilePath());
-        }
-    }
-    paths.removeDuplicates();
-    return paths;
-}

src/lxqtplatformtheme.h

@@ -1,113 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXDE-Qt - a lightweight, Qt based, desktop toolset
- * http://lxde.org/
- *
- * Copyright: 2014 LXQt team
- * Authors:
- *   Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
- *
- * This program or 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 Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- *
- * END_COMMON_COPYRIGHT_HEADER */
-
-#ifndef LXQTPLATFORMTHEME_H
-#define LXQTPLATFORMTHEME_H
-
-#include "lxqtsystemtrayicon.h"
-
-#include <qpa/qplatformtheme.h> // this private header is subject to changes
-#include <QtGlobal>
-#include <QVariant>
-#include <QString>
-#include <QFileSystemWatcher>
-#include <QFont>
-
-class Q_GUI_EXPORT LXQtPlatformTheme : public QObject, public QPlatformTheme {
-    Q_OBJECT
-public:
-    LXQtPlatformTheme();
-    ~LXQtPlatformTheme();
-
-    // virtual QPlatformMenuItem* createPlatformMenuItem() const;
-    // virtual QPlatformMenu* createPlatformMenu() const;
-    // virtual QPlatformMenuBar* createPlatformMenuBar() const;
-
-    virtual bool usePlatformNativeDialog(DialogType type) const;
-    virtual QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const;
-
-    virtual const QPalette *palette(Palette type = SystemPalette) const;
-
-    virtual const QFont *font(Font type = SystemFont) const;
-
-    virtual QVariant themeHint(ThemeHint hint) const;
-
-    QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const
-    {
-        auto trayIcon = new LXQtSystemTrayIcon;
-        if (trayIcon->isSystemTrayAvailable())
-            return trayIcon;
-        else
-        {
-            delete trayIcon;
-            return nullptr;
-        }
-    }
-
-    // virtual QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const;
-    // virtual QPixmap fileIconPixmap(const QFileInfo &fileInfo, const QSizeF &size,
-    //                               QPlatformTheme::IconOptions iconOptions = 0) const;
-
-    virtual QIconEngine *createIconEngine(const QString &iconName) const;
-
-    // virtual QList<QKeySequence> keyBindings(QKeySequence::StandardKey key) const;
-
-    // virtual QString standardButtonText(int button) const;
-
-private:
-    void loadSettings();
-
-private Q_SLOTS:
-    void initWatch();
-    void onSettingsChanged();
-
-private:
-    // LXQt settings
-    QString iconTheme_;
-    Qt::ToolButtonStyle toolButtonStyle_;
-    bool singleClickActivate_;
-    bool iconFollowColorScheme_;
-
-    // other Qt settings
-    // widget
-    QString style_;
-    QString fontStr_;
-    QFont font_;
-    QString fixedFontStr_;
-    QFont fixedFont_;
-    // mouse
-    QVariant doubleClickInterval_;
-    QVariant wheelScrollLines_;
-    // keyboard
-    QVariant cursorFlashTime_;
-    QFileSystemWatcher *settingsWatcher_;
-    QString settingsFile_;
-
-    QStringList xdgIconThemePaths() const;
-};
-
-#endif // LXQTPLATFORMTHEME_H

src/lxqtplatformtheme.json

@@ -1,3 +0,0 @@
-{
-    "Keys": [ "lxqt" ]
-}

src/lxqtsystemtrayicon.cpp

@@ -1,382 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXQt - a lightweight, Qt based, desktop toolset
- * http://lxqt.org/
- *
- * Copyright: 2015 LXQt team
- * Authors:
- *   Paulo Lieuthier <paulolieuthier@gmail.com>
- *
- * This program or 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 Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- *
- * END_COMMON_COPYRIGHT_HEADER */
-
-#include "lxqtsystemtrayicon.h"
-#include <QAction>
-#include <QIcon>
-#include <QMenu>
-#include <QRect>
-#include <QApplication>
-#include <QDBusMetaType>
-#include <QDBusInterface>
-
-SystemTrayMenu::SystemTrayMenu()
-    : QPlatformMenu(),
-    m_tag(0),
-    m_menu(new QMenu())
-{
-    connect(m_menu.data(), &QMenu::aboutToShow, this, &QPlatformMenu::aboutToShow);
-    connect(m_menu.data(), &QMenu::aboutToHide, this, &QPlatformMenu::aboutToHide);
-}
-
-SystemTrayMenu::~SystemTrayMenu()
-{
-    if (m_menu)
-        m_menu->deleteLater();
-}
-
-QPlatformMenuItem *SystemTrayMenu::createMenuItem() const
-{
-    return new SystemTrayMenuItem();
-}
-
-void SystemTrayMenu::insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before)
-{
-    if (SystemTrayMenuItem *ours = qobject_cast<SystemTrayMenuItem*>(menuItem))
-    {
-        bool inserted = false;
-
-        if (SystemTrayMenuItem *oursBefore = qobject_cast<SystemTrayMenuItem*>(before))
-        {
-            for (auto it = m_items.begin(); it != m_items.end(); ++it)
-            {
-                if (*it == oursBefore)
-                {
-                    m_items.insert(it, ours);
-                    if (m_menu)
-                        m_menu->insertAction(oursBefore->action(), ours->action());
-
-                    inserted = true;
-                    break;
-                }
-            }
-        }
-
-        if (!inserted)
-        {
-            m_items.append(ours);
-            if (m_menu)
-                m_menu->addAction(ours->action());
-        }
-    }
-}
-
-QPlatformMenuItem *SystemTrayMenu::menuItemAt(int position) const
-{
-    if (position < m_items.size())
-        return m_items.at(position);
-
-    return nullptr;
-}
-
-QPlatformMenuItem *SystemTrayMenu::menuItemForTag(quintptr tag) const
-{
-    auto it = std::find_if(m_items.constBegin(), m_items.constEnd(), [tag] (SystemTrayMenuItem *item)
-    {
-        return item->tag() == tag;
-    });
-
-    if (it != m_items.constEnd())
-        return *it;
-
-    return nullptr;
-}
-
-void SystemTrayMenu::removeMenuItem(QPlatformMenuItem *menuItem)
-{
-    if (SystemTrayMenuItem *ours = qobject_cast<SystemTrayMenuItem*>(menuItem))
-    {
-        m_items.removeOne(ours);
-        if (ours->action() && m_menu)
-            m_menu->removeAction(ours->action());
-    }
-}
-
-void SystemTrayMenu::setEnabled(bool enabled)
-{
-    if (!m_menu)
-        return;
-
-    m_menu->setEnabled(enabled);
-}
-
-void SystemTrayMenu::setIcon(const QIcon &icon)
-{
-    if (!m_menu)
-        return;
-
-    m_menu->setIcon(icon);
-}
-
-void SystemTrayMenu::setTag(quintptr tag)
-{
-    m_tag = tag;
-}
-
-void SystemTrayMenu::setText(const QString &text)
-{
-    if (!m_menu)
-        return;
-
-    m_menu->setTitle(text);
-}
-
-void SystemTrayMenu::setVisible(bool visible)
-{
-    if (!m_menu)
-        return;
-
-    m_menu->setVisible(visible);
-}
-
-void SystemTrayMenu::syncMenuItem(QPlatformMenuItem *)
-{
-    // Nothing to do
-}
-
-void SystemTrayMenu::syncSeparatorsCollapsible(bool enable)
-{
-    if (!m_menu)
-        return;
-
-    m_menu->setSeparatorsCollapsible(enable);
-}
-
-quintptr SystemTrayMenu::tag() const
-{
-    return m_tag;
-}
-
-QMenu *SystemTrayMenu::menu() const
-{
-    return m_menu.data();
-}
-
-SystemTrayMenuItem::SystemTrayMenuItem()
-    : QPlatformMenuItem(),
-    m_tag(0),
-    m_action(new QAction(this))
-{
-    connect(m_action, &QAction::triggered, this, &QPlatformMenuItem::activated);
-    connect(m_action, &QAction::hovered, this, &QPlatformMenuItem::hovered);
-}
-
-SystemTrayMenuItem::~SystemTrayMenuItem()
-{
-}
-
-void SystemTrayMenuItem::setCheckable(bool checkable)
-{
-    m_action->setCheckable(checkable);
-}
-
-void SystemTrayMenuItem::setChecked(bool isChecked)
-{
-    m_action->setChecked(isChecked);
-}
-
-void SystemTrayMenuItem::setEnabled(bool enabled)
-{
-    m_action->setEnabled(enabled);
-}
-
-void SystemTrayMenuItem::setFont(const QFont &font)
-{
-    m_action->setFont(font);
-}
-
-void SystemTrayMenuItem::setIcon(const QIcon &icon)
-{
-    m_action->setIcon(icon);
-}
-
-void SystemTrayMenuItem::setIsSeparator(bool isSeparator)
-{
-    m_action->setSeparator(isSeparator);
-}
-
-void SystemTrayMenuItem::setMenu(QPlatformMenu *menu)
-{
-    if (SystemTrayMenu *ourMenu = qobject_cast<SystemTrayMenu *>(menu))
-        m_action->setMenu(ourMenu->menu());
-}
-
-void SystemTrayMenuItem::setRole(QPlatformMenuItem::MenuRole)
-{
-}
-
-void SystemTrayMenuItem::setShortcut(const QKeySequence &shortcut)
-{
-    m_action->setShortcut(shortcut);
-}
-
-void SystemTrayMenuItem::setTag(quintptr tag)
-{
-    m_tag = tag;
-}
-
-void SystemTrayMenuItem::setText(const QString &text)
-{
-    m_action->setText(text);
-}
-
-void SystemTrayMenuItem::setVisible(bool isVisible)
-{
-    m_action->setVisible(isVisible);
-}
-
-void SystemTrayMenuItem::setIconSize(int)
-{
-}
-
-quintptr SystemTrayMenuItem::tag() const
-{
-    return m_tag;
-}
-
-QAction *SystemTrayMenuItem::action() const
-{
-    return m_action;
-}
-
-LXQtSystemTrayIcon::LXQtSystemTrayIcon()
-    : QPlatformSystemTrayIcon(),
-    mSni(nullptr)
-{
-    // register types
-    qDBusRegisterMetaType<ToolTip>();
-    qDBusRegisterMetaType<IconPixmap>();
-    qDBusRegisterMetaType<IconPixmapList>();
-}
-
-LXQtSystemTrayIcon::~LXQtSystemTrayIcon()
-{
-}
-
-void LXQtSystemTrayIcon::init()
-{
-    if (!mSni)
-    {
-        mSni = new StatusNotifierItem(QString::number(QCoreApplication::applicationPid()), this);
-        mSni->setTitle(QApplication::applicationDisplayName());
-
-        // default menu
-        QPlatformMenu *menu = createMenu();
-        menu->setParent(mSni);
-        QPlatformMenuItem *menuItem = menu->createMenuItem();
-        menuItem->setParent(menu);
-        menuItem->setText(tr("Quit"));
-        menuItem->setIcon(QIcon::fromTheme("application-exit"));
-        connect(menuItem, &QPlatformMenuItem::activated, qApp, &QApplication::quit);
-        menu->insertMenuItem(menuItem, nullptr);
-        updateMenu(menu);
-
-        connect(mSni, &StatusNotifierItem::activateRequested, [this](const QPoint &)
-        {
-            Q_EMIT activated(QPlatformSystemTrayIcon::Trigger);
-        });
-
-        connect(mSni, &StatusNotifierItem::secondaryActivateRequested, [this](const QPoint &)
-        {
-            Q_EMIT activated(QPlatformSystemTrayIcon::MiddleClick);
-        });
-    }
-}
-
-void LXQtSystemTrayIcon::cleanup()
-{
-    delete mSni;
-    mSni = nullptr;
-}
-
-void LXQtSystemTrayIcon::updateIcon(const QIcon &icon)
-{
-    if (!mSni)
-        return;
-
-    if (icon.name().isEmpty())
-    {
-        mSni->setIconByPixmap(icon);
-        mSni->setToolTipIconByPixmap(icon);
-    }
-    else
-    {
-        mSni->setIconByName(icon.name());
-        mSni->setToolTipIconByName(icon.name());
-    }
-}
-
-void LXQtSystemTrayIcon::updateToolTip(const QString &tooltip)
-{
-    if (!mSni)
-        return;
-
-    mSni->setToolTipTitle(tooltip);
-}
-
-void LXQtSystemTrayIcon::updateMenu(QPlatformMenu *menu)
-{
-    if (!mSni)
-        return;
-
-    if (SystemTrayMenu *ourMenu = qobject_cast<SystemTrayMenu*>(menu))
-        mSni->setContextMenu(ourMenu->menu());
-}
-
-QPlatformMenu *LXQtSystemTrayIcon::createMenu() const
-{
-    return new SystemTrayMenu();
-}
-
-QRect LXQtSystemTrayIcon::geometry() const
-{
-    // StatusNotifierItem doesn't provide the geometry
-    return QRect();
-}
-
-void LXQtSystemTrayIcon::showMessage(const QString &title, const QString &msg,
-                                     const QIcon &icon, MessageIcon, int secs)
-{
-    if (!mSni)
-        return;
-
-    mSni->showMessage(title, msg, icon.name(), secs);
-}
-
-bool LXQtSystemTrayIcon::isSystemTrayAvailable() const
-{
-    QDBusInterface systrayHost("org.kde.StatusNotifierWatcher",
-                               "/StatusNotifierWatcher",
-                               "org.kde.StatusNotifierWatcher");
-
-    return systrayHost.isValid() && systrayHost.property("IsStatusNotifierHostRegistered").toBool();
-}
-
-bool LXQtSystemTrayIcon::supportsMessages() const
-{
-    return true;
-}

src/lxqtsystemtrayicon.h

@@ -1,124 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXQt - a lightweight, Qt based, desktop toolset
- * http://lxqt.org/
- *
- * Copyright: 2015 LXQt team
- * Authors:
- *   Paulo Lieuthier <paulolieuthier@gmail.com>
- *
- * This program or 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 Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- *
- * END_COMMON_COPYRIGHT_HEADER */
-
-#ifndef LXQTSYSTEMTRAYICON_H
-#define LXQTSYSTEMTRAYICON_H
-
-#include <qpa/qplatformmenu.h>
-#include <qpa/qplatformsystemtrayicon.h>
-
-#include "statusnotifieritem/statusnotifieritem.h"
-
-class SystemTrayMenuItem;
-class QAction;
-class QMenu;
-
-class SystemTrayMenu : public QPlatformMenu
-{
-    Q_OBJECT
-public:
-    SystemTrayMenu();
-    ~SystemTrayMenu() Q_DECL_OVERRIDE;
-    void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) Q_DECL_OVERRIDE;
-    QPlatformMenuItem *menuItemAt(int position) const Q_DECL_OVERRIDE;
-    QPlatformMenuItem *menuItemForTag(quintptr tag) const Q_DECL_OVERRIDE;
-    void removeMenuItem(QPlatformMenuItem *menuItem) Q_DECL_OVERRIDE;
-    void setEnabled(bool enabled) Q_DECL_OVERRIDE;
-    void setIcon(const QIcon &icon) Q_DECL_OVERRIDE;
-    void setTag(quintptr tag) Q_DECL_OVERRIDE;
-    void setText(const QString &text) Q_DECL_OVERRIDE;
-    void setVisible(bool visible) Q_DECL_OVERRIDE;
-    void syncMenuItem(QPlatformMenuItem *menuItem) Q_DECL_OVERRIDE;
-    void syncSeparatorsCollapsible(bool enable) Q_DECL_OVERRIDE;
-    quintptr tag() const Q_DECL_OVERRIDE;
-    QPlatformMenuItem *createMenuItem() const Q_DECL_OVERRIDE;
-
-    QMenu *menu() const;
-
-private:
-    quintptr m_tag;
-    QPointer<QMenu> m_menu;
-    QList<SystemTrayMenuItem*> m_items;
-};
-
-class SystemTrayMenuItem : public QPlatformMenuItem
-{
-    Q_OBJECT
-public:
-    SystemTrayMenuItem();
-    ~SystemTrayMenuItem() Q_DECL_OVERRIDE;
-    void setCheckable(bool checkable) Q_DECL_OVERRIDE;
-    void setChecked(bool isChecked) Q_DECL_OVERRIDE;
-    void setEnabled(bool enabled) Q_DECL_OVERRIDE;
-    void setFont(const QFont &font) Q_DECL_OVERRIDE;
-    void setIcon(const QIcon &icon) Q_DECL_OVERRIDE;
-    void setIsSeparator(bool isSeparator) Q_DECL_OVERRIDE;
-    void setMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE;
-    void setRole(MenuRole role) Q_DECL_OVERRIDE;
-    void setShortcut(const QKeySequence &shortcut) Q_DECL_OVERRIDE;
-    void setTag(quintptr tag) Q_DECL_OVERRIDE;
-    void setText(const QString &text) Q_DECL_OVERRIDE;
-    void setVisible(bool isVisible) Q_DECL_OVERRIDE;
-    quintptr tag() const Q_DECL_OVERRIDE;
-    void setIconSize(int size)
-    #if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
-    Q_DECL_OVERRIDE
-    #endif
-    ;
-
-    QAction *action() const;
-
-private:
-    quintptr m_tag;
-    QAction *m_action;
-};
-
-class LXQtSystemTrayIcon : public QPlatformSystemTrayIcon
-{
-public:
-    LXQtSystemTrayIcon();
-    ~LXQtSystemTrayIcon() Q_DECL_OVERRIDE;
-
-    void init() Q_DECL_OVERRIDE;
-    void cleanup() Q_DECL_OVERRIDE;
-    void updateIcon(const QIcon &icon) Q_DECL_OVERRIDE;
-    void updateToolTip(const QString &tooltip) Q_DECL_OVERRIDE;
-    void updateMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE;
-    QRect geometry() const Q_DECL_OVERRIDE;
-    void showMessage(const QString &title, const QString &msg,
-                     const QIcon &icon, MessageIcon iconType, int secs) Q_DECL_OVERRIDE;
-
-    bool isSystemTrayAvailable() const Q_DECL_OVERRIDE;
-    bool supportsMessages() const Q_DECL_OVERRIDE;
-
-    QPlatformMenu *createMenu() const Q_DECL_OVERRIDE;
-
-private:
-    StatusNotifierItem *mSni;
-};
-
-#endif

src/main.cpp

@@ -1,50 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXDE-Qt - a lightweight, Qt based, desktop toolset
- * http://lxde.org/
- *
- * Copyright: 2014 LXQt team
- * Authors:
- *   Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
- *
- * This program or 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 Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- *
- * END_COMMON_COPYRIGHT_HEADER */
-
-// NOTE: To load the plugin, we can set environment variable QT_QPA_PLATFORMTHEME=lxqt
-
-#include <qpa/qplatformthemeplugin.h>
-#include "lxqtplatformtheme.h"
-
-QT_BEGIN_NAMESPACE
-
-class LXQtPlatformThemePlugin: public QPlatformThemePlugin {
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformThemeFactoryInterface.5.1" FILE "lxqtplatformtheme.json")
-public:
-    QPlatformTheme *create(const QString &key, const QStringList &params);
-};
-
-QPlatformTheme *LXQtPlatformThemePlugin::create(const QString &key, const QStringList &params) {
-    if (!key.compare(QLatin1String("lxqt"), Qt::CaseInsensitive))
-        return new LXQtPlatformTheme();
-    return NULL;
-}
-
-QT_END_NAMESPACE
-
-#include "main.moc"

src/statusnotifieritem/dbustypes.cpp

@@ -1,75 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXDE-Qt - a lightweight, Qt based, desktop toolset
- * http://lxqt.org
- *
- * Copyright: 2015 LXQt team
- * Authors:
- *  Balázs Béla <balazsbela[at]gmail.com>
- *  Paulo Lieuthier <paulolieuthier@gmail.com>
- *
- * This program or 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 Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- *
- * END_COMMON_COPYRIGHT_HEADER */
-
-#include "dbustypes.h"
-
-// Marshall the IconPixmap data into a D-Bus argument
-QDBusArgument &operator<<(QDBusArgument &argument, const IconPixmap &icon)
-{
-    argument.beginStructure();
-    argument << icon.width;
-    argument << icon.height;
-    argument << icon.bytes;
-    argument.endStructure();
-    return argument;
-}
-
-// Retrieve the ImageStruct data from the D-Bus argument
-const QDBusArgument &operator>>(const QDBusArgument &argument, IconPixmap &icon)
-{
-    argument.beginStructure();
-    argument >> icon.width;
-    argument >> icon.height;
-    argument >> icon.bytes;
-    argument.endStructure();
-    return argument;
-}
-
-// Marshall the ToolTip data into a D-Bus argument
-QDBusArgument &operator<<(QDBusArgument &argument, const ToolTip &toolTip)
-{
-    argument.beginStructure();
-    argument << toolTip.iconName;
-    argument << toolTip.iconPixmap;
-    argument << toolTip.title;
-    argument << toolTip.description;
-    argument.endStructure();
-    return argument;
-}
-
-// Retrieve the ToolTip data from the D-Bus argument
-const QDBusArgument &operator>>(const QDBusArgument &argument, ToolTip &toolTip)
-{
-    argument.beginStructure();
-    argument >> toolTip.iconName;
-    argument >> toolTip.iconPixmap;
-    argument >> toolTip.title;
-    argument >> toolTip.description;
-    argument.endStructure();
-    return argument;
-}

src/statusnotifieritem/dbustypes.h

@@ -1,60 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXDE-Qt - a lightweight, Qt based, desktop toolset
- * http://lxqt.org
- *
- * Copyright: 2015 LXQt team
- * Authors:
- *  Balázs Béla <balazsbela[at]gmail.com>
- *  Paulo Lieuthier <paulolieuthier@gmail.com>
- *
- * This program or 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 Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- *
- * END_COMMON_COPYRIGHT_HEADER */
-
-#include <QDBusArgument>
-
-#ifndef DBUSTYPES_H
-#define DBUSTYPES_H
-
-struct IconPixmap {
-    int width;
-    int height;
-    QByteArray bytes;
-};
-
-typedef QList<IconPixmap> IconPixmapList;
-
-Q_DECLARE_METATYPE(IconPixmap)
-Q_DECLARE_METATYPE(IconPixmapList)
-
-struct ToolTip {
-    QString iconName;
-    QList<IconPixmap> iconPixmap;
-    QString title;
-    QString description;
-};
-
-Q_DECLARE_METATYPE(ToolTip)
-
-QDBusArgument &operator<<(QDBusArgument &argument, const IconPixmap &icon);
-const QDBusArgument &operator>>(const QDBusArgument &argument, IconPixmap &icon);
-
-QDBusArgument &operator<<(QDBusArgument &argument, const ToolTip &toolTip);
-const QDBusArgument &operator>>(const QDBusArgument &argument, ToolTip &toolTip);
-
-#endif // DBUSTYPES_H

src/statusnotifieritem/org.kde.StatusNotifierItem.xml

@@ -1,69 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.kde.StatusNotifierItem">
-
-    <property name="Category" type="s" access="read"/>
-    <property name="Id" type="s" access="read"/>
-    <property name="Title" type="s" access="read"/>
-    <property name="Status" type="s" access="read"/>
-    <property name="WindowId" type="i" access="read"/>
-    <property name="IconThemePath" type="s" access="read"/>
-    <property name="Menu" type="o" access="read"/>
-    <property name="ItemIsMenu" type="b" access="read"/>
-    <property name="IconName" type="s" access="read"/>
-    <property name="IconPixmap" type="a(iiay)" access="read">
-      <annotation name="org.qtproject.QtDBus.QtTypeName" value="IconPixmapList"/>
-    </property>
-    <property name="OverlayIconName" type="s" access="read"/>
-    <property name="OverlayIconPixmap" type="a(iiay)" access="read">
-      <annotation name="org.qtproject.QtDBus.QtTypeName" value="IconPixmapList"/>
-    </property>
-    <property name="AttentionIconName" type="s" access="read"/>
-    <property name="AttentionIconPixmap" type="a(iiay)" access="read">
-      <annotation name="org.qtproject.QtDBus.QtTypeName" value="IconPixmapList"/>
-    </property>
-    <property name="AttentionMovieName" type="s" access="read"/>
-    <property name="ToolTip" type="(sa(iiay)ss)" access="read">
-      <annotation name="org.qtproject.QtDBus.QtTypeName" value="ToolTip"/>
-    </property>
-    <method name="ContextMenu">
-        <arg name="x" type="i" direction="in"/>
-        <arg name="y" type="i" direction="in"/>
-    </method>
-
-    <method name="Activate">
-        <arg name="x" type="i" direction="in"/>
-        <arg name="y" type="i" direction="in"/>
-    </method>
-
-    <method name="SecondaryActivate">
-        <arg name="x" type="i" direction="in"/>
-        <arg name="y" type="i" direction="in"/>
-    </method>
-
-    <method name="Scroll">
-      <arg name="delta" type="i" direction="in"/>
-      <arg name="orientation" type="s" direction="in"/>
-    </method>
-
-    <signal name="NewTitle">
-    </signal>
-
-    <signal name="NewIcon">
-    </signal>
-
-    <signal name="NewAttentionIcon">
-    </signal>
-
-    <signal name="NewOverlayIcon">
-    </signal>
-
-    <signal name="NewToolTip">
-    </signal>
-
-    <signal name="NewStatus">
-      <arg name="status" type="s"/>
-    </signal>
-
-  </interface>
-</node>

src/statusnotifieritem/statusnotifieritem.cpp

@@ -1,322 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXQt - a lightweight, Qt based, desktop toolset
- * http://lxqt.org/
- *
- * Copyright: 2015 LXQt team
- * Authors:
- *   Paulo Lieuthier <paulolieuthier@gmail.com>
- *
- * This program or 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 Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- *
- * END_COMMON_COPYRIGHT_HEADER */
-
-#include "statusnotifieritem.h"
-#include "statusnotifieritemadaptor.h"
-#include <QDBusInterface>
-#include <QDBusServiceWatcher>
-#include <dbusmenu-qt5/dbusmenuexporter.h>
-
-int StatusNotifierItem::mServiceCounter = 0;
-
-StatusNotifierItem::StatusNotifierItem(QString id, QObject *parent)
-    : QObject(parent),
-    mAdaptor(new StatusNotifierItemAdaptor(this)),
-    mService(QString("org.freedesktop.StatusNotifierItem-%1-%2")
-             .arg(QCoreApplication::applicationPid())
-             .arg(++mServiceCounter)),
-    mId(id),
-    mTitle("Test"),
-    mStatus("Active"),
-    mMenu(nullptr),
-    mMenuExporter(nullptr),
-    mSessionBus(QDBusConnection::connectToBus(QDBusConnection::SessionBus, mService))
-{
-    // Separate DBus connection to the session bus is created, because QDbus does not provide
-    // a way to register different objects for different services with the same paths.
-    // For status notifiers we need different /StatusNotifierItem for each service.
-
-    // register service
-
-    mSessionBus.registerService(mService);
-    mSessionBus.registerObject(QLatin1String("/StatusNotifierItem"), this);
-
-    registerToHost();
-
-    // monitor the watcher service in case the host restarts
-    QDBusServiceWatcher *watcher = new QDBusServiceWatcher("org.kde.StatusNotifierWatcher",
-                                                           mSessionBus,
-                                                           QDBusServiceWatcher::WatchForOwnerChange,
-                                                           this);
-    connect(watcher, &QDBusServiceWatcher::serviceOwnerChanged,
-            this, &StatusNotifierItem::onServiceOwnerChanged);
-}
-
-StatusNotifierItem::~StatusNotifierItem()
-{
-    mSessionBus.unregisterObject(QLatin1String("/StatusNotifierItem"));
-    mSessionBus.unregisterService(mService);
-    QDBusConnection::disconnectFromBus(mService);
-}
-
-void StatusNotifierItem::registerToHost()
-{
-    QDBusInterface interface("org.kde.StatusNotifierWatcher",
-                             "/StatusNotifierWatcher",
-                             "org.kde.StatusNotifierWatcher",
-                             mSessionBus);
-    interface.asyncCall("RegisterStatusNotifierItem", mService);
-}
-
-void StatusNotifierItem::onServiceOwnerChanged(const QString& service, const QString& oldOwner,
-                                               const QString& newOwner)
-{
-	Q_UNUSED(service);
-	Q_UNUSED(oldOwner);
-
-    if (!newOwner.isEmpty())
-        registerToHost();
-}
-
-void StatusNotifierItem::onMenuDestroyed()
-{
-    mMenu = nullptr;
-    mMenuExporter = nullptr; //mMenu is a QObject parent of the mMenuExporter
-}
-
-void StatusNotifierItem::setTitle(const QString &title)
-{
-    if (mTitle == title)
-        return;
-
-    mTitle = title;
-    Q_EMIT mAdaptor->NewTitle();
-}
-
-void StatusNotifierItem::setStatus(const QString &status)
-{
-    if (mStatus == status)
-        return;
-
-    mStatus = status;
-    Q_EMIT mAdaptor->NewStatus(mStatus);
-}
-
-void StatusNotifierItem::setMenuPath(const QString& path)
-{
-    mMenuPath.setPath(path);
-}
-
-void StatusNotifierItem::setIconByName(const QString &name)
-{
-    if (mIconName == name)
-        return;
-
-    mIconName = name;
-    Q_EMIT mAdaptor->NewIcon();
-}
-
-void StatusNotifierItem::setIconByPixmap(const QIcon &icon)
-{
-    if (mIconCacheKey == icon.cacheKey())
-        return;
-
-    mIconCacheKey = icon.cacheKey();
-    mIcon = iconToPixmapList(icon);
-    mIconName.clear();
-    Q_EMIT mAdaptor->NewIcon();
-}
-
-void StatusNotifierItem::setOverlayIconByName(const QString &name)
-{
-    if (mOverlayIconName == name)
-        return;
-
-    mOverlayIconName = name;
-    Q_EMIT mAdaptor->NewOverlayIcon();
-}
-
-void StatusNotifierItem::setOverlayIconByPixmap(const QIcon &icon)
-{
-    if (mOverlayIconCacheKey == icon.cacheKey())
-        return;
-
-    mOverlayIconCacheKey = icon.cacheKey();
-    mOverlayIcon = iconToPixmapList(icon);
-    mOverlayIconName.clear();
-    Q_EMIT mAdaptor->NewOverlayIcon();
-}
-
-void StatusNotifierItem::setAttentionIconByName(const QString &name)
-{
-    if (mAttentionIconName == name)
-        return;
-
-    mAttentionIconName = name;
-    Q_EMIT mAdaptor->NewAttentionIcon();
-}
-
-void StatusNotifierItem::setAttentionIconByPixmap(const QIcon &icon)
-{
-    if (mAttentionIconCacheKey == icon.cacheKey())
-        return;
-
-    mAttentionIconCacheKey = icon.cacheKey();
-    mAttentionIcon = iconToPixmapList(icon);
-    mAttentionIconName.clear();
-    Q_EMIT mAdaptor->NewAttentionIcon();
-}
-
-void StatusNotifierItem::setToolTipTitle(const QString &title)
-{
-    if (mTooltipTitle == title)
-        return;
-
-    mTooltipTitle = title;
-    Q_EMIT mAdaptor->NewToolTip();
-}
-
-void StatusNotifierItem::setToolTipSubTitle(const QString &subTitle)
-{
-    if (mTooltipSubtitle == subTitle)
-        return;
-
-    mTooltipSubtitle = subTitle;
-    Q_EMIT mAdaptor->NewToolTip();
-}
-
-void StatusNotifierItem::setToolTipIconByName(const QString &name)
-{
-    if (mTooltipIconName == name)
-        return;
-
-    mTooltipIconName = name;
-    Q_EMIT mAdaptor->NewToolTip();
-}
-
-void StatusNotifierItem::setToolTipIconByPixmap(const QIcon &icon)
-{
-    if (mTooltipIconCacheKey == icon.cacheKey())
-        return;
-
-    mTooltipIconCacheKey = icon.cacheKey();
-    mTooltipIcon = iconToPixmapList(icon);
-    mTooltipIconName.clear();
-    Q_EMIT mAdaptor->NewToolTip();
-}
-
-void StatusNotifierItem::setContextMenu(QMenu* menu)
-{
-    if (mMenu == menu)
-        return;
-
-    if (nullptr != mMenu)
-    {
-        disconnect(mMenu, &QObject::destroyed, this, &StatusNotifierItem::onMenuDestroyed);
-    }
-    mMenu = menu;
-
-    setMenuPath("/MenuBar");
-    //Note: we need to destroy menu exporter before creating new one -> to free the DBus object path for new menu
-    delete mMenuExporter;
-    if (nullptr != mMenu)
-    {
-        connect(mMenu, &QObject::destroyed, this, &StatusNotifierItem::onMenuDestroyed);
-        mMenuExporter = new DBusMenuExporter{this->menu().path(), mMenu, mSessionBus};
-    }
-}
-
-void StatusNotifierItem::Activate(int x, int y)
-{
-    if (mStatus == "NeedsAttention")
-        mStatus = "Active";
-
-    Q_EMIT activateRequested(QPoint(x, y));
-}
-
-void StatusNotifierItem::SecondaryActivate(int x, int y)
-{
-    if (mStatus == "NeedsAttention")
-        mStatus = "Active";
-
-    Q_EMIT secondaryActivateRequested(QPoint(x, y));
-}
-
-void StatusNotifierItem::ContextMenu(int x, int y)
-{
-    if (mMenu)
-    {
-        if (mMenu->isVisible())
-            mMenu->popup(QPoint(x, y));
-        else
-            mMenu->hide();
-    }
-}
-
-void StatusNotifierItem::Scroll(int delta, const QString &orientation)
-{
-    Qt::Orientation orient = Qt::Vertical;
-    if (orientation.toLower() == "horizontal")
-        orient = Qt::Horizontal;
-
-    Q_EMIT scrollRequested(delta, orient);
-}
-
-void StatusNotifierItem::showMessage(const QString& title, const QString& msg,
-                                     const QString& iconName, int secs)
-{
-    QDBusInterface interface("org.freedesktop.Notifications", "/org/freedesktop/Notifications",
-                             "org.freedesktop.Notifications", mSessionBus);
-    interface.call("Notify", mTitle, (uint) 0, iconName, title,
-                   msg, QStringList(), QVariantMap(), secs);
-}
-
-IconPixmapList StatusNotifierItem::iconToPixmapList(const QIcon& icon)
-{
-    IconPixmapList pixmapList;
-
-    // long live KDE!
-    const QList<QSize> sizes = icon.availableSizes();
-    for (const QSize &size : sizes)
-    {
-        QImage image = icon.pixmap(size).toImage();
-
-        IconPixmap pix;
-        pix.height = image.height();
-        pix.width = image.width();
-
-        if (image.format() != QImage::Format_ARGB32)
-            image = image.convertToFormat(QImage::Format_ARGB32);
-
-        pix.bytes = QByteArray((char *) image.bits(), image.byteCount());
-
-        // swap to network byte order if we are little endian
-        if (QSysInfo::ByteOrder == QSysInfo::LittleEndian)
-        {
-            quint32 *uintBuf = (quint32 *) pix.bytes.data();
-            for (uint i = 0; i < pix.bytes.size() / sizeof(quint32); ++i)
-            {
-                *uintBuf = qToBigEndian(*uintBuf);
-                ++uintBuf;
-            }
-        }
-
-        pixmapList.append(pix);
-    }
-
-    return pixmapList;
-}

src/statusnotifieritem/statusnotifieritem.h

@@ -1,185 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXQt - a lightweight, Qt based, desktop toolset
- * http://lxqt.org/
- *
- * Copyright: 2015 LXQt team
- * Authors:
- *   Paulo Lieuthier <paulolieuthier@gmail.com>
- *
- * This program or 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 Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- *
- * END_COMMON_COPYRIGHT_HEADER */
-
-
-#ifndef STATUS_NOTIFIER_ITEM_H
-#define STATUS_NOTIFIER_ITEM_H
-
-#include <QObject>
-#include <QIcon>
-#include <QMenu>
-#include <QDBusConnection>
-
-#include "dbustypes.h"
-
-class StatusNotifierItemAdaptor;
-class DBusMenuExporter;
-
-class StatusNotifierItem : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString Title READ title)
-    Q_PROPERTY(QString Id READ id)
-    Q_PROPERTY(QString Status READ status)
-    Q_PROPERTY(QDBusObjectPath Menu READ menu)
-
-    Q_PROPERTY(QString IconName READ iconName)
-    Q_PROPERTY(IconPixmapList IconPixmap READ iconPixmap)
-
-    Q_PROPERTY(QString OverlayIconName READ overlayIconName)
-    Q_PROPERTY(IconPixmapList OverlayIconPixmap READ overlayIconPixmap)
-
-    Q_PROPERTY(QString AttentionIconName READ attentionIconName)
-    Q_PROPERTY(IconPixmapList AttentionIconPixmap READ attentionIconPixmap)
-
-    Q_PROPERTY(ToolTip ToolTip READ toolTip)
-
-public:
-    StatusNotifierItem(QString id, QObject *parent = nullptr);
-    ~StatusNotifierItem();
-
-    QString id() const
-    { return mId; }
-
-    QString title() const
-    { return mTitle; }
-    void setTitle(const QString &title);
-
-    QString status() const
-    { return mStatus; }
-    void setStatus(const QString &status);
-
-    QDBusObjectPath menu() const
-    { return mMenuPath; }
-    void setMenuPath(const QString &path);
-
-    QString iconName() const
-    { return mIconName; }
-    void setIconByName(const QString &name);
-
-    IconPixmapList iconPixmap() const
-    { return mIcon; }
-    void setIconByPixmap(const QIcon &icon);
-
-    QString overlayIconName() const
-    { return mOverlayIconName; }
-    void setOverlayIconByName(const QString &name);
-
-    IconPixmapList overlayIconPixmap() const
-    { return mOverlayIcon; }
-    void setOverlayIconByPixmap(const QIcon &icon);
-
-    QString attentionIconName() const
-    { return mAttentionIconName; }
-    void setAttentionIconByName(const QString &name);
-
-    IconPixmapList attentionIconPixmap() const
-    { return mAttentionIcon; }
-    void setAttentionIconByPixmap(const QIcon &icon);
-
-    QString toolTipTitle() const
-    { return mTooltipTitle; }
-    void setToolTipTitle(const QString &title);
-
-    QString toolTipSubTitle() const
-    { return mTooltipSubtitle; }
-    void setToolTipSubTitle(const QString &subTitle);
-
-    QString toolTipIconName() const
-    { return mTooltipIconName; }
-    void setToolTipIconByName(const QString &name);
-
-    IconPixmapList toolTipIconPixmap() const
-    { return mTooltipIcon; }
-    void setToolTipIconByPixmap(const QIcon &icon);
-
-    ToolTip toolTip() const
-    {
-        ToolTip tt;
-        tt.title = mTooltipTitle;
-        tt.description = mTooltipSubtitle;
-        tt.iconName = mTooltipIconName;
-        tt.iconPixmap = mTooltipIcon;
-        return tt;
-    }
-
-    /*!
-     * \Note: we don't take ownership for the \param menu
-     */
-    void setContextMenu(QMenu *menu);
-
-public Q_SLOTS:
-    void Activate(int x, int y);
-    void SecondaryActivate(int x, int y);
-    void ContextMenu(int x, int y);
-    void Scroll(int delta, const QString &orientation);
-
-    void showMessage(const QString &title, const QString &msg, const QString &iconName, int secs);
-
-private:
-    void registerToHost();
-    IconPixmapList iconToPixmapList(const QIcon &icon);
-
-private Q_SLOTS:
-    void onServiceOwnerChanged(const QString &service, const QString &oldOwner,
-                               const QString &newOwner);
-    void onMenuDestroyed();
-
-Q_SIGNALS:
-    void activateRequested(const QPoint &pos);
-    void secondaryActivateRequested(const QPoint &pos);
-    void scrollRequested(int delta, Qt::Orientation orientation);
-
-private:
-    StatusNotifierItemAdaptor *mAdaptor;
-
-    QString mService;
-    QString mId;
-    QString mTitle;
-    QString mStatus;
-
-    // icons
-    QString mIconName, mOverlayIconName, mAttentionIconName;
-    IconPixmapList mIcon, mOverlayIcon, mAttentionIcon;
-    qint64 mIconCacheKey, mOverlayIconCacheKey, mAttentionIconCacheKey;
-
-    // tooltip
-    QString mTooltipTitle, mTooltipSubtitle, mTooltipIconName;
-    IconPixmapList mTooltipIcon;
-    qint64 mTooltipIconCacheKey;
-
-    // menu
-    QMenu *mMenu;
-    QDBusObjectPath mMenuPath;
-    DBusMenuExporter *mMenuExporter;
-    QDBusConnection mSessionBus;
-
-    static int mServiceCounter;
-};
-
-#endif