Apply upstream patch fixing a crash on a custom command.

Move qeyes-types README file to where it belongs
Remove a moved directory from the lxqt-panel.install
944 changed files with 389 additions and 45588 deletions
--- a/10
+++ b/10
@ -1,10 +0,0 @@
-Upstream Authors:
-    LXQt team: http://lxqt.org
-    Razor team: http://razor-qt.org
-
-Copyright:
-    Copyright (c) 2010-2012 Razor team
-    Copyright (c) 2012-2017 LXQt team
-
-License: LGPL-2.1+
-The full text of the licenses can be found in the 'COPYING' file.
--- a/1528
+++ b/1528
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,277 +0,0 @@
-cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
-project(lxqt-panel)
-
-option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
-option(PULL_TRANSLATIONS "Pull translations" ON)
-option(WITH_SCREENSAVER_FALLBACK "Include support for converting the deprecated 'screensaver' plugin to 'quicklaunch'. This requires the lxqt-leave (lxqt-session) to be installed in runtime." ON)
-
-# additional cmake files
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-
-if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE Release)
-endif()
-
-include(CheckCXXCompilerFlag)
-CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
-CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
-if(COMPILER_SUPPORTS_CXX11)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-elseif(COMPILER_SUPPORTS_CXX0X)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-else()
-    message(FATAL "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. C++11 support is required")
-endif()
-
-macro(setByDefault VAR_NAME VAR_VALUE)
-  if(NOT DEFINED ${VAR_NAME})
-    set (${VAR_NAME} ${VAR_VALUE})
-  endif(NOT DEFINED ${VAR_NAME})
-endmacro()
-
-# use gcc visibility feature to decrease unnecessary exported symbols
-if (CMAKE_COMPILER_IS_GNUCXX)
-  # set visibility to hidden to hide symbols, unlesss they're exporeted manually in the code
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -fno-exceptions")
-  # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-no-undefined")
-endif()
-
-#########################################################################
-
-add_definitions (-Wall)
-include(GNUInstallDirs)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-find_package(Qt5Widgets REQUIRED)
-find_package(Qt5DBus REQUIRED)
-find_package(Qt5LinguistTools REQUIRED)
-find_package(Qt5Xml REQUIRED)
-find_package(Qt5X11Extras REQUIRED)
-find_package(KF5WindowSystem REQUIRED)
-
-find_package(lxqt REQUIRED)
-find_package(lxqt-globalkeys REQUIRED)
-find_package(lxqt-globalkeys-ui REQUIRED)
-
-# Patch Version
-set(LXQT_PANEL_PATCH_VERSION 0)
-
-set(LXQT_PANEL_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_PANEL_PATCH_VERSION})
-add_definitions("-DLXQT_PANEL_VERSION=\"${LXQT_PANEL_VERSION}\"")
-
-include(LXQtTranslate)
-
-# Warning: This must be before add_subdirectory(panel). Move with caution.
-set(PLUGIN_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/lxqt-panel")
-add_definitions(
-    -DPLUGIN_DIR=\"${PLUGIN_DIR}\"
-    -DQT_USE_QSTRINGBUILDER
-)
-message(STATUS "Panel plugins location: ${PLUGIN_DIR}")
-
-#########################################################################
-
-# Plugin system
-# You can enable/disable building of the plugin using cmake options.
-#    cmake -DCLOCK_PLUGIN=Yes .. # Enable clock plugin
-#    cmake -DCLOCK_PLUGIN=No ..  # Disable clock plugin
-
-include("cmake/BuildPlugin.cmake")
-
-set(ENABLED_PLUGINS) # list of enabled plugins
-set(STATIC_PLUGINS) # list of statically linked plugins
-
-setByDefault(CLOCK_PLUGIN Yes)
-if(CLOCK_PLUGIN)
-    list(APPEND STATIC_PLUGINS "clock")
-    add_definitions(-DWITH_CLOCK_PLUGIN)
-    list(APPEND ENABLED_PLUGINS "Clock")
-    add_subdirectory(plugin-clock)
-endif()
-
-setByDefault(COLORPICKER_PLUGIN Yes)
-if(COLORPICKER_PLUGIN)
-    list(APPEND ENABLED_PLUGINS "Color Picker")
-    add_subdirectory(plugin-colorpicker)
-endif()
-
-setByDefault(CPULOAD_PLUGIN Yes)
-if(CPULOAD_PLUGIN)
-    find_library(STATGRAB_LIB statgrab)
-
-    if(NOT STATGRAB_LIB)
-        message(FATAL_ERROR "CPU Load plugin requires libstatgrab")
-    endif()
-    list(APPEND ENABLED_PLUGINS "Cpu Load")
-    add_subdirectory(plugin-cpuload)
-endif()
-
-setByDefault(DIRECTORYMENU_PLUGIN Yes)
-if(DIRECTORYMENU_PLUGIN)
-    list(APPEND ENABLED_PLUGINS "Directory menu")
-    add_subdirectory(plugin-directorymenu)
-endif()
-
-setByDefault(DOM_PLUGIN No)
-if(DOM_PLUGIN)
-    list(APPEND ENABLED_PLUGINS "DOM")
-    add_subdirectory(plugin-dom)
-endif(DOM_PLUGIN)
-
-setByDefault(DESKTOPSWITCH_PLUGIN Yes)
-if(DESKTOPSWITCH_PLUGIN)
-    list(APPEND STATIC_PLUGINS "desktopswitch")
-    add_definitions(-DWITH_DESKTOPSWITCH_PLUGIN)
-    list(APPEND ENABLED_PLUGINS "Desktop Switcher")
-    add_subdirectory(plugin-desktopswitch)
-endif()
-
-setByDefault(KBINDICATOR_PLUGIN Yes)
-if(KBINDICATOR_PLUGIN)
-    list(APPEND ENABLED_PLUGINS "Keyboard Indicator")
-    add_subdirectory(plugin-kbindicator)
-endif(KBINDICATOR_PLUGIN)
-
-setByDefault(MAINMENU_PLUGIN Yes)
-if(MAINMENU_PLUGIN)
-    list(APPEND STATIC_PLUGINS "mainmenu")
-    add_definitions(-DWITH_MAINMENU_PLUGIN)
-    list(APPEND ENABLED_PLUGINS "Application menu")
-    add_subdirectory(plugin-mainmenu)
-endif()
-
-setByDefault(MOUNT_PLUGIN Yes)
-if(MOUNT_PLUGIN)
-    list(APPEND ENABLED_PLUGINS "Mount")
-    add_subdirectory(plugin-mount)
-endif(MOUNT_PLUGIN)
-
-setByDefault(QUICKLAUNCH_PLUGIN Yes)
-if(QUICKLAUNCH_PLUGIN)
-    list(APPEND STATIC_PLUGINS "quicklaunch")
-    add_definitions(-DWITH_QUICKLAUNCH_PLUGIN)
-    list(APPEND ENABLED_PLUGINS "Quicklaunch")
-    add_subdirectory(plugin-quicklaunch)
-endif()
-
-setByDefault(SENSORS_PLUGIN Yes)
-if(SENSORS_PLUGIN)
-    find_library(SENSORS_LIB sensors)
-
-    if(NOT SENSORS_LIB)
-        message(FATAL_ERROR "Sensors plugin requires lm_sensors")
-    endif()
-    list(APPEND ENABLED_PLUGINS "Sensors")
-    add_subdirectory(plugin-sensors)
-endif()
-
-setByDefault(SHOWDESKTOP_PLUGIN Yes)
-if(SHOWDESKTOP_PLUGIN)
-    list(APPEND STATIC_PLUGINS "showdesktop")
-    add_definitions(-DWITH_SHOWDESKTOP_PLUGIN)
-    list(APPEND ENABLED_PLUGINS "Show Desktop")
-    add_subdirectory(plugin-showdesktop)
-endif()
-
-setByDefault(NETWORKMONITOR_PLUGIN Yes)
-if(NETWORKMONITOR_PLUGIN)
-    find_library(STATGRAB_LIB statgrab)
-
-    if(NOT STATGRAB_LIB)
-        message(FATAL_ERROR "Network Monitor plugin requires libstatgrab")
-    endif()
-    list(APPEND ENABLED_PLUGINS "Network Monitor")
-    add_subdirectory(plugin-networkmonitor)
-endif()
-
-setByDefault(SYSSTAT_PLUGIN Yes)
-if(SYSSTAT_PLUGIN)
-    list(APPEND ENABLED_PLUGINS "System Stats")
-    add_subdirectory(plugin-sysstat)
-endif(SYSSTAT_PLUGIN)
-
-setByDefault(TASKBAR_PLUGIN Yes)
-if(TASKBAR_PLUGIN)
-  list(APPEND STATIC_PLUGINS "taskbar")
-  add_definitions(-DWITH_TASKBAR_PLUGIN)
-  list(APPEND ENABLED_PLUGINS "Taskbar")
-  add_subdirectory(plugin-taskbar)
-endif()
-
-setByDefault(STATUSNOTIFIER_PLUGIN Yes)
-if(STATUSNOTIFIER_PLUGIN)
-    list(APPEND STATIC_PLUGINS "statusnotifier")
-    add_definitions(-DWITH_STATUSNOTIFIER_PLUGIN)
-    list(APPEND ENABLED_PLUGINS "Status Notifier")
-    add_subdirectory(plugin-statusnotifier)
-endif()
-
-setByDefault(TRAY_PLUGIN Yes)
-if(TRAY_PLUGIN)
-    list(APPEND STATIC_PLUGINS "tray")
-    add_definitions(-DWITH_TRAY_PLUGIN)
-    list(APPEND ENABLED_PLUGINS "System Tray")
-    add_subdirectory(plugin-tray)
-endif()
-
-setByDefault(VOLUME_PLUGIN Yes)
-setByDefault(VOLUME_USE_PULSEAUDIO Yes)
-setByDefault(VOLUME_USE_ALSA Yes)
-if(VOLUME_PLUGIN)
-    if (VOLUME_USE_PULSEAUDIO)
-        find_package(PulseAudio)
-        if (NOT PULSEAUDIO_FOUND)
-            message(FATAL_ERROR "PulseAudio not found, but required (VOLUME_USE_PULSEAUDIO) for Volume plugin!")
-        endif ()
-    endif(VOLUME_USE_PULSEAUDIO)
-
-    if(VOLUME_USE_ALSA)
-        find_package(ALSA)
-        if (NOT ALSA_FOUND)
-            message(FATAL_ERROR "ALSA not found, but required (VOLUME_USE_ALSA) for Volume plugin!")
-        endif ()
-    endif()
-
-    list(APPEND ENABLED_PLUGINS   "Volume")
-    message(STATUS "")
-    message(STATUS "Volume plugin will be built")
-    message(STATUS "    ALSA: ${ALSA_FOUND}")
-    message(STATUS "    PulseAudio: ${PULSEAUDIO_FOUND}")
-    message(STATUS "")
-    add_subdirectory(plugin-volume)
-endif()
-
-setByDefault(WORLDCLOCK_PLUGIN Yes)
-if(WORLDCLOCK_PLUGIN)
-    list(APPEND STATIC_PLUGINS "worldclock")
-    add_definitions(-DWITH_WORLDCLOCK_PLUGIN)
-    list(APPEND ENABLED_PLUGINS "World Clock")
-    add_subdirectory(plugin-worldclock)
-endif(WORLDCLOCK_PLUGIN)
-
-setByDefault(SPACER_PLUGIN Yes)
-if(SPACER_PLUGIN)
-    list(APPEND STATIC_PLUGINS "spacer")
-    add_definitions(-DWITH_SPACER_PLUGIN)
-    list(APPEND ENABLED_PLUGINS "Spacer")
-    add_subdirectory(plugin-spacer)
-endif()
-
-#########################################################################
-
-message(STATUS  "**************** The following plugins will be built ****************")
-foreach (PLUGIN_STR ${ENABLED_PLUGINS})
-    message(STATUS "  ${PLUGIN_STR}")
-endforeach()
-message(STATUS "*********************************************************************")
-
-add_subdirectory(panel)
-
-# merged from lxqt-common
-add_subdirectory(autostart)
-add_subdirectory(menu)
--- a/458
+++ b/458
@ -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
--- a/README.md
+++ b/README.md
@ -1,61 +0,0 @@
-# lxqt-panel
-
-## Overview
-
-`lxqt-panel` represents the taskbar of LXQt.
-
-The elements available in lxqt-panel are called "plugin" technically. This applies e. g. to the source code where they reside in directories `./plugin-<plugin>` like `plugin-mainmenu`. In contrast to this they are called "widgets" by the configuration GUI so far. Also, a more descriptive term is used to refer to distinct plugins within the GUI. E. g. the aforementioned `plugin-mainmenu` is called "Application menu" that way.   
-Configuration dialogue "Add Plugins", see [below](https://github.com/lxde/lxqt-panel#customizing), is listing all available plugins plus a short description and hence provides an overview of the available ones.   
-Notes on some of the plugins, sorted by terms used within the GUI in alphabetical order, technical term in parenthesis:
-
-#### Date & time (plugin-clock) / World clock (plugin-worldclock)
-
-Both provide clock and calendar functionality. plugin-worldclock can display various time zones in addition but lacks a tooltip displaying current date und time upon hovering.   
-These plugins will probably be merged into one, see https://github.com/lxde/lxqt/issues/312.   
-
-#### Quick launch (plugin-quicklaunch)
-
-A plugin to launch applications from the panel. By default it is empty and displays a message "Drop application icons here". Applications need to be available in panel's main menu and can be included into plugin-quicklaunch by drag & drop.
-
-#### Status Notifier Plugin (plugin-statusnotifier) / System Tray (plugin-tray)
-
-Both provide a notification area within the panel, that is an area where arbitrary applications can place informational icons. This is frequently used e. g. by chat or mail clients to inform about incoming messages or tools configuring the network to inform about connections. (So it's some kind of counterpart to the desktop notifications displayed by [lxqt-notificationd](https://github.com/lxde/lxqt-notificationd)).   
-The difference between the two plugins is a technical one. **plugin-tray** is implementing the so-called [System Tray Protocol](https://www.freedesktop.org/wiki/Specifications/systemtray-spec). It's a specification that has been around for years but has some serious technical limitations and in particular won't work under Wayland. **plugin-statusnotifier** on the other hand is implementing the so-called [StatusNotifierItem (SNI)](https://www.freedesktop.org/wiki/Specifications/StatusNotifierItem) specification which can be considered a successor of the System Tray Protocol.   
-Both plugins are maintained in parallel as not all relevant applications are compatible with SNI so far. In particular both Qt 4 and all GTK applications need some kind of wrapper to deal with it. Both plugins can be used in parallel without any issue, applications supporting both specifications will normally chose to display their icons in plugin-statusnotifier.
-
-#### Volume control (plugin-volume)
-
-As indicated by the name, a volume control. Technically Alsa, OSS and PulseAudio can be used as backend. The plugin itself is providing a control to adjust the main volume only but it allows for launching specific UIs of the backend in use like e. g. [pavucontrol-qt](https://github.com/lxde/pavucontrol-qt) to adjust PulseAudio.
-
-## Installation
-
-### Compiling source code
-
-The runtime dependencies are libxcomposite, libdbusmenu-qt5, KGuiAddons, KWindowSystem, Solid, menu-cache, lxmenu-data, [liblxqt](https://github.com/lxde/liblxqt) and [lxqt-globalkeys](https://github.com/lxde/lxqt-globalkeys).   
-Several plugins or features thereof are optional and need additional runtime dependencies. Namely these are (plugin / feature in parenthesis) Alsa library (Alsa support in plugin-volume), PulseAudio client library (PulseAudio support in plugin-volume), lm-sensors (plugin-sensors), libstatgrab (plugin-cpuload, plugin-networkmonitor), [libsysstat](https://github.com/lxde/libsysstat) (plugin-sysstat). All of them are enabled by default and have to be disabled by CMake variables as required, see below.   
-In addition CMake is a mandatory build dependency. Git is optionally needed to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxde/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information.   
-
-Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` has to be set to `/usr` on most operating systems, depending on the way library paths are dealt with on 64bit systems variables like CMAKE_INSTALL_LIBDIR may have to be set as well.   
-By default all available plugins and features thereof are built and CMake fails when dependencies aren't met. Building particular plugins can be disabled by boolean CMake variables `<plugin>_PLUGIN` where the plugin is referred by its technical term like e. g. in `SYSSTAT_PLUGIN`. Alsa and PulseAudio support in plugin-volume can be disabled by boolean CMake variables `VOLUME_USE_ALSA` and `VOLUME_USE_PULSEAUDIO`.   
-
-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-panel`.
-
-## Configuration, Usage
-
-### Launching
-
-The panel is run as a daemon-like [LXQt Module](https://github.com/lxde/lxqt-session#lxqt-modules) the launch of which can be adjusted in section "Basic Settings" of configuration dialogue [LXQt Session Settings](https://github.com/lxde/lxqt-session#lxqt-session-settings) of [lxqt-session](https://github.com/lxde/lxqt-session).
-
-### Customizing
-
-To customize the panel itself there's a context menu, that is a menu opened by right-clicking the pointer device. It is comprising sections "\<plugin\>" and "Panel" which allow for configuring the plugin the pointer is currently over and the panel as a whole respectively.   
-
-In section "Panel" topics "Configure Panel" and "Manage Widgets" open different panes of a dialogue "Configure Panel" which allow for configuring the panel as a whole and the various plugins respectively.   
-Pane "Widgets" allows for configuring and removing all plugins currently included in lxqt-panel. The plus sign opens another dialogue "Add plugins" which is used to add plugins. It comes with a list of all plugins plus some short descriptions and can hence serve as overview what plugins are available.   
-
-Sometimes right-clicking over particular plugins may bring up a context menu dealing with the respective plugin's functionality *only* which means the plugin in question cannot be configured the usual way. This affects e. g. plugin-quicklaunch as soon as items were added (the context menu is limited to topics dealing with the items included in plugin-quicklaunch).   
-Currently there are two ways to deal with this. Some themes like e. g. `Frost` come with handles at the plugins' left end providing the regular context menu. Also, it can be assumed at least one plugin is included in the panel that's always featuring the regular context menu like e. g. plugin-mainmenu. Either way pane "Widgets" of "Configure Panel" can be accessed and used to configure the particular plugin.
--- a/autostart/CMakeLists.txt
+++ b/autostart/CMakeLists.txt
@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
-
-file(GLOB DESKTOP_FILES_IN *.desktop.in)
-
-# Translations **********************************
-lxqt_translate_desktop(DESKTOP_FILES
-    SOURCES
-        ${DESKTOP_FILES_IN}
-)
-add_custom_target(lxqt_panel_autostart_desktop_files ALL DEPENDS ${DESKTOP_FILES})
-#************************************************
-
-install(FILES
-    ${DESKTOP_FILES}
-    DESTINATION "${LXQT_ETC_XDG_DIR}/autostart"
-    COMPONENT Runtime
-)
--- a/autostart/lxqt-panel.desktop.in
+++ b/autostart/lxqt-panel.desktop.in
@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Panel
-TryExec=lxqt-panel
-Exec=lxqt-panel
-OnlyShowIn=LXQt;
-X-LXQt-Module=true
-
-#TRANSLATIONS_DIR=translations
--- a/autostart/translations/lxqt-panel_ar.desktop
+++ b/autostart/translations/lxqt-panel_ar.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[ar]=اللوحة
--- a/autostart/translations/lxqt-panel_cs.desktop
+++ b/autostart/translations/lxqt-panel_cs.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[cs]=Panel
--- a/autostart/translations/lxqt-panel_cs_CZ.desktop
+++ b/autostart/translations/lxqt-panel_cs_CZ.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[cs_CZ]=Panel
--- a/autostart/translations/lxqt-panel_da.desktop
+++ b/autostart/translations/lxqt-panel_da.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[da]=Panel
--- a/autostart/translations/lxqt-panel_de.desktop
+++ b/autostart/translations/lxqt-panel_de.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[de]=Bedienfeld
--- a/autostart/translations/lxqt-panel_el.desktop
+++ b/autostart/translations/lxqt-panel_el.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[el]=Πίνακας
--- a/autostart/translations/lxqt-panel_eo.desktop
+++ b/autostart/translations/lxqt-panel_eo.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[eo]=Panelo
--- a/autostart/translations/lxqt-panel_es.desktop
+++ b/autostart/translations/lxqt-panel_es.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[es]=Panel
--- a/autostart/translations/lxqt-panel_es_VE.desktop
+++ b/autostart/translations/lxqt-panel_es_VE.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[es_VE]=Panel
--- a/autostart/translations/lxqt-panel_eu.desktop
+++ b/autostart/translations/lxqt-panel_eu.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[eu]=Panela
--- a/autostart/translations/lxqt-panel_fi.desktop
+++ b/autostart/translations/lxqt-panel_fi.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[fi]=Paneeli
--- a/autostart/translations/lxqt-panel_fr.desktop
+++ b/autostart/translations/lxqt-panel_fr.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[fr]=Tableau de bord
--- a/autostart/translations/lxqt-panel_hu.desktop
+++ b/autostart/translations/lxqt-panel_hu.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[hu]=Panel
--- a/autostart/translations/lxqt-panel_hu_HU.desktop
+++ b/autostart/translations/lxqt-panel_hu_HU.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[hu_HU]=Panel
--- a/autostart/translations/lxqt-panel_ia.desktop
+++ b/autostart/translations/lxqt-panel_ia.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[ia]=Panello
--- a/autostart/translations/lxqt-panel_it_IT.desktop
+++ b/autostart/translations/lxqt-panel_it_IT.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[it_IT]=Pannello
--- a/autostart/translations/lxqt-panel_ja.desktop
+++ b/autostart/translations/lxqt-panel_ja.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[ja]=パネル
--- a/autostart/translations/lxqt-panel_lt.desktop
+++ b/autostart/translations/lxqt-panel_lt.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[lt]=Skydelis
--- a/autostart/translations/lxqt-panel_nl.desktop
+++ b/autostart/translations/lxqt-panel_nl.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[nl]=Paneel
--- a/autostart/translations/lxqt-panel_pl.desktop
+++ b/autostart/translations/lxqt-panel_pl.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[pl]=Panel
--- a/autostart/translations/lxqt-panel_pt.desktop
+++ b/autostart/translations/lxqt-panel_pt.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[pt]=Painel
--- a/autostart/translations/lxqt-panel_pt_BR.desktop
+++ b/autostart/translations/lxqt-panel_pt_BR.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[pt_BR]=Painel
--- a/autostart/translations/lxqt-panel_ro_RO.desktop
+++ b/autostart/translations/lxqt-panel_ro_RO.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[ro_RO]=Panou
--- a/autostart/translations/lxqt-panel_ru.desktop
+++ b/autostart/translations/lxqt-panel_ru.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[ru]=панель
--- a/autostart/translations/lxqt-panel_ru_RU.desktop
+++ b/autostart/translations/lxqt-panel_ru_RU.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[ru_RU]=Панель
--- a/autostart/translations/lxqt-panel_sl.desktop
+++ b/autostart/translations/lxqt-panel_sl.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[sl]=Pult
--- a/autostart/translations/lxqt-panel_th_TH.desktop
+++ b/autostart/translations/lxqt-panel_th_TH.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[th_TH]=พาเนล
--- a/autostart/translations/lxqt-panel_tr.desktop
+++ b/autostart/translations/lxqt-panel_tr.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[tr]=Panel
--- a/autostart/translations/lxqt-panel_uk.desktop
+++ b/autostart/translations/lxqt-panel_uk.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[uk]=Панель
--- a/autostart/translations/lxqt-panel_zh_CN.desktop
+++ b/autostart/translations/lxqt-panel_zh_CN.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[zh_CN]=面板
--- a/autostart/translations/lxqt-panel_zh_TW.desktop
+++ b/autostart/translations/lxqt-panel_zh_TW.desktop
@ -1,2 +0,0 @@
-# Translations
-Name[zh_TW]=面板
--- a/cmake/BuildPlugin.cmake
+++ b/cmake/BuildPlugin.cmake
@ -1,69 +0,0 @@
-MACRO (BUILD_LXQT_PLUGIN NAME)
-    set(PROGRAM "lxqt-panel")
-    project(${PROGRAM}_${NAME})
-
-    set(PROG_SHARE_DIR ${CMAKE_INSTALL_FULL_DATAROOTDIR}/lxqt/${PROGRAM})
-    set(PLUGIN_SHARE_DIR ${PROG_SHARE_DIR}/${NAME})
-
-    # Translations **********************************
-    lxqt_translate_ts(${PROJECT_NAME}_QM_FILES
-        UPDATE_TRANSLATIONS ${UPDATE_TRANSLATIONS}
-        SOURCES
-            ${HEADERS}
-            ${SOURCES}
-            ${MOCS}
-            ${UIS}
-        TEMPLATE
-            ${NAME}
-        INSTALL_DIR
-            ${LXQT_TRANSLATIONS_DIR}/${PROGRAM}/${NAME}
-        PULL_TRANSLATIONS
-            ${PULL_TRANSLATIONS}
-        CLEAN_TRANSLATIONS
-            ${CLEAN_TRANSLATIONS}
-        TRANSLATIONS_REPO
-            ${TRANSLATIONS_REPO}
-        TRANSLATIONS_REFSPEC
-            ${TRANSLATIONS_REFSPEC}
-        REPO_SUBDIR
-            "${PROGRAM}/plugin-${NAME}"
-    )
-
-    #lxqt_translate_to(QM_FILES ${CMAKE_INSTALL_FULL_DATAROOTDIR}/lxqt/${PROGRAM}/${PROJECT_NAME})
-    file (GLOB ${PROJECT_NAME}_DESKTOP_FILES_IN resources/*.desktop.in)
-    lxqt_translate_desktop(DESKTOP_FILES
-        SOURCES
-            ${${PROJECT_NAME}_DESKTOP_FILES_IN}
-    )
-
-    lxqt_plugin_translation_loader(QM_LOADER ${NAME} "lxqt-panel")
-    #************************************************
-
-    file (GLOB CONFIG_FILES resources/*.conf)
-
-    if (NOT DEFINED PLUGIN_DIR)
-        set (PLUGIN_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROGRAM})
-    endif (NOT DEFINED PLUGIN_DIR)
-
-    set(QTX_LIBRARIES Qt5::Widgets)
-    if(QT_USE_QTXML)
-        set(QTX_LIBRARIES ${QTX_LIBRARIES} Qt5::Xml)
-    endif()
-    if(QT_USE_QTDBUS)
-        set(QTX_LIBRARIES ${QTX_LIBRARIES} Qt5::DBus)
-    endif()
-
-    list(FIND STATIC_PLUGINS ${NAME} IS_STATIC)
-    set(SRC ${HEADERS} ${SOURCES} ${QM_LOADER} ${MOC_SOURCES} ${${PROJECT_NAME}_QM_FILES} ${RESOURCES} ${UIS} ${DESKTOP_FILES})
-    if (${IS_STATIC} EQUAL -1) # not static
-        add_library(${NAME} MODULE ${SRC}) # build dynamically loadable modules
-        install(TARGETS ${NAME} DESTINATION ${PLUGIN_DIR}) # install the *.so file
-    else() # static
-        add_library(${NAME} STATIC ${SRC}) # build statically linked lib
-    endif()
-    target_link_libraries(${NAME} ${QTX_LIBRARIES} lxqt ${LIBRARIES} KF5::WindowSystem)
-
-    install(FILES ${CONFIG_FILES}  DESTINATION ${PLUGIN_SHARE_DIR})
-    install(FILES ${DESKTOP_FILES} DESTINATION ${PROG_SHARE_DIR})
-
-ENDMACRO(BUILD_LXQT_PLUGIN)
--- a/debian/changelog
+++ b/debian/changelog
@ -1,43 +1,169 @@
-lxqt-panel (0.12.0-8ubuntu1) bionic; urgency=medium
-
-  * Cherry-pick some upstream commits because the upstream release cycle is
-    horribly slow (and without this it'll be years before they come in):
-    - Fix wrongly positioned popups (LP: #1527013).
-      + fix-wrongly-positioned-popups.patch
-      + Upstream commit 7391172.
-    - plugin-volume: Use a specific icon for the panel.
-      + use-specific-panel-icon.patch
-      + Upstream commit eaa65e5.
-    - Fix various memory leaks.
-      + fix-memory-leaks.patch
-      + mainmenu: Fix possible leaks in menu-cache usage.
-        * Upstream commit 04630d4.
-      + mount: Fix leak by correctly assigning the QObject parent.
-        * Upstream commit d1bd23f.
-      + taskbar: Avoid conditionals on unintialized values by proper
-        initialization of data members
-        * Upstream commit 1cb5778.
-    - Avoid infinite recursion when no icon is available.
-      + avoid-infinite-recursion-icons.patch
-      + Upstream commit b9b4133.
-    - Add Move and Resize items in the task-button context menu.
-      + add-move-resize-items.patch
-      + Upstream commit b69fe72.
-    - Set the initial task button text (and icon) correctly.
-      + set-initial-task-button-correctly.patch
-      + Upstream commit 563d6bf.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 05 Feb 2018 20:04:48 -0600
-
-lxqt-panel (0.12.0-8build1) bionic; urgency=medium
-
-  * No change rebuild against libdbusmenu-qt5-2.
-
- -- Dmitry Shachnev <mitya57@ubuntu.com>  Tue, 30 Jan 2018 22:29:41 +0300
+lxqt-panel (1.4.0-0ubuntu2) noble; urgency=medium
+
+  * Apply upstream patch fixing a crash on a custom command.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 22 Dec 2023 16:40:34 -0600
+
+lxqt-panel (1.4.0-0ubuntu1) noble; urgency=medium
+
+  * New upstream release.
+  * Fixed copyright file.
+  * Bumped build dependency versions.
+  * Added lxqt-menu-data as a build dependency.
+  * Removed no-longer-existing directory from lxqt-panel.install.
+  * Move a README file for qeyes-types to the proper documentation directory.
+
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Mon, 13 Nov 2023 11:34:09 -0600
+
+lxqt-panel (1.3.0-0ubuntu1) mantic; urgency=medium
+
+  * New upstream release.
+  * Bump build dependencies.
+  * Fix some build dependencies that were renamed.
+  * Remove redundant hardening rule.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 11 Aug 2023 12:49:49 -0500
+
+lxqt-panel (1.2.1-1ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian Unstable, remaining changes:
+    - Lubuntuify the package slightly.
+    - Run wrap-and-sort for cleanliness.
+    - Update the copyright file.
+    - Take a different approach for the watch file.
+    - Add missing entry from the install file.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 16 Jan 2023 16:43:29 -0600
+
+lxqt-panel (1.2.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 4.6.2.
+
+ -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Thu, 05 Jan 2023 00:10:18 +0800
+
+lxqt-panel (1.2.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 4.6.1.
+    * Add Rules-Requires-Root: no
+  * Bump compat to 13.
+    * Remove unnecessary -Wl,--as-needed in d/rules
+    * Remove unnecessary --fail-missing in d/rules
+  * Fix d/upstream/metadata.
+  * Update d/copyright.
+  * Update d/watch for GitHub.
+
+ -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Fri, 16 Dec 2022 01:24:07 +0800
+
+lxqt-panel (1.1.0-2) unstable; urgency=medium
+
+  * Merge to unstable.
+
+ -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Sat, 19 Nov 2022 16:14:37 +0800
+
+lxqt-panel (1.1.0-1) experimental; urgency=medium
+
+  * Add debian/salsa-ci.yml file.
+  * Update debian/upstream/signing-key.asc.
+  * New upstream version 1.0.0
+  * New upstream version 1.1.0
+  * Build-deps on liblxqt1-dev (>= 1.1.0~).
+  * Build-deps on liblxqt-globalkeys1-dev (>= 1.1.0~).
+  * Build-deps on liblxqt-globalkeys-ui1-dev (>= 1.1.0~).
+  * Build-deps on libsysstat-qt5-0-dev (>= 0.4.6~).
+  * Drop obsoleted Breaks and Replaces lines.
+  * debian/copyright: update years.
+  * Build-deps on libxcb-randr0-dev.
+  * Build-deps on libxcb-image0-dev.
+  * Build-deps on libxtst-dev.
+  * Build-deps on libxcb-composite0-dev.
+
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Sat, 16 Jul 2022 00:26:18 +0800
+
+lxqt-panel (0.16.1-1) unstable; urgency=medium
+
+  [ Alf Gaida ]
+  * Switched to gbp
+  * Bumped Standards-Version to 4.4.0, no changes needed
+  * improved debian/rules
+
+  [ Andrew Lee (李健秋) ]
+  * New upstream release. (Closes: #916105, #953154, #978204)
+
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Wed, 06 Jan 2021 18:30:22 +0800
+
+lxqt-panel (0.14.1-1) unstable; urgency=medium
+
+  * Cherry-picking new upstream version 0.14.1.
+  * Bumped minimum versions:
+    - liblxqt0-dev (>= 0.14.1~)
+    - liblxqt-globalkeys0-dev (>= 0.14.1~)
+    - liblxqt-globalkeys-ui0-dev (>= 0.14.1~)
+
+ -- Alf Gaida <agaida@siduction.org>  Tue, 26 Feb 2019 03:28:17 +0100
+
+lxqt-panel (0.14.0-1) unstable; urgency=medium
+
+  * Cherry-picking new upstream version 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 versions:
+    - liblxqt0-dev (>= 0.14.0~)
+    - liblxqt-globalkeys0-dev (>= 0.14.0~)
+    - liblxqt-globalkeys-ui0-dev (>= 0.14.0~)
+    - libsysstat-qt5-0-dev (>= 0.4.2~)
+  * Removed obsolete PULL_TRANSLATIONS= OFF from dh_auto_configure
+  * Added l10n-package, moved from lxqt-l10n
+  * Added d/upstream/metadata
+
+ -- Alf Gaida <agaida@siduction.org>  Sun, 27 Jan 2019 23:13:10 +0100
+
+lxqt-panel (0.13.0-2) unstable; urgency=medium
+
+  * Build dependency libsensors4-dev -> libsensors-dev (Closes: #917440)
+  * Bumped Standards to 4.2.1, no changes needed
+
+ -- Alf Gaida <agaida@siduction.org>  Sat, 29 Dec 2018 13:03:56 +0100
+
+lxqt-panel (0.13.0-1) unstable; urgency=medium
+
+  * Cherry-picking new upstream version 0.13.0.
+  * Bumped build dependencies
+    - liblxqt0-dev to >= 0.13.0~
+    - liblxqt0-dev to >= 0.13.0~
+    - liblxqt-globalkeys0-dev to >= 0.13.0~
+    - liblxqt-globalkeys-ui0-dev to >= 0.13.0~
+    - libsysstat-qt5-0-dev to >= 0.4.1~
+  * Removed build dependency libglib2.0-dev, thrown in via lxqt-build-tools
+  * Bumped year in copyright
+
+ -- Alf Gaida <agaida@siduction.org>  Fri, 25 May 2018 00:08:49 +0200
+
+lxqt-panel (0.12.0-10) unstable; urgency=medium
+
+  * Changed Source and watch for lxqt
+
+ -- Alf Gaida <agaida@siduction.org>  Sat, 28 Apr 2018 15:17:35 +0200
+
+lxqt-panel (0.12.0-9) unstable; urgency=medium
+
+  * Ported back USE_MENU_CACHE handling
+  * Removed build dependency on libmenu-cache-dev (Closes: #896512)
+  * Ported back USE_MENU_CACHE handling
+  * Moved lxqt-about from dependencies to recommends (Closes: #894640)
+  * Bumped debhelper version to 11~
+  * Bumped compat to 11
+  * Bumped Standards to 4.1.4, no changes needed
+  * Fixed VCS fields for salsa
+  * Removed trailing whitespaces
+
+ -- Alf Gaida <agaida@siduction.org>  Mon, 23 Apr 2018 19:47:29 +0200

 lxqt-panel (0.12.0-8) unstable; urgency=medium

-  * Fix plugin-volume, use pavucontrol-qt (Closes: #884547) 
+  * Fix plugin-volume, use pavucontrol-qt (Closes: #884547)

 -- Alf Gaida <agaida@siduction.org>  Sat, 16 Dec 2017 18:36:45 +0100

@ -57,7 +183,7 @@ lxqt-panel (0.12.0-6) unstable; urgency=medium

 lxqt-panel (0.12.0-5) experimental; urgency=medium

-  * Ported back the config move to /usr/share/xdg (Closes: #883034) 
+  * Ported back the config move to /usr/share/xdg (Closes: #883034)

 -- Alf Gaida <agaida@siduction.org>  Sat, 02 Dec 2017 03:23:04 +0100

--- a/debian/compat
+++ b/debian/compat
@ -1 +0,0 @@
-10
--- a/debian/control
+++ b/debian/control
@ -6,45 +6,50 @@ Uploaders: Alf Gaida <agaida@siduction.org>,
           Andrew Lee (李健秋) <ajqlee@debian.org>
 Section: x11
 Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper-compat (= 13),
               libasound2-dev,
               libdbusmenu-qt5-dev,
               libglib2.0-dev,
               libicu-dev,
-               libkf5windowsystem-dev,
               libkf5solid-dev,
-               liblxqt0-dev (>= 0.12.0),
-               liblxqt-globalkeys0-dev (>= 0.12.0),
-               liblxqt-globalkeys-ui0-dev (>= 0.12.0),
-               libmenu-cache-dev,
+               libkf5windowsystem-dev,
+               liblxqt-globalkeys-ui1-dev (>= 1.4.0),
+               liblxqt-globalkeys1-dev (>= 1.4.0),
+               liblxqt1-dev (>= 1.4.0),
               libpulse-dev,
               libqt5svg5-dev,
               libqt5x11extras5-dev,
-               libsensors4-dev [!hurd-any],
+               libsensors-dev [!hurd-any],
               libstatgrab-dev [linux-any],
-               libsysstat-qt5-0-dev (>= 0.4.0),
+               libsysstat-qt5-0-dev (>= 0.4.5),
               libx11-dev,
-               libxcomposite-dev,
-               libxcb-util0-dev,
-               libxcb-xkb-dev,
+               libxcb-composite0-dev,
               libxcb-damage0-dev,
+               libxcb-image0-dev,
+               libxcb-randr0-dev,
+               libxcb-shm0-dev,
+               libxcb-util-dev,
+               libxcb-xkb-dev,
+               libxcomposite-dev,
               libxdamage-dev,
               libxkbcommon-dev,
               libxkbcommon-x11-dev,
-               libxrender-dev
-Standards-Version: 4.1.2
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-panel.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-panel.git
-Homepage: https://github.com/lxde/lxqt-panel
+               libxrender-dev,
+               libxtst-dev,
+               lxqt-menu-data (>= 1.4.0)
+Standards-Version: 4.6.2
+Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-panel-packaging
+Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-panel-packaging.git
+XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-panel
+XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-panel.git
+Homepage: https://github.com/lxqt/lxqt-panel
+Rules-Requires-Root: no

 Package: lxqt-panel
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         lxmenu-data,
-         lxqt-about,
-         lxqt-policykit
-Recommends: lxqt-config,
+Depends: lxmenu-data, lxqt-policykit, ${misc:Depends}, ${shlibs:Depends}
+Recommends: lxqt-about,
+            lxqt-config,
            lxqt-notificationd,
            lxqt-panel-l10n,
            lxqt-qtplugin,
@ -53,9 +58,17 @@ Recommends: lxqt-config,
            pavucontrol-qt | pavucontrol,
            qlipper
 Suggests: lxqt | lxqt-core
-Breaks: lxqt-common (<< 0.12.0)
-Replaces: lxqt-common (<< 0.12.0)
 Description: LXQt desktop panel
 The LXQt desktop panel
 .
- This package contain the LXQt panel.
+ This package contains the LXQt panel.
+
+Package: lxqt-panel-l10n
+Architecture: all
+Multi-Arch: foreign
+Section: localization
+Depends: qttranslations5-l10n, ${misc:Depends}
+Description: Language package for lxqt-panel
+ The l10n files for lxqt-panel.
+ .
+ This package contains the l10n files needed by lxqt-panel.
--- a/debian/copyright
+++ b/debian/copyright
@ -1,15 +1,27 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: lxqt-panel
-Source: https://github.com/lxde/lxqt-panel
+Source: https://github.com/lxqt/lxqt-panel

 Files: *
-Copyright: 2012-2017 LXQt team
-           2010-2012 Razor team
+Copyright: 2010-2013 Razor team
+           2012-2023 LXQt team
+License: LGPL-2.1+
+
+Files: panel/lxqtpanelapplication_p.h
+Copyright: 2016 Luís Pereira <luis.artur.pereira@gmail.com>
 License: LGPL-2.1+

 Files: debian/*
-Copyright: 2014-2017 Alf Gaida <agaida@siduction.org>
-           2015      Andrew Lee (李健秋) <ajqlee@debian.org>
+Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
+           2015-2022 Andrew Lee (李健秋) <ajqlee@debian.org>
+           2022-2023 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
+           2015      Shih-Yuan Lee (FourDollars) <fourdollars@gmail.com>
+           2016      Ralf Jung <post@ralfj.de>
+           2018      Walter Lapchynski <wxl@ubuntu.com>
+           2020-2021 Raman Sarda <theloudspeaker@lubuntu.me>
+           2021      apt-ghetto <apt-ghetto@protonmail.com>
+           2018-2023 Simon Quigley <tsimonq2@ubuntu.com>
+           2023      Aaron Rainbolt <arraybolt3@gmail.com>
 License: LGPL-2.1+

 License: LGPL-2.1+
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@ -0,0 +1,6 @@
+[DEFAULT]
+debian-branch = debian/sid
+upstream-branch = upstream/latest
+pristine-tar = True
+compression = xz
+
--- a/debian/lxqt-panel-l10n.install
+++ b/debian/lxqt-panel-l10n.install
@ -0,0 +1 @@
+usr/share/lxqt/translations/lxqt-panel/
--- a/debian/lxqt-panel.install
+++ b/debian/lxqt-panel.install
@ -0,0 +1,8 @@
+etc/xdg
+usr/bin/lxqt-panel
+usr/include/lxqt
+usr/lib/*/lxqt-panel
+usr/share/lxqt/lxqt-panel
+usr/share/lxqt/panel.conf
+usr/share/lxqt/panel/qeyes-types/
+usr/share/man
--- a/debian/manpages
+++ b/debian/manpages
@ -1,2 +1 @@
 panel/man/lxqt-panel.1
-
--- a/debian/patches/add-move-resize-items.patch
+++ b/debian/patches/add-move-resize-items.patch
@ -1,78 +0,0 @@
-Description: Add Move and Resize items in the task-button context menu
-Author: Tsu Jan <tsujan2000@gmail.com>
-Origin: backport
-Bug: https://github.com/lxde/lxqt/issues/1434
-Applied-Upstream: commit:b69fe72
-Last-Update: 2018-02-05
--- a/plugin-taskbar/lxqttaskbutton.cpp
-+++ b/plugin-taskbar/lxqttaskbutton.cpp
-@@ -464,6 +464,42 @@ void LXQtTaskButton::moveApplicationToDe
- /************************************************
- 
-  ************************************************/
-+void LXQtTaskButton::moveApplication()
-+{
-+    KWindowInfo info(mWindow, NET::WMDesktop);
-+    if (!info.isOnCurrentDesktop())
-+        KWindowSystem::setCurrentDesktop(info.desktop());
-+    if (isMinimized())
-+        KWindowSystem::unminimizeWindow(mWindow);
-+    KWindowSystem::forceActiveWindow(mWindow);
-+    const QRect& g = KWindowInfo(mWindow, NET::WMGeometry).geometry();
-+    int X = g.center().x();
-+    int Y = g.center().y();
-+    QCursor::setPos(X, Y);
-+    NETRootInfo(QX11Info::connection(), NET::WMMoveResize).moveResizeRequest(mWindow, X, Y, NET::Move);
-+}
-+
-+/************************************************
-+
-+ ************************************************/
-+void LXQtTaskButton::resizeApplication()
-+{
-+    KWindowInfo info(mWindow, NET::WMDesktop);
-+    if (!info.isOnCurrentDesktop())
-+        KWindowSystem::setCurrentDesktop(info.desktop());
-+    if (isMinimized())
-+        KWindowSystem::unminimizeWindow(mWindow);
-+    KWindowSystem::forceActiveWindow(mWindow);
-+    const QRect& g = KWindowInfo(mWindow, NET::WMGeometry).geometry();
-+    int X = g.bottomRight().x();
-+    int Y = g.bottomRight().y();
-+    QCursor::setPos(X, Y);
-+    NETRootInfo(QX11Info::connection(), NET::WMMoveResize).moveResizeRequest(mWindow, X, Y, NET::BottomRight);
-+}
-+
-+/************************************************
-+
-+ ************************************************/
- void LXQtTaskButton::contextMenuEvent(QContextMenuEvent* event)
- {
-     if (event->modifiers().testFlag(Qt::ControlModifier))
-@@ -532,6 +568,15 @@ void LXQtTaskButton::contextMenuEvent(QC
-         connect(a, SIGNAL(triggered(bool)), this, SLOT(moveApplicationToDesktop()));
-     }
- 
-+    /********** Move/Resize **********/
-+    menu->addSeparator();
-+    a = menu->addAction(tr("&Move"));
-+    a->setEnabled(info.actionSupported(NET::ActionMove) && !(state & NET::Max) && !(state & NET::FullScreen));
-+    connect(a, &QAction::triggered, this, &LXQtTaskButton::moveApplication);
-+    a = menu->addAction(tr("Resi&ze"));
-+    a->setEnabled(info.actionSupported(NET::ActionResize) && !(state & NET::Max) && !(state & NET::FullScreen));
-+    connect(a, &QAction::triggered, this, &LXQtTaskButton::resizeApplication);
-+
-     /********** State menu **********/
-     menu->addSeparator();
- 
--- a/plugin-taskbar/lxqttaskbutton.h
-+++ b/plugin-taskbar/lxqttaskbutton.h
-@@ -95,6 +95,8 @@ public slots:
-     void unShadeApplication();
-     void closeApplication();
-     void moveApplicationToDesktop();
-+    void moveApplication();
-+    void resizeApplication();
-     void setApplicationLayer();
- 
-     void setOrigin(Qt::Corner);
--- a/debian/patches/avoid-infinite-recursion-icons.patch
+++ b/debian/patches/avoid-infinite-recursion-icons.patch
@ -1,19 +0,0 @@
-Description: Avoid infinite recursion when no icon is available
-Author: comicfans <comicfans44@gmail.com>
-Origin: backport
-Bug: https://github.com/lxde/lxqt/issues/1431
-Applied-Upstream: b9b4133
-Last-Update: 2018-02-05
--- a/plugin-mainmenu/xdgcachedmenu.cpp
-+++ b/plugin-mainmenu/xdgcachedmenu.cpp
-@@ -60,6 +60,10 @@ void XdgCachedMenuAction::updateIcon()
-     if(icon().isNull())
-     {
-         QIcon icon = XdgIcon::fromTheme(iconName_, QIcon::fromTheme("unknown"));
-+        // Some themes may lack the "unknown" icon; checking null prevents
-+        // infinite recursion (setIcon->dataChanged->updateIcon->setIcon)
-+        if (icon.isNull())
-+            return;
-         setIcon(icon);
-     }
- }
--- a/debian/patches/clock-and-volume.patch
+++ b/debian/patches/clock-and-volume.patch
@ -1,31 +0,0 @@
-Description: some cosmetics backported
- - display volume percent 
- - fix worldclock size
-
-Author: Alf Gaida <agaida@siduction.org>
-Last-Update: 2017-11-05
-
--- lxqt-panel-0.12.0.orig/plugin-volume/lxqtvolume.cpp
-+++ lxqt-panel-0.12.0/plugin-volume/lxqtvolume.cpp
-@@ -286,7 +286,7 @@ void LXQtVolume::showNotification(bool f
-             if (m_defaultSink->mute())
-                 m_notification->setSummary(tr("Volume: muted"));
-             else
-                m_notification->setSummary(tr("Volume: %1").arg(QString::number(m_defaultSink->volume())));
-+                m_notification->setSummary(tr("Volume: %1%").arg(QString::number(m_defaultSink->volume())));
-             m_notification->update();
-         }
-     }
--- lxqt-panel-0.12.0.orig/plugin-worldclock/lxqtworldclock.cpp
-+++ lxqt-panel-0.12.0/plugin-worldclock/lxqtworldclock.cpp
-@@ -132,7 +132,10 @@ void LXQtWorldClock::updateTimeText()
- 
-     if (!isUpToDate)
-     {
-+        const QSize old_size = mContent->sizeHint();
-         mContent->setText(tzNow.toString(preformat(mFormat, timeZone, tzNow)));
-+        if (old_size != mContent->sizeHint())
-+            mRotatedWidget->adjustContentSize();
-         mRotatedWidget->update();
-         updatePopupContent();
-     }
--- a/debian/patches/fix-memory-leaks.patch
+++ b/debian/patches/fix-memory-leaks.patch
@ -1,86 +0,0 @@
-Description: Fix various memory leaks
- This commit contains three patches that was done in one upstream pull request
- but the commits weren't squashed. The commit descriptions are as follows:
- - mainmenu: Fix possible leaks in menu-cache usage
- - mount: Fix leak by correctly assigning the QObject parent
- - taskbar: Avoid conditionals on unintialized values by proper initialization
-   of data members
-Author: Palo Kisa <palo.kisa@gmail.com>
-Origin: backport
-Bug: https://github.com/lxde/lxqt/issues/1415
-Applied-Upstream: commit:04630d4, commit:d1bd23f, commit:1cb5778
-Last-Update: 2018-02-05
--- a/plugin-mainmenu/xdgcachedmenu.cpp
-+++ b/plugin-mainmenu/xdgcachedmenu.cpp
-@@ -33,6 +33,7 @@
- #include <QHelpEvent>
- #include <QMimeData>
- #include <QDebug>
-+#include <memory>
- 
- XdgCachedMenuAction::XdgCachedMenuAction(MenuCacheItem* item, QObject* parent):
-     QAction{parent}
-@@ -92,7 +93,10 @@ void XdgCachedMenu::addMenuItems(QMenu*
-   GSList* list = menu_cache_dir_list_children(dir);
-   for(GSList * l = list; l; l = l->next)
-   {
-    MenuCacheItem* item = (MenuCacheItem*)l->data;
-+    // Note: C++14 is needed for usage of the std::make_unique
-+    //auto guard = std::make_unique(static_cast<MenuCacheItem *>(l->data), menu_cache_item_unref);
-+    std::unique_ptr<MenuCacheItem, gboolean (*)(MenuCacheItem* item)> guard{static_cast<MenuCacheItem *>(l->data), menu_cache_item_unref};
-+    MenuCacheItem* item = guard.get();
-     MenuCacheType type = menu_cache_item_get_type(item);
- 
-     if(type == MENU_CACHE_TYPE_SEP)
-@@ -123,7 +127,6 @@ void XdgCachedMenu::addMenuItems(QMenu*
-         addMenuItems(submenu, MENU_CACHE_DIR(item));
-       }
-     }
-    menu_cache_item_unref(item);
-   }
-   if (list)
-       g_slist_free(list);
--- a/plugin-mount/actions/deviceaction.cpp
-+++ b/plugin-mount/actions/deviceaction.cpp
-@@ -42,8 +42,9 @@
- #define ACT_INFO_UPPER      QString(ACT_INFO).toUpper()
- #define ACT_MENU_UPPER      QString(ACT_MENU).toUpper()
- 
-DeviceAction::DeviceAction(LXQtMountPlugin *plugin, QObject *parent):
-    mPlugin(plugin)
-+DeviceAction::DeviceAction(LXQtMountPlugin *plugin, QObject *parent)
-+    : QObject(parent)
-+    , mPlugin(plugin)
- {
- }
- 
--- a/plugin-mount/lxqtmountplugin.cpp
-+++ b/plugin-mount/lxqtmountplugin.cpp
-@@ -74,7 +74,7 @@ void LXQtMountPlugin::settingsChanged()
-     if (mDeviceAction == nullptr || mDeviceAction->Type() != actionId)
-     {
-         delete mDeviceAction;
-        mDeviceAction = DeviceAction::create(actionId, this);
-+        mDeviceAction = DeviceAction::create(actionId, this, this);
- 
-         connect(mPopup, &Popup::deviceAdded, mDeviceAction, &DeviceAction::onDeviceAdded);
-         connect(mPopup, &Popup::deviceRemoved, mDeviceAction, &DeviceAction::onDeviceRemoved);
--- a/plugin-taskbar/lxqttaskbar.cpp
-+++ b/plugin-taskbar/lxqttaskbar.cpp
-@@ -58,6 +58,8 @@ LXQtTaskBar::LXQtTaskBar(ILXQtPanelPlugi
-     QFrame(parent),
-     mSignalMapper(new QSignalMapper(this)),
-     mButtonStyle(Qt::ToolButtonTextBesideIcon),
-+    mButtonWidth(400),
-+    mButtonHeight(100),
-     mCloseOnMiddleClick(true),
-     mRaiseOnCurrentDesktop(true),
-     mShowOnlyOneDesktopTasks(false),
-@@ -65,6 +67,7 @@ LXQtTaskBar::LXQtTaskBar(ILXQtPanelPlugi
-     mShowOnlyCurrentScreenTasks(false),
-     mShowOnlyMinimizedTasks(false),
-     mAutoRotate(true),
-+    mGroupingEnabled(true),
-     mShowGroupOnHover(true),
-     mIconByClass(false),
-     mCycleOnWheelScroll(true),
--- a/debian/patches/fix-wrongly-positioned-popups.patch
+++ b/debian/patches/fix-wrongly-positioned-popups.patch
@ -1,30 +0,0 @@
-Description: lxqtpanel: Fix wrongly positioned popups
- Avoid the usage the QWidget::mapToGlobal(), which is unreliable sometimes.
-Author: Palo Kisa <palo.kisa@gmail.com>
-Origin: backport
-Bug: https://github.com/lxde/lxqt/issues/1076
-Bug-Ubuntu: https://pad.lv/1527013
-Applied-Upstream: commit:7391172
-Last-Update: 2018-02-05
--- a/panel/lxqtpanel.cpp
-+++ b/panel/lxqtpanel.cpp
-@@ -987,7 +987,8 @@ void LXQtPanel::setReserveSpace(bool res
-  ************************************************/
- QRect LXQtPanel::globalGometry() const
- {
-    return QRect(mapToGlobal(QPoint(0, 0)), this->size());
-+    // panel is the the top-most widget/window, no calculation needed
-+    return geometry();
- }
- 
- 
-@@ -1204,7 +1205,8 @@ QRect LXQtPanel::calculatePopupWindowPos
-         return QRect();
-     }
- 
-    return calculatePopupWindowPos(panel_plugin->mapToGlobal(QPoint(0, 0)), windowSize);
-+    // Note: assuming there are not contentMargins around the "BackgroundWidget" (LXQtPanelWidget)
-+    return calculatePopupWindowPos(globalGometry().topLeft() + panel_plugin->geometry().topLeft(), windowSize);
- }
- 
- 
--- a/debian/patches/move-configs.patch
+++ b/debian/patches/move-configs.patch
@ -1,22 +0,0 @@
-From 9d857d1871b1c9e3b988412d691e9dfba4a14f6d Mon Sep 17 00:00:00 2001
-From: Alf Gaida <agaida@siduction.org>
-Date: Wed, 29 Nov 2017 01:00:07 +0100
-Subject: [PATCH] move panel config to /usr/share/lxqt
-
---
- panel/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/panel/CMakeLists.txt b/panel/CMakeLists.txt
-index 5a322a3e..522c1ffc 100644
--- a/panel/CMakeLists.txt
-+++ b/panel/CMakeLists.txt
-@@ -114,7 +114,7 @@ target_link_libraries(${PROJECT}
- )
- 
- install(TARGETS ${PROJECT} RUNTIME DESTINATION bin)
-install(FILES ${CONFIG_FILES} DESTINATION ${LXQT_ETC_XDG_DIR}/lxqt)
-+install(FILES ${CONFIG_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/lxqt)
- install(FILES ${PUB_HEADERS} DESTINATION include/lxqt)
- install(FILES
-     man/lxqt-panel.1
--- a/debian/patches/plugin-volume-mixer.patch
+++ b/debian/patches/plugin-volume-mixer.patch
@ -1,16 +0,0 @@
-Description: Use pavucontrol-qt instead pavucontrol
- backported from upstream, can disappear with the next release
-Author: Alf Gaida <agaida@siduction.org>
-Last-Update: 2017-12-16
-
--- lxqt-panel-0.12.0.orig/plugin-volume/lxqtvolumeconfiguration.h
-+++ lxqt-panel-0.12.0/plugin-volume/lxqtvolumeconfiguration.h
-@@ -47,7 +47,7 @@
- #define SETTINGS_DEFAULT_DEVICE                 0
- #define SETTINGS_DEFAULT_STEP                   3
- #ifdef USE_PULSEAUDIO
-    #define SETTINGS_DEFAULT_MIXER_COMMAND      "pavucontrol"
-+    #define SETTINGS_DEFAULT_MIXER_COMMAND      "pavucontrol-qt"
-     #define SETTINGS_DEFAULT_AUDIO_ENGINE       "PulseAudio"
- #elif defined(USE_ALSA)
-     #define SETTINGS_DEFAULT_MIXER_COMMAND      "qasmixer"
--- a/debian/patches/series
+++ b/debian/patches/series
@ -1,11 +1 @@
-clock-and-volume.patch
-move-configs.patch
-plugin-volume-mixer.patch
-
-# Ubuntu-specific patches
-fix-wrongly-positioned-popups.patch
-use-specific-panel-icon.patch
-fix-memory-leaks.patch
-avoid-infinite-recursion-icons.patch
-add-move-resize-items.patch
-set-initial-task-button-correctly.patch
+trim-custom-commands-prevent-crash.patch
--- a/debian/patches/set-initial-task-button-correctly.patch
+++ b/debian/patches/set-initial-task-button-correctly.patch
@ -1,27 +0,0 @@
-Description: Set the initial task button text (and icon) correctly
- Detailed explanation:
- .
- When a window shows up, the signal `KWindowSystem::stackingOrderChanged` is emitted *before* `KWindowSystem::windowAdded`. The former signal is connected to the function `LXQtTaskBar::refreshTaskList()`, which calls the functions `LXQtTaskBar::addWindow()` and `LXQtTaskBar::removeWindow()` to add and remove monitored windows.
- .
- Connecting `LXQtTaskBar::refreshTaskList()` to the signal `KWindowSystem::stackingOrderChanged` not only is redundant but also causes a problem:
- .
- (1) It's redundant because the job of adding *new* windows should be done by `LXQtTaskBar::onWindowAdded()` connected to the signal `KWindowSystem::windowAdded`. However, with the current code, `LXQtTaskBar::addWindow()` is never called by that function because the new window is already added through `KWindowSystem::stackingOrderChanged`. Similarly, `LXQtTaskBar::onWindowRemoved()` should be responsible for removing windows by being connected to the signal `KWindowSystem::windowRemoved`.
- .
- (2) More importantly, as the window name can change in the short interval between the emissions of `KWindowSystem::stackingOrderChanged` and `KWindowSystem::windowAdded`, the corresponding taskbar button may get a wrong text. The reason is that the signal `WindowSystem::windowChanged` announces changes only starting from the emission of `KWindowSystem::windowAdded`. (Theoretically, the initial icon might also be wrong but that's rarer).
- .
- Here, the connection to `KWindowSystem::stackingOrderChanged` is removed, so that the initial task button text/icon is set correctly. In this way, several useless calls to `LXQtTaskBar::refreshTaskList()` are also prevented when a window is shown/closed or focused/unfocused.
-Author: Tsu Jan <tsujan2000@gmail.com>
-Origin: backport
-Bug: https://github.com/lxde/lxqt/issues/1303
-Applied-Upstream: commit:563d6bf
-Last-Update: 2018-02-05
--- a/plugin-taskbar/lxqttaskbar.cpp
-+++ b/plugin-taskbar/lxqttaskbar.cpp
-@@ -93,7 +93,6 @@ LXQtTaskBar::LXQtTaskBar(ILXQtPanelPlugi
-     connect(mSignalMapper, static_cast<void (QSignalMapper::*)(int)>(&QSignalMapper::mapped), this, &LXQtTaskBar::activateTask);
-     QTimer::singleShot(0, this, &LXQtTaskBar::registerShortcuts);
- 
-    connect(KWindowSystem::self(), SIGNAL(stackingOrderChanged()), SLOT(refreshTaskList()));
-     connect(KWindowSystem::self(), static_cast<void (KWindowSystem::*)(WId, NET::Properties, NET::Properties2)>(&KWindowSystem::windowChanged)
-             , this, &LXQtTaskBar::onWindowChanged);
-     connect(KWindowSystem::self(), &KWindowSystem::windowAdded, this, &LXQtTaskBar::onWindowAdded);
--- a/debian/patches/trim-custom-commands-prevent-crash.patch
+++ b/debian/patches/trim-custom-commands-prevent-crash.patch
@ -0,0 +1,69 @@
+Description: LXQtCustomCommand: trim command to remove spaces
+ This fixes crash when command is made of only whitespace characters.
+ It's not detected as empty and upon argument split, it tries to access
+ first element of an empty list.
+ .
+ Also trim when saving settings in LXQtCustomCommandConfiguration
+ so placeholder text shows up on next run
+Author: Filippo Gentile <42845724+gfgit@users.noreply.github.com>
+Origin: upstream, https://github.com/lxqt/lxqt-panel/pull/1964
+Applied-Upstream: bd637abafc9e8e9c7727a89e5d86e0f07f213c23
+Last-Update: 2023-12-22
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/plugin-customcommand/lxqtcustomcommand.cpp
+++ b/plugin-customcommand/lxqtcustomcommand.cpp
+@@ -109,7 +109,7 @@ void LXQtCustomCommand::settingsChanged(
+ 
+     mAutoRotate = settings()->value(QStringLiteral("autoRotate"), true).toBool();
+     mFont = settings()->value(QStringLiteral("font"), QString()).toString(); // the default font should be empty
+-    mCommand = settings()->value(QStringLiteral("command"), QStringLiteral("echo Configure...")).toString();
+    mCommand = settings()->value(QStringLiteral("command"), QStringLiteral("echo Configure...")).toString().trimmed();
+     mRunWithBash = settings()->value(QStringLiteral("runWithBash"), true).toBool();
+     mOutputImage = settings()->value(QStringLiteral("outputImage"), false).toBool();
+     mRepeat = settings()->value(QStringLiteral("repeat"), true).toBool();
+@@ -118,9 +118,9 @@ void LXQtCustomCommand::settingsChanged(
+     mIcon = settings()->value(QStringLiteral("icon"), QString()).toString();
+     mText = settings()->value(QStringLiteral("text"), QStringLiteral("%1")).toString();
+     mMaxWidth = settings()->value(QStringLiteral("maxWidth"), 200).toInt();
+-    mClick = settings()->value(QStringLiteral("click"), QString()).toString();
+-    mWheelUp = settings()->value(QStringLiteral("wheelUp"), QString()).toString();
+-    mWheelDown = settings()->value(QStringLiteral("wheelDown"), QString()).toString();
+    mClick = settings()->value(QStringLiteral("click"), QString()).toString().trimmed();
+    mWheelUp = settings()->value(QStringLiteral("wheelUp"), QString()).toString().trimmed();
+    mWheelDown = settings()->value(QStringLiteral("wheelDown"), QString()).toString().trimmed();
+ 
+     if (oldFont != mFont) {
+         QFont newFont;
+--- a/plugin-customcommand/lxqtcustomcommandconfiguration.cpp
+++ b/plugin-customcommand/lxqtcustomcommandconfiguration.cpp
+@@ -108,7 +108,7 @@ void LXQtCustomCommandConfiguration::fon
+ void LXQtCustomCommandConfiguration::commandPlainTextEditChanged()
+ {
+     if (!mLockSettingChanges)
+-        settings().setValue(QStringLiteral("command"), ui->commandPlainTextEdit->toPlainText());
+        settings().setValue(QStringLiteral("command"), ui->commandPlainTextEdit->toPlainText().trimmed());
+ }
+ 
+ void LXQtCustomCommandConfiguration::runWithBashCheckBoxChanged(bool runWithBash)
+@@ -163,17 +163,17 @@ void LXQtCustomCommandConfiguration::max
+ void LXQtCustomCommandConfiguration::clickLineEditChanged(QString click)
+ {
+     if (!mLockSettingChanges)
+-        settings().setValue(QStringLiteral("click"), click);
+        settings().setValue(QStringLiteral("click"), click.trimmed());
+ }
+ 
+ void LXQtCustomCommandConfiguration::wheelUpLineEditChanged(QString wheelUp)
+ {
+     if (!mLockSettingChanges)
+-        settings().setValue(QStringLiteral("wheelUp"), wheelUp);
+        settings().setValue(QStringLiteral("wheelUp"), wheelUp.trimmed());
+ }
+ 
+ void LXQtCustomCommandConfiguration::wheelDownLineEditChanged(QString wheelDown)
+ {
+     if (!mLockSettingChanges)
+-        settings().setValue(QStringLiteral("wheelDown"), wheelDown);
+        settings().setValue(QStringLiteral("wheelDown"), wheelDown.trimmed());
+ }
--- a/debian/patches/use-specific-panel-icon.patch
+++ b/debian/patches/use-specific-panel-icon.patch
@ -1,32 +0,0 @@
-Description: plugin-volume: Use a specific icon for the panel
- Some "modern" icon themes have a specific panel icon for volumes.
- Arc, deepin, Faenza, Faience, Flattr, matefaenza, Menda-Circle, Numix,
- Numix-Light, Numix-uTouch, Paper, Papirus and it's derivatives are examples
- of that.
-Author: Luís Pereira <luis.artur.pereira@gmail.com>
-Origin: backport
-Bug: https://github.com/lxde/lxqt-panel/pull/441
-Applied-Upstream: commit:eaa65e5
-Reviewed-by: <name and email of a reviewer, optional>
-Last-Update: 2018-02-05 <YYYY-MM-DD, last update of the meta-information, optional>
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/plugin-volume/volumepopup.cpp
-+++ b/plugin-volume/volumepopup.cpp
-@@ -64,7 +64,7 @@ VolumePopup::VolumePopup(QWidget* parent
-     m_volumeSlider->installEventFilter(this);
- 
-     m_muteToggleButton = new QPushButton(this);
-    m_muteToggleButton->setIcon(XdgIcon::fromTheme(QStringList() << "audio-volume-muted"));
-+    m_muteToggleButton->setIcon(XdgIcon::fromTheme(QLatin1String("audio-volume-muted-panel")));
-     m_muteToggleButton->setCheckable(true);
-     m_muteToggleButton->setAutoDefault(false);
- 
-@@ -171,6 +171,7 @@ void VolumePopup::updateStockIcon()
-     else
-         iconName = "audio-volume-high";
- 
-+    iconName.append(QLatin1String("-panel"));
-     m_muteToggleButton->setIcon(XdgIcon::fromTheme(iconName));
-     emit stockIconChanged(iconName);
- }
--- a/debian/rules
+++ b/debian/rules
@ -2,26 +2,29 @@
 # 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

-WHICH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
+include /usr/share/dpkg/architecture.mk

-ifeq ($(WHICH_OS), kfreebsd)
-    NOT_LINUX := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO
+ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
+    CONF_FLAGS := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO
 endif

-ifeq ($(WHICH_OS), hurd)
-    NOT_LINUX := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO -DSENSORS_PLUGIN=NO
+ifeq ($(DEB_HOST_ARCH_OS), hurd)
+    CONF_FLAGS := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO -DSENSORS_PLUGIN=NO
 endif

+
 %:
 	dh ${@} --buildsystem cmake

+override_dh_installdocs:
+	dh_installdocs
+	mv debian/lxqt-panel/usr/share/lxqt/panel/qeyes-types/README debian/lxqt-panel/usr/share/doc/lxqt-panel/README.qeyes-types
+
 override_dh_auto_configure:
-	dh_auto_configure --\
-		-DPULL_TRANSLATIONS=OFF \
+	dh_auto_configure -- \
 		-DUPDATE_TRANSLATIONS=OFF \
 		-DDOM_PLUGIN=YES \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-		$(NOT_LINUX)
+		$(CONF_FLAGS)
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@ -0,0 +1,12 @@
+# For more information on what jobs are run see:
+# https://salsa.debian.org/salsa-ci-team/pipeline
+#
+# To enable the jobs, go to your repository (at salsa.debian.org)
+# and click over Settings > CI/CD > Expand (in General pipelines).
+# In "Custom CI config path" write debian/salsa-ci.yml and click
+# in "Save Changes". The CI tests will run after the next commit.
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@ -0,0 +1,6 @@
+Name: lxqt-panel
+Bug-Database: https://github.com/lxqt/lxqt-panel/issues
+Bug-Submit: https://github.com/lxqt/lxqt-panel/issues/new
+Changelog: https://github.com/lxqt/lxqt-panel/blob/master/CHANGELOG
+Repository: https://github.com/lxqt/lxqt-panel
+Repository-Browse: https://github.com/lxqt/lxqt-panel
--- a/debian/upstream/signing-key.asc
+++ b/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
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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-----
--- a/debian/watch
+++ b/debian/watch
@ -1,3 +1,5 @@
 version=4
-opts="pgpsigurlmangle=s/$/.asc/" \
-    https://github.com/lxde/lxqt-panel/releases .*/lxqt-panel-([\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
--- a/menu/CMakeLists.txt
+++ b/menu/CMakeLists.txt
@ -1,21 +0,0 @@
-file(GLOB DIRECTORY_FILES_IN desktop-directories/*.directory.in)
-
-# Translations **********************************
-lxqt_translate_desktop(DIRECTORY_FILES
-    SOURCES
-        ${DIRECTORY_FILES_IN}
-)
-add_custom_target(desktop_directories_files ALL DEPENDS ${DIRECTORY_FILES})
-#************************************************
-
-install(FILES
-    ${DIRECTORY_FILES}
-    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/desktop-directories"
-    COMPONENT Runtime
-)
-
-install(FILES
-    lxqt-applications.menu
-    DESTINATION "${LXQT_ETC_XDG_DIR}/menus"
-    COMPONENT Runtime
-)
--- a/menu/desktop-directories/lxqt-leave.directory.in
+++ b/menu/desktop-directories/lxqt-leave.directory.in
@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Leave
-Comment=Leave Session
-Icon=system-shutdown
-Type=Directory
-
-#TRANSLATIONS_DIR=../translations
--- a/menu/desktop-directories/lxqt-settings.directory.in
+++ b/menu/desktop-directories/lxqt-settings.directory.in
@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Directory
-Name=LXQt settings
-Icon=preferences-system
-
-#TRANSLATIONS_DIR=translations
-
-# Translations
--- a/menu/lxqt-applications.menu
+++ b/menu/lxqt-applications.menu
@ -1,237 +0,0 @@
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-
-<Menu>
-
-	<Name>Applications</Name>
-	<Directory>lxde-menu-applications.directory</Directory>
-
-	<!-- Read standard .directory and .desktop file locations -->
-	<DefaultAppDirs/>
-	<DefaultDirectoryDirs/>
-
-	<!-- Read in overrides and child menus from applications-merged/ -->
-	<DefaultMergeDirs/>
-
-	<!-- Accessories submenu -->
-	<Menu>
-		<Name>Accessories</Name>
-		<Directory>lxde-utility.directory</Directory>
-		<Include>
-			<And>
-				<Category>Utility</Category>
-			 <!-- Accessibility spec must have either the Utility or Settings
-			 category, and we display an accessibility submenu already for
-			 the ones that do not have Settings, so don't display accessibility
-			 applications here -->
-				<Not><Category>Accessibility</Category></Not>
-				<Not><Category>System</Category></Not>
-			</And>
-		</Include>
-	</Menu> <!-- End Accessories -->
-
-	<!-- Accessibility submenu -->
-	<Menu>
-		<Name>Universal Access</Name>
-		<Directory>lxde-utility-accessibility.directory</Directory>
-		<Include>
-			<And>
-				<Category>Accessibility</Category>
-				<Not><Category>Settings</Category></Not>
-			</And>
-		</Include>
-	</Menu> <!-- End Accessibility -->
-
-	<!-- Development Tools -->
-	<Menu>
-		<Name>Development</Name>
-		<Directory>lxde-development.directory</Directory>
-		<Include>
-			<And>
-				<Category>Development</Category>
-			</And>
-			<Filename>emacs.desktop</Filename>
-		</Include>
-	</Menu> <!-- End Development Tools -->
-
-	<!-- Education -->
-	<Menu>
-		<Name>Education</Name>
-		<Directory>lxde-education.directory</Directory>
-		<Include>
-			<And>
-				<Category>Education</Category>
-			</And>
-		</Include>
-	</Menu> <!-- End Education -->
-
-	<!-- Games -->
-	<Menu>
-		<Name>Games</Name>
-		<Directory>lxde-game.directory</Directory>
-		<Include>
-			<And>
-				<Category>Game</Category>
-			</And>
-		</Include>
-	</Menu> <!-- End Games -->
-
-	<!-- Graphics -->
-	<Menu>
-		<Name>Graphics</Name>
-		<Directory>lxde-graphics.directory</Directory>
-		<Include>
-			<And>
-				<Category>Graphics</Category>
-				<Not><Category>Utility</Category></Not>
-			</And>
-		</Include>
-	</Menu> <!-- End Graphics -->
-
-	<!-- Internet -->
-	<Menu>
-		<Name>Internet</Name>
-		<Directory>lxde-network.directory</Directory>
-		<Include>
-			<And>
-				<Category>Network</Category>
-			</And>
-		</Include>
-	</Menu>	 <!-- End Internet -->
-
-	<!-- LXQt-About -->
-	<Menu>
-		<Name>LXQt-About</Name>
-		<Include>
-		<Filename>lxqt-about.desktop</Filename>
-		</Include>
-	</Menu> <!-- End LXQt-About -->
-
-	<!-- Multimedia -->
-	<Menu>
-		<Name>Multimedia</Name>
-		<Directory>lxde-audio-video.directory</Directory>
-		<Include>
-			<And>
-				<Category>AudioVideo</Category>
-			</And>
-		</Include>
-	</Menu>	 <!-- End Multimedia -->
-
-	<!-- Office -->
-	<Menu>
-		<Name>Office</Name>
-		<Directory>lxde-office.directory</Directory>
-		<Include>
-			<And>
-				<Category>Office</Category>
-			</And>
-		</Include>
-	</Menu> <!-- End Office -->
-
-	<!-- System Tools-->
-	<Menu>
-		<Name>System</Name>
-		<Directory>lxde-system-tools.directory</Directory>
-		<Include>
-			<And>
-				<Category>System</Category>
-				<Not><Category>Settings</Category></Not>
-				<Not><Category>PackageManager</Category></Not>
-				<Not><Category>X-Leave</Category></Not>
-				<Not><Category>Screensaver</Category></Not>
-				<Not><Filename>lxqt-about.desktop</Filename></Not>
-			</And>
-		</Include>
-	</Menu>	 <!-- End System Tools -->
-
-	<!-- Other -->
-	<Menu>
-		<Name>Other</Name>
-		<Directory>lxde-other.directory</Directory>
-		<OnlyUnallocated/>
-		<Include>
-			<And>
-				<Not><Category>Core</Category></Not>
-				<Not><Category>Settings</Category></Not>
-				<Not><Category>Screensaver</Category></Not>
-			</And>
-		</Include>
-		</Menu> <!-- End Other -->
-
-	<!-- Settings -->
-	<Menu>
-		<Name>DesktopSettings</Name>
-		<Directory>lxde-settings.directory</Directory>
-		<Menu>
-			<Name>LXQtSettings</Name>
-			<Directory>lxqt-settings.directory</Directory>
-			<Include>
-				<And>
-					<Category>LXQt</Category>
-					<Or>
-						<Category>Settings</Category>
-						<Category>PackageManager</Category>
-					</Or>
-				</And>
-				<!-- Include some optional components here -->
-				<Filename>obconf-qt.desktop</Filename>
-				<Filename>compton-conf.desktop</Filename>
-				<Filename>pcmanfm-qt-desktop-pref.desktop</Filename>
-			</Include>
-			<Layout>
-				<Filename>lxqt-config.desktop</Filename>
-				<Separator/>
-				<Merge type="menus"/>
-				<Merge type="files"/>
-			</Layout>
-		</Menu>
-		<OnlyUnallocated/>
-		<Include>
-			<Or>
-				<Category>Settings</Category>
-				<Category>PackageManager</Category>
-			</Or>
-		</Include>
-		<Exclude>
-			<Or>
-				<Filename>lxqt-config.desktop</Filename>
-			</Or>
-		</Exclude>
-		<Layout>
-			<Merge type="menus"/>
-			<Merge type="files"/>
-		</Layout>
-	</Menu> <!-- End Settings -->
-
-	<!-- Leave -->
-	<Menu>
-		<Name>X-Leave</Name>
-		<Directory>lxqt-leave.directory</Directory>
-		<Include>
-			<And>
-				<Category>X-Leave</Category>
-			</And>
-		</Include>
-	</Menu>	 <!-- End Leave -->
-
-	<!-- Screensaver -->
-	<Menu>
-		<Name>Screensaver</Name>
-		<Include>
-		<Filename>lxqt-lockscreen.desktop</Filename>
-		</Include>
-	</Menu> <!-- End Screensaver -->
-
-	<Layout>
-		<Merge type="files"/>
-		<Merge type="menus"/>
-		<Separator/>
-		<Menuname>DesktopSettings</Menuname>
-		<Menuname show_empty="false" inline="true">LXQt-About</Menuname>
-		<Separator/>
-		<Menuname show_empty="false">X-Leave</Menuname>
-		<Menuname show_empty="false" inline="true">Screensaver</Menuname>
-	</Layout>
-
-</Menu> <!-- End Applications -->
--- a/menu/translations/lxqt-leave_de.directory
+++ b/menu/translations/lxqt-leave_de.directory
@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Leave
-Comment=Leave Session
-Icon=system-shutdown
-Type=Directory
-
-Comment[de]=Sitzung verlassen
-Name[de]=Verlassen
--- a/menu/translations/lxqt-leave_el.directory
+++ b/menu/translations/lxqt-leave_el.directory
@ -1 +0,0 @@
-Name[el]=Έξοδος
--- a/menu/translations/lxqt-leave_fr.directory
+++ b/menu/translations/lxqt-leave_fr.directory
@ -1,3 +0,0 @@
-[Desktop Entry]
-Name[fr]=Quitter
-Comment[fr]=Quitter la session
--- a/menu/translations/lxqt-leave_hu.directory
+++ b/menu/translations/lxqt-leave_hu.directory
@ -1,2 +0,0 @@
-Comment[hu]=LXQt elhagyása
-Name[hu]=Kilépés
--- a/menu/translations/lxqt-leave_it.directory
+++ b/menu/translations/lxqt-leave_it.directory
@ -1,2 +0,0 @@
-Name[it]=Esci
-Comment[it]=Chiudere la sessione
--- a/menu/translations/lxqt-leave_lt.directory
+++ b/menu/translations/lxqt-leave_lt.directory
@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Leave
-Comment=Leave Session
-Icon=system-shutdown
-Type=Directory
-
-Comment[lt]=Užbaigti seansą
-Name[lt]=Išeiti
--- a/menu/translations/lxqt-leave_pl.directory
+++ b/menu/translations/lxqt-leave_pl.directory
@ -1,2 +0,0 @@
-Name[pl]=Opuść
-Comment[pl]=Zakończ sesję
--- a/menu/translations/lxqt-leave_pt.directory
+++ b/menu/translations/lxqt-leave_pt.directory
@ -1,3 +0,0 @@
-[Desktop Entry]
-Name[pt]=Sair
-Comment[pt]=Sair da sessão
--- a/menu/translations/lxqt-leave_ru.directory
+++ b/menu/translations/lxqt-leave_ru.directory
@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Leave
-Comment=Leave Session
-Icon=system-shutdown
-Type=Directory
-
-Comment[ru]=Завершить сеанс
-Name[ru]=Выйти
-
-Comment[ru_RU]=Завершить сеанс
-Name[ru_RU]=Выйти
--- a/menu/translations/lxqt-settings_de.directory
+++ b/menu/translations/lxqt-settings_de.directory
@ -1 +0,0 @@
-Name[de]=LXQt-Systemeinstellungen
--- a/menu/translations/lxqt-settings_el.directory
+++ b/menu/translations/lxqt-settings_el.directory
@ -1,2 +0,0 @@
-Name[el]=Ρυθμίσεις LXQt
-
--- a/menu/translations/lxqt-settings_fr.directory
+++ b/menu/translations/lxqt-settings_fr.directory
@ -1 +0,0 @@
-Name[fr]=LXQt-Paramétrage du système
--- a/menu/translations/lxqt-settings_hu.directory
+++ b/menu/translations/lxqt-settings_hu.directory
@ -1 +0,0 @@
-Name[hu]=LXQt beállítása
--- a/menu/translations/lxqt-settings_it.directory
+++ b/menu/translations/lxqt-settings_it.directory
@ -1 +0,0 @@
-Name[it]=Impostazioni di LXQt
--- a/menu/translations/lxqt-settings_lt.directory
+++ b/menu/translations/lxqt-settings_lt.directory
@ -1 +0,0 @@
-Name[lt]=LXQt nustatymai
--- a/menu/translations/lxqt-settings_pl.directory
+++ b/menu/translations/lxqt-settings_pl.directory
@ -1 +0,0 @@
-Name[pl]=Ustawienia LXQt
--- a/menu/translations/lxqt-settings_pt.directory
+++ b/menu/translations/lxqt-settings_pt.directory
@ -1,2 +0,0 @@
-[Desktop Entry]
-Name=Definições do LXQt
--- a/menu/translations/lxqt-settings_ru.directory
+++ b/menu/translations/lxqt-settings_ru.directory
@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Directory
-Name=LXQt settings
-Icon=preferences-system
-
-#TRANSLATIONS_DIR=translations
-
-# Translations
-
-Name[ru]=Настройки LXQt
-
-Name[ru_RU]=Настройки LXQt
--- a/panel/CMakeLists.txt
+++ b/panel/CMakeLists.txt
@ -1,123 +0,0 @@
-set(PROJECT lxqt-panel)
-
-set(PRIV_HEADERS
-    panelpluginsmodel.h
-    windownotifier.h
-    lxqtpanel.h
-    lxqtpanelapplication.h
-    lxqtpanelapplication_p.h
-    lxqtpanellayout.h
-    plugin.h
-    pluginsettings_p.h
-    lxqtpanellimits.h
-    popupmenu.h
-    pluginmoveprocessor.h
-    lxqtpanelpluginconfigdialog.h
-    config/configpaneldialog.h
-    config/configpanelwidget.h
-    config/configpluginswidget.h
-    config/addplugindialog.h
-)
-
-# using LXQt namespace in the public headers.
-set(PUB_HEADERS
-    lxqtpanelglobals.h
-    pluginsettings.h
-    ilxqtpanelplugin.h
-    ilxqtpanel.h
-)
-
-set(SOURCES
-    main.cpp
-    panelpluginsmodel.cpp
-    windownotifier.cpp
-    lxqtpanel.cpp
-    lxqtpanelapplication.cpp
-    lxqtpanellayout.cpp
-    plugin.cpp
-    pluginsettings.cpp
-    popupmenu.cpp
-    pluginmoveprocessor.cpp
-    lxqtpanelpluginconfigdialog.cpp
-    config/configpaneldialog.cpp
-    config/configpanelwidget.cpp
-    config/configpluginswidget.cpp
-    config/addplugindialog.cpp
-)
-
-set(UI
-    config/configpanelwidget.ui
-    config/configpluginswidget.ui
-    config/addplugindialog.ui
-)
-
-set(LIBRARIES
-    lxqt
-)
-
-file(GLOB CONFIG_FILES resources/*.conf)
-
-############################################
-
-add_definitions(-DCOMPILE_LXQT_PANEL)
-
-set(PLUGIN_DESKTOPS_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/lxqt/${PROJECT}")
-add_definitions(-DPLUGIN_DESKTOPS_DIR=\"${PLUGIN_DESKTOPS_DIR}\")
-
-if (WITH_SCREENSAVER_FALLBACK)
-    message(STATUS "Building with conversion of deprecated 'screensaver' plugin")
-    add_definitions(-DWITH_SCREENSAVER_FALLBACK "-DLXQT_LOCK_DESKTOP=\"${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications/lxqt-lockscreen.desktop\"")
-endif ()
-
-project(${PROJECT})
-
-set(QTX_LIBRARIES Qt5::Widgets Qt5::Xml Qt5::DBus)
-
-# Translations
-lxqt_translate_ts(QM_FILES SOURCES
-    UPDATE_TRANSLATIONS
-        ${UPDATE_TRANSLATIONS}
-    SOURCES
-        ${PUB_HEADERS}
-        ${PRIV_HEADERS}
-        ${SOURCES}
-        ${UI}
-    INSTALL_DIR
-        "${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME}"
-    PULL_TRANSLATIONS
-        ${PULL_TRANSLATIONS}
-    CLEAN_TRANSLATIONS
-        ${CLEAN_TRANSLATIONS}
-    TRANSLATIONS_REPO
-        ${TRANSLATIONS_REPO}
-    TRANSLATIONS_REFSPEC
-        ${TRANSLATIONS_REFSPEC}
-    REPO_SUBDIR
-        "${PROJECT_NAME}/panel"
-)
-
-lxqt_app_translation_loader(SOURCES ${PROJECT_NAME})
-
-add_executable(${PROJECT}
-    ${PUB_HEADERS}
-    ${PRIV_HEADERS}
-    ${QM_FILES}
-    ${SOURCES}
-    ${UI}
-)
-
-target_link_libraries(${PROJECT}
-    ${LIBRARIES}
-    ${QTX_LIBRARIES}
-    KF5::WindowSystem
-    ${STATIC_PLUGINS}
-)
-
-install(TARGETS ${PROJECT} RUNTIME DESTINATION bin)
-install(FILES ${CONFIG_FILES} DESTINATION ${LXQT_ETC_XDG_DIR}/lxqt)
-install(FILES ${PUB_HEADERS} DESTINATION include/lxqt)
-install(FILES
-    man/lxqt-panel.1
-    DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
-    COMPONENT Runtime
-)
--- a/panel/config/addplugindialog.cpp
+++ b/panel/config/addplugindialog.cpp
@ -1,135 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXQt - a lightweight, Qt based, desktop toolset
- * http://razor-qt.org
- *
- * Copyright: 2010-2011 Razor team
- * Authors:
- *   Alexander Sokoloff <sokoloff.a@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 "ui_addplugindialog.h"
-#include "addplugindialog.h"
-#include "plugin.h"
-#include "../lxqtpanelapplication.h"
-
-#include <LXQt/HtmlDelegate>
-#include <XdgIcon>
-#include <XdgDirs>
-
-#include <QString>
-#include <QLineEdit>
-#include <QListWidgetItem>
-#include <QIcon>
-
-#define SEARCH_ROLE  Qt::UserRole
-#define INDEX_ROLE   SEARCH_ROLE+1
-
-AddPluginDialog::AddPluginDialog(QWidget *parent):
-    QDialog(parent),
-    ui(new Ui::AddPluginDialog)
-{
-    ui->setupUi(this);
-
-    QStringList desktopFilesDirs;
-    desktopFilesDirs << QString(getenv("LXQT_PANEL_PLUGINS_DIR")).split(':', QString::SkipEmptyParts);
-    desktopFilesDirs << QString("%1/%2").arg(XdgDirs::dataHome(), "/lxqt/lxqt-panel");
-    desktopFilesDirs << PLUGIN_DESKTOPS_DIR;
-
-    mPlugins = LXQt::PluginInfo::search(desktopFilesDirs, QLatin1String("LXQtPanel/Plugin"), QLatin1String("*"));
-    std::sort(mPlugins.begin(), mPlugins.end(), [](const LXQt::PluginInfo &p1, const LXQt::PluginInfo &p2) {
-        return p1.name() < p2.name() || (p1.name() == p2.name() && p1.comment() < p2.comment());
-    });
-
-    ui->pluginList->setItemDelegate(new LXQt::HtmlDelegate(QSize(32, 32), ui->pluginList));
-    ui->pluginList->setContextMenuPolicy(Qt::CustomContextMenu);
-
-    filter();
-
-    // search
-    mSearchTimer.setInterval(300);
-    mSearchTimer.setSingleShot(true);
-    connect(ui->searchEdit, &QLineEdit::textEdited,
-            &mSearchTimer, static_cast<void (QTimer::*)()>(&QTimer::start));
-    connect(&mSearchTimer, &QTimer::timeout, this, &AddPluginDialog::filter);
-    connect(ui->pluginList, &QListWidget::doubleClicked, this, &AddPluginDialog::emitPluginSelected);
-    connect(ui->addButton, &QPushButton::clicked, this, &AddPluginDialog::emitPluginSelected);
-
-    connect(dynamic_cast<LXQtPanelApplication *>(qApp), &LXQtPanelApplication::pluginAdded
-            , this, &AddPluginDialog::filter);
-    connect(dynamic_cast<LXQtPanelApplication *>(qApp), &LXQtPanelApplication::pluginRemoved
-            , this, &AddPluginDialog::filter);
-}
-
-AddPluginDialog::~AddPluginDialog()
-{
-    delete ui;
-}
-
-void AddPluginDialog::filter()
-{
-    QListWidget* pluginList = ui->pluginList;
-
-    const int curr_item = 0 < pluginList->count() ? pluginList->currentRow() : 0;
-    pluginList->clear();
-
-    static QIcon fallIco = XdgIcon::fromTheme("preferences-plugin");
-
-    int pluginCount = mPlugins.length();
-    for (int i = 0; i < pluginCount; ++i)
-    {
-        const LXQt::PluginInfo &plugin = mPlugins.at(i);
-
-        QString s = QString("%1 %2 %3 %4 %5").arg(plugin.name(),
-                                               plugin.comment(),
-                                               plugin.value("Name").toString(),
-                                               plugin.value("Comment").toString(),
-                                               plugin.id());
-        if (!s.contains(ui->searchEdit->text(), Qt::CaseInsensitive))
-            continue;
-
-        QListWidgetItem* item = new QListWidgetItem(ui->pluginList);
-        // disable single-instances plugins already in use
-        if (dynamic_cast<LXQtPanelApplication const *>(qApp)->isPluginSingletonAndRunnig(plugin.id()))
-        {
-            item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
-            item->setBackground(palette().brush(QPalette::Disabled, QPalette::Text));
-            item->setText(QString("<b>%1</b> (%2)<br>%3<br><small>%4</small>")
-                    .arg(plugin.name(), plugin.id(), plugin.comment(), tr("(only one instance can run at a time)")));
-        } else
-            item->setText(QString("<b>%1</b> (%2)<br>%3").arg(plugin.name(), plugin.id(), plugin.comment()));
-        item->setIcon(plugin.icon(fallIco));
-        item->setData(INDEX_ROLE, i);
-    }
-
-    if (pluginCount > 0)
-        ui->pluginList->setCurrentRow(curr_item < pluginCount ? curr_item : pluginCount - 1);
-}
-
-void AddPluginDialog::emitPluginSelected()
-{
-    QListWidget* pluginList = ui->pluginList;
-    if (pluginList->currentItem() && pluginList->currentItem()->isSelected())
-    {
-        LXQt::PluginInfo plugin = mPlugins.at(pluginList->currentItem()->data(INDEX_ROLE).toInt());
-        emit pluginSelected(plugin);
-    }
-}
-
--- a/panel/config/addplugindialog.h
+++ b/panel/config/addplugindialog.h
@ -1,63 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXQt - a lightweight, Qt based, desktop toolset
- * http://razor-qt.org
- *
- * Copyright: 2010-2011 Razor team
- * Authors:
- *   Alexander Sokoloff <sokoloff.a@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 LXQT_ADDPLUGINDIALOG_H
-#define LXQT_ADDPLUGINDIALOG_H
-
-#include <LXQt/PluginInfo>
-#include <QDialog>
-#include <QTimer>
-
-#define SEARCH_DELAY 125
-
-namespace Ui {
-    class AddPluginDialog;
-}
-
-class AddPluginDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    AddPluginDialog(QWidget *parent = 0);
-    ~AddPluginDialog();
-
-signals:
-    void pluginSelected(const LXQt::PluginInfo &plugin);
-
-private:
-    Ui::AddPluginDialog *ui;
-    LXQt::PluginInfoList mPlugins;
-    QTimer mSearchTimer;
-
-private slots:
-    void filter();
-    void emitPluginSelected();
-};
-
-#endif // LXQT_ADDPLUGINDIALOG_H
--- a/panel/config/addplugindialog.ui
+++ b/panel/config/addplugindialog.ui
@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>AddPluginDialog</class>
- <widget class="QDialog" name="AddPluginDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>359</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Add Plugins</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="searchLabel">
-       <property name="text">
-        <string>Search:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="searchEdit"/>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QListWidget" name="pluginList">
-     <property name="sizeAdjustPolicy">
-      <enum>QAbstractScrollArea::AdjustToContents</enum>
-     </property>
-     <property name="showDropIndicator" stdset="0">
-      <bool>true</bool>
-     </property>
-     <property name="alternatingRowColors">
-      <bool>true</bool>
-     </property>
-     <property name="selectionMode">
-      <enum>QAbstractItemView::SingleSelection</enum>
-     </property>
-     <property name="selectionBehavior">
-      <enum>QAbstractItemView::SelectRows</enum>
-     </property>
-     <property name="verticalScrollMode">
-      <enum>QAbstractItemView::ScrollPerPixel</enum>
-     </property>
-     <property name="movement">
-      <enum>QListView::Static</enum>
-     </property>
-     <property name="flow">
-      <enum>QListView::TopToBottom</enum>
-     </property>
-     <property name="resizeMode">
-      <enum>QListView::Adjust</enum>
-     </property>
-     <property name="spacing">
-      <number>0</number>
-     </property>
-     <property name="modelColumn">
-      <number>0</number>
-     </property>
-     <property name="uniformItemSizes">
-      <bool>false</bool>
-     </property>
-     <property name="selectionRectVisible">
-      <bool>true</bool>
-     </property>
-     <property name="currentRow">
-      <number>-1</number>
-     </property>
-     <property name="sortingEnabled">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="addButton">
-       <property name="text">
-        <string>Add Widget</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closeButton">
-       <property name="text">
-        <string>Close</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
-       <property name="default">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>pluginList</tabstop>
-  <tabstop>addButton</tabstop>
-  <tabstop>closeButton</tabstop>
-  <tabstop>searchEdit</tabstop>
- </tabstops>
- <resources/>
- <connections>
-  <connection>
-   <sender>closeButton</sender>
-   <signal>clicked()</signal>
-   <receiver>AddPluginDialog</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>380</x>
-     <y>279</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>118</x>
-     <y>270</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
--- a/panel/config/configpaneldialog.cpp
+++ b/panel/config/configpaneldialog.cpp
@ -1,58 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXDE-Qt - a lightweight, Qt based, desktop toolset
- * http://razor-qt.org
- *
- * Copyright: 2010-2011 Razor team
- * Authors:
- *   Marat "Morion" Talipov <morion.self@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 "configpaneldialog.h"
-
-ConfigPanelDialog::ConfigPanelDialog(LXQtPanel *panel, QWidget *parent):
-    LXQt::ConfigDialog(tr("Configure Panel"), panel->settings(), parent),
-    mPanelPage(nullptr),
-    mPluginsPage(nullptr)
-{
-    setAttribute(Qt::WA_DeleteOnClose);
-
-    mPanelPage = new ConfigPanelWidget(panel, this);
-    addPage(mPanelPage, tr("Panel"), QLatin1String("configure"));
-    connect(this, &ConfigPanelDialog::reset, mPanelPage, &ConfigPanelWidget::reset);
-
-    mPluginsPage = new ConfigPluginsWidget(panel, this);
-    addPage(mPluginsPage, tr("Widgets"), QLatin1String("preferences-plugin"));
-    connect(this, &ConfigPanelDialog::reset, mPluginsPage, &ConfigPluginsWidget::reset);
-
-    connect(this, &ConfigPanelDialog::accepted, [panel] {
-        panel->saveSettings();
-   });
-}
-
-void ConfigPanelDialog::showConfigPanelPage()
-{
-    showPage(mPanelPage);
-}
-
-void ConfigPanelDialog::showConfigPluginsPage()
-{
-    showPage(mPluginsPage);
-}
--- a/panel/config/configpaneldialog.h
+++ b/panel/config/configpaneldialog.h
@ -1,52 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXDE-Qt - a lightweight, Qt based, desktop toolset
- * http://razor-qt.org
- *
- * Copyright: 2010-2011 Razor team
- * Authors:
- *   Marat "Morion" Talipov <morion.self@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 CONFIGPANELDIALOG_H
-#define CONFIGPANELDIALOG_H
-
-#include "configpanelwidget.h"
-#include "configpluginswidget.h"
-#include "../lxqtpanel.h"
-
-#include <LXQt/ConfigDialog>
-
-class ConfigPanelDialog : public LXQt::ConfigDialog
-{
-    Q_OBJECT
-
-public:
-    ConfigPanelDialog(LXQtPanel *panel, QWidget *parent = 0);
-
-    void showConfigPanelPage();
-    void showConfigPluginsPage();
-
-private:
-    ConfigPanelWidget *mPanelPage;
-    ConfigPluginsWidget *mPluginsPage;
-};
-
-#endif // CONFIGPANELDIALOG_H
--- a/panel/config/configpanelwidget.cpp
+++ b/panel/config/configpanelwidget.cpp
@ -1,408 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXDE-Qt - a lightweight, Qt based, desktop toolset
- * http://razor-qt.org
- *
- * Copyright: 2010-2011 Razor team
- * Authors:
- *   Marat "Morion" Talipov <morion.self@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 "configpanelwidget.h"
-#include "ui_configpanelwidget.h"
-
-#include "../lxqtpanellimits.h"
-
-#include <KWindowSystem/KWindowSystem>
-#include <QDebug>
-#include <QListView>
-#include <QDesktopWidget>
-#include <QWindow>
-#include <QColorDialog>
-#include <QFileDialog>
-#include <QStandardPaths>
-
-using namespace LXQt;
-
-struct ScreenPosition
-{
-    int screen;
-    ILXQtPanel::Position position;
-};
-Q_DECLARE_METATYPE(ScreenPosition)
-
-ConfigPanelWidget::ConfigPanelWidget(LXQtPanel *panel, QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::ConfigPanelWidget),
-    mPanel(panel)
-{
-    ui->setupUi(this);
-
-    fillComboBox_position();
-    fillComboBox_alignment();
-
-    mOldPanelSize = mPanel->panelSize();
-    mOldIconSize = mPanel->iconSize();
-    mOldLineCount = mPanel->lineCount();
-
-    mOldLength = mPanel->length();
-    mOldLengthInPercents = mPanel->lengthInPercents();
-
-    mOldAlignment = mPanel->alignment();
-
-    mOldScreenNum = mPanel->screenNum();
-    mScreenNum = mOldScreenNum;
-
-    mOldPosition = mPanel->position();
-    mPosition = mOldPosition;
-
-    mOldHidable = mPanel->hidable();
-
-    mOldAnimation = mPanel->animationTime();
-    mOldShowDelay = mPanel->showDelay();
-
-    ui->spinBox_panelSize->setMinimum(PANEL_MINIMUM_SIZE);
-    ui->spinBox_panelSize->setMaximum(PANEL_MAXIMUM_SIZE);
-
-    mOldFontColor = mPanel->fontColor();
-    mFontColor = mOldFontColor;
-    mOldBackgroundColor = mPanel->backgroundColor();
-    mBackgroundColor = mOldBackgroundColor;
-    mOldBackgroundImage = mPanel->backgroundImage();
-    mOldOpacity = mPanel->opacity();
-    mOldReserveSpace = mPanel->reserveSpace();
-
-    // reset configurations from file
-    reset();
-
-    connect(ui->spinBox_panelSize,          SIGNAL(valueChanged(int)),      this, SLOT(editChanged()));
-    connect(ui->spinBox_iconSize,           SIGNAL(valueChanged(int)),      this, SLOT(editChanged()));
-    connect(ui->spinBox_lineCount,          SIGNAL(valueChanged(int)),      this, SLOT(editChanged()));
-
-    connect(ui->spinBox_length,             SIGNAL(valueChanged(int)),      this, SLOT(editChanged()));
-    connect(ui->comboBox_lenghtType,        SIGNAL(activated(int)),         this, SLOT(widthTypeChanged()));
-
-    connect(ui->comboBox_alignment,         SIGNAL(activated(int)),         this, SLOT(editChanged()));
-    connect(ui->comboBox_position,          SIGNAL(activated(int)),         this, SLOT(positionChanged()));
-    connect(ui->checkBox_hidable,           SIGNAL(toggled(bool)),          this, SLOT(editChanged()));
-    connect(ui->spinBox_animation,          SIGNAL(valueChanged(int)),      this, SLOT(editChanged()));
-    connect(ui->spinBox_delay,              SIGNAL(valueChanged(int)),      this, SLOT(editChanged()));
-
-    connect(ui->checkBox_customFontColor,   SIGNAL(toggled(bool)),          this, SLOT(editChanged()));
-    connect(ui->pushButton_customFontColor, SIGNAL(clicked(bool)),          this, SLOT(pickFontColor()));
-    connect(ui->checkBox_customBgColor,     SIGNAL(toggled(bool)),          this, SLOT(editChanged()));
-    connect(ui->pushButton_customBgColor,   SIGNAL(clicked(bool)),          this, SLOT(pickBackgroundColor()));
-    connect(ui->checkBox_customBgImage,     SIGNAL(toggled(bool)),          this, SLOT(editChanged()));
-    connect(ui->lineEdit_customBgImage,     SIGNAL(textChanged(QString)),   this, SLOT(editChanged()));
-    connect(ui->pushButton_customBgImage,   SIGNAL(clicked(bool)),          this, SLOT(pickBackgroundImage()));
-    connect(ui->slider_opacity,             &QSlider::valueChanged,         this, &ConfigPanelWidget::editChanged);
-
-    connect(ui->checkBox_reserveSpace, &QAbstractButton::toggled, [this](bool checked) { mPanel->setReserveSpace(checked, true); });
-}
-
-
-/************************************************
- *
- ************************************************/
-void ConfigPanelWidget::reset()
-{
-    ui->spinBox_panelSize->setValue(mOldPanelSize);
-    ui->spinBox_iconSize->setValue(mOldIconSize);
-    ui->spinBox_lineCount->setValue(mOldLineCount);
-
-    ui->comboBox_position->setCurrentIndex(indexForPosition(mOldScreenNum, mOldPosition));
-
-    ui->checkBox_hidable->setChecked(mOldHidable);
-
-    ui->spinBox_animation->setValue(mOldAnimation);
-    ui->spinBox_delay->setValue(mOldShowDelay);
-
-    fillComboBox_alignment();
-    ui->comboBox_alignment->setCurrentIndex(mOldAlignment + 1);
-
-    ui->comboBox_lenghtType->setCurrentIndex(mOldLengthInPercents ? 0 : 1);
-    widthTypeChanged();
-    ui->spinBox_length->setValue(mOldLength);
-
-    mFontColor.setNamedColor(mOldFontColor.name());
-    ui->pushButton_customFontColor->setStyleSheet(QString("background: %1").arg(mOldFontColor.name()));
-    mBackgroundColor.setNamedColor(mOldBackgroundColor.name());
-    ui->pushButton_customBgColor->setStyleSheet(QString("background: %1").arg(mOldBackgroundColor.name()));
-    ui->lineEdit_customBgImage->setText(mOldBackgroundImage);
-    ui->slider_opacity->setValue(mOldOpacity);
-    ui->checkBox_reserveSpace->setChecked(mOldReserveSpace);
-
-    ui->checkBox_customFontColor->setChecked(mOldFontColor.isValid());
-    ui->checkBox_customBgColor->setChecked(mOldBackgroundColor.isValid());
-    ui->checkBox_customBgImage->setChecked(QFileInfo(mOldBackgroundImage).exists());
-
-    // update position
-    positionChanged();
-}
-
-/************************************************
- *
- ************************************************/
-void ConfigPanelWidget::fillComboBox_position()
-{
-    int screenCount = QApplication::desktop()->screenCount();
-    if (screenCount == 1)
-    {
-        addPosition(tr("Top of desktop"), 0, LXQtPanel::PositionTop);
-        addPosition(tr("Left of desktop"), 0, LXQtPanel::PositionLeft);
-        addPosition(tr("Right of desktop"), 0, LXQtPanel::PositionRight);
-        addPosition(tr("Bottom of desktop"), 0, LXQtPanel::PositionBottom);
-    }
-    else
-    {
-        for (int screenNum = 0; screenNum < screenCount; screenNum++)
-        {
-            if (screenNum)
-                ui->comboBox_position->insertSeparator(9999);
-
-            addPosition(tr("Top of desktop %1").arg(screenNum +1), screenNum, LXQtPanel::PositionTop);
-            addPosition(tr("Left of desktop %1").arg(screenNum +1), screenNum, LXQtPanel::PositionLeft);
-            addPosition(tr("Right of desktop %1").arg(screenNum +1), screenNum, LXQtPanel::PositionRight);
-            addPosition(tr("Bottom of desktop %1").arg(screenNum +1), screenNum, LXQtPanel::PositionBottom);
-        }
-    }
-}
-
-
-/************************************************
- *
- ************************************************/
-void ConfigPanelWidget::fillComboBox_alignment()
-{
-    ui->comboBox_alignment->setItemData(0, QVariant(LXQtPanel::AlignmentLeft));
-    ui->comboBox_alignment->setItemData(1, QVariant(LXQtPanel::AlignmentCenter));
-    ui->comboBox_alignment->setItemData(2,  QVariant(LXQtPanel::AlignmentRight));
-
-
-    if (mPosition   == ILXQtPanel::PositionTop ||
-        mPosition   == ILXQtPanel::PositionBottom)
-    {
-        ui->comboBox_alignment->setItemText(0, tr("Left"));
-        ui->comboBox_alignment->setItemText(1, tr("Center"));
-        ui->comboBox_alignment->setItemText(2, tr("Right"));
-    }
-    else
-    {
-        ui->comboBox_alignment->setItemText(0, tr("Top"));
-        ui->comboBox_alignment->setItemText(1, tr("Center"));
-        ui->comboBox_alignment->setItemText(2, tr("Bottom"));
-    };
-}
-
-
-/************************************************
- *
- ************************************************/
-void ConfigPanelWidget::addPosition(const QString& name, int screen, LXQtPanel::Position position)
-{
-    if (LXQtPanel::canPlacedOn(screen, position))
-        ui->comboBox_position->addItem(name, QVariant::fromValue((ScreenPosition){screen, position}));
-}
-
-
-/************************************************
- *
- ************************************************/
-int ConfigPanelWidget::indexForPosition(int screen, ILXQtPanel::Position position)
-{
-    for (int i = 0; i < ui->comboBox_position->count(); i++)
-    {
-        ScreenPosition sp = ui->comboBox_position->itemData(i).value<ScreenPosition>();
-        if (screen == sp.screen && position == sp.position)
-            return i;
-    }
-    return -1;
-}
-
-
-/************************************************
- *
- ************************************************/
-ConfigPanelWidget::~ConfigPanelWidget()
-{
-    delete ui;
-}
-
-
-/************************************************
- *
- ************************************************/
-void ConfigPanelWidget::editChanged()
-{
-    mPanel->setPanelSize(ui->spinBox_panelSize->value(), true);
-    mPanel->setIconSize(ui->spinBox_iconSize->value(), true);
-    mPanel->setLineCount(ui->spinBox_lineCount->value(), true);
-
-    mPanel->setLength(ui->spinBox_length->value(),
-                      ui->comboBox_lenghtType->currentIndex() == 0,
-                      true);
-
-    LXQtPanel::Alignment align = LXQtPanel::Alignment(
-        ui->comboBox_alignment->itemData(
-            ui->comboBox_alignment->currentIndex()
-        ).toInt());
-
-    mPanel->setAlignment(align, true);
-    mPanel->setPosition(mScreenNum, mPosition, true);
-    mPanel->setHidable(ui->checkBox_hidable->isChecked(), true);
-    mPanel->setAnimationTime(ui->spinBox_animation->value(), true);
-    mPanel->setShowDelay(ui->spinBox_delay->value(), true);
-
-    mPanel->setFontColor(ui->checkBox_customFontColor->isChecked() ? mFontColor : QColor(), true);
-    if (ui->checkBox_customBgColor->isChecked())
-    {
-        mPanel->setBackgroundColor(mBackgroundColor, true);
-        mPanel->setOpacity(ui->slider_opacity->value(), true);
-    }
-    else
-    {
-        mPanel->setBackgroundColor(QColor(), true);
-        mPanel->setOpacity(100, true);
-    }
-
-    QString image = ui->checkBox_customBgImage->isChecked() ? ui->lineEdit_customBgImage->text() : QString();
-    mPanel->setBackgroundImage(image, true);
-}
-
-
-/************************************************
- *
- ************************************************/
-void ConfigPanelWidget::widthTypeChanged()
-{
-    int max = getMaxLength();
-
-    if (ui->comboBox_lenghtType->currentIndex() == 0)
-    {
-        // Percents .............................
-        int v = ui->spinBox_length->value() * 100.0 / max;
-        ui->spinBox_length->setRange(1, 100);
-        ui->spinBox_length->setValue(v);
-    }
-    else
-    {
-        // Pixels ...............................
-        int v =  max / 100.0 * ui->spinBox_length->value();
-        ui->spinBox_length->setRange(-max, max);
-        ui->spinBox_length->setValue(v);
-    }
-}
-
-
-/************************************************
- *
- ************************************************/
-int ConfigPanelWidget::getMaxLength()
-{
-    QDesktopWidget* dw = QApplication::desktop();
-
-    if (mPosition == ILXQtPanel::PositionTop ||
-        mPosition == ILXQtPanel::PositionBottom)
-        return dw->screenGeometry(mScreenNum).width();
-    else
-        return dw->screenGeometry(mScreenNum).height();
-}
-
-
-/************************************************
- *
- ************************************************/
-void ConfigPanelWidget::positionChanged()
-{
-    ScreenPosition sp = ui->comboBox_position->itemData(
-        ui->comboBox_position->currentIndex()).value<ScreenPosition>();
-
-        bool updateAlig = (sp.position == ILXQtPanel::PositionTop ||
-        sp.position == ILXQtPanel::PositionBottom) !=
-        (mPosition   == ILXQtPanel::PositionTop ||
-        mPosition   == ILXQtPanel::PositionBottom);
-
-        int oldMax = getMaxLength();
-        mPosition = sp.position;
-        mScreenNum = sp.screen;
-        int newMax = getMaxLength();
-
-        if (ui->comboBox_lenghtType->currentIndex() == 1 &&
-            oldMax != newMax)
-        {
-            // Pixels ...............................
-            int v = ui->spinBox_length->value() * 1.0 * newMax / oldMax;
-            ui->spinBox_length->setMaximum(newMax);
-            ui->spinBox_length->setValue(v);
-        }
-
-        if (updateAlig)
-            fillComboBox_alignment();
-
-        editChanged();
-}
-
-/************************************************
- *
- ************************************************/
-void ConfigPanelWidget::pickFontColor()
-{
-    QColorDialog d(QColor(mFontColor.name()), this);
-    d.setWindowTitle(tr("Pick color"));
-    d.setWindowModality(Qt::WindowModal);
-    if (d.exec() && d.currentColor().isValid())
-    {
-        mFontColor.setNamedColor(d.currentColor().name());
-        ui->pushButton_customFontColor->setStyleSheet(QString("background: %1").arg(mFontColor.name()));
-        editChanged();
-    }
-}
-
-/************************************************
- *
- ************************************************/
-void ConfigPanelWidget::pickBackgroundColor()
-{
-    QColorDialog d(QColor(mBackgroundColor.name()), this);
-    d.setWindowTitle(tr("Pick color"));
-    d.setWindowModality(Qt::WindowModal);
-    if (d.exec() && d.currentColor().isValid())
-    {
-        mBackgroundColor.setNamedColor(d.currentColor().name());
-        ui->pushButton_customBgColor->setStyleSheet(QString("background: %1").arg(mBackgroundColor.name()));
-        editChanged();
-    }
-}
-
-/************************************************
- *
- ************************************************/
-void ConfigPanelWidget::pickBackgroundImage()
-{
-    QString picturesLocation;
-    picturesLocation = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
-
-    QFileDialog* d = new QFileDialog(this, tr("Pick image"), picturesLocation, tr("Images (*.png *.gif *.jpg)"));
-    d->setAttribute(Qt::WA_DeleteOnClose);
-    d->setWindowModality(Qt::WindowModal);
-    connect(d, &QFileDialog::fileSelected, ui->lineEdit_customBgImage, &QLineEdit::setText);
-    d->show();
-}
-
--- a/panel/config/configpanelwidget.h
+++ b/panel/config/configpanelwidget.h
@ -1,102 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXDE-Qt - a lightweight, Qt based, desktop toolset
- * http://razor-qt.org
- *
- * Copyright: 2010-2011 Razor team
- * Authors:
- *   Marat "Morion" Talipov <morion.self@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 CONFIGPANELWIDGET_H
-#define CONFIGPANELWIDGET_H
-
-#include "../lxqtpanel.h"
-#include <QSettings>
-#include <QTimer>
-#include <LXQt/ConfigDialog>
-
-class LXQtPanel;
-
-namespace Ui {
-    class ConfigPanelWidget;
-}
-
-class ConfigPanelWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit ConfigPanelWidget(LXQtPanel *panel, QWidget *parent = 0);
-    ~ConfigPanelWidget();
-
-    int screenNum() const { return mScreenNum; }
-    ILXQtPanel::Position position() const { return mPosition; }
-
-signals:
-    void changed();
-
-public slots:
-    void reset();
-
-private slots:
-    void editChanged();
-    void widthTypeChanged();
-    void positionChanged();
-    void pickFontColor();
-    void pickBackgroundColor();
-    void pickBackgroundImage();
-
-private:
-    Ui::ConfigPanelWidget *ui;
-    LXQtPanel *mPanel;
-    int mScreenNum;
-    ILXQtPanel::Position mPosition;
-
-    void addPosition(const QString& name, int screen, LXQtPanel::Position position);
-    void fillComboBox_position();
-    void fillComboBox_alignment();
-    int indexForPosition(int screen, ILXQtPanel::Position position);
-    int getMaxLength();
-
-    // new values
-    QColor mFontColor;
-    QColor mBackgroundColor;
-
-    // old values for reset
-    int mOldPanelSize;
-    int mOldIconSize;
-    int mOldLineCount;
-    int mOldLength;
-    bool mOldLengthInPercents;
-    LXQtPanel::Alignment mOldAlignment;
-    ILXQtPanel::Position mOldPosition;
-    bool mOldHidable;
-    int mOldAnimation;
-    int mOldShowDelay;
-    int mOldScreenNum;
-    QColor mOldFontColor;
-    QColor mOldBackgroundColor;
-    QString mOldBackgroundImage;
-    int mOldOpacity;
-    bool mOldReserveSpace;
-};
-
-#endif
--- a/panel/config/configpanelwidget.ui
+++ b/panel/config/configpanelwidget.ui
@ -1,675 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ConfigPanelWidget</class>
- <widget class="QWidget" name="ConfigPanelWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>382</width>
-    <height>517</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Configure panel</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QGroupBox" name="groupBox_size">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string>Size</string>
-     </property>
-     <property name="checkable">
-      <bool>false</bool>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
-      <item>
-       <widget class="QWidget" name="widget_8" native="true">
-        <layout class="QGridLayout" name="gridLayout_4">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item row="1" column="1">
-          <widget class="QSpinBox" name="spinBox_length">
-           <property name="toolTip">
-            <string>&lt;p&gt;Negative pixel value sets the panel length to that many pixels less than available screen space.&lt;/p&gt;&lt;p/&gt;&lt;p&gt;&lt;i&gt;E.g. &quot;Length&quot; set to -100px, screen size is 1000px, then real panel length will be 900 px.&lt;/i&gt;&lt;/p&gt;</string>
-           </property>
-           <property name="minimum">
-            <number>1</number>
-           </property>
-           <property name="maximum">
-            <number>100</number>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="0">
-          <widget class="QLabel" name="label">
-           <property name="text">
-            <string>Size:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="label_length">
-           <property name="text">
-            <string>Length:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="2">
-          <widget class="QComboBox" name="comboBox_lenghtType">
-           <item>
-            <property name="text">
-             <string>%</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>px</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item row="0" column="1" colspan="2">
-          <widget class="QSpinBox" name="spinBox_panelSize">
-           <property name="suffix">
-            <string> px</string>
-           </property>
-           <property name="value">
-            <number>24</number>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::MinimumExpanding</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>5</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QWidget" name="widget_9" native="true">
-        <layout class="QGridLayout" name="gridLayout">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item row="0" column="1">
-          <widget class="QSpinBox" name="spinBox_iconSize">
-           <property name="suffix">
-            <string> px</string>
-           </property>
-           <property name="minimum">
-            <number>10</number>
-           </property>
-           <property name="maximum">
-            <number>128</number>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="0">
-          <widget class="QLabel" name="label_iconSize">
-           <property name="text">
-            <string>Icon size:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="label_lineCount">
-           <property name="text">
-            <string>Rows count:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QSpinBox" name="spinBox_lineCount">
-           <property name="minimum">
-            <number>1</number>
-           </property>
-           <property name="maximum">
-            <number>20</number>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string>Alignment &amp;&amp; position</string>
-     </property>
-     <layout class="QFormLayout" name="formLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_alignment">
-        <property name="text">
-         <string>Alignment:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="comboBox_alignment">
-        <property name="currentIndex">
-         <number>1</number>
-        </property>
-        <item>
-         <property name="text">
-          <string>Left</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Center</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Right</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_position">
-        <property name="text">
-         <string>Position:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QComboBox" name="comboBox_position"/>
-      </item>
-      <item row="2" column="0" colspan="2">
-       <widget class="QGroupBox" name="checkBox_hidable">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
-        <property name="title">
-         <string>A&amp;uto-hide</string>
-        </property>
-        <property name="checkable">
-         <bool>true</bool>
-        </property>
-        <property name="checked">
-         <bool>false</bool>
-        </property>
-        <layout class="QGridLayout" name="gridLayout_2">
-         <item row="0" column="0">
-          <widget class="QLabel" name="label_animation">
-           <property name="toolTip">
-            <string>Zero means no animation</string>
-           </property>
-           <property name="text">
-            <string>Animation duration:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <spacer name="horizontalSpacer_3">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>102</width>
-             <height>5</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item row="0" column="2">
-          <widget class="QSpinBox" name="spinBox_animation">
-           <property name="toolTip">
-            <string>Zero means no animation</string>
-           </property>
-           <property name="suffix">
-            <string> ms</string>
-           </property>
-           <property name="maximum">
-            <number>500</number>
-           </property>
-           <property name="singleStep">
-            <number>50</number>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="label_delay">
-           <property name="toolTip">
-            <string>Zero means no delay</string>
-           </property>
-           <property name="text">
-            <string>Show with delay:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="2">
-          <widget class="QSpinBox" name="spinBox_delay">
-           <property name="toolTip">
-            <string>Zero means no delay</string>
-           </property>
-           <property name="suffix">
-            <string> ms</string>
-           </property>
-           <property name="maximum">
-            <number>2000</number>
-           </property>
-           <property name="singleStep">
-            <number>50</number>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="3" column="0" colspan="2">
-       <widget class="QCheckBox" name="checkBox_reserveSpace">
-        <property name="toolTip">
-         <string>Don't allow maximized windows go under the panel window</string>
-        </property>
-        <property name="text">
-         <string>Reserve space on display</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string>Custom styling</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_3">
-      <item row="0" column="0" colspan="5">
-       <widget class="QWidget" name="widget_6" native="true">
-        <layout class="QHBoxLayout" name="horizontalLayout_6">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QCheckBox" name="checkBox_customFontColor">
-           <property name="text">
-            <string>Font color:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="pushButton_customFontColor">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="styleSheet">
-            <string notr="true"/>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-           <property name="icon">
-            <iconset theme="color-picker">
-             <normaloff>../../../../../.designer/backup</normaloff>../../../../../.designer/backup</iconset>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer_2">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::MinimumExpanding</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>5</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="checkBox_customBgColor">
-           <property name="text">
-            <string>Background color:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="pushButton_customBgColor">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="styleSheet">
-            <string notr="true"/>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-           <property name="icon">
-            <iconset theme="color-picker">
-             <normaloff>../../../../../.designer/backup</normaloff>../../../../../.designer/backup</iconset>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="2" column="0" colspan="5">
-       <widget class="QWidget" name="widget_3" native="true">
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-         <property name="spacing">
-          <number>6</number>
-         </property>
-         <property name="leftMargin">
-          <number>6</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="label_2">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="text">
-            <string>Background opacity:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QSlider" name="slider_opacity">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="maximum">
-            <number>100</number>
-           </property>
-           <property name="pageStep">
-            <number>5</number>
-           </property>
-           <property name="value">
-            <number>100</number>
-           </property>
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="3" column="0" colspan="5">
-       <widget class="QLabel" name="compositingL">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="text">
-         <string>&lt;small&gt;Compositing is required for panel transparency.&lt;/small&gt;</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0" colspan="2">
-       <widget class="QWidget" name="widget" native="true">
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-        </layout>
-       </widget>
-      </item>
-      <item row="5" column="0">
-       <widget class="QCheckBox" name="checkBox_customBgImage">
-        <property name="text">
-         <string>Background image:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1" colspan="4">
-       <widget class="QWidget" name="widget_4" native="true">
-        <layout class="QHBoxLayout" name="horizontalLayout_4">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QLineEdit" name="lineEdit_customBgImage">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="pushButton_customBgImage">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="styleSheet">
-            <string notr="true"/>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-           <property name="icon">
-            <iconset theme="insert-image">
-             <normaloff>../../../../../.designer/backup</normaloff>../../../../../.designer/backup</iconset>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>checkBox_customBgColor</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>pushButton_customBgColor</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>144</x>
-     <y>332</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>350</x>
-     <y>350</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>checkBox_customBgImage</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>lineEdit_customBgImage</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>137</x>
-     <y>403</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>149</x>
-     <y>440</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>checkBox_customBgImage</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>pushButton_customBgImage</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>125</x>
-     <y>403</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>350</x>
-     <y>441</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>checkBox_customFontColor</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>pushButton_customFontColor</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>190</x>
-     <y>294</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>350</x>
-     <y>312</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>checkBox_customBgColor</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>slider_opacity</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>99</x>
-     <y>333</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>114</x>
-     <y>367</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>checkBox_customBgColor</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>label_2</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>34</x>
-     <y>341</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>32</x>
-     <y>362</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>checkBox_customBgColor</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>compositingL</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
--- a/panel/config/configpluginswidget.cpp
+++ b/panel/config/configpluginswidget.cpp
@ -1,118 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXDE-Qt - 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 "configpluginswidget.h"
-#include "ui_configpluginswidget.h"
-#include "addplugindialog.h"
-#include "panelpluginsmodel.h"
-#include "../plugin.h"
-#include "../ilxqtpanelplugin.h"
-
-#include <HtmlDelegate>
-#include <QPushButton>
-#include <QItemSelectionModel>
-
-ConfigPluginsWidget::ConfigPluginsWidget(LXQtPanel *panel, QWidget* parent) :
-    QWidget(parent),
-    ui(new Ui::ConfigPluginsWidget),
-    mPanel(panel)
-{
-    ui->setupUi(this);
-
-    PanelPluginsModel * plugins = mPanel->mPlugins.data();
-    {
-        QScopedPointer<QItemSelectionModel> m(ui->listView_plugins->selectionModel());
-        ui->listView_plugins->setModel(plugins);
-    }
-    {
-        QScopedPointer<QAbstractItemDelegate> d(ui->listView_plugins->itemDelegate());
-        ui->listView_plugins->setItemDelegate(new LXQt::HtmlDelegate(QSize(16, 16), ui->listView_plugins));
-    }
-
-    resetButtons();
-
-    connect(ui->listView_plugins->selectionModel(), &QItemSelectionModel::selectionChanged,
-            this, &ConfigPluginsWidget::resetButtons);
-
-    connect(ui->pushButton_moveUp,      &QToolButton::clicked, [this, plugins] { plugins->onMovePluginUp(ui->listView_plugins->currentIndex()); });
-    connect(ui->pushButton_moveDown,    &QToolButton::clicked, [this, plugins] { plugins->onMovePluginDown(ui->listView_plugins->currentIndex()); });
-
-    connect(ui->pushButton_addPlugin, &QPushButton::clicked, this, &ConfigPluginsWidget::showAddPluginDialog);
-    connect(ui->pushButton_removePlugin, &QToolButton::clicked, [this, plugins] { plugins->onRemovePlugin(ui->listView_plugins->currentIndex()); });
-
-    connect(ui->pushButton_pluginConfig, &QToolButton::clicked, [this, plugins] { plugins->onConfigurePlugin(ui->listView_plugins->currentIndex()); });
-
-    connect(plugins, &PanelPluginsModel::pluginAdded, this, &ConfigPluginsWidget::resetButtons);
-    connect(plugins, &PanelPluginsModel::pluginRemoved, this, &ConfigPluginsWidget::resetButtons);
-    connect(plugins, &PanelPluginsModel::pluginMoved, this, &ConfigPluginsWidget::resetButtons);
-}
-
-ConfigPluginsWidget::~ConfigPluginsWidget()
-{
-    delete ui;
-}
-
-void ConfigPluginsWidget::reset()
-{
-
-}
-
-void ConfigPluginsWidget::showAddPluginDialog()
-{
-    if (mAddPluginDialog.isNull())
-    {
-        mAddPluginDialog.reset(new AddPluginDialog);
-        connect(mAddPluginDialog.data(), &AddPluginDialog::pluginSelected,
-                mPanel->mPlugins.data(), &PanelPluginsModel::addPlugin);
-    }
-    mAddPluginDialog->show();
-    mAddPluginDialog->raise();
-    mAddPluginDialog->activateWindow();
-}
-
-void ConfigPluginsWidget::resetButtons()
-{
-    PanelPluginsModel *model = mPanel->mPlugins.data();
-    QItemSelectionModel *selectionModel = ui->listView_plugins->selectionModel();
-    bool hasSelection = selectionModel->hasSelection();
-    bool isFirstSelected = selectionModel->isSelected(model->index(0));
-    bool isLastSelected = selectionModel->isSelected(model->index(model->rowCount() - 1));
-
-    bool hasConfigDialog = false;
-    if (hasSelection)
-    {
-        Plugin const * plugin
-            = ui->listView_plugins->model()->data(selectionModel->currentIndex(), Qt::UserRole).value<Plugin const *>();
-        if (nullptr != plugin)
-            hasConfigDialog = plugin->iPlugin()->flags().testFlag(ILXQtPanelPlugin::HaveConfigDialog);
-    }
-
-    ui->pushButton_removePlugin->setEnabled(hasSelection);
-    ui->pushButton_moveUp->setEnabled(hasSelection && !isFirstSelected);
-    ui->pushButton_moveDown->setEnabled(hasSelection && !isLastSelected);
-    ui->pushButton_pluginConfig->setEnabled(hasSelection && hasConfigDialog);
-}
--- a/panel/config/configpluginswidget.h
+++ b/panel/config/configpluginswidget.h
@ -1,64 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXDE-Qt - 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 CONFIGPLUGINSWIDGET_H
-#define CONFIGPLUGINSWIDGET_H
-
-#include "../lxqtpanel.h"
-
-#include <QWidget>
-
-namespace Ui {
-    class ConfigPluginsWidget;
-}
-class AddPluginDialog;
-
-class ConfigPluginsWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    ConfigPluginsWidget(LXQtPanel *panel, QWidget* parent = 0);
-    ~ConfigPluginsWidget();
-
-signals:
-    void changed();
-
-public slots:
-    void reset();
-
-private slots:
-    void showAddPluginDialog();
-    void resetButtons();
-
-private:
-    Ui::ConfigPluginsWidget *ui;
-    QScopedPointer<AddPluginDialog> mAddPluginDialog;
-    LXQtPanel *mPanel;
-};
-
-#endif
--- a/panel/config/configpluginswidget.ui
+++ b/panel/config/configpluginswidget.ui
@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ConfigPluginsWidget</class>
- <widget class="QWidget" name="ConfigPluginsWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>339</width>
-    <height>220</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Configure Plugins</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QWidget" name="widget" native="true">
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QListView" name="listView_plugins">
-        <property name="sizeAdjustPolicy">
-         <enum>QAbstractScrollArea::AdjustToContents</enum>
-        </property>
-        <property name="alternatingRowColors">
-         <bool>true</bool>
-        </property>
-        <property name="selectionMode">
-         <enum>QAbstractItemView::SingleSelection</enum>
-        </property>
-        <property name="selectionBehavior">
-         <enum>QAbstractItemView::SelectRows</enum>
-        </property>
-        <property name="verticalScrollMode">
-         <enum>QAbstractItemView::ScrollPerPixel</enum>
-        </property>
-        <property name="flow">
-         <enum>QListView::TopToBottom</enum>
-        </property>
-        <property name="resizeMode">
-         <enum>QListView::Adjust</enum>
-        </property>
-        <property name="spacing">
-         <number>0</number>
-        </property>
-        <property name="uniformItemSizes">
-         <bool>false</bool>
-        </property>
-        <property name="selectionRectVisible">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>Note: changes made in this page cannot be reset.</string>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QWidget" name="widget_5" native="true">
-     <layout class="QVBoxLayout" name="verticalLayout_3">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QToolButton" name="pushButton_moveUp">
-        <property name="toolTip">
-         <string>Move up</string>
-        </property>
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="icon">
-         <iconset theme="go-up">
-          <normaloff>../../../../../.designer/backup</normaloff>../../../../../.designer/backup</iconset>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="pushButton_moveDown">
-        <property name="toolTip">
-         <string>Move down</string>
-        </property>
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="icon">
-         <iconset theme="go-down">
-          <normaloff>../../../../../.designer/backup</normaloff>../../../../../.designer/backup</iconset>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="Line" name="line">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="pushButton_addPlugin">
-        <property name="toolTip">
-         <string>Add</string>
-        </property>
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="icon">
-         <iconset theme="list-add">
-          <normaloff>../../../../../.designer/backup</normaloff>../../../../../.designer/backup</iconset>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="pushButton_removePlugin">
-        <property name="toolTip">
-         <string>Remove</string>
-        </property>
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="icon">
-         <iconset theme="list-remove">
-          <normaloff>../../../../../.designer/backup</normaloff>../../../../../.designer/backup</iconset>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="Line" name="line_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="pushButton_pluginConfig">
-        <property name="toolTip">
-         <string>Configure</string>
-        </property>
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="icon">
-         <iconset theme="preferences-other">
-          <normaloff>../../../../../.designer/backup</normaloff>../../../../../.designer/backup</iconset>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
--- a/panel/ilxqtpanel.h
+++ b/panel/ilxqtpanel.h
@ -1,115 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXDE-Qt - a lightweight, Qt based, desktop toolset
- * http://razor-qt.org
- *
- * Copyright: 2012 Razor team
- * Authors:
- *   Alexander Sokoloff <sokoloff.a@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 ILXQTPANEL_H
-#define ILXQTPANEL_H
-#include <QRect>
-#include "lxqtpanelglobals.h"
-
-class ILXQtPanelPlugin;
-class QWidget;
-
-/**
- **/
-class LXQT_PANEL_API ILXQtPanel
-{
-public:
-    /**
-     * @brief Specifies the position of the panel on screen.
-     */
-    enum Position{
-        PositionBottom, //!< The bottom side of the screen.
-        PositionTop,    //!< The top side of the screen.
-        PositionLeft,   //!< The left side of the screen.
-        PositionRight   //!< The right side of the screen.
-    };
-
-    /**
-     * @brief Returns the position of the panel. Possible values for the
-     * return value are described by the Position enum.
-     */
-    virtual Position position() const = 0;
-
-    /**
-     * @brief Returns the edge length of the icons that are shown on the panel
-     * in pixels. The icons are square.
-     */
-    virtual int iconSize() const = 0;
-    /**
-     * @brief Returns the number of lines/rows of this panel.
-     */
-    virtual int lineCount() const = 0;
-
-    /**
-     * @brief Helper function for convenient direction/alignment checking.
-     * @return True if the panel is on the top or the bottom of the
-     * screen; otherwise returns false.
-     */
-    bool isHorizontal() const { return position() == PositionBottom || position() == PositionTop; }
-
-    /**
-     * @brief Helper method that returns the global screen coordinates of the
-     * panel, so you do not need to use QWidget::mapToGlobal() by yourself.
-     * @return The QRect where the panel is located in global screen
-     * coordinates.
-     */
-    virtual QRect globalGometry() const = 0;
-
-    /**
-     * @brief Helper method for calculating the global screen position of a
-     * popup window with size windowSize.
-     * @param absolutePos Contains the global screen coordinates where the
-     * popup should be appear, i.e. the point where the user has clicked.
-     * @param windowSize The size that the window will occupy.
-     * @return The global screen position where the popup window can be shown.
-     */
-    virtual QRect calculatePopupWindowPos(const QPoint &absolutePos, const QSize &windowSize) const = 0;
-    /**
-     * @brief Helper method for calculating the global screen position of a
-     * popup window with size windowSize. The parameter plugin should be a
-     * plugin
-     * @param plugin Plugin that the popup window will belong to. The position
-     * will be calculated according to the position of the plugin in the panel.
-     * @param windowSize The size that the window will occupy.
-     * @return The global screen position where the popup window can be shown.
-     */
-    virtual QRect calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const QSize &windowSize) const = 0;
-
-    /*!
-     * \brief By calling this function, a plugin (or any other object) notifies the panel
-     * about showing a (standalone) window/menu -> the panel needs this to avoid "hiding" in case any
-     * standalone window is shown. The widget/window must be shown later than this notification call because
-     * the panel needs to observe its show/hide/close events.
-     *
-     * \param w the window that will be shown
-     *
-     */
-    virtual void willShowWindow(QWidget * w) = 0;
-};
-
-#endif // ILXQTPANEL_H
--- a/panel/ilxqtpanelplugin.h
+++ b/panel/ilxqtpanelplugin.h
@ -1,241 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXDE-Qt - a lightweight, Qt based, desktop toolset
- * http://razor-qt.org
- *
- * Copyright: 2012 Razor team
- * Authors:
- *   Alexander Sokoloff <sokoloff.a@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 ILXQTPANELPLUGIN_H
-#define ILXQTPANELPLUGIN_H
-
-#include <QtPlugin>
-#include "ilxqtpanel.h"
-#include "lxqtpanelglobals.h"
-
-/**
-LXQt panel plugins are standalone sharedlibraries
-(*.so) located in PLUGIN_DIR (define provided by CMakeLists.txt).
-
-Plugin for the panel is a library written in C++. One more necessary thing
-is a .desktop file describing this plugin. The same may be additional files,
-like translations. Themselves plugins will be installed to
-/usr/local/lib/lxqt-panel or /usr/lib/lxqt-panel (dependent on cmake option
-DCMAKE_INSTALL_PREFIX). Desktop files are installed to
-/usr/local/share/lxqt/lxqt-panel, translations to
-/usr/local/share/lxqt/lxqt-panel/PLUGIN_NAME.
-**/
-
-class QDialog;
-class PluginSettings;
-namespace LXQt
-{
-    class PluginInfo;
-}
-
-struct LXQT_PANEL_API ILXQtPanelPluginStartupInfo
-{
-    ILXQtPanel *lxqtPanel;
-    PluginSettings *settings;
-    const LXQt::PluginInfo *desktopFile;
-};
-
-
-/** \brief Base abstract class for LXQt panel widgets/plugins.
-All plugins *must* be inherited from this one.
-
-This class provides some basic API and inherited/implemented
-plugins GUIs will be responsible on the functionality itself.
-**/
-
-class LXQT_PANEL_API ILXQtPanelPlugin
-{
-public:
-    /**
-      This enum describes the properties of a plugin.
-     **/
-    enum Flag {
-        NoFlags              = 0,   ///< It does not have any properties set.
-        PreferRightAlignment = 1,   /**< The plugin prefers right alignment (for example the clock plugin);
-                                        otherwise the plugin prefers left alignment (like main menu).
-                                        This flag is used only at the first start, later positions of all
-                                        plugins are saved in a config, and this saved information is used. */
-        HaveConfigDialog     = 2,   ///< The plugin have a configuration dialog.
-        SingleInstance       = 4,   ///< The plugin allows only one instance to run.
-        NeedsHandle          = 8    ///< The plugin needs a handle for the context menu
-    };
-
-    Q_DECLARE_FLAGS(Flags, Flag)
-
-    /**
-      This enum describes the reason the plugin was activated.
-     **/
-    enum ActivationReason {
-        Unknown             = 0,    ///< Unknown reason
-        DoubleClick         = 2,    ///<	The plugin entry was double clicked
-        Trigger             = 3,    ///<	The plugin was clicked
-        MiddleClick         = 4     ///< The plugin was clicked with the middle mouse button
-    };
-
-    /**
-     Constructs an ILXQtPanelPlugin object with the given startupInfo. You do not have to worry
-     about the startupInfo parameters, ILXQtPanelPlugin processes the parameters itself.
-     **/
-    ILXQtPanelPlugin(const ILXQtPanelPluginStartupInfo &startupInfo):
-        mSettings(startupInfo.settings),
-        mPanel(startupInfo.lxqtPanel),
-        mDesktopFile(startupInfo.desktopFile)
-    {}
-
-    /**
-     Destroys the object.
-     **/
-    virtual ~ILXQtPanelPlugin() {}
-
-    /**
-    Returns the plugin flags.
-    The base class implementation returns a NoFlags.
-     **/
-    virtual Flags flags() const { return NoFlags; }
-
-    /**
-    Returns the string that is used in the theme QSS file.
-    If you return "WorldClock" string, theme author may write something like `#WorldClock { border: 1px solid red; }`
-    to set a custom border for your plugin.
-    **/
-    virtual QString themeId() const = 0;
-
-    /**
-     From the user's point of view, your plugin is some visual widget on the panel. This function returns a pointer to it.
-     This method is called only once, so you are free to return the pointer on a class member, or create the widget on the fly.
-     **/
-    virtual QWidget *widget() = 0;
-
-    /**
-    Returns the plugin settings dialog. Reimplement this function if your plugin has it.
-    The panel does not take ownership of the dialog, it is probably a good idea to set Qt::WA_DeleteOnClose
-    attribute for the dialog.
-    The default implementation returns 0, no dialog;
-
-    Note that the flags method has to return HaveConfigDialog flag.
-    To save the settings you should use a ready-to-use ILXQtPanelPlugin::settings() object.
-
-    **/
-    virtual QDialog *configureDialog() { return 0; }
-
-    /**
-    This function is called when values are changed in the plugin settings.
-    Reimplement this function to your plugin corresponded the new settings.
-
-    The default implementation do nothing.
-    **/
-    virtual void settingsChanged() {}
-
-    /**
-    This function is called when the user activates the plugin. reason specifies the reason for activation.
-    ILXQtPanelPlugin::ActivationReason enumerates the various reasons.
-
-    The default implementation do nothing.
-     **/
-    virtual void activated(ActivationReason reason) {}
-
-    /**
-    This function is called when the panel geometry or lines count are changed.
-
-    The default implementation do nothing.
-
-     **/
-    virtual void realign() {}
-
-    /**
-    Returns the panel object.
-     **/
-    ILXQtPanel *panel() const { return mPanel; }
-
-
-    PluginSettings *settings() const { return mSettings; }
-    const LXQt::PluginInfo *desktopFile() const { return mDesktopFile; }
-
-    /**
-     Helper functions for calculating global screen position of some popup window with windowSize size.
-     If you need to show some popup window, you can use it, to get global screen position for the new window.
-     **/
-    virtual QRect calculatePopupWindowPos(const QSize &windowSize)
-    {
-        return mPanel->calculatePopupWindowPos(this, windowSize);
-    }
-
-    /*!
-     * \brief By calling this function plugin notifies the panel about showing a (standalone) window/menu.
-     *
-     * \param w the shown window
-     *
-     */
-    inline void willShowWindow(QWidget * w)
-    {
-        mPanel->willShowWindow(w);
-    }
-
-    virtual bool isSeparate() const { return false;  }
-    virtual bool isExpandable() const { return false; }
-private:
-    PluginSettings *mSettings;
-    ILXQtPanel *mPanel;
-    const LXQt::PluginInfo *mDesktopFile;
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(ILXQtPanelPlugin::Flags)
-
-/**
-Every plugin must have the ILXQtPanelPluginLibrary loader. You should only reimplement the instance() method which should return your plugin.
-Example:
-@code
-class LXQtClockPluginLibrary: public QObject, public ILXQtPanelPluginLibrary
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0")
-    Q_INTERFACES(ILXQtPanelPluginLibrary)
-public:
-    ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) { return new LXQtClock(startupInfo);}
-};
-@endcode
-**/
-class LXQT_PANEL_API ILXQtPanelPluginLibrary
-{
-public:
-    /**
-     Destroys the ILXQtPanelPluginLibrary object.
-     **/
-    virtual ~ILXQtPanelPluginLibrary() {}
-
-    /**
-    Returns the root component object of the plugin. When the library is finally unloaded, the root component will automatically be deleted.
-     **/
-    virtual ILXQtPanelPlugin* instance(const ILXQtPanelPluginStartupInfo &startupInfo) const = 0;
-};
-
-
-Q_DECLARE_INTERFACE(ILXQtPanelPluginLibrary,
-                    "lxde-qt.org/Panel/PluginInterface/3.0")
-
-#endif // ILXQTPANELPLUGIN_H
--- a/panel/lxqtpanel.cpp
+++ b/panel/lxqtpanel.cpp
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Simon Quigley	44882ee268	Apply upstream patch fixing a crash on a custom command.	5 months ago
Aaron Rainbolt	fd6365df82	Move qeyes-types README file to where it belongs	7 months ago
Aaron Rainbolt	cd2bd55b59	Remove a moved directory from the lxqt-panel.install	7 months ago
Aaron Rainbolt	061c453034	Add lxqt-menu-data build dep	7 months ago
Aaron Rainbolt	56eb2dcb06	Bump build deps	7 months ago
Aaron Rainbolt	78bafeec97	Fix copyright file	7 months ago
Aaron Rainbolt	d9ed05f600	Bump version for new upstream release	7 months ago
Simon Quigley	92c312fa11	Upload to Mantic.	10 months ago
Simon Quigley	a0d6712f47	Remove redundant hardening rule.	10 months ago
Simon Quigley	8e7d101288	Fix some build dependencies that were renamed.	10 months ago
Simon Quigley	028929145f	Bump build dependencies.	10 months ago
Simon Quigley	93606d77e9	New upstream release.	10 months ago
Simon Quigley	6bcb16a614	Upload to Lunar.	1 year ago
Simon Quigley	b7472164bb	Add missing entry from the install file.	1 year ago
Simon Quigley	820873539e	Document watch file delta.	1 year ago
Simon Quigley	32fe0ac1ea	Remove some obsolete parts of the rules file, syncing with Debian.	1 year ago
Simon Quigley	ace4e34bbb	Update the copyright file.	1 year ago
Simon Quigley	8ad4e6ee66	We shouldn't remove the Salsa CI file as part of the delta.	1 year ago
Simon Quigley	f326631c35	Merge in debian/control.	1 year ago
Simon Quigley	e61b40dfb2	New changelog entry.	1 year ago
Simon Quigley	fe87874b79	Upload to Lunar.	2 years ago
Simon Quigley	2e246947f8	Minor copyright updates.	2 years ago
Simon Quigley	ee19df87ab	Less Rs.	2 years ago
Simon Quigley	25b2e6b34b	Lubuntuify the package slightly, to make debhelper happy.	2 years ago
Simon Quigley	9d5b1225d8	Bump Standards-version to 4.6.1, no changes needed.	2 years ago
Simon Quigley	5f63969a22	Bump build dependencies in debian/control.	2 years ago
Simon Quigley	b1548fe065	Fix the watch file, for real this time.	2 years ago
Simon Quigley	bd12faebd9	New upstream release.	2 years ago
Simon Quigley	2a38ff7e2b	Add some missing build dependencies.	2 years ago
Simon Quigley	79c7c121a2	Upload to Kinetic.	2 years ago
Simon Quigley	b987625e63	Drop old Breaks/Replaces since we're past the LTS. Update the runtime dependencies too.	2 years ago
Simon Quigley	5540a9b11d	Bumped build dependencies.	2 years ago
Simon Quigley	cbef7a6dea	New upstream release.	2 years ago
apt-ghetto	f3f136d899	New upstream release for lxqt-panel Summary: Packaged new upstream version 0.17.1 of lxqt-panel Updated changelog, control and copyright Test Plan: Successfully built on https://launchpad.net/~apt-ghetto/+archive/ubuntu/ludev Reviewers: kc2bez Reviewed By: kc2bez Differential Revision: https://phab.lubuntu.me/D130	3 years ago
Raman Sarda	2d271d3ad8	New upstream version.	3 years ago
Simon Quigley	31bbcecc2a	Upload to Groovy.	4 years ago
Simon Quigley	3c8fdee35b	Update LXQt build depends.	4 years ago
Simon Quigley	a989b7a09c	Run wrap-and-sort.	4 years ago
Simon Quigley	72b733018c	Bump Standards-version to 4.5.0, no changes needed.	4 years ago
Simon Quigley	1b2f20e3ad	Update upstream signing key.	4 years ago
Simon Quigley	f90e559cac	New upstream release.	4 years ago
Raman Sarda	d8e78c972c	Updated rules and copyright.	4 years ago
Raman Sarda	b03e9d7595	Correctly Merge from Merge-o-Matic Summary: * Bumped minimum requirements in control file * Copyright updates. * Updated debian/watch to point to correct source. * Updated debian/upstream/metadata Test Plan: Lookout if anything breaks due to the update. Also check about debhelper and debhelper-compat. Reviewers: rikmills, wxl Differential Revision: https://phab.lubuntu.me/D81	4 years ago
Raman Sarda	4ef0632ba2	Merge from Ubuntu Merge-o-Matic	4 years ago
Simon Quigley	e8e9e9401a	Upload to Disco.	5 years ago
Simon Quigley	c43109ce5d	Run wrap-and-sort.	5 years ago
Simon Quigley	fe0f0bd6cb	New upstream release.	5 years ago
Simon Quigley	f2dedd73f4	Upload to Disco.	5 years ago
Simon Quigley	a0418e8556	Remove reverse-applicable patches.	5 years ago
Simon Quigley	3425a55990	Add a new lxqt-panel-l10n package.	5 years ago
Simon Quigley	e1a2304211	Bump build dependencies.	5 years ago
Simon Quigley	a3714bec33	Bump debhelper compat to 12, no changes needed.	5 years ago
Simon Quigley	5107d99afd	Bump Standards-version to 4.3.0, no changes needed.	5 years ago
Simon Quigley	2a5d48a9a1	New upstream release.	5 years ago
Walter Lapchynski	cac77df978	Add optional overriding of icon theme. Summary: Backport of [upstream commit](`1a70479ed9`) Test Plan: I confirmed it built, but I guess someone with more intimacy of the problem should review it. Reviewers: tsimonq2 Reviewed By: tsimonq2 Subscribers: redwolf Differential Revision: https://phab.lubuntu.me/D11	6 years ago
Simon Quigley	d20ac88a1d	Upload to Cosmic.	6 years ago
Simon Quigley	03ff318661	Add an autoexpansion feature to the spacer plugin.	6 years ago
Simon Quigley	82ed4f2785	Update Standards-version to 4.2.0, no changes needed.	6 years ago
Simon Quigley	25d5748997	Change the Uploaders to Ubuntu uploaders.	6 years ago
Simon Quigley	a07087c30b	Upload to Cosmic.	6 years ago
Simon Quigley	a93663a710	Run wrap-and-sort.	6 years ago
Simon Quigley	f107df389c	Bump Standards-version to 4.1.5, no changes needed.	6 years ago
Simon Quigley	9635deb67b	Don't auto-unmute the volume when it's changed.	6 years ago
Simon Quigley	802c9c3b05	Add a DEP-3 header for the patch completely removing the clock plugin.	6 years ago
Simon Quigley	1ba47d736f	Completely remove plugin-clock.	6 years ago
Simon Quigley	347a805025	Upload to Cosmic.	6 years ago
Simon Quigley	ebc520ef52	Remove patches applied upstream.	6 years ago
Simon Quigley	f231ffc0f6	Update copyright.	6 years ago
Simon Quigley	722909b23c	Update build dependencies.	6 years ago
Simon Quigley	88a3fff46b	Remove pristine-tar files.	6 years ago
Simon Quigley	fcc7687eb5	New upstream release.	6 years ago
Simon Quigley	9aba3e7850	Upload to Cosmic.	6 years ago
Simon Quigley	645eb27881	Fix typo in the patch description of fix-memory-leaks.patch.	6 years ago
Simon Quigley	35886724d2	Change the Vcs entries to be Lubuntu-specific.	6 years ago
Simon Quigley	2c417a6c31	Add a merge changelog entry for the last commit.	6 years ago
Simon Quigley	096685b8d8	Merge tag 'debian/0.12.0-9' into ubuntu/cosmic	6 years ago
Alf Gaida	95428aed4d	Some fixes and debian $foo * Ported back USE_MENU_CACHE handling * Removed build dependency on libmenu-cache-dev (Closes: #896512) * Ported back USE_MENU_CACHE handling * Moved lxqt-about from dependencies to recommends (Closes: #894640) * Bumped debhelper version to 11~ * Bumped compat to 11 * Bumped Standards to 4.1.4, no changes needed * Fixed VCS fields for salsa * Removed trailing whitespaces	6 years ago