diff -Nru lxqt-panel-0.14.1/autostart/translations/lxqt-panel_gl.desktop lxqt-panel-0.16.1/autostart/translations/lxqt-panel_gl.desktop --- lxqt-panel-0.14.1/autostart/translations/lxqt-panel_gl.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/autostart/translations/lxqt-panel_gl.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1 @@ +Name[gl]=Panel diff -Nru lxqt-panel-0.14.1/autostart/translations/lxqt-panel_hr.desktop lxqt-panel-0.16.1/autostart/translations/lxqt-panel_hr.desktop --- lxqt-panel-0.14.1/autostart/translations/lxqt-panel_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/autostart/translations/lxqt-panel_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +# Translations +Name[hr]=Ploča diff -Nru lxqt-panel-0.14.1/CHANGELOG lxqt-panel-0.16.1/CHANGELOG --- lxqt-panel-0.14.1/CHANGELOG 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/CHANGELOG 2020-11-05 16:09:19.000000000 +0000 @@ -1,3 +1,68 @@ +lxqt-panel-0.16.1 / 2020-11-04 +============================== + * Fixed compilation with Qt 5.12 and Qt 5.13. + +lxqt-panel-0.16.0 / 2020-11-01 +============================== + * Use a stylesheet for progress-bars of Sensors plugin. + * Implemented auto-hiding for Status Notifier. + * Added option to task button for moving the window to next monitor. + * Added option to place task buttons of new windows next to the existing ones of same class when task buttons are ungrouped. + * Removed incorrect and redundant explanation of milliseconds from World Clock. + * Don't call non-const member functions on temporaries. + * Prevent possible C++11 range loop container detachment. + * Fixed the sizes and alignments of some plugins at startup. + * Added right-click menu to main menu items. + * Address deprecation warnings/errors. + * Added XF86Eject button action. + +lxqt-panel-0.15.1 / 2020-05-20 +============================== + * Bumped version to 0.15.1. + * Fixed a problem in keyboard indicator flag, that might cause a huge amount of error messages. + * Let the panel be at virtual screen edges but not between screens. + +lxqt-panel-0.15.0 / 2020-04-22 +============================== + * Bumped version to 0.15.0. + * Fixed cut text in World Clock text. + * Silenced some compiler warnings. + * Show (the old) system tray icons in a predictable order and add a spacing between them. + * Made showing of the week number optional in World Clock. + * Fixed icons of applications like Skype, Doscord, etc. in Status Notifier. + * Fixed possible abort on assert in WindowNotifier. + * Don't include headers of plugins that aren't being built. + * Fetch window icons in an appropriate size to avoid scaling in task bar. + * Don't (possibly) block on initializing statusnotifier. + * Avoid char raw strings literals memory allocations. + * Don't use automatic string conversions. + * Override the menu icon size only if a custom font size is selected. + * Enhance service name registration in statusnotifier. + * Fixed a crash in LXQtTaskButton under kwin_wayland. + * Only show group popup on left clicking a grouping task button. + * Added the option "Show only active desktop" to Desktop Switcher. + * Better text eliding and painting of task buttons. + * Smoother menu search. + * Added an option to toggle volume notifications with keyboard. + * Made quicklaunch respect Panel's lock state. + * Added hints for Ctrl+DND to Quick Launch. + * Cleanup and fixes for the taksbar code. + * Release mouse after task button DND (to prevent them from remaining pressed after being dragged). + * Reset panel style sheet before updating it (to update plugin handles with Qt ≥ 5.13 when panel orientation changes). + * Removed press-and-hold popup menu from launchers in Quick Launch. + * Check if panel is under mouse on auto-hiding. + * Removed QDesktopWidget from panel. + * Put panel only at an edge of virtual screen (to prevent it from being positioned at the middle of virtual screen). + * Set the geometry of panel before showing it (because, otherwise. some WMs might not position the panel correctly). + * Removed deprecated QImage method `byteCount()` and used `sizeInBytes()` instead. + * Remove deprecated `trUtf8()` and used `tr()` instead. + * Fixd eventFilter() logic in kbindicator. + * Set alignment for layout button in kbindicator. + * Add basic support for country flags to Keyboard status indicator. + * Fixed high CPU usage of Desktop Switcher. + * Added an option to Task Manager for moving window with mouse wheel. + * Added a plugin to change display backlight. + lxqt-panel-0.14.1 / 2019-02-25 ============================== @@ -6,7 +71,7 @@ lxqt-panel-0.14.0 / 2019-01-25 ============================== - + * New implemented: plugin-spacer: Add auto-expansion feature * Deprecated plugin-clock finally removed * Implementation fixed: @@ -1021,7 +1086,7 @@ * New panel layout and many changes * Improve icons handling. * Clock panel plugin: update time once a minute if no seconds displayed - * SysStat: license updated & unused files removed + * SysStat: license updated & unused files removed * Add strings to translate in volume plugin * Quicklaunch: Don't stack buttons on small panels * Panel WorldClock plugin: restart timer only if update interval is long @@ -1589,4 +1654,4 @@ * settings refactored a bit: SHARE_DIR dependen on th CMAKE_INSTALL_PREFIX is defined for the compilation phase (it allows to have more razors installed eg. for development); SHARE_DIR is searched in the startup too; optimized cfg file access (1x vs. 4x as before for every file); redundant conversions merged into Razorsettings; usage of QSettings to read the settings (it does the error handling for us). * implementation of the 'quicklaunch icons' (Razorspinbutton like widget); disabled some debug outputs; tooltips enabled for panel widgets * fixed cmake stuff (debug,lib location,do not install .svn,make uninstall,etc.); fixes for qss skinning - + diff -Nru lxqt-panel-0.14.1/.ci/build.sh lxqt-panel-0.16.1/.ci/build.sh --- lxqt-panel-0.14.1/.ci/build.sh 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/.ci/build.sh 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,6 @@ +set -ex + +mkdir build +cd build +cmake .. +make diff -Nru lxqt-panel-0.14.1/CMakeLists.txt lxqt-panel-0.16.1/CMakeLists.txt --- lxqt-panel-0.14.1/CMakeLists.txt 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/CMakeLists.txt 2020-11-05 16:09:19.000000000 +0000 @@ -29,9 +29,10 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) -set(REQUIRED_QT_VERSION "5.7.1") +set(REQUIRED_QT_VERSION "5.12") set(KF5_MINIMUM_VERSION "5.36.0") -set(LXQT_MINIMUM_VERSION "0.14.1") +set(LXQT_GLOBALKEYS_MINIMUM_VERSION "0.16.0") +set(LXQT_MINIMUM_VERSION "0.16.0") find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED) find_package(Qt5LinguistTools ${REQUIRED_QT_VERSION} REQUIRED) @@ -40,8 +41,7 @@ find_package(Qt5Xml ${REQUIRED_QT_VERSION} REQUIRED) find_package(KF5WindowSystem ${KF5_MINIMUM_VERSION} REQUIRED) find_package(lxqt ${LXQT_MINIMUM_VERSION} REQUIRED) -find_package(lxqt-globalkeys ${LXQT_MINIMUM_VERSION} REQUIRED) -find_package(lxqt-globalkeys-ui ${LXQT_MINIMUM_VERSION} REQUIRED) +find_package(lxqt-globalkeys-ui ${LXQT_GLOBALKEYS_MINIMUM_VERSION} REQUIRED) # Patch Version set(LXQT_PANEL_PATCH_VERSION 1) @@ -248,6 +248,12 @@ add_subdirectory(plugin-spacer) endif() +setByDefault(BACKLIGHT_PLUGIN Yes) +if(BACKLIGHT_PLUGIN) + list(APPEND ENABLED_PLUGINS "Backlight") + add_subdirectory(plugin-backlight) +endif() + ######################################################################### message(STATUS "**************** The following plugins will be built ****************") diff -Nru lxqt-panel-0.14.1/debian/changelog lxqt-panel-0.16.1/debian/changelog --- lxqt-panel-0.14.1/debian/changelog 2020-02-15 19:28:19.000000000 +0000 +++ lxqt-panel-0.16.1/debian/changelog 2021-01-10 22:12:04.000000000 +0000 @@ -1,27 +1,20 @@ -lxqt-panel (0.14.1-1ubuntu3) focal; urgency=medium +lxqt-panel (0.16.1-0~ppa1) focal; urgency=medium - * Updated rules to match debian unstable - * Updated copyright. + * Sync with Debian. - -- Raman Sarda Sun, 16 Feb 2020 00:58:19 +0530 + -- Julien Lavergne Sun, 10 Jan 2021 23:12:04 +0100 -lxqt-panel (0.14.1-1ubuntu2) focal; urgency=medium +lxqt-panel (0.16.1-1) unstable; urgency=medium - * Correct merge from Ubuntu Merge-oMatic - * Bumped minimum requirements in control file - * Copyright updates. - * Updated debian/watch to point to correct source. - * Updated debian/upstream/metadata - * using debhelper-compat instead of debhelper and d/compat - - -- Raman Sarda Sun, 09 Feb 2020 11:29:09 +0530 - -lxqt-panel (0.14.1-1ubuntu1) focal; urgency=low + [ Alf Gaida ] + * Switched to gbp + * Bumped Standards-Version to 4.4.0, no changes needed + * improved debian/rules - * Merge from Debian unstable. Remaining changes: - - Updated control file to include new deps. + [ Andrew Lee (李健秋) ] + * New upstream release. (Closes: #916105, #953154, #978204) - -- Raman Sarda Fri, 07 Feb 2020 22:20:45 +0530 + -- Andrew Lee (李健秋) Wed, 06 Jan 2021 18:30:22 +0800 lxqt-panel (0.14.1-1) unstable; urgency=medium @@ -33,13 +26,6 @@ -- Alf Gaida Tue, 26 Feb 2019 03:28:17 +0100 -lxqt-panel (0.14.1-0ubuntu1) disco; urgency=medium - - * New upstream release. - * Run wrap-and-sort. - - -- Simon Quigley Sat, 09 Mar 2019 13:27:32 -0600 - lxqt-panel (0.14.0-1) unstable; urgency=medium * Cherry-picking new upstream version 0.14.0. @@ -57,17 +43,6 @@ -- Alf Gaida Sun, 27 Jan 2019 23:13:10 +0100 -lxqt-panel (0.14.0-0ubuntu1) disco; urgency=medium - - * New upstream release. - - Bump build dependencies. - - Remove reverse-applicable patches. - * Bump Standards-version to 4.3.0, no changes needed. - * Bump debhelper compat to 12, no changes needed. - * Add a new lxqt-panel-l10n package. - - -- Simon Quigley Sat, 26 Jan 2019 01:19:25 -0600 - lxqt-panel (0.13.0-2) unstable; urgency=medium * Build dependency libsensors4-dev -> libsensors-dev (Closes: #917440) @@ -89,84 +64,12 @@ -- Alf Gaida Fri, 25 May 2018 00:08:49 +0200 -lxqt-panel (0.13.0-0ubuntu5) cosmic; urgency=medium - - * Add optional overriding of icon theme. - * Run wrap-and-sort. - - -- Walter Lapchynski Tue, 21 Aug 2018 23:37:22 -0700 - -lxqt-panel (0.13.0-0ubuntu4) cosmic; urgency=medium - - * Change the Uploaders to Ubuntu uploaders. - * Update Standards-version to 4.2.0, no changes needed. - * Add an autoexpansion feature to the spacer plugin. - - -- Simon Quigley Thu, 16 Aug 2018 16:17:17 -0500 - -lxqt-panel (0.13.0-0ubuntu3) cosmic; urgency=medium - - * Add a DEP-3 header for the patch completely removing the clock plugin. - * Don't auto-unmute the volume when it's changed. - * Bump Standards-version to 4.1.5, no changes needed. - * Run wrap-and-sort. - - -- Simon Quigley Mon, 16 Jul 2018 21:58:19 -0500 - -lxqt-panel (0.13.0-0ubuntu2) cosmic; urgency=medium - - * Completely remove plugin-clock. - - -- Simon Quigley Thu, 24 May 2018 22:51:05 -0500 - -lxqt-panel (0.13.0-0ubuntu1) cosmic; urgency=medium - - * New upstream release. - * Update build dependencies. - * Update copyright. - * Remove patches applied upstream. - - -- Simon Quigley Wed, 23 May 2018 22:38:37 -0500 - lxqt-panel (0.12.0-10) unstable; urgency=medium * Changed Source and watch for lxqt -- Alf Gaida Sat, 28 Apr 2018 15:17:35 +0200 -lxqt-panel (0.12.0-9ubuntu1) cosmic; urgency=medium - - * Merge from Debian Sid. Remaining changes: - - Cherry-pick some upstream commits: - + 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. - * Change the Vcs entries to be Lubuntu-specific. - * Fix typo in the patch description of fix-memory-leaks.patch. - - -- Simon Quigley Mon, 21 May 2018 00:43:10 -0500 - lxqt-panel (0.12.0-9) unstable; urgency=medium * Ported back USE_MENU_CACHE handling @@ -181,43 +84,6 @@ -- Alf Gaida Mon, 23 Apr 2018 19:47:29 +0200 -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 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 Tue, 30 Jan 2018 22:29:41 +0300 - lxqt-panel (0.12.0-8) unstable; urgency=medium * Fix plugin-volume, use pavucontrol-qt (Closes: #884547) @@ -435,4 +301,3 @@ * Removing whitespaces at EOL and EOF. -- Alf Gaida Sun, 25 Oct 2015 02:27:12 +0200 - diff -Nru lxqt-panel-0.14.1/debian/control lxqt-panel-0.16.1/debian/control --- lxqt-panel-0.14.1/debian/control 2020-02-09 08:45:25.000000000 +0000 +++ lxqt-panel-0.16.1/debian/control 2021-01-10 22:04:57.000000000 +0000 @@ -1,45 +1,45 @@ Source: lxqt-panel -Maintainer: Lubuntu Developers -XSBC-Original-Maintainer: LXQt Packaging Team -Uploaders: Simon Quigley +Maintainer: LXQt Packaging Team +Uploaders: Alf Gaida , + ChangZhuo Chen (陳昌倬) , + Andrew Lee (李健秋) Section: x11 Priority: optional Build-Depends: debhelper-compat (= 12), libasound2-dev, libdbusmenu-qt5-dev, - libglib2.0-dev, libicu-dev, - libkf5solid-dev, libkf5windowsystem-dev, libkf5solid-dev, liblxqt0-dev (>= 0.14.1~), - liblxqt-globalkeys0-dev (>= 0.14.1~), - liblxqt-globalkeys-ui0-dev (>= 0.14.1~), + liblxqt-globalkeys0-dev (>= 0.16.0~), + liblxqt-globalkeys-ui0-dev (>= 0.16.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.2~), + libsysstat-qt5-0-dev (>= 0.4.4~), libx11-dev, - libxcb-damage0-dev, + libxcomposite-dev, libxcb-util0-dev, libxcb-xkb-dev, - libxcomposite-dev, + libxcb-damage0-dev, libxdamage-dev, libxkbcommon-dev, libxkbcommon-x11-dev, libxrender-dev -Standards-Version: 4.3.0 -Vcs-Browser: https://phab.lubuntu.me/source/lxqt-panel/ -Vcs-Git: https://phab.lubuntu.me/source/lxqt-panel.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 +Standards-Version: 4.4.0 +Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-panel +Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-panel.git Homepage: https://github.com/lxqt/lxqt-panel Package: lxqt-panel Architecture: any -Depends: lxmenu-data, lxqt-policykit, ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, + ${shlibs:Depends}, + lxmenu-data, + lxqt-policykit Recommends: lxqt-about, lxqt-config, lxqt-notificationd, @@ -55,14 +55,15 @@ Description: LXQt desktop panel The LXQt desktop panel . - This package contains the LXQt panel. + This package contain the LXQt panel. Package: lxqt-panel-l10n Architecture: all Multi-Arch: foreign Section: localization -Depends: qttranslations5-l10n, ${misc:Depends} +Depends: ${misc:Depends}, + qttranslations5-l10n Breaks: lxqt-panel (<< 0.11.0) Replaces: lxqt-panel (<< 0.11.0) Description: Language package for lxqt-panel - This package contains the l10n files needed by lxqt-panel. + This package contains the l10n files needed by the lxqt-panel. diff -Nru lxqt-panel-0.14.1/debian/copyright lxqt-panel-0.16.1/debian/copyright --- lxqt-panel-0.14.1/debian/copyright 2020-02-15 19:26:09.000000000 +0000 +++ lxqt-panel-0.16.1/debian/copyright 2021-01-10 22:04:57.000000000 +0000 @@ -9,7 +9,7 @@ Files: debian/* Copyright: 2014-2019 Alf Gaida - 2015 Andrew Lee (李健秋) + 2015 Andrew Lee (李健秋) License: LGPL-2.1+ License: LGPL-2.1+ diff -Nru lxqt-panel-0.14.1/debian/gbp.conf lxqt-panel-0.16.1/debian/gbp.conf --- lxqt-panel-0.14.1/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/debian/gbp.conf 2021-01-10 22:04:57.000000000 +0000 @@ -0,0 +1,6 @@ +[DEFAULT] +debian-branch = debian/sid +upstream-branch = upstream/latest +pristine-tar = True +compression = xz + diff -Nru lxqt-panel-0.14.1/debian/lxqt-panel.install lxqt-panel-0.16.1/debian/lxqt-panel.install --- lxqt-panel-0.14.1/debian/lxqt-panel.install 2020-02-09 05:56:16.000000000 +0000 +++ lxqt-panel-0.16.1/debian/lxqt-panel.install 2021-01-10 22:04:57.000000000 +0000 @@ -1,8 +1,9 @@ etc/xdg -usr/bin/lxqt-panel usr/include/lxqt -usr/lib/*/lxqt-panel -usr/share/desktop-directories -usr/share/lxqt/lxqt-panel -usr/share/lxqt/panel.conf usr/share/man +usr/share/lxqt/panel.conf +usr/share/lxqt/lxqt-panel +usr/share/desktop-directories +usr/bin/lxqt-panel +usr/lib/*/lxqt-panel + diff -Nru lxqt-panel-0.14.1/debian/manpages lxqt-panel-0.16.1/debian/manpages --- lxqt-panel-0.14.1/debian/manpages 2020-02-09 05:31:02.000000000 +0000 +++ lxqt-panel-0.16.1/debian/manpages 2021-01-10 22:04:57.000000000 +0000 @@ -1 +1,2 @@ panel/man/lxqt-panel.1 + diff -Nru lxqt-panel-0.14.1/debian/rules lxqt-panel-0.16.1/debian/rules --- lxqt-panel-0.14.1/debian/rules 2020-02-15 19:25:41.000000000 +0000 +++ lxqt-panel-0.16.1/debian/rules 2021-01-10 22:04:57.000000000 +0000 @@ -5,16 +5,17 @@ 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 @@ -22,9 +23,8 @@ dh_missing --fail-missing 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) diff -Nru lxqt-panel-0.14.1/debian/upstream/metadata lxqt-panel-0.16.1/debian/upstream/metadata --- lxqt-panel-0.14.1/debian/upstream/metadata 2020-02-09 06:15:48.000000000 +0000 +++ lxqt-panel-0.16.1/debian/upstream/metadata 2021-01-10 22:04:57.000000000 +0000 @@ -4,3 +4,4 @@ Changelog: https://github.com/lxqt/lxqt-panel/blob/master/CHANGELOG Repository: https://github.com/lxqt/lxqt-panel Repository-Browser: https://github.com/lxqt/lxqt-panel + diff -Nru lxqt-panel-0.14.1/debian/watch lxqt-panel-0.16.1/debian/watch --- lxqt-panel-0.14.1/debian/watch 2020-02-09 05:58:56.000000000 +0000 +++ lxqt-panel-0.16.1/debian/watch 2021-01-10 22:04:57.000000000 +0000 @@ -1,3 +1,3 @@ version=4 opts="pgpsigurlmangle=s/$/.asc/" \ - https://github.com/lxqt/lxqt-panel/releases .*/lxqt-panel-([\d\.]+).tar.xz +https://github.com/lxqt/lxqt-panel/releases .*/lxqt-panel-([\d\.]+).tar.xz diff -Nru lxqt-panel-0.14.1/menu/desktop-directories/lxqt-settings.directory.in lxqt-panel-0.16.1/menu/desktop-directories/lxqt-settings.directory.in --- lxqt-panel-0.14.1/menu/desktop-directories/lxqt-settings.directory.in 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/menu/desktop-directories/lxqt-settings.directory.in 2020-11-05 16:09:19.000000000 +0000 @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Type=Directory Name=LXQt settings Icon=preferences-system diff -Nru lxqt-panel-0.14.1/menu/translations/lxqt-leave_eu.directory lxqt-panel-0.16.1/menu/translations/lxqt-leave_eu.directory --- lxqt-panel-0.14.1/menu/translations/lxqt-leave_eu.directory 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/menu/translations/lxqt-leave_eu.directory 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[eu]=Irten +Comment[eu]=Itxi saioa diff -Nru lxqt-panel-0.14.1/menu/translations/lxqt-leave_gl.directory lxqt-panel-0.16.1/menu/translations/lxqt-leave_gl.directory --- lxqt-panel-0.14.1/menu/translations/lxqt-leave_gl.directory 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/menu/translations/lxqt-leave_gl.directory 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[gl]=Saír +Comment[gl]=Pechar a sesión diff -Nru lxqt-panel-0.14.1/menu/translations/lxqt-leave_hr.directory lxqt-panel-0.16.1/menu/translations/lxqt-leave_hr.directory --- lxqt-panel-0.14.1/menu/translations/lxqt-leave_hr.directory 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/menu/translations/lxqt-leave_hr.directory 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=Napusti +Comment[hr]=Napusti sesiju diff -Nru lxqt-panel-0.14.1/menu/translations/lxqt-leave_ja.directory lxqt-panel-0.16.1/menu/translations/lxqt-leave_ja.directory --- lxqt-panel-0.14.1/menu/translations/lxqt-leave_ja.directory 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/menu/translations/lxqt-leave_ja.directory 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[ja]=終了 +Comment[ja]=セッション終了のメニューです diff -Nru lxqt-panel-0.14.1/menu/translations/lxqt-leave_nl.directory lxqt-panel-0.16.1/menu/translations/lxqt-leave_nl.directory --- lxqt-panel-0.14.1/menu/translations/lxqt-leave_nl.directory 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/menu/translations/lxqt-leave_nl.directory 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[nl]=Afsluiten +Comment[nl]=Sessie afsluiten diff -Nru lxqt-panel-0.14.1/menu/translations/lxqt-settings_eu.directory lxqt-panel-0.16.1/menu/translations/lxqt-settings_eu.directory --- lxqt-panel-0.14.1/menu/translations/lxqt-settings_eu.directory 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/menu/translations/lxqt-settings_eu.directory 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1 @@ +Name[eu]=LXQt-ren konfigurazioa diff -Nru lxqt-panel-0.14.1/menu/translations/lxqt-settings_gl.directory lxqt-panel-0.16.1/menu/translations/lxqt-settings_gl.directory --- lxqt-panel-0.14.1/menu/translations/lxqt-settings_gl.directory 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/menu/translations/lxqt-settings_gl.directory 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1 @@ +Name[gl]=Configuración do LXQt diff -Nru lxqt-panel-0.14.1/menu/translations/lxqt-settings_hr.directory lxqt-panel-0.16.1/menu/translations/lxqt-settings_hr.directory --- lxqt-panel-0.14.1/menu/translations/lxqt-settings_hr.directory 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/menu/translations/lxqt-settings_hr.directory 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1 @@ +Name[hr]=LXQt postavke diff -Nru lxqt-panel-0.14.1/menu/translations/lxqt-settings_ja.directory lxqt-panel-0.16.1/menu/translations/lxqt-settings_ja.directory --- lxqt-panel-0.14.1/menu/translations/lxqt-settings_ja.directory 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/menu/translations/lxqt-settings_ja.directory 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1 @@ +Name[ja]=LXQt 設定 diff -Nru lxqt-panel-0.14.1/menu/translations/lxqt-settings_nl.directory lxqt-panel-0.16.1/menu/translations/lxqt-settings_nl.directory --- lxqt-panel-0.14.1/menu/translations/lxqt-settings_nl.directory 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/menu/translations/lxqt-settings_nl.directory 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1 @@ +Name[nl]=LXQt-instellingen diff -Nru lxqt-panel-0.14.1/menu/translations/lxqt-settings_pt.directory lxqt-panel-0.16.1/menu/translations/lxqt-settings_pt.directory --- lxqt-panel-0.14.1/menu/translations/lxqt-settings_pt.directory 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/menu/translations/lxqt-settings_pt.directory 2020-11-05 16:09:19.000000000 +0000 @@ -1,2 +1,2 @@ [Desktop Entry] -Name=Definições do LXQt +Name[pt]=Definições do LXQt diff -Nru lxqt-panel-0.14.1/panel/config/addplugindialog.cpp lxqt-panel-0.16.1/panel/config/addplugindialog.cpp --- lxqt-panel-0.14.1/panel/config/addplugindialog.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/config/addplugindialog.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -49,9 +49,9 @@ 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; + desktopFilesDirs << QString::fromLocal8Bit(qgetenv("LXQT_PANEL_PLUGINS_DIR")).split(QLatin1Char(':'), QString::SkipEmptyParts); + desktopFilesDirs << QStringLiteral("%1/%2").arg(XdgDirs::dataHome(), QStringLiteral("/lxqt/lxqt-panel")); + desktopFilesDirs << QStringLiteral(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) { @@ -90,17 +90,17 @@ const int curr_item = 0 < pluginList->count() ? pluginList->currentRow() : 0; pluginList->clear(); - static QIcon fallIco = XdgIcon::fromTheme("preferences-plugin"); + static QIcon fallIco = XdgIcon::fromTheme(QStringLiteral("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(), + QString s = QStringLiteral("%1 %2 %3 %4 %5").arg(plugin.name(), plugin.comment(), - plugin.value("Name").toString(), - plugin.value("Comment").toString(), + plugin.value(QStringLiteral("Name")).toString(), + plugin.value(QStringLiteral("Comment")).toString(), plugin.id()); if (!s.contains(ui->searchEdit->text(), Qt::CaseInsensitive)) continue; @@ -111,10 +111,10 @@ { item->setFlags(item->flags() & ~Qt::ItemIsEnabled); item->setBackground(palette().brush(QPalette::Disabled, QPalette::Text)); - item->setText(QString("%1 (%2)
%3
%4") + item->setText(QStringLiteral("%1 (%2)
%3
%4") .arg(plugin.name(), plugin.id(), plugin.comment(), tr("(only one instance can run at a time)"))); } else - item->setText(QString("%1 (%2)
%3").arg(plugin.name(), plugin.id(), plugin.comment())); + item->setText(QStringLiteral("%1 (%2)
%3").arg(plugin.name(), plugin.id(), plugin.comment())); item->setIcon(plugin.icon(fallIco)); item->setData(INDEX_ROLE, i); } @@ -132,4 +132,3 @@ emit pluginSelected(plugin); } } - diff -Nru lxqt-panel-0.14.1/panel/config/addplugindialog.h lxqt-panel-0.16.1/panel/config/addplugindialog.h --- lxqt-panel-0.14.1/panel/config/addplugindialog.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/config/addplugindialog.h 2020-11-05 16:09:19.000000000 +0000 @@ -44,7 +44,7 @@ Q_OBJECT public: - AddPluginDialog(QWidget *parent = 0); + AddPluginDialog(QWidget *parent = nullptr); ~AddPluginDialog(); signals: diff -Nru lxqt-panel-0.14.1/panel/config/configpaneldialog.h lxqt-panel-0.16.1/panel/config/configpaneldialog.h --- lxqt-panel-0.14.1/panel/config/configpaneldialog.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/config/configpaneldialog.h 2020-11-05 16:09:19.000000000 +0000 @@ -39,7 +39,7 @@ Q_OBJECT public: - ConfigPanelDialog(LXQtPanel *panel, QWidget *parent = 0); + ConfigPanelDialog(LXQtPanel *panel, QWidget *parent = nullptr); void showConfigPanelPage(); void showConfigPluginsPage(); diff -Nru lxqt-panel-0.14.1/panel/config/configpanelwidget.cpp lxqt-panel-0.16.1/panel/config/configpanelwidget.cpp --- lxqt-panel-0.14.1/panel/config/configpanelwidget.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/config/configpanelwidget.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include @@ -151,16 +151,16 @@ ui->spinBox_length->setValue(mOldLength); mFontColor.setNamedColor(mOldFontColor.name()); - ui->pushButton_customFontColor->setStyleSheet(QString("background: %1").arg(mOldFontColor.name())); + ui->pushButton_customFontColor->setStyleSheet(QStringLiteral("background: %1").arg(mOldFontColor.name())); mBackgroundColor.setNamedColor(mOldBackgroundColor.name()); - ui->pushButton_customBgColor->setStyleSheet(QString("background: %1").arg(mOldBackgroundColor.name())); + ui->pushButton_customBgColor->setStyleSheet(QStringLiteral("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()); + ui->checkBox_customBgImage->setChecked(QFileInfo::exists(mOldBackgroundImage)); // update position positionChanged(); @@ -171,7 +171,7 @@ ************************************************/ void ConfigPanelWidget::fillComboBox_position() { - int screenCount = QApplication::desktop()->screenCount(); + int screenCount = QApplication::screens().size(); if (screenCount == 1) { addPosition(tr("Top of desktop"), 0, LXQtPanel::PositionTop); @@ -280,7 +280,7 @@ 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})); + ui->comboBox_position->addItem(name, QVariant::fromValue(ScreenPosition{screen, position})); } @@ -384,13 +384,16 @@ ************************************************/ 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(); + auto screens = QApplication::screens(); + if (screens.size() > mScreenNum) + { + if (mPosition == ILXQtPanel::PositionTop || + mPosition == ILXQtPanel::PositionBottom) + return screens.at(mScreenNum)->geometry().width(); + else + return screens.at(mScreenNum)->geometry().height(); + } + return 0; } @@ -438,7 +441,7 @@ if (d.exec() && d.currentColor().isValid()) { mFontColor.setNamedColor(d.currentColor().name()); - ui->pushButton_customFontColor->setStyleSheet(QString("background: %1").arg(mFontColor.name())); + ui->pushButton_customFontColor->setStyleSheet(QStringLiteral("background: %1").arg(mFontColor.name())); editChanged(); } } @@ -454,7 +457,7 @@ if (d.exec() && d.currentColor().isValid()) { mBackgroundColor.setNamedColor(d.currentColor().name()); - ui->pushButton_customBgColor->setStyleSheet(QString("background: %1").arg(mBackgroundColor.name())); + ui->pushButton_customBgColor->setStyleSheet(QStringLiteral("background: %1").arg(mBackgroundColor.name())); editChanged(); } } @@ -473,4 +476,3 @@ connect(d, &QFileDialog::fileSelected, ui->lineEdit_customBgImage, &QLineEdit::setText); d->show(); } - diff -Nru lxqt-panel-0.14.1/panel/config/configpanelwidget.h lxqt-panel-0.16.1/panel/config/configpanelwidget.h --- lxqt-panel-0.14.1/panel/config/configpanelwidget.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/config/configpanelwidget.h 2020-11-05 16:09:19.000000000 +0000 @@ -44,7 +44,7 @@ Q_OBJECT public: - explicit ConfigPanelWidget(LXQtPanel *panel, QWidget *parent = 0); + explicit ConfigPanelWidget(LXQtPanel *panel, QWidget *parent = nullptr); ~ConfigPanelWidget(); int screenNum() const { return mScreenNum; } diff -Nru lxqt-panel-0.14.1/panel/config/configpluginswidget.h lxqt-panel-0.16.1/panel/config/configpluginswidget.h --- lxqt-panel-0.14.1/panel/config/configpluginswidget.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/config/configpluginswidget.h 2020-11-05 16:09:19.000000000 +0000 @@ -42,7 +42,7 @@ Q_OBJECT public: - ConfigPluginsWidget(LXQtPanel *panel, QWidget* parent = 0); + ConfigPluginsWidget(LXQtPanel *panel, QWidget* parent = nullptr); ~ConfigPluginsWidget(); signals: diff -Nru lxqt-panel-0.14.1/panel/ilxqtpanel.h lxqt-panel-0.16.1/panel/ilxqtpanel.h --- lxqt-panel-0.14.1/panel/ilxqtpanel.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/ilxqtpanel.h 2020-11-05 16:09:19.000000000 +0000 @@ -49,6 +49,8 @@ PositionRight //!< The right side of the screen. }; + virtual ~ILXQtPanel() { } + /** * @brief Returns the position of the panel. Possible values for the * return value are described by the Position enum. @@ -120,6 +122,11 @@ * \sa ILXQtPanelPlugin::isSeparate(), ILXQtPanelPlugin::isExpandable */ virtual void pluginFlagsChanged(const ILXQtPanelPlugin * plugin) = 0; + + /*! + * \brief Checks if the panel is locked. + */ + virtual bool isLocked() const = 0; }; #endif // ILXQTPANEL_H diff -Nru lxqt-panel-0.14.1/panel/ilxqtpanelplugin.h lxqt-panel-0.16.1/panel/ilxqtpanelplugin.h --- lxqt-panel-0.14.1/panel/ilxqtpanelplugin.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/ilxqtpanelplugin.h 2020-11-05 16:09:19.000000000 +0000 @@ -157,7 +157,7 @@ The default implementation do nothing. **/ - virtual void activated(ActivationReason reason) {} + virtual void activated(ActivationReason /*reason*/) {} /** This function is called when the panel geometry or lines count are changed. diff -Nru lxqt-panel-0.14.1/panel/lxqtpanelapplication.cpp lxqt-panel-0.16.1/panel/lxqtpanelapplication.cpp --- lxqt-panel-0.14.1/panel/lxqtpanelapplication.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/lxqtpanelapplication.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -115,20 +115,20 @@ connect(this, &QCoreApplication::aboutToQuit, this, &LXQtPanelApplication::cleanup); - QStringList panels = d->mSettings->value("panels").toStringList(); + QStringList panels = d->mSettings->value(QStringLiteral("panels")).toStringList(); // WARNING: Giving a separate icon theme to the panel is wrong and has side effects. // However, it is optional and can be used as the last resort for avoiding a low // contrast in the case of symbolic SVG icons. (The correct way of doing that is // using a Qt widget style that can assign a separate theme/QPalette to the panel.) mGlobalIconTheme = QIcon::themeName(); - const QString iconTheme = d->mSettings->value("iconTheme").toString(); + const QString iconTheme = d->mSettings->value(QStringLiteral("iconTheme")).toString(); if (!iconTheme.isEmpty()) QIcon::setThemeName(iconTheme); if (panels.isEmpty()) { - panels << "panel1"; + panels << QStringLiteral("panel1"); } for(const QString& i : qAsConst(panels)) @@ -151,15 +151,15 @@ { Q_D(LXQtPanelApplication); - QString name("panel_" + QUuid::createUuid().toString()); + QString name(QStringLiteral("panel_") + QUuid::createUuid().toString()); LXQtPanel *p = addPanel(name); int screenNum = p->screenNum(); ILXQtPanel::Position newPanelPosition = d->computeNewPanelPosition(p, screenNum); p->setPosition(screenNum, newPanelPosition, true); - QStringList panels = d->mSettings->value("panels").toStringList(); + QStringList panels = d->mSettings->value(QStringLiteral("panels")).toStringList(); panels << name; - d->mSettings->setValue("panels", panels); + d->mSettings->setValue(QStringLiteral("panels"), panels); // Poupup the configuration dialog to allow user configuration right away p->showConfigDialog(); @@ -195,7 +195,7 @@ // LXQtPanelApplication::screenDestroyed(). // qDebug() << "LXQtPanelApplication::reloadPanelsAsNeeded()"; - const QStringList names = d->mSettings->value("panels").toStringList(); + const QStringList names = d->mSettings->value(QStringLiteral("panels")).toStringList(); for(const QString& name : names) { bool found = false; @@ -255,8 +255,8 @@ // delete and then re-create the panel ourselves QString name = panel->name(); panel->saveSettings(false); - delete panel; // delete the panel, so Qt does not have a chance to set a new screen to it. mPanels.removeAll(panel); + delete panel; // delete the panel, so Qt does not have a chance to set a new screen to it. reloadNeeded = true; qDebug() << "Workaround Qt 5 bug #40681: delete panel:" << name; } @@ -274,9 +274,9 @@ mPanels.removeAll(panel); - QStringList panels = d->mSettings->value("panels").toStringList(); + QStringList panels = d->mSettings->value(QStringLiteral("panels")).toStringList(); panels.removeAll(panel->name()); - d->mSettings->setValue("panels", panels); + d->mSettings->setValue(QStringLiteral("panels"), panels); panel->deleteLater(); } @@ -295,7 +295,7 @@ { Q_D(LXQtPanelApplication); - d->mSettings->setValue("iconTheme", iconTheme == mGlobalIconTheme ? QString() : iconTheme); + d->mSettings->setValue(QStringLiteral("iconTheme"), iconTheme == mGlobalIconTheme ? QString() : iconTheme); QString newTheme = iconTheme.isEmpty() ? mGlobalIconTheme : iconTheme; if (newTheme != QIcon::themeName()) { diff -Nru lxqt-panel-0.14.1/panel/lxqtpanel.cpp lxqt-panel-0.16.1/panel/lxqtpanel.cpp --- lxqt-panel-0.14.1/panel/lxqtpanel.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/lxqtpanel.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include @@ -87,10 +86,10 @@ ************************************************/ ILXQtPanel::Position LXQtPanel::strToPosition(const QString& str, ILXQtPanel::Position defaultValue) { - if (str.toUpper() == "TOP") return LXQtPanel::PositionTop; - if (str.toUpper() == "LEFT") return LXQtPanel::PositionLeft; - if (str.toUpper() == "RIGHT") return LXQtPanel::PositionRight; - if (str.toUpper() == "BOTTOM") return LXQtPanel::PositionBottom; + if (str.toUpper() == QLatin1String("TOP")) return LXQtPanel::PositionTop; + if (str.toUpper() == QLatin1String("LEFT")) return LXQtPanel::PositionLeft; + if (str.toUpper() == QLatin1String("RIGHT")) return LXQtPanel::PositionRight; + if (str.toUpper() == QLatin1String("BOTTOM")) return LXQtPanel::PositionBottom; return defaultValue; } @@ -103,13 +102,13 @@ switch (position) { case LXQtPanel::PositionTop: - return QString("Top"); + return QStringLiteral("Top"); case LXQtPanel::PositionLeft: - return QString("Left"); + return QStringLiteral("Left"); case LXQtPanel::PositionRight: - return QString("Right"); + return QStringLiteral("Right"); case LXQtPanel::PositionBottom: - return QString("Bottom"); + return QStringLiteral("Bottom"); } return QString(); @@ -171,12 +170,12 @@ //Allows data from drag and drop operations to be dropped onto the widget (see QWidget::setAcceptDrops()). setAttribute(Qt::WA_AcceptDrops); - setWindowTitle("LXQt Panel"); - setObjectName(QString("LXQtPanel %1").arg(configGroup)); + setWindowTitle(QStringLiteral("LXQt Panel")); + setObjectName(QStringLiteral("LXQtPanel %1").arg(configGroup)); //LXQtPanel (inherits QFrame) -> lav (QGridLayout) -> LXQtPanelWidget (QFrame) -> LXQtPanelLayout LXQtPanelWidget = new QFrame(this); - LXQtPanelWidget->setObjectName("BackgroundWidget"); + LXQtPanelWidget->setObjectName(QStringLiteral("BackgroundWidget")); QGridLayout* lav = new QGridLayout(); lav->setContentsMargins(0, 0, 0, 0); setLayout(lav); @@ -199,14 +198,24 @@ mShowDelayTimer.setInterval(PANEL_SHOW_DELAY); connect(&mShowDelayTimer, &QTimer::timeout, [this] { showPanel(mAnimationTime > 0); }); - connect(QApplication::desktop(), &QDesktopWidget::resized, this, &LXQtPanel::ensureVisible); - connect(QApplication::desktop(), &QDesktopWidget::screenCountChanged, this, &LXQtPanel::ensureVisible); - - // connecting to QDesktopWidget::workAreaResized shouldn't be necessary, - // as we've already connceted to QDesktopWidget::resized, but it actually - // is. Read mode on https://github.com/lxqt/lxqt-panel/pull/310 - connect(QApplication::desktop(), &QDesktopWidget::workAreaResized, - this, &LXQtPanel::ensureVisible); + // screen updates + connect(qApp, &QApplication::screenAdded, this, [this] (QScreen* newScreen) { + connect(newScreen, &QScreen::virtualGeometryChanged, this, &LXQtPanel::ensureVisible); + connect(newScreen, &QScreen::geometryChanged, this, &LXQtPanel::ensureVisible); + ensureVisible(); + }); + connect(qApp, &QApplication::screenRemoved, this, [this] (QScreen* oldScreen) { + disconnect(oldScreen, &QScreen::virtualGeometryChanged, this, &LXQtPanel::ensureVisible); + disconnect(oldScreen, &QScreen::geometryChanged, this, &LXQtPanel::ensureVisible); + // wait until the screen is really removed because it may contain the panel + QTimer::singleShot(0, this, &LXQtPanel::ensureVisible); + }); + const auto screens = QApplication::screens(); + for(const auto& screen : screens) + { + connect(screen, &QScreen::virtualGeometryChanged, this, &LXQtPanel::ensureVisible); + connect(screen, &QScreen::geometryChanged, this, &LXQtPanel::ensureVisible); + } connect(LXQt::Settings::globalSettings(), SIGNAL(settingsChanged()), this, SLOT(update())); connect(lxqtApp, SIGNAL(themeChanged()), this, SLOT(realign())); @@ -220,6 +229,9 @@ loadPlugins(); + // NOTE: Some (X11) WMs may need the geometry to be set before QWidget::show(). + setPanelGeometry(); + show(); // show it the first time, despite setting @@ -240,45 +252,45 @@ // Let Hidability be the first thing we read // so that every call to realign() is without side-effect - mHidable = mSettings->value(CFG_KEY_HIDABLE, mHidable).toBool(); + mHidable = mSettings->value(QStringLiteral(CFG_KEY_HIDABLE), mHidable).toBool(); mHidden = mHidable; - mVisibleMargin = mSettings->value(CFG_KEY_VISIBLE_MARGIN, mVisibleMargin).toBool(); + mVisibleMargin = mSettings->value(QStringLiteral(CFG_KEY_VISIBLE_MARGIN), mVisibleMargin).toBool(); - mAnimationTime = mSettings->value(CFG_KEY_ANIMATION, mAnimationTime).toInt(); - mShowDelayTimer.setInterval(mSettings->value(CFG_KEY_SHOW_DELAY, mShowDelayTimer.interval()).toInt()); + mAnimationTime = mSettings->value(QStringLiteral(CFG_KEY_ANIMATION), mAnimationTime).toInt(); + mShowDelayTimer.setInterval(mSettings->value(QStringLiteral(CFG_KEY_SHOW_DELAY), mShowDelayTimer.interval()).toInt()); // By default we are using size & count from theme. - setPanelSize(mSettings->value(CFG_KEY_PANELSIZE, PANEL_DEFAULT_SIZE).toInt(), false); - setIconSize(mSettings->value(CFG_KEY_ICONSIZE, PANEL_DEFAULT_ICON_SIZE).toInt(), false); - setLineCount(mSettings->value(CFG_KEY_LINECNT, PANEL_DEFAULT_LINE_COUNT).toInt(), false); + setPanelSize(mSettings->value(QStringLiteral(CFG_KEY_PANELSIZE), PANEL_DEFAULT_SIZE).toInt(), false); + setIconSize(mSettings->value(QStringLiteral(CFG_KEY_ICONSIZE), PANEL_DEFAULT_ICON_SIZE).toInt(), false); + setLineCount(mSettings->value(QStringLiteral(CFG_KEY_LINECNT), PANEL_DEFAULT_LINE_COUNT).toInt(), false); - setLength(mSettings->value(CFG_KEY_LENGTH, 100).toInt(), - mSettings->value(CFG_KEY_PERCENT, true).toBool(), + setLength(mSettings->value(QStringLiteral(CFG_KEY_LENGTH), 100).toInt(), + mSettings->value(QStringLiteral(CFG_KEY_PERCENT), true).toBool(), false); - mScreenNum = mSettings->value(CFG_KEY_SCREENNUM, QApplication::desktop()->primaryScreen()).toInt(); + mScreenNum = mSettings->value(QStringLiteral(CFG_KEY_SCREENNUM), 0).toInt(); setPosition(mScreenNum, - strToPosition(mSettings->value(CFG_KEY_POSITION).toString(), PositionBottom), + strToPosition(mSettings->value(QStringLiteral(CFG_KEY_POSITION)).toString(), PositionBottom), false); - setAlignment(Alignment(mSettings->value(CFG_KEY_ALIGNMENT, mAlignment).toInt()), false); + setAlignment(Alignment(mSettings->value(QStringLiteral(CFG_KEY_ALIGNMENT), mAlignment).toInt()), false); - QColor color = mSettings->value(CFG_KEY_FONTCOLOR, "").value(); + QColor color = mSettings->value(QStringLiteral(CFG_KEY_FONTCOLOR), QString()).value(); if (color.isValid()) setFontColor(color, true); - setOpacity(mSettings->value(CFG_KEY_OPACITY, 100).toInt(), true); - mReserveSpace = mSettings->value(CFG_KEY_RESERVESPACE, true).toBool(); - color = mSettings->value(CFG_KEY_BACKGROUNDCOLOR, "").value(); + setOpacity(mSettings->value(QStringLiteral(CFG_KEY_OPACITY), 100).toInt(), true); + mReserveSpace = mSettings->value(QStringLiteral(CFG_KEY_RESERVESPACE), true).toBool(); + color = mSettings->value(QStringLiteral(CFG_KEY_BACKGROUNDCOLOR), QString()).value(); if (color.isValid()) setBackgroundColor(color, true); - QString image = mSettings->value(CFG_KEY_BACKGROUNDIMAGE, "").toString(); + QString image = mSettings->value(QStringLiteral(CFG_KEY_BACKGROUNDIMAGE), QString()).toString(); if (!image.isEmpty()) setBackgroundImage(image, false); - mLockPanel = mSettings->value(CFG_KEY_LOCKPANEL, false).toBool(); + mLockPanel = mSettings->value(QStringLiteral(CFG_KEY_LOCKPANEL), false).toBool(); mSettings->endGroup(); } @@ -301,30 +313,30 @@ //Note: save/load of plugin names is completely handled by mPlugins object //mSettings->setValue(CFG_KEY_PLUGINS, mPlugins->pluginNames()); - mSettings->setValue(CFG_KEY_PANELSIZE, mPanelSize); - mSettings->setValue(CFG_KEY_ICONSIZE, mIconSize); - mSettings->setValue(CFG_KEY_LINECNT, mLineCount); - - mSettings->setValue(CFG_KEY_LENGTH, mLength); - mSettings->setValue(CFG_KEY_PERCENT, mLengthInPercents); - - mSettings->setValue(CFG_KEY_SCREENNUM, mScreenNum); - mSettings->setValue(CFG_KEY_POSITION, positionToStr(mPosition)); - - mSettings->setValue(CFG_KEY_ALIGNMENT, mAlignment); - - mSettings->setValue(CFG_KEY_FONTCOLOR, mFontColor.isValid() ? mFontColor : QColor()); - mSettings->setValue(CFG_KEY_BACKGROUNDCOLOR, mBackgroundColor.isValid() ? mBackgroundColor : QColor()); - mSettings->setValue(CFG_KEY_BACKGROUNDIMAGE, QFileInfo(mBackgroundImage).exists() ? mBackgroundImage : QString()); - mSettings->setValue(CFG_KEY_OPACITY, mOpacity); - mSettings->setValue(CFG_KEY_RESERVESPACE, mReserveSpace); - - mSettings->setValue(CFG_KEY_HIDABLE, mHidable); - mSettings->setValue(CFG_KEY_VISIBLE_MARGIN, mVisibleMargin); - mSettings->setValue(CFG_KEY_ANIMATION, mAnimationTime); - mSettings->setValue(CFG_KEY_SHOW_DELAY, mShowDelayTimer.interval()); + mSettings->setValue(QStringLiteral(CFG_KEY_PANELSIZE), mPanelSize); + mSettings->setValue(QStringLiteral(CFG_KEY_ICONSIZE), mIconSize); + mSettings->setValue(QStringLiteral(CFG_KEY_LINECNT), mLineCount); + + mSettings->setValue(QStringLiteral(CFG_KEY_LENGTH), mLength); + mSettings->setValue(QStringLiteral(CFG_KEY_PERCENT), mLengthInPercents); + + mSettings->setValue(QStringLiteral(CFG_KEY_SCREENNUM), mScreenNum); + mSettings->setValue(QStringLiteral(CFG_KEY_POSITION), positionToStr(mPosition)); + + mSettings->setValue(QStringLiteral(CFG_KEY_ALIGNMENT), mAlignment); + + mSettings->setValue(QStringLiteral(CFG_KEY_FONTCOLOR), mFontColor.isValid() ? mFontColor : QColor()); + mSettings->setValue(QStringLiteral(CFG_KEY_BACKGROUNDCOLOR), mBackgroundColor.isValid() ? mBackgroundColor : QColor()); + mSettings->setValue(QStringLiteral(CFG_KEY_BACKGROUNDIMAGE), QFileInfo::exists(mBackgroundImage) ? mBackgroundImage : QString()); + mSettings->setValue(QStringLiteral(CFG_KEY_OPACITY), mOpacity); + mSettings->setValue(QStringLiteral(CFG_KEY_RESERVESPACE), mReserveSpace); + + mSettings->setValue(QStringLiteral(CFG_KEY_HIDABLE), mHidable); + mSettings->setValue(QStringLiteral(CFG_KEY_VISIBLE_MARGIN), mVisibleMargin); + mSettings->setValue(QStringLiteral(CFG_KEY_ANIMATION), mAnimationTime); + mSettings->setValue(QStringLiteral(CFG_KEY_SHOW_DELAY), mShowDelayTimer.interval()); - mSettings->setValue(CFG_KEY_LOCKPANEL, mLockPanel); + mSettings->setValue(QStringLiteral(CFG_KEY_LOCKPANEL), mLockPanel); mSettings->endGroup(); } @@ -373,9 +385,9 @@ QStringList pluginDesktopDirs() { QStringList dirs; - dirs << QString(getenv("LXQT_PANEL_PLUGINS_DIR")).split(':', QString::SkipEmptyParts); - dirs << QString("%1/%2").arg(XdgDirs::dataHome(), "/lxqt/lxqt-panel"); - dirs << PLUGIN_DESKTOPS_DIR; + dirs << QString::fromLocal8Bit(qgetenv("LXQT_PANEL_PLUGINS_DIR")).split(QLatin1Char(':'), QString::SkipEmptyParts); + dirs << QStringLiteral("%1/%2").arg(XdgDirs::dataHome(), QStringLiteral("/lxqt/lxqt-panel")); + dirs << QStringLiteral(PLUGIN_DESKTOPS_DIR); return dirs; } @@ -386,7 +398,7 @@ void LXQtPanel::loadPlugins() { QString names_key(mConfigGroup); - names_key += '/'; + names_key += QLatin1Char('/'); names_key += QLatin1String(CFG_KEY_PLUGINS); mPlugins.reset(new PanelPluginsModel(this, names_key, pluginDesktopDirs())); @@ -414,7 +426,11 @@ void LXQtPanel::setPanelGeometry(bool animate) { - const QRect currentScreen = QApplication::desktop()->screenGeometry(mActualScreenNum); + const auto screens = QApplication::screens(); + if (mActualScreenNum >= screens.size()) + return; + const QRect currentScreen = screens.at(mActualScreenNum)->geometry(); + QRect rect; if (isHorizontal()) @@ -600,9 +616,9 @@ if(wid == 0 || !isVisible()) return; - if (mReserveSpace) + if (mReserveSpace && QApplication::primaryScreen()) { - const QRect wholeScreen = QApplication::desktop()->geometry(); + const QRect wholeScreen = QApplication::primaryScreen()->virtualGeometry(); const QRect rect = geometry(); // NOTE: https://standards.freedesktop.org/wm-spec/wm-spec-latest.html // Quote from the EWMH spec: " Note that the strut is relative to the screen edge, and not the edge of the xinerama monitor." @@ -661,39 +677,67 @@ /************************************************ - The panel can't be placed on boundary of two displays. - This function checks if the panel can be placed on the display - @screenNum on @position. + This function checks if the panel can be placed on + the display @screenNum at @position. + NOTE: The panel can be placed only at screen edges + but no part of it should be between two screens. ************************************************/ bool LXQtPanel::canPlacedOn(int screenNum, LXQtPanel::Position position) { - QDesktopWidget* dw = QApplication::desktop(); - - switch (position) + const auto screens = QApplication::screens(); + if (screens.size() > screenNum) { - case LXQtPanel::PositionTop: - for (int i = 0; i < dw->screenCount(); ++i) - if (dw->screenGeometry(i).bottom() < dw->screenGeometry(screenNum).top()) - return false; - return true; + const QRect screenGeometry = screens.at(screenNum)->geometry(); + switch (position) + { + case LXQtPanel::PositionTop: + for (const auto& screen : screens) + { + if (screen->geometry().top() < screenGeometry.top()) + { + QRect r = screenGeometry.adjusted(0, screen->geometry().top() - screenGeometry.top(), 0, 0); + if (screen->geometry().intersects(r)) + return false; + } + } + return true; - case LXQtPanel::PositionBottom: - for (int i = 0; i < dw->screenCount(); ++i) - if (dw->screenGeometry(i).top() > dw->screenGeometry(screenNum).bottom()) - return false; - return true; + case LXQtPanel::PositionBottom: + for (const auto& screen : screens) + { + if (screen->geometry().bottom() > screenGeometry.bottom()) + { + QRect r = screenGeometry.adjusted(0, 0, 0, screen->geometry().bottom() - screenGeometry.bottom()); + if (screen->geometry().intersects(r)) + return false; + } + } + return true; - case LXQtPanel::PositionLeft: - for (int i = 0; i < dw->screenCount(); ++i) - if (dw->screenGeometry(i).right() < dw->screenGeometry(screenNum).left()) - return false; - return true; + case LXQtPanel::PositionLeft: + for (const auto& screen : screens) + { + if (screen->geometry().left() < screenGeometry.left()) + { + QRect r = screenGeometry.adjusted(screen->geometry().left() - screenGeometry.left(), 0, 0, 0); + if (screen->geometry().intersects(r)) + return false; + } + } + return true; - case LXQtPanel::PositionRight: - for (int i = 0; i < dw->screenCount(); ++i) - if (dw->screenGeometry(i).left() > dw->screenGeometry(screenNum).right()) - return false; - return true; + case LXQtPanel::PositionRight: + for (const auto& screen : screens) + { + if (screen->geometry().right() > screenGeometry.right()) + { + QRect r = screenGeometry.adjusted(0, 0, screen->geometry().right() - screenGeometry.right(), 0); + if (screen->geometry().intersects(r)) + return false; + } + } + return true; + } } return false; @@ -707,7 +751,7 @@ { int current = mScreenNum; - for (int i = current; i < QApplication::desktop()->screenCount(); ++i) + for (int i = current; i < QApplication::screens().size(); ++i) if (canPlacedOn(i, position)) return i; @@ -764,29 +808,34 @@ ************************************************/ void LXQtPanel::updateStyleSheet() { + // NOTE: This is a workaround for Qt >= 5.13, which might not completely + // update the style sheet (especially positioned backgrounds of plugins + // with NeedsHandle="true") if it is not reset first. + setStyleSheet(QString()); + QStringList sheet; - sheet << QString("Plugin > QAbstractButton, LXQtTray { qproperty-iconSize: %1px %1px; }").arg(mIconSize); - sheet << QString("Plugin > * > QAbstractButton, TrayIcon { qproperty-iconSize: %1px %1px; }").arg(mIconSize); + sheet << QStringLiteral("Plugin > QAbstractButton, LXQtTray { qproperty-iconSize: %1px %1px; }").arg(mIconSize); + sheet << QStringLiteral("Plugin > * > QAbstractButton, TrayIcon { qproperty-iconSize: %1px %1px; }").arg(mIconSize); if (mFontColor.isValid()) - sheet << QString("Plugin * { color: " + mFontColor.name() + "; }"); + sheet << QString(QStringLiteral("Plugin * { color: ") + mFontColor.name() + QStringLiteral("; }")); QString object = LXQtPanelWidget->objectName(); if (mBackgroundColor.isValid()) { - QString color = QString("%1, %2, %3, %4") + QString color = QStringLiteral("%1, %2, %3, %4") .arg(mBackgroundColor.red()) .arg(mBackgroundColor.green()) .arg(mBackgroundColor.blue()) .arg((float) mOpacity / 100); - sheet << QString("LXQtPanel #BackgroundWidget { background-color: rgba(" + color + "); }"); + sheet << QString(QStringLiteral("LXQtPanel #BackgroundWidget { background-color: rgba(") + color + QStringLiteral("); }")); } - if (QFileInfo(mBackgroundImage).exists()) - sheet << QString("LXQtPanel #BackgroundWidget { background-image: url('" + mBackgroundImage + "');}"); + if (QFileInfo::exists(mBackgroundImage)) + sheet << QString(QStringLiteral("LXQtPanel #BackgroundWidget { background-image: url('") + mBackgroundImage + QStringLiteral("');}")); - setStyleSheet(sheet.join("\n")); + setStyleSheet(sheet.join(QStringLiteral("\n"))); } @@ -1041,7 +1090,10 @@ case QEvent::DragEnter: dynamic_cast(event)->setDropAction(Qt::IgnoreAction); event->accept(); - //no break intentionally +#if __cplusplus >= 201703L + [[fallthrough]]; +#endif + // fall through case QEvent::Enter: mShowDelayTimer.start(); break; @@ -1078,7 +1130,7 @@ PopupMenu * menu = new PopupMenu(tr("Panel"), this); menu->setAttribute(Qt::WA_DeleteOnClose); - menu->setIcon(XdgIcon::fromTheme("configure-toolbars")); + menu->setIcon(XdgIcon::fromTheme(QStringLiteral("configure-toolbars"))); // Plugin Menu .............................. if (plugin) @@ -1108,7 +1160,7 @@ this, SLOT(showConfigDialog()) )->setDisabled(mLockPanel); - menu->addAction(XdgIcon::fromTheme("preferences-plugin"), + menu->addAction(XdgIcon::fromTheme(QStringLiteral("preferences-plugin")), tr("Manage Widgets"), this, SLOT(showAddPluginDialog()) )->setDisabled(mLockPanel); @@ -1183,22 +1235,25 @@ QRect res(QPoint(x, y), windowSize); - QRect screen = QApplication::desktop()->screenGeometry(this); + QRect panelScreen; + const auto screens = QApplication::screens(); + if (mActualScreenNum < screens.size()) + panelScreen = screens.at(mActualScreenNum)->geometry(); // NOTE: We cannot use AvailableGeometry() which returns the work area here because when in a // multihead setup with different resolutions. In this case, the size of the work area is limited // by the smallest monitor and may be much smaller than the current screen and we will place the // menu at the wrong place. This is very bad for UX. So let's use the full size of the screen. - if (res.right() > screen.right()) - res.moveRight(screen.right()); + if (res.right() > panelScreen.right()) + res.moveRight(panelScreen.right()); - if (res.bottom() > screen.bottom()) - res.moveBottom(screen.bottom()); + if (res.bottom() > panelScreen.bottom()) + res.moveBottom(panelScreen.bottom()); - if (res.left() < screen.left()) - res.moveLeft(screen.left()); + if (res.left() < panelScreen.left()) + res.moveLeft(panelScreen.left()); - if (res.top() < screen.top()) - res.moveTop(screen.top()); + if (res.top() < panelScreen.top()) + res.moveTop(panelScreen.top()); return res; } @@ -1289,7 +1344,7 @@ } mSettings->beginGroup(mConfigGroup); - const QStringList plugins = mSettings->value("plugins").toStringList(); + const QStringList plugins = mSettings->value(QStringLiteral("plugins")).toStringList(); mSettings->endGroup(); for(const QString& i : plugins) @@ -1324,7 +1379,7 @@ void LXQtPanel::hidePanelWork() { - if (!geometry().contains(QCursor::pos())) + if (!testAttribute(Qt::WA_UnderMouse)) { if (!mStandaloneWindows->isAnyWindowShown()) { @@ -1387,7 +1442,7 @@ QString LXQtPanel::iconTheme() const { - return mSettings->value("iconTheme").toString(); + return mSettings->value(QStringLiteral("iconTheme")).toString(); } void LXQtPanel::setIconTheme(const QString& iconTheme) diff -Nru lxqt-panel-0.14.1/panel/lxqtpanel.h lxqt-panel-0.16.1/panel/lxqtpanel.h --- lxqt-panel-0.14.1/panel/lxqtpanel.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/lxqtpanel.h 2020-11-05 16:09:19.000000000 +0000 @@ -114,7 +114,7 @@ * @param settings The settings instance of this lxqt panel application. * @param parent Parent QWidget, can be omitted. */ - LXQtPanel(const QString &configGroup, LXQt::Settings *settings, QWidget *parent = 0); + LXQtPanel(const QString &configGroup, LXQt::Settings *settings, QWidget *parent = nullptr); virtual ~LXQtPanel(); /** @@ -147,6 +147,7 @@ QRect calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const QSize &windowSize) const override; void willShowWindow(QWidget * w) override; void pluginFlagsChanged(const ILXQtPanelPlugin * plugin) override; + bool isLocked() const override { return mLockPanel; } // ........ end of ILXQtPanel overrides /** diff -Nru lxqt-panel-0.14.1/panel/panelpluginsmodel.cpp lxqt-panel-0.16.1/panel/panelpluginsmodel.cpp --- lxqt-panel-0.14.1/panel/panelpluginsmodel.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/panelpluginsmodel.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -69,15 +69,15 @@ { case Qt::DisplayRole: if (plugin.second.isNull()) - ret = QString("Unknown (%1)").arg(plugin.first); + ret = QStringLiteral("Unknown (%1)").arg(plugin.first); else - ret = QString("%1 (%2)").arg(plugin.second->name(), plugin.first); + ret = QStringLiteral("%1 (%2)").arg(plugin.second->name(), plugin.first); break; case Qt::DecorationRole: if (plugin.second.isNull()) - ret = XdgIcon::fromTheme("preferences-plugin"); + ret = XdgIcon::fromTheme(QStringLiteral("preferences-plugin")); else - ret = plugin.second->desktopFile().icon(XdgIcon::fromTheme("preferences-plugin")); + ret = plugin.second->desktopFile().icon(XdgIcon::fromTheme(QStringLiteral("preferences-plugin"))); break; case Qt::UserRole: ret = QVariant::fromValue(const_cast(plugin.second.data())); @@ -86,7 +86,7 @@ return ret; } -Qt::ItemFlags PanelPluginsModel::flags(const QModelIndex & index) const +Qt::ItemFlags PanelPluginsModel::flags(const QModelIndex & /*index*/) const { return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemNeverHasChildren; } @@ -224,13 +224,13 @@ timer.start(); qint64 lastTime = 0; #endif - for (auto const & name : plugin_names) + for (auto const & name : qAsConst(plugin_names)) { pluginslist_t::iterator i = mPlugins.insert(mPlugins.end(), {name, nullptr}); - QString type = mPanel->settings()->value(name + "/type").toString(); + QString type = mPanel->settings()->value(name + QStringLiteral("/type")).toString(); if (type.isEmpty()) { - qWarning() << QString("Section \"%1\" not found in %2.").arg(name, mPanel->settings()->fileName()); + qWarning() << QStringLiteral("Section \"%1\" not found in %2.").arg(name, mPanel->settings()->fileName()); continue; } #ifdef WITH_SCREENSAVER_FALLBACK @@ -253,10 +253,10 @@ } #endif - LXQt::PluginInfoList list = LXQt::PluginInfo::search(desktopDirs, "LXQtPanel/Plugin", QString("%1.desktop").arg(type)); + LXQt::PluginInfoList list = LXQt::PluginInfo::search(desktopDirs, QStringLiteral("LXQtPanel/Plugin"), QStringLiteral("%1.desktop").arg(type)); if( !list.count()) { - qWarning() << QString("Plugin \"%1\" not found.").arg(type); + qWarning() << QStringLiteral("Plugin \"%1\" not found.").arg(type); continue; } @@ -288,7 +288,7 @@ groups.sort(); // Generate new section name - QString pluginName = QString("%1").arg(pluginType); + QString pluginName = QStringLiteral("%1").arg(pluginType); if (!groups.contains(pluginName)) return pluginName; @@ -296,7 +296,7 @@ { for (int i = 2; true; ++i) { - pluginName = QString("%1%2").arg(pluginType).arg(i); + pluginName = QStringLiteral("%1%2").arg(pluginType).arg(i); if (!groups.contains(pluginName)) return pluginName; } @@ -319,7 +319,11 @@ return; //can't move up beginMoveRows(QModelIndex(), row, row, QModelIndex(), row - 1); +#if (QT_VERSION >= QT_VERSION_CHECK(5,13,0)) + mPlugins.swapItemsAt(row - 1, row); +#else mPlugins.swap(row - 1, row); +#endif endMoveRows(); pluginslist_t::const_reference moved_plugin = mPlugins[row - 1]; pluginslist_t::const_reference prev_plugin = mPlugins[row]; @@ -342,7 +346,11 @@ return; //can't move down beginMoveRows(QModelIndex(), row, row, QModelIndex(), row + 2); +#if (QT_VERSION >= QT_VERSION_CHECK(5,13,0)) + mPlugins.swapItemsAt(row, row + 1); +#else mPlugins.swap(row, row + 1); +#endif endMoveRows(); pluginslist_t::const_reference moved_plugin = mPlugins[row + 1]; pluginslist_t::const_reference next_plugin = mPlugins[row]; diff -Nru lxqt-panel-0.14.1/panel/plugin.cpp lxqt-panel-0.16.1/panel/plugin.cpp --- lxqt-panel-0.14.1/panel/plugin.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/plugin.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -30,6 +30,9 @@ #include "ilxqtpanelplugin.h" #include "pluginsettings_p.h" #include "lxqtpanel.h" + +#include + #include #include #include @@ -50,24 +53,42 @@ #include // statically linked built-in plugins +#if defined(WITH_DESKTOPSWITCH_PLUGIN) #include "../plugin-desktopswitch/desktopswitch.h" // desktopswitch extern void * loadPluginTranslation_desktopswitch_helper; +#endif +#if defined(WITH_MAINMENU_PLUGIN) #include "../plugin-mainmenu/lxqtmainmenu.h" // mainmenu extern void * loadPluginTranslation_mainmenu_helper; +#endif +#if defined(WITH_QUICKLAUNCH_PLUGIN) #include "../plugin-quicklaunch/lxqtquicklaunchplugin.h" // quicklaunch extern void * loadPluginTranslation_quicklaunch_helper; +#endif +#if defined(WITH_SHOWDESKTOP_PLUGIN) #include "../plugin-showdesktop/showdesktop.h" // showdesktop extern void * loadPluginTranslation_showdesktop_helper; +#endif +#if defined(WITH_SPACER_PLUGIN) #include "../plugin-spacer/spacer.h" // spacer extern void * loadPluginTranslation_spacer_helper; +#endif +#if defined(WITH_STATUSNOTIFIER_PLUGIN) #include "../plugin-statusnotifier/statusnotifier.h" // statusnotifier extern void * loadPluginTranslation_statusnotifier_helper; +#endif +#if defined(WITH_TASKBAR_PLUGIN) #include "../plugin-taskbar/lxqttaskbarplugin.h" // taskbar extern void * loadPluginTranslation_taskbar_helper; +#endif +#if defined(WITH_TRAY_PLUGIN) #include "../plugin-tray/lxqttrayplugin.h" // tray extern void * loadPluginTranslation_tray_helper; +#endif +#if defined(WITH_WORLDCLOCK_PLUGIN) #include "../plugin-worldclock/lxqtworldclock.h" // worldclock extern void * loadPluginTranslation_worldclock_helper; +#endif QColor Plugin::mMoveMarkerColor= QColor(255, 0, 0, 255); @@ -89,8 +110,8 @@ mName = desktopFile.name(); QStringList dirs; - dirs << QProcessEnvironment::systemEnvironment().value("LXQTPANEL_PLUGIN_PATH").split(":"); - dirs << PLUGIN_DIR; + dirs << QProcessEnvironment::systemEnvironment().value(QStringLiteral("LXQTPANEL_PLUGIN_PATH")).split(QStringLiteral(":")); + dirs << QStringLiteral(PLUGIN_DIR); bool found = false; if(ILXQtPanelPluginLibrary const * pluginLib = findStaticPlugin(desktopFile.id())) @@ -101,7 +122,7 @@ } else { // this plugin is a dynamically loadable module - QString baseName = QString("lib%1.so").arg(desktopFile.id()); + QString baseName = QStringLiteral("lib%1.so").arg(desktopFile.id()); for(const QString &dirName : qAsConst(dirs)) { QFileInfo fi(QDir(dirName), baseName); @@ -117,17 +138,17 @@ if (!isLoaded()) { if (!found) - qWarning() << QString("Plugin %1 not found in the").arg(desktopFile.id()) << dirs; + qWarning() << QStringLiteral("Plugin %1 not found in the").arg(desktopFile.id()) << dirs; return; } - setObjectName(mPlugin->themeId() + "Plugin"); + setObjectName(mPlugin->themeId() + QStringLiteral("Plugin")); // plugin handle for easy context menu setProperty("NeedsHandle", mPlugin->flags().testFlag(ILXQtPanelPlugin::NeedsHandle)); - QString s = mSettings->value("alignment").toString(); + QString s = mSettings->value(QStringLiteral("alignment")).toString(); // Retrun default value if (s.isEmpty()) @@ -138,7 +159,7 @@ } else { - mAlignment = (s.toUpper() == "RIGHT") ? + mAlignment = (s.toUpper() == QLatin1String("RIGHT")) ? Plugin::AlignRight : Plugin::AlignLeft; @@ -255,7 +276,7 @@ mPlugin = pluginLib->instance(startupInfo); if (!mPlugin) { - qWarning() << QString("Can't load plugin \"%1\". Plugin can't build ILXQtPanelPlugin.").arg(mDesktopFile.id()); + qWarning() << QStringLiteral("Can't load plugin \"%1\". Plugin can't build ILXQtPanelPlugin.").arg(mDesktopFile.id()); return false; } @@ -290,7 +311,7 @@ ILXQtPanelPluginLibrary* pluginLib= qobject_cast(obj); if (!pluginLib) { - qWarning() << QString("Can't load plugin \"%1\". Plugin is not a ILXQtPanelPluginLibrary.").arg(mPluginLoader->fileName()); + qWarning() << QStringLiteral("Can't load plugin \"%1\". Plugin is not a ILXQtPanelPluginLibrary.").arg(mPluginLoader->fileName()); delete obj; return false; } @@ -340,8 +361,8 @@ ************************************************/ void Plugin::saveSettings() { - mSettings->setValue("alignment", (mAlignment == AlignLeft) ? "Left" : "Right"); - mSettings->setValue("type", mDesktopFile.id()); + mSettings->setValue(QStringLiteral("alignment"), (mAlignment == AlignLeft) ? QStringLiteral("Left") : QStringLiteral("Right")); + mSettings->setValue(QStringLiteral("type"), mDesktopFile.id()); mSettings->sync(); } @@ -350,7 +371,7 @@ /************************************************ ************************************************/ -void Plugin::contextMenuEvent(QContextMenuEvent *event) +void Plugin::contextMenuEvent(QContextMenuEvent * /*event*/) { mPanel->showPopupMenu(this); } @@ -391,8 +412,12 @@ ************************************************/ void Plugin::showEvent(QShowEvent *) { + // ensure that plugin widgets have correct sizes at startup if (mPluginWidget) + { + mPluginWidget->updateGeometry(); // needed for widgets with style sizes (like buttons) mPluginWidget->adjustSize(); + } } @@ -401,7 +426,7 @@ ************************************************/ QMenu *Plugin::popupMenu() const { - QString name = this->name().replace("&", "&&"); + QString name = this->name().replace(QLatin1String("&"), QLatin1String("&&")); QMenu* menu = new QMenu(windowTitle()); if (mPlugin->flags().testFlag(ILXQtPanelPlugin::HaveConfigDialog)) @@ -413,7 +438,7 @@ connect(configAction, SIGNAL(triggered()), this, SLOT(showConfigureDialog())); } - QAction* moveAction = new QAction(XdgIcon::fromTheme("transform-move"), tr("Move \"%1\"").arg(name), menu); + QAction* moveAction = new QAction(XdgIcon::fromTheme(QStringLiteral("transform-move")), tr("Move \"%1\"").arg(name), menu); menu->addAction(moveAction); connect(moveAction, SIGNAL(triggered()), this, SIGNAL(startMove())); @@ -450,7 +475,7 @@ /************************************************ ************************************************/ -bool Plugin::eventFilter(QObject * watched, QEvent * event) +bool Plugin::eventFilter(QObject * /*watched*/, QEvent * event) { switch (event->type()) { diff -Nru lxqt-panel-0.14.1/panel/pluginmoveprocessor.cpp lxqt-panel-0.16.1/panel/pluginmoveprocessor.cpp --- lxqt-panel-0.14.1/panel/pluginmoveprocessor.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/pluginmoveprocessor.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -208,7 +208,7 @@ static QWidget *prevWidget = 0; if (prevWidget && prevWidget != widget) - prevWidget->setStyleSheet(""); + prevWidget->setStyleSheet(QLatin1String("")); prevWidget = widget; @@ -220,28 +220,28 @@ switch(markType) { case TopMark: - border1 = "top"; - border2 = "bottom"; + border1 = QLatin1String("top"); + border2 = QLatin1String("bottom"); break; case BottomMark: - border1 = "bottom"; - border2 = "top"; + border1 = QLatin1String("bottom"); + border2 = QLatin1String("top"); break; case LeftMark: - border1 = "left"; - border2 = "right"; + border1 = QLatin1String("left"); + border2 = QLatin1String("right"); break; case RightMark: - border1 = "right"; - border2 = "left"; + border1 = QLatin1String("right"); + border2 = QLatin1String("left"); break; } - widget->setStyleSheet(QString("#%1 {" + widget->setStyleSheet(QString::fromLatin1("#%1 {" "border-%2: 2px solid rgba(%4, %5, %6, %7); " "border-%3: -2px solid; " "background-color: transparent; }") diff -Nru lxqt-panel-0.14.1/panel/pluginsettings.cpp lxqt-panel-0.16.1/panel/pluginsettings.cpp --- lxqt-panel-0.14.1/panel/pluginsettings.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/pluginsettings.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -42,7 +42,7 @@ QString prefix() const; inline QString fullPrefix() const { - return mGroup + "/" + prefix(); + return mGroup + QStringLiteral("/") + prefix(); } LXQt::Settings *mSettings; @@ -54,7 +54,7 @@ QString PluginSettingsPrivate::prefix() const { if (!mSubGroups.empty()) - return mSubGroups.join('/'); + return mSubGroups.join(QLatin1Char('/')); return QString(); } diff -Nru lxqt-panel-0.14.1/panel/popupmenu.cpp lxqt-panel-0.16.1/panel/popupmenu.cpp --- lxqt-panel-0.14.1/panel/popupmenu.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/popupmenu.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -42,12 +42,12 @@ QAction *buttonAction = new QAction(this); QFont font = buttonAction->font(); font.setBold(true); - buttonAction->setText(QString(text).replace("&", "&&")); + buttonAction->setText(QString(text).replace(QLatin1String("&"), QLatin1String("&&"))); buttonAction->setFont(font); buttonAction->setIcon(icon); QWidgetAction *action = new QWidgetAction(this); - action->setObjectName(POPUPMENU_TITLE); + action->setObjectName(QLatin1String(POPUPMENU_TITLE)); QToolButton *titleButton = new QToolButton(this); titleButton->installEventFilter(this); // prevent clicks on the title of the menu titleButton->setDefaultAction(buttonAction); @@ -102,7 +102,7 @@ QWidgetAction *action = qobject_cast(this->activeAction()); QWidgetAction *firstAction = action; - while (action && action->objectName() == POPUPMENU_TITLE) + while (action && action->objectName() == QLatin1String(POPUPMENU_TITLE)) { this->keyPressEvent(e); action = qobject_cast(this->activeAction()); diff -Nru lxqt-panel-0.14.1/panel/popupmenu.h lxqt-panel-0.16.1/panel/popupmenu.h --- lxqt-panel-0.14.1/panel/popupmenu.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/popupmenu.h 2020-11-05 16:09:19.000000000 +0000 @@ -35,8 +35,8 @@ class LXQT_PANEL_API PopupMenu: public QMenu { public: - explicit PopupMenu(QWidget *parent = 0): QMenu(parent) {} - explicit PopupMenu(const QString &title, QWidget *parent = 0): QMenu(title, parent) {} + explicit PopupMenu(QWidget *parent = nullptr): QMenu(parent) {} + explicit PopupMenu(const QString &title, QWidget *parent = nullptr): QMenu(title, parent) {} QAction* addTitle(const QIcon &icon, const QString &text); QAction* addTitle(const QString &text); diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_arn.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_arn.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_arn.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,429 @@ + + + + + AddPluginDialog + + + Add Plugins + + + + + Search: + + + + + Add Widget + + + + + Close + + + + + (only one instance can run at a time) + + + + + ConfigPanelDialog + + + Configure Panel + + + + + Panel + + + + + Widgets + + + + + ConfigPanelWidget + + + Configure panel + + + + + Size + + + + + <p>Negative pixel value sets the panel length to that many pixels less than available screen space.</p><p/><p><i>E.g. "Length" set to -100px, screen size is 1000px, then real panel length will be 900 px.</i></p> + + + + + Size: + + + + + Length: + + + + + % + + + + + px + + + + + + px + + + + + Icon size: + + + + + Alignment && position + + + + + A&uto-hide + + + + + + Zero means no animation + + + + + + ms + + + + + + Zero means no delay + + + + + Show with delay: + + + + + Visible thin margin for hidden panel + + + + + Don't allow maximized windows go under the panel window + + + + + Reserve space on display + + + + + A partial workaround for widget styles that +cannot give a separate theme to the panel. + +You might also want to disable: + +LXQt Appearance Configuration → +Icons Theme → +Colorize icons based on widget style (palette) + + + + + Override icon &theme + + + + + Icon theme for panels: + + + + + Position: + + + + + Animation duration: + + + + + Alignment: + + + + + Rows: + + + + + + Left + + + + + + + Center + + + + + + Right + + + + + Custom styling + + + + + Font color: + + + + + Background color: + + + + + Background opacity: + + + + + <small>Compositing is required for panel transparency.</small> + + + + + Background image: + + + + + Top of desktop + + + + + Left of desktop + + + + + Right of desktop + + + + + Bottom of desktop + + + + + Top of desktop %1 + + + + + Left of desktop %1 + + + + + Right of desktop %1 + + + + + Bottom of desktop %1 + + + + + Top + + + + + Bottom + + + + + + Pick color + + + + + Pick image + + + + + Images (*.png *.gif *.jpg) + + + + + ConfigPluginsWidget + + + Configure Plugins + + + + + Note: changes made in this page cannot be reset. + + + + + Move up + + + + + + + + + ... + + + + + Move down + + + + + Add + + + + + Remove + + + + + Configure + + + + + LXQtPanel + + + + Panel + + + + + Configure Panel + + + + + Manage Widgets + + + + + Add New Panel + + + + + Remove Panel + Menu Item + + + + + Lock This Panel + + + + + Remove Panel + Dialog Title + + + + + Removing a panel can not be undone. +Do you want to remove this panel? + + + + + Plugin + + + Configure "%1" + + + + + Move "%1" + + + + + Remove "%1" + + + + + main + + + Use alternate configuration file. + + + + + Configuration file + + + + diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_ar.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_ar.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_ar.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_ar.ts 2020-11-05 16:09:19.000000000 +0000 @@ -129,12 +129,17 @@ اعرض بمهلة قدرها: - + + Visible thin margin for hidden panel + + + + Don't allow maximized windows go under the panel window لا تسمح بأن تذهب النوافذ المكبّرة تحت نافذة اللوحة - + Reserve space on display احجز مساحة عند العرض @@ -160,55 +165,55 @@ - + Left اليسار - - + + Center الوسط - + Right اليمين - + Custom styling نمط مخصّص - + Font color: لون الخط: - + Background color: لون الخلفية: - + Background opacity: شفافية الخلفية: - + <small>Compositing is required for panel transparency.</small> <small>التراكب مطلوب لشفافية اللوحة.</small> - + Background image: صورة الخلفية: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -220,78 +225,78 @@ - + Override icon &theme - + Icon theme for panels: - + Top of desktop أعلى سطح المكتب - + Left of desktop يسار سطح المكتب - + Right of desktop يمين سطح المكتب - + Bottom of desktop أدنى سطح المكتب - + Top of desktop %1 أعلى سطح المكتب %1 - + Left of desktop %1 يسار سطح المكتب %1 - + Right of desktop %1 يمين سطح المكتب %1 - + Bottom of desktop %1 أدنى سطح المكتب %1 - + Top الأعلى - + Bottom الأسفل - - + + Pick color اختر لونا - + Pick image اختر صورة - + Images (*.png *.gif *.jpg) الصور (‎*.png *.gif *.jpg) @@ -346,45 +351,45 @@ LXQtPanel - - + + Panel اللوحة - + Configure Panel اضبط اللوحة - + Manage Widgets أدِر الودجات - + Add New Panel أضِف لوحة جديدة - + Remove Panel Menu Item أزِل اللوحة - + Lock This Panel اقفل هذه اللوحة - + Remove Panel Dialog Title أزِل اللوحة - + Removing a panel can not be undone. Do you want to remove this panel? إزالة اللوحة إجراء لا عودة فيه. @@ -394,17 +399,17 @@ Plugin - + Configure "%1" اضبط ”%1“ - + Move "%1" انقل ”%1“ - + Remove "%1" أزِل ”%1“ diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_ast.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_ast.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_ast.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_ast.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,437 @@ + + + + + AddPluginDialog + + + Add Plugins + Amiestu de complementos + + + + Search: + Guetar: + + + + Add Widget + Amestar el widget + + + + Close + Zarrar + + + + (only one instance can run at a time) + (namái pue executase una instancia al empar) + + + + ConfigPanelDialog + + + Configure Panel + Configuración del panel + + + + Panel + Panel + + + + Widgets + Widgets + + + + ConfigPanelWidget + + + Configure panel + + + + + Size + Tamañu + + + + <p>Negative pixel value sets the panel length to that many pixels less than available screen space.</p><p/><p><i>E.g. "Length" set to -100px, screen size is 1000px, then real panel length will be 900 px.</i></p> + <p>Un nivel negativu de píxeles afita'l llargor del panel a munchos píxelespembaxo del espaciu disponible na pantalla..</p><p/><p><i>Por exemplu, con«Llargor» afitáu a -100px, el tamañu de la pantalla va ser de 1000px,polo que'l llargor real del panel va ser de 900 px.</i></p> + + + + Size: + Tamañu: + + + + Length: + Llargor: + + + + % + % + + + + px + px + + + + + px + px + + + + Icon size: + Tamañu d'iconos: + + + + Alignment && position + Alliniación y posición + + + + A&uto-hide + An&ubrir automáticamente + + + + + Zero means no animation + Con 0 nun hai animaciones + + + + + ms + ms + + + + + Zero means no delay + Con 0 nun hai retrasu + + + + Show with delay: + Amosar con un retrasu de + + + + Visible thin margin for hidden panel + Amosar un marxe delgáu al anubrir el panel + + + + Don't allow maximized windows go under the panel window + Nun permite que les ventanes maximizaes vaigan embaxo de la ventana del panel + + + + Reserve space on display + Acutar l'espaciu na pantalla + + + + A partial workaround for widget styles that +cannot give a separate theme to the panel. + +You might also want to disable: + +LXQt Appearance Configuration → +Icons Theme → +Colorize icons based on widget style (palette) + Una igua parcial pa los estilos de widgets +que nun apurran un estilu separtáu al panel. + +Quiciabes quieras desactivalo tamién: + +Configuración del aspeutu de LxQt → +Estilu d'iconos → +Pintar los iconos según l'estilu de widgets (paleta) + + + + Override icon &theme + Anular l'&estilu d'iconos + + + + Icon theme for panels: + Estilu d'iconos pa los paneles: + + + + Position: + Posición: + + + + Animation duration: + Duración de les animaciones + + + + Alignment: + Alliniación: + + + + Rows: + Fileres: + + + + + Left + Esquierda + + + + + + Center + Centru + + + + + Right + Drecha + + + + Custom styling + + + + + Font color: + Color de la fonte: + + + + Background color: + Color del fondu: + + + + Background opacity: + Opacidá del fondu: + + + + <small>Compositing is required for panel transparency.</small> + <small>Ríquese la composición pa la composición de los paneles.</small> + + + + Background image: + Imaxe del fondu: + + + + Top of desktop + No cimero del escritoriu + + + + Left of desktop + A la esquierda del escritoriu + + + + Right of desktop + A la drecha del escritoriu + + + + Bottom of desktop + No baxero del escritoriu + + + + Top of desktop %1 + No cimero del escritoriu %1 + + + + Left of desktop %1 + A la esquierda del escritoriu %1 + + + + Right of desktop %1 + A la drecha del escritoriu %1 + + + + Bottom of desktop %1 + No baxero del escritoriu %1 + + + + Top + + + + + Bottom + + + + + + Pick color + Escoyeta d'un color + + + + Pick image + Escoyeta d'una imaxe + + + + Images (*.png *.gif *.jpg) + Imáxenes (*.png *.gif *.jpg) + + + + ConfigPluginsWidget + + + Configure Plugins + + + + + Note: changes made in this page cannot be reset. + Nota: los cambeos fechos nesta páxina nun puen reafitase. + + + + Move up + Xubir + + + + + + + + ... + … + + + + Move down + Baxar + + + + Add + Amestar + + + + Remove + Desaniciar + + + + Configure + Configurar + + + + LXQtPanel + + + + Panel + Panel + + + + Configure Panel + Configurar el panel + + + + Manage Widgets + Xestionar widgets + + + + Add New Panel + Amestar un panel nuevu + + + + Remove Panel + Menu Item + Desaniciar el panel + + + + Lock This Panel + Bloquiar esti panel + + + + Remove Panel + Dialog Title + Desaniciu del panel + + + + Removing a panel can not be undone. +Do you want to remove this panel? + El desaniciu d'un panel nun pue desfacese. +¿Quies desaniciar esti panel? + + + + Plugin + + + Configure "%1" + Configurar «%1» + + + + Move "%1" + Mover «%1» + + + + Remove "%1" + Desaniciar «%1» + + + + main + + + Use alternate configuration file. + Usa un ficheru alternativu de configuración. + + + + Configuration file + Ficheru de configuración + + + diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_ca.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_ca.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_ca.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_ca.ts 2020-11-05 16:09:19.000000000 +0000 @@ -129,12 +129,17 @@ Mostra-ho amb un retard: - + + Visible thin margin for hidden panel + + + + Don't allow maximized windows go under the panel window No permetis que les finestres maximitzades vagin sota de la finestra del tauler - + Reserve space on display Reserva espai a la pantalla @@ -160,55 +165,55 @@ - + Left Esquerra - - + + Center Centre - + Right Dreta - + Custom styling Estil personalitzat - + Font color: Color de la lletra: - + Background color: Color del fons: - + Background opacity: Opacitat del fons: - + <small>Compositing is required for panel transparency.</small> <small>Es requereix composició per a la transparència del tauler.</small> - + Background image: Imatge de fons: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -227,78 +232,78 @@ Acoloreix les icones en funció de l'estil de l'estri (paleta) - + Override icon &theme Anul·la el &tema d'icones - + Icon theme for panels: Tema d'icones per als taulers: - + Top of desktop Part superior de l'escriptori - + Left of desktop Part esquerra de l'escriptori - + Right of desktop Part dreta de l'escriptori - + Bottom of desktop Part inferior de l'escriptori - + Top of desktop %1 Part superior de l'escriptori %1 - + Left of desktop %1 Part esquerra de l'escriptori %1 - + Right of desktop %1 Part dreta de l'escriptori %1 - + Bottom of desktop %1 Part inferior de l'escriptori %1 - + Top Part superior - + Bottom Part inferior - - + + Pick color Tria un color - + Pick image Tria una imatge - + Images (*.png *.gif *.jpg) Imatges (*.png *.gif *.jpg) @@ -353,45 +358,45 @@ LXQtPanel - - + + Panel Tauler - + Configure Panel Configura el tauler - + Manage Widgets Gestiona els estris - + Add New Panel Afegeix un tauler nou - + Remove Panel Menu Item Suprimeix el tauler - + Lock This Panel Bloqueja aquest tauler - + Remove Panel Dialog Title Supressió del tauler - + Removing a panel can not be undone. Do you want to remove this panel? La supressió d'un tauler no es pot desfer. @@ -401,17 +406,17 @@ Plugin - + Configure "%1" Configura "%1" - + Move "%1" Mou "%1" - + Remove "%1" Suprimeix "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_cs.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_cs.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_cs.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_cs.ts 2020-11-05 16:09:19.000000000 +0000 @@ -124,20 +124,20 @@ - + Left Vlevo - - + + Center Na střed - + Right Vpravo @@ -158,47 +158,52 @@ Zobrazit s prodlevou: - + + Visible thin margin for hidden panel + Viditelný tenký okraj pro skrytý panel + + + Don't allow maximized windows go under the panel window Neumožnit aby se maximalizovaná okna dostala pod okno panelu - + Reserve space on display Vyhradit prostor na obrazovce - + Custom styling Vlastní styl - + Font color: Barva písma: - + Background color: Barva pozadí: - + Background opacity: Neprůhlednost pozadí: - + <small>Compositing is required for panel transparency.</small> <small>Panel může být průhledný pouze pokud je k vykreslování používán kompozitor.</small> - + Background image: Obrázek na pozadí: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -212,17 +217,17 @@ Nejspíš také můžete chtít vypnout: -Nastavení vzhledu LXQt → +Nastavení vzhledu LXQt → Motiv ikon → Obarvit ikony podle stylu prvku (paleta) - + Override icon &theme Přebít mo&tiv ikon - + Icon theme for panels: Motiv vzhledu ikon pro panely: @@ -237,68 +242,68 @@ Poloha: - + Top of desktop Horní strana pracovní plochy - + Left of desktop Levá strana pracovní plochy - + Right of desktop Pravá strana pracovní plochy - + Bottom of desktop Dolní strana pracovní plochy - + Top of desktop %1 Horní strana pracovní plochy %1 - + Left of desktop %1 Levá strana pracovní plochy %1 - + Right of desktop %1 Pravá strana pracovní plochy %1 - + Bottom of desktop %1 - Dolní strana pracovní plochy %1 + Spodní strana pracovní plochy %1 - + Top Nahoře - + Bottom Dole - - + + Pick color Vybrat barvu - + Images (*.png *.gif *.jpg) Obrázky (*.png *.gif *.jpg) - + Pick image Vybrat obrázek @@ -353,45 +358,45 @@ LXQtPanel - - + + Panel Panel - + Configure Panel Nastavit panel - + Manage Widgets Spravovat ovládací prvky - + Add New Panel Přidat nový panel - + Remove Panel Menu Item Odstranit panel - + Lock This Panel Zamknout tento panel - + Remove Panel Dialog Title Odstranit panel - + Removing a panel can not be undone. Do you want to remove this panel? Odstranění panelu nelze vrátit zpět. @@ -401,17 +406,17 @@ Plugin - + Configure "%1" Nastavit „%1“ - + Move "%1" Přesunout „%1“ - + Remove "%1" Odstranit „%1“ diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_cy.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_cy.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_cy.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_cy.ts 2020-11-05 16:09:19.000000000 +0000 @@ -129,17 +129,22 @@ - + + Visible thin margin for hidden panel + + + + Don't allow maximized windows go under the panel window - + Reserve space on display - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -151,12 +156,12 @@ - + Override icon &theme - + Icon theme for panels: @@ -182,116 +187,116 @@ - + Left - - + + Center - + Right - + Custom styling - + Font color: - + Background color: - + Background opacity: - + <small>Compositing is required for panel transparency.</small> - + Background image: - + Top of desktop - + Left of desktop - + Right of desktop - + Bottom of desktop - + Top of desktop %1 - + Left of desktop %1 - + Right of desktop %1 - + Bottom of desktop %1 - + Top - + Bottom - - + + Pick color - + Pick image - + Images (*.png *.gif *.jpg) @@ -346,45 +351,45 @@ LXQtPanel - - + + Panel - + Configure Panel - + Manage Widgets - + Add New Panel - + Remove Panel Menu Item - + Lock This Panel - + Remove Panel Dialog Title - + Removing a panel can not be undone. Do you want to remove this panel? @@ -393,17 +398,17 @@ Plugin - + Configure "%1" - + Move "%1" - + Remove "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_da.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_da.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_da.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_da.ts 2020-11-05 16:09:19.000000000 +0000 @@ -124,20 +124,20 @@ - + Left Venstre - - + + Center Centereret - + Right Højre @@ -158,47 +158,52 @@ Vis med forsinkelse: - + + Visible thin margin for hidden panel + Synlig tynd margen til skjult panel + + + Don't allow maximized windows go under the panel window Tillad ikke maksimerede vinduer at gå under panel-vinduet - + Reserve space on display Reserver plads på skærm - + Custom styling Brugerdefineret udseende - + Font color: Skriftfarve: - + Background color: Baggrundsfarve: - + Background opacity: Baggrundens opacity: - + <small>Compositing is required for panel transparency.</small> <small>Komposition kræves for at panelet kan være gennemsigtigt.</small> - + Background image: Baggrundsbillede: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -217,12 +222,12 @@ Farvelæg ikoner baseret på widgetstil (palet) - + Override icon &theme Tilsidesæt ikon&tema - + Icon theme for panels: Ikontema for paneler: @@ -237,68 +242,68 @@ Placering: - + Top of desktop Øverst på skrivebordet - + Left of desktop Til venstre på skrivebordet - + Right of desktop Til højre på skrivebordet - + Bottom of desktop Nederst på skrivebordet - + Top of desktop %1 Øverst på skrivebord %1 - + Left of desktop %1 Til venstre på skrivebord %1 - + Right of desktop %1 Til højre på skrivebord %1 - + Bottom of desktop %1 Nederst på skrivebord %1 - + Top Øverst - + Bottom Nederst - - + + Pick color Vælg farve - + Images (*.png *.gif *.jpg) Billeder (*.png *.gif *.jpg) - + Pick image Vælg billede @@ -353,45 +358,45 @@ LXQtPanel - - + + Panel Panel - + Configure Panel Konfigurér panel - + Manage Widgets Håndtér widgets - + Add New Panel Tilføj nyt panel - + Remove Panel Menu Item Fjern panel - + Lock This Panel Lås panelet - + Remove Panel Dialog Title Fjern panel - + Removing a panel can not be undone. Do you want to remove this panel? Fjernelse af et panel kan ikke fortrydes. @@ -401,17 +406,17 @@ Plugin - + Configure "%1" Konfigurér "%1" - + Move "%1" Flyt "%1" - + Remove "%1" Fjern "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_de.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_de.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_de.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_de.ts 2020-11-05 16:09:19.000000000 +0000 @@ -129,12 +129,17 @@ Mit Verzögerung anzeigen: - + + Visible thin margin for hidden panel + + + + Don't allow maximized windows go under the panel window Nicht zulassen, dass maximierte Fenster unter das Leistenfenster gehen - + Reserve space on display Platz auf Bildschirm reservieren @@ -160,55 +165,55 @@ - + Left Links - - + + Center Mitte - + Right Rechts - + Custom styling Eigener Stil - + Font color: Schriftfarbe: - + Background color: Hintergrundfarbe: - + Background opacity: Hintergrunddeckkraft: - + <small>Compositing is required for panel transparency.</small> <small>Für Leistentransparenz ist Compositing erforderlich.</small> - + Background image: Hintergrundbild: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -220,78 +225,78 @@ - + Override icon &theme Symbol&thema überschreiben - + Icon theme for panels: Symbolthema für Leisten: - + Top of desktop - Oben auf dem Schreibtisch + Oben auf der Arbeitsfläche - + Left of desktop - Links auf dem Schreibtisch + Links auf der Arbeitsfläche - + Right of desktop - Rechts auf dem Schreibtisch + Rechts auf der Arbeitsfläche - + Bottom of desktop - Unten auf dem Schreibtisch + Unten auf der Arbeitsfläche - + Top of desktop %1 - Oben auf dem Schreibtisch %1 + Oben auf der Arbeitsfläche %1 - + Left of desktop %1 - Links auf dem Schreibtisch %1 + Links auf dem Arbeitsfläche %1 - + Right of desktop %1 - Rechts auf dem Schreibtisch %1 + Rechts auf der Arbeitsfläche %1 - + Bottom of desktop %1 - Unten auf dem Schreibtisch %1 + Unten auf der Arbeitsfläche %1 - + Top Oben - + Bottom Unten - - + + Pick color Farbe auswählen - + Pick image Bild auswählen - + Images (*.png *.gif *.jpg) Bilder (*.png *.gif *.jpg) @@ -346,45 +351,45 @@ LXQtPanel - - + + Panel Leiste - + Configure Panel Leiste konfigurieren - + Manage Widgets Bedienelemente verwalten - + Add New Panel Neue Leiste hinzufügen - + Remove Panel Menu Item Leiste entfernen - + Lock This Panel Diese Leiste sperren - + Remove Panel Dialog Title Leiste entfernen - + Removing a panel can not be undone. Do you want to remove this panel? Das Entfernen einer Leiste kann nicht rückgängig gemacht werden. @@ -394,17 +399,17 @@ Plugin - + Configure "%1" "%1" konfigurieren - + Move "%1" "%1" verschieben - + Remove "%1" "%1" entfernen diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_el.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_el.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_el.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_el.ts 2020-11-05 16:09:19.000000000 +0000 @@ -124,20 +124,20 @@ - + Left Αριστερά - - + + Center Κέντρο - + Right Δεξιά @@ -158,47 +158,52 @@ Εμφάνιση με καθυστέρηση: - + + Visible thin margin for hidden panel + Ορατό λεπτό περιθώριο του καταχωνιασμένου πίνακα + + + Don't allow maximized windows go under the panel window Να μην επιτρέπεται στα μεγιστοποιημένα παράθυρα να καταλαμβάνουν τον χώρο κάτω από το πλαίσιο του πίνακα - + Reserve space on display Δέσμευση χώρου στην απεικόνιση - + Custom styling Προσαρμοσμένη τεχνοτροπία - + Font color: Χρώμα γραμματοσειράς: - + Background color: Χρώμα παρασκηνίου: - + Background opacity: Αδιαφάνεια παρασκηνίου: - + <small>Compositing is required for panel transparency.</small> <small>Για την διαφάνεια του πίνακα απαιτείται το χαρακτηριστικό γραφικών σύνθεσης.</small> - + Background image: Εικόνα παρασκηνίου: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -219,12 +224,12 @@ του γραφικού συστατικού (χρωματοπυξίδα) - + Override icon &theme Αντικατάσταση του &θέματος εικονιδίων - + Icon theme for panels: Θέμα εικονιδίων για πίνακες: @@ -239,68 +244,68 @@ Θέση: - + Top of desktop Στην κορυφή της επιφάνεια εργασίας - + Left of desktop Στα αριστερά της επιφάνειας εργασίας - + Right of desktop Στα δεξιά της επιφάνειας εργασίας - + Bottom of desktop Στη βάση της επιφάνειας εργασίας - + Top of desktop %1 Στην κορυφή της επιφάνειας εργασίας %1 - + Left of desktop %1 Στα αριστερά της επιφάνειας εργασίας %1 - + Right of desktop %1 Στα δεξιά της επιφάνειας εργασίας %1 - + Bottom of desktop %1 Στη βάση της επιφάνειας εργασίας %1 - + Top Κορυφή - + Bottom Βάση - - + + Pick color Επιλέξτε το χρώμα - + Images (*.png *.gif *.jpg) Εικόνες (*.png *.gif *.jpg) - + Pick image Επιλογή εικόνας @@ -355,45 +360,45 @@ LXQtPanel - - + + Panel Πίνακας - + Configure Panel Διαμόρφωση του πίνακα - + Manage Widgets Διαχείριση των γραφικών συστατικών - + Add New Panel Προσθήκη νέου πίνακα - + Remove Panel Menu Item Αφαίρεση πίνακα - + Lock This Panel Κλείδωμα του πίνακα - + Remove Panel Dialog Title Αφαίρεση πίνακα - + Removing a panel can not be undone. Do you want to remove this panel? Η αφαίρεση ενός πίνακα δεν μπορεί να αναιρεθεί. @@ -403,17 +408,17 @@ Plugin - + Configure "%1" Διαμόρφωση του «%1» - + Move "%1" Μετακίνηση του «%1» - + Remove "%1" Αφαίρεση του «%1» diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_en_GB.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_en_GB.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_en_GB.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_en_GB.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,429 @@ + + + + + AddPluginDialog + + + Add Plugins + Add Plugins + + + + Search: + + + + + Add Widget + + + + + Close + + + + + (only one instance can run at a time) + + + + + ConfigPanelDialog + + + Configure Panel + + + + + Panel + + + + + Widgets + + + + + ConfigPanelWidget + + + Configure panel + + + + + Size + + + + + <p>Negative pixel value sets the panel length to that many pixels less than available screen space.</p><p/><p><i>E.g. "Length" set to -100px, screen size is 1000px, then real panel length will be 900 px.</i></p> + + + + + Size: + + + + + Length: + + + + + % + + + + + px + + + + + + px + + + + + Icon size: + + + + + Alignment && position + + + + + A&uto-hide + + + + + + Zero means no animation + + + + + + ms + + + + + + Zero means no delay + + + + + Show with delay: + + + + + Visible thin margin for hidden panel + + + + + Don't allow maximized windows go under the panel window + + + + + Reserve space on display + + + + + A partial workaround for widget styles that +cannot give a separate theme to the panel. + +You might also want to disable: + +LXQt Appearance Configuration → +Icons Theme → +Colorize icons based on widget style (palette) + + + + + Override icon &theme + + + + + Icon theme for panels: + Icon theme for panels: + + + + Position: + + + + + Animation duration: + + + + + Alignment: + + + + + Rows: + + + + + + Left + + + + + + + Center + + + + + + Right + + + + + Custom styling + + + + + Font color: + + + + + Background color: + + + + + Background opacity: + + + + + <small>Compositing is required for panel transparency.</small> + + + + + Background image: + + + + + Top of desktop + + + + + Left of desktop + + + + + Right of desktop + + + + + Bottom of desktop + + + + + Top of desktop %1 + + + + + Left of desktop %1 + + + + + Right of desktop %1 + + + + + Bottom of desktop %1 + + + + + Top + + + + + Bottom + + + + + + Pick color + + + + + Pick image + + + + + Images (*.png *.gif *.jpg) + + + + + ConfigPluginsWidget + + + Configure Plugins + + + + + Note: changes made in this page cannot be reset. + + + + + Move up + + + + + + + + + ... + + + + + Move down + + + + + Add + + + + + Remove + + + + + Configure + + + + + LXQtPanel + + + + Panel + + + + + Configure Panel + + + + + Manage Widgets + + + + + Add New Panel + + + + + Remove Panel + Menu Item + + + + + Lock This Panel + + + + + Remove Panel + Dialog Title + + + + + Removing a panel can not be undone. +Do you want to remove this panel? + + + + + Plugin + + + Configure "%1" + + + + + Move "%1" + + + + + Remove "%1" + + + + + main + + + Use alternate configuration file. + + + + + Configuration file + + + + diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_eo.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_eo.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_eo.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_eo.ts 2020-11-05 16:09:19.000000000 +0000 @@ -124,20 +124,20 @@ - + Left Maldekstre - - + + Center Centre - + Right Dekstre @@ -158,47 +158,52 @@ - + + Visible thin margin for hidden panel + + + + Don't allow maximized windows go under the panel window - + Reserve space on display - + Custom styling - + Font color: - + Background color: - + Background opacity: - + <small>Compositing is required for panel transparency.</small> - + Background image: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -210,12 +215,12 @@ - + Override icon &theme - + Icon theme for panels: @@ -230,68 +235,68 @@ Loko: - + Top of desktop Supre de labortablo - + Left of desktop Maldekstre de labortablo - + Right of desktop Dekstre de labortablo - + Bottom of desktop Malsupre de labortablo - + Top of desktop %1 Supre de labortablo %1 - + Left of desktop %1 Maldekstre de labortablo %1 - + Right of desktop %1 Dekstre de labortablo %1 - + Bottom of desktop %1 Malsupre de labortablo %1 - + Top - + Bottom - - + + Pick color - + Images (*.png *.gif *.jpg) - + Pick image @@ -346,45 +351,45 @@ LXQtPanel - - + + Panel Agordoj de muso por LXQto - + Configure Panel - + Manage Widgets - + Add New Panel - + Remove Panel Menu Item - + Lock This Panel - + Remove Panel Dialog Title - + Removing a panel can not be undone. Do you want to remove this panel? @@ -393,17 +398,17 @@ Plugin - + Configure "%1" - + Move "%1" - + Remove "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_es.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_es.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_es.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_es.ts 2020-11-05 16:09:19.000000000 +0000 @@ -16,7 +16,7 @@ Add Widget - Añadir miniaplicación + Añadir widget @@ -26,7 +26,7 @@ (only one instance can run at a time) - (solo se permite una instancia a la vez) + (Este widget ya se encuentra en el panel) @@ -34,7 +34,7 @@ Configure Panel - Configurar el panel + Configuración del panel @@ -44,7 +44,7 @@ Widgets - Miniaplicaciones + Widgets @@ -52,12 +52,12 @@ Configure panel - Configurar el panel + Configurar panel Size - Tamaño + Dimensiones de los elementos del panel @@ -73,7 +73,7 @@ Icon size: - Tamaño de icono: + Tamaño de los iconos: @@ -83,7 +83,7 @@ <p>Negative pixel value sets the panel length to that many pixels less than available screen space.</p><p/><p><i>E.g. "Length" set to -100px, screen size is 1000px, then real panel length will be 900 px.</i></p> - <p>Un largo negativo en píxeles configura el largo del panel a esa cantidad de píxeles menos que el espacio disponible en la pantalla.</p><p/><p><i>P. ej. "Largo" configurado a -100px, el tamaño de la pantalla es 1000px, entonces el largo real del panel será de 900 px.</i></p> + <p>Un valor negativo en el tamaño cambia la longitud total del panel restandole esa cantidad al tamaño en la pantalla. </p><p/><p><i>Por ejemplo si el "Largo" configurado es -100px, y el tamaño de la pantalla es de 1000px, entonces el largo del panel será de 900 px.</i></p> @@ -98,13 +98,13 @@ Alignment && position - Alineación y posición + Alineación, posición y características Zero means no animation - Cero equivale a no usar animaciones + Si elige "0 ms" se desactivarán las animaciones @@ -120,85 +120,91 @@ Rows: - Filas: + Filas del panel: - + Left Izquierda - - + + Center Centro - + Right Derecha A&uto-hide - Ocultar a&utomáticamente + Ocultar el panel a&utomáticamente Zero means no delay - Cero equivale a sin demora + Si elige "0 ms" se evitara cualquier retraso Show with delay: - Mostrar con un retraso: + Retraso antes de aparecer: - + + Visible thin margin for hidden panel + Margen fino visible para el panel oculto + + + Don't allow maximized windows go under the panel window - No permitir que las ventanas maximizadas queden bajo la ventana del panel + Si se activa esta opción se evitará que las ventanas maximizadas +queden bajo del panel y tengan un area inaccesible - + Reserve space on display - Reservar espacio en la pantalla + Reservar el espacio del panel en la pantalla - + Custom styling - Estilo personalizado + Personalización del estilo del panel - + Font color: Color de la fuente: - + Background color: - Color de fondo: + Color del fondo: - + Background opacity: Opacidad del fondo: - + <small>Compositing is required for panel transparency.</small> - <small>La composición es obligatoria para la transparencia del panel.</small> + <small>La composición debe estar activada para usar transparencias en el panel.</small> - + Background image: Imagen de fondo: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -207,25 +213,24 @@ LXQt Appearance Configuration → Icons Theme → Colorize icons based on widget style (palette) - Un apaño parcial para estilos de componentes que no -pueden dar un tema separado al panel. + Si tiene problemas para personalizar los widgets que no soportan +usar un tema diferente al original del panel. -Puede que también quiera deshabilitar: +Debe deshabilitar la siguiente casilla: Configuración de apariencia de LXQt → Tema de iconos → -Colorear los iconos según el estilo de los controles -(paleta) +Colorear los iconos según la paleta de colores usada en los widgets - + Override icon &theme - Sustituir el &tema de iconos + Elegir un &tema personalizado para los iconos - + Icon theme for panels: - Tema de iconos para los paneles: + Tema de iconos de los paneles: @@ -238,68 +243,68 @@ Posición: - + Top of desktop Borde superior del escritorio - + Left of desktop Borde izquierdo del escritorio - + Right of desktop Borde derecho del escritorio - + Bottom of desktop Borde inferior del escritorio - + Top of desktop %1 Borde superior del escritorio %1 - + Left of desktop %1 Borde izquierdo del escritorio %1 - + Right of desktop %1 Borde derecho del escritorio %1 - + Bottom of desktop %1 Borde inferior del escritorio %1 - + Top Arriba - + Bottom Abajo - - + + Pick color Seleccione un color - + Images (*.png *.gif *.jpg) Imágenes (*.png *.gif *.jpg) - + Pick image Seleccione una imagen @@ -314,7 +319,7 @@ Note: changes made in this page cannot be reset. - Nota: los cambios hechos en esta página no pueden deshacerse. + Nota: es posible que algunos de los cambios realizados no puedan deshacerse. @@ -338,83 +343,83 @@ Add - Añadir + Añadir un widget Remove - Eliminar + Eliminar un widget Configure - Configurar + Abrir la ventana de configuración del widget seleccionado LXQtPanel - - + + Panel - + Configure Panel - Configurar el panel + Configurar este panel - + Manage Widgets - Gestionar las miniaplicaciones + Gestionar los widgets - + Add New Panel - Añadir un panel nuevo + Añadir otro panel - + Remove Panel Menu Item - Eliminar el panel + Eliminar este panel - + Lock This Panel Bloquear este panel - + Remove Panel Dialog Title - Eliminar el panel + Eliminar este panel - + Removing a panel can not be undone. Do you want to remove this panel? - La eliminación del panel no puede deshacerse. -¿Seguro que quiere borrar el panel? + Una vez eliminado el panel no puede deshacerse. +¿Seguro que desea borrar este panel? Plugin - + Configure "%1" - Configurar "%1" + Configurar %1 - + Move "%1" - Mover "%1" + Mover %1 - + Remove "%1" - Eliminar "%1" + Eliminar %1 @@ -422,7 +427,7 @@ Use alternate configuration file. - Usar un fichero de configuración alternativo. + Utilizar un archivo de configuración alternativo. diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_es_UY.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_es_UY.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_es_UY.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_es_UY.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,22 +6,22 @@ Add Plugins - Agregar Plugins + Search: - Buscar: + Add Widget - Agregar Widget + Close - Cerrar + @@ -39,7 +39,7 @@ Panel - Panel + @@ -78,7 +78,7 @@ Length: - + Tamaño: @@ -88,117 +88,122 @@ % - + % px - + px Alignment && position - + Alineación y posición Zero means no animation - + Cero significa que no hay animación ms - + ms Animation duration: - + Duración de la animación: Rows: - + Filas: - + Left - + Izquierda - - + + Center - + Centro - + Right - + Derecha A&uto-hide - + Auto-esconder Zero means no delay - + Cero significa sin demora Show with delay: + Mostrar con demora: + + + + Visible thin margin for hidden panel - + Don't allow maximized windows go under the panel window - + No permita que las ventanas maximizadas vayan debajo de la ventana del panel - + Reserve space on display - + Reserva espacio en el monitor - + Custom styling - + Estilo personalizado - + Font color: - + Color de fuente: - + Background color: - + Color de fondo: - + Background opacity: - + Opacidad de fondo: - + <small>Compositing is required for panel transparency.</small> - + Background image: - + Imagen de fondo: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -210,90 +215,90 @@ - + Override icon &theme - + Reemplazar tema de el icono - + Icon theme for panels: Alignment: - + Alineación: Position: - + Posición: - + Top of desktop - Arriba del escritorio + Parte superior de el desktop - + Left of desktop - A la izquierda del escritorio + Izquierda de el desktop - + Right of desktop - A la derecha del escritorio + Derecha de el desktop - + Bottom of desktop - Abajo del escritorio + Parte inferior de el desktop - + Top of desktop %1 - Arriba del escritorio %1 + Parte superior de el desktop %1 - + Left of desktop %1 - A la izquierda del escritorio %1 + Izquierda de el desktop %1 - + Right of desktop %1 - A la derecha del excritorio %1 + Derecha de el desktop %1 - + Bottom of desktop %1 - Abajo del escritorio %1 + Parte inferior de el desktop %1 - + Top - + Parte superior - + Bottom - + Parte inferior - - + + Pick color - + Elige un color - + Images (*.png *.gif *.jpg) - + Imágenes (*.png *.gif *.jpg) - + Pick image - + Elige una imagen @@ -301,17 +306,17 @@ Configure Plugins - + Configurar Plugins(Complementos) Note: changes made in this page cannot be reset. - + Atención: los cambios realizados en la página no se pueden restablecer. Move up - + Mover hacia arriba @@ -320,92 +325,93 @@ ... - + ... Move down - + Mover hacia abajo Add - + Añadir Remove - + Retirar Configure - + Configurar LXQtPanel - - + + Panel - Panel + Panel - + Configure Panel - + Manage Widgets - + Administrar Widgets - + Add New Panel - + Añadir un nuevo panel - + Remove Panel Menu Item - + Retirar el panel - + Lock This Panel - + Bloquear el panel - + Remove Panel Dialog Title - + Retirar el panel - + Removing a panel can not be undone. Do you want to remove this panel? - + La retiración de un panel no se puede deshacer. +¿Quieres retirar el panel? Plugin - + Configure "%1" - + Configurar "%1" - + Move "%1" - + Mover "%1" - + Remove "%1" - + Retirar "%1" @@ -418,7 +424,7 @@ Configuration file - + Archivo de configuración diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_es_VE.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_es_VE.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_es_VE.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_es_VE.ts 2020-11-05 16:09:19.000000000 +0000 @@ -26,7 +26,7 @@ (only one instance can run at a time) - + (sólo una instancia a la vez) @@ -44,7 +44,7 @@ Widgets - + Componentes @@ -57,7 +57,7 @@ Size - + Tamaño @@ -124,20 +124,20 @@ - + Left Izquierda - - + + Center Centrado - + Right Derecha @@ -158,47 +158,52 @@ - + + Visible thin margin for hidden panel + + + + Don't allow maximized windows go under the panel window - + Reserve space on display - + Custom styling - + Font color: - + Background color: - + Background opacity: - + <small>Compositing is required for panel transparency.</small> - + Background image: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -210,12 +215,12 @@ - + Override icon &theme - + Icon theme for panels: @@ -230,68 +235,68 @@ Posicion: - + Top of desktop Tope del escritorio - + Left of desktop Izquierda del escritorio - + Right of desktop Derecha del escritorio - + Bottom of desktop Inferior del escritorio - + Top of desktop %1 Tope del escritorio %1 - + Left of desktop %1 Izquierda del escritorio %1 - + Right of desktop %1 Derecha del escritorio %1 - + Bottom of desktop %1 Inferior del escritorio %1 - + Top - + Bottom - - + + Pick color - + Images (*.png *.gif *.jpg) - + Pick image @@ -346,45 +351,45 @@ LXQtPanel - - + + Panel Panel - + Configure Panel Configurar Panel - + Manage Widgets - + Add New Panel - + Remove Panel Menu Item - + Lock This Panel - + Remove Panel Dialog Title - + Removing a panel can not be undone. Do you want to remove this panel? @@ -393,17 +398,17 @@ Plugin - + Configure "%1" - + Move "%1" - + Remove "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_eu.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_eu.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_eu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_eu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,27 +6,27 @@ Add Plugins - + Gehitu pluginak Search: - + Bilatu: Add Widget - + Gehitu Widget Close - + Itxi (only one instance can run at a time) - + (instantzia bakarra exekutatu daiteke aldi berean) @@ -34,7 +34,7 @@ Configure Panel - + Konfiguratu panela @@ -44,7 +44,7 @@ Widgets - + Widgets @@ -52,33 +52,33 @@ Configure panel - Konfiguratu panela + Konfiguratu panela Size - + Tamaina Size: - Tamaina: + Tamaina: px - + px Icon size: - + Ikonoaren tamaina: Length: - Luzera: + Luzera: @@ -88,117 +88,122 @@ % - % + % px - px + px Alignment && position - + Lerrokatzea && posizioa Zero means no animation - + Zero animaziorik ez dela esan nahi du ms - + ms Animation duration: - + Animazioaren iraupena: Rows: - + Ilarak: - + Left - Ezkerra + Ezkerra - - + + Center - Erdia + Erdia - + Right - Eskuina + Eskuina A&uto-hide - + Auto-ezkutatu Zero means no delay - + Zero atzerapenik ez dela esan nahi du Show with delay: + Erakutsi atzerapenarekin: + + + + Visible thin margin for hidden panel - + Don't allow maximized windows go under the panel window - + Ez baimendu leiho maximizatuak paneleko leihoaren azpian joatea - + Reserve space on display - + erreserbatu espazioa pantailan - + Custom styling - + Diseinu pertsonalizatua - + Font color: - + Letraren kolorea: - + Background color: - + Atzeko planoaren kolorea: - + Background opacity: - + Atzeko planoaren opakutasuna: - + <small>Compositing is required for panel transparency.</small> - + Background image: - + Atzeko planoko irudia: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -210,14 +215,14 @@ - + Override icon &theme - + Baztertu ikonoa eta gaia - + Icon theme for panels: - + Ikonoen gaia panelentzako: @@ -227,73 +232,73 @@ Position: - Posizioa: + Posizioa: - + Top of desktop Mahaigainaren goialdea - + Left of desktop Mahaigainaren ezkerraldea - + Right of desktop Mahaigainaren eskuinaldea - + Bottom of desktop Mahaigainaren behealdea - + Top of desktop %1 %1 mahaigainaren goialdea - + Left of desktop %1 %1 mahaigainaren ezkerraldea - + Right of desktop %1 %1 mahaigainaren eskuinaldea - + Bottom of desktop %1 %1 mahaigainaren behealdea - + Top - + gainean - + Bottom - + behean - - + + Pick color - + Aukeratu kolorea - + Images (*.png *.gif *.jpg) - + Irudiak (* .png * .gif * .jpg) - + Pick image - + Aukeratu irudia @@ -306,7 +311,7 @@ Note: changes made in this page cannot be reset. - + Oharra: ezin dira orrialde honetan egindako aldaketak berrezarri. @@ -346,45 +351,45 @@ LXQtPanel - - + + Panel Panela - + Configure Panel - + Konfiguratu panela - + Manage Widgets - + Add New Panel - + Remove Panel Menu Item - + Lock This Panel - + Remove Panel Dialog Title - + Removing a panel can not be undone. Do you want to remove this panel? @@ -393,17 +398,17 @@ Plugin - + Configure "%1" - + Move "%1" - + Remove "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_fa.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_fa.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_fa.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_fa.ts 2020-11-05 16:09:19.000000000 +0000 @@ -129,17 +129,22 @@ نمایش با وقفه: - + + Visible thin margin for hidden panel + حاشیه نازک قابل مشاهده برای پنل پنهان + + + Don't allow maximized windows go under the panel window - + Reserve space on display - + رزرو فضا بر روی صفحه نمایش - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -151,19 +156,19 @@ - + Override icon &theme - + Icon theme for panels: - + تم آیکون برای پنل‌ها: Position: - + موقعیت: @@ -182,116 +187,116 @@ - + Left چپ - - + + Center مرکز - + Right راست - + Custom styling - + Font color: - رنگ فونت: + رنگ قلم: - + Background color: رنگ پس زمینه: - + Background opacity: شفافیت پس زمینه: - + <small>Compositing is required for panel transparency.</small> - + Background image: تصویر پس زمینه: - + Top of desktop - + بالای دسکتاپ - + Left of desktop - + سمت چپ دسکتاپ - + Right of desktop - + سمت راست دسکتاپ - + Bottom of desktop - + پایین دسکتاپ - + Top of desktop %1 - + بالای دسکتاپ %1 - + Left of desktop %1 - + سمت چپ دسکتاپ %1 - + Right of desktop %1 - + سمت راست دسکتاپ %1 - + Bottom of desktop %1 - + پایین دسکتاپ %1 - + Top بالا - + Bottom پایین - - + + Pick color انتخاب رنگ - + Pick image انتخاب تصویر - + Images (*.png *.gif *.jpg) تصاویر (*.png *.gif *.jpg) @@ -306,12 +311,12 @@ Note: changes made in this page cannot be reset. - + توجه: تغییرات ایجاد شده در این صفحه قابل تنظیم مجدد نیست. Move up - + حرکت به بالا @@ -325,7 +330,7 @@ Move down - + حرکت به پایین @@ -346,45 +351,45 @@ LXQtPanel - - + + Panel پنل - + Configure Panel پیکربندی پنل - + Manage Widgets مدیریت ابزارک ها - + Add New Panel افزودن پنل جدید - + Remove Panel Menu Item حذف پنل - + Lock This Panel - + Remove Panel Dialog Title حذف پنل - + Removing a panel can not be undone. Do you want to remove this panel? @@ -393,17 +398,17 @@ Plugin - + Configure "%1" - + Move "%1" انتقال "%1" - + Remove "%1" حذف "%1" @@ -418,7 +423,7 @@ Configuration file - فایل پیکربندی + پرونده پیکربندی diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_fi.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_fi.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_fi.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_fi.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ Add Plugins - + Lisää lisäosia @@ -16,7 +16,7 @@ Add Widget - Lisää vempain + Lisää pienoisohjelma @@ -39,7 +39,7 @@ Panel - Paneeli + Paneeli @@ -52,7 +52,7 @@ Configure panel - Muokkaa paneelia + Muokkaa paneelia @@ -62,13 +62,13 @@ Size: - Koko: + Koko: px - + px @@ -78,22 +78,22 @@ Length: - Pituus: + Pituus: <p>Negative pixel value sets the panel length to that many pixels less than available screen space.</p><p/><p><i>E.g. "Length" set to -100px, screen size is 1000px, then real panel length will be 900 px.</i></p> - + <p>Negatiivinen pikseliarvo asettaa paneelin pituuden yhtä monta pikseliä käytettävissä olevaa näyttötilaa pienemmäksi.</p><p/><p><i>Esimerkiksi jos "Pituus" on asetettu arvoon -100px, ja näytön koko on 1000px, tulee paneelin pituudeksi 900px.</i></p> % - % + % px - pikseliä + px @@ -110,7 +110,7 @@ ms - + ms @@ -120,26 +120,26 @@ Rows: - + Rivejä: - + Left - Vasemmalla + Vasemmalla - - + + Center - Keskellä + Keskellä - + Right - Oikealla + Oikealla @@ -158,47 +158,52 @@ Esiintulemisen viive: - + + Visible thin margin for hidden panel + Näytä ohut osa piiloitetusta paneelista + + + Don't allow maximized windows go under the panel window Älä salli suurennettujen ikkunoiden mennä paneelin alle - + Reserve space on display Varaa tilaa näytöltä - + Custom styling - + Ulkoasun muokkaaminen - + Font color: Fontin väri: - + Background color: Taustaväri: - + Background opacity: Taustan läpinäkyvyys: - + <small>Compositing is required for panel transparency.</small> <small>Kompositointi tarvitaan läpinäkyvää paneelia varten</small> - + Background image: Taustakuva: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -207,91 +212,98 @@ LXQt Appearance Configuration → Icons Theme → Colorize icons based on widget style (palette) - + Osittainen kiertotapa pienoisohjelmatyyleille, +jotka eivät voi antaa erillistä teemaa paneelille. + +Saatat myös haluta poistaa käytöstä: + +LXQtin ulkoasun hallinta → +Kuvaketeema → +Väritä kuvakkeet pienoisohjelmatyylin (paletti) mukaan - + Override icon &theme - + Ohita kuvake & teema - + Icon theme for panels: - + Kuvaketeema paneeleille: Alignment: - Kohdistus: + Kohdistus: Position: - Sijainti: + Sijainti: - + Top of desktop - Työpöydän yläosassa + Työpöydän yläosassa - + Left of desktop - Työpöydän vasemmassa laidassa + Työpöydän vasemmassa laidassa - + Right of desktop - Työpöydän oikeassa laidassa + Työpöydän oikeassa laidassa - + Bottom of desktop - Työpöydän alaosassa + Työpöydän alaosassa - + Top of desktop %1 - Työpöydän %1 yläosassa + Työpöydän %1 yläosassa - + Left of desktop %1 - Työpöydän %1 vasemmassa laidassa + Työpöydän %1 vasemmassa laidassa - + Right of desktop %1 - Työpöydän %1 oikeassa laidassa + Työpöydän %1 oikeassa laidassa - + Bottom of desktop %1 - Työpöydän %1 alaosassa + Työpöydän %1 alaosassa - + Top - + Yläreunassa - + Bottom - + Alareunassa - - + + Pick color Valitse väri - + Images (*.png *.gif *.jpg) Kuvat (*.png *.gif *.jpg) - + Pick image Valitse kuva @@ -301,7 +313,7 @@ Configure Plugins - + Säädä lisäosia @@ -320,7 +332,7 @@ ... - + ... @@ -335,56 +347,56 @@ Remove - Poista + Poista Configure - Muokkaa + Asetukset LXQtPanel - - + + Panel Paneeli - + Configure Panel Muokkaa paneelia - + Manage Widgets - + Hallitse pienoisohjelmia - + Add New Panel Luo uusi paneeli - + Remove Panel Menu Item Poista paneeli - + Lock This Panel Lukitse paneeli - + Remove Panel Dialog Title Poista paneeli - + Removing a panel can not be undone. Do you want to remove this panel? Paneelin poistoa ei voi peruuttaa. @@ -394,19 +406,19 @@ Plugin - + Configure "%1" - + Säädä "%1" - + Move "%1" - + Siirrä "%1" - + Remove "%1" - + Poista "%1" @@ -414,7 +426,7 @@ Use alternate configuration file. - + Käytä vaihtoehtoista asetustiedostoa. diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_fr.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_fr.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_fr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_fr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -124,20 +124,20 @@ - + Left À gauche - - + + Center Centré - + Right À droite @@ -158,47 +158,52 @@ Afficher avec délai : - + + Visible thin margin for hidden panel + Marge fine visible pour le panneau caché + + + Don't allow maximized windows go under the panel window Ne pas autoriser les fenêtres agrandies d'aller sous le panneau - + Reserve space on display Réserver de l'espace pour l'affichage - + Custom styling Style personnalisé - + Font color: Couleur de la police : - + Background color: Couleur du fond : - + Background opacity: Opacité du fond : - + <small>Compositing is required for panel transparency.</small> <small>Un compositeur est nécessaire pour la transparence du tableau de bord.</small> - + Background image: Image de fond : - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -217,12 +222,12 @@ Colorier les icônes en fonction du style du widget (palette) - + Override icon &theme Ignorer l'icône et le &thème - + Icon theme for panels: Thème d'icônes pour les panneaux : @@ -237,68 +242,68 @@ Position : - + Top of desktop Haut du bureau - + Left of desktop Gauche du bureau - + Right of desktop Droite du bureau - + Bottom of desktop Bas du bureau - + Top of desktop %1 Haut du bureau %1 - + Left of desktop %1 Gauche du bureau %1 - + Right of desktop %1 Droite du bureau %1 - + Bottom of desktop %1 Bas du bureau %1 - + Top Haut - + Bottom Bas - - + + Pick color Choisir une couleur - + Images (*.png *.gif *.jpg) - Image(s) (*.png *.gif *.jpg) + Images (*.png *.gif *.jpg) - + Pick image Choisir une image @@ -353,45 +358,45 @@ LXQtPanel - - + + Panel Tableau de bord - + Configure Panel Configurer le tableau de bord - + Manage Widgets Gérer les widgets - + Add New Panel Ajouter un nouveau tableau - + Remove Panel Menu Item Supprimer le tableau de bord - + Lock This Panel Verrouiller ce tableau de bord - + Remove Panel Dialog Title Supprimer le tableau de bord - + Removing a panel can not be undone. Do you want to remove this panel? La suppression d'un panneau ne peut pas être annulée. @@ -401,17 +406,17 @@ Plugin - + Configure "%1" Configurer "%1" - + Move "%1" Déplacer "%1" - + Remove "%1" Supprimer "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_gl.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_gl.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_gl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_gl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -103,7 +103,7 @@ A&uto-hide - Agachar a&utomaticamente + Agochar a&utomaticamente @@ -129,17 +129,22 @@ Amosar cun atraso de: - + + Visible thin margin for hidden panel + Marxe fina visible para o panel agochado + + + Don't allow maximized windows go under the panel window Non permitir que as xanelas maximizadas queden baixo a xanela do panel - + Reserve space on display Reservar espazo na pantalla - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -158,12 +163,12 @@ Colorar as iconas segundo o estilo dos trebellos (paleta) - + Override icon &theme Substituír o &tema de iconas - + Icon theme for panels: Tema de iconas para os paneis: @@ -189,116 +194,116 @@ - + Left Esquerda - - + + Center Centro - + Right Dereita - + Custom styling Estilo personalizado - + Font color: Cor da letra: - + Background color: Cor do fondo: - + Background opacity: Opacidade do fondo: - + <small>Compositing is required for panel transparency.</small> <small>É necesaria a composición para ter transparencia no panel.</small> - + Background image: Imaxe de fondo: - + Top of desktop Bordo superior do escritorio - + Left of desktop Bordo esquerdo do escritorio - + Right of desktop Bordo dereito do escritorio - + Bottom of desktop Bordo inferior do escritorio - + Top of desktop %1 Bordo superior do escritorio %1 - + Left of desktop %1 Bordo esquerdo do escritorio %1 - + Right of desktop %1 Bordo dereito do escritorio %1 - + Bottom of desktop %1 Bordo inferior do escritorio %1 - + Top Arriba - + Bottom Abaixo - - + + Pick color Seleccione unha cor - + Pick image Seleccione unha imaxe - + Images (*.png *.gif *.jpg) Imaxes (*.png *.gif *.jpg) @@ -318,7 +323,7 @@ Move up - Mover cara arriba + Mover cara a arriba @@ -332,7 +337,7 @@ Move down - Mover cara abaixo + Mover cara a abaixo @@ -353,45 +358,45 @@ LXQtPanel - - + + Panel - + Configure Panel Configurar o panel - + Manage Widgets Administrar os trebellos - + Add New Panel Engadir un panel novo - + Remove Panel Menu Item Retirar o panel - + Lock This Panel Bloquear este panel - + Remove Panel Dialog Title Retirar o panel - + Removing a panel can not be undone. Do you want to remove this panel? A retirada dun panel non pode desfacerse. @@ -401,17 +406,17 @@ Plugin - + Configure "%1" Configurar «%1» - + Move "%1" Desprazar «%1» - + Remove "%1" Retirar «%1» diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_he.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_he.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_he.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_he.ts 2020-11-05 16:09:19.000000000 +0000 @@ -62,7 +62,7 @@ <p>Negative pixel value sets the panel length to that many pixels less than available screen space.</p><p/><p><i>E.g. "Length" set to -100px, screen size is 1000px, then real panel length will be 900 px.</i></p> - <p>ערך פיקסלים שלילי מגדיר את אורך הלוח לכמות כזאת של פיקסלים מתחת לשטח הזמין במסך.</p><p/><p><i>למשל: „אורך” שומגדר ל־‎-100 פיקסלים, גודל המסך הוא 1000 פיקסלים, אז אורך הלוח יהיה 900 פיקסלים.</i></p> + <p>ערך פיקסלים שלילי מגדיר את אורך הלוח לכמות כזאת של פיקסלים מתחת לשטח הזמין במסך.</p><p/><p>למשל: „אורך” שומגדר ל־‎-100 פיקסלים, אם גודל המסך הוא 1000 פיקסלים, אז אורך הלוח יהיה 900 פיקסלים.</p> @@ -77,7 +77,7 @@ % - + % @@ -129,12 +129,17 @@ הצגה עם המתנה: - + + Visible thin margin for hidden panel + גבול דק גלוי ללוח נסתר + + + Don't allow maximized windows go under the panel window לא לאפשר לחלונות מוגדלים לחתור תחת חלון הלוח - + Reserve space on display שמירת מקום בתצוגה @@ -160,55 +165,55 @@ - + Left שמאל - - + + Center מרכז - + Right ימין - + Custom styling סגנון בהתאמה אישית - + Font color: צבע גופן: - + Background color: צבע רקע: - + Background opacity: אטימות רקע: - + <small>Compositing is required for panel transparency.</small> <small>נדרש ניהול חלונות להגדרת שקיפות לוח.</small> - + Background image: תמונת רקע: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -227,78 +232,78 @@ צביעת סמלים בסגנון וידג׳ט (ערכת צבעים) - + Override icon &theme שכתוב על &ערכת סמלים - + Icon theme for panels: ערכת סמלים ללוחות: - + Top of desktop למעלה בשולחן העבודה - + Left of desktop שמאל שולחן העבודה - + Right of desktop ימין שולחן העבודה - + Bottom of desktop תחתית שולחן העבודה - + Top of desktop %1 למעלה בשולחן העבודה %1 - + Left of desktop %1 שמאל שולחן העבודה %1 - + Right of desktop %1 ימין שולחן העבודה %1 - + Bottom of desktop %1 תחתית שולחן העבודה %1 - + Top למעלה - + Bottom תחתית - - + + Pick color בחירת צבע - + Pick image בחירת תמונה - + Images (*.png *.gif *.jpg) תמונות ‎(*.png *.gif *.jpg) @@ -353,45 +358,45 @@ LXQtPanel - - + + Panel לוח - + Configure Panel הגדרת לוח - + Manage Widgets ניהול וידג׳טים - + Add New Panel הוספת לוח חדש - + Remove Panel Menu Item הסרת לוח - + Lock This Panel נעילת הלוח הזה - + Remove Panel Dialog Title הסרת לוח - + Removing a panel can not be undone. Do you want to remove this panel? לא ניתן לבטל הסרת לוח. @@ -401,17 +406,17 @@ Plugin - + Configure "%1" הגדרת „%1” - + Move "%1" העברת „%1” - + Remove "%1" הסרת „%1” diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_hr.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_hr.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_hr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_hr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -16,7 +16,7 @@ Add Widget - Dodaj widget + Dodaj programčić @@ -26,7 +26,7 @@ (only one instance can run at a time) - (samo jedan primjerak može biti pokrenut u isto vrijeme) + (istovremeno se može pokrenuti samo jedan primjerak) @@ -34,17 +34,17 @@ Configure Panel - Konfiguriraj ploču + Konfiguriraj ploču Panel - Ploča + Ploča Widgets - + Programčići @@ -52,163 +52,168 @@ Configure panel - Konfiguriraj ploču + Konfiguriraj ploču Size - Veličina + Veličina <p>Negative pixel value sets the panel length to that many pixels less than available screen space.</p><p/><p><i>E.g. "Length" set to -100px, screen size is 1000px, then real panel length will be 900 px.</i></p> - + <p>Negativna vrijednost piksela postavlja duljinu ploče na toliki broj piksela minus dostupnog prostora na ekranu. </p> <p /> <p> <i> Npr. „Duljina” postavljena na −100 px, s veličinom ekrana od 1000 px, tada će stvarna duljina ploče biti 900 px.</i></p> Size: - Veličina: + Veličina: Length: - Duljina: + Duljina: % - % + % px - px + px px - px + px Icon size: - Veličina ikone: + Veličina ikona: Alignment && position - Poravnanje && pozicija + Poravnanje i položaj A&uto-hide - + A&utomatsko skrivanje Zero means no animation - + Nula znači bez animacije ms - + ms Zero means no delay - + Nula znači bez odgađanja Show with delay: - + Prikaži s odgađanjem: - + + Visible thin margin for hidden panel + Vidljiva tanka margina za skrivene ploče + + + Don't allow maximized windows go under the panel window - + Ne dopuštaj, da maksimalno prošireni prozori idu ispod prozora ploče - + Reserve space on display - + Rezerviraj prostor na ekranu Position: - Pozicija: + Položaj: Animation duration: - + Trajanje animacije: Alignment: - Poravnanje: + Poravnanje: Rows: - + Broj redaka: - + Left - Lijevo + Lijevo - - + + Center - Centar + Centrirano - + Right - Desno + Desno - + Custom styling - + Prilagođeno stiliziranje - + Font color: - Boja fonta: + Boja fonta: - + Background color: - Boja pozadine: + Boja pozadine: - + Background opacity: - Neprozirnost pozadine: + Neprozirnost pozadine: - + <small>Compositing is required for panel transparency.</small> - + <small>Za prozirnost ploče, potrebno je sastavljanje slike i pozadine.</small> - + Background image: - Pozadinska slika: + Slika pozadine: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -217,83 +222,90 @@ LXQt Appearance Configuration → Icons Theme → Colorize icons based on widget style (palette) - + Djelomična alternativa za stilove programčića +koji ploči ne mogu dati zasebnu temu. + +Možda želiš deaktivirati i: + +LXQt konfiguracija izgleda → +Tema ikona → +Oboji ikone na osnovi stila programčića (paleta) - + Override icon &theme - + Nadjačaj &temu ikona - + Icon theme for panels: - + Tema ikona za ploče: - + Top of desktop - Vrh radne površine + Vrh radne površine - + Left of desktop - Lijevo na radnoj površini + Lijevo na radnoj površini - + Right of desktop - Desno na radnoj površini + Desno na radnoj površini - + Bottom of desktop - Dolje na radnoj površini + Dolje na radnoj površini - + Top of desktop %1 - Vrh radne površine%1 + Vrh radne površine %1 - + Left of desktop %1 - Lijevo na radnoj površini %1 + Lijevo na radnoj površini %1 - + Right of desktop %1 - Desno na radnoj površini %1 + Desno na radnoj površini %1 - + Bottom of desktop %1 - Dolje na radnoj površini %1 + Dolje na radnoj površini %1 - + Top - Gore + Gore - + Bottom - Dolje + Dolje - - + + Pick color - Odaberite boju + Odaberi boju - + Pick image - Odaberite sliku + Odaberi sliku - + Images (*.png *.gif *.jpg) - Slike (*.png *.gif *.jpg) + Slike (*.png *.gif *.jpg) @@ -301,17 +313,17 @@ Configure Plugins - Konfiguriraj priključke + Konfiguriraj priključke Note: changes made in this page cannot be reset. - Bilješka: promjene koje se naprave na ovoj stranici ne mogu se vratiti. + Napomena: promjene na ovoj stranici ne mogu se poništiti. Move up - Pomakni gore + Premjesti prema gore @@ -320,92 +332,93 @@ ... - ... + … Move down - Pomakni dolje + Premjesti prema dolje Add - Dodaj + Dodaj Remove - Ukloni + Ukloni Configure - Konfiguriraj + Konfiguriraj LXQtPanel - - + + Panel - Ploča + Ploča - + Configure Panel - Konfiguriraj ploču + Konfiguriraj ploču - + Manage Widgets - + Upravljaj programčićima - + Add New Panel - + Dodaj novu ploču - + Remove Panel Menu Item - Ukloni ploču + Ukloni ploču - + Lock This Panel - + Zaključaj ovu ploču - + Remove Panel Dialog Title - Ukloni ploču + Ukloni ploču - + Removing a panel can not be undone. Do you want to remove this panel? - + Uklanjanje ploče ne može se poništiti. +Svejedno ukloniti ovu ploču? Plugin - + Configure "%1" - Konfiguriraj"%1" + Konfiguriraj „%1” - + Move "%1" - Pomakni "%1" + Premjesti „%1” - + Remove "%1" - Ukloni "%1" + Ukloni „%1” @@ -413,12 +426,12 @@ Use alternate configuration file. - Koristite alternativnu konfiguracijsku datoteku. + Koristi alternativnu konfiguracijsku datoteku. Configuration file - Konfiguracijska datoteka + Konfiguracijska datoteka diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_hu.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_hu.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_hu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_hu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ Add Plugins - Bővítmény hozzáadás + Bővítmény hozzáadása @@ -16,12 +16,12 @@ Add Widget - Elem hozzáadás + Elem hozzáadása Close - Bezár + Bezárás @@ -34,7 +34,7 @@ Configure Panel - Panelbeállítás + Panel beállítása @@ -52,7 +52,7 @@ Configure panel - Panelbeállítás + Panelbeállítások @@ -82,13 +82,13 @@ px - pixel + px px - pixel + px @@ -103,7 +103,7 @@ A&uto-hide - A&utomata elrejtés + A&utomatikus elrejtés @@ -121,22 +121,27 @@ Zero means no delay - Nulla esetén nincs várakozás + Nulla esetén nincs késleltetés Show with delay: - Láthatósági késleltetés: + Megjelenítési késleltetés: - + + Visible thin margin for hidden panel + Vékony margó amikor rejtve van a panel + + + Don't allow maximized windows go under the panel window - A maximalizált ablakok a panel alá nem lóghatnak + A maximalizált ablakok nem lóghatnak a panel alá - + Reserve space on display - A kijelzőn tartalékterület marad + A kijelzőn tartalékterület marad @@ -146,7 +151,7 @@ Animation duration: - Animáció tartam: + Animáció időtartam: @@ -156,59 +161,59 @@ Rows: - + Sorok: - + Left Balra - - + + Center Középre - + Right Jobbra - + Custom styling Egyéni stílus - + Font color: Betűszín: - + Background color: Háttérszín: - + Background opacity: Háttér áttetszőség: - + <small>Compositing is required for panel transparency.</small> - <small>Paneláttetszőséghez kompozitálás kell.</small> + <small>A paneláttetszőséghez kompozitálás szükséges.</small> - + Background image: - Háttér kép: + Háttérkép: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -217,81 +222,88 @@ LXQt Appearance Configuration → Icons Theme → Colorize icons based on widget style (palette) - + Egy részleges kerülőmegoldás azokhoz az elemstílusokhoz, +amelyek nem adnak külön témát a panelnek. + +Lehet, hogy ki akarja kapcsolni: + +Megjelenés → +Ikontéma → +Színes ikonok az elemek stílusából (paletta) - + Override icon &theme - + Ikontéma &felülbírálása - + Icon theme for panels: - + Ikontéma a panelhez: - + Top of desktop - Az asztal tetejére + Az asztal tetején - + Left of desktop - Az asztal bal oldalára + Az asztal bal oldalán - + Right of desktop - Az asztal jobb oldalára + Az asztal jobb oldalán - + Bottom of desktop - Az asztal aljára + Az asztal alján - + Top of desktop %1 - A(z) %1. asztal tetejére + A(z) %1. asztal tetején - + Left of desktop %1 - A(z) %1. asztal bal oldalára + A(z) %1. asztal bal oldalán - + Right of desktop %1 - A(z) %1. asztal jobb oldalára + A(z) %1. asztal jobb oldalán - + Bottom of desktop %1 - A(z) %1. asztal aljára + A(z) %1. asztal alján - + Top - Fenn + Fentre - + Bottom - Lenn + Lentre - - + + Pick color Színválasztás - + Pick image - Képválasztás + Kép kiválasztása - + Images (*.png *.gif *.jpg) Képek (*.png *.gif *.jpg) @@ -301,17 +313,17 @@ Configure Plugins - Bővítménybeállítás + Bővítménybeállítások Note: changes made in this page cannot be reset. - Megjegyzés: ezek a változtatások maradandóak. + Megjegyzés: ezeket a változtatásokat nem lehet visszavonni. Move up - Föl + Fel @@ -320,7 +332,7 @@ ... - + ... @@ -346,65 +358,65 @@ LXQtPanel - - + + Panel - + Configure Panel - Panelbeállítás + Panel beállítása - + Manage Widgets - Bővítménykezelés + Bővítmények kezelése - + Add New Panel Új panel - + Remove Panel Menu Item - Panel törlés + Panel törlése - + Lock This Panel - A panel zárolása + Panel zárolása - + Remove Panel Dialog Title - Panel törlés + Panel törlése - + Removing a panel can not be undone. Do you want to remove this panel? A panel törlése végleges. -Valóban töröljük? +Valóban törli? Plugin - + Configure "%1" "%1" beállítása - + Move "%1" - "%1" mozgatása + "%1" áthelyezése - + Remove "%1" "%1" törlése diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_ia.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_ia.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_ia.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_ia.ts 2020-11-05 16:09:19.000000000 +0000 @@ -124,20 +124,20 @@ - + Left - - + + Center - + Right @@ -158,47 +158,52 @@ - + + Visible thin margin for hidden panel + + + + Don't allow maximized windows go under the panel window - + Reserve space on display - + Custom styling - + Font color: - + Background color: - + Background opacity: - + <small>Compositing is required for panel transparency.</small> - + Background image: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -210,12 +215,12 @@ - + Override icon &theme - + Icon theme for panels: @@ -230,68 +235,68 @@ - + Top of desktop - + Left of desktop - + Right of desktop - + Bottom of desktop - + Top of desktop %1 - + Left of desktop %1 - + Right of desktop %1 - + Bottom of desktop %1 - + Top - + Bottom - - + + Pick color - + Images (*.png *.gif *.jpg) - + Pick image @@ -346,45 +351,45 @@ LXQtPanel - - + + Panel - + Configure Panel - + Manage Widgets - + Add New Panel - + Remove Panel Menu Item - + Lock This Panel - + Remove Panel Dialog Title - + Removing a panel can not be undone. Do you want to remove this panel? @@ -393,17 +398,17 @@ Plugin - + Configure "%1" - + Move "%1" - + Remove "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_id.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_id.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_id.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_id.ts 2020-11-05 16:09:19.000000000 +0000 @@ -124,20 +124,20 @@ - + Left Kiri - - + + Center Tengah - + Right Kanan @@ -158,47 +158,52 @@ Tampilkan dengan jeda: - + + Visible thin margin for hidden panel + + + + Don't allow maximized windows go under the panel window Jangan biarkan jendela yang dimaksimalkan masuk di bawah jendela panel - + Reserve space on display Cadangan ruang pada layar - + Custom styling Gaya kustom - + Font color: Warna fonta: - + Background color: Warna latar belakang: - + Background opacity: Opasitas latar belakang: - + <small>Compositing is required for panel transparency.</small> <small>Compositing dibutuhkan untuk transparasi panel.</small> - + Background image: Gambar latar belakang: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -217,12 +222,12 @@ Warnai ikon berdasarkan gaya widget (palette) - + Override icon &theme Ganti &tema ikon - + Icon theme for panels: Tema ikon untuk panel: @@ -237,68 +242,68 @@ Posisi: - + Top of desktop Atas desktop - + Left of desktop Kiri desktop - + Right of desktop Kanan desktop - + Bottom of desktop Bawah desktop - + Top of desktop %1 Atas desktop %1 - + Left of desktop %1 Kiri desktop %1 - + Right of desktop %1 Kanan desktop %1 - + Bottom of desktop %1 Bawah desktop %1 - + Top Atas - + Bottom Bawah - - + + Pick color Pilih warna - + Images (*.png *.gif *.jpg) Gambar (*.png *.gif *.jpg) - + Pick image Pilih gambar @@ -353,45 +358,45 @@ LXQtPanel - - + + Panel Panel - + Configure Panel Konfigurasi Panel - + Manage Widgets Kelola Widget - + Add New Panel Tambah Panel Baru - + Remove Panel Menu Item Hapus Panel - + Lock This Panel Kunci Panel Ini - + Remove Panel Dialog Title Hapus Panel - + Removing a panel can not be undone. Do you want to remove this panel? Penghapusan panel tidak dapat dibatalkan. @@ -401,17 +406,17 @@ Plugin - + Configure "%1" Konfigurasi "%1" - + Move "%1" Pindah "%1" - + Remove "%1" Hapus "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_it.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_it.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_it.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_it.ts 2020-11-05 16:09:19.000000000 +0000 @@ -124,20 +124,20 @@ - + Left Sinistra - - + + Center Centro - + Right Destra @@ -158,47 +158,52 @@ Mostra con ritardo: - + + Visible thin margin for hidden panel + Bordo fine visibile per panello nascosto + + + Don't allow maximized windows go under the panel window Le finestre massimizzate non possono passare sotto il panello - + Reserve space on display Riserva lo spazio sullo schermo - + Custom styling Aspetto personalizzato - + Font color: Colore carattere: - + Background color: Colore sfondo: - + Background opacity: Trasparenza: - + <small>Compositing is required for panel transparency.</small> <small>E' necessario un compositor per la trasparenza</small> - + Background image: Immagine sfondo: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -217,12 +222,12 @@ Colora le icone in base allo stile del widget (palette) - + Override icon &theme Imponi icone alternative - + Icon theme for panels: Tema icone per i panelli: @@ -237,68 +242,68 @@ Posizione: - + Top of desktop Alto del desktop - + Left of desktop Sinistra del desktop - + Right of desktop Destra del desktop - + Bottom of desktop Basso del desktop - + Top of desktop %1 Alto del desktop %1 - + Left of desktop %1 Sinistra del desktop %1 - + Right of desktop %1 Destra del desktop %1 - + Bottom of desktop %1 Basso del desktop %1 - + Top In cima - + Bottom In fondo - - + + Pick color Scegli il colore - + Images (*.png *.gif *.jpg) Immagini (*.png *.gif *.jpg) - + Pick image Scegli immagine @@ -353,45 +358,45 @@ LXQtPanel - - + + Panel Pannello - + Configure Panel Configura pannello - + Manage Widgets Configura elementi - + Add New Panel Aggiungi nuovo pannello - + Remove Panel Menu Item Rimuovi pannello - + Lock This Panel Blocca questo pannello - + Remove Panel Dialog Title Rimuovi pannello - + Removing a panel can not be undone. Do you want to remove this panel? La rimozione di un pannello non può essere annullato. @@ -401,17 +406,17 @@ Plugin - + Configure "%1" Configura "%1" - + Move "%1" Sposta "%1" - + Remove "%1" Rimuovi "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_ja.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_ja.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_ja.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_ja.ts 2020-11-05 16:09:19.000000000 +0000 @@ -16,7 +16,7 @@ Add Widget - ウィジェットの追加 + ウィジェットへ追加 @@ -26,7 +26,7 @@ (only one instance can run at a time) - + (一度に実行できるインスタンスは 1 つだけです) @@ -34,7 +34,7 @@ Configure Panel - パネルを設定 + パネルの設定 @@ -52,12 +52,12 @@ Configure panel - パネルを設定 + パネルの設定 Size - 大きさ + サイズ @@ -73,7 +73,7 @@ Icon size: - アイコンの大きさ: + アイコンのサイズ: @@ -83,7 +83,7 @@ <p>Negative pixel value sets the panel length to that many pixels less than available screen space.</p><p/><p><i>E.g. "Length" set to -100px, screen size is 1000px, then real panel length will be 900 px.</i></p> - <p>負のピクセル値を設定すると、スクリーンの最大領域からその値を差し引いた長さになります。</p><p/><p><i>例: スクリーンの大きさが 1000 ピクセルである場合に -100 ピクセルを設定すると、パネルの長さは 900 ピクセルになります。</i></p> + <p>負のピクセル値を設定すると、スクリーンの最大領域からその値を差し引いた長さになります。</p><p/><p><i>例: スクリーンのサイズが 1000 ピクセルである場合に -100 ピクセルを設定すると、パネルの長さは 900 ピクセルになります。</i></p> @@ -104,53 +104,53 @@ Zero means no animation - + 0 はアニメーションしません ms - ms + ミリ秒 Animation duration: - + アニメーションの長さ: Rows: - + 行数: - + Left 左寄せ - - + + Center 中央 - + Right 右寄せ A&uto-hide - 自動的に隠す(&u) + 自動的に隠す(&U) Zero means no delay - + 0 は遅延しません @@ -158,47 +158,52 @@ 表示の遅延: - + + Visible thin margin for hidden panel + 隠れたパネルの細い余白を見えるようにする + + + Don't allow maximized windows go under the panel window - 最大化したウィンドウをパネルの後ろに配置することを許可しない + 最大化したウィンドウをパネルの後ろに配置しません - + Reserve space on display - + 表示用スペースを確保する - + Custom styling スタイルのカスタマイズ - + Font color: フォントの色: - + Background color: 背景色: - + Background opacity: 背景の不透明度: - + <small>Compositing is required for panel transparency.</small> - + <small>パネルの透明化にはコンポジターが必要です。</small> - + Background image: 背景の画像: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -207,17 +212,24 @@ LXQt Appearance Configuration → Icons Theme → Colorize icons based on widget style (palette) - + パネルに個別のテーマを指定できない +ウィジェットのスタイルのための部分的な回避策です。 + +次の設定を無効にすることもできます。 + +LXQt 設定 - 外観 → +アイコンテーマ → +ウィジェットのスタイル（パレット）に基づいてアイコンを色付けする - + Override icon &theme - + アイコンのテーマを上書きする(&T) - + Icon theme for panels: - + パネルのアイコンテーマ: @@ -230,68 +242,68 @@ 場所: - + Top of desktop デスクトップの上 - + Left of desktop デスクトップの左 - + Right of desktop デスクトップの右 - + Bottom of desktop デスクトップの下 - + Top of desktop %1 - デスクトップ %1 の上 + モニター %1 の上 - + Left of desktop %1 - デスクトップ %1 の左 + モニター %1 の左 - + Right of desktop %1 - デスクトップ %1 の右 + モニター %1 の右 - + Bottom of desktop %1 - デスクトップ %1 の下 + モニター %1 の下 - + Top 上 - + Bottom 下 - - + + Pick color - 色を選ぶ + 色の選択 - + Images (*.png *.gif *.jpg) 画像 (*.png *.gif *.jpg) - + Pick image 画像の選択 @@ -306,7 +318,7 @@ Note: changes made in this page cannot be reset. - 注意: このページでの変更はリセットされません。 + 注意: このページでの変更は[リセット]ボタンで初期化されません。 @@ -346,67 +358,67 @@ LXQtPanel - - + + Panel パネル - + Configure Panel - パネルを設定 + パネルの設定 - + Manage Widgets - ウェジェットの管理 + ウィジェットの管理 - + Add New Panel 新しいパネルの追加 - + Remove Panel Menu Item - パネルを削除 + パネルの削除 - + Lock This Panel パネルのロック - + Remove Panel Dialog Title - パネルを削除 + パネルの削除 - + Removing a panel can not be undone. Do you want to remove this panel? - パネルの削除は完了していません。 -このパネルを削除しますか? + パネルを削除すると、元に戻せません。 +このパネルを削除しますか？ Plugin - + Configure "%1" - "%1" を設定 + 【%1】の設定 - + Move "%1" - "%1" を移動 + 【%1】の移動 - + Remove "%1" - "%1" を削除 + 【%1】の削除 diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_ko.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_ko.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_ko.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_ko.ts 2020-11-05 16:09:19.000000000 +0000 @@ -124,20 +124,20 @@ - + Left 왼쪽 - - + + Center 가운데 - + Right 오른쪽 @@ -158,47 +158,52 @@ 딜레이 시간: - + + Visible thin margin for hidden panel + 숨겨진 패널에 보이는 얇은 여백 + + + Don't allow maximized windows go under the panel window 패널 창 아래에 최대화한 창 허용하지 않기 - + Reserve space on display 화면을 위한 공간 예약 - + Custom styling 사용자 설정 - + Font color: 글꼴 색: - + Background color: 배경 색: - + Background opacity: 배경 투명도: - + <small>Compositing is required for panel transparency.</small> <small>패널 투명화를 위해서 컴포지팅이 필요합니다.</small> - + Background image: 배경 이미지: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -217,12 +222,12 @@ 위젯 스타일 (팔레트) 기반 아이콘 색상 지정 - + Override icon &theme 아이콘 테마 덮어쓰기 - + Icon theme for panels: 패널용 아이콘 테마: @@ -237,68 +242,68 @@ 위치: - + Top of desktop 바탕화면 위쪽 - + Left of desktop 바탕화면 왼쪽 - + Right of desktop 바탕화면 오른쪽 - + Bottom of desktop 바탕화면 아래쪽 - + Top of desktop %1 바탕화면 위쪽 %1 - + Left of desktop %1 바탕화면 왼쪽 %1 - + Right of desktop %1 바탕화면 오른쪽 %1 - + Bottom of desktop %1 바탕화면 아래쪽 %1 - + Top 위 - + Bottom 아래 - - + + Pick color 색상 선택 - + Images (*.png *.gif *.jpg) 이미지 (*.png *.gif *.jpg) - + Pick image 이미지 선택 @@ -353,45 +358,45 @@ LXQtPanel - - + + Panel 패널 - + Configure Panel 패널 설정 - + Manage Widgets 위젯 관리 - + Add New Panel 새 패널 추가 - + Remove Panel Menu Item 패널 제거 - + Lock This Panel 이 패널 잠그기 - + Remove Panel Dialog Title 패널 제거 - + Removing a panel can not be undone. Do you want to remove this panel? 패널 제거는 취소할 수 없습니다. @@ -401,17 +406,17 @@ Plugin - + Configure "%1" 설정 "%1" - + Move "%1" 이동 "%1" - + Remove "%1" 제거 "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_lt.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_lt.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_lt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_lt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -129,12 +129,17 @@ Rodyti po delsos: - + + Visible thin margin for hidden panel + Matoma plona paslėpto skydelio paraštė + + + Don't allow maximized windows go under the panel window Neleisti išskleistiems langams palįsti po skydelio langu - + Reserve space on display Rezervuoti vietą ekrane @@ -160,55 +165,55 @@ - + Left Kairėje - - + + Center Centre - + Right Dešinėje - + Custom styling Tinkintas stilius - + Font color: Šrifto spalva: - + Background color: Fono spalva: - + Background opacity: Fono nepermatomumas: - + <small>Compositing is required for panel transparency.</small> <small>Skydelio permatomumui reikalingas komponavimas.</small> - + Background image: Fono paveikslas: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -228,78 +233,78 @@ (spalvų paletės) pagrindu - + Override icon &theme Nustelbti piktogramų &temą - + Icon theme for panels: Skydelių piktogramų tema: - + Top of desktop Darbalaukio viršuje - + Left of desktop Darbalaukio kairėje - + Right of desktop Darbalaukio dešinėje - + Bottom of desktop Darbalaukio apačioje - + Top of desktop %1 Darbalaukio %1 viršuje - + Left of desktop %1 Darbalaukio %1 kairėje - + Right of desktop %1 Darbalaukio %1 dešinėje - + Bottom of desktop %1 Darbalaukio %1 apačioje - + Top Viršuje - + Bottom Apačioje - - + + Pick color Pasirinkite spalvą - + Pick image Pasirinkite paveikslą - + Images (*.png *.gif *.jpg) Paveikslai (*.png *.gif *.jpg) @@ -354,45 +359,45 @@ LXQtPanel - - + + Panel Skydelis - + Configure Panel Konfigūruoti skydelį - + Manage Widgets Tvarkyti valdiklius - + Add New Panel Pridėti naują skydelį - + Remove Panel Menu Item Šalinti skydelį - + Lock This Panel Užrakinti šį skydelį - + Remove Panel Dialog Title Šalinti skydelį - + Removing a panel can not be undone. Do you want to remove this panel? Skydelio šalinimas negali būti atšauktas. @@ -402,17 +407,17 @@ Plugin - + Configure "%1" Konfigūruoti "%1" - + Move "%1" Perkelti "%1" - + Remove "%1" Šalinti "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_nb_NO.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_nb_NO.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_nb_NO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_nb_NO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -82,13 +82,13 @@ px - piksler + pk px - piksler + pk @@ -98,12 +98,12 @@ Alignment && position - Justering &og posisjon + Justering &og plassering A&uto-hide - S&kjul automatisk + Skj&ul automatisk @@ -129,17 +129,22 @@ Vis med forsinkelse: - + + Visible thin margin for hidden panel + Synlig tynn marg for skjult panel + + + Don't allow maximized windows go under the panel window Ikke tillat maksimerte vinduer å ligge under panelet - + Reserve space on display Reserver plass på skjermen - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -158,12 +163,12 @@ Fargelegg symboler basert på widget-stil (pallett) - + Override icon &theme Overkjør symbo&ltema - + Icon theme for panels: Symboltema for paneler: @@ -189,116 +194,116 @@ - + Left Venstre - - + + Center I midten - + Right Høyre - + Custom styling - Egen stil + Selvvalgt stil - + Font color: Skriftfarge: - + Background color: Bakgrunnsfarge: - + Background opacity: Bakgrunnsgjennomsiktighet: - + <small>Compositing is required for panel transparency.</small> <small>Lagsammenføying (compositing) er nødvendig for panelets gjennomsiktighet.</small> - + Background image: Bakgrunnsbilde: - + Top of desktop Øverst på skrivebordet - + Left of desktop - Venstre på skrivebordet + Til venstre på skrivebordet - + Right of desktop - Høyre på skrivebordet + Til høyre på skrivebordet - + Bottom of desktop Nederst på skrivebordet - + Top of desktop %1 Øverst på skrivebordet %1 - + Left of desktop %1 - Venstre på skrivebordet %1 + Til venstre på skrivebordet %1 - + Right of desktop %1 - Høyre på skrivebordet %1 + Til høyre på skrivebordet %1 - + Bottom of desktop %1 Nederst på skrivebordet %1 - + Top Øverst - + Bottom Nederst - - + + Pick color Velg farge - + Pick image Velg bilde - + Images (*.png *.gif *.jpg) Bilder (*.png *.gif *.jpg) @@ -353,45 +358,45 @@ LXQtPanel - - + + Panel Panelet - + Configure Panel Konfigurer panelet - + Manage Widgets - Styr Widgeter + Styr widgeter - + Add New Panel Legg til nytt panel - + Remove Panel Menu Item Fjern panel - + Lock This Panel Lås dette panelet - + Remove Panel Dialog Title Fjern panel - + Removing a panel can not be undone. Do you want to remove this panel? Å fjerne panelet kan ikke omgjøres. @@ -401,17 +406,17 @@ Plugin - + Configure "%1" Konfigurer "%1" - + Move "%1" Flytt "%1" - + Remove "%1" Fjern "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_nl.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_nl.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_nl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_nl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -93,7 +93,7 @@ Icon size: - Symbolgröße: + Pictogramgrootte: @@ -129,12 +129,17 @@ Toon met vertraging: - + + Visible thin margin for hidden panel + Zichtbaar dunne marge voor verborgen paneel + + + Don't allow maximized windows go under the panel window Sta gemaximaliseerde vensters niet toe om onder het paneelvenster te duiken - + Reserve space on display Reserveer ruimte op scherm @@ -160,55 +165,55 @@ - + Left Links - - + + Center Midden - + Right Rechts - + Custom styling Eigen stijl - + Font color: Tekstkleur: - + Background color: Achtergrondkleur: - + Background opacity: Ondoorzichtigheid van achtergrond: - + <small>Compositing is required for panel transparency.</small> <small>Voor een doorzichtige werkbalk is beeldsamenstelling benodigd.</small> - + Background image: Achtergrondafbeelding: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -227,78 +232,78 @@ widgetstijl (palet) - + Override icon &theme Pictogramthema passeren - + Icon theme for panels: Pictogramthema voor werkbalken: - + Top of desktop Bovenkant van bureaublad - + Left of desktop Linkerkant van bureaublad - + Right of desktop Rechterkant van bureaublad - + Bottom of desktop Onderkant van bureaublad - + Top of desktop %1 Bovenkant van bureaublad %1 - + Left of desktop %1 Linkerkant van bureaublad %1 - + Right of desktop %1 Rechterkant van bureaublad %1 - + Bottom of desktop %1 Onderkant van bureaublad %1 - + Top Bovenaan - + Bottom Onderaan - - + + Pick color Kies kleur - + Pick image Kies afbeelding - + Images (*.png *.gif *.jpg) Afbeeldingen (*.png *.gif *.jpg) @@ -353,45 +358,45 @@ LXQtPanel - - + + Panel Werkbalk - + Configure Panel Werkbalk instellen - + Manage Widgets Bedieningselementen beheren - + Add New Panel Nieuwe werkbalk toevoegen - + Remove Panel Menu Item Werkbalk verwijderen - + Lock This Panel Vergrendel deze werkbalk - + Remove Panel Dialog Title Werkbalk verwijderen - + Removing a panel can not be undone. Do you want to remove this panel? Verwijdering van een werkbalk kan niet ongedaan worden gemaakt. @@ -401,17 +406,17 @@ Plugin - + Configure "%1" "%1" instellen - + Move "%1" "%1" verplaatsen - + Remove "%1" "%1" verwijderen diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_pl.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_pl.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_pl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_pl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -124,20 +124,20 @@ - + Left Lewa - - + + Center Środek - + Right Prawa @@ -158,47 +158,52 @@ Pokaż z opóźnieniem: - + + Visible thin margin for hidden panel + Widoczny cienki odstęp, gdy pasek jest ukryty + + + Don't allow maximized windows go under the panel window Nie pozwalaj na wyświetlanie zmaksymalizowanych okien pod oknem panelu - + Reserve space on display Rezerwuj przestrzeń na ekranie - + Custom styling Własny styl - + Font color: Kolor czcionki: - + Background color: Kolor tła: - + Background opacity: Przeźroczystość tła: - + <small>Compositing is required for panel transparency.</small> <small>Compositing jest wymagany aby uzyskać przeźroczystość.</small - + Background image: Obrazek tła: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -217,12 +222,12 @@ Koloruj ikony na podstawie stylu (palety) - + Override icon &theme Zas&tąp motyw ikon - + Icon theme for panels: Motyw ikon dla paneli: @@ -237,68 +242,68 @@ Pozycja: - + Top of desktop Górna krawędź pulpitu - + Left of desktop Lewa krawędź pulpitu - + Right of desktop Prawa krawędź pulpitu - + Bottom of desktop Dolna krawędź pulpitu - + Top of desktop %1 Górna krawędź pulpitu %1 - + Left of desktop %1 Lewa krawędź pulpitu %1 - + Right of desktop %1 Prawa krawędź pulpitu %1 - + Bottom of desktop %1 Dolna krawędź pulpitu %1 - + Top Góra - + Bottom Dół - - + + Pick color Wybierz kolor - + Images (*.png *.gif *.jpg) Obrazki (*.png *.gif *.jpg) - + Pick image Wybierz obrazek @@ -308,7 +313,7 @@ Configure Plugins - Konfiguruj Pluginy + Konfiguruj wtyczki @@ -353,45 +358,45 @@ LXQtPanel - - + + Panel Panel - + Configure Panel Konfiguruj Panel - + Manage Widgets Zarządzaj widżetami - + Add New Panel Dodaj nowy panel - + Remove Panel Menu Item Usuń panel - + Lock This Panel Zablokuj ten panel - + Remove Panel Dialog Title Usuń panel - + Removing a panel can not be undone. Do you want to remove this panel? Usunięcie panelu nie może zostać cofnięte. @@ -401,17 +406,17 @@ Plugin - + Configure "%1" Konfiguruj "%1" - + Move "%1" Przesuń "%1" - + Remove "%1" Usuń "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_pt_BR.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_pt_BR.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_pt_BR.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_pt_BR.ts 2020-11-05 16:09:19.000000000 +0000 @@ -124,20 +124,20 @@ - + Left Esquerda - - + + Center Centralizado - + Right Direita @@ -158,47 +158,52 @@ Exibir com atraso: - + + Visible thin margin for hidden panel + Margem estreita visível para painel oculto + + + Don't allow maximized windows go under the panel window Não permitir que janelas maximizadas fiquem abaixo da janela do painel - + Reserve space on display Reservar espaço na tela - + Custom styling Estilo personalizado - + Font color: Cor da fonte: - + Background color: Cor de fundo: - + Background opacity: Opacidade do fundo: - + <small>Compositing is required for panel transparency.</small> <small>É necessária composição para a transparência do painel.</small> - + Background image: Imagem de fundo: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -217,12 +222,12 @@ Colorir ícones baseado no estilo widget (paleta) - + Override icon &theme Substituir ícone do &tema - + Icon theme for panels: Tema de ícones para painéis: @@ -237,68 +242,68 @@ Posição: - + Top of desktop Topo da área de trabalho - + Left of desktop Esquerda da área de trabalho - + Right of desktop Direita da área de trabalho - + Bottom of desktop Abaixo da área de trabalho - + Top of desktop %1 Topo da área de trabalho %1 - + Left of desktop %1 Esquerda da área de trabalho %1 - + Right of desktop %1 Direita da área de trabalho %1 - + Bottom of desktop %1 Abaixo da área de trabalho %1 - + Top Topo - + Bottom Base - - + + Pick color Selecionar cor - + Images (*.png *.gif *.jpg) Imagens (*.png *.gif *.jpg) - + Pick image Selecionar imagem @@ -353,45 +358,45 @@ LXQtPanel - - + + Panel Painel - + Configure Panel Configurar painel - + Manage Widgets Gerenciar widgets - + Add New Panel Adicionar novo painel - + Remove Panel Menu Item Remover painel - + Lock This Panel Travar painel - + Remove Panel Dialog Title Remover painel - + Removing a panel can not be undone. Do you want to remove this panel? A remoção de um painel não pode ser desfeita. @@ -401,17 +406,17 @@ Plugin - + Configure "%1" Configurar "%1" - + Move "%1" Mover "%1" - + Remove "%1" Remover "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_pt.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_pt.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_pt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_pt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -124,20 +124,20 @@ - + Left Esquerda - - + + Center Centro - + Right Direita @@ -158,47 +158,52 @@ Mostrar com atraso: - + + Visible thin margin for hidden panel + Margem visível mínima para o painel oculto + + + Don't allow maximized windows go under the panel window Não permitir janelas maximizadas por baixo da janela do painel - + Reserve space on display Reservar espaço no ecrã - + Custom styling Estilo personalizado - + Font color: Cor do tipo de letra: - + Background color: Cor de fundo: - + Background opacity: Opacidade do fundo: - + <small>Compositing is required for panel transparency.</small> <small>Requer gestão de composição para ativar a transparência.</small> - + Background image: Imagem de fundo: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -217,12 +222,12 @@ Colorir ícones tendo por base o estilo do widget (paleta) - + Override icon &theme Substituir &tema de ícones - + Icon theme for panels: Tema de ícones para os painéis: @@ -237,68 +242,68 @@ Posição: - + Top of desktop Em cima - + Left of desktop À esquerda - + Right of desktop À direita - + Bottom of desktop Em baixo - + Top of desktop %1 Em cima, área de trabalho %1 - + Left of desktop %1 À esquerda, área de trabalho %1 - + Right of desktop %1 À direita, área de trabalho %1 - + Bottom of desktop %1 Em baixo, área de trabalho %1 - + Top Cima - + Bottom Baixo - - + + Pick color Escolher cor - + Images (*.png *.gif *.jpg) Imagens (*.png *.gif *.jpg) - + Pick image Escolher imagem @@ -353,45 +358,45 @@ LXQtPanel - - + + Panel Painel - + Configure Panel Configurar painel - + Manage Widgets Gerir widgets - + Add New Panel Adicionar novo painel - + Remove Panel Menu Item Remover painel - + Lock This Panel Bloquear este painel - + Remove Panel Dialog Title Remover painel - + Removing a panel can not be undone. Do you want to remove this panel? Não pode reverter a remoção de um painel. @@ -401,17 +406,17 @@ Plugin - + Configure "%1" Configurar "%1" - + Move "%1" Mover "%1" - + Remove "%1" Remover "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_ro_RO.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_ro_RO.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_ro_RO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_ro_RO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -124,20 +124,20 @@ - + Left Stânga - - + + Center Centru - + Right Dreapta @@ -158,47 +158,52 @@ Afiseaza cu Decalaj: - + + Visible thin margin for hidden panel + + + + Don't allow maximized windows go under the panel window Nu permite ferestrelor maximizate sa intre sub fereastra panou - + Reserve space on display Inverseaza spatiul pe ecran - + Custom styling Stil particularizat - + Font color: Culoare font: - + Background color: Culoare de fundal: - + Background opacity: Opacitatea fundalului: - + <small>Compositing is required for panel transparency.</small> - <small> Este necesar un compozitor pentru transparența tabloului de bord.</ small> + <small>Este necesar un compozitor pentru transparența tabloului de bord.</ small> - + Background image: Imagine de fundal: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -210,12 +215,12 @@ - + Override icon &theme Inlocuieste pictograma &tema - + Icon theme for panels: Tema de pictograme pentru panouri: @@ -230,68 +235,68 @@ Poziție: - + Top of desktop Partea de sus a ecranului - + Left of desktop Stânga ecranului - + Right of desktop Dreapta ecranului - + Bottom of desktop Partea de jos a ecranului - + Top of desktop %1 Partea de sus a ecranului %1 - + Left of desktop %1 Stânga ecranului %1 - + Right of desktop %1 Dreapta ecranului %1 - + Bottom of desktop %1 Partea de jos a ecranului %1 - + Top Sus - + Bottom Jos - - + + Pick color Alege culoare - + Images (*.png *.gif *.jpg) Imagini (*.png *.gif *.jpg) - + Pick image Alege imagine @@ -346,45 +351,45 @@ LXQtPanel - - + + Panel Panou - + Configure Panel Configurează panoul - + Manage Widgets Gestionează Widget-uri - + Add New Panel Adauga Panou nou - + Remove Panel Menu Item Îndepărtează panou - + Lock This Panel Blocheaza acest Panou - + Remove Panel Dialog Title Îndepărtează panou - + Removing a panel can not be undone. Do you want to remove this panel? Înlăturarea acestui panou nu poate fi anulata. @@ -394,17 +399,17 @@ Plugin - + Configure "%1" Configurează "%1" - + Move "%1" Mută "%1" - + Remove "%1" Îndepărtează "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_ru.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_ru.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_ru.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_ru.ts 2020-11-05 16:09:19.000000000 +0000 @@ -71,20 +71,20 @@ - + Left Слева - - + + Center По центру - + Right Справа @@ -112,7 +112,7 @@ Alignment && position - Выравнивание && расположение + Выравнивание и расположение @@ -155,45 +155,50 @@ Show with delay: - Показать с задержкой: + Показывать с задержкой: - + + Visible thin margin for hidden panel + Оставлять тонкую видимую полосу при скрытии панели + + + Don't allow maximized windows go under the panel window Не позволять развёрнутым окнам залезать под панель - + Reserve space on display Зарезервировать место на экране - + Custom styling Пользовательский стиль - + Font color: Цвет шрифта: - + Background opacity: Непрозрачность фона: - + <small>Compositing is required for panel transparency.</small> <small>Композиция необходима для прозрачности панели.</small> - + Background image: Фоновое изображение: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -212,17 +217,17 @@ Цвет значков в соответствии с палитрой виджетов - + Override icon &theme Переопределить &тему значков - + Icon theme for panels: - Тема значков панели: + Тема значков панелей: - + Background color: Цвет фона: @@ -237,68 +242,68 @@ Расположение: - + Top of desktop Вверху - + Left of desktop Слева - + Right of desktop Справа - + Bottom of desktop Внизу - + Top of desktop %1 Вверху %1 рабочего стола - + Left of desktop %1 Слева на %1 рабочем столе - + Right of desktop %1 Справа на %1 рабочем столе - + Bottom of desktop %1 Внизу %1 рабочего стола - + Top Вверху - + Bottom Внизу - - + + Pick color Выбрать цвет - + Images (*.png *.gif *.jpg) Изображения (*.png *.gif *.jpg) - + Pick image Выберите изображение @@ -313,7 +318,7 @@ Note: changes made in this page cannot be reset. - Примечание: изменения, сделанные на этой странице, нельзя сбросить. + Примечание: изменения, сделанные на этой вкладке, нельзя сбросить. @@ -353,45 +358,45 @@ LXQtPanel - - + + Panel Панель - + Configure Panel Настроить панель - + Manage Widgets Управление виджетами - + Add New Panel Добавить новую панель - + Remove Panel Menu Item Удалить панель - + Lock This Panel - Закрепить эту панель + Закрепить панель - + Remove Panel Dialog Title Удалить панель - + Removing a panel can not be undone. Do you want to remove this panel? Удаление панели не может быть отменено. @@ -401,17 +406,17 @@ Plugin - + Configure "%1" Настроить «%1» - + Move "%1" Переместить «%1» - + Remove "%1" Удалить «%1» diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_sk_SK.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_sk_SK.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_sk_SK.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_sk_SK.ts 2020-11-05 16:09:19.000000000 +0000 @@ -124,20 +124,20 @@ - + Left Vľavo - - + + Center Na stred - + Right Vpravo @@ -158,47 +158,52 @@ Zobraziť s oneskorením: - + + Visible thin margin for hidden panel + Viditeľný tenký okraj pre skrytý panel + + + Don't allow maximized windows go under the panel window Nedovoliť, aby sa maximalizované okná dostali pod panel - + Reserve space on display Rezervovať miesto na obrazovke - + Custom styling Vlastné štýly - + Font color: Farba písma: - + Background color: Farba pozadia: - + Background opacity: Priehľadnosť pozadia: - + <small>Compositing is required for panel transparency.</small> <small>Panel môže byť priehľadný len vtedy, keď používate "compositing window manager".</small> - + Background image: Obrázok pozadia: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -207,15 +212,22 @@ LXQt Appearance Configuration → Icons Theme → Colorize icons based on widget style (palette) - + Čiastočné riešenie pre štýly widgetov, ktorým +nie je možné poskytnúť osobitnú tému panelu. + +Možno budete chcieť zakázať: + +Konfiguráciu vzhľadu LXQt → +Tému ikon → +Farbu ikon na základe štýlu widgetu (palety) - + Override icon &theme Použiť iný š&týl ikon - + Icon theme for panels: Štýl ikon pre panely: @@ -230,68 +242,68 @@ Poloha: - + Top of desktop Vrch plochy - + Left of desktop Ľavá strana plochy - + Right of desktop Pravá strana plochy - + Bottom of desktop Spodok plochy - + Top of desktop %1 Vrch plochy %1 - + Left of desktop %1 Ľavá strana plochy %1 - + Right of desktop %1 Pravá strana plochy %1 - + Bottom of desktop %1 Spodok plochy %1 - + Top Hore - + Bottom Dolu - - + + Pick color Vybrať farbu - + Images (*.png *.gif *.jpg) Obrázky (*.png *.gif *.jpg) - + Pick image Vybrať obrázok @@ -346,45 +358,45 @@ LXQtPanel - - + + Panel Panel - + Configure Panel Nastaviť Panel - + Manage Widgets Spravovať widgety - + Add New Panel Pridať nový panel - + Remove Panel Menu Item Odstrániť panel - + Lock This Panel Zamknúť tento panel - + Remove Panel Dialog Title Odstrániť panel - + Removing a panel can not be undone. Do you want to remove this panel? Odstránenie panelu sa nedá odvolať. @@ -394,17 +406,17 @@ Plugin - + Configure "%1" Nastaviť "%1" - + Move "%1" Presunúť "%1" - + Remove "%1" Odstrániť "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_sl.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_sl.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_sl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_sl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,27 +6,27 @@ Add Plugins - + Dodaj vtičnike Search: - + Išči: Add Widget - + Dodaj gradnik Close - + Zapri (only one instance can run at a time) - + (le en proces lahko deluje naenkrat) @@ -34,17 +34,17 @@ Configure Panel - + Konfiguriraj pult Panel - Pult + Pult Widgets - + Gradniki @@ -52,153 +52,158 @@ Configure panel - Nastavitev pulta + Konfiguriraj pult Size - + Velikost Size: - Velikost: + Velikost: px - + px Icon size: - + Velikost ikon: Length: - Dolžina: + Dolžina: <p>Negative pixel value sets the panel length to that many pixels less than available screen space.</p><p/><p><i>E.g. "Length" set to -100px, screen size is 1000px, then real panel length will be 900 px.</i></p> - + <p>Negativna vrednost pikslov bo odšteta od dolžine zaslona.</p><p/><p><i>Primer: Nastavitev dolžine -100px bo pri velikosti zaslona 1000px skrajšala pult na 900px.</i></p> % - % + % px - pik + px Alignment && position - + Poravnava in položaj Zero means no animation - + Ničla onemogoči animacijo ms - + ms Animation duration: - + Trajanje animacije: Rows: - + Št. vrstic: - + Left - Levo + Levo - - + + Center - Na sredini + Na sredini - + Right - Desno + Desno A&uto-hide - + Samode&jno skrij Zero means no delay - + Ničla onemogoči zakasnitev Show with delay: - + Prikaži z zamikom: - + + Visible thin margin for hidden panel + Viden tanek pas, če je pult skrit + + + Don't allow maximized windows go under the panel window - + Ne dovoli maksimiziranje oken pod pult - + Reserve space on display - + Rezerviraj prostor na zaslonu - + Custom styling - + Oblikovanje po meri - + Font color: - + Barva pisave: - + Background color: - + Barva ozadja: - + Background opacity: - + Prosojnost ozadja: - + <small>Compositing is required for panel transparency.</small> - + <small>Za prosojnost pulta je zahtevano kompozitiranje (compositing)</small> - + Background image: - + Slika ozadja: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -207,93 +212,100 @@ LXQt Appearance Configuration → Icons Theme → Colorize icons based on widget style (palette) - + Delna rešitev za sloge gradnikov, +ki ne delujejo pri pultu. + +Morda boste morali onemogočiti tudi: + +Nastavitev videza LXQt → +Tema ikon → +Obarvaj ikone glede na stil (paleto) gradnikov - + Override icon &theme - + Prezri &temo ikon - + Icon theme for panels: - + Tema ikon za pult: Alignment: - Poravnava: + Poravnava: Position: - Položaj: + Položaj: - + Top of desktop - Vrh namizja + Vrh namizja - + Left of desktop - Leva stran namizja + Leva stran namizja - + Right of desktop - Desna stran namizja + Desna stran namizja - + Bottom of desktop - Dno namizja + Dno namizja - + Top of desktop %1 - Vrh namizja %1 + Vrh namizja %1 - + Left of desktop %1 - Leva stran namizja %1 + Leva stran namizja %1 - + Right of desktop %1 - Desna stran namizja %1 + Desna stran namizja %1 - + Bottom of desktop %1 - Dno namizja %1 + Dno namizja %1 - + Top - + Vrh - + Bottom - + Dno - - + + Pick color - + Izbor barve - + Images (*.png *.gif *.jpg) - + Slike (*.png *.gif *.jpg) - + Pick image - + Izbor slike @@ -301,17 +313,17 @@ Configure Plugins - + Konfiguriraj vtičnike Note: changes made in this page cannot be reset. - + Opomba: nastavitev na tej strani ni možno ponastaviti. Move up - + Premakni gor @@ -320,92 +332,93 @@ ... - + ... Move down - + Premakni dol Add - + Dodaj Remove - Odstrani + Odstrani Configure - Nastavitev + Konfiguriraj LXQtPanel - - + + Panel Pult - + Configure Panel - + Konfiguriraj pult - + Manage Widgets - + Upravljaj gradnike - + Add New Panel - + Dodaj nov pult - + Remove Panel Menu Item - + Odstrani pult - + Lock This Panel - + Zakleni ta pult - + Remove Panel Dialog Title - + Odstrani pult - + Removing a panel can not be undone. Do you want to remove this panel? - + Odstranjenega pulta ni mogoče povrniti. +Ste prepričani, da ga želite odstraniti? Plugin - + Configure "%1" - + Konfiguriraj "%1" - + Move "%1" - + Premakni "%1" - + Remove "%1" - + Odstrani "%1" @@ -413,12 +426,12 @@ Use alternate configuration file. - + Uporabi drugo konfiguracijsko datoteko. Configuration file - + Konfiguracijska datoteka diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_sr_BA.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_sr_BA.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_sr_BA.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_sr_BA.ts 2020-11-05 16:09:19.000000000 +0000 @@ -124,20 +124,20 @@ - + Left Лијево - - + + Center Центар - + Right Десно @@ -158,47 +158,52 @@ - + + Visible thin margin for hidden panel + + + + Don't allow maximized windows go under the panel window - + Reserve space on display - + Custom styling - + Font color: - + Background color: - + Background opacity: - + <small>Compositing is required for panel transparency.</small> - + Background image: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -210,12 +215,12 @@ - + Override icon &theme - + Icon theme for panels: @@ -230,68 +235,68 @@ - + Top of desktop врху површи - + Left of desktop лијевој страни површи - + Right of desktop десној страни површи - + Bottom of desktop дну површи - + Top of desktop %1 врху површи %1 - + Left of desktop %1 лијевој страни површи %1 - + Right of desktop %1 десној страни површи %1 - + Bottom of desktop %1 дну површи %1 - + Top - + Bottom - - + + Pick color - + Images (*.png *.gif *.jpg) - + Pick image @@ -346,45 +351,45 @@ LXQtPanel - - + + Panel Панел - + Configure Panel - + Manage Widgets - + Add New Panel - + Remove Panel Menu Item - + Lock This Panel - + Remove Panel Dialog Title - + Removing a panel can not be undone. Do you want to remove this panel? @@ -393,17 +398,17 @@ Plugin - + Configure "%1" - + Move "%1" - + Remove "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_sr@latin.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_sr@latin.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_sr@latin.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_sr@latin.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,27 +6,27 @@ Add Plugins - + Dodaj Plagine Search: - + Pretraga: Add Widget - + Dodaj vidžet Close - + Zatvori (only one instance can run at a time) - + (istovremeno se može pokrenuti samo jedna instanca) @@ -34,17 +34,17 @@ Configure Panel - + Konfigurišite panel Panel - Automatsko suspendovanje + Panel Widgets - + Vidžet @@ -52,17 +52,17 @@ Configure panel - + Konfigurišite panel Size - + Veličina Size: - + Veličina: @@ -73,38 +73,38 @@ Icon size: - + Veličina ikone: Length: - + Dužina: <p>Negative pixel value sets the panel length to that many pixels less than available screen space.</p><p/><p><i>E.g. "Length" set to -100px, screen size is 1000px, then real panel length will be 900 px.</i></p> - + <p>Negativna vrednost piksela postavlja dužinu panela na broj piksela manje od raspoloživog prostora ekrana.</p><p/><p><i>na primer "Dužina" postavljeno na -100px, veličina ekrana je 1000 px, tada će stvarna dužina panela biti 900 px.</i></p> % - + % px - + px Alignment && position - + Poravnanje i položaj Zero means no animation - + Nula znači da nema animacije @@ -115,31 +115,31 @@ Animation duration: - + Trajanje animacije: Rows: - + Redovi: - + Left - + Levo - - + + Center - + Centar - + Right - + Desno @@ -150,55 +150,60 @@ Zero means no delay - + Nula znači bez zakašnjenja Show with delay: - + Prikaži sa zakašnjenjem: + + + + Visible thin margin for hidden panel + Vidljiva tanka margina za skriveni panel - + Don't allow maximized windows go under the panel window - + Ne dozvolite da maksimizirani prozori idu ispod prozora panela - + Reserve space on display - + Rezervišite prostor na displeju - + Custom styling - + Prilagođeni stil - + Font color: - + Boja fonta: - + Background color: - + Boja pozadine: - + Background opacity: - + Neprozirnost pozadine: - + <small>Compositing is required for panel transparency.</small> - + Background image: - + Pozadinska slika: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -207,15 +212,22 @@ LXQt Appearance Configuration → Icons Theme → Colorize icons based on widget style (palette) - + Delimično rešenje za stilove vidžeta koji +ne može dati posebnu temu panelu. + +Takođe biste mogli da onemogućite: + +Konfiguracija izgleda LXQt → +Tema ikona → +Oboji ikone na osnovu stila vidžeta (paleta) - + Override icon &theme - + Icon theme for panels: @@ -230,68 +242,68 @@ - + Top of desktop - + Left of desktop - + Right of desktop - + Bottom of desktop - + Top of desktop %1 - + Left of desktop %1 - + Right of desktop %1 - + Bottom of desktop %1 - + Top - + Bottom - - + + Pick color - + Images (*.png *.gif *.jpg) - + Pick image @@ -346,45 +358,45 @@ LXQtPanel - - + + Panel Automatsko suspendovanje - + Configure Panel - + Konfigurišite panel - + Manage Widgets - + Add New Panel - + Remove Panel Menu Item - + Lock This Panel - + Remove Panel Dialog Title - + Removing a panel can not be undone. Do you want to remove this panel? @@ -393,17 +405,17 @@ Plugin - + Configure "%1" - + Move "%1" - + Remove "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_sr_RS.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_sr_RS.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_sr_RS.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_sr_RS.ts 2020-11-05 16:09:19.000000000 +0000 @@ -124,20 +124,20 @@ - + Left Лево - - + + Center Центар - + Right Десно @@ -158,47 +158,52 @@ - + + Visible thin margin for hidden panel + + + + Don't allow maximized windows go under the panel window - + Reserve space on display - + Custom styling - + Font color: - + Background color: - + Background opacity: - + <small>Compositing is required for panel transparency.</small> - + Background image: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -210,12 +215,12 @@ - + Override icon &theme - + Icon theme for panels: @@ -230,68 +235,68 @@ - + Top of desktop врху површи - + Left of desktop левој страни површи - + Right of desktop десној страни површи - + Bottom of desktop дну површи - + Top of desktop %1 врху површи %1 - + Left of desktop %1 левој страни површи %1 - + Right of desktop %1 десној страни површи %1 - + Bottom of desktop %1 дну површи %1 - + Top - + Bottom - - + + Pick color - + Images (*.png *.gif *.jpg) - + Pick image @@ -346,45 +351,45 @@ LXQtPanel - - + + Panel Панел - + Configure Panel - + Manage Widgets - + Add New Panel - + Remove Panel Menu Item - + Lock This Panel - + Remove Panel Dialog Title - + Removing a panel can not be undone. Do you want to remove this panel? @@ -393,17 +398,17 @@ Plugin - + Configure "%1" - + Move "%1" - + Remove "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_sv.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_sv.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_sv.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_sv.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,429 @@ + + + + + AddPluginDialog + + + Add Plugins + Lägg till insticksmodul + + + + Search: + Sök: + + + + Add Widget + Lägg till grafiska komponenter + + + + Close + Stäng + + + + (only one instance can run at a time) + (endast en instans kan köras i taget) + + + + ConfigPanelDialog + + + Configure Panel + Konfigurera + + + + Panel + Panel + + + + Widgets + Grafiska komponenter + + + + ConfigPanelWidget + + + Configure panel + Konfigurera + + + + Size + Storlek + + + + <p>Negative pixel value sets the panel length to that many pixels less than available screen space.</p><p/><p><i>E.g. "Length" set to -100px, screen size is 1000px, then real panel length will be 900 px.</i></p> + <p> Negativt pixelvärde ställer in panellängden på så många pixlar som är mindre än tillgängligt skärmutrymme. </p><p/><p> <i>T.ex Om "Längd" = -100px, och skärmbredd = 1000px, då kommer panelen uppta 900px</i></p> + + + + Size: + Storlek: + + + + Length: + Längd: + + + + % + % + + + + px + px + + + + + px + px + + + + Icon size: + Ikonstorlek: + + + + Alignment && position + Justering && position + + + + A&uto-hide + A&uto göm + + + + + Zero means no animation + Noll betyder ingen animering + + + + + ms + ms + + + + + Zero means no delay + Noll betyder ingen fördröjning + + + + Show with delay: + Visa med fördröjning: + + + + Visible thin margin for hidden panel + + + + + Don't allow maximized windows go under the panel window + Låt inte maximerade fönster gå under panelfönstret + + + + Reserve space on display + Reservera utrymme på displayen + + + + A partial workaround for widget styles that +cannot give a separate theme to the panel. + +You might also want to disable: + +LXQt Appearance Configuration → +Icons Theme → +Colorize icons based on widget style (palette) + + + + + Override icon &theme + + + + + Icon theme for panels: + Ikontema för paneler + + + + Position: + Position: + + + + Animation duration: + + + + + Alignment: + + + + + Rows: + Rader: + + + + + Left + + + + + + + Center + + + + + + Right + Höger + + + + Custom styling + + + + + Font color: + Textfärg: + + + + Background color: + Bakgrundsfärg: + + + + Background opacity: + Bakgrunds genomskinlighet: + + + + <small>Compositing is required for panel transparency.</small> + + + + + Background image: + Bakgrundsbild: + + + + Top of desktop + + + + + Left of desktop + + + + + Right of desktop + + + + + Bottom of desktop + + + + + Top of desktop %1 + + + + + Left of desktop %1 + + + + + Right of desktop %1 + + + + + Bottom of desktop %1 + + + + + Top + + + + + Bottom + + + + + + Pick color + + + + + Pick image + + + + + Images (*.png *.gif *.jpg) + + + + + ConfigPluginsWidget + + + Configure Plugins + + + + + Note: changes made in this page cannot be reset. + + + + + Move up + + + + + + + + + ... + + + + + Move down + + + + + Add + + + + + Remove + + + + + Configure + + + + + LXQtPanel + + + + Panel + Panel + + + + Configure Panel + Konfigurera + + + + Manage Widgets + + + + + Add New Panel + + + + + Remove Panel + Menu Item + + + + + Lock This Panel + + + + + Remove Panel + Dialog Title + + + + + Removing a panel can not be undone. +Do you want to remove this panel? + + + + + Plugin + + + Configure "%1" + + + + + Move "%1" + + + + + Remove "%1" + + + + + main + + + Use alternate configuration file. + + + + + Configuration file + + + + diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_th_TH.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_th_TH.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_th_TH.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_th_TH.ts 2020-11-05 16:09:19.000000000 +0000 @@ -124,20 +124,20 @@ - + Left ทางซ้าย - - + + Center ตรงกลาง - + Right ทางขวา @@ -158,47 +158,52 @@ - + + Visible thin margin for hidden panel + + + + Don't allow maximized windows go under the panel window - + Reserve space on display - + Custom styling - + Font color: - + Background color: - + Background opacity: - + <small>Compositing is required for panel transparency.</small> - + Background image: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -210,12 +215,12 @@ - + Override icon &theme - + Icon theme for panels: @@ -230,68 +235,68 @@ ตำแหน่ง: - + Top of desktop ด้านบนของหน้าจอ - + Left of desktop ด้านซ้ายของหน้าจอ - + Right of desktop ด้านขวาของหน้าจอ - + Bottom of desktop ด้านล่างของหน้าจอ - + Top of desktop %1 ด้านบนของหน้าจอ %1 - + Left of desktop %1 ด้านซ้ายของหน้าจอ %1 - + Right of desktop %1 ด้านขวาของหน้าจอ %1 - + Bottom of desktop %1 ด้านล่างของหน้าจอ %1 - + Top - + Bottom - - + + Pick color - + Images (*.png *.gif *.jpg) - + Pick image @@ -346,45 +351,45 @@ LXQtPanel - - + + Panel พาเนล - + Configure Panel - + Manage Widgets - + Add New Panel - + Remove Panel Menu Item - + Lock This Panel - + Remove Panel Dialog Title - + Removing a panel can not be undone. Do you want to remove this panel? @@ -393,17 +398,17 @@ Plugin - + Configure "%1" - + Move "%1" - + Remove "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_tr.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_tr.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_tr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_tr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ Add Plugins - Eklenti Ekle + Eklentiler Ekle @@ -83,7 +83,7 @@ <p>Negative pixel value sets the panel length to that many pixels less than available screen space.</p><p/><p><i>E.g. "Length" set to -100px, screen size is 1000px, then real panel length will be 900 px.</i></p> - <p>Negatif piksel değerleri panel uzunluğunu kullanılabilir ekran genişliğinden girilen piksel değeri kadar az kısaltır.</p><p/><p><i>Örn: "Uzunluk" -100px, ekran boyutu 1000px ise gerçek panel boyutu 900px olacaktır.</i></p> + <p>Negatif piksel değerleri, panel uzunluğunu kullanılabilir ekran genişliğinin piksel değerinden daha azına ayarlar.</p><p/><p><i>Örn: "Uzunluk" -100px'e ayarlanır, ekran boyutu 1000px'dir, bu durumda gerçek panel boyutu 900px olacaktır.</i></p> @@ -104,7 +104,7 @@ Zero means no animation - Sıfır animasyon yok anlamına gelir + Sıfır, animasyon yok anlamına gelir @@ -124,20 +124,20 @@ - + Left Sol - - + + Center Orta - + Right Sağ @@ -150,7 +150,7 @@ Zero means no delay - Sıfır gecikme yok demektir + Sıfır, gecikme yok demektir @@ -158,47 +158,52 @@ Gecikmeli göster: - + + Visible thin margin for hidden panel + Gizli panel için görünür ince kenar boşluğu + + + Don't allow maximized windows go under the panel window - Büyütülmüş pencerelerin panel penceresinin altına gitmesine izin verme + Büyütülmüş pencerelerin panel penceresinin altına girmesine izin verme - + Reserve space on display Ekranda yer ayır - + Custom styling - Özel biçemlendirme + Özel biçimlendirme - + Font color: - Yazıtipi rengi: + Yazı tipi rengi: - + Background color: - Arkaplan rengi: + Arka plan rengi: - + Background opacity: - Arkaplan matlığı: + Arka plan matlığı: - + <small>Compositing is required for panel transparency.</small> - <small>Panel şeffaflığı için karışım gerekli.</small> + <small>Karışım, panel şeffaflığı için gereklidir.</small> - + Background image: - Arkaplan resmi: + Arka plan resmi: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -207,22 +212,22 @@ LXQt Appearance Configuration → Icons Theme → Colorize icons based on widget style (palette) - Panele ayrı bir tema veremeyen widget -stilleri için kısmi bir geçici çözüm. + Panele ayrı bir tema veremeyen gereç +biçimleri için kısmi bir geçici çözüm. -Devre dışı bırakmak isteyebilirsiniz: +Ayrıca etkisiz bırakmak isteyebilirsiniz: -LXQT Görünüm Yapılandırma -Simge Teması -Gereç biçemine (palet) göre simgeleri renklendir +LXQt Görünüm Yapılandırması → +Simge Teması → +Gereç biçimine (palet) göre simgeleri renklendir - + Override icon &theme - Simge temasını geçersiz kıl + Simge &temasını geçersiz kıl - + Icon theme for panels: Panel için simge teması: @@ -237,68 +242,68 @@ Konum: - + Top of desktop - Ekranın Üstünde + Ekranın üstünde - + Left of desktop - Ekranın Solunda + Ekranın solunda - + Right of desktop - Ekranın Sağında + Ekranın sağında - + Bottom of desktop - Ekranın Altında + Ekranın altında - + Top of desktop %1 - %1 Ekranın Üstünde + %1, ekranın üstünde - + Left of desktop %1 - %1 Ekranın Solunda + %1 Ekranın solunda - + Right of desktop %1 - %1 Ekranın Sağında + %1 Ekranın sağında - + Bottom of desktop %1 - %1 Ekranın Altında + %1 Ekranın altında - + Top Üst - + Bottom Alt - - + + Pick color Renk seç - + Images (*.png *.gif *.jpg) - Resimler(*.png *.gif *.jpg) + Resimler (*.png *.gif *.jpg) - + Pick image Resim seç @@ -353,45 +358,45 @@ LXQtPanel - - + + Panel Panel - + Configure Panel Paneli Yapılandır - + Manage Widgets Gereçleri Yönet - + Add New Panel Yeni Panel Ekle - + Remove Panel Menu Item Paneli Sil - + Lock This Panel Bu Paneli Kilitle - + Remove Panel Dialog Title Paneli Sil - + Removing a panel can not be undone. Do you want to remove this panel? Bir paneli silme eylemi geri alınamaz. @@ -401,19 +406,19 @@ Plugin - + Configure "%1" - "%1" ögesini yapılandır + "%1"'i yapılandır - + Move "%1" - "%1" ögesini taşı + "%1"'i taşı - + Remove "%1" - "%1" ögesini sil + "%1"'i sil @@ -421,7 +426,7 @@ Use alternate configuration file. - Diğer yapılandırma dosyasını kullanın. + Diğer yapılandırma dosyasını kullanınız. diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel.ts 2020-11-05 16:09:19.000000000 +0000 @@ -129,17 +129,22 @@ - + + Visible thin margin for hidden panel + + + + Don't allow maximized windows go under the panel window - + Reserve space on display - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -151,12 +156,12 @@ - + Override icon &theme - + Icon theme for panels: @@ -182,116 +187,116 @@ - + Left - - + + Center - + Right - + Custom styling - + Font color: - + Background color: - + Background opacity: - + <small>Compositing is required for panel transparency.</small> - + Background image: - + Top of desktop - + Left of desktop - + Right of desktop - + Bottom of desktop - + Top of desktop %1 - + Left of desktop %1 - + Right of desktop %1 - + Bottom of desktop %1 - + Top - + Bottom - - + + Pick color - + Pick image - + Images (*.png *.gif *.jpg) @@ -346,45 +351,45 @@ LXQtPanel - - + + Panel - + Configure Panel - + Manage Widgets - + Add New Panel - + Remove Panel Menu Item - + Lock This Panel - + Remove Panel Dialog Title - + Removing a panel can not be undone. Do you want to remove this panel? @@ -393,17 +398,17 @@ Plugin - + Configure "%1" - + Move "%1" - + Remove "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_uk.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_uk.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_uk.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_uk.ts 2020-11-05 16:09:19.000000000 +0000 @@ -120,85 +120,90 @@ Rows: - + Рядів: - + Left Зліва - - + + Center Посередині - + Right Справа A&uto-hide - + Автоматично ховати Zero means no delay - + При вказанні нуля затримки не буде Show with delay: - + Показувати із затримкою: - + + Visible thin margin for hidden panel + Лишати тонкий край прихованої панелі видимим + + + Don't allow maximized windows go under the panel window - + Не дозволяти максимізованим вікнам розташовуватися під панеллю - + Reserve space on display - + Резервувати простір на екрані - + Custom styling Власний стиль - + Font color: Колір шрифта: - + Background color: Коілр тла: - + Background opacity: Прозорість тла: - + <small>Compositing is required for panel transparency.</small> <small>Композит вимагається для прозорості панелі.</small> - + Background image: Малюнок тла: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -210,14 +215,14 @@ - + Override icon &theme - + Замінити тему піктограм - + Icon theme for panels: - + Тема піктограм для панелей: @@ -230,68 +235,68 @@ Позиція: - + Top of desktop Згори стільниці - + Left of desktop З лівого боку стільниці - + Right of desktop З правого боку стільниці - + Bottom of desktop Знизу стільниці - + Top of desktop %1 Згори стільниці %1 - + Left of desktop %1 З лівого боку стільниці %1 - + Right of desktop %1 З правого боку стільниці %1 - + Bottom of desktop %1 Знизу стільниці %1 - + Top Зверху - + Bottom Знизу - - + + Pick color Взяти колір - + Images (*.png *.gif *.jpg) Малюнки (*.png *.gif *.jpg - + Pick image Взяти малюнок @@ -346,45 +351,45 @@ LXQtPanel - - + + Panel Панель - + Configure Panel Налаштувати панель - + Manage Widgets Керувати віджетами - + Add New Panel Додати нову панель - + Remove Panel Menu Item Вилучити панель - + Lock This Panel Замкнути цю панель - + Remove Panel Dialog Title Вилучити панель - + Removing a panel can not be undone. Do you want to remove this panel? Вилучення панелі невідворотне. @@ -394,17 +399,17 @@ Plugin - + Configure "%1" Налаштування "%1" - + Move "%1" Перемістити "%1" - + Remove "%1" Вилучити "%1" diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_zh_CN.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_zh_CN.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_zh_CN.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_zh_CN.ts 2020-11-05 16:09:19.000000000 +0000 @@ -68,7 +68,7 @@ px - + 像素 @@ -83,7 +83,7 @@ <p>Negative pixel value sets the panel length to that many pixels less than available screen space.</p><p/><p><i>E.g. "Length" set to -100px, screen size is 1000px, then real panel length will be 900 px.</i></p> - <p>如设置长度为负数，则面板长度会等于最大长度加上输入值</p><p/><p><i>例：如“长度”设置为-100px，且最大长度为1000px，则实际显示长度为900px。</i></p> + <p>如设置长度为负数，则面板长度会等于可用空间减去输入值</p><p/><p><i>例：如“长度”设置为-100px，且最大长度为1000px，则实际显示长度为900px。</i></p> @@ -93,7 +93,7 @@ px - px + 像素 @@ -104,7 +104,7 @@ Zero means no animation - 如设置为0，则不显示动画 + 0表示无动画 @@ -115,7 +115,7 @@ Animation duration: - 动画时间: + 动画时长： @@ -124,27 +124,27 @@ - + Left - 左 + 居左 - - + + Center 居中 - + Right - 右 + 居右 A&uto-hide - 自动隐藏(&U) + 自动隐藏(&u) @@ -158,47 +158,52 @@ 动画延迟: - + + Visible thin margin for hidden panel + 为隐藏面板保留可见细边距 + + + Don't allow maximized windows go under the panel window 不允许最大化窗口显示在面板窗口之下 - + Reserve space on display - 显示器上的保留空间 + 在显示器上保留空间 - + Custom styling 自定义样式 - + Font color: 字体颜色: - + Background color: 背景颜色: - + Background opacity: 背景不透明度: - + <small>Compositing is required for panel transparency.</small> <small>必须要启用合成特效才可以使面板透明</small> - + Background image: 背景图像: - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -207,17 +212,24 @@ LXQt Appearance Configuration → Icons Theme → Colorize icons based on widget style (palette) - + 部分解决窗口小部件样式的方法， +无法为面板提供单独的主题。 + +你可能还想禁用： + +LXQt 外观配置→ +图标主题→ +根据小部件样式（调色板）着色图标 - + Override icon &theme 覆盖图标主题(T) - + Icon theme for panels: - 面板的图标主题 + 面板的图标主题： @@ -230,68 +242,68 @@ 位置： - + Top of desktop 桌面顶部 - + Left of desktop 桌面左侧 - + Right of desktop 桌面右侧 - + Bottom of desktop 桌面底部 - + Top of desktop %1 桌面顶部 %1 - + Left of desktop %1 桌面左侧 %1 - + Right of desktop %1 左面右侧 %1 - + Bottom of desktop %1 桌面底部 %1 - + Top 顶部 - + Bottom 底部 - - + + Pick color 选择颜色 - + Images (*.png *.gif *.jpg) 图像 (*.png *.gif *.jpg) - + Pick image 选择图像 @@ -346,45 +358,45 @@ LXQtPanel - - + + Panel 面板 - + Configure Panel 配置面板 - + Manage Widgets 管理小部件 - + Add New Panel 新增面板 - + Remove Panel Menu Item 删除面板 - + Lock This Panel 锁定此面板 - + Remove Panel Dialog Title 删除面板 - + Removing a panel can not be undone. Do you want to remove this panel? 删除面板不可撤销。 @@ -394,17 +406,17 @@ Plugin - + Configure "%1" 配置“%1” - + Move "%1" 移动“%1” - + Remove "%1" 删除“%1” diff -Nru lxqt-panel-0.14.1/panel/translations/lxqt-panel_zh_TW.ts lxqt-panel-0.16.1/panel/translations/lxqt-panel_zh_TW.ts --- lxqt-panel-0.14.1/panel/translations/lxqt-panel_zh_TW.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/translations/lxqt-panel_zh_TW.ts 2020-11-05 16:09:19.000000000 +0000 @@ -124,20 +124,20 @@ - + Left 向左 - - + + Center 中間 - + Right 向右 @@ -158,47 +158,52 @@ 顯示有延遲： - + + Visible thin margin for hidden panel + + + + Don't allow maximized windows go under the panel window 不允許最大化視窗在面板視窗的下面 - + Reserve space on display 在螢幕上保留空間 - + Custom styling 自訂樣式 - + Font color: 字型顏色： - + Background color: 背景顏色： - + Background opacity: 背景不透明度： - + <small>Compositing is required for panel transparency.</small> <small>面板透明度需要合成</small> - + Background image: 背景圖片： - + A partial workaround for widget styles that cannot give a separate theme to the panel. @@ -207,15 +212,22 @@ LXQt Appearance Configuration → Icons Theme → Colorize icons based on widget style (palette) - + 幾則無法將面板變更為其他主題的 +小部件樣式的解決方案。 + +您可能還想禁用： + +LXQt外觀配置→ +圖標主題→ +根據小部件樣式（調色板）著色圖標 - + Override icon &theme 覆寫圖示主題(&T) - + Icon theme for panels: 面板的圖示主題： @@ -230,68 +242,68 @@ 位置 : - + Top of desktop 桌面頂端 - + Left of desktop 桌面左方 - + Right of desktop 桌面右方 - + Bottom of desktop 桌面底端 - + Top of desktop %1 桌面頂端 %1 - + Left of desktop %1 桌面左方 %1 - + Right of desktop %1 桌面右方 %1 - + Bottom of desktop %1 桌面底端 %1 - + Top 頂端 - + Bottom 底端 - - + + Pick color 選擇顏色 - + Images (*.png *.gif *.jpg) 圖片 (*.png *.gif *.jpg) - + Pick image 選擇圖片 @@ -346,45 +358,45 @@ LXQtPanel - - + + Panel 面板 - + Configure Panel 配置面板 - + Manage Widgets 管理小工具 - + Add New Panel 新增面板 - + Remove Panel Menu Item 移除面板 - + Lock This Panel 鎖定此面板 - + Remove Panel Dialog Title 移除面板 - + Removing a panel can not be undone. Do you want to remove this panel? 移除面板是不可回復的。 @@ -394,17 +406,17 @@ Plugin - + Configure "%1" 配置 "%1" - + Move "%1" 移動 "%1" - + Remove "%1" 移除 "%1" diff -Nru lxqt-panel-0.14.1/panel/windownotifier.cpp lxqt-panel-0.16.1/panel/windownotifier.cpp --- lxqt-panel-0.14.1/panel/windownotifier.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/panel/windownotifier.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -44,10 +44,13 @@ { case QEvent::Close: watched->removeEventFilter(this); - //no break +#if __cplusplus >= 201703L + [[fallthrough]]; +#endif + // fall through case QEvent::Hide: - Q_ASSERT(mShownWindows.end() != it); - mShownWindows.erase(it); + if (mShownWindows.end() != it) + mShownWindows.erase(it); if (mShownWindows.isEmpty()) emit lastHidden(); break; diff -Nru lxqt-panel-0.14.1/plugin-backlight/backlight.cpp lxqt-panel-0.16.1/plugin-backlight/backlight.cpp --- lxqt-panel-0.14.1/plugin-backlight/backlight.cpp 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-backlight/backlight.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,80 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * https://lxqt.org + * + * Copyright: 2020 LXQt team + * Authors: + * + * 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 "backlight.h" +#include + +LXQtBacklight::LXQtBacklight(const ILXQtPanelPluginStartupInfo &startupInfo): + QObject(), + ILXQtPanelPlugin(startupInfo) +{ + m_backlightButton = new QToolButton(); + // use our own icon + m_backlightButton->setIcon(QIcon::fromTheme(QStringLiteral("brightnesssettings"))); + + connect(m_backlightButton, SIGNAL(clicked(bool)), this, SLOT(showSlider(bool))); + + m_backlightSlider = nullptr; +} + + +LXQtBacklight::~LXQtBacklight() +{ + delete m_backlightButton; +} + + +QWidget *LXQtBacklight::widget() +{ + return m_backlightButton; +} + +void LXQtBacklight::deleteSlider() +{ + if(m_backlightSlider) { + m_backlightSlider->deleteLater(); + } + m_backlightSlider = nullptr; + //printf("Deleted\n"); +} + +void LXQtBacklight::showSlider(bool) +{ + if(! m_backlightSlider) { + m_backlightSlider = new SliderDialog(m_backlightButton); + connect(m_backlightSlider, SIGNAL(dialogClosed()), this, SLOT(deleteSlider())); + //printf("New Slider\n"); + } + QSize size = m_backlightSlider->sizeHint(); + QRect rect = calculatePopupWindowPos(size); + m_backlightSlider->setGeometry(rect); + m_backlightSlider->updateBacklight(); + m_backlightSlider->show(); + m_backlightSlider->setFocus(); +} + + + diff -Nru lxqt-panel-0.14.1/plugin-backlight/backlight.h lxqt-panel-0.16.1/plugin-backlight/backlight.h --- lxqt-panel-0.14.1/plugin-backlight/backlight.h 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-backlight/backlight.h 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,86 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * https://lxqt.org + * + * Copyright: 2020 LXQt team + * Authors: + * + * 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 LXQTBACKLIGHT_H +#define LXQTBACKLIGHT_H + +#include +#include "../panel/ilxqtpanelplugin.h" +#include "sliderdialog.h" + +namespace LXQt { +class Notification; +} +namespace GlobalKeyShortcut +{ +class Action; +} + + + +class LXQtBacklight : public QObject, public ILXQtPanelPlugin +{ + Q_OBJECT +public: + LXQtBacklight(const ILXQtPanelPluginStartupInfo &startupInfo); + ~LXQtBacklight(); + + virtual QWidget *widget(); + virtual QString themeId() const { return QStringLiteral("Backlight"); } + virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment ; } + +protected Q_SLOTS: + void showSlider(bool); + void deleteSlider(); + +private: + QToolButton *m_backlightButton; + SliderDialog *m_backlightSlider; +}; + + +class LXQtBacklightPluginLibrary: public QObject, public ILXQtPanelPluginLibrary +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "lxqt.org/Panel/PluginInterface/3.0") + Q_INTERFACES(ILXQtPanelPluginLibrary) +public: + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const + { + return new LXQtBacklight(startupInfo); + } +}; + +class Slider: public QSlider +{ +public: + Slider(QWidget *parent); +protected: + bool event(QEvent * event) override; +}; + +#endif // LXQTBACKLIGHT_H diff -Nru lxqt-panel-0.14.1/plugin-backlight/CMakeLists.txt lxqt-panel-0.16.1/plugin-backlight/CMakeLists.txt --- lxqt-panel-0.14.1/plugin-backlight/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-backlight/CMakeLists.txt 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,17 @@ +set(PLUGIN "backlight") + +set(HEADERS + backlight.h + sliderdialog.h +) + +set(SOURCES + backlight.cpp + sliderdialog.cpp +) + +set(LIBRARIES + ${LIBRARIES} +) + +BUILD_LXQT_PLUGIN(${PLUGIN}) diff -Nru lxqt-panel-0.14.1/plugin-backlight/resources/backlight.desktop.in lxqt-panel-0.16.1/plugin-backlight/resources/backlight.desktop.in --- lxqt-panel-0.14.1/plugin-backlight/resources/backlight.desktop.in 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-backlight/resources/backlight.desktop.in 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Service +ServiceTypes=LXQtPanel/Plugin +Name=Backlight +Comment=Sets display backlight +Icon=brightnesssettings + +#TRANSLATIONS_DIR=../translations diff -Nru lxqt-panel-0.14.1/plugin-backlight/sliderdialog.cpp lxqt-panel-0.16.1/plugin-backlight/sliderdialog.cpp --- lxqt-panel-0.14.1/plugin-backlight/sliderdialog.cpp 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-backlight/sliderdialog.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,129 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * https://lxqt.org + * + * Copyright: 2020 LXQt team + * Authors: + * + * 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 +#include +#include +#include +#include "sliderdialog.h" + + +SliderDialog::SliderDialog(QWidget *parent) : QDialog(parent, Qt::Dialog | Qt::WindowStaysOnTopHint | Qt::CustomizeWindowHint | Qt::Popup | Qt::X11BypassWindowManagerHint) +{ + setWindowFlags(Qt::WindowStaysOnTopHint | Qt::CustomizeWindowHint | Qt::Popup | Qt::X11BypassWindowManagerHint); + m_backlight = new LXQt::Backlight(this); + + QVBoxLayout *layout = new QVBoxLayout(this); + layout->setSpacing(0); + layout->setMargin(2); + + m_upButton = new QToolButton(); + m_upButton->setText(QStringLiteral("☀")); + m_upButton->setAutoRepeat(true); + layout->addWidget(m_upButton, 0, Qt::AlignHCenter); + + m_slider = new QSlider(this); + layout->addWidget(m_slider, 0, Qt::AlignHCenter); + + m_downButton = new QToolButton(); + m_downButton->setText(QStringLiteral("☼")); + m_downButton->setAutoRepeat(true); + layout->addWidget(m_downButton, 0, Qt::AlignHCenter); + + + if(m_backlight->isBacklightAvailable() || m_backlight->isBacklightOff()) { + // Set the minimum to 5% of the maximum to prevent a black screen + int minBacklight = qMax(qRound((qreal)(m_backlight->getMaxBacklight())*0.05), 1); + int maxBacklight = m_backlight->getMaxBacklight(); + int interval = maxBacklight - minBacklight; + if(interval <= 100) { + m_slider->setMaximum(maxBacklight); + m_slider->setMinimum(minBacklight); + m_slider->setValue(m_backlight->getBacklight()); + } else { + m_slider->setMaximum(100); + // Set the minimum to 5% of the maximum to prevent a black screen + m_slider->setMinimum(5); + m_slider->setValue( (m_backlight->getBacklight() * 100) / maxBacklight); + } + } else { + m_slider->setValue(0); + m_slider->setEnabled(false); + m_upButton->setEnabled(false); + m_downButton->setEnabled(false); + } + + connect(m_slider, SIGNAL(valueChanged(int)), this, SLOT(sliderValueChanged(int))); + connect(m_upButton, SIGNAL(clicked(bool)), this, SLOT(upButtonClicked(bool))); + connect(m_downButton, SIGNAL(clicked(bool)), this, SLOT(downButtonClicked(bool))); +} + + +void SliderDialog::sliderValueChanged(int value) +{ + // Set the minimum to 5% of the maximum to prevent a black screen + int minBacklight = qMax(qRound((qreal)(m_backlight->getMaxBacklight())*0.05), 1); + int maxBacklight = m_backlight->getMaxBacklight(); + int interval = maxBacklight - minBacklight; + if(interval > 100) + value = (value * maxBacklight) / 100; + m_backlight->setBacklight(value); +} + + +void SliderDialog::updateBacklight() +{ + // Set the minimum to 5% of the maximum to prevent a black screen + int minBacklight = qMax(qRound((qreal)(m_backlight->getMaxBacklight())*0.05), 1); + int maxBacklight = m_backlight->getMaxBacklight(); + int interval = maxBacklight - minBacklight; + if(interval <= 100) + m_slider->setValue(m_backlight->getBacklight()); + else + m_slider->setValue( (m_backlight->getBacklight() * 100) / maxBacklight); +} + +void SliderDialog::downButtonClicked(bool) +{ + m_slider->setValue(m_slider->value() - 1); +} + +void SliderDialog::upButtonClicked(bool) +{ + m_slider->setValue(m_slider->value() + 1); +} + + +bool SliderDialog::event(QEvent * event) +{ + if(event->type() == QEvent::WindowDeactivate || event->type() == QEvent::Hide) { + hide(); + //printf("emit dialogClosed()\n"); + emit dialogClosed(); + } + return QDialog::event(event); +} + diff -Nru lxqt-panel-0.14.1/plugin-backlight/sliderdialog.h lxqt-panel-0.16.1/plugin-backlight/sliderdialog.h --- lxqt-panel-0.14.1/plugin-backlight/sliderdialog.h 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-backlight/sliderdialog.h 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,63 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * https://lxqt.org + * + * Copyright: 2020 LXQt team + * Authors: + * + * 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 SLIDERDIALOG_H +#define SLIDERDIALOG_H + +#include +#include +#include +#include + + +class SliderDialog: public QDialog +{ + Q_OBJECT + +public: + SliderDialog(QWidget *parent); + void updateBacklight(); + +Q_SIGNALS: + void dialogClosed(); + +protected: + bool event(QEvent *event) override; + +private: + QSlider *m_slider; + QToolButton *m_upButton, *m_downButton; + LXQt::Backlight *m_backlight; + +private Q_SLOTS: + void sliderValueChanged(int value); + void downButtonClicked(bool); + void upButtonClicked(bool); + +}; + +#endif // SLIDERDIALOG_H diff -Nru lxqt-panel-0.14.1/plugin-backlight/translations/backlight_cs.desktop lxqt-panel-0.16.1/plugin-backlight/translations/backlight_cs.desktop --- lxqt-panel-0.14.1/plugin-backlight/translations/backlight_cs.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-backlight/translations/backlight_cs.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[cs]=Podsvícení +Comment[cs]=Nastavuje podsvícení displeje diff -Nru lxqt-panel-0.14.1/plugin-backlight/translations/backlight_es.desktop lxqt-panel-0.16.1/plugin-backlight/translations/backlight_es.desktop --- lxqt-panel-0.14.1/plugin-backlight/translations/backlight_es.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-backlight/translations/backlight_es.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[es]=Brillo de la pantalla +Comment[es]=Cambia el brillo de la pantalla diff -Nru lxqt-panel-0.14.1/plugin-backlight/translations/backlight_hr.desktop lxqt-panel-0.16.1/plugin-backlight/translations/backlight_hr.desktop --- lxqt-panel-0.14.1/plugin-backlight/translations/backlight_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-backlight/translations/backlight_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=Svjetlina ekrana +Comment[hr]=Postavlja svjetlinu ekrana diff -Nru lxqt-panel-0.14.1/plugin-backlight/translations/backlight_ja.desktop lxqt-panel-0.16.1/plugin-backlight/translations/backlight_ja.desktop --- lxqt-panel-0.14.1/plugin-backlight/translations/backlight_ja.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-backlight/translations/backlight_ja.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[ja]=バックライト +Comment[ja]=ディスプレイのバックライトを設定します diff -Nru lxqt-panel-0.14.1/plugin-backlight/translations/backlight_nl.desktop lxqt-panel-0.16.1/plugin-backlight/translations/backlight_nl.desktop --- lxqt-panel-0.14.1/plugin-backlight/translations/backlight_nl.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-backlight/translations/backlight_nl.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[nl]=Achtergrondverlichting +Comment[nl]=Achtergrondverlichting instellen diff -Nru lxqt-panel-0.14.1/plugin-backlight/translations/backlight_tr.desktop lxqt-panel-0.16.1/plugin-backlight/translations/backlight_tr.desktop --- lxqt-panel-0.14.1/plugin-backlight/translations/backlight_tr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-backlight/translations/backlight_tr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[tr]=Arka ışık +Comment[tr]=Görüntünün arka ışığını ayarlar diff -Nru lxqt-panel-0.14.1/plugin-colorpicker/colorpicker.cpp lxqt-panel-0.16.1/plugin-colorpicker/colorpicker.cpp --- lxqt-panel-0.14.1/plugin-colorpicker/colorpicker.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-colorpicker/colorpicker.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -56,7 +56,7 @@ QFrame(parent) { QFontMetrics fm (mLineEdit.font()); - mLineEdit.setFixedWidth ( 10*fm.width ("a") ); + mLineEdit.setFixedWidth ( 10*fm.horizontalAdvance (QStringLiteral("a")) ); QHBoxLayout *layout = new QHBoxLayout(this); layout->setContentsMargins (0, 0, 0, 0); @@ -67,7 +67,7 @@ mButton.setAutoRaise(true); - mButton.setIcon(XdgIcon::fromTheme("color-picker", "kcolorchooser")); + mButton.setIcon(XdgIcon::fromTheme(QStringLiteral("color-picker"), QStringLiteral("kcolorchooser"))); mCapturing = false; connect(&mButton, SIGNAL(clicked()), this, SLOT(captureMouse())); diff -Nru lxqt-panel-0.14.1/plugin-colorpicker/colorpicker.h lxqt-panel-0.16.1/plugin-colorpicker/colorpicker.h --- lxqt-panel-0.14.1/plugin-colorpicker/colorpicker.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-colorpicker/colorpicker.h 2020-11-05 16:09:19.000000000 +0000 @@ -42,7 +42,7 @@ { Q_OBJECT public: - ColorPickerWidget(QWidget* parent = 0); + ColorPickerWidget(QWidget* parent = nullptr); ~ColorPickerWidget(); QLineEdit *lineEdit() { return &mLineEdit; } @@ -70,7 +70,7 @@ ~ColorPicker(); virtual QWidget *widget() { return &mWidget; } - virtual QString themeId() const { return "ColorPicker"; } + virtual QString themeId() const { return QStringLiteral("ColorPicker"); } bool isSeparate() const { return true; } diff -Nru lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_arn.ts lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_arn.ts --- lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_arn.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_ast.ts lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_ast.ts --- lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_ast.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_ast.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_cs.desktop lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_cs.desktop --- lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_cs.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_cs.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,10 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Color picker -Comment=Get the color under the cursor. For web developers. - - -# Translations -Comment[cs]=Získejte barvu pod ukazatelem. Pro webové vývojáře. Name[cs]=Výběr barvy +Comment[cs]=Získejte barvu pod ukazatelem. Pro webové vývojáře. diff -Nru lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_cs.ts lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_cs.ts --- lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_cs.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_cs.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_hr.desktop lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_hr.desktop --- lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=Kapaljka +Comment[hr]=Odaberi boju ispod pokazivača. Za web‑dizajnere. diff -Nru lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_hu.desktop lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_hu.desktop --- lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_hu.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_hu.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -6,5 +6,5 @@ # Translations -Comment[hu]=Színszippantó. Fejlesztőknek. +Comment[hu]=Szín kiválasztása a képernyőről. Fejlesztőknek. Name[hu]=Színválasztó diff -Nru lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_hu.ts lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_hu.ts --- lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_hu.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_hu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_ja.desktop lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_ja.desktop --- lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_ja.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_ja.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,5 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=カラーピッカー -Comment=カーソルの下の色を取得します。ウェブ制作者向け +Name[ja]=カラーピッカー +Comment[ja]=マウスカーソルの下の色を取得します。ウェブ開発者向け。 diff -Nru lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_ja.ts lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_ja.ts --- lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_ja.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_ja.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_nl.desktop lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_nl.desktop --- lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_nl.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_nl.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[nl]=Kleurkiezer +Comment[nl]=Selecteer de kleur onder de cursor. Voor webontwikkelaars. diff -Nru lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_nl.ts lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_nl.ts --- lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_nl.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_nl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_ru.ts lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_ru.ts --- lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_ru.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_ru.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_sk_SK.ts lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_sk_SK.ts --- lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_sk_SK.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_sk_SK.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_sv.ts lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_sv.ts --- lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_sv.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_sv.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_tr.desktop lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_tr.desktop --- lxqt-panel-0.14.1/plugin-colorpicker/translations/colorpicker_tr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-colorpicker/translations/colorpicker_tr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[tr]=Renk seçici +Comment[tr]=İmleç altındaki rengi alır. Web geliştiricileri içindir. diff -Nru lxqt-panel-0.14.1/plugin-cpuload/lxqtcpuloadconfiguration.cpp lxqt-panel-0.16.1/plugin-cpuload/lxqtcpuloadconfiguration.cpp --- lxqt-panel-0.14.1/plugin-cpuload/lxqtcpuloadconfiguration.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-cpuload/lxqtcpuloadconfiguration.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -38,7 +38,7 @@ ui(new Ui::LXQtCpuLoadConfiguration) { setAttribute(Qt::WA_DeleteOnClose); - setObjectName("CpuLoadConfigurationWindow"); + setObjectName(QStringLiteral("CpuLoadConfigurationWindow")); ui->setupUi(this); fillBarOrientations(); @@ -65,20 +65,20 @@ void LXQtCpuLoadConfiguration::fillBarOrientations() { - ui->barOrientationCOB->addItem(trUtf8("Bottom up"), BAR_ORIENT_BOTTOMUP); - ui->barOrientationCOB->addItem(trUtf8("Top down"), BAR_ORIENT_TOPDOWN); - ui->barOrientationCOB->addItem(trUtf8("Left to right"), BAR_ORIENT_LEFTRIGHT); - ui->barOrientationCOB->addItem(trUtf8("Right to left"), BAR_ORIENT_RIGHTLEFT); + ui->barOrientationCOB->addItem(tr("Bottom up"), QStringLiteral(BAR_ORIENT_BOTTOMUP)); + ui->barOrientationCOB->addItem(tr("Top down"), QStringLiteral(BAR_ORIENT_TOPDOWN)); + ui->barOrientationCOB->addItem(tr("Left to right"), QStringLiteral(BAR_ORIENT_LEFTRIGHT)); + ui->barOrientationCOB->addItem(tr("Right to left"), QStringLiteral(BAR_ORIENT_RIGHTLEFT)); } void LXQtCpuLoadConfiguration::loadSettings() { - ui->showTextCB->setChecked(settings().value("showText", false).toBool()); - ui->barWidthSB->setValue(settings().value("barWidth", 20).toInt()); - ui->updateIntervalSpinBox->setValue(settings().value("updateInterval", 1000).toInt() / 1000.0); + ui->showTextCB->setChecked(settings().value(QStringLiteral("showText"), false).toBool()); + ui->barWidthSB->setValue(settings().value(QStringLiteral("barWidth"), 20).toInt()); + ui->updateIntervalSpinBox->setValue(settings().value(QStringLiteral("updateInterval"), 1000).toInt() / 1000.0); int boIndex = ui->barOrientationCOB->findData( - settings().value("barOrientation", BAR_ORIENT_BOTTOMUP)); + settings().value(QStringLiteral("barOrientation"), QStringLiteral(BAR_ORIENT_BOTTOMUP))); boIndex = (boIndex < 0) ? 1 : boIndex; ui->barOrientationCOB->setCurrentIndex(boIndex); @@ -93,20 +93,20 @@ void LXQtCpuLoadConfiguration::showTextChanged(bool value) { - settings().setValue("showText", value); + settings().setValue(QStringLiteral("showText"), value); } void LXQtCpuLoadConfiguration::barWidthChanged(int value) { - settings().setValue("barWidth", value); + settings().setValue(QStringLiteral("barWidth"), value); } void LXQtCpuLoadConfiguration::updateIntervalChanged(double value) { - settings().setValue("updateInterval", value*1000); + settings().setValue(QStringLiteral("updateInterval"), value*1000); } void LXQtCpuLoadConfiguration::barOrientationChanged(int index) { - settings().setValue("barOrientation", ui->barOrientationCOB->itemData(index).toString()); + settings().setValue(QStringLiteral("barOrientation"), ui->barOrientationCOB->itemData(index).toString()); } diff -Nru lxqt-panel-0.14.1/plugin-cpuload/lxqtcpuload.cpp lxqt-panel-0.16.1/plugin-cpuload/lxqtcpuload.cpp --- lxqt-panel-0.14.1/plugin-cpuload/lxqtcpuload.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-cpuload/lxqtcpuload.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -57,7 +57,7 @@ m_barOrientation(TopDownBar), m_timerID(-1) { - setObjectName("LXQtCpuLoad"); + setObjectName(QStringLiteral("LXQtCpuLoad")); QHBoxLayout *layout = new QHBoxLayout(this); layout->setSpacing(0); @@ -118,7 +118,7 @@ return (cur->user + cur->kernel + cur->nice); } -void LXQtCpuLoad::timerEvent(QTimerEvent *event) +void LXQtCpuLoad::timerEvent(QTimerEvent * /*event*/) { double avg = getLoadCpu(); if ( qAbs(m_avg-avg)>1 ) @@ -193,16 +193,16 @@ if (m_timerID != -1) killTimer(m_timerID); - m_showText = mPlugin->settings()->value("showText", false).toBool(); - m_barWidth = mPlugin->settings()->value("barWidth", 20).toInt(); - m_updateInterval = mPlugin->settings()->value("updateInterval", 1000).toInt(); + m_showText = mPlugin->settings()->value(QStringLiteral("showText"), false).toBool(); + m_barWidth = mPlugin->settings()->value(QStringLiteral("barWidth"), 20).toInt(); + m_updateInterval = mPlugin->settings()->value(QStringLiteral("updateInterval"), 1000).toInt(); - QString barOrientation = mPlugin->settings()->value("barOrientation", BAR_ORIENT_BOTTOMUP).toString(); - if (barOrientation == BAR_ORIENT_RIGHTLEFT) + QString barOrientation = mPlugin->settings()->value(QStringLiteral("barOrientation"), QStringLiteral(BAR_ORIENT_BOTTOMUP)).toString(); + if (barOrientation == QLatin1String(BAR_ORIENT_RIGHTLEFT)) m_barOrientation = RightToLeftBar; - else if (barOrientation == BAR_ORIENT_LEFTRIGHT) + else if (barOrientation == QLatin1String(BAR_ORIENT_LEFTRIGHT)) m_barOrientation = LeftToRightBar; - else if (barOrientation == BAR_ORIENT_TOPDOWN) + else if (barOrientation == QLatin1String(BAR_ORIENT_TOPDOWN)) m_barOrientation = TopDownBar; else m_barOrientation = BottomUpBar; diff -Nru lxqt-panel-0.14.1/plugin-cpuload/lxqtcpuload.h lxqt-panel-0.16.1/plugin-cpuload/lxqtcpuload.h --- lxqt-panel-0.14.1/plugin-cpuload/lxqtcpuload.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-cpuload/lxqtcpuload.h 2020-11-05 16:09:19.000000000 +0000 @@ -48,7 +48,7 @@ LeftToRightBar //! Bar begins at left edge and grows to the right }; - LXQtCpuLoad(ILXQtPanelPlugin *plugin, QWidget* parent = 0); + LXQtCpuLoad(ILXQtPanelPlugin *plugin, QWidget* parent = nullptr); ~LXQtCpuLoad(); @@ -85,5 +85,3 @@ #endif // LXQTCPULOAD_H - - diff -Nru lxqt-panel-0.14.1/plugin-cpuload/lxqtcpuloadplugin.h lxqt-panel-0.16.1/plugin-cpuload/lxqtcpuloadplugin.h --- lxqt-panel-0.14.1/plugin-cpuload/lxqtcpuloadplugin.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-cpuload/lxqtcpuloadplugin.h 2020-11-05 16:09:19.000000000 +0000 @@ -43,7 +43,7 @@ virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } virtual QWidget *widget(); - virtual QString themeId() const { return "CpuLoad"; } + virtual QString themeId() const { return QStringLiteral("CpuLoad"); } bool isSeparate() const { return true; } QDialog *configureDialog(); diff -Nru lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_arn.ts lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_arn.ts --- lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_arn.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,70 @@ + + + + + LXQtCpuLoad + + + CPU load %1% + + + + + LXQtCpuLoadConfiguration + + + CPU Load Settings + + + + + General + + + + + Show text + + + + + Update interval: + + + + + sec + + + + + Bar orientation: + + + + + Bar width: + + + + + Bottom up + + + + + Top down + + + + + Left to right + + + + + Right to left + + + + diff -Nru lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_ast.ts lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_ast.ts --- lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_ast.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_ast.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,70 @@ + + + + + LXQtCpuLoad + + + CPU load %1% + + + + + LXQtCpuLoadConfiguration + + + CPU Load Settings + + + + + General + + + + + Show text + + + + + Update interval: + + + + + sec + + + + + Bar orientation: + + + + + Bar width: + + + + + Bottom up + + + + + Top down + + + + + Left to right + + + + + Right to left + + + + diff -Nru lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_cs.desktop lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_cs.desktop --- lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_cs.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_cs.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,13 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin - -Name=Cpu monitor -Comment=Displays the current CPU load. - - - - -# Translations -Comment[cs]=Sledování zatížení procesoru -Name[cs]=Zatížení procesoru +Name[cs]=Vytížení procesoru +Comment[cs]=Sledování vytížení procesoru diff -Nru lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_fr.ts lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_fr.ts --- lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_fr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_fr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -19,7 +19,7 @@ General - Généraux + Général @@ -34,7 +34,7 @@ sec - seconde(s) + sec diff -Nru lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_gl.ts lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_gl.ts --- lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_gl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_gl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -49,22 +49,22 @@ Bottom up - De abaixo cara arriba + De abaixo cara a arriba Top down - De arriba cara abaixo + De arriba cara a abaixo Left to right - Da esquerda cara a dereita + Da esquerda cara á dereita Right to left - Da dereita cara a esquerda + Da dereita cara á esquerda diff -Nru lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_he.ts lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_he.ts --- lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_he.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_he.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ CPU load %1% - עומס על המעבד %1% + עומס על המעבד %1% diff -Nru lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_hr.desktop lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_hr.desktop --- lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=Praćenje procesora +Comment[hr]=Prikazuje trenutačno opterećenje procesora. diff -Nru lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_hr.ts lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_hr.ts --- lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_hr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_hr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ CPU load %1% - Korištenje CPU-a %1% + Opterećenje procesora %1 % @@ -14,32 +14,32 @@ CPU Load Settings - Postavke korištenja CPU-a + Opterećenje procesora – Postavke General - Općenito + Opće Show text - Pokaži tekst + Prikaži tekst Update interval: - Interval ažuriranja: + Interval aktualiziranja: sec - sek + s Bar orientation: - Orijentacija trake: + Smjer trake: diff -Nru lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_hu.ts lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_hu.ts --- lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_hu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_hu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -14,7 +14,7 @@ CPU Load Settings - CPU jelző beállítás + CPU-figyelő beállítások @@ -29,7 +29,7 @@ Update interval: - Frissítési köz: + Frissítési időköz: @@ -39,32 +39,32 @@ Bar orientation: - Sáv irány: + Sáv iránya: Bar width: - Sáv szélesség: + Sáv szélessége: Bottom up - Felfele + Lentről fel Top down - Lefele + Fentről le Left to right - Jobbra + Balról jobbra Right to left - Balra + Jobbról balra diff -Nru lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_ja.desktop lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_ja.desktop --- lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_ja.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_ja.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,13 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin - -Name=CPU monitor -Comment=Displays the current CPU load. - - - - -# Translations -Comment[ja]=現在のCPUの負荷を表示します -Name[ja]=CPUモニター +Name[ja]=CPU モニター +Comment[ja]=現在の CPU の負荷を表示します diff -Nru lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_ja.ts lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_ja.ts --- lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_ja.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_ja.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ CPU load %1% - CPU負荷 %1% + CPU 負荷 %1% @@ -14,7 +14,7 @@ CPU Load Settings - CPUモニターの設定 + CPU モニターの設定 @@ -24,7 +24,7 @@ Show text - テキストを表示 + テキストを表示する diff -Nru lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_nb_NO.ts lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_nb_NO.ts --- lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_nb_NO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_nb_NO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -34,7 +34,7 @@ sec - sekunder + sek @@ -49,12 +49,12 @@ Bottom up - Fra nederst til øverst + Nedenfra Top down - Fra øverst til nederst + Ovenfra diff -Nru lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_nl.desktop lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_nl.desktop --- lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_nl.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_nl.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,13 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin - -Name=Cpu monitor -Comment=Displays the current CPU load. - - - - -# Translations -Comment[nl]=CPU belasting monitor -Name[nl]=Cpu belasting +Name[nl]=CPU-monitor +Comment[nl]=Geeft de huidige processorbelasting weer. diff -Nru lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_sk_SK.ts lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_sk_SK.ts --- lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_sk_SK.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_sk_SK.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,70 @@ + + + + + LXQtCpuLoad + + + CPU load %1% + Zaťaženie procesora %1% + + + + LXQtCpuLoadConfiguration + + + CPU Load Settings + Nastavenie zaťaženia procesora + + + + General + Všeobecné + + + + Show text + Zobraziť text + + + + Update interval: + Interval obnovení: + + + + sec + sek + + + + Bar orientation: + Smer panela: + + + + Bar width: + Šírka panela: + + + + Bottom up + Zdola hore + + + + Top down + Zhora dole + + + + Left to right + Zľava doprava + + + + Right to left + Z prava doľava + + + diff -Nru lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_sl.ts lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_sl.ts --- lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_sl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_sl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ CPU load %1% - + Obremenitev CPE %1% @@ -14,7 +14,7 @@ CPU Load Settings - + Nastavitve CPU-gradnika @@ -24,7 +24,7 @@ Show text - Pokaži besedilo + Prikaži porabo v odstotkih @@ -44,7 +44,7 @@ Bar width: - + Širina vrstice: diff -Nru lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_sv.ts lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_sv.ts --- lxqt-panel-0.14.1/plugin-cpuload/translations/cpuload_sv.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-cpuload/translations/cpuload_sv.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,70 @@ + + + + + LXQtCpuLoad + + + CPU load %1% + CPU-belastning% 1% + + + + LXQtCpuLoadConfiguration + + + CPU Load Settings + Inställningar för CPU-belastning + + + + General + Allmänt + + + + Show text + Visa text + + + + Update interval: + Uppdateringsintervall: + + + + sec + sek + + + + Bar orientation: + Stapelns orientering: + + + + Bar width: + Stapelbredd: + + + + Bottom up + Botten upp + + + + Top down + Toppen ned + + + + Left to right + Vänster till höger + + + + Right to left + Höger till vänster + + + diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/desktopswitchconfiguration.cpp lxqt-panel-0.16.1/plugin-desktopswitch/desktopswitchconfiguration.cpp --- lxqt-panel-0.14.1/plugin-desktopswitch/desktopswitchconfiguration.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/desktopswitchconfiguration.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -34,7 +34,7 @@ ui(new Ui::DesktopSwitchConfiguration) { setAttribute(Qt::WA_DeleteOnClose); - setObjectName("DesktopSwitchConfigurationWindow"); + setObjectName(QStringLiteral("DesktopSwitchConfigurationWindow")); ui->setupUi(this); connect(ui->buttons, SIGNAL(clicked(QAbstractButton*)), this, SLOT(dialogButtonsAction(QAbstractButton*))); @@ -43,6 +43,7 @@ connect(ui->rowsSB, SIGNAL(valueChanged(int)), this, SLOT(rowsChanged(int))); connect(ui->labelTypeCB, SIGNAL(currentIndexChanged(int)), this, SLOT(labelTypeChanged(int))); + connect(ui->showOnlyActiveCB, &QAbstractButton::toggled, [this] (bool checked) { this->settings().setValue(QStringLiteral("showOnlyActive"), checked); }); loadDesktopsNames(); } @@ -54,8 +55,9 @@ void DesktopSwitchConfiguration::loadSettings() { - ui->rowsSB->setValue(settings().value("rows", 1).toInt()); - ui->labelTypeCB->setCurrentIndex(settings().value("labelType", 0).toInt()); + ui->rowsSB->setValue(settings().value(QStringLiteral("rows"), 1).toInt()); + ui->labelTypeCB->setCurrentIndex(settings().value(QStringLiteral("labelType"), 0).toInt()); + ui->showOnlyActiveCB->setChecked(settings().value(QStringLiteral("showOnlyActive"), false).toBool()); } void DesktopSwitchConfiguration::loadDesktopsNames() @@ -64,7 +66,7 @@ for (int i = 1; i <= n; i++) { QLineEdit *edit = new QLineEdit(KWindowSystem::desktopName(i), this); - ((QFormLayout *) ui->namesGroupBox->layout())->addRow(QString("Desktop %1:").arg(i), edit); + ((QFormLayout *) ui->namesGroupBox->layout())->addRow(QStringLiteral("Desktop %1:").arg(i), edit); // C++11 rocks! QTimer *timer = new QTimer(this); @@ -77,11 +79,10 @@ void DesktopSwitchConfiguration::rowsChanged(int value) { - settings().setValue("rows", value); + settings().setValue(QStringLiteral("rows"), value); } void DesktopSwitchConfiguration::labelTypeChanged(int type) { - settings().setValue("labelType", type); + settings().setValue(QStringLiteral("labelType"), type); } - diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/desktopswitchconfiguration.ui lxqt-panel-0.16.1/plugin-desktopswitch/desktopswitchconfiguration.ui --- lxqt-panel-0.14.1/plugin-desktopswitch/desktopswitchconfiguration.ui 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/desktopswitchconfiguration.ui 2020-11-05 16:09:19.000000000 +0000 @@ -6,8 +6,8 @@ 0 0 - 213 - 207 + 253 + 235 @@ -66,6 +66,16 @@ + + + + If checked, widget will be just an indicator + + + Show only active desktop + + + diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/desktopswitch.cpp lxqt-panel-0.16.1/plugin-desktopswitch/desktopswitch.cpp --- lxqt-panel-0.14.1/plugin-desktopswitch/desktopswitch.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/desktopswitch.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -40,7 +40,7 @@ #include "desktopswitchbutton.h" #include "desktopswitchconfiguration.h" -static const QString DEFAULT_SHORTCUT_TEMPLATE("Control+F%1"); +static const QString DEFAULT_SHORTCUT_TEMPLATE(QStringLiteral("Control+F%1")); DesktopSwitch::DesktopSwitch(const ILXQtPanelPluginStartupInfo &startupInfo) : QObject(), @@ -48,6 +48,7 @@ m_pSignalMapper(new QSignalMapper(this)), m_desktopCount(KWindowSystem::numberOfDesktops()), mRows(-1), + mShowOnlyActive(false), mDesktops(new NETRootInfo(QX11Info::connection(), NET::NumberOfDesktops | NET::CurrentDesktop | NET::DesktopNames, NET::WM2DesktopLayout)), mLabelType(static_cast(-1)) { @@ -80,7 +81,7 @@ QString description; for (int i = 0; i < 12; ++i) { - path = QString("/panel/%1/desktop_%2").arg(settings()->group()).arg(i + 1); + path = QStringLiteral("/panel/%1/desktop_%2").arg(settings()->group()).arg(i + 1); description = tr("Switch to desktop %1").arg(i + 1); gshortcut = GlobalKeyShortcut::Client::instance()->addAction(QString(), path, description, this); @@ -109,7 +110,7 @@ } } -void DesktopSwitch::onWindowChanged(WId id, NET::Properties properties, NET::Properties2 properties2) +void DesktopSwitch::onWindowChanged(WId id, NET::Properties properties, NET::Properties2 /*properties2*/) { if (properties.testFlag(NET::WMState) && isWindowHighlightable(id)) { @@ -128,18 +129,21 @@ void DesktopSwitch::refresh() { - QList btns = m_buttons->buttons(); + const QList btns = m_buttons->buttons(); int i = 0; + const int current_desktop = KWindowSystem::currentDesktop(); const int current_cnt = btns.count(); const int border = qMin(btns.count(), m_desktopCount); //update existing buttons for ( ; i < border; ++i) { - ((DesktopSwitchButton*)m_buttons->button(i))->update(i, mLabelType, + DesktopSwitchButton * button = qobject_cast(btns[i]); + button->update(i, mLabelType, KWindowSystem::desktopName(i + 1).isEmpty() ? tr("Desktop %1").arg(i + 1) : KWindowSystem::desktopName(i + 1)); + button->setVisible(!mShowOnlyActive || i + 1 == current_desktop); } //create new buttons (if neccessary) @@ -152,12 +156,13 @@ KWindowSystem::desktopName(i+1)); mWidget.layout()->addWidget(b); m_buttons->addButton(b, i); + b->setVisible(!mShowOnlyActive || i + 1 == current_desktop); } //delete unneeded buttons (if neccessary) for ( ; i < current_cnt; ++i) { - b = m_buttons->buttons().last(); + b = m_buttons->buttons().constLast(); m_buttons->removeButton(b); mWidget.layout()->removeWidget(b); delete b; @@ -219,9 +224,28 @@ void DesktopSwitch::onCurrentDesktopChanged(int current) { - QAbstractButton *button = m_buttons->button(current - 1); - if (button) - button->setChecked(true); + if (mShowOnlyActive) + { + int i = 1; + const auto buttons = m_buttons->buttons(); + for (const auto button : buttons) + { + if (current == i) + { + button->setChecked(true); + button->setVisible(true); + } else + { + button->setVisible(false); + } + ++i; + } + } else + { + QAbstractButton *button = m_buttons->button(current - 1); + if (button) + button->setChecked(true); + } } void DesktopSwitch::onDesktopNamesChanged() @@ -231,35 +255,48 @@ void DesktopSwitch::settingsChanged() { - int value = settings()->value("rows", 1).toInt(); - if (mRows != value) + const int rows = settings()->value(QStringLiteral("rows"), 1).toInt(); + const bool show_only_active = settings()->value(QStringLiteral("showOnlyActive"), false).toBool(); + const int label_type = settings()->value(QStringLiteral("labelType"), DesktopSwitchButton::LABEL_TYPE_NUMBER).toInt(); + + const bool need_realign = mRows != rows || show_only_active != mShowOnlyActive; + const bool need_refresh = mLabelType != static_cast(label_type) || show_only_active != mShowOnlyActive; + + mRows = rows; + mShowOnlyActive = show_only_active; + mLabelType = static_cast(label_type); + if (need_realign) { - mRows = value; - realign(); + // WARNING: Changing the desktop layout may call "LXQtPanel::realign", which calls + // "DesktopSwitch::realign()". Therefore, the desktop layout should not be changed + // inside the latter method. + int columns = static_cast(ceil(static_cast(m_desktopCount) / mRows)); + if (panel()->isHorizontal()) + { + mDesktops->setDesktopLayout(NET::OrientationHorizontal, columns, mRows, mWidget.isRightToLeft() ? NET::DesktopLayoutCornerTopRight : NET::DesktopLayoutCornerTopLeft); + } + else + { + mDesktops->setDesktopLayout(NET::OrientationHorizontal, mRows, columns, mWidget.isRightToLeft() ? NET::DesktopLayoutCornerTopRight : NET::DesktopLayoutCornerTopLeft); + } + realign(); // in case it isn't called when the desktop layout changes } - value = settings()->value("labelType", DesktopSwitchButton::LABEL_TYPE_NUMBER).toInt(); - if (mLabelType != static_cast(value)) - { - mLabelType = static_cast(value); + if (need_refresh) refresh(); - } } void DesktopSwitch::realign() { - int columns = static_cast(ceil(static_cast(m_desktopCount) / mRows)); mLayout->setEnabled(false); if (panel()->isHorizontal()) { - mLayout->setRowCount(mRows); + mLayout->setRowCount(mShowOnlyActive ? 1 : mRows); mLayout->setColumnCount(0); - mDesktops->setDesktopLayout(NET::OrientationHorizontal, columns, mRows, mWidget.isRightToLeft() ? NET::DesktopLayoutCornerTopRight : NET::DesktopLayoutCornerTopLeft); } else { - mLayout->setColumnCount(mRows); + mLayout->setColumnCount(mShowOnlyActive ? 1 : mRows); mLayout->setRowCount(0); - mDesktops->setDesktopLayout(NET::OrientationHorizontal, mRows, columns, mWidget.isRightToLeft() ? NET::DesktopLayoutCornerTopRight : NET::DesktopLayoutCornerTopLeft); } mLayout->setEnabled(true); } diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/desktopswitch.h lxqt-panel-0.16.1/plugin-desktopswitch/desktopswitch.h --- lxqt-panel-0.14.1/plugin-desktopswitch/desktopswitch.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/desktopswitch.h 2020-11-05 16:09:19.000000000 +0000 @@ -66,7 +66,7 @@ DesktopSwitch(const ILXQtPanelPluginStartupInfo &startupInfo); ~DesktopSwitch(); - QString themeId() const { return "DesktopSwitch"; } + QString themeId() const { return QStringLiteral("DesktopSwitch"); } QWidget *widget() { return &mWidget; } bool isSeparate() const { return true; } void realign(); @@ -82,6 +82,7 @@ DesktopSwitchWidget mWidget; LXQt::GridLayout *mLayout; int mRows; + bool mShowOnlyActive; QScopedPointer mDesktops; DesktopSwitchButton::LabelType mLabelType; diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_arn.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_arn.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_arn.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,71 @@ + + + + + DesktopSwitch + + + Switch to desktop %1 + + + + + + Desktop %1 + + + + + DesktopSwitchConfiguration + + + DesktopSwitch settings + + + + + Number of rows: + + + + + Desktop labels: + + + + + Appearance + + + + + Numbers + + + + + Names + + + + + None + + + + + If checked, widget will be just an indicator + + + + + Show only active desktop + + + + + Desktop names + + + + diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_ar.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_ar.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_ar.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_ar.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 بدّل إلى سطح المكتب %1 - - + + Desktop %1 سطح المكتب %1 @@ -53,7 +53,17 @@ بلا + + If checked, widget will be just an indicator + + + + Show only active desktop + + + + Desktop names أسماء أسطح المكتب diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_ast.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_ast.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_ast.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_ast.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,71 @@ + + + + + DesktopSwitch + + + Switch to desktop %1 + Cambiar al escritoriu %1 + + + + + Desktop %1 + Escritoriu %1 + + + + DesktopSwitchConfiguration + + + DesktopSwitch settings + Axustes del conmutador d'escritorios + + + + Number of rows: + Númberu de fileres: + + + + Desktop labels: + Etiquetes: + + + + Appearance + Aspeutu + + + + Numbers + Númberos + + + + Names + Nomes + + + + None + Nada + + + + If checked, widget will be just an indicator + + + + + Show only active desktop + + + + + Desktop names + Nomes de los escritorios + + + diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_ca.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_ca.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_ca.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_ca.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 Canvia a l'escriptori %1 - - + + Desktop %1 Escriptori %1 @@ -53,7 +53,17 @@ Cap + + If checked, widget will be just an indicator + + + + Show only active desktop + + + + Desktop names Noms dels escriptoris diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_cs.desktop lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_cs.desktop --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_cs.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_cs.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,12 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Desktop switcher -Comment=Allows easy switching between virtual desktops. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[cs]=Umožňuje přepínání virtuálních ploch Name[cs]=Přepínání ploch +Comment[cs]=Umožňuje přepínání virtuálních ploch diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_cs.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_cs.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_cs.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_cs.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 Přepnout na plochu %1 - - + + Desktop %1 Plocha %1 @@ -30,7 +30,7 @@ Desktop labels: - Popisy ploch: + Popisky ploch: @@ -53,7 +53,17 @@ Žádné + + If checked, widget will be just an indicator + Pokud zaškrtnuto, ovládací prvek bude pouze ukazatelem + + + Show only active desktop + Zobrazovat pouze pracovní plochu, na které se nacházíte + + + Desktop names Názvy ploch diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_cy.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_cy.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_cy.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_cy.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 - - + + Desktop %1 @@ -53,7 +53,17 @@ + + If checked, widget will be just an indicator + + + + Show only active desktop + + + + Desktop names diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_da.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_da.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_da.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_da.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 Skift til skrivebord %1 - - + + Desktop %1 Skrivebord %1 @@ -53,7 +53,17 @@ Intet + + If checked, widget will be just an indicator + Hvis den er tilvalgt, så er widgeten blot en indikator + + + Show only active desktop + Vis kun det aktive skrivebord + + + Desktop names Skrivebordsnavne diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_de.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_de.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_de.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_de.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 - Zu Schreibtisch %1 wechseln + Wechsele zu Arbeitsfläche %1 - - + + Desktop %1 Arbeitsfläche %1 @@ -20,7 +20,7 @@ DesktopSwitch settings - Einstellungen für Schreibtischumschalter + Einstellungen für Arbeitsflächenumschalter @@ -30,12 +30,12 @@ Desktop labels: - Schreibtischbezeichnungen: + Arbeitsflächenbezeichnungen: Number of rows: - Anzahl der Zeilen: + Zeilenanzahl: @@ -53,9 +53,19 @@ Keine + + If checked, widget will be just an indicator + Wenn diese Option aktiviert ist, ist das Widget nur ein Indikator + + + Show only active desktop + Nur aktiven Desktop anzeigen + + + Desktop names - Schreibtischnamen + Arbeitsflächennamen diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_el.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_el.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_el.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_el.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 Εναλλαγή στην επιφάνεια εργασίας %1 - - + + Desktop %1 Επιφάνεια εργασίας %1 @@ -53,7 +53,17 @@ Ουδεμία + + If checked, widget will be just an indicator + Αν είναι επιλεγμένο, το γραφικό συστατικό θα είναι απλώς μια ένδειξη + + + Show only active desktop + Εμφάνιση μόνο της ενεργής επιφάνειας εργασίας + + + Desktop names Ονόματα των επιφανειών εργασίας diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_eo.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_eo.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_eo.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_eo.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 - - + + Desktop %1 Labortablo %1 @@ -53,7 +53,17 @@ + + If checked, widget will be just an indicator + + + + Show only active desktop + + + + Desktop names diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_es.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_es.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_es.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_es.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 Cambiar al escritorio %1 - - + + Desktop %1 Escritorio %1 @@ -53,7 +53,17 @@ Ninguna + + If checked, widget will be just an indicator + Si está marcado, el control será solo un indicador + + + Show only active desktop + Mostrar solo el escritorio activo + + + Desktop names Nombres de escritorio diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_es_UY.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_es_UY.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_es_UY.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_es_UY.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 - + Cambiar a escritorio %1 - - + + Desktop %1 Escritorio %1 @@ -20,32 +20,32 @@ DesktopSwitch settings - + Configuración de DesktopSwitch Number of rows: - + Cantidad de filas: Desktop labels: - + Etiquetas de escritorio: Appearance - + Apariencia Numbers - + Números Names - + Nombres @@ -53,7 +53,17 @@ + + If checked, widget will be just an indicator + + + + Show only active desktop + + + + Desktop names diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_es_VE.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_es_VE.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_es_VE.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_es_VE.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 - - + + Desktop %1 Escritorio %1 @@ -53,7 +53,17 @@ + + If checked, widget will be just an indicator + + + + Show only active desktop + + + + Desktop names diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_eu.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_eu.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_eu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_eu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 - - + + Desktop %1 %1 mahaigaina @@ -53,7 +53,17 @@ + + If checked, widget will be just an indicator + + + + Show only active desktop + + + + Desktop names diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_fi.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_fi.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_fi.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_fi.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 - + Siirry työpöydälle %1 - - + + Desktop %1 Työpöytä %1 @@ -20,7 +20,7 @@ DesktopSwitch settings - + Työpöydän vaihtajan asetukset @@ -30,7 +30,7 @@ Desktop labels: - + Työpöydän nimikkeet: @@ -53,7 +53,17 @@ Ei mitään + + If checked, widget will be just an indicator + Käytä vain työpöydän ilmaisimena + + + Show only active desktop + Näytä vain aktiivinen työpöytä + + + Desktop names Työpöytien nimet diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_fr.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_fr.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_fr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_fr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 Basculer vers le bureau %1 - - + + Desktop %1 Bureau %1 @@ -53,7 +53,17 @@ Aucun + + If checked, widget will be just an indicator + Si coché, le widget ne sera qu'un indicateur + + + Show only active desktop + Afficher uniquement le bureau actif + + + Desktop names Noms des bureaux diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_gl.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_gl.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_gl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_gl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 Cambiar para o escritorio %1 - - + + Desktop %1 Escritorio %1 @@ -53,7 +53,17 @@ Ningún + + If checked, widget will be just an indicator + Se está marcado, o trebello será só un indicador + + + Show only active desktop + Amosa só escritorio activo + + + Desktop names Nomes dos escritorios diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_he.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_he.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_he.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_he.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 מעבר לשולחן עבודה %1 - - + + Desktop %1 שולחן עבודה %1 @@ -20,7 +20,7 @@ DesktopSwitch settings - הגדרות מעבר שולחן עבודה + הגדרות מעבר בין שולחנות עבודה @@ -50,10 +50,20 @@ None - אין + כלום + + + + If checked, widget will be just an indicator + אם האפשרות מסומנת, הווידג׳ט יהיה מחוון בלבד + Show only active desktop + הצגת שולחן העבודה הפעיל בלבד + + + Desktop names שמות שולחנות עבודה diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_hr.desktop lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_hr.desktop --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=Prebacivanje između radnih površina +Comment[hr]=Omugućuje jednostavno prebacivanje između virtualnih radnih površina. diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_hr.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_hr.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_hr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_hr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,15 @@ DesktopSwitch - + Switch to desktop %1 - Prebaci na radnu površinu %1 + Prebaci se na radnu površinu %1 - - + + Desktop %1 - Radna površina %1 + Radna površina %1 @@ -20,42 +20,52 @@ DesktopSwitch settings - Postavke prebacivaša radnih površina + Prebacivanje između radnih površina – Postavke Number of rows: - Broj redaka: + Broj redaka: Desktop labels: - + Oznake radnih površina: Appearance - + Izgled Numbers - Brojevi + Brojevi Names - Imena + Imena None - + Bez + + + + If checked, widget will be just an indicator + Ako je označeno, programčić će biti samo indikator + Show only active desktop + Prikaži samo aktivne radne površine + + + Desktop names - + Imena radnih površina diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_hu.desktop lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_hu.desktop --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_hu.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_hu.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -9,4 +9,4 @@ # Translations Comment[hu]=Lehetővé teszi a virtuális asztalok közötti váltást -Name[hu]=Aszatlváltó +Name[hu]=Asztalváltó diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_hu.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_hu.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_hu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_hu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 %1. asztalra váltás - - + + Desktop %1 %1. asztal @@ -20,7 +20,7 @@ DesktopSwitch settings - Asztalváltó beállítás + Asztalváltó beállításai @@ -50,12 +50,22 @@ None - + Nincs + + + + If checked, widget will be just an indicator + Ha be van jelölve, nem lehet asztalt váltani vele + Show only active desktop + Csak az aktív asztal megjelenítése + + + Desktop names - Asztal nevek + Asztalnevek diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_ia.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_ia.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_ia.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_ia.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 - - + + Desktop %1 @@ -53,7 +53,17 @@ + + If checked, widget will be just an indicator + + + + Show only active desktop + + + + Desktop names diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_id.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_id.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_id.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_id.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 Beralih ke desktop %1 - - + + Desktop %1 Desktop %1 @@ -53,7 +53,17 @@ Tak ada + + If checked, widget will be just an indicator + + + + Show only active desktop + + + + Desktop names Nama desktop diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_it.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_it.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_it.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_it.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 Passa al desktop %1 - - + + Desktop %1 Desktop %1 @@ -53,7 +53,17 @@ Nessuna + + If checked, widget will be just an indicator + Se selezionato, l'elemento sarà un semplice indicatore + + + Show only active desktop + Mostra solo desktop attivo + + + Desktop names Nomi dei desktop diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_ja.desktop lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_ja.desktop --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_ja.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_ja.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,12 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Desktop switcher -Comment=Allows easy switching between virtual desktops. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ja]=仮想デスクトップの切り替えを可能にします Name[ja]=デスクトップ切り替え +Comment[ja]=仮想デスクトップの切り替えを簡単にします diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_ja.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_ja.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_ja.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_ja.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 - デスクトップ%1に切り替える + デスクトップ %1 に切り替える - - + + Desktop %1 デスクトップ %1 @@ -20,12 +20,12 @@ DesktopSwitch settings - + デスクトップ切り替えの設定 Number of rows: - 段の数: + 行数: @@ -50,10 +50,20 @@ None - + なし + + + + If checked, widget will be just an indicator + チェックすると、ウィジェットがインジケーターのみになります + Show only active desktop + アクティブなデスクトップのみを表示する + + + Desktop names デスクトップの名前 diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_ko.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_ko.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_ko.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_ko.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 바탕화면 바꾸기 %1 - - + + Desktop %1 바탕화면 %1 @@ -53,7 +53,17 @@ 없음 + + If checked, widget will be just an indicator + 이 옵션을 선택하면,위젯이 표시기에 표시 + + + Show only active desktop + 활성 데스크탑 만 표시 + + + Desktop names 바탕화면 이름 diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_lt.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_lt.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_lt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_lt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 Perjungti į darbalaukį %1 - - + + Desktop %1 Darbalaukis %1 @@ -53,7 +53,17 @@ Nėra + + If checked, widget will be just an indicator + Jei pažymėta, valdiklis bus tiesiog indikatoriumi + + + Show only active desktop + Rodyti tik aktyvų darbalaukį + + + Desktop names Darbalaukių pavadinimai diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_nb_NO.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_nb_NO.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_nb_NO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_nb_NO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 Bytt til skrivebord %1 - - + + Desktop %1 Skrivebord %1 @@ -53,7 +53,17 @@ Ingen + + If checked, widget will be just an indicator + Når aktivert blir widgeten bare en indikator + + + Show only active desktop + Vis bare aktivt skrivebord + + + Desktop names Skrivebordsnavn diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_nl.desktop lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_nl.desktop --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_nl.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_nl.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,12 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Desktop switcher -Comment=Allows easy switching between virtual desktops. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[nl]=Wisselen tussen virtuele-bureaubladen toestaan -Name[nl]=Wissel bureaublad +Name[nl]=Bureaubladwisselaar +Comment[nl]=Eenvoudig wisselen tussen virtuele bureaubladen diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_nl.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_nl.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_nl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_nl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,15 @@ DesktopSwitch - + Switch to desktop %1 - Schakel over naar werkblad %1 + Schakel over naar bureaublad %1 - - + + Desktop %1 - Werkblad %1 + bureaublad %1 @@ -20,7 +20,7 @@ DesktopSwitch settings - Instellingen voor Werkbladwisselaar + Instellingen voor Bureaubladwisselaar @@ -30,7 +30,7 @@ Desktop labels: - Werkbladetiketten: + Bureaubladlabels: @@ -53,9 +53,19 @@ Geen + + If checked, widget will be just an indicator + Indien aangevinkt is de bureaubladwisselaar alleen een indicator + + + Show only active desktop + Toon alleen in actieve desktop + + + Desktop names - Werkbladnamen + Bureaubladnamen diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_pl.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_pl.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_pl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_pl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 Przełącz na pulpit %1 - - + + Desktop %1 Pulpit %1 @@ -53,7 +53,17 @@ Brak + + If checked, widget will be just an indicator + Jeżeli zaznaczono, widżet będzie po prostu wskaźnikiem + + + Show only active desktop + Pokazuj tylko aktywny pulpit + + + Desktop names Nazwy pulpitów diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_pt_BR.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_pt_BR.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_pt_BR.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_pt_BR.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 Ir para a área de trabalho %1 - - + + Desktop %1 Área de trabalho %1 @@ -53,7 +53,17 @@ Nenhum + + If checked, widget will be just an indicator + Se marcado, o widget será apenas um indicador + + + Show only active desktop + Exibir somente a área de trabalho ativa + + + Desktop names Nomes das áreas de trabalho diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_pt.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_pt.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_pt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_pt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 Trocar para a área de trabalho %1 - - + + Desktop %1 Área de trabalho %1 @@ -53,7 +53,17 @@ Nenhum + + If checked, widget will be just an indicator + Se ativada, o widget será apenas um indicador + + + Show only active desktop + Mostrar apenas a área de trabalho ativa + + + Desktop names Nome das áreas de trabalho diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_ro_RO.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_ro_RO.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_ro_RO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_ro_RO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 Comutare la ecranul %1 - - + + Desktop %1 Ecranul %1 @@ -53,7 +53,17 @@ Nici unul + + If checked, widget will be just an indicator + + + + Show only active desktop + + + + Desktop names Denumiri ale desktopului diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_ru.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_ru.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_ru.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_ru.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 Переключиться на рабочий стол %1 - - + + Desktop %1 Рабочий стол %1 @@ -53,7 +53,17 @@ Без меток + + If checked, widget will be just an indicator + Если отмечено, виджет будет работать как простой индикатор + + + Show only active desktop + Показывать только активный рабочий стол + + + Desktop names Имена рабочих столов diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_sk_SK.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_sk_SK.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_sk_SK.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_sk_SK.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 - + Prejsť na plochu %1 - - + + Desktop %1 Plocha %1 @@ -20,42 +20,52 @@ DesktopSwitch settings - + Nastavenia prepínača pracovnej plochy Number of rows: - + Počet riadkov: Desktop labels: - + Názov plochy: Appearance - + Vzhľad Numbers - + Počet Names - + Mená None - + Žiadne + + + + If checked, widget will be just an indicator + Ak je možnosť aktivovaná, ovládací prvok bude iba indikátorom + Show only active desktop + Zobraziť iba aktívnu plochu + + + Desktop names - + Názov plochy diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_sl.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_sl.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_sl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_sl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 - + Preklopi na namizje %1 - - + + Desktop %1 Namizje %1 @@ -20,42 +20,52 @@ DesktopSwitch settings - + Nastavitve preklopnika namizij Number of rows: - + Število vrstic: Desktop labels: - + Oznake namizij: Appearance - + Izgled Numbers - + Številke Names - + Imena None - + Brez + + + + If checked, widget will be just an indicator + Če obkljukano, bo gradnik le indikator + Show only active desktop + Prikaži le aktivno namizje + + + Desktop names - + Imena namizij diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_sr_BA.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_sr_BA.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_sr_BA.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_sr_BA.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 - - + + Desktop %1 Површ %1 @@ -53,7 +53,17 @@ + + If checked, widget will be just an indicator + + + + Show only active desktop + + + + Desktop names diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_sr@latin.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_sr@latin.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_sr@latin.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_sr@latin.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 - - + + Desktop %1 @@ -53,7 +53,17 @@ + + If checked, widget will be just an indicator + + + + Show only active desktop + + + + Desktop names diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_sr_RS.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_sr_RS.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_sr_RS.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_sr_RS.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 - - + + Desktop %1 Површ %1 @@ -53,7 +53,17 @@ + + If checked, widget will be just an indicator + + + + Show only active desktop + + + + Desktop names diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_sv.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_sv.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_sv.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_sv.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,71 @@ + + + + + DesktopSwitch + + + Switch to desktop %1 + Byt till skrivbord %1 + + + + + Desktop %1 + Skrivbord %1 + + + + DesktopSwitchConfiguration + + + DesktopSwitch settings + DesktopSwitch-inställningar + + + + Number of rows: + Antal rader: + + + + Desktop labels: + Skrivbordsnamn: + + + + Appearance + Utseende + + + + Numbers + Nummer + + + + Names + Namn + + + + None + Ingen + + + + If checked, widget will be just an indicator + + + + + Show only active desktop + + + + + Desktop names + Skrivbordsnamn + + + diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_th_TH.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_th_TH.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_th_TH.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_th_TH.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 - - + + Desktop %1 พื้นโต๊ะ %1 @@ -53,7 +53,17 @@ + + If checked, widget will be just an indicator + + + + Show only active desktop + + + + Desktop names diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_tr.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_tr.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_tr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_tr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 %1 Masaüstüne geç - - + + Desktop %1 %1 Masaüstü @@ -53,7 +53,17 @@ Hiçbiri + + If checked, widget will be just an indicator + İşaretliyse, gereç sadece bir gösterge olacaktır + + + Show only active desktop + Sadece aktif masaüstünü göster + + + Desktop names Masaüstü isimleri diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 - - + + Desktop %1 @@ -53,7 +53,17 @@ + + If checked, widget will be just an indicator + + + + Show only active desktop + + + + Desktop names diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_uk.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_uk.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_uk.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_uk.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,14 +4,14 @@ DesktopSwitch - + Switch to desktop %1 Перейти на стільницю %1 - - + + Desktop %1 Стільниця %1 @@ -54,7 +54,17 @@ + + If checked, widget will be just an indicator + + + + Show only active desktop + + + + Desktop names Назви стільниць diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_zh_CN.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_zh_CN.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_zh_CN.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_zh_CN.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 切换至桌面 %1 - - + + Desktop %1 桌面 %1 @@ -53,7 +53,17 @@ 无 + + If checked, widget will be just an indicator + + + + Show only active desktop + + + + Desktop names 桌面名称 diff -Nru lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_zh_TW.ts lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_zh_TW.ts --- lxqt-panel-0.14.1/plugin-desktopswitch/translations/desktopswitch_zh_TW.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-desktopswitch/translations/desktopswitch_zh_TW.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,13 @@ DesktopSwitch - + Switch to desktop %1 切換到桌面 %1 - - + + Desktop %1 桌面 %1 @@ -53,7 +53,17 @@ 無 + + If checked, widget will be just an indicator + + + + Show only active desktop + + + + Desktop names 桌面名稱 diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/directorymenuconfiguration.cpp lxqt-panel-0.16.1/plugin-directorymenu/directorymenuconfiguration.cpp --- lxqt-panel-0.14.1/plugin-directorymenu/directorymenuconfiguration.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/directorymenuconfiguration.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -41,11 +41,11 @@ LXQtPanelPluginConfigDialog(settings, parent), ui(new Ui::DirectoryMenuConfiguration), mBaseDirectory(QDir::homePath()), - mDefaultIcon(XdgIcon::fromTheme("folder")), - mDefaultTerminal("/usr/bin/qterminal") + mDefaultIcon(XdgIcon::fromTheme(QStringLiteral("folder"))), + mDefaultTerminal(QStringLiteral("/usr/bin/qterminal")) { setAttribute(Qt::WA_DeleteOnClose); - setObjectName("DirectoryMenuConfigurationWindow"); + setObjectName(QStringLiteral("DirectoryMenuConfigurationWindow")); ui->setupUi(this); connect(ui->buttons, SIGNAL(clicked(QAbstractButton*)), SLOT(dialogButtonsAction(QAbstractButton*))); @@ -65,10 +65,10 @@ void DirectoryMenuConfiguration::loadSettings() { - mBaseDirectory.setPath(settings().value("baseDirectory", QDir::homePath()).toString()); + mBaseDirectory.setPath(settings().value(QStringLiteral("baseDirectory"), QDir::homePath()).toString()); ui->baseDirectoryB->setText(mBaseDirectory.dirName()); - mIcon = settings().value("icon", QString()).toString(); + mIcon = settings().value(QStringLiteral("icon"), QString()).toString(); if(!mIcon.isNull()) { QIcon buttonIcon = QIcon(mIcon); @@ -81,14 +81,14 @@ ui->iconB->setIcon(mDefaultIcon); - ui->terminalB->setText(settings().value("defaultTerminal", QString()).toString()); + ui->terminalB->setText(settings().value(QStringLiteral("defaultTerminal"), QString()).toString()); } void DirectoryMenuConfiguration::saveSettings() { - settings().setValue("baseDirectory", mBaseDirectory.absolutePath()); - settings().setValue("icon", mIcon); - settings().setValue("defaultTerminal", mDefaultTerminal); + settings().setValue(QStringLiteral("baseDirectory"), mBaseDirectory.absolutePath()); + settings().setValue(QStringLiteral("icon"), mIcon); + settings().setValue(QStringLiteral("defaultTerminal"), mDefaultTerminal); } void DirectoryMenuConfiguration::showDirectoryDialog() @@ -100,7 +100,7 @@ if(d.exec() && !d.selectedFiles().isEmpty()) { - mBaseDirectory.setPath(d.selectedFiles().front()); + mBaseDirectory.setPath(d.selectedFiles().constFirst()); ui->baseDirectoryB->setText(mBaseDirectory.dirName()); saveSettings(); @@ -109,13 +109,13 @@ void DirectoryMenuConfiguration::showTermDialog() { - QFileDialog d(this, tr("Choose Default Terminal"), "/usr/bin"); + QFileDialog d(this, tr("Choose Default Terminal"), QStringLiteral("/usr/bin")); d.setFileMode(QFileDialog::ExistingFile); d.setWindowModality(Qt::WindowModal); if (d.exec() && !d.selectedFiles().isEmpty()) { - mDefaultTerminal = d.selectedFiles().front(); + mDefaultTerminal = d.selectedFiles().constFirst(); saveSettings(); } ui->terminalB->setText(mDefaultTerminal); @@ -128,7 +128,7 @@ if(d.exec() && !d.selectedFiles().isEmpty()) { - QIcon newIcon = QIcon(d.selectedFiles().front()); + QIcon newIcon = QIcon(d.selectedFiles().constFirst()); if(newIcon.pixmap(QSize(24,24)).isNull()) { @@ -137,7 +137,7 @@ } ui->iconB->setIcon(newIcon); - mIcon = d.selectedFiles().front(); + mIcon = d.selectedFiles().constFirst(); saveSettings(); } } diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/directorymenu.cpp lxqt-panel-0.16.1/plugin-directorymenu/directorymenu.cpp --- lxqt-panel-0.14.1/plugin-directorymenu/directorymenu.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/directorymenu.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -42,7 +42,7 @@ QObject(), ILXQtPanelPlugin(startupInfo), mMenu(0), - mDefaultIcon(XdgIcon::fromTheme("folder")) + mDefaultIcon(XdgIcon::fromTheme(QStringLiteral("folder"))) { mOpenDirectorySignalMapper = new QSignalMapper(this); mOpenTerminalSignalMapper = new QSignalMapper(this); @@ -50,7 +50,7 @@ mButton.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); mButton.setAutoRaise(true); - mButton.setIcon(XdgIcon::fromTheme("folder")); + mButton.setIcon(XdgIcon::fromTheme(QStringLiteral("folder"))); connect(&mButton, SIGNAL(clicked()), this, SLOT(showMenu())); connect(mOpenDirectorySignalMapper, SIGNAL(mapped(QString)), this, SLOT(openDirectory(QString))); @@ -62,11 +62,7 @@ DirectoryMenu::~DirectoryMenu() { - if(mMenu) - { - delete mMenu; - mMenu = 0; - } + delete mMenu; } void DirectoryMenu::showMenu() @@ -88,11 +84,7 @@ void DirectoryMenu::buildMenu(const QString& path) { - if(mMenu) - { - delete mMenu; - mMenu = 0; - } + delete mMenu; mPathStrings.clear(); @@ -103,14 +95,14 @@ void DirectoryMenu::openDirectory(const QString& path) { - QDesktopServices::openUrl(QUrl("file://" + QDir::toNativeSeparators(path))); + QDesktopServices::openUrl(QUrl(QStringLiteral("file://") + QDir::toNativeSeparators(path))); } void DirectoryMenu::openInTerminal(const QString& path) { // Create list of arguments QStringList args; - args << "--workdir" << QDir::toNativeSeparators(path); + args << QStringLiteral("--workdir") << QDir::toNativeSeparators(path); // Execute the default terminal program with arguments QProcess::startDetached(mDefaultTerminal, args); } @@ -130,11 +122,11 @@ { mPathStrings.push_back(path); - QAction* openDirectoryAction = menu->addAction(XdgIcon::fromTheme("folder"), tr("Open")); + QAction* openDirectoryAction = menu->addAction(XdgIcon::fromTheme(QStringLiteral("folder")), tr("Open")); connect(openDirectoryAction, SIGNAL(triggered()), mOpenDirectorySignalMapper, SLOT(map())); mOpenDirectorySignalMapper->setMapping(openDirectoryAction, mPathStrings.back()); - QAction* openTerminalAction = menu->addAction(XdgIcon::fromTheme("folder"), tr("Open in terminal")); + QAction* openTerminalAction = menu->addAction(XdgIcon::fromTheme(QStringLiteral("folder")), tr("Open in terminal")); connect(openTerminalAction, SIGNAL(triggered()), mOpenTerminalSignalMapper, SLOT(map())); mOpenTerminalSignalMapper->setMapping(openTerminalAction, mPathStrings.back()); @@ -149,7 +141,7 @@ { mPathStrings.push_back(entry.fileName()); - QMenu* subMenu = menu->addMenu(XdgIcon::fromTheme("folder"), mPathStrings.back()); + QMenu* subMenu = menu->addMenu(XdgIcon::fromTheme(QStringLiteral("folder")), mPathStrings.back()); connect(subMenu, SIGNAL(aboutToShow()), mMenuSignalMapper, SLOT(map())); mMenuSignalMapper->setMapping(subMenu, entry.absoluteFilePath()); @@ -164,9 +156,9 @@ void DirectoryMenu::settingsChanged() { - mBaseDirectory.setPath(settings()->value("baseDirectory", QDir::homePath()).toString()); + mBaseDirectory.setPath(settings()->value(QStringLiteral("baseDirectory"), QDir::homePath()).toString()); - QString iconPath = settings()->value("icon", QString()).toString(); + QString iconPath = settings()->value(QStringLiteral("icon"), QString()).toString(); QIcon icon = QIcon(iconPath); if(!icon.isNull()) @@ -182,5 +174,5 @@ mButton.setIcon(mDefaultIcon); // Set default terminal - mDefaultTerminal = settings()->value("defaultTerminal", QString()).toString(); + mDefaultTerminal = settings()->value(QStringLiteral("defaultTerminal"), QString()).toString(); } diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/directorymenu.h lxqt-panel-0.16.1/plugin-directorymenu/directorymenu.h --- lxqt-panel-0.14.1/plugin-directorymenu/directorymenu.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/directorymenu.h 2020-11-05 16:09:19.000000000 +0000 @@ -50,7 +50,7 @@ ~DirectoryMenu(); virtual QWidget *widget() { return &mButton; } - virtual QString themeId() const { return "DirectoryMenu"; } + virtual QString themeId() const { return QStringLiteral("DirectoryMenu"); } virtual ILXQtPanelPlugin::Flags flags() const { return HaveConfigDialog; } QDialog *configureDialog(); void settingsChanged(); diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_arn.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_arn.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_arn.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,81 @@ + + + + + DirectoryMenu + + + Open + + + + + Open in terminal + + + + + DirectoryMenuConfiguration + + + Directory Menu Settings + + + + + Appearance + + + + + Base directory: + + + + + BaseDirectoryName + + + + + Icon: + + + + + Terminal + + + + + + Choose Default Terminal + + + + + Choose Base Directory + + + + + Choose Icon + + + + + Icons (*.png *.xpm *.jpg) + + + + + Directory Menu + + + + + An error occurred while loading the icon. + + + + diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_ar.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_ar.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_ar.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_ar.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open افتح + + + Open in terminal + افتح في الطرفية + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ الأيقونة: - + + Terminal + الطرفية + + + + + Choose Default Terminal + اختر الطرفية المبدئية + + + Choose Base Directory اختر الدليل الأساس - + Choose Icon اختر أيقونة - + Icons (*.png *.xpm *.jpg) الصور (‎*.png *.xpm *.jpg) - + Directory Menu قائمة الأدلة - + An error occurred while loading the icon. حدث خطأ أثناء تحميل الأيقونة. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_ast.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_ast.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_ast.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_ast.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,81 @@ + + + + + DirectoryMenu + + + Open + Abrir + + + + Open in terminal + + + + + DirectoryMenuConfiguration + + + Directory Menu Settings + Axustes del menú de direutorios + + + + Appearance + Aspeutu + + + + Base directory: + Direutoriu base: + + + + BaseDirectoryName + BaseDirectoryName + + + + Icon: + Iconu: + + + + Terminal + + + + + + Choose Default Terminal + + + + + Choose Base Directory + Escoyeta d'un direutoriu base + + + + Choose Icon + Escoyeta d'un iconu + + + + Icons (*.png *.xpm *.jpg) + Iconos (*.png *.xpm *.jpg) + + + + Directory Menu + Menú de direutorios + + + + An error occurred while loading the icon. + Asocedió un fallu mentanto se cargaba l'iconu. + + + diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_ca.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_ca.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_ca.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_ca.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open Obre + + + Open in terminal + + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ Icona: - + + Terminal + + + + + + Choose Default Terminal + + + + Choose Base Directory Trieu el directori base - + Choose Icon Trieu la icona - + Icons (*.png *.xpm *.jpg) Icones (*.png *.xpm *.jpg) - + Directory Menu Menú de directoris - + An error occurred while loading the icon. S'ha produït un error mentre es carregava la icona. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_cs.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_cs.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_cs.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_cs.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open Otevřít + + + Open in terminal + Otevřít v terminálu + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ Ikona: - + + Terminal + Terminál + + + + + Choose Default Terminal + Zvolte výchozí terminál + + + Choose Base Directory Vybrat základní složku - + Choose Icon Zvolit ikonu - + Icons (*.png *.xpm *.jpg) Ikony (*.png *.xpm *.jpg) - + Directory Menu Nabídka složky - + An error occurred while loading the icon. Při nahrávání ikony se vyskytla chyba. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_cy.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_cy.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_cy.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_cy.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open + + + Open in terminal + + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ - + + Terminal + + + + + + Choose Default Terminal + + + + Choose Base Directory - + Choose Icon - + Icons (*.png *.xpm *.jpg) - + Directory Menu - + An error occurred while loading the icon. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_da.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_da.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_da.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_da.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open Åbn + + + Open in terminal + Åbn i terminal + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ Ikon: - + + Terminal + Terminal + + + + + Choose Default Terminal + Vælg standardterminal + + + Choose Base Directory Vælg grundmappe - + Choose Icon Vælg ikon - + Icons (*.png *.xpm *.jpg) Ikoner (*.png *.xpm *.jpg) - + Directory Menu Mappemenu - + An error occurred while loading the icon. Der opstod en fejl under indlæsning af ikonet. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_de.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_de.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_de.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_de.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open Öffnen + + + Open in terminal + In Terminal öffnen + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ Symbol: - + + Terminal + Terminal + + + + + Choose Default Terminal + Wählen Sie das Standardterminal + + + Choose Base Directory Basisverzeichnis auswählen - + Choose Icon Symbol auswählen - + Icons (*.png *.xpm *.jpg) Symbole (*.png *.xpm *.jpg) - + Directory Menu Verzeichnismenü - + An error occurred while loading the icon. Beim Laden des Symbols trat ein Fehler auf. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_el.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_el.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_el.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_el.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open Άνοιγμα + + + Open in terminal + Άνοιγμα στο τερματικό + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ Εικονίδιο: - + + Terminal + Τερματικό + + + + + Choose Default Terminal + Επιλογή προκαθορισμένου τερματικού + + + Choose Base Directory Επιλέξτε τον βασικό κατάλογο - + Choose Icon Επιλέξτε το εικονίδιο - + Icons (*.png *.xpm *.jpg) Εικονίδια (*.png *.xpm *.jpg) - + Directory Menu Μενού καταλόγου - + An error occurred while loading the icon. Παρουσιάστηκε ένα σφάλμα κατά την φόρτωση του εικονιδίου. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_es.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_es.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_es.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_es.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open Abrir + + + Open in terminal + Abrir en la terminal + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ Icono: - + + Terminal + Terminal + + + + + Choose Default Terminal + Elegir la terminal por defecto + + + Choose Base Directory Elija el directorio base - + Choose Icon Elija el icono - + Icons (*.png *.xpm *.jpg) Iconos (*.png *.xpm *.jpg) - + Directory Menu Menú de directorio - + An error occurred while loading the icon. Ha ocurrido un error al intentar cargar el icono. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_fr.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_fr.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_fr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_fr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open Ouvrir + + + Open in terminal + Ouvrir dans le terminal + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ Icône : - + + Terminal + Qterminal + + + + + Choose Default Terminal + Choisir le terminal par défaut + + + Choose Base Directory Choisir le répertoire de base - + Choose Icon Choisir l'icône - + Icons (*.png *.xpm *.jpg) Icônes (*.png *.xpm *.jpg) - + Directory Menu Menu des répertoires - + An error occurred while loading the icon. Une erreur s'est produite lors du chargement de l'icône. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_gl.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_gl.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_gl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_gl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open Abrir + + + Open in terminal + Abrir nun terminal + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ Icona: - + + Terminal + Terminal + + + + + Choose Default Terminal + Escolla o terminal predeterminado + + + Choose Base Directory Escolla o directorio base - + Choose Icon Escolla a icona - + Icons (*.png *.xpm *.jpg) Iconas (*.png *.xpm *.jpg) - + Directory Menu Menú de directorios - + An error occurred while loading the icon. Produciuse un erro ao cargar a icona. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_he.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_he.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_he.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_he.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open פתיחה + + + Open in terminal + פתיחה במסוף + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ סמל: - + + Terminal + מסוף + + + + + Choose Default Terminal + בחירת מסוף בררת המחדל + + + Choose Base Directory בחירת תיקיית בסיס - + Choose Icon בחירת סמל - + Icons (*.png *.xpm *.jpg) סמלים ‎(*.png *.xpm *.jpg) - + Directory Menu תפריט תיקיות - + An error occurred while loading the icon. אירעה שגיאה בעת טעינת הסמל. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_hr.desktop lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_hr.desktop --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=Izbornik mape +Comment[hr]=Prikazuje sadržaj mape u izborniku diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_hr.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_hr.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_hr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_hr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,9 +4,14 @@ DirectoryMenu - + Open - Otvori + Otvori + + + + Open in terminal + Otvori u terminalu @@ -14,52 +19,63 @@ Directory Menu Settings - Postavke izbornika direktorija + Izbornik mape – Postavke Appearance - Izgled + Izgled Base directory: - Osnovni direktorij: + Osnovna mapa: BaseDirectoryName - Ime osnovnog direktorija + Ime osnovne mape Icon: - Ikona: + Ikona: + + + + Terminal + Terminal + + + + + Choose Default Terminal + Odaberi standardni terminal - + Choose Base Directory - Izaberite osnovni direktorij + Odaberi osnovnu mapu - + Choose Icon - Izaberite ikonu + Odaberi ikonu - + Icons (*.png *.xpm *.jpg) - Ikone (*.png *.xpm *.jpg) + Ikone (*.png *.xpm *.jpg) - + Directory Menu - Izbornik direktorija + Izbornik mape - + An error occurred while loading the icon. - Došlo je do greške pri učitavanju ikone. + Došlo je do greške pri učitavanju ikone. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_hu.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_hu.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_hu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_hu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,9 +4,14 @@ DirectoryMenu - + Open - Nyit + Megnyitás + + + + Open in terminal + Megnyitás terminálban @@ -19,7 +24,7 @@ Appearance - Kinézet + Megjelenés @@ -37,29 +42,40 @@ Ikon: - + + Terminal + Terminál + + + + + Choose Default Terminal + Alapértelmezett terminál kiválasztása + + + Choose Base Directory - Aapkönyvtár kijelölés + Alapkönyvtár kiválasztása - + Choose Icon - Ikon kijelölés + Ikon kiválasztása - + Icons (*.png *.xpm *.jpg) Ikonok (*.png *.xpm *.jpg) - + Directory Menu Könyvtármenü - + An error occurred while loading the icon. - Az ikon betöltése sikertelen. + Hiba történt az ikon betöltése közben. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_id.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_id.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_id.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_id.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open Buka + + + Open in terminal + + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ Ikon: - + + Terminal + + + + + + Choose Default Terminal + + + + Choose Base Directory Pilih Direktori Dasar - + Choose Icon Pilih Ikon - + Icons (*.png *.xpm *.jpg) Ikon (*.png *.xpm *.jpg) - + Directory Menu Menu Direktori - + An error occurred while loading the icon. Terjadi kesalahan saat memuat ikon. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_it.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_it.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_it.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_it.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open Apri + + + Open in terminal + Apri nel terminale + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ Icona: - + + Terminal + Terminale + + + + + Choose Default Terminal + Seleziona terminale predefinito + + + Choose Base Directory Seleziona cartella mostrata - + Choose Icon Scegli icona - + Icons (*.png *.xpm *.jpg) Icone (*.png .xpm *.jpg) - + Directory Menu Menu cartella - + An error occurred while loading the icon. Errore durante il caricamento dell'icona. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_ja.desktop lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_ja.desktop --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_ja.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_ja.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[ja]=ディレクトリメニュー +Comment[ja]=指定したディレクトリからツリー表示します diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_ja.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_ja.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_ja.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_ja.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open 開く + + + Open in terminal + 端末で開く + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ アイコン: - + + Terminal + 端末 + + + + + Choose Default Terminal + 既定の端末を選択 + + + Choose Base Directory ベースディレクトリを選ぶ - + Choose Icon アイコンを選ぶ - + Icons (*.png *.xpm *.jpg) アイコン (*.png *.xpm *.jpg) - + Directory Menu ディレクトリメニュー - + An error occurred while loading the icon. アイコンのロード中にエラーが発生しました。 diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_ko.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_ko.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_ko.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_ko.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,81 @@ + + + + + DirectoryMenu + + + Open + + + + + Open in terminal + + + + + DirectoryMenuConfiguration + + + Directory Menu Settings + + + + + Appearance + + + + + Base directory: + + + + + BaseDirectoryName + + + + + Icon: + + + + + Terminal + + + + + + Choose Default Terminal + + + + + Choose Base Directory + + + + + Choose Icon + + + + + Icons (*.png *.xpm *.jpg) + + + + + Directory Menu + + + + + An error occurred while loading the icon. + + + + diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_lt.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_lt.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_lt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_lt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open Atverti + + + Open in terminal + Atverti terminale + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ Piktograma: - + + Terminal + Terminalas + + + + + Choose Default Terminal + Pasirinkti numatytąjį terminalą + + + Choose Base Directory Pasirinkite bazinį katalogą - + Choose Icon Pasirinkite piktogramą - + Icons (*.png *.xpm *.jpg) Piktogramos (*.png *.xpm *.jpg) - + Directory Menu Katalogų meniu - + An error occurred while loading the icon. Įkeliant piktogramą, įvyko klaida. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_nb_NO.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_nb_NO.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_nb_NO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_nb_NO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open Åpne + + + Open in terminal + Åpne i terminal + DirectoryMenuConfiguration @@ -24,12 +29,12 @@ Base directory: - Mappe å vise: + Basismappe: BaseDirectoryName - Navn på mappe å vise + Basismappenavn @@ -37,27 +42,38 @@ Symbol: - + + Terminal + Terminal + + + + + Choose Default Terminal + Velg standard terminal + + + Choose Base Directory - Velg mappe å vise + Velg basismappe - + Choose Icon Velg symbol - + Icons (*.png *.xpm *.jpg) Symboler (*.png *.xpm *.jpg) - + Directory Menu Mappemeny - + An error occurred while loading the icon. En feil oppstod da symbolet ble lastet inn. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_nl.desktop lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_nl.desktop --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_nl.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_nl.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[nl]=Mapmenu +Comment[nl]=Toont de inhoud van een map in een menu diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_nl.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_nl.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_nl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_nl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,22 @@ DirectoryMenu - + Open Openen + + + Open in terminal + In terminal openen + DirectoryMenuConfiguration Directory Menu Settings - Instellingen voor mapmenu + Instellingen voor Mapmenu @@ -37,27 +42,38 @@ Pictogram: - + + Terminal + Terminal + + + + + Choose Default Terminal + Kies standaardterminal + + + Choose Base Directory Kies basismap - + Choose Icon Kies pictogram - + Icons (*.png *.xpm *.jpg) Pictogrammen (*.png *.xpm *.jpg) - + Directory Menu Mapmenu - + An error occurred while loading the icon. Er is een fout opgetreden bij het laden van het pictogram. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_pl.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_pl.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_pl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_pl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open Otwarty + + + Open in terminal + Otwórz w terminalu + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ Ikona: - + + Terminal + Terminal + + + + + Choose Default Terminal + Wybierz domyślny terminal + + + Choose Base Directory Wybierz katalog bazowy - + Choose Icon Wybierz ikonę - + Icons (*.png *.xpm *.jpg) Pliki ikon (*.png *.pm *.jpg) - + Directory Menu Menu katalogu - + An error occurred while loading the icon. Wystąpił błąd podczas ładowania ikony. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_pt.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_pt.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_pt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_pt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open Abrir + + + Open in terminal + Abrir no terminal + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ Ícone: - + + Terminal + Terminal + + + + + Choose Default Terminal + Escolher terminal padrão + + + Choose Base Directory Escolha o diretório base - + Choose Icon Escolha o ícone - + Icons (*.png *.xpm *.jpg) Ícones (*.png *.xpm *.jpg) - + Directory Menu Menu de diretórios - + An error occurred while loading the icon. Ocorreu um erro ao carregar o ícone. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_ru.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_ru.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_ru.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_ru.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open Открыть + + + Open in terminal + Открыть в терминале + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ Значок: - + + Terminal + Терминал + + + + + Choose Default Terminal + Выберите терминал по умолчанию + + + Choose Base Directory Выберите начальный каталог - + Choose Icon Выберите значок - + Icons (*.png *.xpm *.jpg) Значки (*.png *.xpm *.jpg) - + Directory Menu Меню каталога - + An error occurred while loading the icon. Произошла ошибка при загрузке значка. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_sk_SK.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_sk_SK.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_sk_SK.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_sk_SK.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,81 @@ + + + + + DirectoryMenu + + + Open + Otvoriť + + + + Open in terminal + Otvoriť v terminále + + + + DirectoryMenuConfiguration + + + Directory Menu Settings + Nastavenie ponuky + + + + Appearance + Vzhľad + + + + Base directory: + Základný adresár: + + + + BaseDirectoryName + Názov základného adresára + + + + Icon: + Ikona: + + + + Terminal + Terminál + + + + + Choose Default Terminal + Vybrať predvolený terminál + + + + Choose Base Directory + Vybrať základný adresár + + + + Choose Icon + Zvoliť ikonu + + + + Icons (*.png *.xpm *.jpg) + Ikony (*.png *.xpm *.jpg) + + + + Directory Menu + Ponuka adresára + + + + An error occurred while loading the icon. + Pri načítaní ikony nastala chyba. + + + diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_sv.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_sv.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_sv.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_sv.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,81 @@ + + + + + DirectoryMenu + + + Open + Öppna + + + + Open in terminal + + + + + DirectoryMenuConfiguration + + + Directory Menu Settings + Inställningar för mapp-meny + + + + Appearance + Utseende + + + + Base directory: + Basmapp: + + + + BaseDirectoryName + BaseDirectoryName + + + + Icon: + Ikon: + + + + Terminal + + + + + + Choose Default Terminal + + + + + Choose Base Directory + Välj basmapp + + + + Choose Icon + Välj ikon + + + + Icons (*.png *.xpm *.jpg) + Ikoner (*.png *.xpm *.jpg) + + + + Directory Menu + Mapp-meny + + + + An error occurred while loading the icon. + Ett fel inträffade när ikonen laddades. + + + diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_tr.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_tr.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_tr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_tr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open Aç + + + Open in terminal + Terminal'de aç + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ Simge: - + + Terminal + Terminal + + + + + Choose Default Terminal + Varsayılan Terminal'i Seç + + + Choose Base Directory Temel Dizini Seç - + Choose Icon Simge Seç - + Icons (*.png *.xpm *.jpg) Simgeler (*.png *.xmp *.jpg) - + Directory Menu Dizin Menüsü - + An error occurred while loading the icon. Simge yüklenirken hata oluştu. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open + + + Open in terminal + + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ - + + Terminal + + + + + + Choose Default Terminal + + + + Choose Base Directory - + Choose Icon - + Icons (*.png *.xpm *.jpg) - + Directory Menu - + An error occurred while loading the icon. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_uk.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_uk.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_uk.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_uk.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open Відкрити + + + Open in terminal + + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ Значок: - + + Terminal + + + + + + Choose Default Terminal + + + + Choose Base Directory Вибрати базову теку - + Choose Icon Вибрати значок - + Icons (*.png *.xpm *.jpg) Значки (*.png *.xpm *.jpg) - + Directory Menu Меню теки - + An error occurred while loading the icon. Сталася помилка завантаження значка. diff -Nru lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_zh_CN.ts lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_zh_CN.ts --- lxqt-panel-0.14.1/plugin-directorymenu/translations/directorymenu_zh_CN.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-directorymenu/translations/directorymenu_zh_CN.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,10 +4,15 @@ DirectoryMenu - + Open 打开 + + + Open in terminal + + DirectoryMenuConfiguration @@ -37,27 +42,38 @@ 图标: - + + Terminal + + + + + + Choose Default Terminal + + + + Choose Base Directory 选择起始目录 - + Choose Icon 选择图标 - + Icons (*.png *.xpm *.jpg) 图标 (*.png *.xpm *.jpg) - + Directory Menu 目录菜单 - + An error occurred while loading the icon. 加载图标时出现错误。 diff -Nru lxqt-panel-0.14.1/plugin-dom/domplugin.cpp lxqt-panel-0.16.1/plugin-dom/domplugin.cpp --- lxqt-panel-0.14.1/plugin-dom/domplugin.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-dom/domplugin.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -37,7 +37,7 @@ { mButton.setAutoRaise(true); mButton.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - mButton.setIcon(XdgIcon::fromTheme("preferences-plugin")); + mButton.setIcon(XdgIcon::fromTheme(QStringLiteral("preferences-plugin"))); connect(&mButton, SIGNAL(clicked()), this, SLOT(showDialog())); } diff -Nru lxqt-panel-0.14.1/plugin-dom/domplugin.h lxqt-panel-0.16.1/plugin-dom/domplugin.h --- lxqt-panel-0.14.1/plugin-dom/domplugin.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-dom/domplugin.h 2020-11-05 16:09:19.000000000 +0000 @@ -40,7 +40,7 @@ DomPlugin(const ILXQtPanelPluginStartupInfo &startupInfo); virtual QWidget *widget() { return &mButton; } - virtual QString themeId() const { return "Dom"; } + virtual QString themeId() const { return QStringLiteral("Dom"); } virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment; } private slots: diff -Nru lxqt-panel-0.14.1/plugin-dom/domtreeitem.cpp lxqt-panel-0.16.1/plugin-dom/domtreeitem.cpp --- lxqt-panel-0.14.1/plugin-dom/domtreeitem.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-dom/domtreeitem.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -57,7 +57,7 @@ QStringList hierarcy = widgetClassHierarcy(); for (int i=0; iobjectName(); - setText(0, QString("%1 (%2)%3").arg( + setText(0, QStringLiteral("%1 (%2)%3").arg( name , widgetClassName(), text)); - setText(1, hierarcy.join(" :: ")); + setText(1, hierarcy.join(QStringLiteral(" :: "))); fill(); } @@ -128,13 +128,13 @@ if (toolButton) return toolButton->text(); - return ""; + return QLatin1String(""); } QString DomTreeItem::widgetClassName() const { - return mWidget->metaObject()->className(); + return QString::fromUtf8(mWidget->metaObject()->className()); } @@ -144,7 +144,7 @@ const QMetaObject *m = mWidget->metaObject(); while (m) { - hierarcy << m->className(); + hierarcy << QString::fromUtf8(m->className()); m = m->superClass(); } return hierarcy; diff -Nru lxqt-panel-0.14.1/plugin-dom/translations/dom_arn.ts lxqt-panel-0.16.1/plugin-dom/translations/dom_arn.ts --- lxqt-panel-0.14.1/plugin-dom/translations/dom_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-dom/translations/dom_arn.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,38 @@ + + + + + TreeWindow + + + Panel DOM tree + + + + + + Property + + + + + Value + + + + + All properties + + + + + Type + + + + + String value + + + + diff -Nru lxqt-panel-0.14.1/plugin-dom/translations/dom_ast.ts lxqt-panel-0.16.1/plugin-dom/translations/dom_ast.ts --- lxqt-panel-0.14.1/plugin-dom/translations/dom_ast.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-dom/translations/dom_ast.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,38 @@ + + + + + TreeWindow + + + Panel DOM tree + + + + + + Property + + + + + Value + + + + + All properties + + + + + Type + + + + + String value + + + + diff -Nru lxqt-panel-0.14.1/plugin-dom/translations/dom_hr.desktop lxqt-panel-0.16.1/plugin-dom/translations/dom_hr.desktop --- lxqt-panel-0.14.1/plugin-dom/translations/dom_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-dom/translations/dom_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=DOM stablo ploče +Comment[hr]=Prikazuje DOM stablo LXQt ploče. diff -Nru lxqt-panel-0.14.1/plugin-dom/translations/dom_hr.ts lxqt-panel-0.16.1/plugin-dom/translations/dom_hr.ts --- lxqt-panel-0.14.1/plugin-dom/translations/dom_hr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-dom/translations/dom_hr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,33 +6,33 @@ Panel DOM tree - + DOM stablo ploče Property - Svojstvo + Svojstvo Value - Vrijednost + Vrijednost All properties - Sva svojstva + Sva svojstva Type - Vrsta + Vrsta String value - + Vrijednost niza diff -Nru lxqt-panel-0.14.1/plugin-dom/translations/dom_hu.ts lxqt-panel-0.16.1/plugin-dom/translations/dom_hu.ts --- lxqt-panel-0.14.1/plugin-dom/translations/dom_hu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-dom/translations/dom_hu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ Panel DOM tree - DOM panel fa + Panel DOM fa diff -Nru lxqt-panel-0.14.1/plugin-dom/translations/dom_ja.desktop lxqt-panel-0.16.1/plugin-dom/translations/dom_ja.desktop --- lxqt-panel-0.14.1/plugin-dom/translations/dom_ja.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-dom/translations/dom_ja.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,5 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name[ja]=パネルのDOMツリー -Comment[ja]=LXQtパネルのDOMツリーを表示する +Name[ja]=パネルの DOM ツリー +Comment[ja]=LXQt パネルの DOM ツリーを表示します diff -Nru lxqt-panel-0.14.1/plugin-dom/translations/dom_ja.ts lxqt-panel-0.16.1/plugin-dom/translations/dom_ja.ts --- lxqt-panel-0.14.1/plugin-dom/translations/dom_ja.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-dom/translations/dom_ja.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,13 +6,13 @@ Panel DOM tree - パネルのDOMツリー + パネルの DOM ツリー Property - プロパティー + プロパティ diff -Nru lxqt-panel-0.14.1/plugin-dom/translations/dom_nl.desktop lxqt-panel-0.16.1/plugin-dom/translations/dom_nl.desktop --- lxqt-panel-0.14.1/plugin-dom/translations/dom_nl.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-dom/translations/dom_nl.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[nl]=DOM-boom werkbalk +Comment[nl]=Toont de DOM-boomstructuur voor de LXQt-werkbalk. diff -Nru lxqt-panel-0.14.1/plugin-dom/translations/dom_pt_BR.ts lxqt-panel-0.16.1/plugin-dom/translations/dom_pt_BR.ts --- lxqt-panel-0.14.1/plugin-dom/translations/dom_pt_BR.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-dom/translations/dom_pt_BR.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,38 @@ + + + + + TreeWindow + + + Panel DOM tree + Árvore do Painel DOM + + + + + Property + Propriedade + + + + Value + Valor + + + + All properties + Todas propriedades + + + + Type + Tipo + + + + String value + Valor da cadeia de caracteres + + + diff -Nru lxqt-panel-0.14.1/plugin-dom/translations/dom_sk_SK.ts lxqt-panel-0.16.1/plugin-dom/translations/dom_sk_SK.ts --- lxqt-panel-0.14.1/plugin-dom/translations/dom_sk_SK.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-dom/translations/dom_sk_SK.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,38 @@ + + + + + TreeWindow + + + Panel DOM tree + DOM strom panelu + + + + + Property + Vlastníctvo + + + + Value + Hodnota + + + + All properties + Všetky vlastnosti + + + + Type + Typ + + + + String value + Hodnota reťazca + + + diff -Nru lxqt-panel-0.14.1/plugin-dom/translations/dom_sv.ts lxqt-panel-0.16.1/plugin-dom/translations/dom_sv.ts --- lxqt-panel-0.14.1/plugin-dom/translations/dom_sv.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-dom/translations/dom_sv.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,38 @@ + + + + + TreeWindow + + + Panel DOM tree + Panel för DOM-träd + + + + + Property + Egenskap + + + + Value + Värde + + + + All properties + Alla egenskaper + + + + Type + Typ + + + + String value + Textvärde + + + diff -Nru lxqt-panel-0.14.1/plugin-dom/treewindow.cpp lxqt-panel-0.16.1/plugin-dom/treewindow.cpp --- lxqt-panel-0.14.1/plugin-dom/treewindow.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-dom/treewindow.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -49,11 +49,11 @@ ui->setupUi(this); - ui->tree->setStyleSheet( + ui->tree->setStyleSheet(QStringLiteral( "QTreeView::item { " "padding: 2px;" "}" - ); + )); initPropertiesView(); @@ -90,19 +90,19 @@ ui->propertiesView->setColumnCount(2); QTableWidgetItem *item; - item = new QTableWidgetItem("Object name"); + item = new QTableWidgetItem(QStringLiteral("Object name")); ui->propertiesView->setItem(PROP_OBJECT_NAME, 0, item); ui->propertiesView->setItem(PROP_OBJECT_NAME, 1, new QTableWidgetItem()); - item = new QTableWidgetItem("Class name"); + item = new QTableWidgetItem(QStringLiteral("Class name")); ui->propertiesView->setItem(PROP_CLASS_NAME, 0, item); ui->propertiesView->setItem(PROP_CLASS_NAME, 1, new QTableWidgetItem()); - item = new QTableWidgetItem("Text"); + item = new QTableWidgetItem(QStringLiteral("Text")); ui->propertiesView->setItem(PROP_TEXT, 0, item); ui->propertiesView->setItem(PROP_TEXT, 1, new QTableWidgetItem()); - item = new QTableWidgetItem("Class hierarcy"); + item = new QTableWidgetItem(QStringLiteral("Class hierarcy")); ui->propertiesView->setItem(PROP_CLASS_HIERARCY, 0, item); ui->propertiesView->setItem(PROP_CLASS_HIERARCY, 1, new QTableWidgetItem()); @@ -130,7 +130,7 @@ ui->propertiesView->item(PROP_OBJECT_NAME, 1)->setText(treeItem->widgetObjectName()); ui->propertiesView->item(PROP_CLASS_NAME, 1)->setText(treeItem->widgetClassName()); ui->propertiesView->item(PROP_TEXT, 1)->setText(treeItem->widgetText()); - ui->propertiesView->item(PROP_CLASS_HIERARCY, 1)->setText(treeItem->widgetClassHierarcy().join(" :: ")); + ui->propertiesView->item(PROP_CLASS_HIERARCY, 1)->setText(treeItem->widgetClassHierarcy().join(QStringLiteral(" :: "))); QString s; QDebug out(&s); @@ -146,8 +146,8 @@ ui->allPropertiesView->setItem(i, 2, new QTableWidgetItem); } QMetaProperty const & prop = m->property(i); - ui->allPropertiesView->item(i, 0)->setText(prop.name()); - ui->allPropertiesView->item(i, 1)->setText(prop.typeName()); + ui->allPropertiesView->item(i, 0)->setText(QString::fromUtf8(prop.name())); + ui->allPropertiesView->item(i, 1)->setText(QString::fromUtf8(prop.typeName())); s.clear(); out << prop.read(treeItem->widget()); ui->allPropertiesView->item(i, 2)->setText(s); @@ -160,7 +160,7 @@ void TreeWindow::clearPropertiesView() { for (int i=0; ipropertiesView->rowCount(); ++i) - ui->propertiesView->item(i, 1)->setText(""); + ui->propertiesView->item(i, 1)->setText(QLatin1String("")); for (int i = ui->allPropertiesView->rowCount(); 0 <= i; --i) ui->allPropertiesView->removeRow(i); ui->allPropertiesView->setRowCount(0); diff -Nru lxqt-panel-0.14.1/plugin-dom/treewindow.h lxqt-panel-0.16.1/plugin-dom/treewindow.h --- lxqt-panel-0.14.1/plugin-dom/treewindow.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-dom/treewindow.h 2020-11-05 16:09:19.000000000 +0000 @@ -46,7 +46,7 @@ Q_OBJECT public: - explicit TreeWindow(QWidget *parent = 0); + explicit TreeWindow(QWidget *parent = nullptr); ~TreeWindow(); private slots: diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/src/content.cpp lxqt-panel-0.16.1/plugin-kbindicator/src/content.cpp --- lxqt-panel-0.14.1/plugin-kbindicator/src/content.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/src/content.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -28,6 +28,9 @@ #include #include #include +#include +#include +#include #include "kbdstate.h" #include "content.h" @@ -41,32 +44,31 @@ setLayout(box); m_capsLock = new QLabel(tr("C", "Label for CapsLock indicator")); - m_capsLock->setObjectName("CapsLockLabel"); + m_capsLock->setObjectName(QStringLiteral("CapsLockLabel")); m_capsLock->setAlignment(Qt::AlignCenter); m_capsLock->setToolTip(tr("CapsLock", "Tooltip for CapsLock indicator")); m_capsLock->installEventFilter(this); layout()->addWidget(m_capsLock); m_numLock = new QLabel(tr("N", "Label for NumLock indicator")); - m_numLock->setObjectName("NumLockLabel"); + m_numLock->setObjectName(QStringLiteral("NumLockLabel")); m_numLock->setToolTip(tr("NumLock", "Tooltip for NumLock indicator")); m_numLock->setAlignment(Qt::AlignCenter); m_numLock->installEventFilter(this); layout()->addWidget(m_numLock); m_scrollLock = new QLabel(tr("S", "Label for ScrollLock indicator")); - m_scrollLock->setObjectName("ScrollLockLabel"); + m_scrollLock->setObjectName(QStringLiteral("ScrollLockLabel")); m_scrollLock->setToolTip(tr("ScrollLock", "Tooltip for ScrollLock indicator")); m_scrollLock->setAlignment(Qt::AlignCenter); m_scrollLock->installEventFilter(this); layout()->addWidget(m_scrollLock); - m_layout = new QLabel; - m_layout->setObjectName("LayoutLabel"); - m_layout->setAlignment(Qt::AlignCenter); - m_layout->installEventFilter(this); - layout()->addWidget(m_layout); - m_layout->setEnabled(false); + m_layout = new QToolButton; + m_layout->setObjectName(QStringLiteral("LayoutLabel")); + m_layout->setAutoRaise(true); + connect(m_layout, &QAbstractButton::released, this, [this] { emit controlClicked(Controls::Layout); }); + box->addWidget(m_layout, 0, Qt::AlignCenter); } Content::~Content() @@ -78,13 +80,26 @@ m_numLock->setVisible(Settings::instance().showNumLock()); m_scrollLock->setVisible(Settings::instance().showScrollLock()); m_layout->setVisible(m_layoutEnabled && Settings::instance().showLayout()); + m_layoutFlagPattern = Settings::instance().layoutFlagPattern(); return true; } void Content::layoutChanged(const QString & sym, const QString & name, const QString & variant) { m_layout->setText(sym.toUpper()); - QString txt = QString("\ + QString flag_file; + if (m_layoutFlagPattern.contains(QStringLiteral("%1"))) + flag_file = m_layoutFlagPattern.arg(sym); + if (flag_file.isEmpty() || !QFileInfo::exists(flag_file)) + { + m_layout->setToolButtonStyle(Qt::ToolButtonTextOnly); + m_layout->setIcon({}); + } else + { + m_layout->setIcon(QIcon{flag_file}); + m_layout->setToolButtonStyle(m_layout->icon().pixmap(m_layout->iconSize()).isNull() ? Qt::ToolButtonTextOnly : Qt::ToolButtonIconOnly); + } + QString txt = QStringLiteral("
\ \ \
%1: %3
%2: %4
").arg(tr("Layout")).arg(tr("Variant")).arg(name).arg(variant); @@ -123,13 +138,9 @@ emit controlClicked(Controls::Num); else if (object == m_scrollLock) emit controlClicked(Controls::Scroll); - else if(object == m_layout){ - emit controlClicked(Controls::Layout); - } - return true; } - return QObject::eventFilter(object, event); + return QWidget::eventFilter(object, event); } void Content::showHorizontal() diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/src/content.h lxqt-panel-0.16.1/plugin-kbindicator/src/content.h --- lxqt-panel-0.14.1/plugin-kbindicator/src/content.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/src/content.h 2020-11-05 16:09:19.000000000 +0000 @@ -31,6 +31,7 @@ #include "controls.h" class QLabel; +class QToolButton; class Content : public QWidget { @@ -55,10 +56,11 @@ void controlClicked(Controls cnt); private: bool m_layoutEnabled; + QString m_layoutFlagPattern; QLabel *m_capsLock; QLabel *m_numLock; QLabel *m_scrollLock; - QLabel *m_layout; + QToolButton *m_layout; }; #endif diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/src/kbdkeeper.cpp lxqt-panel-0.16.1/plugin-kbindicator/src/kbdkeeper.cpp --- lxqt-panel-0.14.1/plugin-kbindicator/src/kbdkeeper.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/src/kbdkeeper.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -142,8 +142,8 @@ void AppKbdKeeper::layoutChanged(uint group) { - KWindowInfo info = KWindowInfo(KWindowSystem::activeWindow(), 0, NET::WM2WindowClass); - QString app = info.windowClassName(); + KWindowInfo info = KWindowInfo(KWindowSystem::activeWindow(), NET::Properties(), NET::WM2WindowClass); + QString app = QString::fromUtf8(info.windowClassName()); if (m_active == app){ m_mapping[app] = group; @@ -161,8 +161,8 @@ void AppKbdKeeper::checkState() { - KWindowInfo info = KWindowInfo(KWindowSystem::activeWindow(), 0, NET::WM2WindowClass); - QString app = info.windowClassName(); + KWindowInfo info = KWindowInfo(KWindowSystem::activeWindow(), NET::Properties(), NET::WM2WindowClass); + QString app = QString::fromUtf8(info.windowClassName()); if (!m_mapping.contains(app)) m_mapping.insert(app, 0); @@ -176,8 +176,8 @@ void AppKbdKeeper::switchToGroup(uint group) { - KWindowInfo info = KWindowInfo(KWindowSystem::activeWindow(), 0, NET::WM2WindowClass); - QString app = info.windowClassName(); + KWindowInfo info = KWindowInfo(KWindowSystem::activeWindow(), NET::Properties(), NET::WM2WindowClass); + QString app = QString::fromUtf8(info.windowClassName()); m_mapping[app] = group; m_layout.lockGroup(group); diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/src/kbdstateconfig.cpp lxqt-panel-0.16.1/plugin-kbindicator/src/kbdstateconfig.cpp --- lxqt-panel-0.14.1/plugin-kbindicator/src/kbdstateconfig.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/src/kbdstateconfig.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -44,6 +44,7 @@ connect(m_ui->showNum, &QCheckBox::clicked, this, &KbdStateConfig::save); connect(m_ui->showScroll, &QCheckBox::clicked, this, &KbdStateConfig::save); connect(m_ui->showLayout, &QGroupBox::clicked, this, &KbdStateConfig::save); + connect(m_ui->layoutFlagPattern, &QLineEdit::textEdited, this, &KbdStateConfig::save); connect(m_ui->modes, static_cast(&QButtonGroup::buttonClicked), [this](int){ @@ -76,6 +77,7 @@ m_ui->showNum->setChecked(sets.showNumLock()); m_ui->showScroll->setChecked(sets.showScrollLock()); m_ui->showLayout->setChecked(sets.showLayout()); + m_ui->layoutFlagPattern->setText(sets.layoutFlagPattern()); switch(sets.keeperType()){ case KeeperType::Global: @@ -98,6 +100,7 @@ sets.setShowNumLock(m_ui->showNum->isChecked()); sets.setShowScrollLock(m_ui->showScroll->isChecked()); sets.setShowLayout(m_ui->showLayout->isChecked()); + sets.setLayoutFlagPattern(m_ui->layoutFlagPattern->text()); if (m_ui->switchGlobal->isChecked()) sets.setKeeperType(KeeperType::Global); diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/src/kbdstateconfig.h lxqt-panel-0.16.1/plugin-kbindicator/src/kbdstateconfig.h --- lxqt-panel-0.14.1/plugin-kbindicator/src/kbdstateconfig.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/src/kbdstateconfig.h 2020-11-05 16:09:19.000000000 +0000 @@ -38,7 +38,7 @@ Q_OBJECT public: - explicit KbdStateConfig(QWidget *parent = 0); + explicit KbdStateConfig(QWidget *parent = nullptr); ~KbdStateConfig(); private: void save(); diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/src/kbdstateconfig.ui lxqt-panel-0.16.1/plugin-kbindicator/src/kbdstateconfig.ui --- lxqt-panel-0.14.1/plugin-kbindicator/src/kbdstateconfig.ui 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/src/kbdstateconfig.ui 2020-11-05 16:09:19.000000000 +0000 @@ -6,8 +6,8 @@ 0 0 - 249 - 354 + 384 + 408 @@ -55,15 +55,15 @@ false - - + + Switching policy - + Global @@ -73,7 +73,7 @@ - + Window @@ -83,7 +83,7 @@ - + Application @@ -93,6 +93,20 @@ + + + + Flags path pattern: + + + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + + + diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/src/kbdstate.h lxqt-panel-0.16.1/plugin-kbindicator/src/kbdstate.h --- lxqt-panel-0.14.1/plugin-kbindicator/src/kbdstate.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/src/kbdstate.h 2020-11-05 16:09:19.000000000 +0000 @@ -42,7 +42,7 @@ virtual ~KbdState(); virtual QString themeId() const - { return "KbIndicator"; } + { return QStringLiteral("KbIndicator"); } virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/src/kbdwatcher.cpp lxqt-panel-0.16.1/plugin-kbindicator/src/kbdwatcher.cpp --- lxqt-panel-0.14.1/plugin-kbindicator/src/kbdwatcher.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/src/kbdwatcher.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -41,6 +41,8 @@ if (!m_keeper || m_keeper->type() != Settings::instance().keeperType()){ createKeeper(Settings::instance().keeperType()); + } else { + keeperChanged(); } } diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/src/settings.cpp lxqt-panel-0.16.1/plugin-kbindicator/src/settings.cpp --- lxqt-panel-0.14.1/plugin-kbindicator/src/settings.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/src/settings.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -42,37 +42,43 @@ } bool Settings::showCapLock() const -{ return m_settings->value("show_caps_lock", true).toBool(); } +{ return m_settings->value(QStringLiteral("show_caps_lock"), true).toBool(); } bool Settings::showNumLock() const -{ return m_settings->value("show_num_lock", true).toBool(); } +{ return m_settings->value(QStringLiteral("show_num_lock"), true).toBool(); } bool Settings::showScrollLock() const -{ return m_settings->value("show_scroll_lock", true).toBool(); } +{ return m_settings->value(QStringLiteral("show_scroll_lock"), true).toBool(); } bool Settings::showLayout() const -{ return m_settings->value("show_layout", true).toBool(); } +{ return m_settings->value(QStringLiteral("show_layout"), true).toBool(); } + +QString Settings::layoutFlagPattern() const +{ return m_settings->value(QStringLiteral("layout_flag_pattern")).toString(); } void Settings::setShowCapLock(bool show) -{ m_settings->setValue("show_caps_lock", show); } +{ m_settings->setValue(QStringLiteral("show_caps_lock"), show); } void Settings::setShowNumLock(bool show) -{ m_settings->setValue("show_num_lock", show); } +{ m_settings->setValue(QStringLiteral("show_num_lock"), show); } void Settings::setShowScrollLock(bool show) -{ m_settings->setValue("show_scroll_lock", show); } +{ m_settings->setValue(QStringLiteral("show_scroll_lock"), show); } void Settings::setShowLayout(bool show) -{ m_settings->setValue("show_layout", show); } +{ m_settings->setValue(QStringLiteral("show_layout"), show); } + +void Settings::setLayoutFlagPattern(const QString & layoutFlagPattern) +{ m_settings->setValue(QStringLiteral("layout_flag_pattern"), layoutFlagPattern); } KeeperType Settings::keeperType() const { - QString type = m_settings->value("keeper_type", "global").toString(); - if(type == "global") + QString type = m_settings->value(QStringLiteral("keeper_type"), QStringLiteral("global")).toString(); + if(type == QLatin1String("global")) return KeeperType::Global; - if(type == "window") + if(type == QLatin1String("window")) return KeeperType::Window; - if(type == "application") + if(type == QLatin1String("application")) return KeeperType::Application; return KeeperType::Application; } @@ -81,13 +87,13 @@ { switch (type) { case KeeperType::Global: - m_settings->setValue("keeper_type", "global"); + m_settings->setValue(QStringLiteral("keeper_type"), QStringLiteral("global")); break; case KeeperType::Window: - m_settings->setValue("keeper_type", "window"); + m_settings->setValue(QStringLiteral("keeper_type"), QStringLiteral("window")); break; case KeeperType::Application: - m_settings->setValue("keeper_type", "application"); + m_settings->setValue(QStringLiteral("keeper_type"), QStringLiteral("application")); break; } } diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/src/settings.h lxqt-panel-0.16.1/plugin-kbindicator/src/settings.h --- lxqt-panel-0.14.1/plugin-kbindicator/src/settings.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/src/settings.h 2020-11-05 16:09:19.000000000 +0000 @@ -50,6 +50,7 @@ bool showNumLock() const; bool showScrollLock() const; bool showLayout() const; + QString layoutFlagPattern() const; KeeperType keeperType() const; void restore(); @@ -58,6 +59,7 @@ void setShowNumLock(bool show); void setShowScrollLock(bool show); void setShowLayout(bool show); + void setLayoutFlagPattern(const QString & layoutFlagPattern); void setKeeperType(KeeperType type) const; private: diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/src/x11/kbdlayout.cpp lxqt-panel-0.16.1/plugin-kbindicator/src/x11/kbdlayout.cpp --- lxqt-panel-0.14.1/plugin-kbindicator/src/x11/kbdlayout.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/src/x11/kbdlayout.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -149,7 +149,7 @@ info.clear(); xkb_layout_index_t count = xkb_keymap_num_layouts(m_keymap); for(xkb_layout_index_t i = 0; i < count; ++i){ - QString name = xkb_keymap_layout_get_name(m_keymap, i); + QString name = QString::fromUtf8(xkb_keymap_layout_get_name(m_keymap, i)); const LangInfo & linfo = names(name); info.append({linfo.syn, linfo.name, linfo.variant}); if (xkb_state_layout_index_is_active(m_state, i, XKB_STATE_LAYOUT_EFFECTIVE)) @@ -242,35 +242,35 @@ const LangInfo & names(const QString & langName) const { - static LangInfo def{"Unknown", "??", "None"}; + static LangInfo def{QStringLiteral("Unknown"), QStringLiteral("??"), QStringLiteral("None")}; static QHash names; if (names.empty()){ - if(QFile::exists("/usr/share/X11/xkb/rules/evdev.xml")){ + if(QFile::exists(QStringLiteral("/usr/share/X11/xkb/rules/evdev.xml"))){ QDomDocument doc; - QFile file("/usr/share/X11/xkb/rules/evdev.xml"); + QFile file(QStringLiteral("/usr/share/X11/xkb/rules/evdev.xml")); if (file.open(QIODevice::ReadOnly)){ if (doc.setContent(&file)) { QDomElement docElem = doc.documentElement(); - auto layout= docElem.firstChildElement("layoutList"); + auto layout= docElem.firstChildElement(QStringLiteral("layoutList")); for(int i = 0; i < layout.childNodes().count(); ++i){ - auto conf = layout.childNodes().at(i).firstChildElement("configItem"); + auto conf = layout.childNodes().at(i).firstChildElement(QStringLiteral("configItem")); names.insert( - conf.firstChildElement("description").firstChild().toText().data(),{ - conf.firstChildElement("description").firstChild().toText().data(), - conf.firstChildElement("name").firstChild().toText().data(), - "None" + conf.firstChildElement(QStringLiteral("description")).firstChild().toText().data(),{ + conf.firstChildElement(QStringLiteral("description")).firstChild().toText().data(), + conf.firstChildElement(QStringLiteral("name")).firstChild().toText().data(), + QStringLiteral("None") } ); - auto variants = layout.childNodes().at(i).firstChildElement("variantList"); + auto variants = layout.childNodes().at(i).firstChildElement(QStringLiteral("variantList")); for(int j = 0; j < variants.childNodes().count(); ++j){ - auto var = variants.childNodes().at(j).firstChildElement("configItem"); + auto var = variants.childNodes().at(j).firstChildElement(QStringLiteral("configItem")); names.insert( - var.firstChildElement("description").firstChild().toText().data(), { - conf.firstChildElement("description").firstChild().toText().data(), - conf.firstChildElement("name").firstChild().toText().data(), - var.firstChildElement("name").firstChild().toText().data() + var.firstChildElement(QStringLiteral("description")).firstChild().toText().data(), { + conf.firstChildElement(QStringLiteral("description")).firstChild().toText().data(), + conf.firstChildElement(QStringLiteral("name")).firstChild().toText().data(), + var.firstChildElement(QStringLiteral("name")).firstChild().toText().data() } ); } diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_arn.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_arn.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_arn.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,121 @@ + + + + + Content + + + C + Label for CapsLock indicator + + + + + CapsLock + Tooltip for CapsLock indicator + + + + + N + Label for NumLock indicator + + + + + NumLock + Tooltip for NumLock indicator + + + + + S + Label for ScrollLock indicator + + + + + ScrollLock + Tooltip for ScrollLock indicator + + + + + Layout + + + + + Variant + + + + + KbdStateConfig + + + Keyboard state settings + + + + + Lock Indicators + + + + + Show Caps Lock + + + + + Show Num Lock + + + + + Show Scroll Lock + + + + + Keyboard Layout Indicator + + + + + Switching policy + + + + + Flags path pattern: + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + + + + + Configure layouts + + + + + Global + + + + + Window + + + + + Application + + + + diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_ar.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_ar.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_ar.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_ar.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator C - + CapsLock Tooltip for CapsLock indicator قافل الحالة - + N Label for NumLock indicator N - + NumLock Tooltip for NumLock indicator قافل الأرقام - + S Label for ScrollLock indicator S - + ScrollLock Tooltip for ScrollLock indicator قافل التمرير - + Layout التخطيط - + Variant التنويعة @@ -88,7 +88,17 @@ سياسة التبديل - + + Flags path pattern: + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + + + + Configure layouts اضبط التخطيطات diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_ast.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_ast.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_ast.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_ast.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,121 @@ + + + + + Content + + + C + Label for CapsLock indicator + + + + + CapsLock + Tooltip for CapsLock indicator + + + + + N + Label for NumLock indicator + + + + + NumLock + Tooltip for NumLock indicator + + + + + S + Label for ScrollLock indicator + + + + + ScrollLock + Tooltip for ScrollLock indicator + + + + + Layout + + + + + Variant + + + + + KbdStateConfig + + + Keyboard state settings + + + + + Lock Indicators + + + + + Show Caps Lock + + + + + Show Num Lock + + + + + Show Scroll Lock + + + + + Keyboard Layout Indicator + + + + + Switching policy + + + + + Flags path pattern: + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + + + + + Configure layouts + + + + + Global + + + + + Window + + + + + Application + + + + diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_ca.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_ca.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_ca.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_ca.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator M - + CapsLock Tooltip for CapsLock indicator Bloq Maj - + N Label for NumLock indicator N - + NumLock Tooltip for NumLock indicator Bloq Núm - + S Label for ScrollLock indicator D - + ScrollLock Tooltip for ScrollLock indicator Bloq Despl - + Layout Disposició - + Variant Variant @@ -88,7 +88,17 @@ Política d'intercanvi - + + Flags path pattern: + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + + + + Configure layouts Configura les disposicions diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_cs.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_cs.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_cs.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_cs.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator C - + CapsLock Tooltip for CapsLock indicator Psaní velkými písmeny (CapsLock) - + N Label for NumLock indicator N - + NumLock Tooltip for NumLock indicator Zamknutí číselné klávesnice (NumLock) - + S Label for ScrollLock indicator S - + ScrollLock Tooltip for ScrollLock indicator Zamknutí posunování obrazu (ScrollLock) - + Layout Rozvržení - + Variant Varianta @@ -88,7 +88,17 @@ Pravidlo pro přepínání - + + Flags path pattern: + Vzor cesty k vlajce: + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + Vzor souborové cesty pro vlajky zemí. Musí obsahovat <strong>%1</strong>, což je nahrazeno dvěma písmeny ISO kódu země (malá písmena).<br><br>Příklad: /usr/share/iso-flags-svg/country-squared/%1.svg + + + Configure layouts Nastavit rozvržení diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_cy.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_cy.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_cy.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_cy.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator - + CapsLock Tooltip for CapsLock indicator - + N Label for NumLock indicator - + NumLock Tooltip for NumLock indicator - + S Label for ScrollLock indicator - + ScrollLock Tooltip for ScrollLock indicator - + Layout - + Variant @@ -88,7 +88,17 @@ - + + Flags path pattern: + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + + + + Configure layouts diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_da.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_da.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_da.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_da.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator C - + CapsLock Tooltip for CapsLock indicator CapsLock - + N Label for NumLock indicator N - + NumLock Tooltip for NumLock indicator NumLock - + S Label for ScrollLock indicator S - + ScrollLock Tooltip for ScrollLock indicator ScrollLock - + Layout Layout - + Variant Variant @@ -88,7 +88,17 @@ Skifter politik - + + Flags path pattern: + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + + + + Configure layouts Konfigurér layouts diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_de.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_de.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_de.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_de.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,51 +4,51 @@ Content - + C Label for CapsLock indicator This capital letter is printed on my keyboard. - A + C - + CapsLock Tooltip for CapsLock indicator Feststelltaste - + N Label for NumLock indicator This digit is printed on my keyboard. - 1 + N - + NumLock Tooltip for NumLock indicator Num-Taste - + S Label for ScrollLock indicator From the word "Rollen". - R + S - + ScrollLock Tooltip for ScrollLock indicator Rollen-Taste - + Layout Belegung - + Variant Variante @@ -88,10 +88,20 @@ Switching policy - Umschaltrichtlinie + Umschaltregelung + + + + Flags path pattern: + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + - + Configure layouts Belegungen konfigurieren diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_el.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_el.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_el.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_el.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator C - + CapsLock Tooltip for CapsLock indicator CapsLock - + N Label for NumLock indicator N - + NumLock Tooltip for NumLock indicator NumLock - + S Label for ScrollLock indicator S - + ScrollLock Tooltip for ScrollLock indicator ScrollLock - + Layout Διάταξη - + Variant Παραλλαγή @@ -103,7 +103,17 @@ Εφαρμογή - + + Flags path pattern: + Σχηματομορφή διαδρομής σημαιών: + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + Σχηματομορφή διαδρομής αρχείου για της σημαίες χωρών. Πρέπει να περιέχει το <strong>%1</strong> το οποίο θα αντικατασταθεί από τα δυο γράμματα του κωδικού ISO της χώρας (πεζά).<br><br>Παράδειγμα: /usr/share/iso-flags-svg/country-squared/%1.svg + + + Configure layouts Διαμόρφωση των διατάξεων diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_es.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_es.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_es.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_es.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator M - + CapsLock Tooltip for CapsLock indicator Bloqueo de mayúsculas - + N Label for NumLock indicator N - + NumLock Tooltip for NumLock indicator Bloqueo numérico - + S Label for ScrollLock indicator D - + ScrollLock Tooltip for ScrollLock indicator Bloqueo de desplazamiento - + Layout Distribución - + Variant Variante @@ -88,7 +88,17 @@ Política de intercambio - + + Flags path pattern: + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + + + + Configure layouts Configurar las distribuciones diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_fr.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_fr.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_fr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_fr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator M - + CapsLock Tooltip for CapsLock indicator Verr Maj - + N Label for NumLock indicator N - + NumLock Tooltip for NumLock indicator Verr Num - + S Label for ScrollLock indicator D - + ScrollLock Tooltip for ScrollLock indicator Verr Défil - + Layout Disposition - + Variant Variant @@ -100,10 +100,20 @@ Application - Application(s) + Application + + + + Flags path pattern: + Modèle de chemin des drapeaux : + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + - + Configure layouts Configurer les dispositions diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_gl.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_gl.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_gl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_gl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator M - + CapsLock Tooltip for CapsLock indicator Bloq Maiús - + N Label for NumLock indicator - + NumLock Tooltip for NumLock indicator Bloq Núm - + S Label for ScrollLock indicator D - + ScrollLock Tooltip for ScrollLock indicator Bloq Despr - + Layout Disposición - + Variant Variante @@ -88,7 +88,17 @@ Política de intercambio - + + Flags path pattern: + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + + + + Configure layouts Configurar as disposicións @@ -105,7 +115,7 @@ Application - Aplicativo + Aplicación diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_he.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_he.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_he.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_he.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator - + CapsLock Tooltip for CapsLock indicator - + N Label for NumLock indicator - + NumLock Tooltip for NumLock indicator - + S Label for ScrollLock indicator - + ScrollLock Tooltip for ScrollLock indicator - + Layout פריסה - + Variant הגוון @@ -88,7 +88,17 @@ מדיניות החלפה - + + Flags path pattern: + תבנית נתיבי דגלים: + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + תבנית נתיבי קבצים לדגלי מדינות. חייב להכיל <strong>%1</strong> שיוחלף בקוד של שתי אותיות (קטנות) מתקן ISO לייצוג המדינה.<br><br>למשל: ‎/usr/share/iso-flags-svg/country-squared/%1.svg + + + Configure layouts הגדרת פריסות diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_hr.desktop lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_hr.desktop --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=Indikator stanja tipkovnice +Comment[hr]=Priključak za indikatora stanja tipkovnice i za prebacivanje između rasporeda tipkovnice. diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_hr.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_hr.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_hr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_hr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator - C + V - + CapsLock Tooltip for CapsLock indicator - CapsLock + Prekidač velikih slova - + N Label for NumLock indicator - N + B - + NumLock Tooltip for NumLock indicator - NumLock + Prekidač brojčane tipkovnice - + S Label for ScrollLock indicator - S + K - + ScrollLock Tooltip for ScrollLock indicator - ScrollLock + Prekidač klizanja - + Layout Raspored - + Variant Varijanta @@ -55,32 +55,32 @@ Keyboard state settings - Postavke stanja tipkovnice + Stanje tipkovnice – Postavke Lock Indicators - Indikatori lockova + Indikatori za tipke Show Caps Lock - Prikaži CapsLock + Prikaži prekidač velikih slova Show Num Lock - Prikaži NumLock + Prikaži prekidač brojčane tipkovnice Show Scroll Lock - Prikaži ScrollLock + Prikaži prekidač klizanja Keyboard Layout Indicator - Indikator rasporeda tipkovnice + Indikator za raspored tipkovnice @@ -100,10 +100,20 @@ Application - Aplikacija + Program + + + + Flags path pattern: + Uzorak staze zastava: + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + Uzorak staze datoteka za zastave zemlje. Mora sadržavati <strong>%1</strong>, što se zamijenjuje dvoslovnim ISO kodom države (mala slova).<br><br>Primjer: /usr/share/iso-flags-svg/country-squared/%1.svg - + Configure layouts Konfiguriraj rasporede diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_hu.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_hu.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_hu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_hu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator C - + CapsLock Tooltip for CapsLock indicator CapsLock - + N Label for NumLock indicator N - + NumLock Tooltip for NumLock indicator NumLock - + S Label for ScrollLock indicator S - + ScrollLock Tooltip for ScrollLock indicator ScrollLock - + Layout Kiosztás - + Variant Változat @@ -55,42 +55,52 @@ Keyboard state settings - Billentyűállapot beállítás + Billentyűzetállapot beállítások Lock Indicators - Jelzőállapotok + Jelzőállapot Show Caps Lock - Caps Lock be + Caps Lock megjelenítése Show Num Lock - Num Lock be + Num Lock megjelenítése Show Scroll Lock - Scroll Lock be + Scroll Lock megjelenítése Keyboard Layout Indicator - Billentyűkiosztás jelző + Billentyűzetkiosztás jelző Switching policy - Őrváltó + Szolgáltatásváltás + + + + Flags path pattern: + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + - + Configure layouts - Kiosztásbeállítás + Kiosztás beállítása diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_id.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_id.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_id.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_id.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator C - + CapsLock Tooltip for CapsLock indicator CapsLock - + N Label for NumLock indicator N - + NumLock Tooltip for NumLock indicator NumLock - + S Label for ScrollLock indicator S - + ScrollLock Tooltip for ScrollLock indicator ScrollLock - + Layout Tata letak - + Variant Varian @@ -88,7 +88,17 @@ Perubahan aturan - + + Flags path pattern: + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + + + + Configure layouts Konfigurasi tata latak diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_it.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_it.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_it.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_it.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator M - + CapsLock Tooltip for CapsLock indicator Blocco maiuscolo - + N Label for NumLock indicator N - + NumLock Tooltip for NumLock indicator Blocco numeri - + S Label for ScrollLock indicator S - + ScrollLock Tooltip for ScrollLock indicator Blocco scorrimento - + Layout Mappatura - + Variant Variante @@ -88,7 +88,17 @@ Cambio mappatura - + + Flags path pattern: + Schema percorso bandiere: + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + Schema percorso per le bandiere dei paesi. Deve contenere <strong>%1</strong> che sarà sostituio dal codice ISO del paese (in minuscolo).<br><br>Esempio: /usr/share/iso-flags-svg/country-squared/%1.svg + + + Configure layouts Configura la mappatura diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_ja.desktop lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_ja.desktop --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_ja.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_ja.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,7 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LxQtPanel/Plugin Name[ja]=キーボードインジケーター -Comment[ja]=キーボードインジケーターのプラグイン - -#TRANSLATIONS_DIR=../translations +Comment[ja]=キーボードのロック状態やレイアウトの表示と切替をします diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_ja.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_ja.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_ja.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_ja.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,50 +4,50 @@ Content - + C Label for CapsLock indicator C - + CapsLock Tooltip for CapsLock indicator - CapsLock + Caps Lock - + N Label for NumLock indicator N - + NumLock Tooltip for NumLock indicator - NumLock + Num Lock - + S Label for ScrollLock indicator S - + ScrollLock Tooltip for ScrollLock indicator - ScrollLock + Scroll Lock - + Layout レイアウト - + Variant - + バリアント @@ -55,57 +55,67 @@ Keyboard state settings - + キーボード状態の設定 Lock Indicators - + ロックインジケーター Show Caps Lock - + Caps Lock を表示する Show Num Lock - + Num Lock を表示する Show Scroll Lock - + Scroll Lock を表示する Keyboard Layout Indicator - + キーボードレイアウトインジケーター Switching policy - + 切り替えのポリシー Global - + 全体 Window - + ウィンドウ Application - + アプリケーション + + + + Flags path pattern: + 旗のパス: + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + 国旗のファイルパスのパターンです。必ず含む <strong>%1</strong> が 2 文字の ISO 国名コード (小文字) で置き換えられます。<br><br>例: /usr/share/iso-flags-svg/country-squared/%1.svg - + Configure layouts - + レイアウトの設定 diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_lt.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_lt.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_lt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_lt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator D - + CapsLock Tooltip for CapsLock indicator Didž (CapsLock) - + N Label for NumLock indicator S - + NumLock Tooltip for NumLock indicator Skaitm (NumLock) - + S Label for ScrollLock indicator L - + ScrollLock Tooltip for ScrollLock indicator Slinkti (ScrollLock) - + Layout Išdėstymas - + Variant Variantas @@ -88,7 +88,17 @@ Perjungimo politika - + + Flags path pattern: + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + + + + Configure layouts Konfigūruoti išdėstymus diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_nb_NO.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_nb_NO.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_nb_NO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_nb_NO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator - + CapsLock Tooltip for CapsLock indicator - + N Label for NumLock indicator - + NumLock Tooltip for NumLock indicator - + S Label for ScrollLock indicator - + ScrollLock Tooltip for ScrollLock indicator - + Layout Tastaturspråk - + Variant @@ -88,7 +88,17 @@ Bytt tastaturspråk - + + Flags path pattern: + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + + + + Configure layouts Still inn tastaturlayout diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_nl.desktop lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_nl.desktop --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_nl.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_nl.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[nl]=Toetsenbordindicator +Comment[nl]=Toont toetsenbordstatus en laat eenvoudig wisselen tussen toetsenbordindelingen. diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_nl.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_nl.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_nl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_nl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,51 +4,51 @@ Content - + C Label for CapsLock indicator This capital letter is printed on my keyboard. C - + N Label for NumLock indicator This digit is printed on my keyboard. N - + S Label for ScrollLock indicator From the word "Rollen". S - + CapsLock Tooltip for CapsLock indicator CapsLock - + NumLock Tooltip for NumLock indicator NumLock - + ScrollLock Tooltip for ScrollLock indicator ScrollLock - + Layout Indeling - + Variant Variant @@ -68,17 +68,17 @@ Show Caps Lock - Toon Caps Lock-toets + Toon Caps Lock Show Num Lock - Toon Num Lock-toets + Toon Num Lock Show Scroll Lock - Toon Scroll Lock-toets + Toon Scroll Lock @@ -91,7 +91,17 @@ Omschakelingsbeleid - + + Flags path pattern: + Patroon voor pad van vlaggen: + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + Patroon voor bestandspad van vlaggen. Moet <strong>%1</strong> bevatten, dat vervangen zal worden door de tweeletterige ISO-landcode (kleine letters).<br><br>Bijvoorbeeld: /usr/share/iso-flags-svg/country-squared/%1.svg + + + Configure layouts Indelingen instellen diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_pl.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_pl.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_pl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_pl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator C - + CapsLock Tooltip for CapsLock indicator Caps Lock - + N Label for NumLock indicator Num Lock - + NumLock Tooltip for NumLock indicator Num Lock - + S Label for ScrollLock indicator S - + ScrollLock Tooltip for ScrollLock indicator Scroll Lock - + Layout Układ - + Variant Wariant @@ -88,7 +88,17 @@ Zasady przełączania - + + Flags path pattern: + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + + + + Configure layouts Konfiguruj układy diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_pt.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_pt.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_pt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_pt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator C - + CapsLock Tooltip for CapsLock indicator CapsLock - + N Label for NumLock indicator N - + NumLock Tooltip for NumLock indicator NumLock - + S Label for ScrollLock indicator S - + ScrollLock Tooltip for ScrollLock indicator ScrollLock - + Layout Disposição - + Variant Variante @@ -103,7 +103,17 @@ Aplicação - + + Flags path pattern: + Caminho para a bandeira: + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + Padrão dos caminhos para as bandeiras dos países. Tem que conter <strong>%1</strong>, que será substituído pelas duas letras ISO do código do país (minúsculas). <br><br>Exemplo: /usr/share/iso-flags-svg/country-squared/%1.svg + + + Configure layouts Configurar disposição diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_ru.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_ru.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_ru.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_ru.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,54 +4,54 @@ Content - + C Label for CapsLock indicator Метка для индикатора CapsLock C - + CapsLock Tooltip for CapsLock indicator Подсказка для индикатора CapsLock CapsLock - + N Label for NumLock indicator Метка для индикатора NumLock N - + NumLock Tooltip for NumLock indicator Подсказка для индикатора NumLock NumLock - + S Label for ScrollLock indicator Метка для индикатора ScrollLock S - + ScrollLock Tooltip for ScrollLock indicator Подсказка для индикатора ScrollLock ScrollLock - + Layout Раскладка - + Variant Вариант @@ -94,7 +94,17 @@ Правило переключения - + + Flags path pattern: + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + + + + Configure layouts Настроить раскладки diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_sk_SK.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_sk_SK.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_sk_SK.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_sk_SK.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,121 @@ + + + + + Content + + + C + Label for CapsLock indicator + C + + + + CapsLock + Tooltip for CapsLock indicator + Písanie veľkými písmenami (CapsLock) + + + + N + Label for NumLock indicator + N + + + + NumLock + Tooltip for NumLock indicator + Uzamknutie číselnej klávesnice (NumLock) + + + + S + Label for ScrollLock indicator + S + + + + ScrollLock + Tooltip for ScrollLock indicator + Zamknúť posúvanie obrazu (ScrollLock) + + + + Layout + Rozvrhnutie + + + + Variant + Variant + + + + KbdStateConfig + + + Keyboard state settings + Nastavenie stavu klávesnice + + + + Lock Indicators + Indikovať zámky + + + + Show Caps Lock + Ukazovať CapsLock + + + + Show Num Lock + Ukazovať NumLock + + + + Show Scroll Lock + Ukazovať ScrollLock + + + + Keyboard Layout Indicator + Ukazovať rozloženie klávesnice + + + + Switching policy + Pravidlo pre prepínanie + + + + Flags path pattern: + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + + + + + Configure layouts + Nastaviť rozloženie + + + + Global + Globálne + + + + Window + Okno + + + + Application + Aplikácie + + + diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_sv.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_sv.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_sv.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_sv.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,121 @@ + + + + + Content + + + C + Label for CapsLock indicator + C + + + + CapsLock + Tooltip for CapsLock indicator + Caps Lock + + + + N + Label for NumLock indicator + N + + + + NumLock + Tooltip for NumLock indicator + NumLock + + + + S + Label for ScrollLock indicator + S + + + + ScrollLock + Tooltip for ScrollLock indicator + Scroll Lock + + + + Layout + Utseende + + + + Variant + Variant + + + + KbdStateConfig + + + Keyboard state settings + Tangentbordets inställningar + + + + Lock Indicators + Låsindikatorer + + + + Show Caps Lock + Visa CapsLock + + + + Show Num Lock + Visa NumLock + + + + Show Scroll Lock + Visa Scroll Lock + + + + Keyboard Layout Indicator + Indikator för tangentbordlayout + + + + Switching policy + Bytesprincip + + + + Flags path pattern: + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + + + + + Configure layouts + Anpassa layouter + + + + Global + Allmänna + + + + Window + Fönster + + + + Application + Program + + + diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_tr.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_tr.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_tr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_tr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator B - + CapsLock Tooltip for CapsLock indicator - + N Label for NumLock indicator S - + NumLock Tooltip for NumLock indicator - + S Label for ScrollLock indicator K - + ScrollLock Tooltip for ScrollLock indicator - + Layout Düzen - + Variant Klavye @@ -88,7 +88,17 @@ Değiştirme politikası - + + Flags path pattern: + Dil bayrağı yolu: + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + Ülke bayrakları dosya yoludur. İki harfli ISO ülke kodu (küçük harf) ile değiştirilecek <strong>%1</strong> karakteri içermelidir.<br><br>Örnek: /usr/share/iso-flags-svg/country-squared/%1.svg + + + Configure layouts Düzeni yapılandır diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator - + CapsLock Tooltip for CapsLock indicator - + N Label for NumLock indicator - + NumLock Tooltip for NumLock indicator - + S Label for ScrollLock indicator - + ScrollLock Tooltip for ScrollLock indicator - + Layout - + Variant @@ -88,7 +88,17 @@ - + + Flags path pattern: + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + + + + Configure layouts diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_uk.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_uk.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_uk.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_uk.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator C - + CapsLock Tooltip for CapsLock indicator CapsLock - + N Label for NumLock indicator N - + NumLock Tooltip for NumLock indicator NumLock - + S Label for ScrollLock indicator S - + ScrollLock Tooltip for ScrollLock indicator ScrollLock - + Layout Розкладка - + Variant Варіант @@ -88,7 +88,17 @@ Політика перемикання - + + Flags path pattern: + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + + + + Configure layouts Налатування розкладки diff -Nru lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_zh_CN.ts lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_zh_CN.ts --- lxqt-panel-0.14.1/plugin-kbindicator/translations/kbindicator_zh_CN.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-kbindicator/translations/kbindicator_zh_CN.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,48 +4,48 @@ Content - + C Label for CapsLock indicator - + CapsLock Tooltip for CapsLock indicator 大写锁定 - + N Label for NumLock indicator - + NumLock Tooltip for NumLock indicator 数字键锁定 - + S Label for ScrollLock indicator - + ScrollLock Tooltip for ScrollLock indicator 滚动锁定 - + Layout 布局 - + Variant 变种 @@ -88,7 +88,17 @@ 切换策略 - + + Flags path pattern: + + + + + File path pattern for country flags. Must contain <strong>%1</strong> which is replaced by the two letter ISO country code (lower case).<br><br>Example: /usr/share/iso-flags-svg/country-squared/%1.svg + + + + Configure layouts 配置布局 diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/actionview.cpp lxqt-panel-0.16.1/plugin-mainmenu/actionview.cpp --- lxqt-panel-0.14.1/plugin-mainmenu/actionview.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/actionview.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -189,7 +189,7 @@ item->setText(action->text()); item->setToolTip(action->toolTip()); QString all = action->text(); - all += '\n'; + all += QLatin1Char('\n'); all += action->toolTip(); item->setData(all, FilterRole); diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/lxqtmainmenuconfiguration.cpp lxqt-panel-0.16.1/plugin-mainmenu/lxqtmainmenuconfiguration.cpp --- lxqt-panel-0.14.1/plugin-mainmenu/lxqtmainmenuconfiguration.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/lxqtmainmenuconfiguration.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -43,10 +43,10 @@ mShortcut(shortcut) { setAttribute(Qt::WA_DeleteOnClose); - setObjectName("MainMenuConfigurationWindow"); + setObjectName(QStringLiteral("MainMenuConfigurationWindow")); ui->setupUi(this); - QIcon folder{XdgIcon::fromTheme("folder")}; + QIcon folder{XdgIcon::fromTheme(QStringLiteral("folder"))}; ui->chooseMenuFilePB->setIcon(folder); ui->iconPB->setIcon(folder); @@ -61,7 +61,7 @@ { this->settings().setValue(QLatin1String("menu_file"), file); }); - connect(ui->iconCB, &QCheckBox::toggled, [this] (bool value) { this->settings().setValue("ownIcon", value); }); + connect(ui->iconCB, &QCheckBox::toggled, [this] (bool value) { this->settings().setValue(QStringLiteral("ownIcon"), value); }); connect(ui->iconPB, &QAbstractButton::clicked, this, &LXQtMainMenuConfiguration::chooseIcon); connect(ui->iconLE, &QLineEdit::textChanged, [&] (QString const & path) { @@ -79,28 +79,28 @@ connect(ui->filterMenuCB, &QCheckBox::toggled, [this] (bool enabled) { ui->filterClearCB->setEnabled(enabled || ui->filterShowCB->isChecked()); - this->settings().setValue("filterMenu", enabled); + this->settings().setValue(QStringLiteral("filterMenu"), enabled); }); connect(ui->filterShowCB, &QCheckBox::toggled, [this] (bool enabled) { ui->filterClearCB->setEnabled(enabled || ui->filterMenuCB->isChecked()); - this->settings().setValue("filterShow", enabled); + this->settings().setValue(QStringLiteral("filterShow"), enabled); }); connect(ui->filterShowMaxItemsSB, static_cast(&QSpinBox::valueChanged), [this] (int value) { - this->settings().setValue("filterShowMaxItems", value); + this->settings().setValue(QStringLiteral("filterShowMaxItems"), value); }); connect(ui->filterShowMaxWidthSB, static_cast(&QSpinBox::valueChanged), [this] (int value) { - this->settings().setValue("filterShowMaxWidth", value); + this->settings().setValue(QStringLiteral("filterShowMaxWidth"), value); }); connect(ui->filterShowHideMenuCB, &QCheckBox::toggled, [this] (bool enabled) { - this->settings().setValue("filterShowHideMenu", enabled); + this->settings().setValue(QStringLiteral("filterShowHideMenu"), enabled); }); connect(ui->filterClearCB, &QCheckBox::toggled, [this] (bool enabled) { - this->settings().setValue("filterClear", enabled); + this->settings().setValue(QStringLiteral("filterClear"), enabled); }); } @@ -111,12 +111,12 @@ void LXQtMainMenuConfiguration::loadSettings() { - ui->iconCB->setChecked(settings().value("ownIcon", false).toBool()); - ui->iconLE->setText(settings().value("icon", QLatin1String(LXQT_GRAPHICS_DIR"/helix.svg")).toString()); - ui->showTextCB->setChecked(settings().value("showText", false).toBool()); - ui->textLE->setText(settings().value("text", "").toString()); + ui->iconCB->setChecked(settings().value(QStringLiteral("ownIcon"), false).toBool()); + ui->iconLE->setText(settings().value(QStringLiteral("icon"), QLatin1String(LXQT_GRAPHICS_DIR"/helix.svg")).toString()); + ui->showTextCB->setChecked(settings().value(QStringLiteral("showText"), false).toBool()); + ui->textLE->setText(settings().value(QStringLiteral("text"), QString()).toString()); - QString menuFile = settings().value("menu_file", "").toString(); + QString menuFile = settings().value(QStringLiteral("menu_file"), QString()).toString(); if (menuFile.isEmpty()) { menuFile = XdgMenu::getMenuFileName(); @@ -124,38 +124,38 @@ ui->menuFilePathLE->setText(menuFile); ui->shortcutEd->setText(nullptr != mShortcut ? mShortcut->shortcut() : mDefaultShortcut); - ui->customFontCB->setChecked(settings().value("customFont", false).toBool()); - LXQt::Settings lxqtSettings("lxqt"); //load system font size as init value + ui->customFontCB->setChecked(settings().value(QStringLiteral("customFont"), false).toBool()); + LXQt::Settings lxqtSettings(QStringLiteral("lxqt")); //load system font size as init value QFont systemFont; lxqtSettings.beginGroup(QLatin1String("Qt")); - systemFont.fromString(lxqtSettings.value("font", this->font()).toString()); + systemFont.fromString(lxqtSettings.value(QStringLiteral("font"), this->font()).toString()); lxqtSettings.endGroup(); - ui->customFontSizeSB->setValue(settings().value("customFontSize", systemFont.pointSize()).toInt()); - const bool filter_menu = settings().value("filterMenu", true).toBool(); + ui->customFontSizeSB->setValue(settings().value(QStringLiteral("customFontSize"), systemFont.pointSize()).toInt()); + const bool filter_menu = settings().value(QStringLiteral("filterMenu"), true).toBool(); ui->filterMenuCB->setChecked(filter_menu); - const bool filter_show = settings().value("filterShow", true).toBool(); + const bool filter_show = settings().value(QStringLiteral("filterShow"), true).toBool(); ui->filterShowCB->setChecked(filter_show); ui->filterShowMaxItemsL->setEnabled(filter_show); ui->filterShowMaxItemsSB->setEnabled(filter_show); - ui->filterShowMaxItemsSB->setValue(settings().value("filterShowMaxItems", 10).toInt()); + ui->filterShowMaxItemsSB->setValue(settings().value(QStringLiteral("filterShowMaxItems"), 10).toInt()); ui->filterShowMaxWidthL->setEnabled(filter_show); ui->filterShowMaxWidthSB->setEnabled(filter_show); - ui->filterShowMaxWidthSB->setValue(settings().value("filterShowMaxWidth", 300).toInt()); + ui->filterShowMaxWidthSB->setValue(settings().value(QStringLiteral("filterShowMaxWidth"), 300).toInt()); ui->filterShowHideMenuCB->setEnabled(filter_show); - ui->filterShowHideMenuCB->setChecked(settings().value("filterShowHideMenu", true).toBool()); - ui->filterClearCB->setChecked(settings().value("filterClear", false).toBool()); + ui->filterShowHideMenuCB->setChecked(settings().value(QStringLiteral("filterShowHideMenu"), true).toBool()); + ui->filterClearCB->setChecked(settings().value(QStringLiteral("filterClear"), false).toBool()); ui->filterClearCB->setEnabled(filter_menu || filter_show); } void LXQtMainMenuConfiguration::textButtonChanged(const QString &value) { - settings().setValue("text", value); + settings().setValue(QStringLiteral("text"), value); } void LXQtMainMenuConfiguration::showTextChanged(bool value) { - settings().setValue("showText", value); + settings().setValue(QStringLiteral("showText"), value); } void LXQtMainMenuConfiguration::chooseIcon() @@ -206,10 +206,10 @@ void LXQtMainMenuConfiguration::customFontChanged(bool value) { - settings().setValue("customFont", value); + settings().setValue(QStringLiteral("customFont"), value); } void LXQtMainMenuConfiguration::customFontSizeChanged(int value) { - settings().setValue("customFontSize", value); + settings().setValue(QStringLiteral("customFontSize"), value); } diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/lxqtmainmenu.cpp lxqt-panel-0.16.1/plugin-mainmenu/lxqtmainmenu.cpp --- lxqt-panel-0.14.1/plugin-mainmenu/lxqtmainmenu.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/lxqtmainmenu.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -44,10 +44,14 @@ #include #include +#include #ifdef HAVE_MENU_CACHE #include "xdgcachedmenu.h" #else + #include + #include + #include #include #endif @@ -68,8 +72,8 @@ mHeavyMenuChanges(false) { #ifdef HAVE_MENU_CACHE - mMenuCache = NULL; - mMenuCacheNotify = 0; + mMenuCache = nullptr; + mMenuCacheNotify = nullptr; #endif mDelayedPopup.setSingleShot(true); @@ -78,6 +82,10 @@ mHideTimer.setSingleShot(true); mHideTimer.setInterval(250); + mSearchTimer.setSingleShot(true); + connect(&mSearchTimer, &QTimer::timeout, this, &LXQtMainMenu::searchMenu); + mSearchTimer.setInterval(350); // typing speed (not very fast) + mButton.setAutoRaise(true); mButton.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); //Notes: @@ -96,17 +104,19 @@ mSearchEdit = new QLineEdit; mSearchEdit->setClearButtonEnabled(true); mSearchEdit->setPlaceholderText(LXQtMainMenu::tr("Search...")); - connect(mSearchEdit, &QLineEdit::textChanged, this, &LXQtMainMenu::searchTextChanged); + connect(mSearchEdit, &QLineEdit::textChanged, [this] (QString const &) { + mSearchTimer.start(); + }); connect(mSearchEdit, &QLineEdit::returnPressed, mSearchView, &ActionView::activateCurrent); mSearchEditAction->setDefaultWidget(mSearchEdit); QTimer::singleShot(0, [this] { settingsChanged(); }); - mShortcut = GlobalKeyShortcut::Client::instance()->addAction(QString{}, QString("/panel/%1/show_hide").arg(settings()->group()), LXQtMainMenu::tr("Show/hide main menu"), this); + mShortcut = GlobalKeyShortcut::Client::instance()->addAction(QString{}, QStringLiteral("/panel/%1/show_hide").arg(settings()->group()), LXQtMainMenu::tr("Show/hide main menu"), this); if (mShortcut) { connect(mShortcut, &GlobalKeyShortcut::Action::registrationFinished, [this] { if (mShortcut->shortcut().isEmpty()) - mShortcut->changeShortcut(DEFAULT_SHORTCUT); + mShortcut->changeShortcut(QStringLiteral(DEFAULT_SHORTCUT)); }); connect(mShortcut, &GlobalKeyShortcut::Action::activated, [this] { if (!mHideTimer.isActive()) @@ -167,10 +177,6 @@ mMenu->popup(calculatePopupWindowPos(mMenu->sizeHint()).topLeft()); if (mFilterMenu || mFilterShow) { - if (mFilterClear && !mSearchEdit->text().isEmpty()) - { - mSearchEdit->setText(QString{}); - } //Note: part of the workadound for https://bugreports.qt.io/browse/QTBUG-52021 mSearchEdit->setReadOnly(false); //the setReadOnly also changes the cursor, override it back to normal @@ -193,20 +199,20 @@ void LXQtMainMenu::settingsChanged() { setButtonIcon(); - if (settings()->value("showText", false).toBool()) + if (settings()->value(QStringLiteral("showText"), false).toBool()) { - mButton.setText(settings()->value("text", "Start").toString()); + mButton.setText(settings()->value(QStringLiteral("text"), QStringLiteral("Start")).toString()); mButton.setToolButtonStyle(Qt::ToolButtonTextBesideIcon); } else { - mButton.setText(""); + mButton.setText(QLatin1String("")); mButton.setToolButtonStyle(Qt::ToolButtonIconOnly); } - mLogDir = settings()->value("log_dir", "").toString(); + mLogDir = settings()->value(QStringLiteral("log_dir"), QString()).toString(); - QString menu_file = settings()->value("menu_file", "").toString(); + QString menu_file = settings()->value(QStringLiteral("menu_file"), QString()).toString(); if (menu_file.isEmpty()) menu_file = XdgMenu::getMenuFileName(); @@ -220,7 +226,7 @@ menu_cache_remove_reload_notify(mMenuCache, mMenuCacheNotify); menu_cache_unref(mMenuCache); } - mMenuCache = menu_cache_lookup(mMenuFile.toLocal8Bit()); + mMenuCache = menu_cache_lookup(mMenuFile.toLocal8Bit().constData()); if (MenuCacheDir * root = menu_cache_dup_root_dir(mMenuCache)) { menu_cache_item_unref(MENU_CACHE_ITEM(root)); @@ -228,7 +234,7 @@ } mMenuCacheNotify = menu_cache_add_reload_notify(mMenuCache, (MenuCacheReloadNotify)menuCacheReloadNotify, this); #else - mXdgMenu.setEnvironments(QStringList() << "X-LXQT" << "LXQt"); + mXdgMenu.setEnvironments(QStringList() << QStringLiteral("X-LXQT") << QStringLiteral("LXQt")); mXdgMenu.setLogDir(mLogDir); bool res = mXdgMenu.read(mMenuFile); @@ -239,7 +245,7 @@ } else { - QMessageBox::warning(0, "Parse error", mXdgMenu.errorString()); + QMessageBox::warning(0, QStringLiteral("Parse error"), mXdgMenu.errorString()); return; } #endif @@ -249,17 +255,19 @@ //clear the search to not leaving the menu in wrong state mSearchEdit->setText(QString{}); - mFilterMenu = settings()->value("filterMenu", true).toBool(); - mFilterShow = settings()->value("filterShow", true).toBool(); - mFilterClear = settings()->value("filterClear", false).toBool(); - mFilterShowHideMenu = settings()->value("filterShowHideMenu", true).toBool(); + mFilterMenu = settings()->value(QStringLiteral("filterMenu"), true).toBool(); + mFilterShow = settings()->value(QStringLiteral("filterShow"), true).toBool(); + mFilterClear = settings()->value(QStringLiteral("filterClear"), false).toBool(); + mFilterShowHideMenu = settings()->value(QStringLiteral("filterShowHideMenu"), true).toBool(); if (mMenu) { mSearchEdit->setVisible(mFilterMenu || mFilterShow); mSearchEditAction->setVisible(mFilterMenu || mFilterShow); + if (mFilterClear && !mMenu->isVisible()) + mSearchEdit->clear(); } - mSearchView->setMaxItemsToShow(settings()->value("filterShowMaxItems", 10).toInt()); - mSearchView->setMaxItemWidth(settings()->value("filterShowMaxWidth", 300).toInt()); + mSearchView->setMaxItemsToShow(settings()->value(QStringLiteral("filterShowMaxItems"), 10).toInt()); + mSearchView->setMaxItemWidth(settings()->value(QStringLiteral("filterShowMaxWidth"), 300).toInt()); realign(); } @@ -333,8 +341,9 @@ /************************************************ ************************************************/ -void LXQtMainMenu::searchTextChanged(QString const & text) +void LXQtMainMenu::searchMenu() { + const QString text = mSearchEdit->text(); if (mFilterShow) { mHeavyMenuChanges = true; @@ -393,9 +402,10 @@ #ifdef HAVE_MENU_CACHE mMenu = new XdgCachedMenu(mMenuCache, &mButton); #else - mMenu = new XdgMenuWidget(mXdgMenu, "", &mButton); + mMenu = new XdgMenuWidget(mXdgMenu, QLatin1String(""), &mButton); + addContextMenu(mMenu); #endif - mMenu->setObjectName("TopLevelMainMenu"); + mMenu->setObjectName(QStringLiteral("TopLevelMainMenu")); setTranslucentMenus(mMenu); // Note: the QWidget::ensurePolished() workarounds problem with transparent // QLineEdit (mSearchEditAction) in menu with Breeze style @@ -417,28 +427,121 @@ //(if the readOnly is not set, the "blink" timer is active also in case the menu is not shown -> //QWidgetLineControl::updateNeeded is performed w/o any need) //https://bugreports.qt.io/browse/QTBUG-52021 - connect(mMenu, &QMenu::aboutToHide, [this] { mSearchEdit->setReadOnly(true); }); + connect(mMenu, &QMenu::aboutToHide, [this] { + mSearchEdit->setReadOnly(true); + if (mFilterClear) + mSearchEdit->clear(); + }); mSearchEdit->setVisible(mFilterMenu || mFilterShow); mSearchEditAction->setVisible(mFilterMenu || mFilterShow); mSearchView->fillActions(mMenu); - searchTextChanged(mSearchEdit->text()); + searchMenu(); setMenuFontSize(); } /************************************************ ************************************************/ +void LXQtMainMenu::addContextMenu(QMenu *menu) +{ + const auto actions = menu->actions(); + for (auto const & action : actions) + { + if (action->menu()) + { + action->menu()->setContextMenuPolicy(Qt::CustomContextMenu); + connect(action->menu(), &QWidget::customContextMenuRequested, + this, &LXQtMainMenu::onRequestingCustomMenu); + addContextMenu(action->menu()); + } + } +} + +void LXQtMainMenu::onRequestingCustomMenu(const QPoint& p) +{ +#ifdef HAVE_MENU_CACHE + Q_UNUSED(p) + return; +#else + QMenu *parentMenu = static_cast(QObject::sender()); + if (parentMenu == nullptr) + return; + QAction *action = parentMenu->actionAt(p); + if (action == nullptr || action->menu() != nullptr || action->isSeparator()) + return; + XdgAction *xdgAction = qobject_cast(action); + if (xdgAction == nullptr) + return; + const XdgDesktopFile& df = xdgAction->desktopFile(); + QString file = df.fileName(); + + QMenu menu; + QAction *a; + + if (df.actions().count() > 0 && df.type() == XdgDesktopFile::Type::ApplicationType) + { + for (int i = 0; i < df.actions().count(); ++i) + { + QString action(df.actions().at(i)); + a = menu.addAction(df.actionIcon(action), df.actionName(action)); + connect(a, &QAction::triggered, [this, df, action] { + df.actionActivate(action, QStringList()); + mMenu->hide(); + }); + } + menu.addSeparator(); + } + + a = menu.addAction(XdgIcon::fromTheme(QLatin1String("desktop")), tr("Add to desktop")); + connect(a, &QAction::triggered, [file] { + QString desktop = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation); + QString desktopFile = desktop + QStringLiteral("/") + file.section(QStringLiteral("/"), -1); + if (QFile::exists(desktopFile)) + { + QMessageBox::StandardButton btn = + QMessageBox::question(nullptr, + tr("Question"), + tr("A file with the same name already exists.\nDo you want to overwrite it?")); + if (btn == QMessageBox::No) + return; + if (!QFile::remove(desktopFile)) + { + QMessageBox::warning(nullptr, + tr("Warning"), + tr("The file cannot be overwritten.")); + return; + } + } + QFile::copy(file, desktopFile); + }); + a = menu.addAction(XdgIcon::fromTheme(QLatin1String("edit-copy")), tr("Copy")); + connect(a, &QAction::triggered, [file] { + QClipboard* clipboard = QApplication::clipboard(); + QMimeData* data = new QMimeData(); + data->setData(QStringLiteral("text/uri-list"), QUrl::fromLocalFile(file).toEncoded() + + QByteArray("\r\n")); + clipboard->setMimeData(data); + }); + menu.exec(parentMenu->mapToGlobal(p)); +#endif +} + +/************************************************ + + ************************************************/ void LXQtMainMenu::setMenuFontSize() { if (!mMenu) return; QFont menuFont = mButton.font(); - if(settings()->value("customFont", false).toBool()) + bool customFont = settings()->value(QStringLiteral("customFont"), false).toBool(); + + if(customFont) { menuFont = mMenu->font(); - menuFont.setPointSize(settings()->value("customFontSize").toInt()); + menuFont.setPointSize(settings()->value(QStringLiteral("customFontSize")).toInt()); } if (mMenu->font() != menuFont) @@ -453,9 +556,15 @@ mSearchView->setFont(menuFont); } - //icon size the same as the font height - const int icon_size = QFontMetrics(menuFont).height(); + // icon size the same as the font height if a custom font is selected, + // otherwise use the default size + int icon_size = (customFont ? QFontMetrics(menuFont).height() + : MenuStyle::DEFAULT_ICON_SIZE); mTopMenuStyle.setIconSize(icon_size); + + // get the size back from the style (this will resolve DEFAULT_ICON_SIZE + // to an actual pixel size if necessary) + icon_size = mTopMenuStyle.pixelMetric(QStyle::PM_SmallIconSize); mSearchView->setIconSize(QSize{icon_size, icon_size}); } @@ -465,9 +574,9 @@ ************************************************/ void LXQtMainMenu::setButtonIcon() { - if (settings()->value("ownIcon", false).toBool()) + if (settings()->value(QStringLiteral("ownIcon"), false).toBool()) { - mButton.setStyleSheet(QString("#MainMenu { qproperty-icon: url(%1); }") + mButton.setStyleSheet(QStringLiteral("#MainMenu { qproperty-icon: url(%1); }") .arg(settings()->value(QLatin1String("icon"), QLatin1String(LXQT_GRAPHICS_DIR"/helix.svg")).toString())); } else { @@ -481,7 +590,7 @@ ************************************************/ QDialog *LXQtMainMenu::configureDialog() { - return new LXQtMainMenuConfiguration(settings(), mShortcut, DEFAULT_SHORTCUT); + return new LXQtMainMenuConfiguration(settings(), mShortcut, QStringLiteral(DEFAULT_SHORTCUT)); } /************************************************ @@ -526,7 +635,7 @@ QAction* action = menu->activeAction(); if(action !=0) { QList actions = menu->actions(); - QList::iterator it = qFind(actions.begin(), actions.end(), action); + QList::iterator it = std::find(actions.begin(), actions.end(), action); it = std::find_if(it + 1, actions.end(), MatchAction(key)); if(it == actions.end()) it = std::find_if(actions.begin(), it, MatchAction(key)); diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/lxqtmainmenu.h lxqt-panel-0.16.1/plugin-mainmenu/lxqtmainmenu.h --- lxqt-panel-0.14.1/plugin-mainmenu/lxqtmainmenu.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/lxqtmainmenu.h 2020-11-05 16:09:19.000000000 +0000 @@ -69,7 +69,7 @@ LXQtMainMenu(const ILXQtPanelPluginStartupInfo &startupInfo); ~LXQtMainMenu(); - QString themeId() const { return "MainMenu"; } + QString themeId() const { return QStringLiteral("MainMenu"); } virtual ILXQtPanelPlugin::Flags flags() const { return HaveConfigDialog ; } QWidget *widget() { return &mButton; } @@ -83,6 +83,7 @@ private: void setMenuFontSize(); void setButtonIcon(); + void addContextMenu(QMenu *menu); private: QToolButton mButton; @@ -111,6 +112,7 @@ QTimer mDelayedPopup; QTimer mHideTimer; + QTimer mSearchTimer; QString mMenuFile; protected slots: @@ -121,8 +123,9 @@ private slots: void showMenu(); void showHideMenu(); - void searchTextChanged(QString const & text); + void searchMenu(); void setSearchFocus(QAction *action); + void onRequestingCustomMenu(const QPoint& p); }; class LXQtMainMenuPluginLibrary: public QObject, public ILXQtPanelPluginLibrary diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/menustyle.cpp lxqt-panel-0.16.1/plugin-mainmenu/menustyle.cpp --- lxqt-panel-0.14.1/plugin-mainmenu/menustyle.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/menustyle.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -36,7 +36,7 @@ MenuStyle::MenuStyle(): QProxyStyle() { - mIconSize = 16; + mIconSize = DEFAULT_ICON_SIZE; } @@ -45,7 +45,7 @@ ************************************************/ int MenuStyle::pixelMetric(PixelMetric metric, const QStyleOption * option, const QWidget * widget) const { - if (metric == QProxyStyle::PM_SmallIconSize) + if (metric == QStyle::PM_SmallIconSize && mIconSize != DEFAULT_ICON_SIZE) return mIconSize; return QProxyStyle::pixelMetric(metric, option, widget); diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/menustyle.h lxqt-panel-0.16.1/plugin-mainmenu/menustyle.h --- lxqt-panel-0.14.1/plugin-mainmenu/menustyle.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/menustyle.h 2020-11-05 16:09:19.000000000 +0000 @@ -35,6 +35,9 @@ { Q_OBJECT public: + // reserved value which gets the icon size from the parent style + static constexpr int DEFAULT_ICON_SIZE = -1; + explicit MenuStyle(); int pixelMetric(PixelMetric metric, const QStyleOption * option = 0, const QWidget * widget = 0 ) const; int styleHint(StyleHint hint, const QStyleOption* option = 0, const QWidget* widget = 0, QStyleHintReturn* returnData = 0) const; diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_arn.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_arn.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_arn.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,166 @@ + + + + + LXQtMainMenu + + + Search... + + + + + Show/hide main menu + + + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + + + + LXQtMainMenuConfiguration + + + General + + + + + Main Menu settings + + + + + Icon: + + + + + Button text: + + + + + Custom font size: + + + + + pt + + + + + Menu file + + + + + Menu file: + + + + + Search + + + + + Max. item width: + + + + + Show matching entries: + + + + + Maximum visible items: + + + + + Filter menu entries + + + + + px + + + + + Hide menu entries while searching + + + + + Clear search upon showing menu + + + + + Keyboard Shortcut + + + + + Click the button to record shortcut: + + + + + Reset + + + + + Choose icon file + + + + + Images (*.svg *.png) + + + + + Choose menu file + + + + + Menu files (*.menu) + + + + diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_ar.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_ar.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_ar.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_ar.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... ابحث… - + Show/hide main menu اعرض/أخفِ القائمة الرئيسية + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_ast.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_ast.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_ast.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_ast.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,166 @@ + + + + + LXQtMainMenu + + + Search... + + + + + Show/hide main menu + + + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + + + + LXQtMainMenuConfiguration + + + General + + + + + Main Menu settings + + + + + Icon: + + + + + Button text: + + + + + Custom font size: + + + + + pt + + + + + Menu file + + + + + Menu file: + + + + + Search + + + + + Max. item width: + + + + + Show matching entries: + + + + + Maximum visible items: + + + + + Filter menu entries + + + + + px + + + + + Hide menu entries while searching + + + + + Clear search upon showing menu + + + + + Keyboard Shortcut + + + + + Click the button to record shortcut: + + + + + Reset + + + + + Choose icon file + + + + + Images (*.svg *.png) + + + + + Choose menu file + + + + + Menu files (*.menu) + + + + diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_ca.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_ca.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_ca.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_ca.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... Cerca... - + Show/hide main menu Mostra o oculta el menú principal + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_cs.desktop lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_cs.desktop --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_cs.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_cs.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,12 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Application menu -Comment=A menu of all your applications. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[cs]=Nabídka se všemi nainstalovanými aplikacemi Name[cs]=Nabídka aplikací +Comment[cs]=Nabídka se všemi nainstalovanými aplikacemi diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_cs.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_cs.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_cs.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_cs.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... Hledat… - + Show/hide main menu Zobrazit/skrýt hlavní nabídku + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration @@ -39,7 +70,7 @@ Custom font size: - Uživatelem určená velikost písma: + Uživatelem stanovená velikost písma: diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_cy.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_cy.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_cy.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_cy.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... - + Show/hide main menu + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_da.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_da.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_da.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_da.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... Søg... - + Show/hide main menu Vis/skjul hovedmenu + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_de.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_de.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_de.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_de.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... Suchen... - + Show/hide main menu Hauptmenü anzeigen/ausblenden + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_el.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_el.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_el.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_el.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,48 @@ LXQtMainMenu - + Search... Αναζήτηση... - + Show/hide main menu Εμφάνιση/απόκρυψη του κύριου μενού + + + Add to desktop + Προσθήκη στην επιφάνεια εργασίας + + + + Question + Ερώτηση + + + + A file with the same name already exists. +Do you want to overwrite it? + Ένα αρχείο με το ίδιο όνομα υπάρχει ήδη. +Επιθυμείτε να το αντικαταστήσετε; + + + + + Warning + Προειδοποίηση + + + + The file cannot be overwritten. + Το αρχείο δεν μπορεί να αντικατασταθεί. + + + + Copy + Αντιγραφή + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_eo.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_eo.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_eo.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_eo.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... - + Show/hide main menu + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_es.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_es.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_es.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_es.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... Buscar... - + Show/hide main menu Mostrar/ocultar el menú principal + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_es_UY.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_es_UY.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_es_UY.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_es_UY.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,44 @@ LXQtMainMenu - + Search... - + Buscar... - + Show/hide main menu + Mostrar/esconder el menú principal + + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_es_VE.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_es_VE.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_es_VE.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_es_VE.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... - + Show/hide main menu + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_eu.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_eu.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_eu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_eu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... - + Show/hide main menu + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_fi.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_fi.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_fi.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_fi.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... Etsi... - + Show/hide main menu Näytä/piilota päävalikko + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration @@ -44,7 +75,7 @@ pt - + pt @@ -64,32 +95,32 @@ Max. item width: - + Tuloksien leveys: Show matching entries: - + Hakutuloksien näyttäminen: Maximum visible items: - + Enintään: Filter menu entries - + Näytä vain hakutuloksien kategoriat px - + px Hide menu entries while searching - + Älä näytä kategorioita haun aikana diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_fr.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_fr.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_fr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_fr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... Recherche... - + Show/hide main menu Afficher/Cacher le menu principal + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration @@ -104,7 +135,7 @@ Click the button to record shortcut: - Cliquez sur le bouton pour enregistrer le raccourci : + Cliquer sur le bouton pour enregistrer le raccourci : @@ -119,12 +150,12 @@ Images (*.svg *.png) - Image(s) (*.svg *.png) + Images (*.svg *.png) Choose menu file - Choisissez un fichier de menu + Choisir un fichier de menu diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_gl.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_gl.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_gl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_gl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,14 +4,45 @@ LXQtMainMenu - + Search... Buscar... - + Show/hide main menu - Amosar/agachar o menú principal + Amosar/agochar o menú principal + + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + @@ -89,7 +120,7 @@ Hide menu entries while searching - Agachar as entradas do menú nas buscas + Agochar as entradas do menú nas buscas diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_he.desktop lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_he.desktop --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_he.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_he.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[he]=תפריט יישומים +Comment[he]=תפריט לכל היישומים שלך. diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_he.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_he.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_he.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_he.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... חיפוש… - + Show/hide main menu הצגת/הסתרת תפריט ראשי + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_hr.desktop lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_hr.desktop --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=Izbornik programa +Comment[hr]=Izbornik svih programa. diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_hr.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_hr.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_hr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_hr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,14 +4,45 @@ LXQtMainMenu - + Search... - + Traži … - + Show/hide main menu - Pokaži/sakrij glavni izbornik + Prikaži/sakrij glavni izbornik + + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + @@ -19,117 +50,117 @@ General - Općenito + Opće Main Menu settings - Postavke glavnoga izbornika + Glavni izbornik – Postavke Icon: - + Ikona: Button text: - + Tekst gumba: Custom font size: - Prilagođena veličina fonta: + Prilagođena veličina fonta: pt - pt + pt Menu file - Datoteka izbornika + Datoteka izbornika Menu file: - Datoteka izbornika: + Datoteka izbornika: Keyboard Shortcut - Kratica tipkovnice + Tipkovnički prečac Click the button to record shortcut: - + Pritisni gumb za snimanje pračaca: Search - + Pretraga Max. item width: - + Maks. širina elementa: Show matching entries: - + Prikaži poklapajuće unose: Maximum visible items: - + Maks. broj vidljivih elemenata: Filter menu entries - + Filtriraj unose izbornika px - + px Hide menu entries while searching - + Sakrij unose izbornika tijekom pretrage Clear search upon showing menu - + Ukloni pretragu pri prikazu izbornika Reset - + Resetiraj Choose icon file - + Odaberi datoteku ikone Images (*.svg *.png) - + Slike (*.svg *.png) Choose menu file - Izaberite datoteku izbornika + Odaberi datoteku izbornika Menu files (*.menu) - + Datoteke izbornika (*.menu) diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_hu.desktop lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_hu.desktop --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_hu.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_hu.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -8,5 +8,5 @@ # Translations -Comment[hu]=Alkalmazásindító alapú menü +Comment[hu]=Egy menü az alkalmazások indításához Name[hu]=Alkalmazásmenü diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_hu.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_hu.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_hu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_hu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,14 +4,46 @@ LXQtMainMenu - + Search... - Keres... + Keresés... - + Show/hide main menu - Menü láttatás/elrejtés + Menü megjelenítése/elrejtése + + + + Add to desktop + Hozzáadás asztalhoz + + + + Question + Kérdés + + + + A file with the same name already exists. +Do you want to overwrite it? + Már létezik azonos nevű fájl. +Felül szeretné írni? + + + + Warning + Figyelmeztetés + + + + The file cannot be overwritten. + A fájlt nem lehet felülírni. + + + + Copy + Másolás @@ -24,7 +56,7 @@ Main Menu settings - Menübeállítás + Menü beállítások @@ -59,12 +91,12 @@ Search - Keres + Keresés Max. item width: - + Maximum elemszélesség: @@ -74,12 +106,12 @@ Maximum visible items: - Maximálisan látható tételek: + Maximálisan látható elemek: Filter menu entries - Szűrő menü elemek + Menüelemek keresése @@ -94,7 +126,7 @@ Clear search upon showing menu - Törölje a keresést a menüből + Törölje a keresést a menü megjelenítésekor @@ -104,17 +136,17 @@ Click the button to record shortcut: - Billentyű nyomása a megjegyzéshez: + Gyorsbillentyű beállítása: Reset - Visszaállít + Visszaállítás Choose icon file - Ikonfájl választás + Ikon kiválasztása diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_ia.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_ia.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_ia.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_ia.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... - + Show/hide main menu + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_id.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_id.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_id.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_id.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... Cari... - + Show/hide main menu Tampilkan/sembunyikan menu utama + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_it.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_it.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_it.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_it.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,47 @@ LXQtMainMenu - + Search... Cerca... - + Show/hide main menu Mostra/nascondi menu principale + + + Add to desktop + Aggiungi al desktop + + + + Question + Domanda + + + + A file with the same name already exists. +Do you want to overwrite it? + Un file dello stesso nome esiste già. +Sovrascriverlo? + + + + Warning + Attenzione + + + + The file cannot be overwritten. + Impossibile sovrascrivere il file. + + + + Copy + Copia + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_ja.desktop lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_ja.desktop --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_ja.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_ja.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,12 +1,3 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Application menu -Comment=A menu of all your applications. - -#TRANSLATIONS_DIR=../translations - - # Translations -Comment[ja]=アプリケーションランチャーを元にしたメニューです Name[ja]=アプリケーションメニュー +Comment[ja]=アプリケーションをメニューに表示します diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_ja.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_ja.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_ja.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_ja.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,14 +4,45 @@ LXQtMainMenu - + Search... 検索... - + Show/hide main menu - メインメニューを表示/隠す + アプリケーションメニューの表示/非表示 + + + + Add to desktop + デスクトップに追加する + + + + Question + 質問 + + + + A file with the same name already exists. +Do you want to overwrite it? + 同じ名前のファイルが既に存在します。上書きしますか？ + + + + Warning + 警告 + + + + The file cannot be overwritten. + ファイルを上書き出来ません。 + + + + Copy + コピー @@ -24,7 +55,7 @@ Main Menu settings - メインメニューの設定 + アプリケーションメニューの設定 @@ -64,37 +95,37 @@ Max. item width: - + アイテムの表示最大幅: Show matching entries: - + 一致するエントリ名を表示: Maximum visible items: - + アイテムの表示最大数: Filter menu entries - + メニューエントリの絞り込みをする px - + ピクセル Hide menu entries while searching - 検索中はメニューエントリーを隠す + 検索中はメニューエントリを隠す Clear search upon showing menu - メニューの表示時は検索フォームをクリアする + メニューを表示した時、検索フォームをクリアする @@ -124,12 +155,12 @@ Choose menu file - メニューファイルを選択 + メニューファイルの選択 Menu files (*.menu) - メニューファイル(*.menu) + メニューファイル (*.menu) diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_ko.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_ko.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_ko.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_ko.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... 검색... - + Show/hide main menu 메뉴 보이기/감추기 + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_lt.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_lt.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_lt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_lt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... Ieškoti... - + Show/hide main menu Rodyti/slėpti pagrindinį meniu + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_nb_NO.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_nb_NO.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_nb_NO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_nb_NO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... Søk... - + Show/hide main menu Vis eller skjul hovedmeny + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration @@ -39,12 +70,12 @@ Custom font size: - Egen skriftstørrelse: + Selvvalgt skriftstørrelse: pt - punkter + pt @@ -74,7 +105,7 @@ Maximum visible items: - Maksimum synlige valg: + Maksimum synlige elementer: @@ -84,7 +115,7 @@ px - piksler + pk @@ -104,12 +135,12 @@ Click the button to record shortcut: - Klikk knappen for ny tastaturkommando: + Klikk knappen for ny tastatursnarevei: Reset - + Nullstill diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_nl.desktop lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_nl.desktop --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_nl.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_nl.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,12 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Application menu -Comment=A menu of all your applications. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[nl]=Menu-gebasseerde applicatie starter -Name[nl]=Applicatie menu +Name[nl]=Applicatie-menu +Comment[nl]=Een menu met alle applicaties diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_nl.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_nl.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_nl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_nl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,22 +4,53 @@ LXQtMainMenu - + Search... Zoeken... - + Show/hide main menu Toon/verberg hoofdmenu + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration Main Menu settings - Instellingen van hoofdmenu + Instellingen van Hoofdmenu @@ -74,7 +105,7 @@ Max. item width: - Max. elementbreedte: + Maximum elementbreedte: diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_pl.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_pl.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_pl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_pl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... Szukaj... - + Show/hide main menu Pokaż/ukryj główne menu + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_pt_BR.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_pt_BR.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_pt_BR.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_pt_BR.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,47 @@ LXQtMainMenu - + Search... Pesquisar... - + Show/hide main menu Exibir/ocultar o menu principal + + + Add to desktop + Adicionar à área de trabalho + + + + Question + Questão + + + + A file with the same name already exists. +Do you want to overwrite it? + Já existe um arquivo com o mesmo nome. +Você deseja sobrescrevê-lo? + + + + Warning + Atenção + + + + The file cannot be overwritten. + O arquivo não pode ser sobrescrito. + + + + Copy + Copiar + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_pt.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_pt.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_pt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_pt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... Pesquisar... - + Show/hide main menu Mostrar/ocultar menu principal + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_ro_RO.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_ro_RO.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_ro_RO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_ro_RO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... Cautare ... - + Show/hide main menu Afișează/Ascunde meniul principal + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_ru.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_ru.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_ru.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_ru.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... Найти... - + Show/hide main menu Показать/скрыть главное меню + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_sk_SK.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_sk_SK.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_sk_SK.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_sk_SK.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... Hľadať... - + Show/hide main menu Zobraziť/skryť hlavné menu + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration @@ -34,17 +65,17 @@ Button text: - + Text tlačidla: Custom font size: - + Vlastná veľkosť písma: pt - + pt @@ -54,12 +85,12 @@ Menu file: - + Súbor menu: Search - + Hľadať @@ -69,17 +100,17 @@ Show matching entries: - + Zobraziť zodpovedajúce položky: Maximum visible items: - + Maximum viditeľných položiek: Filter menu entries - + Filtrovať položky menu @@ -94,7 +125,7 @@ Clear search upon showing menu - + Po zobrazení menu vymazať históriu vyhľadávania @@ -104,17 +135,17 @@ Click the button to record shortcut: - + Kliknite na tlačidlo pre uloženie: Reset - + Vrátiť späť Choose icon file - + Vybrať ikonu súboru diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_sl.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_sl.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_sl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_sl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,13 +4,44 @@ LXQtMainMenu - + Search... - + Išči... - + Show/hide main menu + Prikaži/skrij glavni meni + + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy @@ -24,77 +55,77 @@ Main Menu settings - + Nastavitve glavnega menija Icon: - + Ikona: Button text: - + Besedilo gumba: Custom font size: - + Velikost pisave: pt - + pt Menu file - Datoteka z menijem + Datoteka z menijskimi vnosi Menu file: - + Lokacija datoteke: Search - + Iskanje Max. item width: - + Maks. širina vnosa: Show matching entries: - + Prikaz ujemanj iskanja: Maximum visible items: - + Največje število elementov: Filter menu entries - + Ne išči po kategorijah px - + px Hide menu entries while searching - + Med iskanjem ne kaži kategorij Clear search upon showing menu - + Počisti iskanje ob vnovičnem odpiranju menija @@ -109,17 +140,17 @@ Reset - + Ponastavi Choose icon file - + Izberite ikono Images (*.svg *.png) - + Sličice (*.svg *.png) @@ -129,7 +160,7 @@ Menu files (*.menu) - Datoteke z menijem (*.menu) + Menijske datoteke (*.menu) diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_sr_BA.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_sr_BA.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_sr_BA.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_sr_BA.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... - + Show/hide main menu + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_sr@latin.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_sr@latin.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_sr@latin.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_sr@latin.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... - + Show/hide main menu + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_sr_RS.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_sr_RS.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_sr_RS.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_sr_RS.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... - + Show/hide main menu + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_th_TH.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_th_TH.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_th_TH.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_th_TH.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... - + Show/hide main menu + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_tr.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_tr.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_tr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_tr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... Ara... - + Show/hide main menu Ana menüyü göster/gizle + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... - + Show/hide main menu + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_uk.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_uk.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_uk.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_uk.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... Пошук... - + Show/hide main menu Показати/сховати головне меню + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_zh_CN.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_zh_CN.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_zh_CN.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_zh_CN.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... 搜索... - + Show/hide main menu 显示/隐藏主菜单 + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_zh_TW.ts lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_zh_TW.ts --- lxqt-panel-0.14.1/plugin-mainmenu/translations/mainmenu_zh_TW.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/translations/mainmenu_zh_TW.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,15 +4,46 @@ LXQtMainMenu - + Search... 搜尋... - + Show/hide main menu 顯示/隱藏 主選單 + + + Add to desktop + + + + + Question + + + + + A file with the same name already exists. +Do you want to overwrite it? + + + + + Warning + + + + + The file cannot be overwritten. + + + + + Copy + + LXQtMainMenuConfiguration diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/xdgcachedmenu.cpp lxqt-panel-0.16.1/plugin-mainmenu/xdgcachedmenu.cpp --- lxqt-panel-0.14.1/plugin-mainmenu/xdgcachedmenu.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/xdgcachedmenu.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -39,7 +39,7 @@ , iconName_{QString::fromUtf8(menu_cache_item_get_icon(item))} { QString title = QString::fromUtf8(menu_cache_item_get_name(item)); - title = title.replace('&', QLatin1String("&&")); // & is reserved for mnemonics + title = title.replace(QLatin1Char('&'), QLatin1String("&&")); // & is reserved for mnemonics setText(title); // Only set tooltips for app items if(menu_cache_item_get_type(item) == MENU_CACHE_TYPE_APP) @@ -64,7 +64,7 @@ QIcon icon = QIcon::fromTheme(iconName_); if (icon.isNull()) - icon = QIcon::fromTheme("unknown"); + icon = QIcon::fromTheme(QStringLiteral("unknown")); // Some themes may lack the "unknown" icon; checking null prevents // infinite recursion (setIcon->dataChanged->updateIcon->setIcon) if (icon.isNull()) @@ -169,7 +169,7 @@ { QHelpEvent* helpEvent = static_cast(event); QAction* action = actionAt(helpEvent->pos()); - if(action && action->menu() == NULL) + if(action && action->menu() == nullptr) QToolTip::showText(helpEvent->globalPos(), action->toolTip(), this); } @@ -190,7 +190,7 @@ return; QList urls; - urls << QUrl(QString("file://%1").arg(a->filePath())); + urls << QUrl(QString::fromLatin1("file://%1").arg(a->filePath())); QMimeData *mimeData = new QMimeData(); mimeData->setUrls(urls); diff -Nru lxqt-panel-0.14.1/plugin-mainmenu/xdgcachedmenu.h lxqt-panel-0.16.1/plugin-mainmenu/xdgcachedmenu.h --- lxqt-panel-0.14.1/plugin-mainmenu/xdgcachedmenu.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mainmenu/xdgcachedmenu.h 2020-11-05 16:09:19.000000000 +0000 @@ -31,7 +31,7 @@ { Q_OBJECT public: - XdgCachedMenu(QWidget* parent = NULL); + XdgCachedMenu(QWidget* parent = nullptr); XdgCachedMenu(MenuCache* menuCache, QWidget* parent); virtual ~XdgCachedMenu(); @@ -55,7 +55,7 @@ { Q_OBJECT public: - explicit XdgCachedMenuAction(MenuCacheItem* item, QObject* parent = 0); + explicit XdgCachedMenuAction(MenuCacheItem* item, QObject* parent = nullptr); inline const QString & filePath() const { return filePath_; } void updateIcon(); diff -Nru lxqt-panel-0.14.1/plugin-mount/actions/deviceaction.cpp lxqt-panel-0.16.1/plugin-mount/actions/deviceaction.cpp --- lxqt-panel-0.14.1/plugin-mount/actions/deviceaction.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/actions/deviceaction.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -38,9 +38,9 @@ #define ACT_INFO "showInfo" #define ACT_MENU "showMenu" -#define ACT_NOTHING_UPPER QString(ACT_NOTHING).toUpper() -#define ACT_INFO_UPPER QString(ACT_INFO).toUpper() -#define ACT_MENU_UPPER QString(ACT_MENU).toUpper() +#define ACT_NOTHING_UPPER QStringLiteral(ACT_NOTHING).toUpper() +#define ACT_INFO_UPPER QStringLiteral(ACT_INFO).toUpper() +#define ACT_MENU_UPPER QStringLiteral(ACT_MENU).toUpper() DeviceAction::DeviceAction(LXQtMountPlugin *plugin, QObject *parent) : QObject(parent) @@ -73,12 +73,12 @@ { switch (id) { - case ActionNothing: return ACT_NOTHING; - case ActionInfo: return ACT_INFO; - case ActionMenu: return ACT_MENU; + case ActionNothing: return QStringLiteral(ACT_NOTHING); + case ActionInfo: return QStringLiteral(ACT_INFO); + case ActionMenu: return QStringLiteral(ACT_MENU); } - return ACT_INFO; + return QStringLiteral(ACT_INFO); } void DeviceAction::onDeviceAdded(Solid::Device device) diff -Nru lxqt-panel-0.14.1/plugin-mount/actions/deviceaction.h lxqt-panel-0.16.1/plugin-mount/actions/deviceaction.h --- lxqt-panel-0.14.1/plugin-mount/actions/deviceaction.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/actions/deviceaction.h 2020-11-05 16:09:19.000000000 +0000 @@ -49,7 +49,7 @@ virtual ~DeviceAction(); virtual ActionId Type() const throw () = 0; - static DeviceAction *create(ActionId id, LXQtMountPlugin *plugin, QObject *parent = 0); + static DeviceAction *create(ActionId id, LXQtMountPlugin *plugin, QObject *parent = nullptr); static ActionId stringToActionId(const QString &string, ActionId defaultValue); static QString actionIdToString(ActionId id); @@ -58,7 +58,7 @@ void onDeviceRemoved(Solid::Device device); protected: - explicit DeviceAction(LXQtMountPlugin *plugin, QObject *parent = 0); + explicit DeviceAction(LXQtMountPlugin *plugin, QObject *parent = nullptr); virtual void doDeviceAdded(Solid::Device device) = 0; virtual void doDeviceRemoved(Solid::Device device) = 0; diff -Nru lxqt-panel-0.14.1/plugin-mount/actions/deviceaction_info.h lxqt-panel-0.16.1/plugin-mount/actions/deviceaction_info.h --- lxqt-panel-0.14.1/plugin-mount/actions/deviceaction_info.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/actions/deviceaction_info.h 2020-11-05 16:09:19.000000000 +0000 @@ -39,7 +39,7 @@ { Q_OBJECT public: - explicit DeviceActionInfo(LXQtMountPlugin *plugin, QObject *parent = 0); + explicit DeviceActionInfo(LXQtMountPlugin *plugin, QObject *parent = nullptr); virtual ActionId Type() const throw () { return ActionInfo; } protected: diff -Nru lxqt-panel-0.14.1/plugin-mount/actions/deviceaction_menu.cpp lxqt-panel-0.16.1/plugin-mount/actions/deviceaction_menu.cpp --- lxqt-panel-0.14.1/plugin-mount/actions/deviceaction_menu.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/actions/deviceaction_menu.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -39,12 +39,12 @@ connect(&mHideTimer, &QTimer::timeout, mPopup, &Popup::hide); } -void DeviceActionMenu::doDeviceAdded(Solid::Device device) +void DeviceActionMenu::doDeviceAdded(Solid::Device /*device*/) { mHideTimer.start(); mPopup->show(); } -void DeviceActionMenu::doDeviceRemoved(Solid::Device device) +void DeviceActionMenu::doDeviceRemoved(Solid::Device /*device*/) { } diff -Nru lxqt-panel-0.14.1/plugin-mount/actions/deviceaction_menu.h lxqt-panel-0.16.1/plugin-mount/actions/deviceaction_menu.h --- lxqt-panel-0.14.1/plugin-mount/actions/deviceaction_menu.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/actions/deviceaction_menu.h 2020-11-05 16:09:19.000000000 +0000 @@ -39,7 +39,7 @@ { Q_OBJECT public: - explicit DeviceActionMenu(LXQtMountPlugin *plugin, QObject *parent = 0); + explicit DeviceActionMenu(LXQtMountPlugin *plugin, QObject *parent = nullptr); virtual ActionId Type() const throw () { return ActionMenu; } protected: diff -Nru lxqt-panel-0.14.1/plugin-mount/actions/deviceaction_nothing.cpp lxqt-panel-0.16.1/plugin-mount/actions/deviceaction_nothing.cpp --- lxqt-panel-0.14.1/plugin-mount/actions/deviceaction_nothing.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/actions/deviceaction_nothing.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -32,10 +32,10 @@ { } -void DeviceActionNothing::doDeviceAdded(Solid::Device device) +void DeviceActionNothing::doDeviceAdded(Solid::Device /*device*/) { } -void DeviceActionNothing::doDeviceRemoved(Solid::Device device) +void DeviceActionNothing::doDeviceRemoved(Solid::Device /*device*/) { } diff -Nru lxqt-panel-0.14.1/plugin-mount/actions/deviceaction_nothing.h lxqt-panel-0.16.1/plugin-mount/actions/deviceaction_nothing.h --- lxqt-panel-0.14.1/plugin-mount/actions/deviceaction_nothing.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/actions/deviceaction_nothing.h 2020-11-05 16:09:19.000000000 +0000 @@ -37,7 +37,7 @@ Q_OBJECT public: - explicit DeviceActionNothing(LXQtMountPlugin *plugin, QObject *parent = 0); + explicit DeviceActionNothing(LXQtMountPlugin *plugin, QObject *parent = nullptr); virtual ActionId Type() const throw () { return ActionNothing; }; protected: diff -Nru lxqt-panel-0.14.1/plugin-mount/actions/ejectaction.cpp lxqt-panel-0.16.1/plugin-mount/actions/ejectaction.cpp --- lxqt-panel-0.14.1/plugin-mount/actions/ejectaction.cpp 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/actions/ejectaction.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,86 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * https://lxqt.org + * + * Copyright: 2020 LXQt team + * Authors: + * Oleksandr Ostrenko + * + * 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 "ejectaction.h" +#include "ejectaction_nothing.h" +#include "ejectaction_optical.h" +#include "../lxqtmountplugin.h" + +#define ACT_NOTHING "nothing" +#define ACT_EJECT_OPTICAL "ejectOpticalDrives" + +#define ACT_NOTHING_UPPER QStringLiteral(ACT_NOTHING).toUpper() +#define ACT_EJECT_OPTICAL_UPPER QStringLiteral(ACT_EJECT_OPTICAL).toUpper() + +EjectAction::EjectAction(LXQtMountPlugin *plugin, QObject *parent) + : QObject(parent) + , mPlugin(plugin) +{ +} + +EjectAction::~EjectAction() +{ +} + +EjectAction *EjectAction::create(ActionId id, LXQtMountPlugin *plugin, QObject *parent) +{ + switch (id) + { + case ActionNothing: + return new EjectActionNothing(plugin, parent); + + case ActionOptical: + return new EjectActionOptical(plugin, parent); + } + + return nullptr; +} + +QString EjectAction::actionIdToString(EjectAction::ActionId id) +{ + switch (id) + { + case ActionNothing: return QStringLiteral(ACT_NOTHING); + case ActionOptical: return QStringLiteral(ACT_EJECT_OPTICAL); + } + + return QStringLiteral(ACT_NOTHING); +} + +void EjectAction::onEjectPressed(void) +{ + doEjectPressed(); +} + +EjectAction::ActionId EjectAction::stringToActionId(const QString &string, ActionId defaultValue) +{ + QString s = string.toUpper(); + if (s == ACT_NOTHING_UPPER) return ActionNothing; + if (s == ACT_EJECT_OPTICAL_UPPER) return ActionOptical; + + return defaultValue; +} diff -Nru lxqt-panel-0.14.1/plugin-mount/actions/ejectaction.h lxqt-panel-0.16.1/plugin-mount/actions/ejectaction.h --- lxqt-panel-0.14.1/plugin-mount/actions/ejectaction.h 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/actions/ejectaction.h 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,65 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * https://lxqt.org + * + * Copyright: 2020 LXQt team + * Authors: + * Oleksandr Ostrenko + * + * 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_PLUGIN_MOUNT_EJECTACTION_H +#define LXQT_PLUGIN_MOUNT_EJECTACTION_H + +#include +#include +#include + +class LXQtMountPlugin; + +class EjectAction: public QObject +{ + Q_OBJECT + +public: + enum ActionId + { + ActionNothing, + ActionOptical + }; + + virtual ~EjectAction(); + virtual ActionId Type() const throw () = 0; + + static EjectAction *create(ActionId id, LXQtMountPlugin *plugin, QObject *parent = nullptr); + static ActionId stringToActionId(const QString &string, ActionId defaultValue); + static QString actionIdToString(ActionId id); + +public slots: + void onEjectPressed(void); + +protected: + explicit EjectAction(LXQtMountPlugin *plugin, QObject *parent = nullptr); + virtual void doEjectPressed() = 0; + + LXQtMountPlugin *mPlugin; +}; + +#endif // EJECTACTION_H diff -Nru lxqt-panel-0.14.1/plugin-mount/actions/ejectaction_nothing.cpp lxqt-panel-0.16.1/plugin-mount/actions/ejectaction_nothing.cpp --- lxqt-panel-0.14.1/plugin-mount/actions/ejectaction_nothing.cpp 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/actions/ejectaction_nothing.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,37 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * https://lxqt.org + * + * Copyright: 2020 LXQt team + * Authors: + * Oleksandr Ostrenko + * + * 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 "ejectaction_nothing.h" + +EjectActionNothing::EjectActionNothing(LXQtMountPlugin *plugin, QObject *parent): + EjectAction(plugin, parent) +{ +} + +void EjectActionNothing::doEjectPressed(void) +{ +} diff -Nru lxqt-panel-0.14.1/plugin-mount/actions/ejectaction_nothing.h lxqt-panel-0.16.1/plugin-mount/actions/ejectaction_nothing.h --- lxqt-panel-0.14.1/plugin-mount/actions/ejectaction_nothing.h 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/actions/ejectaction_nothing.h 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,47 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * https://lxqt.org + * + * Copyright: 2020 LXQt team + * Authors: + * Oleksandr Ostrenko + * + * 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_PLUGIN_MOUNT_EJECTACTION_NOTHING_H +#define LXQT_PLUGIN_MOUNT_EJECTACTION_NOTHING_H + +#include "ejectaction.h" +#include + +class EjectActionNothing : public EjectAction +{ + Q_OBJECT + +public: + explicit EjectActionNothing(LXQtMountPlugin *plugin, QObject *parent = nullptr); + virtual ActionId Type() const throw () { return ActionNothing; }; + +protected: + void doEjectPressed(void); +}; + +#endif // EJECTACTION_NOTHING_H diff -Nru lxqt-panel-0.14.1/plugin-mount/actions/ejectaction_optical.cpp lxqt-panel-0.16.1/plugin-mount/actions/ejectaction_optical.cpp --- lxqt-panel-0.14.1/plugin-mount/actions/ejectaction_optical.cpp 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/actions/ejectaction_optical.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,60 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * https://lxqt.org + * + * Copyright: 2020 LXQt team + * Authors: + * Oleksandr Ostrenko + * + * 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 "../lxqtmountplugin.h" +#include "ejectaction_optical.h" + +#include +#include +#include +#include + +#include +//#include + +EjectActionOptical::EjectActionOptical(LXQtMountPlugin *plugin, QObject *parent): + EjectAction(plugin, parent) +{ +} + +void EjectActionOptical::doEjectPressed(void) +{ + for (const Solid::Device& device : Solid::Device::listFromType(Solid::DeviceInterface::OpticalDrive)) + { + Solid::Device it; + if (device.isValid()) + { + it = device; + //qDebug() << "device : " << it.udi() << "\n"; + // search for parent drive + for (; !it.udi().isEmpty(); it = it.parent()) + if (it.is()) + it.as()->eject(); + } + } + LXQt::Notification::notify(tr("Removable media/devices manager"), tr("Ejected all optical drives"), mPlugin->icon().name()); +} diff -Nru lxqt-panel-0.14.1/plugin-mount/actions/ejectaction_optical.h lxqt-panel-0.16.1/plugin-mount/actions/ejectaction_optical.h --- lxqt-panel-0.14.1/plugin-mount/actions/ejectaction_optical.h 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/actions/ejectaction_optical.h 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,46 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * https://lxqt.org + * + * Copyright: 2020 LXQt team + * Authors: + * Oleksandr Ostrenko + * + * 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_PLUGIN_MOUNT_EJECTACTION_OPTICAL_H +#define LXQT_PLUGIN_MOUNT_EJECTACTION_OPTICAL_H + +#include "ejectaction.h" + +#include + +class EjectActionOptical : public EjectAction +{ + Q_OBJECT +public: + explicit EjectActionOptical(LXQtMountPlugin *plugin, QObject *parent = nullptr); + virtual ActionId Type() const throw () { return ActionOptical; } + +protected: + void doEjectPressed(void); +}; + +#endif // EJECTACTION_OPTICAL_H diff -Nru lxqt-panel-0.14.1/plugin-mount/button.h lxqt-panel-0.16.1/plugin-mount/button.h --- lxqt-panel-0.14.1/plugin-mount/button.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/button.h 2020-11-05 16:09:19.000000000 +0000 @@ -36,7 +36,7 @@ { Q_OBJECT public: - Button(QWidget *parent = 0); + Button(QWidget *parent = nullptr); ~Button(); }; diff -Nru lxqt-panel-0.14.1/plugin-mount/CMakeLists.txt lxqt-panel-0.16.1/plugin-mount/CMakeLists.txt --- lxqt-panel-0.14.1/plugin-mount/CMakeLists.txt 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/CMakeLists.txt 2020-11-05 16:09:19.000000000 +0000 @@ -10,6 +10,9 @@ actions/deviceaction_info.h actions/deviceaction_menu.h actions/deviceaction_nothing.h + actions/ejectaction.h + actions/ejectaction_optical.h + actions/ejectaction_nothing.h ) set(SOURCES @@ -22,6 +25,9 @@ actions/deviceaction_info.cpp actions/deviceaction_menu.cpp actions/deviceaction_nothing.cpp + actions/ejectaction.cpp + actions/ejectaction_optical.cpp + actions/ejectaction_nothing.cpp ) set(UIS @@ -29,6 +35,6 @@ ) find_package(KF5Solid ${QT_MINIMUM_VERSION} REQUIRED) -set(LIBRARIES Qt5Xdg KF5::Solid) +set(LIBRARIES Qt5Xdg lxqt-globalkeys KF5::Solid) BUILD_LXQT_PLUGIN(${PLUGIN}) diff -Nru lxqt-panel-0.14.1/plugin-mount/configuration.cpp lxqt-panel-0.16.1/plugin-mount/configuration.cpp --- lxqt-panel-0.14.1/plugin-mount/configuration.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/configuration.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -37,13 +37,27 @@ ui(new Ui::Configuration) { ui->setupUi(this); + + ui->devAddedLabel->sizePolicy().setHorizontalStretch(1); + ui->devAddedCombo->addItem(tr("Popup menu"), QLatin1String(ACT_SHOW_MENU)); ui->devAddedCombo->addItem(tr("Show info"), QLatin1String(ACT_SHOW_INFO)); ui->devAddedCombo->addItem(tr("Do nothing"), QLatin1String(ACT_NOTHING)); + ui->devAddedCombo->sizePolicy().setHorizontalStretch(1); + + ui->ejectPressedLabel->sizePolicy().setHorizontalStretch(1); + + ui->ejectPressedCombo->addItem(tr("Do nothing"), QLatin1String(ACT_NOTHING)); + ui->ejectPressedCombo->addItem(tr("Eject All Optical Drives"), QLatin1String(ACT_EJECT_OPTICAL)); + ui->ejectPressedCombo->sizePolicy().setHorizontalStretch(1); + + adjustSize(); loadSettings(); connect(ui->devAddedCombo, static_cast(&QComboBox::currentIndexChanged), this, &Configuration::devAddedChanged); + connect(ui->ejectPressedCombo, static_cast(&QComboBox::currentIndexChanged), + this, &Configuration::ejectPressedChanged); connect(ui->buttons, &QDialogButtonBox::clicked, this, &Configuration::dialogButtonsAction); } @@ -56,6 +70,9 @@ { QVariant value = settings().value(QLatin1String(CFG_KEY_ACTION), QLatin1String(ACT_SHOW_INFO)); setComboboxIndexByData(ui->devAddedCombo, value, 1); + + value = settings().value(QLatin1String(CFG_EJECT_ACTION), QLatin1String(ACT_NOTHING)); + setComboboxIndexByData(ui->ejectPressedCombo, value, 1); } void Configuration::devAddedChanged(int index) @@ -63,3 +80,9 @@ QString s = ui->devAddedCombo->itemData(index).toString(); settings().setValue(QLatin1String(CFG_KEY_ACTION), s); } + +void Configuration::ejectPressedChanged(int index) +{ + QString s = ui->ejectPressedCombo->itemData(index).toString(); + settings().setValue(QLatin1String(CFG_EJECT_ACTION), s); +} diff -Nru lxqt-panel-0.14.1/plugin-mount/configuration.h lxqt-panel-0.16.1/plugin-mount/configuration.h --- lxqt-panel-0.14.1/plugin-mount/configuration.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/configuration.h 2020-11-05 16:09:19.000000000 +0000 @@ -30,10 +30,12 @@ #include "../panel/lxqtpanelpluginconfigdialog.h" -#define CFG_KEY_ACTION "newDeviceAction" -#define ACT_SHOW_MENU "showMenu" -#define ACT_SHOW_INFO "showInfo" -#define ACT_NOTHING "nothing" +#define CFG_KEY_ACTION "newDeviceAction" +#define CFG_EJECT_ACTION "ejectAction" +#define ACT_SHOW_MENU "showMenu" +#define ACT_SHOW_INFO "showInfo" +#define ACT_NOTHING "nothing" +#define ACT_EJECT_OPTICAL "ejectOpticalDrives" namespace Ui { class Configuration; @@ -44,12 +46,13 @@ Q_OBJECT public: - explicit Configuration(PluginSettings *settings, QWidget *parent = 0); + explicit Configuration(PluginSettings *settings, QWidget *parent = nullptr); ~Configuration(); protected slots: virtual void loadSettings(); void devAddedChanged(int index); + void ejectPressedChanged(int index); private: Ui::Configuration *ui; diff -Nru lxqt-panel-0.14.1/plugin-mount/configuration.ui lxqt-panel-0.16.1/plugin-mount/configuration.ui --- lxqt-panel-0.14.1/plugin-mount/configuration.ui 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/configuration.ui 2020-11-05 16:09:19.000000000 +0000 @@ -6,8 +6,8 @@ 0 0 - 407 - 129 + 607 + 170 @@ -19,17 +19,36 @@ Behaviour - - + + + QFormLayout::AllNonFixedFieldsGrow + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + When a device is connected: - + + + + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + When eject button is pressed: + + + + + + @@ -40,8 +59,8 @@ - 20 - 41 + 10 + 10 diff -Nru lxqt-panel-0.14.1/plugin-mount/lxqtmountplugin.cpp lxqt-panel-0.16.1/plugin-mount/lxqtmountplugin.cpp --- lxqt-panel-0.14.1/plugin-mount/lxqtmountplugin.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/lxqtmountplugin.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -28,13 +28,21 @@ #include "lxqtmountplugin.h" #include "configuration.h" +#include + +#include + #include +#define DEFAULT_EJECT_SHORTCUT "XF86Eject" + LXQtMountPlugin::LXQtMountPlugin(const ILXQtPanelPluginStartupInfo &startupInfo): QObject(), ILXQtPanelPlugin(startupInfo), mPopup(nullptr), - mDeviceAction(nullptr) + mDeviceAction(nullptr), + mEjectAction(nullptr), + mKeyEject(nullptr) { mButton = new Button; mPopup = new Popup(this); @@ -51,6 +59,29 @@ delete mPopup; } + +void LXQtMountPlugin::shortcutRegistered() +{ + GlobalKeyShortcut::Action * const shortcut = qobject_cast(sender()); + + if (shortcut == mKeyEject) + { + disconnect(mKeyEject, &GlobalKeyShortcut::Action::registrationFinished, this, &LXQtMountPlugin::shortcutRegistered); + + if (mKeyEject->shortcut().isEmpty()) + { + mKeyEject->changeShortcut(QStringLiteral(DEFAULT_EJECT_SHORTCUT)); + if (mKeyEject->shortcut().isEmpty()) + { +// QString errorMsg = tr("Failed to register shortcut \"%1\""); +// errorMsg = errorMsg.arg(DEFAULT_EJECT_SHORTCUT); +// LXQt::Notification::notify(tr("Removable media/devices manager"), errorMsg, "media-eject"); + LXQt::Notification::notify(tr("Removable media/devices manager: Global shortcut '%1' cannot be registered").arg(QStringLiteral(DEFAULT_EJECT_SHORTCUT))); + } + } + } +} + QDialog *LXQtMountPlugin::configureDialog() { if (mPopup) @@ -69,15 +100,37 @@ void LXQtMountPlugin::settingsChanged() { QString s = settings()->value(QLatin1String(CFG_KEY_ACTION)).toString(); - DeviceAction::ActionId actionId = DeviceAction::stringToActionId(s, DeviceAction::ActionMenu); + DeviceAction::ActionId devActionId = DeviceAction::stringToActionId(s, DeviceAction::ActionMenu); - if (mDeviceAction == nullptr || mDeviceAction->Type() != actionId) + if (mDeviceAction == nullptr || mDeviceAction->Type() != devActionId) { delete mDeviceAction; - mDeviceAction = DeviceAction::create(actionId, this, this); + mDeviceAction = DeviceAction::create(devActionId, this, this); connect(mPopup, &Popup::deviceAdded, mDeviceAction, &DeviceAction::onDeviceAdded); connect(mPopup, &Popup::deviceRemoved, mDeviceAction, &DeviceAction::onDeviceRemoved); } + if(mKeyEject == nullptr) + { + mKeyEject = GlobalKeyShortcut::Client::instance()->addAction(QString(), QStringLiteral("/panel/%1/eject").arg(settings()->group()), tr("Eject removable media"), this); + if(mKeyEject) + { + connect(mKeyEject, &GlobalKeyShortcut::Action::registrationFinished, this, &LXQtMountPlugin::shortcutRegistered); + } + } + + s = settings()->value(QLatin1String(CFG_EJECT_ACTION)).toString(); + EjectAction::ActionId ejActionId = EjectAction::stringToActionId(s, EjectAction::ActionNothing); + + if ((mEjectAction == nullptr || mEjectAction->Type() != ejActionId) && mKeyEject) + { + if(mEjectAction) + mKeyEject->disconnect(mEjectAction); + + delete mEjectAction; + mEjectAction = EjectAction::create(ejActionId, this, this); + + connect(mKeyEject, &GlobalKeyShortcut::Action::activated, mEjectAction, &EjectAction::onEjectPressed); + } } diff -Nru lxqt-panel-0.14.1/plugin-mount/lxqtmountplugin.h lxqt-panel-0.16.1/plugin-mount/lxqtmountplugin.h --- lxqt-panel-0.14.1/plugin-mount/lxqtmountplugin.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/lxqtmountplugin.h 2020-11-05 16:09:19.000000000 +0000 @@ -33,9 +33,15 @@ #include "button.h" #include "popup.h" #include "actions/deviceaction.h" +#include "actions/ejectaction.h" #include +namespace GlobalKeyShortcut +{ + class Action; +} + /*! \author Petr Vanek */ @@ -61,11 +67,14 @@ protected slots: virtual void settingsChanged(); + void shortcutRegistered(); private: Button *mButton; Popup *mPopup; DeviceAction *mDeviceAction; + EjectAction *mEjectAction; + GlobalKeyShortcut::Action *mKeyEject; }; class LXQtMountPluginLibrary: public QObject, public ILXQtPanelPluginLibrary diff -Nru lxqt-panel-0.14.1/plugin-mount/menudiskitem.cpp lxqt-panel-0.16.1/plugin-mount/menudiskitem.cpp --- lxqt-panel-0.14.1/plugin-mount/menudiskitem.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/menudiskitem.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -52,14 +52,14 @@ Q_ASSERT(nullptr != iface); mDiskButton = new QToolButton(this); - mDiskButton->setObjectName("DiskButton"); + mDiskButton->setObjectName(QStringLiteral("DiskButton")); mDiskButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); mDiskButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); connect(mDiskButton, &QToolButton::clicked, this, &MenuDiskItem::diskButtonClicked); mEjectButton = new QToolButton(this); - mEjectButton->setObjectName("EjectButton"); - mEjectButton->setIcon(XdgIcon::fromTheme("media-eject")); + mEjectButton->setObjectName(QStringLiteral("EjectButton")); + mEjectButton->setIcon(XdgIcon::fromTheme(QStringLiteral("media-eject"))); connect(mEjectButton, &QToolButton::clicked, this, &MenuDiskItem::ejectButtonClicked); QHBoxLayout *layout = new QHBoxLayout(this); @@ -71,7 +71,7 @@ connect(iface, &Solid::StorageAccess::setupDone, this, &MenuDiskItem::onMounted); connect(iface, &Solid::StorageAccess::teardownDone, this, &MenuDiskItem::onUnmounted); - connect(iface, &Solid::StorageAccess::accessibilityChanged, [this] (bool accessible, QString const &) { + connect(iface, &Solid::StorageAccess::accessibilityChanged, [this] (bool /*accessible*/, QString const &) { updateMountStatus(); }); @@ -142,7 +142,7 @@ mPopup->hide(); } -void MenuDiskItem::onMounted(Solid::ErrorType error, QVariant resultData, const QString &udi) +void MenuDiskItem::onMounted(Solid::ErrorType error, QVariant resultData, const QString & /*udi*/) { if (mDiskButtonClicked) { @@ -159,7 +159,7 @@ } } -void MenuDiskItem::onUnmounted(Solid::ErrorType error, QVariant resultData, const QString &udi) +void MenuDiskItem::onUnmounted(Solid::ErrorType error, QVariant resultData, const QString & /*udi*/) { if (mEjectButtonClicked) { diff -Nru lxqt-panel-0.14.1/plugin-mount/popup.cpp lxqt-panel-0.16.1/plugin-mount/popup.cpp --- lxqt-panel-0.14.1/plugin-mount/popup.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/popup.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -58,7 +58,7 @@ mPlaceholder(nullptr), mDisplayCount(0) { - setObjectName("LXQtMountPopup"); + setObjectName(QStringLiteral("LXQtMountPopup")); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); setLayout(new QVBoxLayout(this)); layout()->setMargin(0); @@ -66,7 +66,7 @@ setAttribute(Qt::WA_AlwaysShowToolTips); mPlaceholder = new QLabel(tr("No devices are available"), this); - mPlaceholder->setObjectName("NoDiskLabel"); + mPlaceholder->setObjectName(QStringLiteral("NoDiskLabel")); layout()->addWidget(mPlaceholder); //Perform the potential long time operation after object construction @@ -76,7 +76,7 @@ { delete aux_timer; //cleanup const auto devices = Solid::Device::listFromType(Solid::DeviceInterface::StorageAccess); - for (const Solid::Device& device : Solid::Device::listFromType(Solid::DeviceInterface::StorageAccess)) + for (const Solid::Device& device : devices) if (hasRemovableParent(device)) addItem(device); }); diff -Nru lxqt-panel-0.14.1/plugin-mount/popup.h lxqt-panel-0.16.1/plugin-mount/popup.h --- lxqt-panel-0.14.1/plugin-mount/popup.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/popup.h 2020-11-05 16:09:19.000000000 +0000 @@ -42,7 +42,7 @@ Q_OBJECT public: - explicit Popup(ILXQtPanelPlugin * plugin, QWidget* parent = 0); + explicit Popup(ILXQtPanelPlugin * plugin, QWidget* parent = nullptr); void realign(); public slots: diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_arn.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_arn.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_arn.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,132 @@ + + + + + Button + + + Removable media/devices manager + + + + + Configuration + + + Removable Media Settings + + + + + Behaviour + + + + + When a device is connected: + + + + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + + Popup menu + + + + + Show info + + + + + + Do nothing + + + + + Eject All Optical Drives + + + + + DeviceActionInfo + + + The device <b><nobr>"%1"</nobr></b> is connected. + + + + + The device <b><nobr>"%1"</nobr></b> is removed. + + + + + Removable media/devices manager + + + + + EjectActionOptical + + + Removable media/devices manager + + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + + MenuDiskItem + + + Mounting of <b><nobr>"%1"</nobr></b> failed: %2 + + + + + + Removable media/devices manager + + + + + Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 + + + + + Popup + + + No devices are available + + + + diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_ar.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_ar.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_ar.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_ar.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ السلوك - + When a device is connected: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu أبثِق قائمة - + Show info اعرض معلوماته - + + Do nothing لا تفعل شيئا + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + مدير الأجهزة/الوسائط المنفصلة + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_ast.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_ast.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_ast.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_ast.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,90 @@ + + + + + Button + + + Removable media/devices manager + Xestor de preseos/medios estrayibles + + + + Configuration + + + Removable Media Settings + Axustes de medios estrayibles + + + + Behaviour + Comportamientu + + + + When a device is connected: + Al coneutar un preséu: + + + + Popup menu + Amosar un menú emerxente + + + + Show info + Amosar la información + + + + Do nothing + Nun facer nada + + + + DeviceActionInfo + + + The device <b><nobr>"%1"</nobr></b> is connected. + Coneutóse'l preséu <b><nobr>«%1»</nobr></b>. + + + + The device <b><nobr>"%1"</nobr></b> is removed. + Estráxose'l preséu <b><nobr>«%1»</nobr></b>. + + + + Removable media/devices manager + Xestor de preseos/medios estrayibles + + + + MenuDiskItem + + + Mounting of <b><nobr>"%1"</nobr></b> failed: %2 + El montaxe de <b><nobr>«%1»</nobr></b> falló: %2 + + + + + Removable media/devices manager + Xestor de preseos/medios estrayibles + + + + Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 + El desmontaxe de <strong><nobr>«%1»</nobr></strong> falló: %2 + + + + Popup + + + No devices are available + Nun hai preseos disponibles + + + diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_ca.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_ca.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_ca.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_ca.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Comportament - + When a device is connected: Quan es connecta un dispositiu: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu Menú emergent - + Show info Mostra la informació - + + Do nothing No facis res + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Gestor de mitjans/dispositius extraïbles + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_cs.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_cs.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_cs.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_cs.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Chování - + When a device is connected: Když je zařízení připojeno: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu Zobrazit vyskakovací nabídku - + Show info Ukázat informace - + + Do nothing Nedělat nic + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Správa vyjímatelných médií/zařízení + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem @@ -84,7 +126,7 @@ No devices are available - Nejsou k dispozici žádná zařízení + Nejsou dostupná žádná zařízení diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_cy.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_cy.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_cy.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_cy.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ - + When a device is connected: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu - + Show info - + + Do nothing + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_da.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_da.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_da.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_da.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Afværd - + When a device is connected: Når en enhed er forbundet: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu Pop op-menu - + Show info Vis information - + + Do nothing Gør intet + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Håndtering af flytbare medier/enheder + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_de.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_de.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_de.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_de.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Verhalten - + When a device is connected: Wenn ein Gerät verbunden ist: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu Aufklapp-Menü - + Show info Info anzeigen - + + Do nothing Nichts tun + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Verwaltung entfernbarer Medien/Geräte + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_el.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_el.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_el.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_el.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Συμπεριφορά - + When a device is connected: Κατά την σύνδεση μιας συσκευής: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + <html><head/><body><p>Ενεργοποίηση της ακόλουθης ενέργειας της συντόμευσης εξαγωγής (<span style=" font-weight:600;">XF86Eject</span> εξ ορισμού)</p></body></html> + + + + When eject button is pressed: + Κατά το πάτημα του κουμπιού εξαγωγής: + + + Popup menu Αναδυόμενο μενού - + Show info Εμφάνιση πληροφοριών - + + Do nothing Καμία ενέργεια + + + Eject All Optical Drives + Εξαγωγή όλων των οπτικών οδηγών + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Διαχειριστής αφαιρούμενων μέσων/συσκευών + + + + Ejected all optical drives + Έγινε εξαγωγή όλων των οπτικών οδηγών + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + Διαχειριστής αφαιρούμενων μέσων/συσκευών: Η καθολική συντόμευση '%1' δεν μπορεί να καταχωρηθεί + + + + Eject removable media + Εξαγωγή του αφαιρούμενου μέσου + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_eo.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_eo.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_eo.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_eo.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Konduto - + When a device is connected: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu Ŝprucfenestra menuo - + Show info Montri informojn - + + Do nothing Fari nenion + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Mastrumilo de demeteblaj aparatoj + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_es.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_es.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_es.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_es.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Comportamiento - + When a device is connected: Al conectar un dispositivo: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu Menú contextual - + Show info Mostrar información - + + Do nothing No hacer nada + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Gestor de medios y dispositivos extraíbles + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_es_UY.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_es_UY.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_es_UY.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_es_UY.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ Removable media/devices manager - Administrador de dispositivos desmontables + @@ -19,27 +19,43 @@ Behaviour - Comportamiento + - + When a device is connected: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu - Menú emergente + - + Show info - Mostrar información + - + + Do nothing - No hacer nada + + + + + Eject All Optical Drives + @@ -47,17 +63,43 @@ The device <b><nobr>"%1"</nobr></b> is connected. - El dispositivo <b><nobr>"%1"</nobr></b> está conectado. + The device <b><nobr>"%1"</nobr></b> is removed. - El dispositivo <b><nobr>"%1"</nobr></b> fue quitado. + Removable media/devices manager - Administrador de dispositivos desmontables + + + + + EjectActionOptical + + + Removable media/devices manager + + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + @@ -71,7 +113,7 @@ Removable media/devices manager - Administrador de dispositivos desmontables + diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_es_VE.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_es_VE.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_es_VE.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_es_VE.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Comportamiento - + When a device is connected: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu Menú emergente - + Show info Mostrar información - + + Do nothing No hacer nada + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Administrador de medios y dispositivos + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_eu.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_eu.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_eu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_eu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Portaera - + When a device is connected: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu Laster-menua - + Show info Erakutsi informazioa - + + Do nothing Ez egin ezer + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Eduki/gailu aldagarrien kudeatzailea + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_fi.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_fi.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_fi.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_fi.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Toiminta - + When a device is connected: Kun laite kytketään: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu Näytä valikko - + Show info Näytä ilmoitus - + + Do nothing Älä tee mitään + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Irrotettavien laitteiden ja levyjen hallinta + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_fr.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_fr.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_fr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_fr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Comportement - + When a device is connected: Lorsqu'un appareil est connecté : - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu Menu pop-up - + Show info Afficher les infos - + + Do nothing Ne rien faire + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Gestionnaire de médias/périphériques amovibles + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_gl.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_gl.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_gl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_gl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Comportamento - + When a device is connected: Cando se conecta un dispositivo: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu Menú emerxente - + Show info Amosar información - + + Do nothing Non facer nada + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Administrador de medios/dispositivos extraíbeis + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_he.desktop lxqt-panel-0.16.1/plugin-mount/translations/mount_he.desktop --- lxqt-panel-0.14.1/plugin-mount/translations/mount_he.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_he.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[he]=מדיה נתיקה +Comment[he]=עיגון וניתוק של USB וכוננים אופטיים בקלות. diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_he.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_he.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_he.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_he.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ התנהגות - + When a device is connected: + כאשר מכשיר מחובר: + + + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: - + Popup menu להקפיץ תפריט - + Show info להציג מידע - + + Do nothing לא לעשות כלום + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + מנהל התקנים/מדיה נתיקים + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_hr.desktop lxqt-panel-0.16.1/plugin-mount/translations/mount_hr.desktop --- lxqt-panel-0.14.1/plugin-mount/translations/mount_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=Prijenosni mediji +Comment[hr]=Pokretanje i uklanjanje prijenosnih medija. diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_hr.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_hr.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_hr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_hr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ Removable media/devices manager - Upravitelj uklonjivim medijima/uređajima + Upravljač prijenosnih medija/uređaja @@ -14,32 +14,48 @@ Removable Media Settings - Postavke uklonjivih medija + Prijenosni mediji – Postavke Behaviour - Ponašanje + Ponašanje - + When a device is connected: + Kad je uređaj priključen: + + + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> - - Popup menu + + When eject button is pressed: - + + Popup menu + Otvori skočni izbornik + + + Show info - Pokaži info + Prikaži inforamcije - + + Do nothing - Ne čini ništa + Ne čini ništa + + + + Eject All Optical Drives + @@ -47,17 +63,43 @@ The device <b><nobr>"%1"</nobr></b> is connected. - Uređaj <b><nobr>"%1"</nobr></b> je spojen. + Uređaj <b><nobr>„%1”</nobr></b> je spojen. The device <b><nobr>"%1"</nobr></b> is removed. - Uređaj <b><nobr>"%1"</nobr></b> je uklonjen. + Uređaj <b><nobr>„%1”</nobr></b> je uklonjen. Removable media/devices manager - Upravitelj uklonjivim medijima/uređajima + Upravljač prijenosnih medija/uređaja + + + + EjectActionOptical + + + Removable media/devices manager + Upravljač prijenosnih medija/uređaja + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + @@ -65,18 +107,18 @@ Mounting of <b><nobr>"%1"</nobr></b> failed: %2 - Montiranje <b><nobr>"%1"</nobr></b> nije uspjelo: %2 + Neuspjelo pokretanje medija/uređaja <b><nobr>„%1”</nobr></b>: %2 Removable media/devices manager - Upravitelj uklonjivim medijima/uređajima + Upravljač prijenosnih medija/uređaja Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - Odmontiranje <strong><nobr>"%1"</nobr></strong> nije uspjelo: %2 + Neuspjelo uklanjanje medija/uređaja <b><nobr>„%1”</nobr></b>: %2 @@ -84,7 +126,7 @@ No devices are available - Nije dostupan nijedan uređaj + Nema dostupnih uređaja diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_hu.desktop lxqt-panel-0.16.1/plugin-mount/translations/mount_hu.desktop --- lxqt-panel-0.14.1/plugin-mount/translations/mount_hu.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_hu.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -8,5 +8,5 @@ # Translations -Comment[hu]=Cserélhetőeszköz-kezelő (USB, CD, DVD, …) -Name[hu]=Cserélhető eszköz +Comment[hu]=USB és optikai meghajtók egyszerű fel- és lecsatlakoztatása +Name[hu]=Cserélhetőeszköz-kezelő diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_hu.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_hu.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_hu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_hu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -14,7 +14,7 @@ Removable Media Settings - Cserélhető eszközbeállítás + Cserélhetőeszköz-kezelő beállításai @@ -22,25 +22,41 @@ Működés - + When a device is connected: - + Ha egy eszköz csatlakoztatva van: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + <html><head/><body><p>A következő művelet végrehajtása a kiadás gomb megnyomásakor (<span style=" font-weight:600;">XF86Eject</span> alapértelmezetten)</p></body></html> + + + + When eject button is pressed: + A kiadás gomb megnyomásakor: + + + Popup menu Felugró menü - + Show info Információ megjelenítése - + + Do nothing Ne tegyen semmit + + + Eject All Optical Drives + Összes optikai meghajtó kiadása + DeviceActionInfo @@ -57,7 +73,33 @@ Removable media/devices manager - Cserélhetőeszköz kezelő + Cserélhetőeszköz-kezelő + + + + EjectActionOptical + + + Removable media/devices manager + Cserélhetőeszköz-kezelő + + + + Ejected all optical drives + Az összes optikai meghajtó kiadva + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + Cserélhetőeszköz-kezelő: A '%1' globális gyorsbillentyű nem regisztrálható + + + + Eject removable media + Eltávolítható adathordozó kiadása @@ -65,13 +107,13 @@ Mounting of <b><nobr>"%1"</nobr></b> failed: %2 - A <strong><nobr>"%1"</nobr></strong> felcsatolása sikertelen: %2 + A <strong><nobr>"%1"</nobr></strong> csatolása sikertelen: %2 Removable media/devices manager - Cserélhetőeszköz kezelő + Cserélhetőeszköz-kezelő diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_ia.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_ia.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_ia.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_ia.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ - + When a device is connected: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu - + Show info - + + Do nothing + + + Eject All Optical Drives + + DeviceActionInfo @@ -60,6 +76,32 @@ + + EjectActionOptical + + + Removable media/devices manager + + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_id.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_id.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_id.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_id.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Perilaku - + When a device is connected: Ketika perangkat terhubung: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu Menu popup - + Show info Lihat info - + + Do nothing Tidak melakukan apapun + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Pengelola media/perangkat yang dapat dilepas + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_it.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_it.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_it.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_it.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Comportamento - + When a device is connected: Quando un device è connesso: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + <html><head/><body><p>Esegui sempre la seguente azione alla pressione del pulsante di espulsione (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + When eject button is pressed: + Se pressato pulsante di espulsione: + + + Popup menu Menu a comparsa - + Show info Mostra informazioni - + + Do nothing Non fare nulla + + + Eject All Optical Drives + Espelli tutti dispositivi ottici + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Gestore dei supporti/dispositivi rimovibili + + + + Ejected all optical drives + Espelli tutti dischi ottici + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + Gestore dispositivi rimovibili: Impossibile registrare scorciatoia globale '%1' + + + + Eject removable media + Espelli dispositivo rimovibile + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_ja.desktop lxqt-panel-0.16.1/plugin-mount/translations/mount_ja.desktop --- lxqt-panel-0.14.1/plugin-mount/translations/mount_ja.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_ja.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,12 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Removable media -Comment=Easy mounting and unmounting of USB and optical drives. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ja]=USBや光学ドライブのマウントやアンマウントを容易にします -Name[ja]=リムーバルメディア +Name[ja]=リムーバブルメディア +Comment[ja]=USB や光学ドライブのマウントやアンマウントを簡単にします diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_ja.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_ja.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_ja.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_ja.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ Removable media/devices manager - リムーバルメディア/デバイスの管理 + リムーバブルメディア/デバイスの管理 @@ -19,28 +19,44 @@ Behaviour - 挙動 + 動作 - + When a device is connected: - + デバイスが接続された時: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + <html><head/><body><p>取り出しのショートカットが押されると次のアクションが起こります(既定では <span style=" font-weight:600;">XF86Eject</span> )</p></body></html> + + + + When eject button is pressed: + 取り出しボタンが押された時: + + + Popup menu - メニューをポップアップ + メニューのポップアップ - + Show info - 情報を表示 + 情報の表示 - + + Do nothing 何もしない + + + Eject All Optical Drives + すべての光学式ドライブを取り出す + DeviceActionInfo @@ -57,7 +73,33 @@ Removable media/devices manager - リムーバルメディア/デバイスの管理 + リムーバブルメディア/デバイスの管理 + + + + EjectActionOptical + + + Removable media/devices manager + リムーバブルメディアとデバイスの管理 + + + + Ejected all optical drives + すべての光学式ドライブを取り出しました + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + リムーバブルメディア/デバイスのマネージャー: グローバルショートカット '%1' を登録できません + + + + Eject removable media + リムーバブルメディアを取り出す @@ -71,7 +113,7 @@ Removable media/devices manager - リムーバルメディア/デバイスの管理 + リムーバブルメディア/デバイスの管理 diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_ko.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_ko.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_ko.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_ko.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ 동작 - + When a device is connected: 장비를 연결했을 때: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu 메뉴 팝업 - + Show info 정보 보이기 - + + Do nothing 아무것도 안 하기 + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + 이동식 미디어/장비 관리 도구 + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_lt.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_lt.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_lt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_lt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Elgsena - + When a device is connected: Prijungus įrenginį: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu Iškylantysis meniu - + Show info Rodyti informaciją - + + Do nothing Nieko nedaryti + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Keičiamųjų laikmenų/įrenginių tvarkytuvė + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_nb_NO.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_nb_NO.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_nb_NO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_nb_NO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Oppførsel - + When a device is connected: Når en enhet er koblet til: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu Sprettoppmeny - + Show info Vis info - + + Do nothing Gjør ingenting + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,11 +77,37 @@ + EjectActionOptical + + + Removable media/devices manager + + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem Mounting of <b><nobr>"%1"</nobr></b> failed: %2 - Monteringen av <b><nobr>"%1"</nobr></b> feilet: %2 + Monteringen av <b><nobr>"%1"</nobr></b> mislyktes: %2 @@ -76,7 +118,7 @@ Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - Avmonteringen av <strong><nobr>"%1"</nobr></strong> feilet: %2 + Avmonteringen av <strong><nobr>"%1"</nobr></strong> mislyktes: %2 diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_nl.desktop lxqt-panel-0.16.1/plugin-mount/translations/mount_nl.desktop --- lxqt-panel-0.14.1/plugin-mount/translations/mount_nl.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_nl.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,12 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Removable media -Comment=Easy mounting and unmounting of USB and optical drives. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[nl]=Verwijderbare media beheerder (USB, CD, DVD, ...) Name[nl]=Verwijderbare media +Comment[nl]=Verwijderbare media beheren (USB, CD, DVD, ...) diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_nl.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_nl.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_nl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_nl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ Removable media/devices manager - Beheerder van verwijderbare media/apparaten + Beheer van verwijderbare media/apparaten @@ -22,24 +22,40 @@ Gedrag - + When a device is connected: + Wanneer een apparaat is verbonden: + + + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: - + Popup menu - Opduikmenu + Popup-menu - + Show info Toon info - + + Do nothing - Doe niets + Niets doen + + + + Eject All Optical Drives + @@ -52,12 +68,38 @@ The device <b><nobr>"%1"</nobr></b> is removed. - Het apparaat <b><nobr>"%1"</nobr></b> werd verwijderd. + Het apparaat <b><nobr>"%1"</nobr></b> is verwijderd. Removable media/devices manager - Beheerder van verwijderbare media/apparaten + Beheer van verwijderbare media/apparaten + + + + EjectActionOptical + + + Removable media/devices manager + Beheer van verwijderbare media/apparaten + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + @@ -71,7 +113,7 @@ Removable media/devices manager - Beheerder van verwijderbare media/apparaten + Beheer van verwijderbare media/apparaten diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_pl.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_pl.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_pl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_pl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Zachowanie - + When a device is connected: Po podłączeniu urządzenia: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu Wyskakujące menu - + Show info Pokaż informacje - + + Do nothing Nic nie rób + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Menedżer nośników wymiennych + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_pt_BR.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_pt_BR.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_pt_BR.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_pt_BR.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Comportamento - + When a device is connected: Quando um dispositivo está conectado: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + <html><head/><body><p>Acione a seguinte ação se o atalho de ejeção for pressionado (<span style=" font-weight:600;">XF86Eject</span> por padrão)</p></body></html> + + + + When eject button is pressed: + Quando o botão de ejeção é pressionado: + + + Popup menu Menu popup - + Show info Exibir informações - + + Do nothing Não fazer nada + + + Eject All Optical Drives + Ejetar Todas as Unidades Ópticas + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Gerenciador de mídias/dispositivos removíveis + + + + Ejected all optical drives + Todas as unidades ópticas ejetadas + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + Gerenciador de mídias/dispositivos removíveis: O atalho global '%1' não pode ser registrado + + + + Eject removable media + Ejetar mídia removível + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_pt.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_pt.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_pt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_pt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Comportamento - + When a device is connected: Ao conectar um dispositivo: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu Mostrar menu - + Show info Mostrar informações - + + Do nothing Nada fazer + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Gestor de discos e unidades amovíveis + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_ro_RO.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_ro_RO.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_ro_RO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_ro_RO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Comportament - + When a device is connected: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu Meniu pop-up - + Show info Afișează informații - + + Do nothing Nicio acțiune + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Administrator medii/dispozitive detașabile + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_ru.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_ru.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_ru.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_ru.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Поведение - + When a device is connected: При подключении устройства: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu Показать меню - + Show info Показать информацию - + + Do nothing Ничего не делать + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_sk_SK.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_sk_SK.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_sk_SK.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_sk_SK.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ Removable media/devices manager - Správca prenosných médií a zariadení + Správca prenosných médií a zariadení @@ -14,32 +14,48 @@ Removable Media Settings - + Nastavenia vymeniteľných médií Behaviour - Správanie + Správanie - + When a device is connected: + Keď je zariadenie pripojené: + + + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> - + + When eject button is pressed: + + + + Popup menu - Zobraziť menu + Zobraziť menu - + Show info - Zobraziť informácie + Zobraziť informácie - + + Do nothing - Nerobiť nič + Nerobiť nič + + + + Eject All Optical Drives + @@ -47,36 +63,62 @@ The device <b><nobr>"%1"</nobr></b> is connected. - Zariadenie <b><nobr>„%1“</nobr></b> je zapojené. + Zariadenie <b><nobr>„%1“</nobr></b> je pripojené. The device <b><nobr>"%1"</nobr></b> is removed. - Zariadenie <b><nobr>„%1“</nobr></b> je odstránené. + Zariadenie <b><nobr>„%1“</nobr></b> bolo odstránené. Removable media/devices manager + Správca prenosných médií a zariadení + + + + EjectActionOptical + + + Removable media/devices manager Správca prenosných médií a zariadení + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + MenuDiskItem Mounting of <b><nobr>"%1"</nobr></b> failed: %2 - + Pripojenie zariadenia a <b><nobr>"%1"</nobr></b> zlyhalo: %2 Removable media/devices manager - Správca prenosných médií a zariadení + Správca prenosných médií a zariadení Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - + Odpojenie zariadenia <strong><nobr>"%1"</nobr></strong> zlyhalo: %2 @@ -84,7 +126,7 @@ No devices are available - + K dispozícii nie je žiadne zariadenie diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_sl.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_sl.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_sl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_sl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ Removable media/devices manager - Upravljalnik odstranljivih nosilcev/naprav + Upravljalnik odstranljivih nosilcev @@ -14,32 +14,48 @@ Removable Media Settings - + Nastavitve odstranljivih nosilcev Behaviour - Obnašanje + Samodejna dejanja - + When a device is connected: + Ko je naprava priklopljena: + + + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> - + + When eject button is pressed: + + + + Popup menu - Prikaži meni + Prikaži meni - + Show info - Prikaži podatke + Prikaži informacije - + + Do nothing - Ne naredi nič + Ne naredi nič + + + + Eject All Optical Drives + @@ -47,17 +63,43 @@ The device <b><nobr>"%1"</nobr></b> is connected. - Naprava <b><nobr>%1</nobr></b> je priključena. + Naprava <b><nobr>"%1"</nobr></b> je priključena. The device <b><nobr>"%1"</nobr></b> is removed. - Naprava <b><nobr>%1</nobr></b> je odstranjena. + Naprava <b><nobr>"%1"</nobr></b> je odstranjena. Removable media/devices manager - Upravljalnik odstranljivih nosilcev/naprav + Upravljalnik odstranljivih nosilcev + + + + EjectActionOptical + + + Removable media/devices manager + Upravljalnik odstranljivih nosilcev + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + @@ -65,18 +107,18 @@ Mounting of <b><nobr>"%1"</nobr></b> failed: %2 - + Priklop naprave <b><nobr>"%1"</nobr></b> je spodletel: %2 Removable media/devices manager - Upravljalnik odstranljivih nosilcev/naprav + Upravljalnik odstranljivih nosilcev Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - + Naprave <strong><nobr>"%1"</nobr></strong> ni mogoče izvreči: %2 @@ -84,7 +126,7 @@ No devices are available - + Nobene naprave ni na voljo diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_sr_BA.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_sr_BA.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_sr_BA.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_sr_BA.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Понашање - + When a device is connected: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu прикажи мени - + Show info прикажи инфо - + + Do nothing не ради ништа + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Менаџер уклоњивих медија/уређаја + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_sr@latin.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_sr@latin.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_sr@latin.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_sr@latin.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ - + When a device is connected: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu - + Show info - + + Do nothing + + + Eject All Optical Drives + + DeviceActionInfo @@ -60,6 +76,32 @@ + + EjectActionOptical + + + Removable media/devices manager + + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_sr_RS.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_sr_RS.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_sr_RS.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_sr_RS.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Понашање - + When a device is connected: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu прикажи мени - + Show info прикажи инфо - + + Do nothing не ради ништа + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Менаџер уклоњивих медија/уређаја + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_th_TH.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_th_TH.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_th_TH.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_th_TH.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ พฤติกรรม - + When a device is connected: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu เมนูผุดขึ้น - + Show info แสดงข้อมูล - + + Do nothing ไม่ต้องทำอะไร + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + ตัดจัดการสื่อ/อุปกรณ์แบบถอดเสียบ + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_tr.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_tr.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_tr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_tr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Davranış - + When a device is connected: Bir aygıt bağlandığında: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu Açılır menü - + Show info Bilgi görüntüle - + + Do nothing Hiç bir şey yapma + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Çıkarılabilir ortam/aygıt yönetici + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount.ts lxqt-panel-0.16.1/plugin-mount/translations/mount.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ - + When a device is connected: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu - + Show info - + + Do nothing + + + Eject All Optical Drives + + DeviceActionInfo @@ -60,6 +76,32 @@ + + EjectActionOptical + + + Removable media/devices manager + + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_uk.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_uk.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_uk.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_uk.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ Поведінка - + When a device is connected: - + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: + + + + Popup menu Вигулькне меню - + Show info Показати інформацію - + + Do nothing Нічого не робити + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + Керування знімними носіями + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_zh_CN.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_zh_CN.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_zh_CN.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_zh_CN.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ 行为 - + When a device is connected: + 连接设备时： + + + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: - + Popup menu 弹出菜单 - + Show info 显示信息 - + + Do nothing 什么都不做 + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + 可移动媒体管理器 + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem @@ -76,7 +118,7 @@ Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - 卸载<b><nobr>“%1”</nobr></b>失败：%2 + 卸载<strong><nobr>“%1”</nobr></strong>失败：%2 diff -Nru lxqt-panel-0.14.1/plugin-mount/translations/mount_zh_TW.ts lxqt-panel-0.16.1/plugin-mount/translations/mount_zh_TW.ts --- lxqt-panel-0.14.1/plugin-mount/translations/mount_zh_TW.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-mount/translations/mount_zh_TW.ts 2020-11-05 16:09:19.000000000 +0000 @@ -22,25 +22,41 @@ 行為 - + When a device is connected: + 當設備已連結： + + + + <html><head/><body><p>Trigger the following action eject shortcut is pressed (<span style=" font-weight:600;">XF86Eject</span> by default)</p></body></html> + + + + + When eject button is pressed: - + Popup menu 彈出式選單 - + Show info 顯示資訊 - + + Do nothing 什麼都不做 + + + Eject All Optical Drives + + DeviceActionInfo @@ -61,6 +77,32 @@ + EjectActionOptical + + + Removable media/devices manager + 可卸除式裝置管理員 + + + + Ejected all optical drives + + + + + LXQtMountPlugin + + + Removable media/devices manager: Global shortcut '%1' cannot be registered + + + + + Eject removable media + + + + MenuDiskItem diff -Nru lxqt-panel-0.14.1/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.cpp lxqt-panel-0.16.1/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.cpp --- lxqt-panel-0.14.1/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -43,7 +43,7 @@ ui(new Ui::LXQtNetworkMonitorConfiguration) { setAttribute(Qt::WA_DeleteOnClose); - setObjectName("NetworkMonitorConfigurationWindow"); + setObjectName(QStringLiteral("NetworkMonitorConfigurationWindow")); ui->setupUi(this); connect(ui->buttons, SIGNAL(clicked(QAbstractButton*)), this, SLOT(dialogButtonsAction(QAbstractButton*))); @@ -60,13 +60,13 @@ void LXQtNetworkMonitorConfiguration::saveSettings() { - settings().setValue("icon", ui->iconCB->currentIndex()); - settings().setValue("interface", ui->interfaceCB->currentText()); + settings().setValue(QStringLiteral("icon"), ui->iconCB->currentIndex()); + settings().setValue(QStringLiteral("interface"), ui->interfaceCB->currentText()); } void LXQtNetworkMonitorConfiguration::loadSettings() { - ui->iconCB->setCurrentIndex(settings().value("icon", 1).toInt()); + ui->iconCB->setCurrentIndex(settings().value(QStringLiteral("icon"), 1).toInt()); int count; #ifdef STATGRAB_NEWER_THAN_0_90 @@ -77,8 +77,8 @@ sg_network_iface_stats* stats = sg_get_network_iface_stats(&count); #endif for (int ix = 0; ix < count; ix++) - ui->interfaceCB->addItem(stats[ix].interface_name); + ui->interfaceCB->addItem(QLatin1String(stats[ix].interface_name)); - QString interface = settings().value("interface").toString(); + QString interface = settings().value(QStringLiteral("interface")).toString(); ui->interfaceCB->setCurrentIndex(qMax(qMin(0, count - 1), ui->interfaceCB->findText(interface))); } diff -Nru lxqt-panel-0.14.1/plugin-networkmonitor/lxqtnetworkmonitor.cpp lxqt-panel-0.16.1/plugin-networkmonitor/lxqtnetworkmonitor.cpp --- lxqt-panel-0.14.1/plugin-networkmonitor/lxqtnetworkmonitor.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-networkmonitor/lxqtnetworkmonitor.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -58,8 +58,8 @@ sg_init(); #endif - m_iconList << "modem" << "monitor" - << "network" << "wireless"; + m_iconList << QStringLiteral("modem") << QStringLiteral("monitor") + << QStringLiteral("network") << QStringLiteral("wireless"); startTimer(800); @@ -79,7 +79,7 @@ } -void LXQtNetworkMonitor::timerEvent(QTimerEvent *event) +void LXQtNetworkMonitor::timerEvent(QTimerEvent * /*event*/) { bool matched = false; @@ -98,19 +98,19 @@ { if (network_stats->rx != 0 && network_stats->tx != 0) { - m_pic.load(iconName("transmit-receive")); + m_pic.load(iconName(QStringLiteral("transmit-receive"))); } else if (network_stats->rx != 0 && network_stats->tx == 0) { - m_pic.load(iconName("receive")); + m_pic.load(iconName(QStringLiteral("receive"))); } else if (network_stats->rx == 0 && network_stats->tx != 0) { - m_pic.load(iconName("transmit")); + m_pic.load(iconName(QStringLiteral("transmit"))); } else { - m_pic.load(iconName("idle")); + m_pic.load(iconName(QStringLiteral("idle"))); } matched = true; @@ -123,7 +123,7 @@ if (!matched) { - m_pic.load(iconName("error")); + m_pic.load(iconName(QStringLiteral("error"))); } update(); @@ -158,8 +158,8 @@ { if (m_interface == QString::fromLocal8Bit(network_stats->interface_name)) { - setToolTip(tr("Network interface %1").arg(m_interface) + "
" - + tr("Transmitted %1").arg(convertUnits(network_stats->tx)) + "
" + setToolTip(tr("Network interface %1").arg(m_interface) + QStringLiteral("
") + + tr("Transmitted %1").arg(convertUnits(network_stats->tx)) + QStringLiteral("
") + tr("Received %1").arg(convertUnits(network_stats->rx)) ); } @@ -186,8 +186,8 @@ void LXQtNetworkMonitor::settingsChanged() { - m_iconIndex = mPlugin->settings()->value("icon", 1).toInt(); - m_interface = mPlugin->settings()->value("interface").toString(); + m_iconIndex = mPlugin->settings()->value(QStringLiteral("icon"), 1).toInt(); + m_interface = mPlugin->settings()->value(QStringLiteral("interface")).toString(); if (m_interface.isEmpty()) { #ifdef STATGRAB_NEWER_THAN_0_90 @@ -197,10 +197,10 @@ #endif sg_network_iface_stats* stats = sg_get_network_iface_stats(&count); if (count > 0) - m_interface = QString(stats[0].interface_name); + m_interface = QString(QLatin1String(stats[0].interface_name)); } - m_pic.load(iconName("error")); + m_pic.load(iconName(QStringLiteral("error"))); } QString LXQtNetworkMonitor::convertUnits(double num) @@ -212,5 +212,5 @@ num /= 1024; unit = iter.next(); } - return QString::number(num, 'f', 2) + " " + unit; + return QString::number(num, 'f', 2) + QLatin1Char(' ') + unit; } diff -Nru lxqt-panel-0.14.1/plugin-networkmonitor/lxqtnetworkmonitor.h lxqt-panel-0.16.1/plugin-networkmonitor/lxqtnetworkmonitor.h --- lxqt-panel-0.14.1/plugin-networkmonitor/lxqtnetworkmonitor.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-networkmonitor/lxqtnetworkmonitor.h 2020-11-05 16:09:19.000000000 +0000 @@ -38,7 +38,7 @@ { Q_OBJECT public: - LXQtNetworkMonitor(ILXQtPanelPlugin *plugin, QWidget* parent = 0); + LXQtNetworkMonitor(ILXQtPanelPlugin *plugin, QWidget* parent = nullptr); ~LXQtNetworkMonitor(); virtual void settingsChanged(); @@ -53,7 +53,7 @@ static QString convertUnits(double num); QString iconName(const QString& state) const { - return QString(":/images/knemo-%1-%2.png") + return QStringLiteral(":/images/knemo-%1-%2.png") .arg(m_iconList[m_iconIndex], state); } diff -Nru lxqt-panel-0.14.1/plugin-networkmonitor/lxqtnetworkmonitorplugin.h lxqt-panel-0.16.1/plugin-networkmonitor/lxqtnetworkmonitorplugin.h --- lxqt-panel-0.14.1/plugin-networkmonitor/lxqtnetworkmonitorplugin.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-networkmonitor/lxqtnetworkmonitorplugin.h 2020-11-05 16:09:19.000000000 +0000 @@ -43,7 +43,7 @@ virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } virtual QWidget *widget(); - virtual QString themeId() const { return "NetworkMonitor"; } + virtual QString themeId() const { return QStringLiteral("NetworkMonitor"); } bool isSeparate() const { return false; } QDialog *configureDialog(); diff -Nru lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_arn.ts lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_arn.ts --- lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_arn.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,95 @@ + + + + + LXQtNetworkMonitor + + + Network interface <b>%1</b> + + + + + Transmitted %1 + + + + + Received %1 + + + + + B + + + + + KiB + + + + + MiB + + + + + GiB + + + + + TiB + + + + + PiB + + + + + LXQtNetworkMonitorConfiguration + + + Network Monitor settings + + + + + General + + + + + Interface + + + + + Modem + + + + + Monitor + + + + + Network + + + + + Wireless + + + + + Icon + + + + diff -Nru lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_ast.ts lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_ast.ts --- lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_ast.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_ast.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,95 @@ + + + + + LXQtNetworkMonitor + + + Network interface <b>%1</b> + + + + + Transmitted %1 + + + + + Received %1 + + + + + B + + + + + KiB + + + + + MiB + + + + + GiB + + + + + TiB + + + + + PiB + + + + + LXQtNetworkMonitorConfiguration + + + Network Monitor settings + + + + + General + + + + + Interface + + + + + Modem + + + + + Monitor + + + + + Network + + + + + Wireless + + + + + Icon + + + + diff -Nru lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_fi.ts lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_fi.ts --- lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_fi.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_fi.ts 2020-11-05 16:09:19.000000000 +0000 @@ -54,7 +54,7 @@ Network Monitor settings - + Verkkoseuranta astukset @@ -74,7 +74,7 @@ Monitor - + Monitori diff -Nru lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_fr.ts lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_fr.ts --- lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_fr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_fr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -64,12 +64,12 @@ Interface - Interface(s) + Interface Modem - Modem(s) + Modem diff -Nru lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_hr.desktop lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_hr.desktop --- lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=Praćenje mreže +Comment[hr]=Prikazuje stanje i aktivonst mreže. diff -Nru lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_hr.ts lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_hr.ts --- lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_hr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_hr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,47 +6,47 @@ Network interface <b>%1</b> - Mrežno sučelje <b>%1</b> + Mrežno sučelje <b>%1</b> Transmitted %1 - + Preneseno %1 Received %1 - Primljeno %1 + Primljeno %1 B - B + B KiB - KiB + KiB MiB - MiB + MiB GiB - GiB + GiB TiB - TiB + TiB PiB - PiB + PiB @@ -54,42 +54,42 @@ Network Monitor settings - Postavke nadzora mreže + Praćenje mreže – Postavke General - Općenito + Opće Interface - Sučelje + Sučelje Modem - Modem + Modem Monitor - Nadzor + Monitor Network - Mreža + Mreža Wireless - Bežično + Bežično Icon - Ikona + Ikona diff -Nru lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_hu.desktop lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_hu.desktop --- lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_hu.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_hu.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -6,5 +6,5 @@ Comment=Displays network status and activity. # Translations -Name[hu]=Alkalmazásindító alapú menü -Comment[hu]=Alkalmazásmenü +Name[hu]=Hálózatfigyelő +Comment[hu]=Megjeleníti a hálózat állapotát és aktivitását. diff -Nru lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_hu.ts lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_hu.ts --- lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_hu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_hu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -41,12 +41,12 @@ TiB - Tib + TiB PiB - Pib + PiB @@ -54,7 +54,7 @@ Network Monitor settings - Hálózatfigyelő beállítás + Hálózatfigyelő beállítások @@ -84,7 +84,7 @@ Wireless - Drótnélküli + Vezeték nélküli diff -Nru lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_it.ts lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_it.ts --- lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_it.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_it.ts 2020-11-05 16:09:19.000000000 +0000 @@ -84,7 +84,7 @@ Wireless - Wireless + Senza fili diff -Nru lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_ja.ts lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_ja.ts --- lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_ja.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_ja.ts 2020-11-05 16:09:19.000000000 +0000 @@ -11,12 +11,12 @@ Transmitted %1 - 送信 %1 + 送信済 %1 Received %1 - 受信 %1 + 受信済 %1 diff -Nru lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_nl.ts lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_nl.ts --- lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_nl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_nl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -54,7 +54,7 @@ Network Monitor settings - Instellingen van Netwerkbewaker + Instellingen van Netwerkmonitor @@ -74,7 +74,7 @@ Monitor - Bewaker + Monitor diff -Nru lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_ru.ts lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_ru.ts --- lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_ru.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_ru.ts 2020-11-05 16:09:19.000000000 +0000 @@ -26,27 +26,27 @@ KiB - Кб + КиБ MiB - Мб + МиБ GiB - Гб + ГиБ TiB - Тб + ТиБ PiB - Пб + ПиБ diff -Nru lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_sk_SK.ts lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_sk_SK.ts --- lxqt-panel-0.14.1/plugin-networkmonitor/translations/networkmonitor_sk_SK.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-networkmonitor/translations/networkmonitor_sk_SK.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,95 @@ + + + + + LXQtNetworkMonitor + + + Network interface <b>%1</b> + Sieťové rozhranie <b>%1</b> + + + + Transmitted %1 + Odoslané %1 + + + + Received %1 + Prijaté %1 + + + + B + B + + + + KiB + KiB + + + + MiB + MiB + + + + GiB + GiB + + + + TiB + TiB + + + + PiB + PiB + + + + LXQtNetworkMonitorConfiguration + + + Network Monitor settings + Nastavenie sledovania siete + + + + General + Všeobecné + + + + Interface + Rozhranie + + + + Modem + Modem + + + + Monitor + Monitor + + + + Network + Sieť + + + + Wireless + Bezdrôtové + + + + Icon + Ikona + + + diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/lxqtquicklaunch.cpp lxqt-panel-0.16.1/plugin-quicklaunch/lxqtquicklaunch.cpp --- lxqt-panel-0.14.1/plugin-quicklaunch/lxqtquicklaunch.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/lxqtquicklaunch.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -61,11 +61,11 @@ QString exec; QString icon; - const auto apps = mPlugin->settings()->readArray("apps"); + const auto apps = mPlugin->settings()->readArray(QStringLiteral("apps")); for (const QMap &app : apps) { - desktop = app.value("desktop", "").toString(); - file = app.value("file", "").toString(); + desktop = app.value(QStringLiteral("desktop"), QString()).toString(); + file = app.value(QStringLiteral("file"), QString()).toString(); if (!desktop.isEmpty()) { XdgDesktopFile xdg; @@ -88,9 +88,9 @@ } else { - execname = app.value("name", "").toString(); - exec = app.value("exec", "").toString(); - icon = app.value("icon", "").toString(); + execname = app.value(QStringLiteral("name"), QString()).toString(); + exec = app.value(QStringLiteral("exec"), QString()).toString(); + icon = app.value(QStringLiteral("icon"), QString()).toString(); if (icon.isNull()) { qDebug() << "Icon" << icon << "is not valid (isNull). Skipped."; @@ -172,6 +172,12 @@ void LXQtQuickLaunch::dragEnterEvent(QDragEnterEvent *e) { + if (mPlugin->panel()->isLocked()) + { + e->ignore(); + return; + } + // Getting URL from mainmenu... if (e->mimeData()->hasUrls()) { @@ -188,8 +194,19 @@ void LXQtQuickLaunch::dropEvent(QDropEvent *e) { + if (mPlugin->panel()->isLocked()) + { + e->ignore(); + return; + } + +#if (QT_VERSION >= QT_VERSION_CHECK(5,14,0)) + const auto & urls = e->mimeData()->urls(); + for (const QUrl &url : QSet{urls.cbegin(), urls.cend()}) +#else const auto urls = e->mimeData()->urls().toSet(); for (const QUrl &url : urls) +#endif { QString fileName(url.isLocalFile() ? url.toLocalFile() : url.url()); QFileInfo fi(fileName); @@ -202,7 +219,7 @@ } else if (fi.exists() && fi.isExecutable() && !fi.isDir()) { - addButton(new QuickLaunchAction(fileName, fileName, "", this)); + addButton(new QuickLaunchAction(fileName, fileName, QLatin1String(""), this)); } else if (fi.exists()) { @@ -286,7 +303,7 @@ void LXQtQuickLaunch::saveSettings() { PluginSettings *settings = mPlugin->settings(); - settings->remove("apps"); + settings->remove(QStringLiteral("apps")); QList > hashList; int size = mLayout->count(); @@ -307,7 +324,7 @@ hashList << map; } - settings->setArray("apps", hashList); + settings->setArray(QStringLiteral("apps"), hashList); } @@ -317,7 +334,7 @@ { mPlaceHolder = new QLabel(this); mPlaceHolder->setAlignment(Qt::AlignCenter); - mPlaceHolder->setObjectName("QuickLaunchPlaceHolder"); + mPlaceHolder->setObjectName(QStringLiteral("QuickLaunchPlaceHolder")); mPlaceHolder->setText(tr("Drop application\nicons here")); } diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/lxqtquicklaunch.h lxqt-panel-0.16.1/plugin-quicklaunch/lxqtquicklaunch.h --- lxqt-panel-0.14.1/plugin-quicklaunch/lxqtquicklaunch.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/lxqtquicklaunch.h 2020-11-05 16:09:19.000000000 +0000 @@ -55,7 +55,7 @@ Q_OBJECT public: - LXQtQuickLaunch(ILXQtPanelPlugin *plugin, QWidget* parent = 0); + LXQtQuickLaunch(ILXQtPanelPlugin *plugin, QWidget* parent = nullptr); ~LXQtQuickLaunch(); int indexOfButton(QuickLaunchButton* button) const; diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/lxqtquicklaunchplugin.h lxqt-panel-0.16.1/plugin-quicklaunch/lxqtquicklaunchplugin.h --- lxqt-panel-0.14.1/plugin-quicklaunch/lxqtquicklaunchplugin.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/lxqtquicklaunchplugin.h 2020-11-05 16:09:19.000000000 +0000 @@ -42,7 +42,7 @@ ~LXQtQuickLaunchPlugin(); virtual QWidget *widget(); - virtual QString themeId() const { return "QuickLaunch"; } + virtual QString themeId() const { return QStringLiteral("QuickLaunch"); } virtual Flags flags() const { return NeedsHandle; } void realign(); diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/quicklaunchaction.cpp lxqt-panel-0.16.1/plugin-quicklaunch/quicklaunchaction.cpp --- lxqt-panel-0.14.1/plugin-quicklaunch/quicklaunchaction.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/quicklaunchaction.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -46,11 +46,11 @@ { m_type = ActionLegacy; - m_settingsMap["name"] = name; - m_settingsMap["exec"] = exec; - m_settingsMap["icon"] = icon; + m_settingsMap[QStringLiteral("name")] = name; + m_settingsMap[QStringLiteral("exec")] = exec; + m_settingsMap[QStringLiteral("icon")] = icon; - if (icon == "" || icon.isNull()) + if (icon == QLatin1String("") || icon.isNull()) setIcon(XdgIcon::defaultApplicationIcon()); else setIcon(QIcon(icon)); @@ -66,12 +66,12 @@ { m_type = ActionXdg; - m_settingsMap["desktop"] = xdg->fileName(); + m_settingsMap[QStringLiteral("desktop")] = xdg->fileName(); - QString title(xdg->localizedValue("Name").toString()); - QString gn(xdg->localizedValue("GenericName").toString()); + QString title(xdg->localizedValue(QStringLiteral("Name")).toString()); + QString gn(xdg->localizedValue(QStringLiteral("GenericName")).toString()); if (!gn.isEmpty()) - title += " (" + gn + ")"; + title += QLatin1String(" (") + gn + QLatin1String(")"); setText(title); setIcon(xdg->icon(XdgIcon::defaultApplicationIcon())); @@ -97,7 +97,7 @@ setText(fileName); setData(fileName); - m_settingsMap["file"] = fileName; + m_settingsMap[QStringLiteral("file")] = fileName; QFileInfo fi(fileName); if (fi.isDir()) diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/quicklaunchbutton.cpp lxqt-panel-0.16.1/plugin-quicklaunch/quicklaunchbutton.cpp --- lxqt-panel-0.14.1/plugin-quicklaunch/quicklaunchbutton.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/quicklaunchbutton.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -52,16 +52,18 @@ setDefaultAction(mAct); mAct->setParent(this); - mMoveLeftAct = new QAction(XdgIcon::fromTheme("go-previous"), tr("Move left"), this); + const QString dndStr = QStringLiteral(" ") + tr("(Ctrl + DND)"); + + mMoveLeftAct = new QAction(XdgIcon::fromTheme(QStringLiteral("go-previous")), tr("Move left") + dndStr, this); connect(mMoveLeftAct, SIGNAL(triggered()), this, SIGNAL(movedLeft())); - mMoveRightAct = new QAction(XdgIcon::fromTheme("go-next"), tr("Move right"), this); + mMoveRightAct = new QAction(XdgIcon::fromTheme(QStringLiteral("go-next")), tr("Move right") + dndStr, this); connect(mMoveRightAct, SIGNAL(triggered()), this, SIGNAL(movedRight())); - mDeleteAct = new QAction(XdgIcon::fromTheme("dialog-close"), tr("Remove from quicklaunch"), this); + mDeleteAct = new QAction(XdgIcon::fromTheme(QStringLiteral("dialog-close")), tr("Remove from quicklaunch"), this); connect(mDeleteAct, SIGNAL(triggered()), this, SLOT(selfRemove())); - addAction(mDeleteAct); + mMenu = new QMenu(this); mMenu->addAction(mAct); mMenu->addActions(mAct->addtitionalActions()); @@ -71,7 +73,6 @@ mMenu->addSeparator(); mMenu->addAction(mDeleteAct); - setContextMenuPolicy(Qt::CustomContextMenu); connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(this_customContextMenuRequested(const QPoint&))); @@ -91,12 +92,13 @@ } -void QuickLaunchButton::this_customContextMenuRequested(const QPoint & pos) +void QuickLaunchButton::this_customContextMenuRequested(const QPoint & /*pos*/) { LXQtQuickLaunch *panel = qobject_cast(parent()); - mMoveLeftAct->setEnabled( panel && panel->indexOfButton(this) > 0); - mMoveRightAct->setEnabled(panel && panel->indexOfButton(this) < panel->countOfButtons() - 1); + mMoveLeftAct->setEnabled(!mPlugin->panel()->isLocked() && panel && panel->indexOfButton(this) > 0); + mMoveRightAct->setEnabled(!mPlugin->panel()->isLocked() && panel && panel->indexOfButton(this) < panel->countOfButtons() - 1); + mDeleteAct->setEnabled(!mPlugin->panel()->isLocked()); mPlugin->willShowWindow(mMenu); mMenu->popup(mPlugin->panel()->calculatePopupWindowPos(mapToGlobal({0, 0}), mMenu->sizeHint()).topLeft()); } @@ -108,17 +110,6 @@ } -void QuickLaunchButton::paintEvent(QPaintEvent *) -{ - // Do not paint that ugly "has menu" arrow - QStylePainter p(this); - QStyleOptionToolButton opt; - initStyleOption(&opt); - opt.features &= (~ QStyleOptionToolButton::HasMenu); - p.drawComplexControl(QStyle::CC_ToolButton, opt); -} - - void QuickLaunchButton::mousePressEvent(QMouseEvent *e) { if (e->button() == Qt::LeftButton && e->modifiers() == Qt::ControlModifier) @@ -133,7 +124,7 @@ void QuickLaunchButton::mouseMoveEvent(QMouseEvent *e) { - if (!(e->buttons() & Qt::LeftButton)) + if (mPlugin->panel()->isLocked() || !(e->buttons() & Qt::LeftButton)) { return; } @@ -165,7 +156,7 @@ void QuickLaunchButton::dragMoveEvent(QDragMoveEvent * e) { - if (e->mimeData()->hasFormat(MIMETYPE)) + if (!mPlugin->panel()->isLocked() && e->mimeData()->hasFormat(QStringLiteral(MIMETYPE))) e->acceptProposedAction(); else e->ignore(); @@ -174,9 +165,11 @@ void QuickLaunchButton::dragEnterEvent(QDragEnterEvent *e) { - const ButtonMimeData *mimeData = qobject_cast(e->mimeData()); - if (mimeData && mimeData->button()) - { - emit switchButtons(mimeData->button(), this); + if (!mPlugin->panel()->isLocked()) { + const ButtonMimeData *mimeData = qobject_cast(e->mimeData()); + if (mimeData && mimeData->button()) + { + emit switchButtons(mimeData->button(), this); + } } } diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/quicklaunchbutton.h lxqt-panel-0.16.1/plugin-quicklaunch/quicklaunchbutton.h --- lxqt-panel-0.14.1/plugin-quicklaunch/quicklaunchbutton.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/quicklaunchbutton.h 2020-11-05 16:09:19.000000000 +0000 @@ -41,7 +41,7 @@ Q_OBJECT public: - QuickLaunchButton(QuickLaunchAction * act, ILXQtPanelPlugin * plugin, QWidget* parent = 0); + QuickLaunchButton(QuickLaunchAction * act, ILXQtPanelPlugin * plugin, QWidget* parent = nullptr); ~QuickLaunchButton(); QHash settingsMap(); @@ -53,8 +53,6 @@ void movedRight(); protected: - //! Disable that annoying small arrow when there is a menu - virtual void paintEvent(QPaintEvent *); void mousePressEvent(QMouseEvent *e); void mouseMoveEvent(QMouseEvent *e); void dragEnterEvent(QDragEnterEvent *e); diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_arn.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_arn.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_arn.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,46 @@ + + + + + LXQtQuickLaunch + + + Drop Error + + + + + File/URL '%1' cannot be embedded into QuickLaunch for now + + + + + Drop application +icons here + + + + + QuickLaunchButton + + + (Ctrl + DND) + + + + + Move left + + + + + Move right + + + + + Remove from quicklaunch + + + + diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_ar.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_ar.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_ar.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_ar.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error خطأ في الإفلات - + File/URL '%1' cannot be embedded into QuickLaunch for now يتعذر الآن تضمين العنوان/المسار ”%1“ إلى المُطلق السريع - + Drop application icons here أفلِت أيقونات التطبيقات هنا @@ -24,16 +24,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left انقل يسارا - + Move right انقل يمينا - + Remove from quicklaunch أزِل من المُطلق السريع diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_ast.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_ast.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_ast.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_ast.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,46 @@ + + + + + LXQtQuickLaunch + + + Drop Error + + + + + File/URL '%1' cannot be embedded into QuickLaunch for now + + + + + Drop application +icons here + + + + + QuickLaunchButton + + + (Ctrl + DND) + + + + + Move left + + + + + Move right + + + + + Remove from quicklaunch + + + + diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_ca.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_ca.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_ca.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_ca.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Error d'arrossegament - + File/URL '%1' cannot be embedded into QuickLaunch for now El fitxer o l'URL «%1» no pot ser incrustada de moment a QuickLaunch - + Drop application icons here Arrossegueu aquí les @@ -25,16 +25,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left Mou a l'esquerra - + Move right Mou a la dreta - + Remove from quicklaunch Suprimeix de QuickLaunch diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_cs.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_cs.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_cs.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_cs.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Problém s upuštěním sem - + File/URL '%1' cannot be embedded into QuickLaunch for now Soubor/URL „%1“ nyní nelze vložit do rychlého spuštění - + Drop application icons here Sem přetáhněte @@ -25,16 +25,21 @@ QuickLaunchButton + (Ctrl + DND) + (Ctrl + DND) + + + Move left Posunout vlevo - + Move right Posunout vpravo - + Remove from quicklaunch Odebrat z rychlého spuštění diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_cy.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_cy.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_cy.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_cy.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error - + File/URL '%1' cannot be embedded into QuickLaunch for now - + Drop application icons here @@ -24,16 +24,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left - + Move right - + Remove from quicklaunch diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_da.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_da.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_da.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_da.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Fejl ved slip - + File/URL '%1' cannot be embedded into QuickLaunch for now Filen/URL'en '%1' kan ikke indlejres i hurtigstart på nuværende tidspunkt - + Drop application icons here Slip programikoner her @@ -24,16 +24,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left Flyt mod venstre - + Move right Flyt mod højre - + Remove from quicklaunch Fjern fra hurtigstart diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_de.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_de.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_de.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_de.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Fehler beim fallen lassen - + File/URL '%1' cannot be embedded into QuickLaunch for now Datei/URL '%1' kann momentan nicht in die Schnellstartleiste eingebettet werden - + Drop application icons here Anwendungsymbol @@ -25,16 +25,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left Nach links verschieben - + Move right Nach rechts verschieben - + Remove from quicklaunch Aus der Schnellstartleiste entfernen diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_el.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_el.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_el.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_el.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Σφάλμα εναπόθεσης - + File/URL '%1' cannot be embedded into QuickLaunch for now Το αρχείο/η διεύθυνση "%1" δεν μπορεί να ενσωματωθεί για την ώρα στη γρήγορη εκκίνηση - + Drop application icons here Εναποθέστε εδώ @@ -25,16 +25,21 @@ QuickLaunchButton + (Ctrl + DND) + (Ctrl + DND) + + + Move left Μετακίνηση αριστερά - + Move right Μετακίνηση δεξιά - + Remove from quicklaunch Αφαίρεση από τη γρήγορη εκκίνηση diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_eo.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_eo.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_eo.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_eo.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Eraro dum forigado - + File/URL '%1' cannot be embedded into QuickLaunch for now Dosiero/URL '%1' ne povas esti enkorpigita en rapidlanĉilo nun - + Drop application icons here @@ -24,16 +24,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left Movi maldekstren - + Move right Movi dekstren - + Remove from quicklaunch Forigi el rapidlanĉilo diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_es.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_es.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_es.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_es.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Error al soltar - + File/URL '%1' cannot be embedded into QuickLaunch for now El archivo/URL '%1' no puede incrustarse de momento en QuickLaunch - + Drop application icons here Soltar iconos de @@ -25,16 +25,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left Mover a la izquierda - + Move right Mover a la derecha - + Remove from quicklaunch Quitar del lanzador rápido diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_es_VE.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_es_VE.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_es_VE.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_es_VE.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,36 +4,42 @@ LXQtQuickLaunch - + Drop Error Error al remover - + File/URL '%1' cannot be embedded into QuickLaunch for now Archivo/URL '%1' no puede ser empotrado en la barra de lanzadores por ahora - + Drop application icons here - + Ponga los iconos de +las aplicaciones aquí QuickLaunchButton + (Ctrl + DND) + + + + Move left Mover a la izquierda - + Move right Mover a la derecha - + Remove from quicklaunch Remover de la barra de lanzadores diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_eu.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_eu.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_eu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_eu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Errorea jaregitean - + File/URL '%1' cannot be embedded into QuickLaunch for now '%1' fitxategia/URLa ezin da QuickLaunch-en txertatu oraingoz - + Drop application icons here @@ -24,16 +24,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left Mugitu ezkerrera - + Move right Mugitu eskuinera - + Remove from quicklaunch Kendu abio azkarretik diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_fi.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_fi.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_fi.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_fi.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,36 +4,42 @@ LXQtQuickLaunch - + Drop Error Poistovirhe - + File/URL '%1' cannot be embedded into QuickLaunch for now Tiedostoa/osoitetta '%1' ei toistaiseksi voi asettaa pikakäynnistykseen - + Drop application icons here - + Pudota ohjelman +kuvake tähän QuickLaunchButton + (Ctrl + DND) + + + + Move left Siirrä vasemmalle - + Move right Siirrä oikealle - + Remove from quicklaunch Poista pikakäynnistyksestä diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_fr.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_fr.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_fr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_fr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Ne pas tenir compte de l'erreur - + File/URL '%1' cannot be embedded into QuickLaunch for now Le fichier/l'URL '%1' ne peut pas être inclus dans le lancement rapide pour l'instant - + Drop application icons here Déposer ici @@ -25,16 +25,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left Déplacer vers la gauche - + Move right Déplacer vers la droite - + Remove from quicklaunch Enlever du lancement rapide diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_gl.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_gl.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_gl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_gl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,39 +4,44 @@ LXQtQuickLaunch - + Drop Error Produciuse un erro ao arrastrar - + File/URL '%1' cannot be embedded into QuickLaunch for now O ficheiro/URL «%1» non pode ser incrustado, polo de agora, no inicio rápido - + Drop application icons here - Arrastre cara aquí as -iconas dos aplicativos + Arrastre cara a aquí as +iconas das aplicacións QuickLaunchButton + (Ctrl + DND) + + + + Move left Mover á esquerda - + Move right Mover á dereita - + Remove from quicklaunch - Retirar o iniciador rápido + Retirar o lanzador rápido diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_he.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_he.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_he.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_he.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,47 @@ + + + + + LXQtQuickLaunch + + + Drop Error + שגיאת השלכה + + + + File/URL '%1' cannot be embedded into QuickLaunch for now + לא ניתן להטמיע את הקובץ/הכתובת ‚%1’ לתוך QuickLaunch כרגע + + + + Drop application +icons here + יש להשליך סמלי +יישומים לכאן + + + + QuickLaunchButton + + + (Ctrl + DND) + (Ctrl + DND) + + + + Move left + הזזה שמאלה + + + + Move right + הזזה ימינה + + + + Remove from quicklaunch + הסרה מ־quicklaunch + + + diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_hr.desktop lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_hr.desktop --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=Brzo pokretanje +Comment[hr]=Brz pristup omiljenim programima. diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_hr.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_hr.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_hr.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_hr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,47 @@ + + + + + LXQtQuickLaunch + + + Drop Error + Greška ispuštanja + + + + File/URL '%1' cannot be embedded into QuickLaunch for now + Datoteku/URL „%1” za sada nije moguće ugraditi u Brzo pokretanje + + + + Drop application +icons here + Ispusti ikone +programa ovdje + + + + QuickLaunchButton + + + (Ctrl + DND) + (Ctrl + DND) + + + + Move left + Pomakni lijevo + + + + Move right + Pomakni desno + + + + Remove from quicklaunch + Ukloni iz brzog pokretanja + + + diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_hu.desktop lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_hu.desktop --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_hu.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_hu.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -8,5 +8,5 @@ # Translations -Comment[hu]=A kedvenc alkalmazásainak indítása +Comment[hu]=A kedvenc alkalmazásainak indítása. Name[hu]=Gyorsindító diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_hu.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_hu.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_hu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_hu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,37 +4,42 @@ LXQtQuickLaunch - + Drop Error Ejtési hiba - + File/URL '%1' cannot be embedded into QuickLaunch for now A(z) „%1” fájl vagy URL nem ágyazható be a Gyorsindítóba - + Drop application icons here - Ejts ide -indító ikont + Rakjon ide +indító ikonokat QuickLaunchButton + (Ctrl + DND) + (Ctrl + húzás) + + + Move left Balra - + Move right Jobbra - + Remove from quicklaunch Eltávolítás a gyorsindítóról diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_ia.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_ia.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_ia.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_ia.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error - + File/URL '%1' cannot be embedded into QuickLaunch for now - + Drop application icons here @@ -24,16 +24,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left - + Move right - + Remove from quicklaunch diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_id.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_id.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_id.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_id.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Salah Menjatuhkan - + File/URL '%1' cannot be embedded into QuickLaunch for now Berkas/URL '%1' tidak dapat disematkan kedalam QuickLaunch untuk saat ini - + Drop application icons here Jatuhkan ikon @@ -25,16 +25,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left Pindah kekiri - + Move right Pindah kekanan - + Remove from quicklaunch Hapus dari quicklaunch diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_it.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_it.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_it.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_it.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Errore di rilascio - + File/URL '%1' cannot be embedded into QuickLaunch for now Il file/URL '%1' in questo momento non può essere inserito in Avvio rapido - + Drop application icons here Rilascia qui le icone @@ -25,16 +25,21 @@ QuickLaunchButton + (Ctrl + DND) + (Ctrl + trascina) + + + Move left Sposta a sinistra - + Move right Sposta a destra - + Remove from quicklaunch Rimuovi da Avvio rapido diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_ja.desktop lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_ja.desktop --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_ja.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_ja.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,12 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Quick launch -Comment=Easy access to your favourite applications. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ja]=お気に入りのアプリケーションの起動を容易にします Name[ja]=クイック起動 +Comment[ja]=お気に入りのアプリケーションの起動を簡単にします diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_ja.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_ja.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_ja.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_ja.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,37 +4,42 @@ LXQtQuickLaunch - + Drop Error ドロップエラー - + File/URL '%1' cannot be embedded into QuickLaunch for now - ファイル/URL '%1' は現在、クイック起動に埋め込むことができません + 現時点では、ファイル/URL '%1' はクイック起動に入れられません - + Drop application icons here - アプリケーションアイコンを -ここへドロップ + ここにアプリケーション +アイコンをドロップします QuickLaunchButton + (Ctrl + DND) + (Ctrl + ドラッグアンドドロップ) + + + Move left - 左に移動 + 左へ移動 - + Move right - 右に移動 + 右へ移動 - + Remove from quicklaunch クイック起動から削除 diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_ko.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_ko.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_ko.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_ko.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error 드롭 오류 - + File/URL '%1' cannot be embedded into QuickLaunch for now File/URL '%1'의 QuickLaunch 임베딩이 지금은 불가능합니다 - + Drop application icons here 애플리케이션 아이콘을 @@ -25,16 +25,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left 왼쪽으로 - + Move right 오른쪽으로 - + Remove from quicklaunch quicklaunch에서 빼기 diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_lt.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_lt.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_lt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_lt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Vilkimo klaida - + File/URL '%1' cannot be embedded into QuickLaunch for now Failas/URL "%1" dabar negali būti įtaisytas į spartųjį paleidimą - + Drop application icons here Vilkite programų @@ -25,16 +25,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left Perkelti kairėn - + Move right Perkelti dešinėn - + Remove from quicklaunch Šalinti iš sparčiojo paleidimo diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_nb_NO.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_nb_NO.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_nb_NO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_nb_NO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Slippfeil - + File/URL '%1' cannot be embedded into QuickLaunch for now - Filen/URLen '%1' kan ikke bli lagt til Hurtigstarteren nå + Filen/URLen '%1' kan ikke bli lagt til hurtigstarteren nå - + Drop application icons here Slipp program- @@ -25,16 +25,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left Flytt til venstre - + Move right Flytt til høyre - + Remove from quicklaunch Fjern fra hurtigstarteren diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_nl.desktop lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_nl.desktop --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_nl.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_nl.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,12 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Quick launch -Comment=Easy access to your favourite applications. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[nl]=Uw favoriete programma's starten Name[nl]=Snelstarter +Comment[nl]=Uw favoriete programma's starten met één muisklik. diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_nl.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_nl.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_nl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_nl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,39 +4,44 @@ LXQtQuickLaunch - + Drop Error - Neerzetfout + Sleepfout - + File/URL '%1' cannot be embedded into QuickLaunch for now Bestand/URL '%1' kan vooralsnog niet worden ingebed in de snelstartbalk - + Drop application icons here - Zet pictogrammen van -toepassingen hier neer + Sleep pictogrammen van +toepassingen hiernaartoe QuickLaunchButton + (Ctrl + DND) + Ctrl + slepen + + + Move left Verplaats naar links - + Move right Verplaats naar rechts - + Remove from quicklaunch - Verwijder uit snelstartbalk + Verwijder uit snelstarter diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_pl.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_pl.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_pl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_pl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Błąd upuszczania - + File/URL '%1' cannot be embedded into QuickLaunch for now Plik/adres '%1' nie może zostać umieszczony w Szybkim uruchamianiu teraz - + Drop application icons here Upuść ikony aplikacji tutaj @@ -24,16 +24,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left Przesuń w lewo - + Move right Przesuń w prawo - + Remove from quicklaunch Usuń z szybkiego uruchamiania diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_pt_BR.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_pt_BR.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_pt_BR.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_pt_BR.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Erro na colocação - + File/URL '%1' cannot be embedded into QuickLaunch for now O arquivo/URL '%1' não pôde ser incorporado ao lançador rápido por enquanto - + Drop application icons here Arraste ícones de @@ -25,16 +25,21 @@ QuickLaunchButton + (Ctrl + DND) + (Ctrl + Arrastar e Soltar) + + + Move left Mover para a esquerda - + Move right Mover para a direita - + Remove from quicklaunch Remover do lançador rápido diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_pt.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_pt.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_pt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_pt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Erro ao soltar - + File/URL '%1' cannot be embedded into QuickLaunch for now Ficheiro/URL '%1' ainda não pode ser incorporado no Início rápido - + Drop application icons here Largue aqui os @@ -25,16 +25,21 @@ QuickLaunchButton + (Ctrl + DND) + (Ctrl + Arrastar e largar) + + + Move left Mover para esquerda - + Move right Mover para direita - + Remove from quicklaunch Remover de Início rápido diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_ro_RO.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_ro_RO.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_ro_RO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_ro_RO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error - + File/URL '%1' cannot be embedded into QuickLaunch for now Fișierul/URL-ul '%1' nu poate fi inclus în lista de lansare rapidă momentan - + Drop application icons here @@ -24,16 +24,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left Mută spre stânga - + Move right Mută spre dreapta - + Remove from quicklaunch Îndepărtează din lista pentru lansare rapidă diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_ru.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_ru.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_ru.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_ru.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Ошибка при перетаскивании - + File/URL '%1' cannot be embedded into QuickLaunch for now Файл/URL-адрес '%1' сейчас не может быть встроен в быстрый запуск - + Drop application icons here Перетащите значки @@ -25,16 +25,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left Сдвинуть влево - + Move right Сдвинуть вправо - + Remove from quicklaunch Удалить из быстрого запуска diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_sk_SK.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_sk_SK.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_sk_SK.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_sk_SK.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error - CHyba pri pustení + Chyba pri poklese - + File/URL '%1' cannot be embedded into QuickLaunch for now - Súbor/URL „%1“ nateraz nemožno vložiť do rýchleho spustenia + Súbor/URL „%1“ momentálne nie je možné vložiť do rýchleho spustenia - + Drop application icons here Sem pretiahnite @@ -25,16 +25,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left Presunúť vľavo - + Move right Presunúť vpravo - + Remove from quicklaunch Odstrániť z rýchleho spustenia diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_sl.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_sl.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_sl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_sl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,36 +4,42 @@ LXQtQuickLaunch - + Drop Error - Napaka spusta + Napaka pri dodajanju - + File/URL '%1' cannot be embedded into QuickLaunch for now - Datoteke/lokacije »%1« trenutno ni bilo moč vstaviti v Hitri zagon + Elementa »%1« trenutno ni mogoče vstaviti v hitri zagon - + Drop application icons here - + Povlecite ikone za +hitri zagon sem QuickLaunchButton + (Ctrl + DND) + + + + Move left Premakni levo - + Move right Premakni desno - + Remove from quicklaunch Odstrani iz hitrega zagona diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_sr_BA.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_sr_BA.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_sr_BA.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_sr_BA.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Грешка испуштања - + File/URL '%1' cannot be embedded into QuickLaunch for now Фајл/УРЛ „%1“ не може бити уграђен у Брзо Покретање за сада - + Drop application icons here @@ -24,16 +24,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left Помјери лијево - + Move right Помјери десно - + Remove from quicklaunch Уклони са брзог покретања diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_sr@latin.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_sr@latin.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_sr@latin.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_sr@latin.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error - + File/URL '%1' cannot be embedded into QuickLaunch for now - + Drop application icons here @@ -24,16 +24,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left - + Move right - + Remove from quicklaunch diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_sr_RS.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_sr_RS.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_sr_RS.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_sr_RS.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Грешка испуштања - + File/URL '%1' cannot be embedded into QuickLaunch for now Фајл/УРЛ „%1“ не може бити уграђен у Брзо Покретање за сада - + Drop application icons here @@ -24,16 +24,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left Помери лево - + Move right Помери десно - + Remove from quicklaunch Уклони са брзог покретања diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_th_TH.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_th_TH.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_th_TH.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_th_TH.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error การหย่อนขัดข้อง - + File/URL '%1' cannot be embedded into QuickLaunch for now แฟ้ม/URL '%1' ไม่สามารถฝังตัวไปยังตัวเรียกโปรแกรมด่วนได้ในตอนนี้ - + Drop application icons here @@ -24,16 +24,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left ย้ายไปทางซ้าย - + Move right ย้ายไปทางขวา - + Remove from quicklaunch ลบออกจากตัวเรียกโปรแกรมด่วน diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_tr.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_tr.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_tr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_tr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Bırakma Hatası - + File/URL '%1' cannot be embedded into QuickLaunch for now Şimdilik '%1' dosyası/bağlantısı Hızlı Başlatıcı' ya eklenemiyor - + Drop application icons here Uygulama simgesini @@ -25,16 +25,21 @@ QuickLaunchButton + (Ctrl + DND) + (Ctrl + DND) + + + Move left Sola kaydır - + Move right Sağa kaydır - + Remove from quicklaunch Hızlı başlatıcıdan kaldır diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error - + File/URL '%1' cannot be embedded into QuickLaunch for now - + Drop application icons here @@ -24,16 +24,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left - + Move right - + Remove from quicklaunch diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_uk.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_uk.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_uk.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_uk.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error Збій при розміщенні - + File/URL '%1' cannot be embedded into QuickLaunch for now Файл/URL '%1' зараз не вдається додати до швидкого запуску - + Drop application icons here Тут значок програми @@ -25,16 +25,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left Посунути ліворуч - + Move right Посунути праворуч - + Remove from quicklaunch Вилучити зі швидкого запуску diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_zh_CN.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_zh_CN.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_zh_CN.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_zh_CN.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error 拖放错误 - + File/URL '%1' cannot be embedded into QuickLaunch for now 文件/URL '%1' 暂时无法被嵌入到快速启动 - + Drop application icons here 移动应用程序图标至此 @@ -24,16 +24,21 @@ QuickLaunchButton + (Ctrl + DND) + + + + Move left 左移 - + Move right 右移 - + Remove from quicklaunch 从快速启动删除 diff -Nru lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_zh_TW.ts lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_zh_TW.ts --- lxqt-panel-0.14.1/plugin-quicklaunch/translations/quicklaunch_zh_TW.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-quicklaunch/translations/quicklaunch_zh_TW.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,17 +4,17 @@ LXQtQuickLaunch - + Drop Error 移入錯誤 - + File/URL '%1' cannot be embedded into QuickLaunch for now 檔案位址'%1'現在無法嵌入至快速啟動 - + Drop application icons here 在此放置 @@ -25,16 +25,21 @@ QuickLaunchButton + (Ctrl + DND) + （Ctrl + 拖曳） + + + Move left 往左移 - + Move right 往右移 - + Remove from quicklaunch 從快速啟動中移除 diff -Nru lxqt-panel-0.14.1/plugin-sensors/feature.cpp lxqt-panel-0.16.1/plugin-sensors/feature.cpp --- lxqt-panel-0.14.1/plugin-sensors/feature.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/feature.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -33,11 +33,11 @@ : mSensorsChipName(sensorsChipName), mSensorsFeature(sensorsFeature) { - char *featureLabel = NULL; + char *featureLabel = nullptr; if ((featureLabel = sensors_get_label(mSensorsChipName, mSensorsFeature))) { - mLabel = featureLabel; + mLabel = QString::fromUtf8(featureLabel); free(featureLabel); } diff -Nru lxqt-panel-0.14.1/plugin-sensors/lxqtsensorsconfiguration.cpp lxqt-panel-0.16.1/plugin-sensors/lxqtsensorsconfiguration.cpp --- lxqt-panel-0.14.1/plugin-sensors/lxqtsensorsconfiguration.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/lxqtsensorsconfiguration.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -39,7 +39,7 @@ ui(new Ui::LXQtSensorsConfiguration) { setAttribute(Qt::WA_DeleteOnClose); - setObjectName("SensorsConfigurationWindow"); + setObjectName(QStringLiteral("SensorsConfigurationWindow")); ui->setupUi(this); // We load settings here cause we have to set up dynamic widgets @@ -69,10 +69,10 @@ void LXQtSensorsConfiguration::loadSettings() { - ui->updateIntervalSB->setValue(settings().value("updateInterval").toInt()); - ui->tempBarWidthSB->setValue(settings().value("tempBarWidth").toInt()); + ui->updateIntervalSB->setValue(settings().value(QStringLiteral("updateInterval")).toInt()); + ui->tempBarWidthSB->setValue(settings().value(QStringLiteral("tempBarWidth")).toInt()); - if (settings().value("useFahrenheitScale").toBool()) + if (settings().value(QStringLiteral("useFahrenheitScale")).toBool()) { ui->fahrenheitTempScaleRB->setChecked(true); } @@ -80,7 +80,7 @@ // In case of reloading settings we have to clear GUI elements ui->detectedChipsCB->clear(); - settings().beginGroup("chips"); + settings().beginGroup(QStringLiteral("chips")); QStringList chipNames = settings().childGroups(); for (int i = 0; i < chipNames.size(); ++i) @@ -96,32 +96,32 @@ } ui->warningAboutHighTemperatureChB->setChecked( - settings().value("warningAboutHighTemperature").toBool()); + settings().value(QStringLiteral("warningAboutHighTemperature")).toBool()); } void LXQtSensorsConfiguration::saveSettings() { - settings().setValue("updateInterval", ui->updateIntervalSB->value()); - settings().setValue("tempBarWidth", ui->tempBarWidthSB->value()); + settings().setValue(QStringLiteral("updateInterval"), ui->updateIntervalSB->value()); + settings().setValue(QStringLiteral("tempBarWidth"), ui->tempBarWidthSB->value()); if (ui->fahrenheitTempScaleRB->isChecked()) { - settings().setValue("useFahrenheitScale", true); + settings().setValue(QStringLiteral("useFahrenheitScale"), true); } else { - settings().setValue("useFahrenheitScale", false); + settings().setValue(QStringLiteral("useFahrenheitScale"), false); } - settings().beginGroup("chips"); + settings().beginGroup(QStringLiteral("chips")); QStringList chipNames = settings().childGroups(); if (chipNames.size()) { QStringList chipFeatureLabels; - QPushButton* colorButton = NULL; - QCheckBox* enabledCheckbox = NULL; + QPushButton* colorButton = nullptr; + QCheckBox* enabledCheckbox = nullptr; settings().beginGroup(chipNames[ui->detectedChipsCB->currentIndex()]); @@ -132,12 +132,12 @@ enabledCheckbox = qobject_cast(ui->chipFeaturesT->cellWidget(j, 0)); // We know what we are doing so we don't have to check if enabledCheckbox == 0 - settings().setValue("enabled", enabledCheckbox->isChecked()); + settings().setValue(QStringLiteral("enabled"), enabledCheckbox->isChecked()); colorButton = qobject_cast(ui->chipFeaturesT->cellWidget(j, 2)); // We know what we are doing so we don't have to check if colorButton == 0 settings().setValue( - "color", + QStringLiteral("color"), colorButton->palette().color(QPalette::Normal, QPalette::Button).name()); settings().endGroup(); @@ -147,7 +147,7 @@ } settings().endGroup(); - settings().setValue("warningAboutHighTemperature", + settings().setValue(QStringLiteral("warningAboutHighTemperature"), ui->warningAboutHighTemperatureChB->isChecked()); } @@ -176,12 +176,12 @@ void LXQtSensorsConfiguration::detectedChipSelected(int index) { - settings().beginGroup("chips"); + settings().beginGroup(QStringLiteral("chips")); QStringList chipNames = settings().childGroups(); QStringList chipFeatureLabels; - QPushButton* colorButton = NULL; - QCheckBox* enabledCheckbox = NULL; - QTableWidgetItem *chipFeatureLabel = NULL; + QPushButton* colorButton = nullptr; + QCheckBox* enabledCheckbox = nullptr; + QTableWidgetItem *chipFeatureLabel = nullptr; if (index < chipNames.size()) { @@ -205,7 +205,7 @@ ui->chipFeaturesT->insertRow(j); enabledCheckbox = new QCheckBox(ui->chipFeaturesT); - enabledCheckbox->setChecked(settings().value("enabled").toBool()); + enabledCheckbox->setChecked(settings().value(QStringLiteral("enabled")).toBool()); // Connect here after the setChecked call because we don't want to send signal connect(enabledCheckbox, SIGNAL(stateChanged(int)), this, SLOT(saveSettings())); ui->chipFeaturesT->setCellWidget(j, 0, enabledCheckbox); @@ -218,7 +218,7 @@ connect(colorButton, SIGNAL(clicked()), this, SLOT(changeProgressBarColor())); QPalette pal = colorButton->palette(); pal.setColor(QPalette::Normal, QPalette::Button, - QColor(settings().value("color").toString())); + QColor(settings().value(QStringLiteral("color")).toString())); colorButton->setPalette(pal); ui->chipFeaturesT->setCellWidget(j, 2, colorButton); diff -Nru lxqt-panel-0.14.1/plugin-sensors/lxqtsensors.cpp lxqt-panel-0.16.1/plugin-sensors/lxqtsensors.cpp --- lxqt-panel-0.14.1/plugin-sensors/lxqtsensors.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/lxqtsensors.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -51,7 +51,7 @@ initDefaultSettings(); // Add GUI elements - ProgressBar* pg = NULL; + ProgressBar* pg = nullptr; mLayout = new QBoxLayout(QBoxLayout::LeftToRight, this); mLayout->setSpacing(0); @@ -59,7 +59,7 @@ QString chipFeatureLabel; - mSettings->beginGroup("chips"); + mSettings->beginGroup(QStringLiteral("chips")); for (int i = 0; i < mDetectedChips.size(); ++i) { @@ -77,19 +77,14 @@ pg->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); // Hide progress bar if it is not enabled - if (!mSettings->value("enabled").toBool()) + if (!mSettings->value(QStringLiteral("enabled")).toBool()) { pg->hide(); } pg->setToolTip(chipFeatureLabel); pg->setTextVisible(false); - - QPalette pal = pg->palette(); - QColor color(mSettings->value("color").toString()); - pal.setColor(QPalette::Active, QPalette::Highlight, color); - pal.setColor(QPalette::Inactive, QPalette::Highlight, color); - pg->setPalette(pal); + pg->setSensorColor(mSettings->value(QStringLiteral("color")).toString()); mTemperatureProgressBars.push_back(pg); mLayout->addWidget(pg); @@ -110,13 +105,13 @@ // Run timer that will be updating sensor readings connect(&mUpdateSensorReadingsTimer, SIGNAL(timeout()), this, SLOT(updateSensorReadings())); - mUpdateSensorReadingsTimer.start(mSettings->value("updateInterval").toInt() * 1000); + mUpdateSensorReadingsTimer.start(mSettings->value(QStringLiteral("updateInterval")).toInt() * 1000); // Run timer that will be showin warning mWarningAboutHighTemperatureTimer.setInterval(500); connect(&mWarningAboutHighTemperatureTimer, SIGNAL(timeout()), this, SLOT(warningAboutHighTemperature())); - if (mSettings->value("warningAboutHighTemperature").toBool()) + if (mSettings->value(QStringLiteral("warningAboutHighTemperature")).toBool()) { mWarningAboutHighTemperatureTimer.start(); } @@ -141,8 +136,8 @@ // Iterator for temperature progress bars QList::iterator temperatureProgressBarsIt = mTemperatureProgressBars.begin(); - const bool use_fahrenheit = mSettings->value("useFahrenheitScale").toBool(); - const bool warn_high = mSettings->value("warningAboutHighTemperature").toBool(); + const bool use_fahrenheit = mSettings->value(QStringLiteral("useFahrenheitScale")).toBool(); + const bool warn_high = mSettings->value(QStringLiteral("warningAboutHighTemperature")).toBool(); const double default_max = use_fahrenheit ? celsiusToFahrenheit(DEFAULT_MAX) : DEFAULT_MAX; for (int i = 0; i < mDetectedChips.size(); ++i) @@ -153,7 +148,7 @@ { if (features[j].getType() == SENSORS_FEATURE_TEMP) { - tooltip = features[j].getLabel() + " (" + QChar(0x00B0); + tooltip = features[j].getLabel() + QStringLiteral(" (") + QChar(0x00B0); critTemp = features[j].getValue(SENSORS_SUBFEATURE_TEMP_CRIT); maxTemp = features[j].getValue(SENSORS_SUBFEATURE_TEMP_MAX); @@ -187,11 +182,11 @@ minTemp = celsiusToFahrenheit(minTemp); curTemp = celsiusToFahrenheit(curTemp); - tooltip += "F)"; + tooltip += QLatin1String("F)"); } else { - tooltip += "C)"; + tooltip += QLatin1String("C)"); } @@ -202,25 +197,25 @@ // Set current temperature (*temperatureProgressBarsIt)->setValue(curTemp); - tooltip += "

Crit: "; + tooltip += QLatin1String("

Crit: "); tooltip += QString::number((*temperatureProgressBarsIt)->maximum()); - tooltip += "
Max: "; + tooltip += QLatin1String("
Max: "); tooltip += QString::number(int(maxTemp)); - tooltip += "
Cur: "; + tooltip += QLatin1String("
Cur: "); // Mark high temperature in the tooltip if (highTemperature) { - tooltip += ""; + tooltip += QLatin1String(""); tooltip += QString::number((*temperatureProgressBarsIt)->value()); - tooltip += " !"; + tooltip += QLatin1String(" !"); } else { tooltip += QString::number((*temperatureProgressBarsIt)->value()); } - tooltip += "
Min: "; + tooltip += QLatin1String("
Min: "); tooltip += QString::number((*temperatureProgressBarsIt)->minimum()); (*temperatureProgressBarsIt)->setToolTip(tooltip); @@ -265,13 +260,13 @@ void LXQtSensors::settingsChanged() { - mUpdateSensorReadingsTimer.setInterval(mSettings->value("updateInterval").toInt() * 1000); + mUpdateSensorReadingsTimer.setInterval(mSettings->value(QStringLiteral("updateInterval")).toInt() * 1000); // Iterator for temperature progress bars QList::iterator temperatureProgressBarsIt = mTemperatureProgressBars.begin(); - mSettings->beginGroup("chips"); + mSettings->beginGroup(QStringLiteral("chips")); for (int i = 0; i < mDetectedChips.size(); ++i) { @@ -284,7 +279,7 @@ { mSettings->beginGroup(features[j].getLabel()); - if (mSettings->value("enabled").toBool()) + if (mSettings->value(QStringLiteral("enabled")).toBool()) { (*temperatureProgressBarsIt)->show(); } @@ -293,11 +288,7 @@ (*temperatureProgressBarsIt)->hide(); } - QPalette pal = (*temperatureProgressBarsIt)->palette(); - QColor color(mSettings->value("color").toString()); - pal.setColor(QPalette::Active, QPalette::Highlight, color); - pal.setColor(QPalette::Inactive, QPalette::Highlight, color); - (*temperatureProgressBarsIt)->setPalette(pal); + (*temperatureProgressBarsIt)->setSensorColor(mSettings->value(QStringLiteral("color")).toString()); mSettings->endGroup(); @@ -312,7 +303,7 @@ mSettings->endGroup(); - if (mSettings->value("warningAboutHighTemperature").toBool()) + if (mSettings->value(QStringLiteral("warningAboutHighTemperature")).toBool()) { // Update sensors readings to get the list of high temperature progress bars updateSensorReadings(); @@ -370,12 +361,12 @@ if (mPlugin->panel()->isHorizontal()) { - mTemperatureProgressBars[i]->setFixedWidth(mPlugin->settings()->value("tempBarWidth").toInt()); + mTemperatureProgressBars[i]->setFixedWidth(mPlugin->settings()->value(QStringLiteral("tempBarWidth")).toInt()); mTemperatureProgressBars[i]->setFixedHeight(QWIDGETSIZE_MAX); } else { - mTemperatureProgressBars[i]->setFixedHeight(mPlugin->settings()->value("tempBarWidth").toInt()); + mTemperatureProgressBars[i]->setFixedHeight(mPlugin->settings()->value(QStringLiteral("tempBarWidth")).toInt()); mTemperatureProgressBars[i]->setFixedWidth(QWIDGETSIZE_MAX); } } @@ -391,22 +382,22 @@ void LXQtSensors::initDefaultSettings() { - if (!mSettings->contains("updateInterval")) + if (!mSettings->contains(QStringLiteral("updateInterval"))) { - mSettings->setValue("updateInterval", 1); + mSettings->setValue(QStringLiteral("updateInterval"), 1); } - if (!mSettings->contains("tempBarWidth")) + if (!mSettings->contains(QStringLiteral("tempBarWidth"))) { - mSettings->setValue("tempBarWidth", 8); + mSettings->setValue(QStringLiteral("tempBarWidth"), 8); } - if (!mSettings->contains("useFahrenheitScale")) + if (!mSettings->contains(QStringLiteral("useFahrenheitScale"))) { - mSettings->setValue("useFahrenheitScale", false); + mSettings->setValue(QStringLiteral("useFahrenheitScale"), false); } - mSettings->beginGroup("chips"); + mSettings->beginGroup(QStringLiteral("chips")); // Initialize default sensors settings for (int i = 0; i < mDetectedChips.size(); ++i) @@ -419,15 +410,15 @@ if (features[j].getType() == SENSORS_FEATURE_TEMP) { mSettings->beginGroup(features[j].getLabel()); - if (!mSettings->contains("enabled")) + if (!mSettings->contains(QStringLiteral("enabled"))) { - mSettings->setValue("enabled", true); + mSettings->setValue(QStringLiteral("enabled"), true); } - if (!mSettings->contains("color")) + if (!mSettings->contains(QStringLiteral("color"))) { // This is the default from QtDesigner - mSettings->setValue("color", QColor(qRgb(98, 140, 178)).name()); + mSettings->setValue(QStringLiteral("color"), QColor(qRgb(98, 140, 178)).name()); } mSettings->endGroup(); } @@ -437,9 +428,9 @@ mSettings->endGroup(); - if (!mSettings->contains("warningAboutHighTemperature")) + if (!mSettings->contains(QStringLiteral("warningAboutHighTemperature"))) { - mSettings->setValue("warningAboutHighTemperature", true); + mSettings->setValue(QStringLiteral("warningAboutHighTemperature"), true); } } @@ -454,3 +445,18 @@ { return QSize(20, 20); } + +void ProgressBar::setSensorColor(const QString &colorName) +{ + // NOTE: Only a style sheet guarantees that custom colors are applied + // because not all widget styles use palettes to draw progress bars. + static const QString ss = QStringLiteral("QProgressBar{background-color: %1; border-radius: 2px; border: 1px solid %2;}" + "QProgressBar::chunk{background-color: %3; border-radius: 1px;}"); + QPalette pal = palette(); + QColor base = pal.color(QPalette::Base); + QColor outline = pal.color(QPalette::Text); + outline.setRgbF(0.5 * base.redF() + 0.5 * outline.redF(), + 0.5 * base.greenF() + 0.5 * outline.greenF(), + 0.5 * base.blueF() + 0.5 * outline.blueF()); + setStyleSheet(ss.arg(base.name(), outline.name(), colorName)); +} diff -Nru lxqt-panel-0.14.1/plugin-sensors/lxqtsensors.h lxqt-panel-0.16.1/plugin-sensors/lxqtsensors.h --- lxqt-panel-0.14.1/plugin-sensors/lxqtsensors.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/lxqtsensors.h 2020-11-05 16:09:19.000000000 +0000 @@ -40,9 +40,10 @@ { Q_OBJECT public: - ProgressBar(QWidget *parent = 0); + ProgressBar(QWidget *parent = nullptr); QSize sizeHint() const; + void setSensorColor(const QString &colorName); }; @@ -54,7 +55,7 @@ { Q_OBJECT public: - LXQtSensors(ILXQtPanelPlugin *plugin, QWidget* parent = 0); + LXQtSensors(ILXQtPanelPlugin *plugin, QWidget* parent = nullptr); ~LXQtSensors(); void settingsChanged(); diff -Nru lxqt-panel-0.14.1/plugin-sensors/lxqtsensorsplugin.h lxqt-panel-0.16.1/plugin-sensors/lxqtsensorsplugin.h --- lxqt-panel-0.14.1/plugin-sensors/lxqtsensorsplugin.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/lxqtsensorsplugin.h 2020-11-05 16:09:19.000000000 +0000 @@ -44,7 +44,7 @@ virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } virtual QWidget *widget(); - virtual QString themeId() const { return "Sensors"; } + virtual QString themeId() const { return QStringLiteral("Sensors"); } bool isSeparate() const { return true; } QDialog *configureDialog(); diff -Nru lxqt-panel-0.14.1/plugin-sensors/sensors.cpp lxqt-panel-0.16.1/plugin-sensors/sensors.cpp --- lxqt-panel-0.14.1/plugin-sensors/sensors.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/sensors.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -39,14 +39,14 @@ // Increase instance counter ++mInstanceCounter; - if (!mSensorsInitialized && sensors_init(NULL) == 0) + if (!mSensorsInitialized && sensors_init(nullptr) == 0) { // Sensors initialized mSensorsInitialized = true; sensors_chip_name const * chipName; int chipNr = 0; - while ((chipName = sensors_get_detected_chips(NULL, &chipNr)) != NULL) + while ((chipName = sensors_get_detected_chips(nullptr, &chipNr)) != nullptr) { mDetectedChips.push_back(chipName); } diff -Nru lxqt-panel-0.14.1/plugin-sensors/translations/sensors_arn.ts lxqt-panel-0.16.1/plugin-sensors/translations/sensors_arn.ts --- lxqt-panel-0.14.1/plugin-sensors/translations/sensors_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/translations/sensors_arn.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,82 @@ + + + + + LXQtSensorsConfiguration + + + Sensors Settings + + + + + Common + + + + + Update interval (seconds) + + + + + Temperature bar width + + + + + Temperature scale + + + + + Celsius + + + + + Fahrenheit + + + + + Blink status bars when the temperature is too high + + + + + Warning about high temperature + + + + + Sensors + + + + + Detected chips: + + + + + Chip features: + + + + + Enabled + + + + + Label + + + + + Color + + + + diff -Nru lxqt-panel-0.14.1/plugin-sensors/translations/sensors_ast.ts lxqt-panel-0.16.1/plugin-sensors/translations/sensors_ast.ts --- lxqt-panel-0.14.1/plugin-sensors/translations/sensors_ast.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/translations/sensors_ast.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,82 @@ + + + + + LXQtSensorsConfiguration + + + Sensors Settings + + + + + Common + + + + + Update interval (seconds) + + + + + Temperature bar width + + + + + Temperature scale + + + + + Celsius + + + + + Fahrenheit + + + + + Blink status bars when the temperature is too high + + + + + Warning about high temperature + + + + + Sensors + + + + + Detected chips: + + + + + Chip features: + + + + + Enabled + + + + + Label + + + + + Color + + + + diff -Nru lxqt-panel-0.14.1/plugin-sensors/translations/sensors_cs.ts lxqt-panel-0.16.1/plugin-sensors/translations/sensors_cs.ts --- lxqt-panel-0.14.1/plugin-sensors/translations/sensors_cs.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/translations/sensors_cs.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ Sensors Settings - Nastavení čidel + Nastavení senzorů @@ -21,7 +21,7 @@ Temperature bar width - Šířka proužku s teplotou + Šíře pruhu s teplotou @@ -31,17 +31,17 @@ Celsius - Celsius + Celsia Fahrenheit - Fahrenheit + Fahrenheita Blink status bars when the temperature is too high - Při příliš vysoké teplotě signalizovat blikáním proužků ukazatele stavu + Při příliš vysoké teplotě signalizovat blikáním pruhu ukazatele stavu @@ -51,7 +51,7 @@ Sensors - Čidla + Senzory @@ -66,12 +66,12 @@ Enabled - Zapnouto + Povoleno Label - Štítek + Označení diff -Nru lxqt-panel-0.14.1/plugin-sensors/translations/sensors_es.ts lxqt-panel-0.16.1/plugin-sensors/translations/sensors_es.ts --- lxqt-panel-0.14.1/plugin-sensors/translations/sensors_es.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/translations/sensors_es.ts 2020-11-05 16:09:19.000000000 +0000 @@ -41,12 +41,12 @@ Blink status bars when the temperature is too high - Hacer titilar las barras de estado si la temperatura es demasiado alta + Hacer destellos en las barra de estado si la temperatura es muy alta Warning about high temperature - Avisar cuando la temperatura sea alta + Advertir cuando la temperatura este alta diff -Nru lxqt-panel-0.14.1/plugin-sensors/translations/sensors_es_VE.ts lxqt-panel-0.16.1/plugin-sensors/translations/sensors_es_VE.ts --- lxqt-panel-0.14.1/plugin-sensors/translations/sensors_es_VE.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/translations/sensors_es_VE.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ Sensors Settings - + Configuración de Sensores @@ -41,7 +41,7 @@ Blink status bars when the temperature is too high - + Parpadear las barras de estado cuando la temperatura sea demasiado alta diff -Nru lxqt-panel-0.14.1/plugin-sensors/translations/sensors_fi.ts lxqt-panel-0.16.1/plugin-sensors/translations/sensors_fi.ts --- lxqt-panel-0.14.1/plugin-sensors/translations/sensors_fi.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/translations/sensors_fi.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ Sensors Settings - + Sensorien asetukset @@ -41,7 +41,7 @@ Blink status bars when the temperature is too high - + Välkytä tilapalkkeja kun lämpötila on liian korkea diff -Nru lxqt-panel-0.14.1/plugin-sensors/translations/sensors_he.ts lxqt-panel-0.16.1/plugin-sensors/translations/sensors_he.ts --- lxqt-panel-0.14.1/plugin-sensors/translations/sensors_he.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/translations/sensors_he.ts 2020-11-05 16:09:19.000000000 +0000 @@ -41,7 +41,7 @@ Blink status bars when the temperature is too high - + להבהב את שורות המצב כשהטמפרטורה גבוהה מדי diff -Nru lxqt-panel-0.14.1/plugin-sensors/translations/sensors_hr.desktop lxqt-panel-0.16.1/plugin-sensors/translations/sensors_hr.desktop --- lxqt-panel-0.14.1/plugin-sensors/translations/sensors_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/translations/sensors_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=Senzori +Comment[hr]=Prikaz stanja uređaja. diff -Nru lxqt-panel-0.14.1/plugin-sensors/translations/sensors_hr.ts lxqt-panel-0.16.1/plugin-sensors/translations/sensors_hr.ts --- lxqt-panel-0.14.1/plugin-sensors/translations/sensors_hr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/translations/sensors_hr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,77 +6,77 @@ Sensors Settings - Postavke senzora + Senzori – Postavke Common - Uobičajeno + Uobičajene Update interval (seconds) - Interval ažuriranja (sekunde) + Interval aktualiziranja (sekunde) Temperature bar width - Duljina trake temperature + Duljina trake temperature Temperature scale - Skala temperature + Temperaturna ljestvica Celsius - Celzijus + Celzijeva Fahrenheit - Fahrenheit + Fahrenheitova Blink status bars when the temperature is too high - + Traka stanja treperi kad je temperatura previsoka Warning about high temperature - Upozori na visoku temperaturu + Upozori na visoku temperaturu Sensors - Senzori + Senzori Detected chips: - Nađeni čipovi: + Nađeni čipovi: Chip features: - + Funkcije čipova: Enabled - Omogućeno + Aktivirano Label - + Oznaka Color - Boja + Boja diff -Nru lxqt-panel-0.14.1/plugin-sensors/translations/sensors_hu.ts lxqt-panel-0.16.1/plugin-sensors/translations/sensors_hu.ts --- lxqt-panel-0.14.1/plugin-sensors/translations/sensors_hu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/translations/sensors_hu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -16,37 +16,37 @@ Update interval (seconds) - Frissítési köz (másodperc) + Frissítési időköz (másodperc) Temperature bar width - Hősáv szélesség + Sáv szélessége Temperature scale - Hőfok skálaérték + Mértékegység Celsius - + Celsius Fahrenheit - + Fahrenheit Blink status bars when the temperature is too high - + Villogjon az állapotsáv, ha a hőmérséklet túl magas Warning about high temperature - Nagy hőfoknál figyelmeztetés + Magas hőfoknál figyelmeztetés diff -Nru lxqt-panel-0.14.1/plugin-sensors/translations/sensors_ja.desktop lxqt-panel-0.16.1/plugin-sensors/translations/sensors_ja.desktop --- lxqt-panel-0.14.1/plugin-sensors/translations/sensors_ja.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/translations/sensors_ja.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,10 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Sensors -Comment=View readings from hardware sensors. - - -# Translations Name[ja]=センサー -Comment[ja]=ハードウェアセンサからの測定値を表示します +Comment[ja]=ハードウェアセンサー(温度など)からの測定値を表示します diff -Nru lxqt-panel-0.14.1/plugin-sensors/translations/sensors_ja.ts lxqt-panel-0.16.1/plugin-sensors/translations/sensors_ja.ts --- lxqt-panel-0.14.1/plugin-sensors/translations/sensors_ja.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/translations/sensors_ja.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ Sensors Settings - センサーウィジェットの設定 + センサーの設定 @@ -31,22 +31,22 @@ Celsius - 摂氏 + 摂氏 (℃) Fahrenheit - 華氏 + 華氏 (℉) Blink status bars when the temperature is too high - + 温度が高すぎる時にステータスバーを点滅します Warning about high temperature - 高温時に警告 + 高温時に警告する diff -Nru lxqt-panel-0.14.1/plugin-sensors/translations/sensors_nl.desktop lxqt-panel-0.16.1/plugin-sensors/translations/sensors_nl.desktop --- lxqt-panel-0.14.1/plugin-sensors/translations/sensors_nl.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/translations/sensors_nl.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,10 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Sensors -Comment=View readings from hardware sensors. - - -# Translations Name[nl]=Sensoren -Comment[nl]=Bekijk metingen van hardware sensoren (op dit moment lm_sensors) +Comment[nl]=Bekijk metingen van hardware-sensoren. diff -Nru lxqt-panel-0.14.1/plugin-sensors/translations/sensors_nl.ts lxqt-panel-0.16.1/plugin-sensors/translations/sensors_nl.ts --- lxqt-panel-0.14.1/plugin-sensors/translations/sensors_nl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/translations/sensors_nl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ Sensors Settings - Instellingen van sensoren + Instellingen van Sensoren @@ -41,7 +41,7 @@ Blink status bars when the temperature is too high - + Knipper statusbalk als de temperatuur te hoog is @@ -56,7 +56,7 @@ Detected chips: - Opgemerkte chips: + Gedetecteerde chips: @@ -71,7 +71,7 @@ Label - Etiket + Label diff -Nru lxqt-panel-0.14.1/plugin-sensors/translations/sensors_pt_BR.ts lxqt-panel-0.16.1/plugin-sensors/translations/sensors_pt_BR.ts --- lxqt-panel-0.14.1/plugin-sensors/translations/sensors_pt_BR.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/translations/sensors_pt_BR.ts 2020-11-05 16:09:19.000000000 +0000 @@ -31,7 +31,7 @@ Celsius - + Celso diff -Nru lxqt-panel-0.14.1/plugin-sensors/translations/sensors_sk_SK.ts lxqt-panel-0.16.1/plugin-sensors/translations/sensors_sk_SK.ts --- lxqt-panel-0.14.1/plugin-sensors/translations/sensors_sk_SK.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/translations/sensors_sk_SK.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,82 @@ + + + + + LXQtSensorsConfiguration + + + Sensors Settings + Nastavenie senzorov + + + + Common + Spoločné + + + + Update interval (seconds) + Interval obnovovania (v sekundách) + + + + Temperature bar width + Šírka prúžku s teplotou + + + + Temperature scale + Stupnica teploty + + + + Celsius + Celzius + + + + Fahrenheit + Fahrenheit + + + + Blink status bars when the temperature is too high + Pri príliš vysokej teplote signalizovať blikaním + + + + Warning about high temperature + Varovanie pri vysokej teplote + + + + Sensors + Senzory + + + + Detected chips: + Zistené čipy: + + + + Chip features: + Funkcia čipov: + + + + Enabled + Aktivované + + + + Label + Štítok + + + + Color + Farba + + + diff -Nru lxqt-panel-0.14.1/plugin-sensors/translations/sensors_zh_TW.ts lxqt-panel-0.16.1/plugin-sensors/translations/sensors_zh_TW.ts --- lxqt-panel-0.14.1/plugin-sensors/translations/sensors_zh_TW.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sensors/translations/sensors_zh_TW.ts 2020-11-05 16:09:19.000000000 +0000 @@ -41,7 +41,7 @@ Blink status bars when the temperature is too high - + 當溫度過高時閃爍狀態欄 diff -Nru lxqt-panel-0.14.1/plugin-showdesktop/showdesktop.cpp lxqt-panel-0.16.1/plugin-showdesktop/showdesktop.cpp --- lxqt-panel-0.14.1/plugin-showdesktop/showdesktop.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-showdesktop/showdesktop.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -41,14 +41,14 @@ QObject(), ILXQtPanelPlugin(startupInfo) { - m_key = GlobalKeyShortcut::Client::instance()->addAction(QString(), QString("/panel/%1/show_hide").arg(settings()->group()), tr("Show desktop"), this); + m_key = GlobalKeyShortcut::Client::instance()->addAction(QString(), QStringLiteral("/panel/%1/show_hide").arg(settings()->group()), tr("Show desktop"), this); if (m_key) { connect(m_key, &GlobalKeyShortcut::Action::registrationFinished, this, &ShowDesktop::shortcutRegistered); connect(m_key, SIGNAL(activated()), this, SLOT(toggleShowingDesktop())); } - QAction * act = new QAction(XdgIcon::fromTheme("user-desktop"), tr("Show Desktop"), this); + QAction * act = new QAction(XdgIcon::fromTheme(QStringLiteral("user-desktop")), tr("Show Desktop"), this); connect(act, SIGNAL(triggered()), this, SLOT(toggleShowingDesktop())); mButton.setDefaultAction(act); @@ -60,10 +60,10 @@ { if (m_key->shortcut().isEmpty()) { - m_key->changeShortcut(DEFAULT_SHORTCUT); + m_key->changeShortcut(QStringLiteral(DEFAULT_SHORTCUT)); if (m_key->shortcut().isEmpty()) { - LXQt::Notification::notify(tr("Show Desktop: Global shortcut '%1' cannot be registered").arg(DEFAULT_SHORTCUT)); + LXQt::Notification::notify(tr("Show Desktop: Global shortcut '%1' cannot be registered").arg(QStringLiteral(DEFAULT_SHORTCUT))); } } } diff -Nru lxqt-panel-0.14.1/plugin-showdesktop/showdesktop.h lxqt-panel-0.16.1/plugin-showdesktop/showdesktop.h --- lxqt-panel-0.14.1/plugin-showdesktop/showdesktop.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-showdesktop/showdesktop.h 2020-11-05 16:09:19.000000000 +0000 @@ -46,7 +46,7 @@ ShowDesktop(const ILXQtPanelPluginStartupInfo &startupInfo); virtual QWidget *widget() { return &mButton; } - virtual QString themeId() const { return "ShowDesktop"; } + virtual QString themeId() const { return QStringLiteral("ShowDesktop"); } private: GlobalKeyShortcut::Action * m_key; diff -Nru lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_arn.ts lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_arn.ts --- lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_arn.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,22 @@ + + + + + ShowDesktop + + + Show desktop + + + + + Show Desktop: Global shortcut '%1' cannot be registered + + + + + Show Desktop + + + + diff -Nru lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_ast.ts lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_ast.ts --- lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_ast.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_ast.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,22 @@ + + + + + ShowDesktop + + + Show desktop + + + + + Show Desktop: Global shortcut '%1' cannot be registered + + + + + Show Desktop + + + + diff -Nru lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_de.ts lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_de.ts --- lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_de.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_de.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,17 +6,17 @@ Show desktop - Schreibtisch anzeigen + Arbeitsfläche anzeigen Show Desktop - Schreibtisch anzeigen + Arbeitsfläche anzeigen Show Desktop: Global shortcut '%1' cannot be registered - Schreibtisch anzeigen: Globales Tastaturkürzel '%1' kann nicht registriert werden + Arbeitsfläche anzeigen: Globales Tastaturkürzel '%1' kann nicht registriert werden diff -Nru lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_hr.desktop lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_hr.desktop --- lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=Prikaži radnu površinu +Comment[hr]=Sakrij sve prozore i prikaži radnu površinu diff -Nru lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_hr.ts lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_hr.ts --- lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_hr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_hr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,17 +6,17 @@ Show desktop - Pokaži radnu površinu + Prikaži radnu površinu Show Desktop: Global shortcut '%1' cannot be registered - + Prikaži radnu površinu: Nije moguće registrirati globalni prečac „%1” Show Desktop - Pokaži Radnu površinu + Prikaži radnu površinu diff -Nru lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_hu.desktop lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_hu.desktop --- lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_hu.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_hu.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -9,4 +9,4 @@ # Translations Comment[hu]=Minimalizálja az összes ablakot és megjeleníti az asztalt -Name[hu]=Az asztal megjelenítése +Name[hu]=Asztal megjelenítése diff -Nru lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_hu.ts lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_hu.ts --- lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_hu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_hu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,17 +6,17 @@ Show desktop - Asztalmegjelenítés + Asztal megjelenítése Show Desktop: Global shortcut '%1' cannot be registered - Asztalmegjelenítés: A '%1' gyorsbillentyű nem regisztrálható + Asztal megjelenítése: A '%1' gyorsbillentyű nem beállítható Show Desktop - Asztalmegjelenítés + Asztal megjelenítése diff -Nru lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_ja.desktop lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_ja.desktop --- lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_ja.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_ja.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,12 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Show desktop -Comment=Minimize all windows and show the desktop - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ja]=全ウィンドウ最小化やデスクトップ表示を可能にします Name[ja]=デスクトップ表示 +Comment[ja]=すべてのウィンドウを最小化してデスクトップを表示します diff -Nru lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_ja.ts lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_ja.ts --- lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_ja.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_ja.ts 2020-11-05 16:09:19.000000000 +0000 @@ -16,7 +16,7 @@ Show Desktop - デスクトップを表示 + デスクトップを表示します diff -Nru lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_nb_NO.ts lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_nb_NO.ts --- lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_nb_NO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_nb_NO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -11,7 +11,7 @@ Show Desktop: Global shortcut '%1' cannot be registered - Vis skrivebord: Global tastaturkommando '%1' kan ikke registreres + Vis skrivebord: Global tastatursnarevei '%1' kan ikke registreres diff -Nru lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_nl.desktop lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_nl.desktop --- lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_nl.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_nl.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,12 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Show desktop -Comment=Minimize all windows and show the desktop - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[nl]=Minimaliseer alle vensters en toon het bureaublad Name[nl]=Toon Bureaublad +Comment[nl]=Minimaliseer alle vensters en toon het bureaublad diff -Nru lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_sl.ts lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_sl.ts --- lxqt-panel-0.14.1/plugin-showdesktop/translations/showdesktop_sl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-showdesktop/translations/showdesktop_sl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,12 +6,12 @@ Show desktop - + Pokaži namizje Show Desktop: Global shortcut '%1' cannot be registered - Prikaz namizja: globalne bližnjice »%1« ni moč registrirati + Prikaži namizje: globalne bližnjice '%1' ni mogoče registrirati diff -Nru lxqt-panel-0.14.1/plugin-spacer/translations/spacer_arn.ts lxqt-panel-0.16.1/plugin-spacer/translations/spacer_arn.ts --- lxqt-panel-0.14.1/plugin-spacer/translations/spacer_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-spacer/translations/spacer_arn.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,47 @@ + + + + + SpacerConfiguration + + + Spacer Settings + + + + + Space width: + + + + + Space type: + + + + + fixed + + + + + expandable + + + + + lined + + + + + dotted + + + + + invisible + + + + diff -Nru lxqt-panel-0.14.1/plugin-spacer/translations/spacer_ar.ts lxqt-panel-0.16.1/plugin-spacer/translations/spacer_ar.ts --- lxqt-panel-0.14.1/plugin-spacer/translations/spacer_ar.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-spacer/translations/spacer_ar.ts 2020-11-05 16:09:19.000000000 +0000 @@ -21,22 +21,22 @@ fixed - + ثابت expandable - + يتوسّع lined - خطي + خطّي dotted - منقط + منقّط diff -Nru lxqt-panel-0.14.1/plugin-spacer/translations/spacer_ast.ts lxqt-panel-0.16.1/plugin-spacer/translations/spacer_ast.ts --- lxqt-panel-0.14.1/plugin-spacer/translations/spacer_ast.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-spacer/translations/spacer_ast.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,47 @@ + + + + + SpacerConfiguration + + + Spacer Settings + Axustes del espaciador + + + + Space width: + Anchor: + + + + Space type: + Triba: + + + + fixed + fixu + + + + expandable + espandible + + + + lined + lliniáu + + + + dotted + puntiáu + + + + invisible + invisible + + + diff -Nru lxqt-panel-0.14.1/plugin-spacer/translations/spacer_de.ts lxqt-panel-0.16.1/plugin-spacer/translations/spacer_de.ts --- lxqt-panel-0.14.1/plugin-spacer/translations/spacer_de.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-spacer/translations/spacer_de.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ Spacer Settings - Einstellungen des Abstandhalters + Abstandhaltereinstellungen diff -Nru lxqt-panel-0.14.1/plugin-spacer/translations/spacer_hr.desktop lxqt-panel-0.16.1/plugin-spacer/translations/spacer_hr.desktop --- lxqt-panel-0.14.1/plugin-spacer/translations/spacer_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-spacer/translations/spacer_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=Razmaci +Comment[hr]=Postavljanje razmaka izmađu programčića diff -Nru lxqt-panel-0.14.1/plugin-spacer/translations/spacer_hr.ts lxqt-panel-0.16.1/plugin-spacer/translations/spacer_hr.ts --- lxqt-panel-0.14.1/plugin-spacer/translations/spacer_hr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-spacer/translations/spacer_hr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,42 +6,42 @@ Spacer Settings - + Razmaci – Postavke Space width: - Duljina razmaka: + Širina razmaka: Space type: - Vrsta razmaka: + Vrsta razmaka: fixed - + fiksna expandable - + proširiva lined - + crta dotted - + točkast invisible - nevidljiv + nevidljiv diff -Nru lxqt-panel-0.14.1/plugin-spacer/translations/spacer_hu.ts lxqt-panel-0.16.1/plugin-spacer/translations/spacer_hu.ts --- lxqt-panel-0.14.1/plugin-spacer/translations/spacer_hu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-spacer/translations/spacer_hu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ Spacer Settings - Távtartóbeállítás + Távtartó beállítása @@ -16,27 +16,27 @@ Space type: - Táv típus: + Típus: fixed - + rögzített expandable - + bővíthető lined - vonalas + vonal dotted - pontozott + pontok diff -Nru lxqt-panel-0.14.1/plugin-spacer/translations/spacer_ja.desktop lxqt-panel-0.16.1/plugin-spacer/translations/spacer_ja.desktop --- lxqt-panel-0.14.1/plugin-spacer/translations/spacer_ja.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-spacer/translations/spacer_ja.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[ja]=スペーサー +Comment[ja]=プラグイン間に空間を開けます diff -Nru lxqt-panel-0.14.1/plugin-spacer/translations/spacer_ja.ts lxqt-panel-0.16.1/plugin-spacer/translations/spacer_ja.ts --- lxqt-panel-0.14.1/plugin-spacer/translations/spacer_ja.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-spacer/translations/spacer_ja.ts 2020-11-05 16:09:19.000000000 +0000 @@ -16,32 +16,32 @@ Space type: - スペースのタイプ: + スペースの種類: fixed - + 固定 expandable - + 自動拡張 lined - 線 + 直線 dotted - ドット + 点線 invisible - 見えないようにする + 非表示 diff -Nru lxqt-panel-0.14.1/plugin-spacer/translations/spacer_nb_NO.ts lxqt-panel-0.16.1/plugin-spacer/translations/spacer_nb_NO.ts --- lxqt-panel-0.14.1/plugin-spacer/translations/spacer_nb_NO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-spacer/translations/spacer_nb_NO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -41,7 +41,7 @@ invisible - Usynlig + usynlig diff -Nru lxqt-panel-0.14.1/plugin-spacer/translations/spacer_nl.desktop lxqt-panel-0.16.1/plugin-spacer/translations/spacer_nl.desktop --- lxqt-panel-0.14.1/plugin-spacer/translations/spacer_nl.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-spacer/translations/spacer_nl.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[nl]=Tussenruimte +Comment[nl]=Ruimte tussen bedieningselementen diff -Nru lxqt-panel-0.14.1/plugin-spacer/translations/spacer_nl.ts lxqt-panel-0.16.1/plugin-spacer/translations/spacer_nl.ts --- lxqt-panel-0.14.1/plugin-spacer/translations/spacer_nl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-spacer/translations/spacer_nl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,22 +6,22 @@ Spacer Settings - Instellingen voor spaties + Instellingen voor Tussenruimte Space width: - Spatiebreedte: + Breedte: Space type: - Spatiesoort: + Type: fixed - vastgezet + vast diff -Nru lxqt-panel-0.14.1/plugin-spacer/translations/spacer_sk_SK.ts lxqt-panel-0.16.1/plugin-spacer/translations/spacer_sk_SK.ts --- lxqt-panel-0.14.1/plugin-spacer/translations/spacer_sk_SK.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-spacer/translations/spacer_sk_SK.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,47 @@ + + + + + SpacerConfiguration + + + Spacer Settings + Nastavenie výplne + + + + Space width: + Šírka výplne: + + + + Space type: + Typ výplne: + + + + fixed + Pevné veľkosti + + + + expandable + Rozšíriteľná + + + + lined + linkovaná + + + + dotted + bodkovaná + + + + invisible + neviditeľný + + + diff -Nru lxqt-panel-0.14.1/plugin-spacer/translations/spacer_sk.ts lxqt-panel-0.16.1/plugin-spacer/translations/spacer_sk.ts --- lxqt-panel-0.14.1/plugin-spacer/translations/spacer_sk.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-spacer/translations/spacer_sk.ts 2020-11-05 16:09:19.000000000 +0000 @@ -21,12 +21,12 @@ fixed - + Pevný expandable - + Rozšiřitelný diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/CMakeLists.txt lxqt-panel-0.16.1/plugin-statusnotifier/CMakeLists.txt --- lxqt-panel-0.14.1/plugin-statusnotifier/CMakeLists.txt 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/CMakeLists.txt 2020-11-05 16:09:19.000000000 +0000 @@ -2,9 +2,11 @@ find_package(dbusmenu-qt5 REQUIRED) +find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Concurrent) set(HEADERS statusnotifier.h + statusnotifierconfiguration.h dbustypes.h statusnotifierbutton.h statusnotifieriteminterface.h @@ -15,6 +17,7 @@ set(SOURCES statusnotifier.cpp + statusnotifierconfiguration.cpp dbustypes.cpp statusnotifierbutton.cpp statusnotifieriteminterface.cpp @@ -23,6 +26,10 @@ sniasync.cpp ) +set(UIS + statusnotifierconfiguration.ui +) + qt5_add_dbus_adaptor(DBUS_SOURCES org.kde.StatusNotifierItem.xml statusnotifieriteminterface.h @@ -35,6 +42,7 @@ set(LIBRARIES dbusmenu-qt5 + Qt5::Concurrent ) BUILD_LXQT_PLUGIN(${PLUGIN}) diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/sniasync.h lxqt-panel-0.16.1/plugin-statusnotifier/sniasync.h --- lxqt-panel-0.14.1/plugin-statusnotifier/sniasync.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/sniasync.h 2020-11-05 16:09:19.000000000 +0000 @@ -67,7 +67,7 @@ { Q_OBJECT public: - SniAsync(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); + SniAsync(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr); template inline void propertyGetAsync(QString const &name, F finished) @@ -79,7 +79,7 @@ { QDBusPendingReply reply = *call; if (reply.isError()) - qDebug() << "Error on DBus request:" << reply.error(); + qDebug().noquote().nospace() << "Error on DBus request(" << mSni.service() << ',' << mSni.path() << "): " << reply.error(); finished(qdbus_cast::type>::argument_type>(reply.value())); call->deleteLater(); } diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifierbutton.cpp lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifierbutton.cpp --- lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifierbutton.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifierbutton.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -57,8 +57,9 @@ : QToolButton(parent), mMenu(nullptr), mStatus(Passive), - mFallbackIcon(QIcon::fromTheme("application-x-executable")), - mPlugin(plugin) + mFallbackIcon(QIcon::fromTheme(QLatin1String("application-x-executable"))), + mPlugin(plugin), + mAutoHide(false) { setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); setAutoRaise(true); @@ -70,6 +71,15 @@ connect(interface, &SniAsync::NewToolTip, this, &StatusNotifierButton::newToolTip); connect(interface, &SniAsync::NewStatus, this, &StatusNotifierButton::newStatus); + // get the title only at the start because that title is used + // for deciding about (auto-)hiding + interface->propertyGetAsync(QLatin1String("Title"), [this] (QString value) { + mTitle = value; + QTimer::singleShot(0, this, [this]() { // wait for the c-tor + Q_EMIT titleFound(mTitle); + }); + }); + interface->propertyGetAsync(QLatin1String("Menu"), [this] (QDBusObjectPath path) { if (!path.path().isEmpty()) { @@ -83,14 +93,21 @@ }); interface->propertyGetAsync(QLatin1String("IconThemePath"), [this] (QString value) { - mThemePath = value; //do the logic of icons after we've got the theme path - refetchIcon(Active); - refetchIcon(Passive); - refetchIcon(NeedsAttention); + refetchIcon(Active, value); + refetchIcon(Passive, value); + refetchIcon(NeedsAttention, value); }); newToolTip(); + + // The timer that hides an auto-hiding button after it gets attention: + mHideTimer.setSingleShot(true); + mHideTimer.setInterval(300000); + connect(&mHideTimer, &QTimer::timeout, this, [this] { + hide(); + Q_EMIT attentionChanged(); + }); } StatusNotifierButton::~StatusNotifierButton() @@ -100,20 +117,33 @@ void StatusNotifierButton::newIcon() { - refetchIcon(Passive); + if (!icon().isNull() && icon().name() != QLatin1String("application-x-executable")) + onNeedingAttention(); + + interface->propertyGetAsync(QLatin1String("IconThemePath"), [this] (QString value) { + refetchIcon(Passive, value); + }); } void StatusNotifierButton::newOverlayIcon() { - refetchIcon(Active); + onNeedingAttention(); + + interface->propertyGetAsync(QLatin1String("IconThemePath"), [this] (QString value) { + refetchIcon(Active, value); + }); } void StatusNotifierButton::newAttentionIcon() { - refetchIcon(NeedsAttention); + onNeedingAttention(); + + interface->propertyGetAsync(QLatin1String("IconThemePath"), [this] (QString value) { + refetchIcon(NeedsAttention, value); + }); } -void StatusNotifierButton::refetchIcon(Status status) +void StatusNotifierButton::refetchIcon(Status status, const QString& themePath) { QString nameProperty, pixmapProperty; if (status == Active) @@ -132,7 +162,7 @@ pixmapProperty = QLatin1String("IconPixmap"); } - interface->propertyGetAsync(nameProperty, [this, status, pixmapProperty] (QString iconName) { + interface->propertyGetAsync(nameProperty, [this, status, pixmapProperty, themePath] (QString iconName) { QIcon nextIcon; if (!iconName.isEmpty()) { @@ -140,13 +170,13 @@ nextIcon = QIcon::fromTheme(iconName); else { - QDir themeDir(mThemePath); + QDir themeDir(themePath); if (themeDir.exists()) { - if (themeDir.exists(iconName + ".png")) - nextIcon.addFile(themeDir.filePath(iconName + ".png")); + if (themeDir.exists(iconName + QStringLiteral(".png"))) + nextIcon.addFile(themeDir.filePath(iconName + QStringLiteral(".png"))); - if (themeDir.cd("hicolor") || (themeDir.cd("icons") && themeDir.cd("hicolor"))) + if (themeDir.cd(QStringLiteral("hicolor")) || (themeDir.cd(QStringLiteral("icons")) && themeDir.cd(QStringLiteral("hicolor")))) { const QStringList sizes = themeDir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot); for (const QString &dir : sizes) @@ -154,7 +184,7 @@ const QStringList dirs = QDir(themeDir.filePath(dir)).entryList(QDir::AllDirs | QDir::NoDotAndDotDot); for (const QString &innerDir : dirs) { - QString file = themeDir.absolutePath() + "/" + dir + "/" + innerDir + "/" + iconName + ".png"; + QString file = themeDir.absolutePath() + QLatin1Char('/') + dir + QLatin1Char('/') + innerDir + QLatin1Char('/') + iconName + QStringLiteral(".png"); if (QFile::exists(file)) nextIcon.addFile(file); } @@ -193,7 +223,7 @@ QImage image((uchar*) iconPixmap.bytes.data(), iconPixmap.width, iconPixmap.height, QImage::Format_ARGB32); - const uchar *end = image.constBits() + image.byteCount(); + const uchar *end = image.constBits() + image.sizeInBytes(); uchar *dest = reinterpret_cast(iconPixmap.bytes.data()); for (const uchar *src = image.constBits(); src < end; src += 4, dest += 4) qToUnaligned(qToBigEndian(qFromUnaligned(src)), dest); @@ -250,12 +280,14 @@ return; mStatus = newStatus; + if (mStatus == NeedsAttention) + onNeedingAttention(); resetIcon(); } -void StatusNotifierButton::contextMenuEvent(QContextMenuEvent* event) +void StatusNotifierButton::contextMenuEvent(QContextMenuEvent* /*event*/) { - //XXX: avoid showing of parent's context menu, we are (optionaly) providing context menu on mouseReleaseEvent + //XXX: avoid showing of parent's context menu, we are (optionally) providing context menu on mouseReleaseEvent //QWidget::contextMenuEvent(event); } @@ -280,7 +312,7 @@ void StatusNotifierButton::wheelEvent(QWheelEvent *event) { - interface->Scroll(event->delta(), "vertical"); + interface->Scroll(event->delta(), QStringLiteral("vertical")); } void StatusNotifierButton::resetIcon() @@ -298,3 +330,31 @@ else setIcon(mFallbackIcon); } + +void StatusNotifierButton::setAutoHide(bool autoHide, int minutes, bool forcedVisible) +{ + if (autoHide) + mHideTimer.setInterval(qBound(1, minutes, 60) * 60000); + if (mAutoHide != autoHide) + { + mAutoHide = autoHide; + setVisible(!mAutoHide || forcedVisible); + if (!mAutoHide) + mHideTimer.stop(); + } +} + +void StatusNotifierButton::onNeedingAttention() +{ + if (mAutoHide) + { + show(); + mHideTimer.start(); + Q_EMIT attentionChanged(); + } +} + +bool StatusNotifierButton::hasAttention() const +{ + return mHideTimer.isActive(); +} diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifierbutton.h lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifierbutton.h --- lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifierbutton.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifierbutton.h 2020-11-05 16:09:19.000000000 +0000 @@ -36,6 +36,7 @@ #include #include #include +#include #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) template inline T qFromUnaligned(const uchar *src) @@ -55,7 +56,7 @@ Q_OBJECT public: - StatusNotifierButton(QString service, QString objectPath, ILXQtPanelPlugin* plugin, QWidget *parent = 0); + StatusNotifierButton(QString service, QString objectPath, ILXQtPanelPlugin* plugin, QWidget *parent = nullptr); ~StatusNotifierButton(); enum Status @@ -63,6 +64,16 @@ Passive, Active, NeedsAttention }; + QString title() const { + return mTitle; + } + bool hasAttention() const; + void setAutoHide(bool autoHide, int minutes = 5, bool forcedVisible = false); + +signals: + void titleFound(const QString &title); + void attentionChanged(); + public slots: void newIcon(); void newAttentionIcon(); @@ -71,21 +82,26 @@ void newStatus(QString status); private: + void onNeedingAttention(); + SniAsync *interface; QMenu *mMenu; Status mStatus; - QString mThemePath; QIcon mIcon, mOverlayIcon, mAttentionIcon, mFallbackIcon; ILXQtPanelPlugin* mPlugin; + QString mTitle; + bool mAutoHide; + QTimer mHideTimer; + protected: void contextMenuEvent(QContextMenuEvent * event); void mouseReleaseEvent(QMouseEvent *event); void wheelEvent(QWheelEvent *event); - void refetchIcon(Status status); + void refetchIcon(Status status, const QString& themePath); void resetIcon(); }; diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifierconfiguration.cpp lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifierconfiguration.cpp --- lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifierconfiguration.cpp 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifierconfiguration.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,115 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * https://lxqt.org + * + * Copyright: 2020 LXQt team + * + * 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 "statusnotifierconfiguration.h" +#include "ui_statusnotifierconfiguration.h" +#include +#include + +StatusNotifierConfiguration::StatusNotifierConfiguration(PluginSettings *settings, QWidget *parent): + LXQtPanelPluginConfigDialog(settings, parent), + ui(new Ui::StatusNotifierConfiguration) +{ + setAttribute(Qt::WA_DeleteOnClose); + setObjectName(QStringLiteral("StatusNotifierConfigurationWindow")); + ui->setupUi(this); + + if (QPushButton *closeBtn = ui->buttons->button(QDialogButtonBox::Close)) + closeBtn->setDefault(true); + connect(ui->buttons, &QDialogButtonBox::clicked, this, &StatusNotifierConfiguration::dialogButtonsAction); + + ui->tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); + ui->tableWidget->horizontalHeader()->setSectionsClickable(false); + ui->tableWidget->sortByColumn(0, Qt::AscendingOrder); + + loadSettings(); + + connect(ui->attentionSB, &QAbstractSpinBox::editingFinished, this, &StatusNotifierConfiguration::saveSettings); +} + +StatusNotifierConfiguration::~StatusNotifierConfiguration() +{ + delete ui; +} + +void StatusNotifierConfiguration::loadSettings() +{ + ui->attentionSB->setValue(settings().value(QStringLiteral("attentionPeriod"), 5).toInt()); + mAutoHideList = settings().value(QStringLiteral("autoHideList")).toStringList(); + mHideList = settings().value(QStringLiteral("hideList")).toStringList(); +} + +void StatusNotifierConfiguration::saveSettings() +{ + settings().setValue(QStringLiteral("attentionPeriod"), ui->attentionSB->value()); + settings().setValue(QStringLiteral("autoHideList"), mAutoHideList); + settings().setValue(QStringLiteral("hideList"), mHideList); +} + +void StatusNotifierConfiguration::addItems(const QStringList &items) +{ + ui->tableWidget->setRowCount(items.size()); + ui->tableWidget->setSortingEnabled(false); + int index = 0; + for (const auto &item : items) + { + // first column + QTableWidgetItem *widgetItem = new QTableWidgetItem(item); + widgetItem->setFlags(widgetItem->flags() & ~Qt::ItemIsEditable & ~Qt::ItemIsSelectable); + ui->tableWidget->setItem(index, 0, widgetItem); + // second column + QComboBox *cb = new QComboBox(); + cb->addItems(QStringList() << tr("Always show") << tr("Auto-hide") << tr("Always hide")); + if (mAutoHideList.contains(item)) + cb->setCurrentIndex(1); + else if (mHideList.contains(item)) + cb->setCurrentIndex(2); + connect(cb, QOverload::of(&QComboBox::currentIndexChanged), this, [this, item] (int indx) { + if (indx == 0) + { + mAutoHideList.removeAll(item); + mHideList.removeAll(item); + } + else if (indx == 1) + { + mHideList.removeAll(item); + if (!mAutoHideList.contains(item)) + mAutoHideList << item; + } + else if (indx == 2) + { + mAutoHideList.removeAll(item); + if (!mHideList.contains(item)) + mHideList << item; + } + saveSettings(); + }); + ui->tableWidget->setCellWidget(index, 1, cb); + ++ index; + } + ui->tableWidget->setSortingEnabled(true); + ui->tableWidget->horizontalHeader()->setSortIndicatorShown(false); + ui->tableWidget->setCurrentCell(0, 1); +} diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifierconfiguration.h lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifierconfiguration.h --- lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifierconfiguration.h 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifierconfiguration.h 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,58 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * https://lxqt.org + * + * Copyright: 2020 LXQt team + * + * 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 STATUSNOTIFIERCONFIGURATION_H +#define STATUSNOTIFIERCONFIGURATION_H + +#include "../panel/lxqtpanelpluginconfigdialog.h" +#include "../panel/pluginsettings.h" + +namespace Ui { + class StatusNotifierConfiguration; +} + +class StatusNotifierConfiguration : public LXQtPanelPluginConfigDialog +{ + Q_OBJECT + +public: + explicit StatusNotifierConfiguration(PluginSettings *settings, QWidget *parent = nullptr); + ~StatusNotifierConfiguration(); + + void addItems(const QStringList &items); + +private: + Ui::StatusNotifierConfiguration *ui; + + QStringList mAutoHideList; + QStringList mHideList; + + void loadSettings(); + +private slots: + void saveSettings(); +}; + +#endif // STATUSNOTIFIERCONFIGURATION_H diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifierconfiguration.ui lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifierconfiguration.ui --- lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifierconfiguration.ui 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifierconfiguration.ui 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,145 @@ + + + StatusNotifierConfiguration + + + + 0 + 0 + 400 + 400 + + + + Status Notifier Settings + + + + 5 + + + + + 5 + + + + + An auto-hiding item will remain visible for this period if it needs attention. + + + Attention period: + + + + + + + An auto-hiding item will remain visible for this period if it needs attention. + + + minute(s) + + + 1 + + + 60 + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 5 + 5 + + + + + + + + + + Change visibility of items + + + + + + QAbstractItemView::SingleSelection + + + false + + + + Item + + + + + Visibility + + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Close|QDialogButtonBox::Reset + + + + + + + + + buttons + accepted() + StatusNotifierConfiguration + accept() + + + 262 + 496 + + + 157 + 274 + + + + + buttons + rejected() + StatusNotifierConfiguration + reject() + + + 330 + 496 + + + 286 + 274 + + + + + diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifier.cpp lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifier.cpp --- lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifier.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifier.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -35,6 +35,13 @@ m_widget = new StatusNotifierWidget(this); } +QDialog *StatusNotifier::configureDialog() +{ + auto dialog = new StatusNotifierConfiguration(settings()); + dialog->addItems(m_widget->itemTitles()); + return dialog; +} + void StatusNotifier::realign() { m_widget->realign(); diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifier.h lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifier.h --- lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifier.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifier.h 2020-11-05 16:09:19.000000000 +0000 @@ -31,6 +31,7 @@ #include "../panel/ilxqtpanelplugin.h" #include "statusnotifierwidget.h" +#include "statusnotifierconfiguration.h" class StatusNotifier : public QObject, public ILXQtPanelPlugin { @@ -40,10 +41,14 @@ bool isSeparate() const { return true; } void realign(); - QString themeId() const { return "StatusNotifier"; } - virtual Flags flags() const { return SingleInstance | NeedsHandle; } + QString themeId() const { return QStringLiteral("StatusNotifier"); } + virtual Flags flags() const { return SingleInstance | HaveConfigDialog | NeedsHandle; } QWidget *widget() { return m_widget; } + QDialog *configureDialog() override; + + void settingsChanged() { m_widget->settingsChanged(); } + private: StatusNotifierWidget *m_widget; }; diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifieriteminterface.h lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifieriteminterface.h --- lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifieriteminterface.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifieriteminterface.h 2020-11-05 16:09:19.000000000 +0000 @@ -60,7 +60,7 @@ { return "org.kde.StatusNotifierItem"; } public: - StatusNotifierItemInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); + StatusNotifierItemInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr); ~StatusNotifierItemInterface(); diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifierwatcher.cpp lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifierwatcher.cpp --- lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifierwatcher.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifierwatcher.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -40,9 +40,18 @@ qDBusRegisterMetaType(); QDBusConnection dbus = QDBusConnection::sessionBus(); - if (!dbus.registerService("org.kde.StatusNotifierWatcher")) - qDebug() << QDBusConnection::sessionBus().lastError().message(); - if (!dbus.registerObject("/StatusNotifierWatcher", this, QDBusConnection::ExportScriptableContents)) + switch (dbus.interface()->registerService(QStringLiteral("org.kde.StatusNotifierWatcher"), QDBusConnectionInterface::QueueService).value()) + { + case QDBusConnectionInterface::ServiceNotRegistered: + qWarning() << "StatusNotifier: unable to register service for org.kde.StatusNotifierWatcher"; + break; + case QDBusConnectionInterface::ServiceQueued: + qWarning() << "StatusNotifier: registration of service org.kde.StatusNotifierWatcher queued, we can become primary after existing one deregisters"; + break; + case QDBusConnectionInterface::ServiceRegistered: + break; + } + if (!dbus.registerObject(QStringLiteral("/StatusNotifierWatcher"), this, QDBusConnection::ExportScriptableContents)) qDebug() << QDBusConnection::sessionBus().lastError().message(); mWatcher = new QDBusServiceWatcher(this); @@ -54,16 +63,16 @@ StatusNotifierWatcher::~StatusNotifierWatcher() { - QDBusConnection::sessionBus().unregisterService("org.kde.StatusNotifierWatcher"); + QDBusConnection::sessionBus().unregisterService(QStringLiteral("org.kde.StatusNotifierWatcher")); } void StatusNotifierWatcher::RegisterStatusNotifierItem(const QString &serviceOrPath) { QString service = serviceOrPath; - QString path = "/StatusNotifierItem"; + QString path = QStringLiteral("/StatusNotifierItem"); // workaround for sni-qt - if (service.startsWith('/')) + if (service.startsWith(QLatin1Char('/'))) { path = service; service = message().service(); @@ -101,7 +110,7 @@ return; } - QString match = service + '/'; + QString match = service + QLatin1Char('/'); QStringList::Iterator it = mServices.begin(); while (it != mServices.end()) { diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifierwatcher.h lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifierwatcher.h --- lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifierwatcher.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifierwatcher.h 2020-11-05 16:09:19.000000000 +0000 @@ -46,7 +46,7 @@ Q_SCRIPTABLE Q_PROPERTY(QStringList RegisteredStatusNotifierItems READ RegisteredStatusNotifierItems) public: - explicit StatusNotifierWatcher(QObject *parent = 0); + explicit StatusNotifierWatcher(QObject *parent = nullptr); ~StatusNotifierWatcher(); bool isStatusNotifierHostRegistered() { return mHosts.count() > 0; } diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifierwidget.cpp lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifierwidget.cpp --- lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifierwidget.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifierwidget.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -29,29 +29,90 @@ #include "statusnotifierwidget.h" #include #include +#include +#include +#include +#include "../panel/pluginsettings.h" #include "../panel/ilxqtpanelplugin.h" StatusNotifierWidget::StatusNotifierWidget(ILXQtPanelPlugin *plugin, QWidget *parent) : QWidget(parent), - mPlugin(plugin) + mPlugin(plugin), + mAttentionPeriod(5), + mForceVisible(false) { - QString dbusName = QString("org.kde.StatusNotifierHost-%1-%2").arg(QApplication::applicationPid()).arg(1); - if (!QDBusConnection::sessionBus().registerService(dbusName)) - qDebug() << QDBusConnection::sessionBus().lastError().message(); - - mWatcher = new StatusNotifierWatcher; - mWatcher->RegisterStatusNotifierHost(dbusName); - - connect(mWatcher, &StatusNotifierWatcher::StatusNotifierItemRegistered, - this, &StatusNotifierWidget::itemAdded); - connect(mWatcher, &StatusNotifierWatcher::StatusNotifierItemUnregistered, - this, &StatusNotifierWidget::itemRemoved); - setLayout(new LXQt::GridLayout(this)); - realign(); - qDebug() << mWatcher->RegisteredStatusNotifierItems(); + // The button that shows all hidden items: + mShowBtn = new QToolButton(this); + mShowBtn->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + mShowBtn->setAutoRaise(true); + mShowBtn->setToolButtonStyle(Qt::ToolButtonTextOnly); + mShowBtn->setText(QStringLiteral("+")); + layout()->addWidget(mShowBtn); + mShowBtn->hide(); + connect(mShowBtn, &QAbstractButton::clicked, [this] { + if (mForceVisible) + return; // all items are visible; nothing to do + mShowBtn->hide(); + mHideTimer.stop(); + mForceVisible = true; + const auto allButtons = findChildren(QString(), Qt::FindDirectChildrenOnly); + for (const auto &btn : allButtons) + btn->show(); + }); + + settingsChanged(); + + // The timer that hides (auto-)hidden items after 2 seconds: + mHideTimer.setSingleShot(true); + mHideTimer.setInterval(2000); + connect(&mHideTimer, &QTimer::timeout, this, [this] { + mShowBtn->show(); + mForceVisible = false; + const auto allButtons = findChildren(QString(), Qt::FindDirectChildrenOnly); + for (const auto &btn : allButtons) + { + if (btn->hasAttention() + || (!mAutoHideList.contains(btn->title()) + && !mHideList.contains(btn->title()))) + { + continue; + } + btn->hide(); + } + }); + + QFutureWatcher * future_watcher = new QFutureWatcher; + connect(future_watcher, &QFutureWatcher::finished, this, [this, future_watcher] + { + mWatcher = future_watcher->future().result(); + + connect(mWatcher, &StatusNotifierWatcher::StatusNotifierItemRegistered, + this, &StatusNotifierWidget::itemAdded); + connect(mWatcher, &StatusNotifierWatcher::StatusNotifierItemUnregistered, + this, &StatusNotifierWidget::itemRemoved); + + qDebug() << mWatcher->RegisteredStatusNotifierItems(); + + future_watcher->deleteLater(); + }); + + QFuture future = QtConcurrent::run([] + { + QString dbusName = QStringLiteral("org.kde.StatusNotifierHost-%1-%2").arg(QApplication::applicationPid()).arg(1); + if (QDBusConnectionInterface::ServiceNotRegistered == QDBusConnection::sessionBus().interface()->registerService(dbusName, QDBusConnectionInterface::DontQueueService)) + qDebug() << "unable to register service for " << dbusName; + + StatusNotifierWatcher * watcher = new StatusNotifierWatcher; + watcher->RegisterStatusNotifierHost(dbusName); + watcher->moveToThread(QApplication::instance()->thread()); + return watcher; + }); + + future_watcher->setFuture(future); + realign(); } StatusNotifierWidget::~StatusNotifierWidget() @@ -59,9 +120,20 @@ delete mWatcher; } +void StatusNotifierWidget::leaveEvent(QEvent * /*event*/) +{ + if (mForceVisible) + mHideTimer.start(); +} + +void StatusNotifierWidget::enterEvent(QEvent * /*event*/) +{ + mHideTimer.stop(); +} + void StatusNotifierWidget::itemAdded(QString serviceAndPath) { - int slash = serviceAndPath.indexOf('/'); + int slash = serviceAndPath.indexOf(QLatin1Char('/')); QString serv = serviceAndPath.left(slash); QString path = serviceAndPath.mid(slash); StatusNotifierButton *button = new StatusNotifierButton(serv, path, mPlugin, this); @@ -69,18 +141,132 @@ mServices.insert(serviceAndPath, button); layout()->addWidget(button); button->show(); + + // show/hide the added item appropriately and show mShowBtn if needed + connect(button, &StatusNotifierButton::titleFound, [this, button] (const QString &title) { + mItemTitles << title; + if (mAutoHideList.contains(title)) + { + if (!mForceVisible) + mShowBtn->show(); + button->setAutoHide(true, mAttentionPeriod, mForceVisible); + } + else if (mHideList.contains(title)) + { + button->setAutoHide(false); + if (!mForceVisible) + { + mShowBtn->show(); + button->hide(); + } + } + }); + // show/hide mShowBtn if needed whenever an item gets or loses attention + connect(button, &StatusNotifierButton::attentionChanged, [this, button] { + if (button->hasAttention()) + { + if (mShowBtn->isVisible() || mForceVisible) + { + const auto allButtons = findChildren(QString(), Qt::FindDirectChildrenOnly); + for (const auto &btn : allButtons) + { + if (!btn->isVisible() + // or shown only because mShowBtn was clicked + || (mForceVisible && !btn->hasAttention() + && (mAutoHideList.contains(btn->title()) + || mHideList.contains(btn->title())))) + { + return; + } + } + // there is no item in the hiding list and all auto-hiding items have attention; + // so, mShowBtn has no job + mHideTimer.stop(); + mForceVisible = false; + mShowBtn->hide(); + } + } + else // the auto-hiding item lost attention + { + if (!mForceVisible) + mShowBtn->show(); + } + }); } void StatusNotifierWidget::itemRemoved(const QString &serviceAndPath) { - StatusNotifierButton *button = mServices.value(serviceAndPath, NULL); + StatusNotifierButton *button = mServices.value(serviceAndPath, nullptr); if (button) { + mItemTitles.removeOne(button->title()); + if (mShowBtn->isVisible() || mForceVisible) + { // hide mShowBtn if no (auto-)hidden item remains + bool showBtn = false; + for (const auto &name : qAsConst(mItemTitles)) + { + if (mAutoHideList.contains(name) || mHideList.contains(name)) + { + showBtn = true; + break; + } + } + if (!showBtn) + { + mHideTimer.stop(); + mForceVisible = false; + mShowBtn->hide(); + } + } button->deleteLater(); layout()->removeWidget(button); + mServices.remove(serviceAndPath); } } +void StatusNotifierWidget::settingsChanged() +{ + mAttentionPeriod = mPlugin->settings()->value(QStringLiteral("attentionPeriod"), 5).toInt(); + mAutoHideList = mPlugin->settings()->value(QStringLiteral("autoHideList")).toStringList(); + mHideList = mPlugin->settings()->value(QStringLiteral("hideList")).toStringList(); + + // show/hide items as well as showBtn appropriately + const auto allButtons = findChildren(QString(), Qt::FindDirectChildrenOnly); + bool showBtn = false; + for (const auto &btn : allButtons) + { + if (mAutoHideList.contains(btn->title())) + { + btn->setAutoHide(true, mAttentionPeriod); + if (!btn->isVisible() + // or shown only because mShowBtn was clicked + || !btn->hasAttention()) + { + showBtn = true; + } + } + else if (mHideList.contains(btn->title())) + { + showBtn = true; + btn->setAutoHide(false); + btn->hide(); + } + else + { + btn->setAutoHide(false); + btn->show(); // may have been in mHideList before + } + } + if (!showBtn) + { + mHideTimer.stop(); + mForceVisible = false; + mShowBtn->hide(); + } + else if (!mForceVisible) + mShowBtn->show(); +} + void StatusNotifierWidget::realign() { LXQt::GridLayout *layout = qobject_cast(this->layout()); @@ -100,3 +286,10 @@ layout->setEnabled(true); } + +QStringList StatusNotifierWidget::itemTitles() const +{ + QStringList names = mItemTitles; + names.removeDuplicates(); + return names; +} diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifierwidget.h lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifierwidget.h --- lxqt-panel-0.14.1/plugin-statusnotifier/statusnotifierwidget.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/statusnotifierwidget.h 2020-11-05 16:09:19.000000000 +0000 @@ -30,6 +30,7 @@ #define STATUSNOTIFIERWIDGET_H #include +#include #include @@ -41,9 +42,12 @@ Q_OBJECT public: - StatusNotifierWidget(ILXQtPanelPlugin *plugin, QWidget *parent = 0); + StatusNotifierWidget(ILXQtPanelPlugin *plugin, QWidget *parent = nullptr); ~StatusNotifierWidget(); + void settingsChanged(); + QStringList itemTitles() const; + signals: public slots: @@ -52,11 +56,24 @@ void realign(); +protected: + void leaveEvent(QEvent *event) override; + void enterEvent(QEvent *event) override; + private: ILXQtPanelPlugin *mPlugin; StatusNotifierWatcher *mWatcher; + QTimer mHideTimer; + QHash mServices; + + QStringList mItemTitles; + QStringList mAutoHideList; + QStringList mHideList; + QToolButton *mShowBtn; + int mAttentionPeriod; + bool mForceVisible; }; #endif // STATUSNOTIFIERWIDGET_H diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_arn.ts lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_arn.ts --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_arn.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,58 @@ + + + + + StatusNotifierConfiguration + + + Status Notifier Settings + + + + + + An auto-hiding item will remain visible for this period if it needs attention. + + + + + Attention period: + + + + + minute(s) + + + + + Change visibility of items + + + + + Item + + + + + Visibility + + + + + Always show + + + + + Auto-hide + + + + + Always hide + + + + diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_ast.ts lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_ast.ts --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_ast.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_ast.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,58 @@ + + + + + StatusNotifierConfiguration + + + Status Notifier Settings + + + + + + An auto-hiding item will remain visible for this period if it needs attention. + + + + + Attention period: + + + + + minute(s) + + + + + Change visibility of items + + + + + Item + + + + + Visibility + + + + + Always show + + + + + Auto-hide + + + + + Always hide + + + + diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_ca.ts lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_ca.ts --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_ca.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_ca.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,58 @@ + + StatusNotifierConfiguration + + + Status Notifier Settings + + + + + + An auto-hiding item will remain visible for this period if it needs attention. + + + + + Attention period: + + + + + minute(s) + + + + + Change visibility of items + + + + + Item + + + + + Visibility + + + + + Always show + + + + + Auto-hide + + + + + Always hide + + + diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_cs.ts lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_cs.ts --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_cs.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_cs.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,58 @@ + + + + + StatusNotifierConfiguration + + + Status Notifier Settings + Nastavení oznamování stavu + + + + + An auto-hiding item will remain visible for this period if it needs attention. + Automaticky skrývaná položka zůstane po tuto dobu viditelná, pokud toto potřebuje pozornost. + + + + Attention period: + Doba pozornosti: + + + + minute(s) + minut(a) + + + + Change visibility of items + Změnit viditelnost položek + + + + Item + Položka + + + + Visibility + Viditelnost + + + + Always show + Ukázat vždy + + + + Auto-hide + Skrýt automaticky + + + + Always hide + Skrýt vždy + + + diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_cy.ts lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_cy.ts --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_cy.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_cy.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,58 @@ + + StatusNotifierConfiguration + + + Status Notifier Settings + + + + + + An auto-hiding item will remain visible for this period if it needs attention. + + + + + Attention period: + + + + + minute(s) + + + + + Change visibility of items + + + + + Item + + + + + Visibility + + + + + Always show + + + + + Auto-hide + + + + + Always hide + + + diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_da.ts lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_da.ts --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_da.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_da.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,58 @@ + + StatusNotifierConfiguration + + + Status Notifier Settings + + + + + + An auto-hiding item will remain visible for this period if it needs attention. + + + + + Attention period: + + + + + minute(s) + + + + + Change visibility of items + + + + + Item + + + + + Visibility + + + + + Always show + + + + + Auto-hide + + + + + Always hide + + + diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_de.ts lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_de.ts --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_de.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_de.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,58 @@ + + StatusNotifierConfiguration + + + Status Notifier Settings + + + + + + An auto-hiding item will remain visible for this period if it needs attention. + + + + + Attention period: + + + + + minute(s) + + + + + Change visibility of items + + + + + Item + + + + + Visibility + + + + + Always show + + + + + Auto-hide + + + + + Always hide + + + diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_gl.ts lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_gl.ts --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_gl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_gl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,58 @@ + + StatusNotifierConfiguration + + + Status Notifier Settings + + + + + + An auto-hiding item will remain visible for this period if it needs attention. + + + + + Attention period: + + + + + minute(s) + + + + + Change visibility of items + + + + + Item + + + + + Visibility + + + + + Always show + + + + + Auto-hide + + + + + Always hide + + + diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_he.ts lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_he.ts --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_he.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_he.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,58 @@ + + + + + StatusNotifierConfiguration + + + Status Notifier Settings + הגדרות מודיע מצבים + + + + + An auto-hiding item will remain visible for this period if it needs attention. + פריט שמסתתר אוטומטית יישאר גלוי למשך הזמן הזה אם נדרשת התייחסות. + + + + Attention period: + תקופת ההתייחסות: + + + + minute(s) + דקות + + + + Change visibility of items + החלפת מצב חשיפה של פריטים + + + + Item + פריט + + + + Visibility + נראות + + + + Always show + להציג תמיד + + + + Auto-hide + הסתרה אוטומטית + + + + Always hide + להסתיר תמיד + + + diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_hr.desktop lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_hr.desktop --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=Obavijesti o stanju +Comment[hr]=Dodatak za obavijesti o stanju diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_hu.desktop lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_hu.desktop --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_hu.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_hu.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,2 +1,2 @@ Name[hu]=Állapotjelzés -Comment[hu]=Álapotértesítő bővítmény +Comment[hu]=Állapotértesítő bővítmény diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_hu.ts lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_hu.ts --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_hu.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_hu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,58 @@ + + + + + StatusNotifierConfiguration + + + Status Notifier Settings + Állapotjelző beállítások + + + + + An auto-hiding item will remain visible for this period if it needs attention. + Az automatikus rejtett elem ebben az időszakban látható marad, ha figyelmet igényel. + + + + Attention period: + Figyelemidő: + + + + minute(s) + perc + + + + Change visibility of items + Elemek láthatóságának változtatása + + + + Item + Elem + + + + Visibility + Láthatóság + + + + Always show + Megjelenítés mindig + + + + Auto-hide + Automatikus elrejtés + + + + Always hide + Elrejtés mindig + + + diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_it.ts lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_it.ts --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_it.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_it.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,58 @@ + + + + + StatusNotifierConfiguration + + + Status Notifier Settings + Impostazioni di Status Notifier + + + + + An auto-hiding item will remain visible for this period if it needs attention. + Un applicazione che si nasconde automaticamente rimarrà visibile per questo periodo se necessita di attenzione. + + + + Attention period: + Periodo di attenzione: + + + + minute(s) + minuti + + + + Change visibility of items + Cambia visibilità delle applicazioni + + + + Item + Applicazione + + + + Visibility + Visibilità + + + + Always show + Mostra sempre + + + + Auto-hide + Nascondi automaticamente + + + + Always hide + Nascondi sempre + + + diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_ja.desktop lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_ja.desktop --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_ja.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_ja.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[ja]=ステータス通知 +Comment[ja]=ステータス(アイコン)を表示します diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_ja.ts lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_ja.ts --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_ja.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_ja.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,58 @@ + + + + + StatusNotifierConfiguration + + + Status Notifier Settings + ステータス通知の設定 + + + + + An auto-hiding item will remain visible for this period if it needs attention. + 注意が必要な場合、自動的に隠されるアイテムがこの期間表示されたままになります。 + + + + Attention period: + 注意期間: + + + + minute(s) + 分 + + + + Change visibility of items + アイテムの表示を変更 + + + + Item + アイテム + + + + Visibility + 表示 + + + + Always show + 常に表示する + + + + Auto-hide + 自動的に隠す + + + + Always hide + 常に隠す + + + diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_nb_NO.ts lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_nb_NO.ts --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_nb_NO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_nb_NO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,58 @@ + + StatusNotifierConfiguration + + + Status Notifier Settings + + + + + + An auto-hiding item will remain visible for this period if it needs attention. + + + + + Attention period: + + + + + minute(s) + + + + + Change visibility of items + + + + + Item + + + + + Visibility + + + + + Always show + + + + + Auto-hide + + + + + Always hide + + + diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_nl.desktop lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_nl.desktop --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_nl.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_nl.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[nl]=Statusmeldingen +Comment[nl]=Invoegtoepassing voor statusmeldingen diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_nl.ts lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_nl.ts --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_nl.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_nl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,58 @@ + + + + + StatusNotifierConfiguration + + + Status Notifier Settings + + + + + + An auto-hiding item will remain visible for this period if it needs attention. + + + + + Attention period: + + + + + minute(s) + + + + + Change visibility of items + + + + + Item + + + + + Visibility + + + + + Always show + + + + + Auto-hide + + + + + Always hide + + + + diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_pl.ts lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_pl.ts --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_pl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_pl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,58 @@ + + StatusNotifierConfiguration + + + Status Notifier Settings + + + + + + An auto-hiding item will remain visible for this period if it needs attention. + + + + + Attention period: + + + + + minute(s) + + + + + Change visibility of items + + + + + Item + + + + + Visibility + + + + + Always show + + + + + Auto-hide + + + + + Always hide + + + diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_sk_SK.ts lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_sk_SK.ts --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_sk_SK.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_sk_SK.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,58 @@ + + + + + StatusNotifierConfiguration + + + Status Notifier Settings + + + + + + An auto-hiding item will remain visible for this period if it needs attention. + + + + + Attention period: + + + + + minute(s) + + + + + Change visibility of items + + + + + Item + + + + + Visibility + + + + + Always show + + + + + Auto-hide + + + + + Always hide + + + + diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_tr.ts lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_tr.ts --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier_tr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier_tr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,58 @@ + + StatusNotifierConfiguration + + + Status Notifier Settings + Durum Bildirici Ayarları + + + + + An auto-hiding item will remain visible for this period if it needs attention. + Otomatik gizlenen bir öge, ilgilenilmesi gerekiyorsa bu süre boyunca görünür kalacaktır. + + + + Attention period: + Dikkat süresi: + + + + minute(s) + dakika(lar) + + + + Change visibility of items + Ögelerin görünürlüğünü değiştir + + + + Item + Öge + + + + Visibility + Görünürlük + + + + Always show + Her zaman göster + + + + Auto-hide + Otomatik Gizle + + + + Always hide + Her zaman gizle + + diff -Nru lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier.ts lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier.ts --- lxqt-panel-0.14.1/plugin-statusnotifier/translations/statusnotifier.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-statusnotifier/translations/statusnotifier.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,58 @@ + + StatusNotifierConfiguration + + + Status Notifier Settings + + + + + + An auto-hiding item will remain visible for this period if it needs attention. + + + + + Attention period: + + + + + minute(s) + + + + + Change visibility of items + + + + + Item + + + + + Visibility + + + + + Always show + + + + + Auto-hide + + + + + Always hide + + + diff -Nru lxqt-panel-0.14.1/plugin-sysstat/lxqtsysstatcolours.cpp lxqt-panel-0.16.1/plugin-sysstat/lxqtsysstatcolours.cpp --- lxqt-panel-0.14.1/plugin-sysstat/lxqtsysstatcolours.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/lxqtsysstatcolours.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -41,29 +41,29 @@ setWindowModality(Qt::WindowModal); ui->setupUi(this); - mDefaultColours["grid"] = QColor("#808080"); - mDefaultColours["title"] = QColor("#000000"); + mDefaultColours[QStringLiteral("grid")] = QColor("#808080"); + mDefaultColours[QStringLiteral("title")] = QColor("#000000"); - mDefaultColours["cpuSystem"] = QColor("#800000"); - mDefaultColours["cpuUser"] = QColor("#000080"); - mDefaultColours["cpuNice"] = QColor("#008000"); - mDefaultColours["cpuOther"] = QColor("#808000"); - mDefaultColours["cpuFrequency"] = QColor("#808080"); - - mDefaultColours["memApps"] = QColor("#000080"); - mDefaultColours["memBuffers"] = QColor("#008000"); - mDefaultColours["memCached"] = QColor("#808000"); - mDefaultColours["memSwap"] = QColor("#800000"); + mDefaultColours[QStringLiteral("cpuSystem")] = QColor("#800000"); + mDefaultColours[QStringLiteral("cpuUser")] = QColor("#000080"); + mDefaultColours[QStringLiteral("cpuNice")] = QColor("#008000"); + mDefaultColours[QStringLiteral("cpuOther")] = QColor("#808000"); + mDefaultColours[QStringLiteral("cpuFrequency")] = QColor("#808080"); + + mDefaultColours[QStringLiteral("memApps")] = QColor("#000080"); + mDefaultColours[QStringLiteral("memBuffers")] = QColor("#008000"); + mDefaultColours[QStringLiteral("memCached")] = QColor("#808000"); + mDefaultColours[QStringLiteral("memSwap")] = QColor("#800000"); - mDefaultColours["netReceived"] = QColor("#000080"); - mDefaultColours["netTransmitted"] = QColor("#808000"); + mDefaultColours[QStringLiteral("netReceived")] = QColor("#000080"); + mDefaultColours[QStringLiteral("netTransmitted")] = QColor("#808000"); #undef CONNECT_SELECT_COLOUR #define CONNECT_SELECT_COLOUR(VAR) \ connect(ui-> VAR ## B, SIGNAL(clicked()), mSelectColourMapper, SLOT(map())); \ - mSelectColourMapper->setMapping(ui-> VAR ## B, QString( #VAR )); \ - mShowColourMap[QString( #VAR )] = ui-> VAR ## B; + mSelectColourMapper->setMapping(ui-> VAR ## B, QString::fromLatin1( #VAR )); \ + mShowColourMap[QString::fromLatin1( #VAR )] = ui-> VAR ## B; CONNECT_SELECT_COLOUR(grid) CONNECT_SELECT_COLOUR(title) @@ -95,7 +95,7 @@ if (color.isValid()) { mColours[name] = color; - mShowColourMap[name]->setStyleSheet(QString("background-color: %1;\ncolor: %2;").arg(color.name()).arg((color.toHsl().lightnessF() > 0.5) ? "black" : "white")); + mShowColourMap[name]->setStyleSheet(QStringLiteral("background-color: %1;\ncolor: %2;").arg(color.name()).arg((color.toHsl().lightnessF() > 0.5) ? QStringLiteral("black") : QStringLiteral("white"))); ui->buttons->button(QDialogButtonBox::Apply)->setEnabled(true); } @@ -116,7 +116,7 @@ for (Colours::ConstIterator I = mColours.constBegin(); I != M; ++I) { const QColor &color = I.value(); - mShowColourMap[I.key()]->setStyleSheet(QString("background-color: %1;\ncolor: %2;").arg(color.name()).arg((color.toHsl().lightnessF() > 0.5) ? "black" : "white")); + mShowColourMap[I.key()]->setStyleSheet(QStringLiteral("background-color: %1;\ncolor: %2;").arg(color.name()).arg((color.toHsl().lightnessF() > 0.5) ? QStringLiteral("black") : QStringLiteral("white"))); } } diff -Nru lxqt-panel-0.14.1/plugin-sysstat/lxqtsysstatcolours.h lxqt-panel-0.16.1/plugin-sysstat/lxqtsysstatcolours.h --- lxqt-panel-0.14.1/plugin-sysstat/lxqtsysstatcolours.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/lxqtsysstatcolours.h 2020-11-05 16:09:19.000000000 +0000 @@ -49,7 +49,7 @@ Q_OBJECT public: - explicit LXQtSysStatColours(QWidget *parent = NULL); + explicit LXQtSysStatColours(QWidget *parent = nullptr); ~LXQtSysStatColours(); typedef QMap Colours; diff -Nru lxqt-panel-0.14.1/plugin-sysstat/lxqtsysstatconfiguration.cpp lxqt-panel-0.16.1/plugin-sysstat/lxqtsysstatconfiguration.cpp --- lxqt-panel-0.14.1/plugin-sysstat/lxqtsysstatconfiguration.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/lxqtsysstatconfiguration.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -85,11 +85,11 @@ LXQtSysStatConfiguration::LXQtSysStatConfiguration(PluginSettings *settings, QWidget *parent) : LXQtPanelPluginConfigDialog(settings, parent), ui(new Ui::LXQtSysStatConfiguration), - mStat(NULL), - mColoursDialog(NULL) + mStat(nullptr), + mColoursDialog(nullptr) { setAttribute(Qt::WA_DeleteOnClose); - setObjectName("SysStatConfigurationWindow"); + setObjectName(QStringLiteral("SysStatConfigurationWindow")); ui->setupUi(this); //Note: translation is needed here in runtime (translator is attached already) @@ -117,27 +117,27 @@ void LXQtSysStatConfiguration::loadSettings() { - ui->intervalSB->setValue(settings().value("graph/updateInterval", 1.0).toDouble()); - ui->sizeSB->setValue(settings().value("graph/minimalSize", 30).toInt()); + ui->intervalSB->setValue(settings().value(QStringLiteral("graph/updateInterval"), 1.0).toDouble()); + ui->sizeSB->setValue(settings().value(QStringLiteral("graph/minimalSize"), 30).toInt()); - ui->linesSB->setValue(settings().value("grid/lines", 1).toInt()); + ui->linesSB->setValue(settings().value(QStringLiteral("grid/lines"), 1).toInt()); - ui->titleLE->setText(settings().value("title/label", QString()).toString()); + ui->titleLE->setText(settings().value(QStringLiteral("title/label"), QString()).toString()); - int typeIndex = ui->typeCOB->findData(settings().value("data/type", msStatTypes[0])); + int typeIndex = ui->typeCOB->findData(settings().value(QStringLiteral("data/type"), msStatTypes[0])); ui->typeCOB->setCurrentIndex((typeIndex >= 0) ? typeIndex : 0); on_typeCOB_currentIndexChanged(ui->typeCOB->currentIndex()); - int sourceIndex = ui->sourceCOB->findData(settings().value("data/source", QString())); + int sourceIndex = ui->sourceCOB->findData(settings().value(QStringLiteral("data/source"), QString())); ui->sourceCOB->setCurrentIndex((sourceIndex >= 0) ? sourceIndex : 0); - ui->useFrequencyCB->setChecked(settings().value("cpu/useFrequency", true).toBool()); - ui->maximumHS->setValue(PluginSysStat::netSpeedFromString(settings().value("net/maximumSpeed", "1 MB/s").toString())); + ui->useFrequencyCB->setChecked(settings().value(QStringLiteral("cpu/useFrequency"), true).toBool()); + ui->maximumHS->setValue(PluginSysStat::netSpeedFromString(settings().value(QStringLiteral("net/maximumSpeed"), QStringLiteral("1 MB/s")).toString())); on_maximumHS_valueChanged(ui->maximumHS->value()); - ui->logarithmicCB->setChecked(settings().value("net/logarithmicScale", true).toBool()); - ui->logScaleSB->setValue(settings().value("net/logarithmicScaleSteps", 4).toInt()); + ui->logarithmicCB->setChecked(settings().value(QStringLiteral("net/logarithmicScale"), true).toBool()); + ui->logScaleSB->setValue(settings().value(QStringLiteral("net/logarithmicScaleSteps"), 4).toInt()); - bool useThemeColours = settings().value("graph/useThemeColours", true).toBool(); + bool useThemeColours = settings().value(QStringLiteral("graph/useThemeColours"), true).toBool(); ui->useThemeColoursRB->setChecked(useThemeColours); ui->useCustomColoursRB->setChecked(!useThemeColours); ui->customColoursB->setEnabled(!useThemeColours); @@ -145,26 +145,26 @@ void LXQtSysStatConfiguration::saveSettings() { - settings().setValue("graph/useThemeColours", ui->useThemeColoursRB->isChecked()); - settings().setValue("graph/updateInterval", ui->intervalSB->value()); - settings().setValue("graph/minimalSize", ui->sizeSB->value()); + settings().setValue(QStringLiteral("graph/useThemeColours"), ui->useThemeColoursRB->isChecked()); + settings().setValue(QStringLiteral("graph/updateInterval"), ui->intervalSB->value()); + settings().setValue(QStringLiteral("graph/minimalSize"), ui->sizeSB->value()); - settings().setValue("grid/lines", ui->linesSB->value()); + settings().setValue(QStringLiteral("grid/lines"), ui->linesSB->value()); - settings().setValue("title/label", ui->titleLE->text()); + settings().setValue(QStringLiteral("title/label"), ui->titleLE->text()); //Note: // need to make a realy deep copy of the msStatTypes[x] because of SEGFAULTs // occuring in static finalization time (don't know the real reason...maybe ordering of static finalizers/destructors) - QString type = ui->typeCOB->itemData(ui->typeCOB->currentIndex(), Qt::UserRole).toString().toStdString().c_str(); - settings().setValue("data/type", type); - settings().setValue("data/source", ui->sourceCOB->itemData(ui->sourceCOB->currentIndex(), Qt::UserRole)); - - settings().setValue("cpu/useFrequency", ui->useFrequencyCB->isChecked()); - - settings().setValue("net/maximumSpeed", PluginSysStat::netSpeedToString(ui->maximumHS->value())); - settings().setValue("net/logarithmicScale", ui->logarithmicCB->isChecked()); - settings().setValue("net/logarithmicScaleSteps", ui->logScaleSB->value()); + QString type = QString::fromUtf8(ui->typeCOB->itemData(ui->typeCOB->currentIndex(), Qt::UserRole).toString().toStdString().c_str()); + settings().setValue(QStringLiteral("data/type"), type); + settings().setValue(QStringLiteral("data/source"), ui->sourceCOB->itemData(ui->sourceCOB->currentIndex(), Qt::UserRole)); + + settings().setValue(QStringLiteral("cpu/useFrequency"), ui->useFrequencyCB->isChecked()); + + settings().setValue(QStringLiteral("net/maximumSpeed"), PluginSysStat::netSpeedToString(ui->maximumHS->value())); + settings().setValue(QStringLiteral("net/logarithmicScale"), ui->logarithmicCB->isChecked()); + settings().setValue(QStringLiteral("net/logarithmicScaleSteps"), ui->logScaleSB->value()); } void LXQtSysStatConfiguration::on_typeCOB_currentIndexChanged(int index) @@ -204,22 +204,22 @@ { const LXQtSysStatColours::Colours &colours = mColoursDialog->colours(); - settings().setValue("grid/colour", colours["grid"].name()); - settings().setValue("title/colour", colours["title"].name()); + settings().setValue(QStringLiteral("grid/colour"), colours[QStringLiteral("grid")].name()); + settings().setValue(QStringLiteral("title/colour"), colours[QStringLiteral("title")].name()); - settings().setValue("cpu/systemColour", colours["cpuSystem"].name()); - settings().setValue("cpu/userColour", colours["cpuUser"].name()); - settings().setValue("cpu/niceColour", colours["cpuNice"].name()); - settings().setValue("cpu/otherColour", colours["cpuOther"].name()); - settings().setValue("cpu/frequencyColour", colours["cpuFrequency"].name()); - - settings().setValue("mem/appsColour", colours["memApps"].name()); - settings().setValue("mem/buffersColour", colours["memBuffers"].name()); - settings().setValue("mem/cachedColour", colours["memCached"].name()); - settings().setValue("mem/swapColour", colours["memSwap"].name()); + settings().setValue(QStringLiteral("cpu/systemColour"), colours[QStringLiteral("cpuSystem")].name()); + settings().setValue(QStringLiteral("cpu/userColour"), colours[QStringLiteral("cpuUser")].name()); + settings().setValue(QStringLiteral("cpu/niceColour"), colours[QStringLiteral("cpuNice")].name()); + settings().setValue(QStringLiteral("cpu/otherColour"), colours[QStringLiteral("cpuOther")].name()); + settings().setValue(QStringLiteral("cpu/frequencyColour"), colours[QStringLiteral("cpuFrequency")].name()); + + settings().setValue(QStringLiteral("mem/appsColour"), colours[QStringLiteral("memApps")].name()); + settings().setValue(QStringLiteral("mem/buffersColour"), colours[QStringLiteral("memBuffers")].name()); + settings().setValue(QStringLiteral("mem/cachedColour"), colours[QStringLiteral("memCached")].name()); + settings().setValue(QStringLiteral("mem/swapColour"), colours[QStringLiteral("memSwap")].name()); - settings().setValue("net/receivedColour", colours["netReceived"].name()); - settings().setValue("net/transmittedColour", colours["netTransmitted"].name()); + settings().setValue(QStringLiteral("net/receivedColour"), colours[QStringLiteral("netReceived")].name()); + settings().setValue(QStringLiteral("net/transmittedColour"), colours[QStringLiteral("netTransmitted")].name()); } void LXQtSysStatConfiguration::on_customColoursB_clicked() @@ -234,22 +234,22 @@ const LXQtSysStatColours::Colours &defaultColours = mColoursDialog->defaultColours(); - colours["grid"] = QColor(settings().value("grid/colour", defaultColours["grid"] .name()).toString()); - colours["title"] = QColor(settings().value("title/colour", defaultColours["title"].name()).toString()); + colours[QStringLiteral("grid")] = QColor(settings().value(QStringLiteral("grid/colour"), defaultColours[QStringLiteral("grid")] .name()).toString()); + colours[QStringLiteral("title")] = QColor(settings().value(QStringLiteral("title/colour"), defaultColours[QStringLiteral("title")].name()).toString()); - colours["cpuSystem"] = QColor(settings().value("cpu/systemColour", defaultColours["cpuSystem"] .name()).toString()); - colours["cpuUser"] = QColor(settings().value("cpu/userColour", defaultColours["cpuUser"] .name()).toString()); - colours["cpuNice"] = QColor(settings().value("cpu/niceColour", defaultColours["cpuNice"] .name()).toString()); - colours["cpuOther"] = QColor(settings().value("cpu/otherColour", defaultColours["cpuOther"] .name()).toString()); - colours["cpuFrequency"] = QColor(settings().value("cpu/frequencyColour", defaultColours["cpuFrequency"].name()).toString()); - - colours["memApps"] = QColor(settings().value("mem/appsColour", defaultColours["memApps"] .name()).toString()); - colours["memBuffers"] = QColor(settings().value("mem/buffersColour", defaultColours["memBuffers"].name()).toString()); - colours["memCached"] = QColor(settings().value("mem/cachedColour", defaultColours["memCached"] .name()).toString()); - colours["memSwap"] = QColor(settings().value("mem/swapColour", defaultColours["memSwap"] .name()).toString()); + colours[QStringLiteral("cpuSystem")] = QColor(settings().value(QStringLiteral("cpu/systemColour"), defaultColours[QStringLiteral("cpuSystem")] .name()).toString()); + colours[QStringLiteral("cpuUser")] = QColor(settings().value(QStringLiteral("cpu/userColour"), defaultColours[QStringLiteral("cpuUser")] .name()).toString()); + colours[QStringLiteral("cpuNice")] = QColor(settings().value(QStringLiteral("cpu/niceColour"), defaultColours[QStringLiteral("cpuNice")] .name()).toString()); + colours[QStringLiteral("cpuOther")] = QColor(settings().value(QStringLiteral("cpu/otherColour"), defaultColours[QStringLiteral("cpuOther")] .name()).toString()); + colours[QStringLiteral("cpuFrequency")] = QColor(settings().value(QStringLiteral("cpu/frequencyColour"), defaultColours[QStringLiteral("cpuFrequency")].name()).toString()); + + colours[QStringLiteral("memApps")] = QColor(settings().value(QStringLiteral("mem/appsColour"), defaultColours[QStringLiteral("memApps")] .name()).toString()); + colours[QStringLiteral("memBuffers")] = QColor(settings().value(QStringLiteral("mem/buffersColour"), defaultColours[QStringLiteral("memBuffers")].name()).toString()); + colours[QStringLiteral("memCached")] = QColor(settings().value(QStringLiteral("mem/cachedColour"), defaultColours[QStringLiteral("memCached")] .name()).toString()); + colours[QStringLiteral("memSwap")] = QColor(settings().value(QStringLiteral("mem/swapColour"), defaultColours[QStringLiteral("memSwap")] .name()).toString()); - colours["netReceived"] = QColor(settings().value("net/receivedColour", defaultColours["netReceived"] .name()).toString()); - colours["netTransmitted"] = QColor(settings().value("net/transmittedColour", defaultColours["netTransmitted"].name()).toString()); + colours[QStringLiteral("netReceived")] = QColor(settings().value(QStringLiteral("net/receivedColour"), defaultColours[QStringLiteral("netReceived")] .name()).toString()); + colours[QStringLiteral("netTransmitted")] = QColor(settings().value(QStringLiteral("net/transmittedColour"), defaultColours[QStringLiteral("netTransmitted")].name()).toString()); mColoursDialog->setColours(colours); diff -Nru lxqt-panel-0.14.1/plugin-sysstat/lxqtsysstatconfiguration.ui lxqt-panel-0.16.1/plugin-sysstat/lxqtsysstatconfiguration.ui --- lxqt-panel-0.14.1/plugin-sysstat/lxqtsysstatconfiguration.ui 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/lxqtsysstatconfiguration.ui 2020-11-05 16:09:19.000000000 +0000 @@ -77,7 +77,7 @@ - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> px diff -Nru lxqt-panel-0.14.1/plugin-sysstat/lxqtsysstat.cpp lxqt-panel-0.16.1/plugin-sysstat/lxqtsysstat.cpp --- lxqt-panel-0.14.1/plugin-sysstat/lxqtsysstat.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/lxqtsysstat.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -115,14 +115,14 @@ LXQtSysStatContent::LXQtSysStatContent(ILXQtPanelPlugin *plugin, QWidget *parent): QWidget(parent), mPlugin(plugin), - mStat(NULL), + mStat(nullptr), mUpdateInterval(0), mMinimalSize(0), mTitleFontPixelHeight(0), mUseThemeColours(true), mHistoryOffset(0) { - setObjectName("SysStat_Graph"); + setObjectName(QStringLiteral("SysStat_Graph")); } LXQtSysStatContent::~LXQtSysStatContent() @@ -223,47 +223,47 @@ bool old_logarithmicScale = mLogarithmicScale; int old_logScaleSteps = mLogScaleSteps; - mUseThemeColours = settings->value("graph/useThemeColours", true).toBool(); - mUpdateInterval = settings->value("graph/updateInterval", 1.0).toDouble(); - mMinimalSize = settings->value("graph/minimalSize", 30).toInt(); + mUseThemeColours = settings->value(QStringLiteral("graph/useThemeColours"), true).toBool(); + mUpdateInterval = settings->value(QStringLiteral("graph/updateInterval"), 1.0).toDouble(); + mMinimalSize = settings->value(QStringLiteral("graph/minimalSize"), 30).toInt(); - mGridLines = settings->value("grid/lines", 1).toInt(); + mGridLines = settings->value(QStringLiteral("grid/lines"), 1).toInt(); - mTitleLabel = settings->value("title/label", QString()).toString(); + mTitleLabel = settings->value(QStringLiteral("title/label"), QString()).toString(); // default to CPU monitoring - mDataType = settings->value("data/type", LXQtSysStatConfiguration::msStatTypes[0]).toString(); + mDataType = settings->value(QStringLiteral("data/type"), LXQtSysStatConfiguration::msStatTypes[0]).toString(); - mDataSource = settings->value("data/source", QString("cpu")).toString(); + mDataSource = settings->value(QStringLiteral("data/source"), QStringLiteral("cpu")).toString(); - mUseFrequency = settings->value("cpu/useFrequency", true).toBool(); + mUseFrequency = settings->value(QStringLiteral("cpu/useFrequency"), true).toBool(); - mNetMaximumSpeed = PluginSysStat::netSpeedFromString(settings->value("net/maximumSpeed", "1 MB/s").toString()); - mLogarithmicScale = settings->value("net/logarithmicScale", true).toBool(); + mNetMaximumSpeed = PluginSysStat::netSpeedFromString(settings->value(QStringLiteral("net/maximumSpeed"), QStringLiteral("1 MB/s")).toString()); + mLogarithmicScale = settings->value(QStringLiteral("net/logarithmicScale"), true).toBool(); - mLogScaleSteps = settings->value("net/logarithmicScaleSteps", 4).toInt(); + mLogScaleSteps = settings->value(QStringLiteral("net/logarithmicScaleSteps"), 4).toInt(); mLogScaleMax = static_cast(static_cast(1) << mLogScaleSteps); mNetRealMaximumSpeed = static_cast(static_cast(1) << mNetMaximumSpeed); - mSettingsColours.gridColour = QColor(settings->value("grid/colour", "#c0c0c0").toString()); + mSettingsColours.gridColour = QColor(settings->value(QStringLiteral("grid/colour"), QStringLiteral("#c0c0c0")).toString()); - mSettingsColours.titleColour = QColor(settings->value("title/colour", "#ffffff").toString()); + mSettingsColours.titleColour = QColor(settings->value(QStringLiteral("title/colour"), QStringLiteral("#ffffff")).toString()); - mSettingsColours.cpuSystemColour = QColor(settings->value("cpu/systemColour", "#800000").toString()); - mSettingsColours.cpuUserColour = QColor(settings->value("cpu/userColour", "#000080").toString()); - mSettingsColours.cpuNiceColour = QColor(settings->value("cpu/niceColour", "#008000").toString()); - mSettingsColours.cpuOtherColour = QColor(settings->value("cpu/otherColour", "#808000").toString()); - mSettingsColours.frequencyColour = QColor(settings->value("cpu/frequencyColour", "#808080").toString()); - - mSettingsColours.memAppsColour = QColor(settings->value("mem/appsColour", "#000080").toString()); - mSettingsColours.memBuffersColour = QColor(settings->value("mem/buffersColour", "#008000").toString()); - mSettingsColours.memCachedColour = QColor(settings->value("mem/cachedColour", "#808000").toString()); - mSettingsColours.swapUsedColour = QColor(settings->value("mem/swapColour", "#800000").toString()); + mSettingsColours.cpuSystemColour = QColor(settings->value(QStringLiteral("cpu/systemColour"), QStringLiteral("#800000")).toString()); + mSettingsColours.cpuUserColour = QColor(settings->value(QStringLiteral("cpu/userColour"), QStringLiteral("#000080")).toString()); + mSettingsColours.cpuNiceColour = QColor(settings->value(QStringLiteral("cpu/niceColour"), QStringLiteral("#008000")).toString()); + mSettingsColours.cpuOtherColour = QColor(settings->value(QStringLiteral("cpu/otherColour"), QStringLiteral("#808000")).toString()); + mSettingsColours.frequencyColour = QColor(settings->value(QStringLiteral("cpu/frequencyColour"), QStringLiteral("#808080")).toString()); + + mSettingsColours.memAppsColour = QColor(settings->value(QStringLiteral("mem/appsColour"), QStringLiteral("#000080")).toString()); + mSettingsColours.memBuffersColour = QColor(settings->value(QStringLiteral("mem/buffersColour"), QStringLiteral("#008000")).toString()); + mSettingsColours.memCachedColour = QColor(settings->value(QStringLiteral("mem/cachedColour"), QStringLiteral("#808000")).toString()); + mSettingsColours.swapUsedColour = QColor(settings->value(QStringLiteral("mem/swapColour"), QStringLiteral("#800000")).toString()); - mSettingsColours.netReceivedColour = QColor(settings->value("net/receivedColour", "#000080").toString()); - mSettingsColours.netTransmittedColour = QColor(settings->value("net/transmittedColour", "#808000").toString()); + mSettingsColours.netReceivedColour = QColor(settings->value(QStringLiteral("net/receivedColour"), QStringLiteral("#000080")).toString()); + mSettingsColours.netTransmittedColour = QColor(settings->value(QStringLiteral("net/transmittedColour"), QStringLiteral("#808000")).toString()); if (mUseThemeColours) @@ -306,11 +306,11 @@ mStat = nullptr; } - if (mDataType == "CPU") + if (mDataType == QLatin1String("CPU")) mStat = new SysStat::CpuStat(this); - else if (mDataType == "Memory") + else if (mDataType == QLatin1String("Memory")) mStat = new SysStat::MemStat(this); - else if (mDataType == "Network") + else if (mDataType == QLatin1String("Network")) mStat = new SysStat::NetStat(this); } @@ -318,7 +318,7 @@ { if (needReconnecting) { - if (mDataType == "CPU") + if (mDataType == QLatin1String("CPU")) { if (mUseFrequency) { @@ -331,14 +331,14 @@ connect(qobject_cast(mStat), SIGNAL(update(float, float, float, float)), this, SLOT(cpuUpdate(float, float, float, float))); } } - else if (mDataType == "Memory") + else if (mDataType == QLatin1String("Memory")) { - if (mDataSource == "memory") + if (mDataSource == QLatin1String("memory")) connect(qobject_cast(mStat), SIGNAL(memoryUpdate(float, float, float)), this, SLOT(memoryUpdate(float, float, float))); else connect(qobject_cast(mStat), SIGNAL(swapUpdate(float)), this, SLOT(swapUpdate(float))); } - else if (mDataType == "Network") + else if (mDataType == QLatin1String("Network")) { connect(qobject_cast(mStat), SIGNAL(update(unsigned, unsigned)), this, SLOT(networkUpdate(unsigned, unsigned))); } @@ -620,7 +620,7 @@ void LXQtSysStatContent::toolTipInfo(QString const & tooltip) { - setToolTip(QString("%1(%2)
%3") + setToolTip(QStringLiteral("%1(%2)
%3") .arg(QCoreApplication::translate("LXQtSysStatConfiguration", mDataType.toStdString().c_str())) .arg(QCoreApplication::translate("LXQtSysStatConfiguration", mDataSource.toStdString().c_str())) .arg(tooltip)); diff -Nru lxqt-panel-0.14.1/plugin-sysstat/lxqtsysstat.h lxqt-panel-0.16.1/plugin-sysstat/lxqtsysstat.h --- lxqt-panel-0.14.1/plugin-sysstat/lxqtsysstat.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/lxqtsysstat.h 2020-11-05 16:09:19.000000000 +0000 @@ -50,7 +50,7 @@ ~LXQtSysStat(); virtual QWidget *widget() { return mWidget; } - virtual QString themeId() const { return "SysStat"; } + virtual QString themeId() const { return QStringLiteral("SysStat"); } virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } virtual bool isSeparate() const { return true; } @@ -73,7 +73,7 @@ { Q_OBJECT public: - LXQtSysStatTitle(QWidget *parent = NULL); + LXQtSysStatTitle(QWidget *parent = nullptr); ~LXQtSysStatTitle(); protected: @@ -102,7 +102,7 @@ Q_PROPERTY(QColor netTransmittedColor READ netTransmittedColour WRITE setNetTransmittedColour) public: - LXQtSysStatContent(ILXQtPanelPlugin *plugin, QWidget *parent = NULL); + LXQtSysStatContent(ILXQtPanelPlugin *plugin, QWidget *parent = nullptr); ~LXQtSysStatContent(); void updateSettings(const PluginSettings *); diff -Nru lxqt-panel-0.14.1/plugin-sysstat/lxqtsysstatutils.cpp lxqt-panel-0.16.1/plugin-sysstat/lxqtsysstatutils.cpp --- lxqt-panel-0.14.1/plugin-sysstat/lxqtsysstatutils.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/lxqtsysstatutils.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -39,18 +39,18 @@ QString prefix; static const char prefixes[] = "kMG"; if (value / 10) - prefix = QChar(prefixes[value / 10 - 1]); + prefix = QLatin1Char(prefixes[value / 10 - 1]); - return QString("%1 %2B/s").arg(1 << (value % 10)).arg(prefix); + return QStringLiteral("%1 %2B/s").arg(1 << (value % 10)).arg(prefix); } int netSpeedFromString(QString value) { - QRegExp re("^(\\d+) ([kMG])B/s$"); + QRegExp re(QStringLiteral("^(\\d+) ([kMG])B/s$")); if (re.exactMatch(value)) { int shift = 0; - switch (re.cap(2)[0].toLatin1()) + switch (re.cap(2).at(0).toLatin1()) { case 'k': shift = 10; diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_arn.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_arn.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_arn.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,405 @@ + + + + + LXQtSysStatColours + + + System Statistics Colors + + + + + Graph + + + + + &Grid + + + + + + + + + + + + + + + + + Change ... + + + + + T&itle + + + + + CPU + + + + + &Nice + + + + + Ot&her + + + + + &Frequency + + + + + S&ystem + + + + + &User + + + + + Memory + + + + + Cache&d + + + + + S&wap + + + + + &Applications + + + + + &Buffers + + + + + Network + + + + + &Received + + + + + &Transmitted + + + + + LXQtSysStatConfiguration + + + System Statistics Settings + + + + + Graph + + + + + &Minimal size + + + + + Update &interval + + + + + &Title + + + + + &Grid lines + + + + + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + + + + + px + + + + + s + + + + + Data + + + + + Use &frequency + + + + + Ma&ximum + + + + + XXX KBs + + + + + Lo&garithmic scale + + + + + steps + + + + + &Source + + + + + T&ype + + + + + Colours + + + + + Use t&heme colours + + + + + Use c&ustom colours + + + + + Custom colour ... + + + + + CPU + + + + + Memory + + + + + Network + + + + + cpu + + + + + cpu0 + + + + + cpu1 + + + + + cpu2 + + + + + cpu3 + + + + + cpu4 + + + + + cpu5 + + + + + cpu6 + + + + + cpu7 + + + + + cpu8 + + + + + cpu9 + + + + + cpu10 + + + + + cpu11 + + + + + cpu12 + + + + + cpu13 + + + + + cpu14 + + + + + cpu15 + + + + + cpu16 + + + + + cpu17 + + + + + cpu18 + + + + + cpu19 + + + + + cpu20 + + + + + cpu21 + + + + + cpu22 + + + + + cpu23 + + + + + memory + + + + + swap + + + + + LXQtSysStatContent + + + system: %1%<br>user: %2%<br>nice: %3%<br>other: %4%<br>freq: %5% + CPU tooltip information + + + + + system: %1%<br>user: %2%<br>nice: %3%<br>other: %4%<br>freq: n/a + CPU tooltip information + + + + + apps: %1%<br>buffers: %2%<br>cached: %3% + Memory tooltip information + + + + + used: %1% + Swap tooltip information + + + + + min: %1%<br>max: %2% + Network tooltip information + + + + diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_ast.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_ast.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_ast.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_ast.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,405 @@ + + + + + LXQtSysStatColours + + + System Statistics Colors + + + + + Graph + + + + + &Grid + + + + + + + + + + + + + + + + + Change ... + + + + + T&itle + + + + + CPU + + + + + &Nice + + + + + Ot&her + + + + + &Frequency + + + + + S&ystem + + + + + &User + + + + + Memory + + + + + Cache&d + + + + + S&wap + + + + + &Applications + + + + + &Buffers + + + + + Network + + + + + &Received + + + + + &Transmitted + + + + + LXQtSysStatConfiguration + + + System Statistics Settings + + + + + Graph + + + + + &Minimal size + + + + + Update &interval + + + + + &Title + + + + + &Grid lines + + + + + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + + + + + px + + + + + s + + + + + Data + + + + + Use &frequency + + + + + Ma&ximum + + + + + XXX KBs + + + + + Lo&garithmic scale + + + + + steps + + + + + &Source + + + + + T&ype + + + + + Colours + + + + + Use t&heme colours + + + + + Use c&ustom colours + + + + + Custom colour ... + + + + + CPU + + + + + Memory + + + + + Network + + + + + cpu + + + + + cpu0 + + + + + cpu1 + + + + + cpu2 + + + + + cpu3 + + + + + cpu4 + + + + + cpu5 + + + + + cpu6 + + + + + cpu7 + + + + + cpu8 + + + + + cpu9 + + + + + cpu10 + + + + + cpu11 + + + + + cpu12 + + + + + cpu13 + + + + + cpu14 + + + + + cpu15 + + + + + cpu16 + + + + + cpu17 + + + + + cpu18 + + + + + cpu19 + + + + + cpu20 + + + + + cpu21 + + + + + cpu22 + + + + + cpu23 + + + + + memory + + + + + swap + + + + + LXQtSysStatContent + + + system: %1%<br>user: %2%<br>nice: %3%<br>other: %4%<br>freq: %5% + CPU tooltip information + + + + + system: %1%<br>user: %2%<br>nice: %3%<br>other: %4%<br>freq: n/a + CPU tooltip information + + + + + apps: %1%<br>buffers: %2%<br>cached: %3% + Memory tooltip information + + + + + used: %1% + Swap tooltip information + + + + + min: %1%<br>max: %2% + Network tooltip information + + + + diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_ca.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_ca.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_ca.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_ca.ts 2020-11-05 16:09:19.000000000 +0000 @@ -145,8 +145,8 @@ - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - <html><head/><body><p>L'amplada mínima si el tauler és horitzontal.</p><p>L'alçada mínima si el tauler és vertical.</p></body></html> + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_cs.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_cs.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_cs.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_cs.ts 2020-11-05 16:09:19.000000000 +0000 @@ -145,8 +145,8 @@ - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - <html><head/><body><p>Nejmenší šířka, pokud je panel vodorovně.</p><p>Nejmenší výška, pokud svisle.</p></body></html> + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + <html><head/><body><p>Nejmenší šířka, pokud je panel vodorovný.</p><p>Nejmenší výška, pokud je panel svislý.</p></body></html> @@ -286,7 +286,7 @@ cpu9 - jádro8 + jádro9 diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_cy.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_cy.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_cy.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_cy.ts 2020-11-05 16:09:19.000000000 +0000 @@ -145,8 +145,8 @@ - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_da.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_da.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_da.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_da.ts 2020-11-05 16:09:19.000000000 +0000 @@ -145,8 +145,8 @@ - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - <html><head/><body><p>Minimum bredde hvis panelet er vandret.</p><p>Minimum højde hvis panelet er lodret.</p></body></html> + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_de.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_de.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_de.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_de.ts 2020-11-05 16:09:19.000000000 +0000 @@ -145,8 +145,8 @@ - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - <html><head/><body><p>Mindestbreite bei horizontalem Panel.</p><p>Mindesthöhe bei vertikalem Panel.</p></body></html> + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_el.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_el.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_el.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_el.ts 2020-11-05 16:09:19.000000000 +0000 @@ -119,6 +119,11 @@ Γράφημα + + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + <html><head/><body><p>Το ελάχιστο μέγεθος αν ο πίνακας είναι τοποθετημένος οριζόντια.</p><p>Το ελάχιστο ύψος αν ο πίνακας είναι τοποθετημένος κάθετα.</p></body></html> + + px εικ @@ -159,11 +164,6 @@ &Γραμμές καννάβου - - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - <html><head/><body><p>Το ελάχιστο μέγεθος αν ο πίνακας είναι τοποθετημένος οριζόντια.</p><p>Το ελάχιστο ύψος αν ι πίνακας είναι τοποθετημένος κάθετα.</p></body></html> - - Use &frequency Χρήση της συ&χνότητας diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_es.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_es.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_es.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_es.ts 2020-11-05 16:09:19.000000000 +0000 @@ -145,8 +145,8 @@ - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - <html><head/><body><p>Ancho mínimo si el panel es horizonal.</p><p>Altura mínma si el panel es vertical.</p></body></html> + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + @@ -176,7 +176,7 @@ XXX KBs - XXX KBs + XXX KB/s diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_fr.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_fr.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_fr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_fr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -43,7 +43,7 @@ CPU - CPU (µC) + CPU @@ -88,7 +88,7 @@ &Applications - &Application(s) + &Applications @@ -145,18 +145,18 @@ - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> <html><head/><body><p>Largeur minimale si le panneau est horizontal.</p><p>Hauteur minimale si le panneau est vertical.</p></body></html> px - px(s) + px s - seconde(s) + s @@ -191,12 +191,12 @@ &Source - &Source(s) + &Source T&ype - T&ype(s) + T&ype @@ -216,12 +216,12 @@ Custom colour ... - Couleurs personnalisées ... + Couleurs personnalisées... CPU - CPU (µC) + CPU @@ -375,13 +375,13 @@ system: %1%<br>user: %2%<br>nice: %3%<br>other: %4%<br>freq: %5% CPU tooltip information - système : %1%<br>utilisateur : %2%<br>bon : %3%<br>autre : %4%<br>fréq : %5% + système : %1%<br>utilisateur : %2%<br>nice : %3%<br>autre : %4%<br>fréq : %5% system: %1%<br>user: %2%<br>nice: %3%<br>other: %4%<br>freq: n/a CPU tooltip information - système : %1%<br>utilisateur : %2%<br>bon : %3%<br>autre : %4%<br>fréq : n/c + système : %1%<br>utilisateur : %2%<br>nice : %3%<br>autre : %4%<br>fréq : n/c diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_gl.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_gl.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_gl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_gl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -88,7 +88,7 @@ &Applications - &Aplicativos + &Aplicacións @@ -145,8 +145,8 @@ - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - <html><head/><body><p>Largura mínima se o panel for horizontal.</p><p>Altura mínima se o panel for vertical.</p></body></html> + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + @@ -387,7 +387,7 @@ apps: %1%<br>buffers: %2%<br>cached: %3% Memory tooltip information - aplicativos: %1%<br>búferes: %2%<br>na caché: %3% + aplicacións: %1%<br>búferes: %2%<br>na caché: %3% diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_he.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_he.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_he.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_he.ts 2020-11-05 16:09:19.000000000 +0000 @@ -48,7 +48,7 @@ &Nice - + &עדיפות @@ -145,8 +145,8 @@ - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - <html><head/><body><p>רוחב מזערי אם הלוח הוא אופקי.</p><p>גובה מזערי אם הלוח הוא אנכי.</p></body></html> + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + <html><head/><body><p>רוחב מזערי אם הלוח אופקי.</p><p>גובה מזערי אם הלוח אנכי.</p></body></html> diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_hr.desktop lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_hr.desktop --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=Statistika sustava +Comment[hr]=Priključak za prikaz statistike sustava. diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_hr.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_hr.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_hr.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_hr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,405 @@ + + + + + LXQtSysStatColours + + + System Statistics Colors + Statistika sustava – Boje + + + + Graph + Dijagram + + + + &Grid + &Mreža + + + + + + + + + + + + + + + + Change ... + Promijeni … + + + + T&itle + Na&slov + + + + CPU + CPU + + + + &Nice + &Nice + + + + Ot&her + Os&talo + + + + &Frequency + &Frekvencija + + + + S&ystem + S&ustav + + + + &User + &Korisnik + + + + Memory + Memorija + + + + Cache&d + Pre&dmemorija + + + + S&wap + &Virtualna + + + + &Applications + &Programi + + + + &Buffers + M&eđuspremnici + + + + Network + Mreža + + + + &Received + P&rimljeno + + + + &Transmitted + Prenesen&o + + + + LXQtSysStatConfiguration + + + System Statistics Settings + Statistika sustava – Postavke + + + + Graph + Dijagram + + + + &Minimal size + &Minimalna veličina + + + + Update &interval + &Interval aktualiziranja + + + + &Title + Naslo&v + + + + &Grid lines + Broj linija &mreže + + + + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + <html><head/><body><p>Minimalna širina, ako ploča stoji vodoravno.</p><p>Minimalna visina, ako ploča stoji okomito.</p></body></html> + + + + px + px + + + + s + s + + + + Data + Podaci + + + + Use &frequency + Koristi &frekvenciju + + + + Ma&ximum + Ma&ksimum + + + + XXX KBs + XXX KB + + + + Lo&garithmic scale + Lo&garitamska mjera + + + + steps + koraka + + + + &Source + &Izvor + + + + T&ype + &Vrsta + + + + Colours + Boje + + + + Use t&heme colours + Koristi boj&e teme + + + + Use c&ustom colours + Koristi &prilagođene boje + + + + Custom colour ... + Prilagođena boja … + + + + CPU + CPU + + + + Memory + Memorija + + + + Network + Mreža + + + + cpu + cpu + + + + cpu0 + cpu0 + + + + cpu1 + cpu1 + + + + cpu2 + cpu2 + + + + cpu3 + cpu3 + + + + cpu4 + cpu4 + + + + cpu5 + cpu5 + + + + cpu6 + cpu6 + + + + cpu7 + cpu7 + + + + cpu8 + cpu8 + + + + cpu9 + cpu9 + + + + cpu10 + cpu10 + + + + cpu11 + cpu11 + + + + cpu12 + cpu12 + + + + cpu13 + cpu13 + + + + cpu14 + cpu14 + + + + cpu15 + cpu15 + + + + cpu16 + cpu16 + + + + cpu17 + cpu17 + + + + cpu18 + cpu18 + + + + cpu19 + cpu19 + + + + cpu20 + cpu20 + + + + cpu21 + cpu21 + + + + cpu22 + cpu22 + + + + cpu23 + cpu23 + + + + memory + memorija + + + + swap + virtualna + + + + LXQtSysStatContent + + + system: %1%<br>user: %2%<br>nice: %3%<br>other: %4%<br>freq: %5% + CPU tooltip information + sustav: %1 %<br>korisnik: %2 %<br>nice: %3 %<br>ostalo: %4 %<br>frekv.: %5 % + + + + system: %1%<br>user: %2%<br>nice: %3%<br>other: %4%<br>freq: n/a + CPU tooltip information + sustav: %1 %<br>korisnik: %2 %<br>nice: %3 %<br>ostalo: %4 %<br>frekv.: -- + + + + apps: %1%<br>buffers: %2%<br>cached: %3% + Memory tooltip information + programi: %1 %<br>međuspremnici: %2 %<br>predmemorija: %3 % + + + + used: %1% + Swap tooltip information + korišteno: %1 % + + + + min: %1%<br>max: %2% + Network tooltip information + min.: %1 %<br>maks.: %2 % + + + diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_hu.desktop lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_hu.desktop --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_hu.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_hu.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,3 +1,3 @@ #TRANSLATIONS Name[hu]=Rendszerstatisztika -Comment[hu]=Infó a rendszerállapotról +Comment[hu]=Információ a rendszer állapotáról diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_hu.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_hu.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_hu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_hu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ System Statistics Colors - Rendszerstatisztikai színek + Rendszerstatisztika színek @@ -33,7 +33,7 @@ Change ... - Változtat... + Változtatás... @@ -48,7 +48,7 @@ &Nice - &Nice + &Nice @@ -68,7 +68,7 @@ &User - &Használó + &Felhasználó @@ -78,12 +78,12 @@ Cache&d - &Gyorsított + &Gyorsítótárazva S&wap - &Lapozó + &Swap @@ -119,9 +119,14 @@ Grafikon + + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + <html><head/><body><p>Legkisebb szélesség, ha a panel vízszintes.</p><p>Legkisebb magasság, ha a panel függőleges.</p></body></html> + + px - pixel + px @@ -136,7 +141,7 @@ System Statistics Settings - Rendszerstatisztika beállítás + Rendszerstatisztika beállítások @@ -146,7 +151,7 @@ Update &interval - Fr&issítési köz + Fr&issítési időköz @@ -159,14 +164,9 @@ &Rácsvonalak - - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - <html><head/><body><p>Vízszintes panelnál szélesség.</p><p>Függőleges panelnál magaság.</p></body></html> - - Use &frequency - &Frekvencia használat + &Frekvencia használata @@ -326,7 +326,7 @@ swap - lapozóhely + swap @@ -346,7 +346,7 @@ Use t&heme colours - &Rendszertémáé + &Rendszertéma használata @@ -375,7 +375,7 @@ system: %1%<br>user: %2%<br>nice: %3%<br>other: %4%<br>freq: %5% CPU tooltip information - rendszer: %1%<br>felhasználó: %2%<br>nice: %3%<br>más: %4%<br>freq: %5% + rendszer: %1%<br>felhasználó: %2%<br>nice: %3%<br>egyéb: %4%<br>frekvencia: %5% @@ -387,13 +387,13 @@ apps: %1%<br>buffers: %2%<br>cached: %3% Memory tooltip information - + alkalmazások: %1%<br>pufferek: %2%<br>gyorsítótárazva: %3% used: %1% Swap tooltip information - haznált: %1% + használt: %1% diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_id.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_id.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_id.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_id.ts 2020-11-05 16:09:19.000000000 +0000 @@ -145,8 +145,8 @@ - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - <html><head/><body><p>Lebar minimal jika panelnya horisontal.</p><p>Tinggi minimal jika panelnya vertikal.</p></body></html> + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_it.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_it.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_it.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_it.ts 2020-11-05 16:09:19.000000000 +0000 @@ -119,6 +119,11 @@ Grafico + + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + <html><head/><body><p>Larghezza minimale se il pannello è horizontale.</p><p>Altezza minima se il pannello è verticale.</p></body></html> + + px @@ -159,11 +164,6 @@ &Linee della griglia - - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - <html><head/><body><p>Larghezza minima se il pannello è orizzontale.</p><p>Altezza minima se il pannello è verticale.</p></body></html> - - Use &frequency Usa &frequenza diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_ja.desktop lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_ja.desktop --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_ja.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_ja.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,8 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin Name[ja]=システム統計 -Comment[ja]=システム統計のプラグイン - -#TRANSLATIONS_DIR=../translations - +Comment[ja]=システム(CPU、メモリ、ネットワーク等)をグラフ表示します diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_ja.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_ja.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_ja.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_ja.ts 2020-11-05 16:09:19.000000000 +0000 @@ -48,7 +48,7 @@ &Nice - Nice(&N) + Nice値(&N) @@ -73,7 +73,7 @@ Memory - メモリー + メモリ @@ -119,6 +119,11 @@ グラフ + + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + <html><head/><body><p>パネルが水平では最小幅。</p><p>パネルが垂直では最小高。</p></body></html> + + px ピクセル @@ -131,7 +136,7 @@ Data - データー + データ @@ -159,14 +164,9 @@ グリッド線の数(&G) - - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - <html><head/><body><p>水平なパネルでは幅の最小値、</p><p>垂直なパネルでは高さの最小値です</p></body></html> - - Use &frequency - 周波数をグラフ表示(&F) + 周波数をグラフ表示する(&F) @@ -186,7 +186,7 @@ Memory - メモリー + メモリ @@ -196,137 +196,137 @@ cpu - + CPU cpu0 - + CPU 0 cpu1 - + CPU 1 cpu2 - + CPU 2 cpu3 - + CPU 3 cpu4 - + CPU 4 cpu5 - + CPU 5 cpu6 - + CPU 6 cpu7 - + CPU 7 cpu8 - + CPU 8 cpu9 - + CPU 9 cpu10 - + CPU 10 cpu11 - + CPU 11 cpu12 - + CPU 12 cpu13 - + CPU 13 cpu14 - + CPU 14 cpu15 - + CPU 15 cpu16 - + CPU 16 cpu17 - + CPU 17 cpu18 - + CPU 18 cpu19 - + CPU 19 cpu20 - + CPU 20 cpu21 - + CPU 21 cpu22 - + CPU 22 cpu23 - + CPU 23 memory - + メモリ swap - + スワップ @@ -346,17 +346,17 @@ Use t&heme colours - テーマの色を使用(&H) + テーマの色を使用する(&H) Use c&ustom colours - 色を指定(&U) + 色を指定する(&U) Custom colour ... - 色を指定する ... + 色の指定 ... @@ -375,31 +375,31 @@ system: %1%<br>user: %2%<br>nice: %3%<br>other: %4%<br>freq: %5% CPU tooltip information - + システム: %1%<br>ユーザー: %2%<br>Nice値: %3%<br>その他: %4%<br>周波数: %5% system: %1%<br>user: %2%<br>nice: %3%<br>other: %4%<br>freq: n/a CPU tooltip information - + システム: %1%<br>ユーザー: %2%<br>Nice値: %3%<br>その他: %4%<br>周波数: 不明 apps: %1%<br>buffers: %2%<br>cached: %3% Memory tooltip information - + アプリケーション: %1%<br>バッファー: %2%<br>キャッシュ: %3% used: %1% Swap tooltip information - + 使用: %1% min: %1%<br>max: %2% Network tooltip information - + 最小: %1%<br>最大: %2% diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_lt.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_lt.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_lt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_lt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -145,8 +145,8 @@ - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - <html><head/><body><p>Minimalus plotis, jeigu skydelis yra horizontalus.</p><p>Minimalus aukštis, jeigu skydelis yra vertikalus.</p></body></html> + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_nb_NO.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_nb_NO.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_nb_NO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_nb_NO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ System Statistics Colors - Systemstatistikkfarger + Farger for systemstatistikk @@ -145,8 +145,8 @@ - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - <html><head/><body><p>Minimal bredde hvis panelet er horisontalt.</p><p>Minimal høyde er panelet vertikalt.</p></body></html> + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + @@ -176,7 +176,7 @@ XXX KBs - XXX kB + XXX kBs diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_nl.desktop lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_nl.desktop --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_nl.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_nl.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[nl]=Systeemstatistieken +Comment[nl]=Invoegtoepassing die statistieken van uw systeem toont. diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_nl.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_nl.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_nl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_nl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ System Statistics Colors - Kleuren voor systeemstatistieken + Kleuren voor Systeemstatistieken @@ -78,7 +78,7 @@ Cache&d - Tijdelijke op&slag + &Tijdelijke opslag @@ -88,12 +88,12 @@ &Applications - &Toepassingen + &Applicaties &Buffers - Buff&ers + &Buffers @@ -116,7 +116,7 @@ System Statistics Settings - Instellingen voor systeemstatistieken + Instellingen voor Systeemstatistieken @@ -145,8 +145,8 @@ - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - <html><head/><body><p>Minimale breedte indien balk horizontaal is.</p><p>Minimale hoogte wanneer de balk verticaal is.</p></body></html> + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + <html><head/><body><p>Minimale breedte als de werkbalk horizontaal is.</p><p>Minimale hoogte als de werkbalk verticaal is.</p></body></html> @@ -387,7 +387,7 @@ apps: %1%<br>buffers: %2%<br>cached: %3% Memory tooltip information - toepassingen: %1%<br>buffers: %2%<br>tijd. opslag: %3% + applicaties: %1%<br>buffers: %2%<br>tijd. opslag: %3% diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_pl.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_pl.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_pl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_pl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -145,8 +145,8 @@ - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - <html><head/><body><p>Minimalna szerokość dla poziomego panelu.</p><p>Minimalna wysokość dla pionowego panelu.</p></body></html> + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_pt_BR.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_pt_BR.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_pt_BR.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_pt_BR.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,405 @@ + + + + + LXQtSysStatColours + + + System Statistics Colors + Cores de Estatísticas do Sistema + + + + Graph + Gráfico + + + + &Grid + &Grade + + + + + + + + + + + + + + + + Change ... + Alterar ... + + + + T&itle + T&ítulo + + + + CPU + CPU + + + + &Nice + &Aceitável + + + + Ot&her + Out&ro + + + + &Frequency + &Frequência + + + + S&ystem + S&istema + + + + &User + &Usuário + + + + Memory + Memória + + + + Cache&d + Em cac&he + + + + S&wap + &Swap + + + + &Applications + &Aplicações + + + + &Buffers + &Buffers + + + + Network + Rede + + + + &Received + &Recebido + + + + &Transmitted + &Transmitido + + + + LXQtSysStatConfiguration + + + System Statistics Settings + Configurações de Estatísticas do Sistema + + + + Graph + Gráfico + + + + &Minimal size + Tamanho &Mínimo + + + + Update &interval + &Intervalo de atualização + + + + &Title + &Título + + + + &Grid lines + Linhas de &grade + + + + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + <html><head/><body><p>Largura mínima se o painel é horizontal.</p><p>Altura mínima se o painel é vertical.</p></body></html> + + + + px + px + + + + s + s + + + + Data + Dados + + + + Use &frequency + &Frequência de uso + + + + Ma&ximum + Má&ximo + + + + XXX KBs + XXX KBs + + + + Lo&garithmic scale + Escala lo&garítmica + + + + steps + passos + + + + &Source + &Origem + + + + T&ype + T&ipo + + + + Colours + Cores + + + + Use t&heme colours + Usar cores do t&ema + + + + Use c&ustom colours + Usar cores per&sonalizadas + + + + Custom colour ... + Cor personalizada ... + + + + CPU + CPU + + + + Memory + Memória + + + + Network + Rede + + + + cpu + cpu + + + + cpu0 + cpu0 + + + + cpu1 + cpu1 + + + + cpu2 + cpu2 + + + + cpu3 + cpu3 + + + + cpu4 + cpu4 + + + + cpu5 + cpu5 + + + + cpu6 + cpu6 + + + + cpu7 + cpu7 + + + + cpu8 + cpu8 + + + + cpu9 + cpu9 + + + + cpu10 + cpu10 + + + + cpu11 + cpu11 + + + + cpu12 + cpu12 + + + + cpu13 + cpu13 + + + + cpu14 + cpu14 + + + + cpu15 + cpu15 + + + + cpu16 + cpu16 + + + + cpu17 + cpu17 + + + + cpu18 + cpu18 + + + + cpu19 + cpu19 + + + + cpu20 + cpu20 + + + + cpu21 + cpu21 + + + + cpu22 + cpu22 + + + + cpu23 + cpu23 + + + + memory + memória + + + + swap + swap + + + + LXQtSysStatContent + + + system: %1%<br>user: %2%<br>nice: %3%<br>other: %4%<br>freq: %5% + CPU tooltip information + sistema: %1%<br>usuário: %2%<br>nice: %3%<br>outro: %4%<br>freq: %5% + + + + system: %1%<br>user: %2%<br>nice: %3%<br>other: %4%<br>freq: n/a + CPU tooltip information + sistema: %1%<br>usuário: %2%<br>nice: %3%<br>outro: %4%<br>freq: n/a + + + + apps: %1%<br>buffers: %2%<br>cached: %3% + Memory tooltip information + aplicativos: %1%<br>buffers: %2%<br>em cache: %3% + + + + used: %1% + Swap tooltip information + usado: %1% + + + + min: %1%<br>max: %2% + Network tooltip information + mín: %1%<br>máx: %2% + + + diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_pt.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_pt.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_pt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_pt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -119,6 +119,11 @@ Gráfico + + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + <html><head/><body><p>Largura mínima do painel se na horizontal.</p><p>Altura mínima do painel se na vertical.</p></body></html> + + px px @@ -159,11 +164,6 @@ Linhas da &grelha - - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - <html><head/><body><p>Largura mínima se o painel for horizontal.</p><p>Altura mínima se o painel for vertical.</p></body></html> - - Use &frequency Utilizar &frequência diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_ru.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_ru.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_ru.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_ru.ts 2020-11-05 16:09:19.000000000 +0000 @@ -145,8 +145,8 @@ - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - <html><head/><body><p>Минимальная ширина для горизонтальной панели.</p><p>Минимальная высота для вертикальной панели.</p></body></html> + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_sk_SK.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_sk_SK.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_sk_SK.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_sk_SK.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,405 @@ + + + + + LXQtSysStatColours + + + System Statistics Colors + Farby systémových štatistík + + + + Graph + Graf + + + + &Grid + &Mriežka + + + + + + + + + + + + + + + + Change ... + Zmeniť... + + + + T&itle + &Názov + + + + CPU + Procesor + + + + &Nice + &Prednosť + + + + Ot&her + &Iné + + + + &Frequency + &Frekvencia + + + + S&ystem + &Systém + + + + &User + &Užívateľ + + + + Memory + Pamäť + + + + Cache&d + &Uložené v medzipamäti + + + + S&wap + &Swap + + + + &Applications + &Aplikácie + + + + &Buffers + &Vyrovnávacia pamäť + + + + Network + Sieť + + + + &Received + &Prijaté + + + + &Transmitted + &Odoslané + + + + LXQtSysStatConfiguration + + + System Statistics Settings + &Nastavenie systémových štatistík + + + + Graph + Graf + + + + &Minimal size + &Minimálne veľkosť + + + + Update &interval + &Interval aktualizácie + + + + &Title + &Nadpis + + + + &Grid lines + &Čiary a mriežky + + + + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + + + + + px + px + + + + s + s + + + + Data + Dáta + + + + Use &frequency + &Použiť frekvenciu + + + + Ma&ximum + &Maximum + + + + XXX KBs + XXX KB/s + + + + Lo&garithmic scale + &Logaritmická stupnica + + + + steps + kroky + + + + &Source + &Zdroj + + + + T&ype + &Typ + + + + Colours + Farby + + + + Use t&heme colours + &Použiť farbu motívu + + + + Use c&ustom colours + &Použiť užívateľsky určené farby + + + + Custom colour ... + Užívateľsky určená farba... + + + + CPU + Procesor + + + + Memory + Pamäť + + + + Network + Sieť + + + + cpu + procesor + + + + cpu0 + jadro0 + + + + cpu1 + jadro1 + + + + cpu2 + jadro2 + + + + cpu3 + jadro3 + + + + cpu4 + jadro4 + + + + cpu5 + jadro5 + + + + cpu6 + jadro6 + + + + cpu7 + jadro7 + + + + cpu8 + jadro8 + + + + cpu9 + jadro9 + + + + cpu10 + jadro10 + + + + cpu11 + jadro11 + + + + cpu12 + jadro12 + + + + cpu13 + jadro13 + + + + cpu14 + jadro14 + + + + cpu15 + jadro15 + + + + cpu16 + jadro16 + + + + cpu17 + jadro17 + + + + cpu18 + jadro18 + + + + cpu19 + jadro19 + + + + cpu20 + jadro20 + + + + cpu21 + jadro21 + + + + cpu22 + jadro22 + + + + cpu23 + jadro23 + + + + memory + Pamäť + + + + swap + swap + + + + LXQtSysStatContent + + + system: %1%<br>user: %2%<br>nice: %3%<br>other: %4%<br>freq: %5% + CPU tooltip information + systém: %1%<br>užívateľ: %2%<br>prednosť: %3%<br>ostatní: %4%<br>frekvencia: %5% + + + + system: %1%<br>user: %2%<br>nice: %3%<br>other: %4%<br>freq: n/a + CPU tooltip information + systém: %1%<br>užívateľ: %2%<br>prednosť: %3%<br>ostatné: %4%<br>frekvencia: n/a + + + + apps: %1%<br>buffers: %2%<br>cached: %3% + Memory tooltip information + aplikácie: %1%<br>vyrovnávacia pamäť: %2%<br>uložené v medzipamäti: %3% + + + + used: %1% + Swap tooltip information + použité: %1% + + + + min: %1%<br>max: %2% + Network tooltip information + najmenej: %1%<br>najviac: %2% + + + diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_tr.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_tr.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_tr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_tr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -146,7 +146,7 @@ - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> <html><head/><body><p>Panel yatay ise minimum genişlik.</p><p>Panel dikey ise minimum yükseklik.</p></body></html> @@ -177,7 +177,7 @@ XXX KBs - XXX KBs + XXX KB diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat.ts 2020-11-05 16:09:19.000000000 +0000 @@ -145,7 +145,7 @@ - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_uk.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_uk.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_uk.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_uk.ts 2020-11-05 16:09:19.000000000 +0000 @@ -145,8 +145,8 @@ - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - <html><head/><body><p>Мінімальний розмір, якщо панель є горизонтальна.</p><p>Мінімальна висота, якщо панель є вертикальна.</p></body></html> + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + diff -Nru lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_zh_CN.ts lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_zh_CN.ts --- lxqt-panel-0.14.1/plugin-sysstat/translations/sysstat_zh_CN.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-sysstat/translations/sysstat_zh_CN.ts 2020-11-05 16:09:19.000000000 +0000 @@ -6,7 +6,7 @@ System Statistics Colors - 系统统计颜色 + 系统统计信息颜色 @@ -145,8 +145,8 @@ - <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> - <html><head/><body><p>横置面板时的最小宽度。</p><p>纵置面板时的最小宽度。</p></body></html> + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height if the panel is vertical.</p></body></html> + diff -Nru lxqt-panel-0.14.1/plugin-taskbar/lxqtgrouppopup.cpp lxqt-panel-0.16.1/plugin-taskbar/lxqtgrouppopup.cpp --- lxqt-panel-0.14.1/plugin-taskbar/lxqtgrouppopup.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/lxqtgrouppopup.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -131,7 +131,7 @@ /************************************************ * ************************************************/ -void LXQtGroupPopup::leaveEvent(QEvent *event) +void LXQtGroupPopup::leaveEvent(QEvent * /*event*/) { mCloseTimer.start(); } @@ -139,12 +139,12 @@ /************************************************ * ************************************************/ -void LXQtGroupPopup::enterEvent(QEvent *event) +void LXQtGroupPopup::enterEvent(QEvent * /*event*/) { mCloseTimer.stop(); } -void LXQtGroupPopup::paintEvent(QPaintEvent *event) +void LXQtGroupPopup::paintEvent(QPaintEvent * /*event*/) { QPainter p(this); QStyleOption opt; diff -Nru lxqt-panel-0.14.1/plugin-taskbar/lxqttaskbarconfiguration.cpp lxqt-panel-0.16.1/plugin-taskbar/lxqttaskbarconfiguration.cpp --- lxqt-panel-0.14.1/plugin-taskbar/lxqttaskbarconfiguration.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/lxqttaskbarconfiguration.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -36,40 +36,52 @@ ui(new Ui::LXQtTaskbarConfiguration) { setAttribute(Qt::WA_DeleteOnClose); - setObjectName("TaskbarConfigurationWindow"); + setObjectName(QStringLiteral("TaskbarConfigurationWindow")); ui->setupUi(this); connect(ui->buttons, SIGNAL(clicked(QAbstractButton*)), this, SLOT(dialogButtonsAction(QAbstractButton*))); - ui->buttonStyleCB->addItem(tr("Icon and text"), "IconText"); - ui->buttonStyleCB->addItem(tr("Only icon"), "Icon"); - ui->buttonStyleCB->addItem(tr("Only text"), "Text"); + ui->buttonStyleCB->addItem(tr("Icon and text"), QLatin1String("IconText")); + ui->buttonStyleCB->addItem(tr("Only icon"), QLatin1String("Icon")); + ui->buttonStyleCB->addItem(tr("Only text"), QLatin1String("Text")); + + ui->wheelEventsActionCB->addItem(tr("Disabled"), 0); + ui->wheelEventsActionCB->addItem(tr("Cycle windows on wheel scrolling"), 1); + ui->wheelEventsActionCB->addItem(tr("Scroll up to raise, down to minimize"), 2); + ui->wheelEventsActionCB->addItem(tr("Scroll up to minimize, down to raise"), 3); + ui->wheelEventsActionCB->addItem(tr("Scroll up to move to next desktop, down to previous"), 4); + ui->wheelEventsActionCB->addItem(tr("Scroll up to move to previous desktop, down to next"), 5); ui->showDesktopNumCB->addItem(tr("Current"), 0); //Note: in KWindowSystem desktops are numbered from 1..N const int desk_cnt = KWindowSystem::numberOfDesktops(); for (int i = 1; desk_cnt >= i; ++i) - ui->showDesktopNumCB->addItem(QString("%1 - %2").arg(i).arg(KWindowSystem::desktopName(i)), i); + ui->showDesktopNumCB->addItem(QString(QStringLiteral("%1 - %2")).arg(i).arg(KWindowSystem::desktopName(i)), i); loadSettings(); - + ui->ungroupedNextToExistingCB->setEnabled(!(ui->groupingGB->isChecked())); /* We use clicked() and activated(int) because these signals aren't emitting after programmaticaly change of state */ - connect(ui->limitByDesktopCB, SIGNAL(clicked()), this, SLOT(saveSettings())); + connect(ui->limitByDesktopCB, &QAbstractButton::clicked, this, &LXQtTaskbarConfiguration::saveSettings); connect(ui->limitByDesktopCB, &QCheckBox::stateChanged, ui->showDesktopNumCB, &QWidget::setEnabled); - connect(ui->showDesktopNumCB, SIGNAL(activated(int)), this, SLOT(saveSettings())); - connect(ui->limitByScreenCB, SIGNAL(clicked()), this, SLOT(saveSettings())); - connect(ui->limitByMinimizedCB, SIGNAL(clicked()), this, SLOT(saveSettings())); - connect(ui->raiseOnCurrentDesktopCB, SIGNAL(clicked()), this, SLOT(saveSettings())); - connect(ui->buttonStyleCB, SIGNAL(activated(int)), this, SLOT(saveSettings())); - connect(ui->buttonWidthSB, SIGNAL(valueChanged(int)), this, SLOT(saveSettings())); - connect(ui->buttonHeightSB, SIGNAL(valueChanged(int)), this, SLOT(saveSettings())); - connect(ui->autoRotateCB, SIGNAL(clicked()), this, SLOT(saveSettings())); - connect(ui->middleClickCB, SIGNAL(clicked()), this, SLOT(saveSettings())); - connect(ui->groupingGB, SIGNAL(clicked()), this, SLOT(saveSettings())); - connect(ui->showGroupOnHoverCB, SIGNAL(clicked()), this, SLOT(saveSettings())); - connect(ui->iconByClassCB, &QCheckBox::clicked, this, &LXQtTaskbarConfiguration::saveSettings); - connect(ui->cycleOnWheelScroll, &QCheckBox::clicked, this, &LXQtTaskbarConfiguration::saveSettings); + connect(ui->showDesktopNumCB, QOverload::of(&QComboBox::activated), this, &LXQtTaskbarConfiguration::saveSettings); + connect(ui->limitByScreenCB, &QAbstractButton::clicked, this, &LXQtTaskbarConfiguration::saveSettings); + connect(ui->limitByMinimizedCB, &QAbstractButton::clicked, this, &LXQtTaskbarConfiguration::saveSettings); + connect(ui->raiseOnCurrentDesktopCB, &QAbstractButton::clicked, this, &LXQtTaskbarConfiguration::saveSettings); + connect(ui->buttonStyleCB, QOverload::of(&QComboBox::activated), this, &LXQtTaskbarConfiguration::saveSettings); + connect(ui->buttonWidthSB, &QAbstractSpinBox::editingFinished, this, &LXQtTaskbarConfiguration::saveSettings); + connect(ui->buttonHeightSB, &QAbstractSpinBox::editingFinished, this, &LXQtTaskbarConfiguration::saveSettings); + connect(ui->autoRotateCB, &QAbstractButton::clicked, this, &LXQtTaskbarConfiguration::saveSettings); + connect(ui->middleClickCB, &QAbstractButton::clicked, this, &LXQtTaskbarConfiguration::saveSettings); + connect(ui->groupingGB, &QGroupBox::clicked, this, [this] { + saveSettings(); + ui->ungroupedNextToExistingCB->setEnabled(!(ui->groupingGB->isChecked())); + }); + connect(ui->showGroupOnHoverCB, &QAbstractButton::clicked, this, &LXQtTaskbarConfiguration::saveSettings); + connect(ui->ungroupedNextToExistingCB, &QAbstractButton::clicked, this, &LXQtTaskbarConfiguration::saveSettings); + connect(ui->iconByClassCB, &QAbstractButton::clicked, this, &LXQtTaskbarConfiguration::saveSettings); + connect(ui->wheelEventsActionCB, QOverload::of(&QComboBox::activated), this, &LXQtTaskbarConfiguration::saveSettings); + connect(ui->wheelDeltaThresholdSB, &QAbstractSpinBox::editingFinished, this, &LXQtTaskbarConfiguration::saveSettings); } LXQtTaskbarConfiguration::~LXQtTaskbarConfiguration() @@ -79,39 +91,43 @@ void LXQtTaskbarConfiguration::loadSettings() { - const bool showOnlyOneDesktopTasks = settings().value("showOnlyOneDesktopTasks", false).toBool(); + const bool showOnlyOneDesktopTasks = settings().value(QStringLiteral("showOnlyOneDesktopTasks"), false).toBool(); ui->limitByDesktopCB->setChecked(showOnlyOneDesktopTasks); - ui->showDesktopNumCB->setCurrentIndex(ui->showDesktopNumCB->findData(settings().value("showDesktopNum", 0).toInt())); + ui->showDesktopNumCB->setCurrentIndex(ui->showDesktopNumCB->findData(settings().value(QStringLiteral("showDesktopNum"), 0).toInt())); ui->showDesktopNumCB->setEnabled(showOnlyOneDesktopTasks); - ui->limitByScreenCB->setChecked(settings().value("showOnlyCurrentScreenTasks", false).toBool()); - ui->limitByMinimizedCB->setChecked(settings().value("showOnlyMinimizedTasks", false).toBool()); + ui->limitByScreenCB->setChecked(settings().value(QStringLiteral("showOnlyCurrentScreenTasks"), false).toBool()); + ui->limitByMinimizedCB->setChecked(settings().value(QStringLiteral("showOnlyMinimizedTasks"), false).toBool()); - ui->autoRotateCB->setChecked(settings().value("autoRotate", true).toBool()); - ui->middleClickCB->setChecked(settings().value("closeOnMiddleClick", true).toBool()); - ui->raiseOnCurrentDesktopCB->setChecked(settings().value("raiseOnCurrentDesktop", false).toBool()); - ui->buttonStyleCB->setCurrentIndex(ui->buttonStyleCB->findData(settings().value("buttonStyle", "IconText"))); - ui->buttonWidthSB->setValue(settings().value("buttonWidth", 400).toInt()); - ui->buttonHeightSB->setValue(settings().value("buttonHeight", 100).toInt()); - ui->groupingGB->setChecked(settings().value("groupingEnabled",true).toBool()); - ui->showGroupOnHoverCB->setChecked(settings().value("showGroupOnHover",true).toBool()); - ui->iconByClassCB->setChecked(settings().value("iconByClass", false).toBool()); - ui->cycleOnWheelScroll->setChecked(settings().value("cycleOnWheelScroll", true).toBool()); + ui->autoRotateCB->setChecked(settings().value(QStringLiteral("autoRotate"), true).toBool()); + ui->middleClickCB->setChecked(settings().value(QStringLiteral("closeOnMiddleClick"), true).toBool()); + ui->raiseOnCurrentDesktopCB->setChecked(settings().value(QStringLiteral("raiseOnCurrentDesktop"), false).toBool()); + ui->buttonStyleCB->setCurrentIndex(ui->buttonStyleCB->findData(settings().value(QStringLiteral("buttonStyle"), QLatin1String("IconText")))); + ui->buttonWidthSB->setValue(settings().value(QStringLiteral("buttonWidth"), 400).toInt()); + ui->buttonHeightSB->setValue(settings().value(QStringLiteral("buttonHeight"), 100).toInt()); + ui->groupingGB->setChecked(settings().value(QStringLiteral("groupingEnabled"),true).toBool()); + ui->showGroupOnHoverCB->setChecked(settings().value(QStringLiteral("showGroupOnHover"),true).toBool()); + ui->ungroupedNextToExistingCB->setChecked(settings().value(QStringLiteral("ungroupedNextToExisting"),false).toBool()); + ui->iconByClassCB->setChecked(settings().value(QStringLiteral("iconByClass"), false).toBool()); + ui->wheelEventsActionCB->setCurrentIndex(ui->wheelEventsActionCB->findData(settings().value(QStringLiteral("wheelEventsAction"), 0).toInt())); + ui->wheelDeltaThresholdSB->setValue(settings().value(QStringLiteral("wheelDeltaThreshold"), 300).toInt()); } void LXQtTaskbarConfiguration::saveSettings() { - settings().setValue("showOnlyOneDesktopTasks", ui->limitByDesktopCB->isChecked()); - settings().setValue("showDesktopNum", ui->showDesktopNumCB->itemData(ui->showDesktopNumCB->currentIndex())); - settings().setValue("showOnlyCurrentScreenTasks", ui->limitByScreenCB->isChecked()); - settings().setValue("showOnlyMinimizedTasks", ui->limitByMinimizedCB->isChecked()); - settings().setValue("buttonStyle", ui->buttonStyleCB->itemData(ui->buttonStyleCB->currentIndex())); - settings().setValue("buttonWidth", ui->buttonWidthSB->value()); - settings().setValue("buttonHeight", ui->buttonHeightSB->value()); - settings().setValue("autoRotate", ui->autoRotateCB->isChecked()); - settings().setValue("closeOnMiddleClick", ui->middleClickCB->isChecked()); - settings().setValue("raiseOnCurrentDesktop", ui->raiseOnCurrentDesktopCB->isChecked()); - settings().setValue("groupingEnabled",ui->groupingGB->isChecked()); - settings().setValue("showGroupOnHover",ui->showGroupOnHoverCB->isChecked()); - settings().setValue("iconByClass",ui->iconByClassCB->isChecked()); - settings().setValue("cycleOnWheelScroll",ui->cycleOnWheelScroll->isChecked()); + settings().setValue(QStringLiteral("showOnlyOneDesktopTasks"), ui->limitByDesktopCB->isChecked()); + settings().setValue(QStringLiteral("showDesktopNum"), ui->showDesktopNumCB->itemData(ui->showDesktopNumCB->currentIndex())); + settings().setValue(QStringLiteral("showOnlyCurrentScreenTasks"), ui->limitByScreenCB->isChecked()); + settings().setValue(QStringLiteral("showOnlyMinimizedTasks"), ui->limitByMinimizedCB->isChecked()); + settings().setValue(QStringLiteral("buttonStyle"), ui->buttonStyleCB->itemData(ui->buttonStyleCB->currentIndex())); + settings().setValue(QStringLiteral("buttonWidth"), ui->buttonWidthSB->value()); + settings().setValue(QStringLiteral("buttonHeight"), ui->buttonHeightSB->value()); + settings().setValue(QStringLiteral("autoRotate"), ui->autoRotateCB->isChecked()); + settings().setValue(QStringLiteral("closeOnMiddleClick"), ui->middleClickCB->isChecked()); + settings().setValue(QStringLiteral("raiseOnCurrentDesktop"), ui->raiseOnCurrentDesktopCB->isChecked()); + settings().setValue(QStringLiteral("groupingEnabled"),ui->groupingGB->isChecked()); + settings().setValue(QStringLiteral("showGroupOnHover"),ui->showGroupOnHoverCB->isChecked()); + settings().setValue(QStringLiteral("ungroupedNextToExisting"),ui->ungroupedNextToExistingCB->isChecked()); + settings().setValue(QStringLiteral("iconByClass"),ui->iconByClassCB->isChecked()); + settings().setValue(QStringLiteral("wheelEventsAction"),ui->wheelEventsActionCB->itemData(ui->wheelEventsActionCB->currentIndex())); + settings().setValue(QStringLiteral("wheelDeltaThreshold"),ui->wheelDeltaThresholdSB->value()); } diff -Nru lxqt-panel-0.14.1/plugin-taskbar/lxqttaskbarconfiguration.ui lxqt-panel-0.16.1/plugin-taskbar/lxqttaskbarconfiguration.ui --- lxqt-panel-0.14.1/plugin-taskbar/lxqttaskbarconfiguration.ui 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/lxqttaskbarconfiguration.ui 2020-11-05 16:09:19.000000000 +0000 @@ -7,7 +7,7 @@ 0 0 401 - 512 + 528 @@ -77,12 +77,62 @@ + + + + + + + Mouse Wheel + + - - - Cycle windows on wheel scrolling + + + + + + 0 - + + 0 + + + 0 + + + 0 + + + 0 + + + + + Wheel Delta Threshold + + + + + + + + 0 + 0 + + + + px + + + 0 + + + 300 + + + + @@ -107,6 +157,13 @@ + + + Put buttons of the same class next to each other + + + + Appearance diff -Nru lxqt-panel-0.14.1/plugin-taskbar/lxqttaskbar.cpp lxqt-panel-0.16.1/plugin-taskbar/lxqttaskbar.cpp --- lxqt-panel-0.14.1/plugin-taskbar/lxqttaskbar.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/lxqttaskbar.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -38,7 +38,6 @@ #include #include #include -#include #include #include @@ -68,8 +67,10 @@ mAutoRotate(true), mGroupingEnabled(true), mShowGroupOnHover(true), + mUngroupedNextToExisting(false), mIconByClass(false), - mCycleOnWheelScroll(true), + mWheelEventsAction(1), + mWheelDeltaThreshold(300), mPlugin(plugin), mPlaceHolder(new QWidget(this)), mStyle(new LeftAlignedTextStyle()) @@ -270,7 +271,7 @@ void LXQtTaskBar::addWindow(WId window) { // If grouping disabled group behaves like regular button - const QString group_id = mGroupingEnabled ? KWindowInfo(window, 0, NET::WM2WindowClass).windowClassClass() : QString("%1").arg(window); + const QString group_id = mGroupingEnabled ? QString::fromUtf8(KWindowInfo(window, NET::Properties(), NET::WM2WindowClass).windowClassClass()) : QString::number(window); LXQtTaskGroup *group = nullptr; auto i_group = mKnownWindows.find(window); @@ -304,11 +305,34 @@ connect(group, &LXQtTaskButton::dragging, this, [this] (QObject * dragSource, QPoint const & pos) { buttonMove(qobject_cast(sender()), qobject_cast(dragSource), pos); }); - mLayout->addWidget(group); group->setToolButtonsStyle(mButtonStyle); - } + if (mUngroupedNextToExisting) + { + const QString window_class = QString::fromUtf8(KWindowInfo(window, NET::Properties(), NET::WM2WindowClass).windowClassClass()); + int src_index = mLayout->count() - 1; + int dst_index = src_index; + for (int i = mLayout->count() - 2; 0 <= i; --i) + { + LXQtTaskGroup * current_group = qobject_cast(mLayout->itemAt(i)->widget()); + if (nullptr != current_group) + { + const QString current_class = QString::fromUtf8(KWindowInfo((current_group->groupName()).toUInt(), NET::Properties(), NET::WM2WindowClass).windowClassClass()); + if(current_class == window_class) + { + dst_index = i + 1; + break; + } + } + } + + if (dst_index != src_index) + { + mLayout->moveItem(src_index, dst_index, false); + } + } + } mKnownWindows[window] = group; group->addWindow(window); } @@ -443,37 +467,40 @@ void LXQtTaskBar::settingsChanged() { bool groupingEnabledOld = mGroupingEnabled; + bool ungroupedNextToExistingOld = mUngroupedNextToExisting; bool showOnlyOneDesktopTasksOld = mShowOnlyOneDesktopTasks; const int showDesktopNumOld = mShowDesktopNum; bool showOnlyCurrentScreenTasksOld = mShowOnlyCurrentScreenTasks; bool showOnlyMinimizedTasksOld = mShowOnlyMinimizedTasks; const bool iconByClassOld = mIconByClass; - mButtonWidth = mPlugin->settings()->value("buttonWidth", 400).toInt(); - mButtonHeight = mPlugin->settings()->value("buttonHeight", 100).toInt(); - QString s = mPlugin->settings()->value("buttonStyle").toString().toUpper(); + mButtonWidth = mPlugin->settings()->value(QStringLiteral("buttonWidth"), 400).toInt(); + mButtonHeight = mPlugin->settings()->value(QStringLiteral("buttonHeight"), 100).toInt(); + QString s = mPlugin->settings()->value(QStringLiteral("buttonStyle")).toString().toUpper(); - if (s == "ICON") + if (s == QStringLiteral("ICON")) setButtonStyle(Qt::ToolButtonIconOnly); - else if (s == "TEXT") + else if (s == QStringLiteral("TEXT")) setButtonStyle(Qt::ToolButtonTextOnly); else setButtonStyle(Qt::ToolButtonTextBesideIcon); - mShowOnlyOneDesktopTasks = mPlugin->settings()->value("showOnlyOneDesktopTasks", mShowOnlyOneDesktopTasks).toBool(); - mShowDesktopNum = mPlugin->settings()->value("showDesktopNum", mShowDesktopNum).toInt(); - mShowOnlyCurrentScreenTasks = mPlugin->settings()->value("showOnlyCurrentScreenTasks", mShowOnlyCurrentScreenTasks).toBool(); - mShowOnlyMinimizedTasks = mPlugin->settings()->value("showOnlyMinimizedTasks", mShowOnlyMinimizedTasks).toBool(); - mAutoRotate = mPlugin->settings()->value("autoRotate", true).toBool(); - mCloseOnMiddleClick = mPlugin->settings()->value("closeOnMiddleClick", true).toBool(); - mRaiseOnCurrentDesktop = mPlugin->settings()->value("raiseOnCurrentDesktop", false).toBool(); - mGroupingEnabled = mPlugin->settings()->value("groupingEnabled",true).toBool(); - mShowGroupOnHover = mPlugin->settings()->value("showGroupOnHover",true).toBool(); - mIconByClass = mPlugin->settings()->value("iconByClass", false).toBool(); - mCycleOnWheelScroll = mPlugin->settings()->value("cycleOnWheelScroll", true).toBool(); + mShowOnlyOneDesktopTasks = mPlugin->settings()->value(QStringLiteral("showOnlyOneDesktopTasks"), mShowOnlyOneDesktopTasks).toBool(); + mShowDesktopNum = mPlugin->settings()->value(QStringLiteral("showDesktopNum"), mShowDesktopNum).toInt(); + mShowOnlyCurrentScreenTasks = mPlugin->settings()->value(QStringLiteral("showOnlyCurrentScreenTasks"), mShowOnlyCurrentScreenTasks).toBool(); + mShowOnlyMinimizedTasks = mPlugin->settings()->value(QStringLiteral("showOnlyMinimizedTasks"), mShowOnlyMinimizedTasks).toBool(); + mAutoRotate = mPlugin->settings()->value(QStringLiteral("autoRotate"), true).toBool(); + mCloseOnMiddleClick = mPlugin->settings()->value(QStringLiteral("closeOnMiddleClick"), true).toBool(); + mRaiseOnCurrentDesktop = mPlugin->settings()->value(QStringLiteral("raiseOnCurrentDesktop"), false).toBool(); + mGroupingEnabled = mPlugin->settings()->value(QStringLiteral("groupingEnabled"),true).toBool(); + mShowGroupOnHover = mPlugin->settings()->value(QStringLiteral("showGroupOnHover"),true).toBool(); + mUngroupedNextToExisting = mPlugin->settings()->value(QStringLiteral("ungroupedNextToExisting"),false).toBool(); + mIconByClass = mPlugin->settings()->value(QStringLiteral("iconByClass"), false).toBool(); + mWheelEventsAction = mPlugin->settings()->value(QStringLiteral("wheelEventsAction"), 1).toInt(); + mWheelDeltaThreshold = mPlugin->settings()->value(QStringLiteral("wheelDeltaThreshold"), 300).toInt(); - // Delete all groups if grouping feature toggled and start over - if (groupingEnabledOld != mGroupingEnabled) + // Delete all groups if grouping or ungrouped next to existing feature toggled and start over + if (groupingEnabledOld != mGroupingEnabled || ungroupedNextToExistingOld != mUngroupedNextToExisting) { for (int i = mLayout->count() - 1; 0 <= i; --i) { @@ -561,21 +588,27 @@ ************************************************/ void LXQtTaskBar::wheelEvent(QWheelEvent* event) { - if (!mCycleOnWheelScroll) + // ignore wheel action unless user preference is "cycle windows" + if (mWheelEventsAction != 1) return QFrame::wheelEvent(event); static int threshold = 0; - threshold += abs(event->delta()); - if (threshold < 300) + + QPoint angleDelta = event->angleDelta(); + Qt::Orientation orient = (qAbs(angleDelta.x()) > qAbs(angleDelta.y()) ? Qt::Horizontal : Qt::Vertical); + int delta = (orient == Qt::Horizontal ? angleDelta.x() : angleDelta.y()); + + threshold += abs(delta); + if (threshold < mWheelDeltaThreshold) return QFrame::wheelEvent(event); else threshold = 0; - int delta = event->delta() < 0 ? 1 : -1; + int D = delta < 0 ? 1 : -1; // create temporary list of visible groups in the same order like on the layout QList list; - LXQtTaskGroup *group = NULL; + LXQtTaskGroup *group = nullptr; for (int i = 0; i < mLayout->count(); i++) { QWidget * o = mLayout->itemAt(i)->widget(); @@ -595,15 +628,15 @@ if (!group) group = list.at(0); - LXQtTaskButton *button = NULL; + LXQtTaskButton *button = nullptr; // switching between groups from temporary list in modulo addressing while (!button) { - button = group->getNextPrevChildButton(delta == 1, !(list.count() - 1)); + button = group->getNextPrevChildButton(D == 1, !(list.count() - 1)); if (button) button->raiseApplication(); - int idx = (list.indexOf(group) + delta + list.count()) % list.count(); + int idx = (list.indexOf(group) + D + list.count()) % list.count(); group = list.at(idx); } QFrame::wheelEvent(event); @@ -626,7 +659,7 @@ // if current style is changed, reset the base style of the proxy style // so we can apply the new style correctly to task buttons. if(event->type() == QEvent::StyleChange) - mStyle->setBaseStyle(NULL); + mStyle->setBaseStyle(nullptr); QFrame::changeEvent(event); } @@ -644,7 +677,7 @@ QString description; for (int i = 1; i <= 10; ++i) { - path = QString("/panel/%1/task_%2").arg(mPlugin->settings()->group()).arg(i); + path = QStringLiteral("/panel/%1/task_%2").arg(mPlugin->settings()->group()).arg(i); description = tr("Activate task %1").arg(i); gshortcut = GlobalKeyShortcut::Client::instance()->addAction(QStringLiteral(), path, description, this); diff -Nru lxqt-panel-0.14.1/plugin-taskbar/lxqttaskbar.h lxqt-panel-0.16.1/plugin-taskbar/lxqttaskbar.h --- lxqt-panel-0.14.1/plugin-taskbar/lxqttaskbar.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/lxqttaskbar.h 2020-11-05 16:09:19.000000000 +0000 @@ -60,7 +60,7 @@ Q_OBJECT public: - explicit LXQtTaskBar(ILXQtPanelPlugin *plugin, QWidget* parent = 0); + explicit LXQtTaskBar(ILXQtPanelPlugin *plugin, QWidget* parent = nullptr); virtual ~LXQtTaskBar(); void realign(); @@ -77,6 +77,8 @@ bool isGroupingEnabled() const { return mGroupingEnabled; } bool isShowGroupOnHover() const { return mShowGroupOnHover; } bool isIconByClass() const { return mIconByClass; } + int wheelEventsAction() const { return mWheelEventsAction; } + int wheelDeltaThreshold() const { return mWheelDeltaThreshold; } inline ILXQtPanel * panel() const { return mPlugin->panel(); } inline ILXQtPanelPlugin * plugin() const { return mPlugin; } @@ -134,8 +136,10 @@ bool mAutoRotate; bool mGroupingEnabled; bool mShowGroupOnHover; + bool mUngroupedNextToExisting; bool mIconByClass; - bool mCycleOnWheelScroll; //!< flag for processing the wheelEvent + int mWheelEventsAction; + int mWheelDeltaThreshold; bool acceptWindow(WId window) const; void setButtonStyle(Qt::ToolButtonStyle buttonStyle); diff -Nru lxqt-panel-0.14.1/plugin-taskbar/lxqttaskbarplugin.h lxqt-panel-0.16.1/plugin-taskbar/lxqttaskbarplugin.h --- lxqt-panel-0.14.1/plugin-taskbar/lxqttaskbarplugin.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/lxqttaskbarplugin.h 2020-11-05 16:09:19.000000000 +0000 @@ -42,7 +42,7 @@ LXQtTaskBarPlugin(const ILXQtPanelPluginStartupInfo &startupInfo); ~LXQtTaskBarPlugin(); - QString themeId() const { return "TaskBar"; } + QString themeId() const { return QStringLiteral("TaskBar"); } virtual Flags flags() const { return HaveConfigDialog | NeedsHandle; } QWidget *widget() { return mTaskBar; } diff -Nru lxqt-panel-0.14.1/plugin-taskbar/lxqttaskbutton.cpp lxqt-panel-0.16.1/plugin-taskbar/lxqttaskbutton.cpp --- lxqt-panel-0.14.1/plugin-taskbar/lxqttaskbutton.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/lxqttaskbutton.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -48,6 +48,7 @@ #include #include #include +#include #include "lxqttaskbutton.h" #include "lxqttaskgroup.h" @@ -67,8 +68,12 @@ , const QPalette & pal, bool enabled, const QString & text , QPalette::ColorRole textRole) const { - QString txt = QFontMetrics(painter->font()).elidedText(text, Qt::ElideRight, rect.width()); - return QProxyStyle::drawItemText(painter, rect, (flags & ~Qt::AlignHCenter) | Qt::AlignLeft, pal, enabled, txt, textRole); + QString txt = text; + // get the button text because the text that's given to this function may be middle-elided + if (const QToolButton *tb = dynamic_cast(painter->device())) + txt = tb->text(); + txt = QFontMetrics(painter->font()).elidedText(txt, Qt::ElideRight, rect.width()); + QProxyStyle::drawItemText(painter, rect, (flags & ~Qt::AlignHCenter) | Qt::AlignLeft, pal, enabled, txt, textRole); } @@ -80,10 +85,12 @@ mWindow(window), mUrgencyHint(false), mOrigin(Qt::TopLeftCorner), - mDrawPixmap(false), mParentTaskBar(taskbar), mPlugin(mParentTaskBar->plugin()), - mDNDTimer(new QTimer(this)) + mIconSize(mPlugin->panel()->iconSize()), + mWheelDelta(0), + mDNDTimer(new QTimer(this)), + mWheelTimer(new QTimer(this)) { Q_ASSERT(taskbar); @@ -101,6 +108,13 @@ mDNDTimer->setSingleShot(true); mDNDTimer->setInterval(700); connect(mDNDTimer, SIGNAL(timeout()), this, SLOT(activateWithDraggable())); + + mWheelTimer->setSingleShot(true); + mWheelTimer->setInterval(250); + connect(mWheelTimer, &QTimer::timeout, [this] { + mWheelDelta = 0; // forget previous wheel deltas + }); + connect(LXQt::Settings::globalSettings(), SIGNAL(iconThemeChanged()), this, SLOT(updateIcon())); connect(mParentTaskBar, &LXQtTaskBar::iconByClassChanged, this, &LXQtTaskButton::updateIcon); } @@ -119,7 +133,7 @@ { KWindowInfo info(mWindow, NET::WMVisibleName | NET::WMName); QString title = info.visibleName().isEmpty() ? info.name() : info.visibleName(); - setText(title.replace("&", "&&")); + setText(title.replace(QStringLiteral("&"), QStringLiteral("&&"))); setToolTip(title); } @@ -131,11 +145,16 @@ QIcon ico; if (mParentTaskBar->isIconByClass()) { - ico = XdgIcon::fromTheme(QString::fromUtf8(KWindowInfo{mWindow, 0, NET::WM2WindowClass}.windowClassClass()).toLower()); + ico = XdgIcon::fromTheme(QString::fromUtf8(KWindowInfo{mWindow, NET::Properties(), NET::WM2WindowClass}.windowClassClass()).toLower()); } if (ico.isNull()) { - ico = KWindowSystem::icon(mWindow); +#if QT_VERSION >= 0x050600 + int devicePixels = mIconSize * devicePixelRatioF(); +#else + int devicePixels = mIconSize * devicePixelRatio(); +#endif + ico = KWindowSystem::icon(mWindow, devicePixels, devicePixels); } setIcon(ico.isNull() ? XdgIcon::defaultApplicationIcon() : ico); } @@ -145,11 +164,17 @@ ************************************************/ void LXQtTaskButton::refreshIconGeometry(QRect const & geom) { - NETWinInfo info(QX11Info::connection(), + xcb_connection_t* x11conn = QX11Info::connection(); + + if (!x11conn) { + return; + } + + NETWinInfo info(x11conn, windowId(), (WId) QX11Info::appRootWindow(), NET::WMIconGeometry, - 0); + NET::Properties2()); NETRect const curr = info.iconGeometry(); if (curr.pos.x != geom.x() || curr.pos.y != geom.y() || curr.size.width != geom.width() || curr.size.height != geom.height()) @@ -166,6 +191,26 @@ /************************************************ ************************************************/ +void LXQtTaskButton::changeEvent(QEvent *event) +{ + if (event->type() == QEvent::StyleChange) + { + // When the icon size changes, the panel doesn't emit any specific + // signal, but it triggers a stylesheet update, which we can detect + int newIconSize = mPlugin->panel()->iconSize(); + if (newIconSize != mIconSize) + { + mIconSize = newIconSize; + updateIcon(); + } + } + + QToolButton::changeEvent(event); +} + +/************************************************ + + ************************************************/ void LXQtTaskButton::dragEnterEvent(QDragEnterEvent *event) { // It must be here otherwise dragLeaveEvent and dragMoveEvent won't be called @@ -229,7 +274,7 @@ ************************************************/ void LXQtTaskButton::mouseReleaseEvent(QMouseEvent* event) { - if (event->button() == Qt::LeftButton) + if (!sDraggging && event->button() == Qt::LeftButton) { if (isChecked()) minimizeApplication(); @@ -242,6 +287,61 @@ /************************************************ ************************************************/ +void LXQtTaskButton::wheelEvent(QWheelEvent* event) +{ + // ignore wheel event if it is not "raise", "minimize" or "move" window + if (mParentTaskBar->wheelEventsAction() < 2 || mParentTaskBar->wheelEventsAction() > 5) + return QToolButton::wheelEvent(event); + + QPoint angleDelta = event->angleDelta(); + Qt::Orientation orient = (qAbs(angleDelta.x()) > qAbs(angleDelta.y()) ? Qt::Horizontal : Qt::Vertical); + int delta = (orient == Qt::Horizontal ? angleDelta.x() : angleDelta.y()); + + if (!mWheelTimer->isActive()) + mWheelDelta += abs(delta); + else + { + // NOTE: We should consider a short delay after the last wheel event + // in order to distinguish between separate wheel rotations; otherwise, + // a wheel delta threshold will not make much sense because the delta + // might have been increased due to a previous and separate wheel rotation. + mWheelTimer->start(); + } + + if (mWheelDelta < mParentTaskBar->wheelDeltaThreshold()) + return QToolButton::wheelEvent(event); + else + { + mWheelDelta = 0; + mWheelTimer->start(); // start to distinguish between separate wheel rotations + } + + int D = delta < 0 ? 1 : -1; + + if (mParentTaskBar->wheelEventsAction() == 4) + { + moveApplicationToPrevNextDesktop(D < 0); + } + else if (mParentTaskBar->wheelEventsAction() == 5) + { + moveApplicationToPrevNextDesktop(D > 0); + } + else + { + if (mParentTaskBar->wheelEventsAction() == 3) + D *= -1; + if (D < 0) + raiseApplication(); + else if (D > 0) + minimizeApplication(); + } + + QToolButton::wheelEvent(event); +} + +/************************************************ + + ************************************************/ QMimeData * LXQtTaskButton::mimeData() { QMimeData *mimedata = new QMimeData; @@ -257,6 +357,7 @@ ************************************************/ void LXQtTaskButton::mouseMoveEvent(QMouseEvent* event) { + QAbstractButton::mouseMoveEvent(event); if (!(event->buttons() & Qt::LeftButton)) return; @@ -286,9 +387,13 @@ // if button is dropped out of panel (e.g. on desktop) // it is not deleted automatically by Qt drag->deleteLater(); - sDraggging = false; - QAbstractButton::mouseMoveEvent(event); + // release mouse appropriately, by positioning the event outside + // the button rectangle (otherwise, the button will be toggled) + QMouseEvent releasingEvent(QEvent::MouseButtonRelease, QPoint(-1,-1), Qt::LeftButton, Qt::NoButton, Qt::NoModifier); + mouseReleaseEvent(&releasingEvent); + + sDraggging = false; } /************************************************ @@ -463,6 +568,67 @@ /************************************************ ************************************************/ +void LXQtTaskButton::moveApplicationToPrevNextDesktop(bool next) +{ + int deskNum = KWindowSystem::numberOfDesktops(); + if (deskNum <= 1) + return; + int targetDesk = KWindowInfo(mWindow, NET::WMDesktop).desktop() + (next ? 1 : -1); + // wrap around + if (targetDesk > deskNum) + targetDesk = 1; + else if (targetDesk < 1) + targetDesk = deskNum; + + KWindowSystem::setOnDesktop(mWindow, targetDesk); +} + +/************************************************ + + ************************************************/ +void LXQtTaskButton::moveApplicationToPrevNextMonitor(bool next) +{ + KWindowInfo info(mWindow, NET::WMDesktop); + if (!info.isOnCurrentDesktop()) + KWindowSystem::setCurrentDesktop(info.desktop()); + if (isMinimized()) + KWindowSystem::unminimizeWindow(mWindow); + KWindowSystem::forceActiveWindow(mWindow); + const QRect& windowGeometry = KWindowInfo(mWindow, NET::WMFrameExtents).frameGeometry(); + QList screens = QGuiApplication::screens(); + if (screens.size() > 1){ + for (int i = 0; i < screens.size(); ++i) + { + QRect screenGeometry = screens[i]->geometry(); + if (screenGeometry.intersects(windowGeometry)) + { + int targetScreen = i + (next ? 1 : -1); + if (targetScreen < 0) + targetScreen += screens.size(); + else if (targetScreen >= screens.size()) + targetScreen -= screens.size(); + QRect targetScreenGeometry = screens[targetScreen]->geometry(); + int X = windowGeometry.x() - screenGeometry.x() + targetScreenGeometry.x(); + int Y = windowGeometry.y() - screenGeometry.y() + targetScreenGeometry.y(); + NET::States state = KWindowInfo(mWindow, NET::WMState).state(); + // NW geometry | y/x | from panel + const int flags = 1 | (0b011 << 8) | (0b010 << 12); + KWindowSystem::clearState(mWindow, NET::MaxHoriz | NET::MaxVert | NET::Max | NET::FullScreen); + NETRootInfo(QX11Info::connection(), 0, NET::WM2MoveResizeWindow).moveResizeWindowRequest(mWindow, flags, X, Y, 0, 0); + QTimer::singleShot(200, this, [this, state] + { + KWindowSystem::setState(mWindow, state); + raiseApplication(); + }); + break; + } + } + } +} + +/************************************************ + + ************************************************/ void LXQtTaskButton::moveApplication() { KWindowInfo info(mWindow, NET::WMDesktop); @@ -507,7 +673,7 @@ return; } - KWindowInfo info(mWindow, 0, NET::WM2AllowedActions); + KWindowInfo info(mWindow, NET::Properties(), NET::WM2AllowedActions); unsigned long state = KWindowInfo(mWindow, NET::WMState).state(); QMenu * menu = new QMenu(tr("Application")); @@ -566,8 +732,16 @@ a->setEnabled(curDesk != winDesk); connect(a, SIGNAL(triggered(bool)), this, SLOT(moveApplicationToDesktop())); } - /********** Move/Resize **********/ + if (QGuiApplication::screens().size() > 1) + { + menu->addSeparator(); + a = menu->addAction(tr("Move To &Next Monitor")); + connect(a, &QAction::triggered, this, [this] { moveApplicationToPrevNextMonitor(true); }); + a->setEnabled(info.actionSupported(NET::ActionMove) && (!(state & NET::FullScreen) || ((state & NET::FullScreen) && info.actionSupported(NET::ActionFullScreen)))); + a = menu->addAction(tr("Move To &Previous Monitor")); + connect(a, &QAction::triggered, this, [this] { moveApplicationToPrevNextMonitor(false); }); + } menu->addSeparator(); a = menu->addAction(tr("&Move")); a->setEnabled(info.actionSupported(NET::ActionMove) && !(state & NET::Max) && !(state & NET::FullScreen)); @@ -643,7 +817,7 @@ /********** Kill menu **********/ menu->addSeparator(); - a = menu->addAction(XdgIcon::fromTheme("process-stop"), tr("&Close")); + a = menu->addAction(XdgIcon::fromTheme(QStringLiteral("process-stop")), tr("&Close")); connect(a, SIGNAL(triggered(bool)), this, SLOT(closeApplication())); menu->setGeometry(mParentTaskBar->panel()->calculatePopupWindowPos(mapToGlobal(event->pos()), menu->sizeHint())); mPlugin->willShowWindow(menu); @@ -733,70 +907,39 @@ } QSize sz = size(); - QSize adjSz = sz; + bool transpose = false; QTransform transform; - QPoint originPoint; switch (mOrigin) { case Qt::TopLeftCorner: - transform.rotate(0.0); - originPoint = QPoint(0.0, 0.0); break; case Qt::TopRightCorner: transform.rotate(90.0); - originPoint = QPoint(0.0, -sz.width()); - adjSz.transpose(); + transform.translate(0.0, -sz.width()); + transpose = true; break; case Qt::BottomRightCorner: transform.rotate(180.0); - originPoint = QPoint(-sz.width(), -sz.height()); + transform.translate(-sz.width(), -sz.height()); break; case Qt::BottomLeftCorner: transform.rotate(270.0); - originPoint = QPoint(-sz.height(), 0.0); - adjSz.transpose(); + transform.translate(-sz.height(), 0.0); + transpose = true; break; } - bool drawPixmapNextTime = false; - - if (!mDrawPixmap) - { - mPixmap = QPixmap(adjSz); - mPixmap.fill(QColor(0, 0, 0, 0)); - - if (adjSz != sz) - resize(adjSz); // this causes paint event to be repeated - next time we'll paint the pixmap to the widget surface. - - // copied from QToolButton::paintEvent { - QStylePainter painter(&mPixmap, this); - QStyleOptionToolButton opt; - initStyleOption(&opt); - painter.drawComplexControl(QStyle::CC_ToolButton, opt); - // } - - if (adjSz != sz) - { - resize(sz); - drawPixmapNextTime = true; - } - else - mDrawPixmap = true; // transfer the pixmap to the widget now! - } - if (mDrawPixmap) - { - QPainter painter(this); - painter.setTransform(transform); - painter.drawPixmap(originPoint, mPixmap); - - drawPixmapNextTime = false; - } - - mDrawPixmap = drawPixmapNextTime; + QStylePainter painter(this); + painter.setTransform(transform); + QStyleOptionToolButton opt; + initStyleOption(&opt); + if (transpose) + opt.rect = opt.rect.transposed(); + painter.drawComplexControl(QStyle::CC_ToolButton, opt); } bool LXQtTaskButton::hasDragAndDropHover() const diff -Nru lxqt-panel-0.14.1/plugin-taskbar/lxqttaskbutton.h lxqt-panel-0.16.1/plugin-taskbar/lxqttaskbutton.h --- lxqt-panel-0.14.1/plugin-taskbar/lxqttaskbutton.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/lxqttaskbutton.h 2020-11-05 16:09:19.000000000 +0000 @@ -59,7 +59,7 @@ Q_PROPERTY(Qt::Corner origin READ origin WRITE setOrigin) public: - explicit LXQtTaskButton(const WId window, LXQtTaskBar * taskBar, QWidget *parent = 0); + explicit LXQtTaskButton(const WId window, LXQtTaskBar * taskBar, QWidget *parent = nullptr); virtual ~LXQtTaskButton(); bool isApplicationHidden() const; @@ -93,7 +93,7 @@ void shadeApplication(); void unShadeApplication(); void closeApplication(); - void moveApplicationToDesktop(); + void moveApplicationToDesktop(); void moveApplication(); void resizeApplication(); void setApplicationLayer(); @@ -103,6 +103,7 @@ void updateIcon(); protected: + virtual void changeEvent(QEvent *event); virtual void dragEnterEvent(QDragEnterEvent *event); virtual void dragMoveEvent(QDragMoveEvent * event); virtual void dragLeaveEvent(QDragLeaveEvent *event); @@ -110,6 +111,7 @@ void mousePressEvent(QMouseEvent *event); void mouseReleaseEvent(QMouseEvent *event); void mouseMoveEvent(QMouseEvent *event); + void wheelEvent(QWheelEvent* event); virtual void contextMenuEvent(QContextMenuEvent *event); void paintEvent(QPaintEvent *); @@ -120,19 +122,24 @@ inline ILXQtPanelPlugin * plugin() const { return mPlugin; } private: + void moveApplicationToPrevNextDesktop(bool next); + void moveApplicationToPrevNextMonitor(bool next); WId mWindow; bool mUrgencyHint; QPoint mDragStartPosition; Qt::Corner mOrigin; - QPixmap mPixmap; - bool mDrawPixmap; LXQtTaskBar * mParentTaskBar; ILXQtPanelPlugin * mPlugin; + int mIconSize; + int mWheelDelta; // Timer for when draggind something into a button (the button's window // must be activated so that the use can continue dragging to the window QTimer * mDNDTimer; + // Timer for distinguishing between separate mouse wheel rotations + QTimer * mWheelTimer; + private slots: void activateWithDraggable(); diff -Nru lxqt-panel-0.14.1/plugin-taskbar/lxqttaskgroup.cpp lxqt-panel-0.16.1/plugin-taskbar/lxqttaskgroup.cpp --- lxqt-panel-0.14.1/plugin-taskbar/lxqttaskgroup.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/lxqttaskgroup.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -81,7 +81,7 @@ QMenu * menu = new QMenu(tr("Group")); menu->setAttribute(Qt::WA_DeleteOnClose); - QAction *a = menu->addAction(XdgIcon::fromTheme("process-stop"), tr("Close group")); + QAction *a = menu->addAction(XdgIcon::fromTheme(QStringLiteral("process-stop")), tr("Close group")); connect(a, SIGNAL(triggered()), this, SLOT(closeGroup())); connect(menu, &QMenu::aboutToHide, [this] { mPreventPopup = false; @@ -136,7 +136,7 @@ if (button->isChecked()) return button; - return NULL; + return nullptr; } /************************************************ @@ -171,7 +171,7 @@ if (circular) idx = (idx + mButtonHash.count()) % mButtonHash.count(); else if (mPopup->count() <= idx || idx < 0) - return NULL; + return nullptr; // return the next or the previous child QLayoutItem *item = mPopup->itemAt(idx); @@ -182,7 +182,7 @@ return button; } - return NULL; + return nullptr; } /************************************************ @@ -206,7 +206,7 @@ /************************************************ ************************************************/ -void LXQtTaskGroup::onDesktopChanged(int number) +void LXQtTaskGroup::onDesktopChanged(int /*number*/) { refreshVisibility(); } @@ -322,7 +322,7 @@ { mSingleButton = true; // Get first visible button - LXQtTaskButton * button = NULL; + LXQtTaskButton * button = nullptr; for (LXQtTaskButton *btn : qAsConst(mButtonHash)) { if (btn->isVisibleTo(mPopup)) @@ -344,7 +344,7 @@ else { mSingleButton = false; - QString t = QString("%1 - %2 windows").arg(mGroupName).arg(cont); + QString t = QString(QStringLiteral("%1 - %2 windows")).arg(mGroupName).arg(cont); setText(t); setToolTip(parentTaskBar()->isShowGroupOnHover() ? QString() : t); } @@ -490,10 +490,10 @@ int LXQtTaskGroup::recalculateFrameWidth() const { const QFontMetrics fm = fontMetrics(); - int max = 100 * fm.width (' '); // elide after the max width + int max = 100 * fm.horizontalAdvance(QLatin1Char(' ')); // elide after the max width int txtWidth = 0; for (LXQtTaskButton *btn : qAsConst(mButtonHash)) - txtWidth = qMax(fm.width(btn->text()), txtWidth); + txtWidth = qMax(fm.horizontalAdvance(btn->text()), txtWidth); return iconSize().width() + qMin(txtWidth, max) + 30/* give enough room to margins and borders*/; } @@ -584,6 +584,35 @@ /************************************************ ************************************************/ + +void LXQtTaskGroup::mouseReleaseEvent(QMouseEvent* event) +{ + // do nothing on left button release if there is a group + if (event->button() == Qt::LeftButton && visibleButtonsCount() == 1) + LXQtTaskButton::mouseReleaseEvent(event); + else + QToolButton::mouseReleaseEvent(event); +} + +/************************************************ + + ************************************************/ + +void LXQtTaskGroup::wheelEvent(QWheelEvent* event) +{ + if (mSingleButton) + { + LXQtTaskButton::wheelEvent(event); + return; + } + // if there are multiple buttons, just show the popup + setPopupVisible(true); + QToolButton::wheelEvent(event); +} + +/************************************************ + + ************************************************/ bool LXQtTaskGroup::onWindowChanged(WId window, NET::Properties prop, NET::Properties2 prop2) { // returns true if the class is preserved bool needsRefreshVisibility{false}; @@ -600,8 +629,8 @@ // if class is changed the window won't belong to our group any more if (parentTaskBar()->isGroupingEnabled() && prop2.testFlag(NET::WM2WindowClass)) { - KWindowInfo info(window, 0, NET::WM2WindowClass); - if (info.windowClassClass() != mGroupName) + KWindowInfo info(window, NET::Properties(), NET::WM2WindowClass); + if (QString::fromUtf8(info.windowClassClass()) != mGroupName) { onWindowRemoved(window); return false; diff -Nru lxqt-panel-0.14.1/plugin-taskbar/lxqttaskgroup.h lxqt-panel-0.16.1/plugin-taskbar/lxqttaskgroup.h --- lxqt-panel-0.14.1/plugin-taskbar/lxqttaskgroup.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/lxqttaskgroup.h 2020-11-05 16:09:19.000000000 +0000 @@ -82,6 +82,8 @@ void dragLeaveEvent(QDragLeaveEvent * event); void contextMenuEvent(QContextMenuEvent * event); void mouseMoveEvent(QMouseEvent * event); + void mouseReleaseEvent(QMouseEvent *event); + void wheelEvent(QWheelEvent* event); int recalculateFrameHeight() const; int recalculateFrameWidth() const; diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_arn.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_arn.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_arn.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,283 @@ + + + + + LXQtTaskBar + + + Activate task %1 + + + + + LXQtTaskButton + + + Application + + + + + To &Desktop + + + + + &All Desktops + + + + + Desktop &%1 + + + + + &To Current Desktop + + + + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + + &Move + + + + + Resi&ze + + + + + Ma&ximize + + + + + Maximize vertically + + + + + Maximize horizontally + + + + + &Restore + + + + + Mi&nimize + + + + + Roll down + + + + + Roll up + + + + + &Layer + + + + + Always on &top + + + + + &Normal + + + + + Always on &bottom + + + + + &Close + + + + + LXQtTaskGroup + + + Group + + + + + Close group + + + + + LXQtTaskbarConfiguration + + + Task Manager Settings + + + + + General + + + + + Show only windows from desktop + + + + + Show only windows from &panel's screen + + + + + Show only minimized windows + + + + + Raise minimized windows on current desktop + + + + + Close on middle-click + + + + + Cycle windows on wheel scrolling + + + + + Window &grouping + + + + + Show popup on mouse hover + + + + + Appearance + + + + + Button style + + + + + Maximum button width + + + + + + + px + + + + + Mouse Wheel + + + + + Wheel Delta Threshold + + + + + Put buttons of the same class next to each other + + + + + Maximum button height + + + + + Auto&rotate buttons when the panel is vertical + + + + + Use icons by WindowClass, if available + + + + + Icon and text + + + + + Only icon + + + + + Only text + + + + + Disabled + + + + + Scroll up to raise, down to minimize + + + + + Scroll up to minimize, down to raise + + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + + Current + + + + diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_ar.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_ar.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_ar.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_ar.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 فعّل المهمة %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application التطبيق - + To &Desktop إلى س&طح المكتب - + &All Desktops &كل أسطح المكتب - + Desktop &%1 سطح المكتب &%1 - + &To Current Desktop إ&لى سطح المكتب الحالي - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move ا&نقل - + Resi&ze &غيّر المقاس - + Ma&ximize &كبّر - + Maximize vertically كبّر رأسيا - + Maximize horizontally كبّر أفقيا - + &Restore ا&ستعِد - + Mi&nimize &صغّر - + Roll down لُفّ لأسفل - + Roll up لُفّ لأعلى - + &Layer ال&طبقة - + Always on &top &فوق الكل دائما - + &Normal &عادي - + Always on &bottom &تحت الكل دائما - + &Close أ&غلِق @@ -158,53 +168,69 @@ أغلِق بالنقر بالوسط - + Cycle windows on wheel scrolling عجلة الفأرة تُبدّل بين النوافذ - + Window &grouping &جمّع النوافذ - + Show popup on mouse hover اعرض منبثقة عند مرور المؤشّر - + Appearance المظهر - + Button style نمط الأزرار - + Maximum button width أدنى عرض للزرّ - - + + + px بكسل - + + Mouse Wheel + عجلة الفأرة + + + + Wheel Delta Threshold + + + + + Put buttons of the same class next to each other + + + + Maximum button height أقصى ارتفاع للزرّ - + Auto&rotate buttons when the panel is vertical &دوّر الأزرار آليا عندما تكون اللوحة رأسية - + Use icons by WindowClass, if available استخدم الأيقونات من WindowClass إن وُجدت @@ -225,6 +251,31 @@ + Disabled + + + + + Scroll up to raise, down to minimize + + + + + Scroll up to minimize, down to raise + + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current الحالي diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_ast.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_ast.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_ast.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_ast.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,283 @@ + + + + + LXQtTaskBar + + + Activate task %1 + + + + + LXQtTaskButton + + + Application + + + + + To &Desktop + + + + + &All Desktops + + + + + Desktop &%1 + + + + + &To Current Desktop + + + + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + + &Move + + + + + Resi&ze + + + + + Ma&ximize + + + + + Maximize vertically + + + + + Maximize horizontally + + + + + &Restore + + + + + Mi&nimize + + + + + Roll down + + + + + Roll up + + + + + &Layer + + + + + Always on &top + + + + + &Normal + + + + + Always on &bottom + + + + + &Close + + + + + LXQtTaskGroup + + + Group + + + + + Close group + + + + + LXQtTaskbarConfiguration + + + Task Manager Settings + + + + + General + + + + + Show only windows from desktop + + + + + Show only windows from &panel's screen + + + + + Show only minimized windows + + + + + Raise minimized windows on current desktop + + + + + Close on middle-click + + + + + Cycle windows on wheel scrolling + + + + + Window &grouping + + + + + Show popup on mouse hover + + + + + Appearance + + + + + Button style + + + + + Maximum button width + + + + + + + px + + + + + Mouse Wheel + + + + + Wheel Delta Threshold + + + + + Put buttons of the same class next to each other + + + + + Maximum button height + + + + + Auto&rotate buttons when the panel is vertical + + + + + Use icons by WindowClass, if available + + + + + Icon and text + + + + + Only icon + + + + + Only text + + + + + Disabled + + + + + Scroll up to raise, down to minimize + + + + + Scroll up to minimize, down to raise + + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + + Current + + + + diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_ca.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_ca.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_ca.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_ca.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 Activa la tasca %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Aplicació - + To &Desktop A l'&escriptori - + &All Desktops T&ots els escriptoris - + Desktop &%1 Escriptori &%1 - + &To Current Desktop A l'escriptori ac&tual - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move &Mou - + Resi&ze Redimen&siona - + Ma&ximize Ma&ximitza - + Maximize vertically Maximitza verticalment - + Maximize horizontally Maximitza horitzontalment - + &Restore &Restaura - + Mi&nimize Mi&nimitza - + Roll down Enrotlla cap avall - + Roll up Enrotlla cap amunt - + &Layer &Capa - + Always on &top Sempre a la par&t superior - + &Normal &Normal - + Always on &bottom Sempre a la part in&ferior - + &Close Tan&ca @@ -158,53 +168,69 @@ Tanca amb el clic del botó del mig - + Cycle windows on wheel scrolling Recorre les finestres amb el desplaçament del ratolí - + Window &grouping A&grupació de les finestres - + Show popup on mouse hover Mostra el menú emergent en passar per sobre el ratolí - + Appearance Aparença - + Button style Estil del botó - + Maximum button width Amplada màxima del botó - - + + + px px - + + Mouse Wheel + + + + + Wheel Delta Threshold + + + + + Put buttons of the same class next to each other + + + + Maximum button height Alçada màxima del botó - + Auto&rotate buttons when the panel is vertical Gi&ra automàticament els botons quan el tauler sigui vertical - + Use icons by WindowClass, if available Utilitza les icones de classe de finestra, si estigués disponible @@ -225,6 +251,31 @@ + Disabled + + + + + Scroll up to raise, down to minimize + + + + + Scroll up to minimize, down to raise + + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current Actual diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_cs.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_cs.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_cs.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_cs.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 Aktivovat úlohu %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Aplikace - + To &Desktop Na &plochu - + &All Desktops &Všechny plochy - + Desktop &%1 Plocha &%1 - + &To Current Desktop Na s&távající plochu - + + Move To &Next Monitor + Přesunout na &další obrazovku + + + + Move To &Previous Monitor + Přesunout na &předchozí obrazovku + + + &Move &Přesunout - + Resi&ze &Změnit velikost - + Ma&ximize - Ma&ximalizovat + Z&většit - + Maximize vertically - Maximalizovat ve svislém směru + Udělat největším ve svislém směru - + Maximize horizontally - Maximalizovat ve vodorovném směru + Udělat největším ve vodorovném směru - + &Restore &Obnovit předchozí velikost - + Mi&nimize - Mi&nimalizovat + &Zmenšit - + Roll down Sbalit - + Roll up Rozbalit - + &Layer &Vrstva - + Always on &top Vždy &navrchu - + &Normal &Normální - + Always on &bottom Vždy &naspodu - + &Close &Zavřít @@ -153,53 +163,69 @@ Vyzdvihnout minimalizovaná okna stávající plochy - + Cycle windows on wheel scrolling Přepínat mezi okny otáčením kolečka myši - + Window &grouping &Seskupování oken - + Show popup on mouse hover Při najetí ukazatelem myši zobrazit vyskakovací okno - + Appearance Vzhled - + Maximum button width Šířka tlačítka maximálně - - + + + px px - + + Mouse Wheel + Kolečko myši + + + + Wheel Delta Threshold + Práh přírůstku pootočení kolečka + + + + Put buttons of the same class next to each other + Dát tlačítka stejné třídy vedle sebe + + + Maximum button height Výška tlačítka maximálně - + Use icons by WindowClass, if available Použít ikony podle třídy okna (pokud je k dispozici) - + Auto&rotate buttons when the panel is vertical Při svisle o&rientovaném panelu otočit tlačítka tak, aby byla vodorovně - + Button style Styl tlačítek @@ -225,6 +251,31 @@ + Disabled + Vypnuto + + + + Scroll up to raise, down to minimize + Otáčením nahoru přenést do popředí, dolů minimalizovat + + + + Scroll up to minimize, down to raise + Otáčením nahoru minimalizovat, dolů přenést do popředí + + + + Scroll up to move to next desktop, down to previous + Posunout nahoru pro přesun na další plochu, dolů pro přesun na předchozí + + + + Scroll up to move to previous desktop, down to next + Posunout nahoru pro přesun na předchozí plochu, dolů pro přesun na další + + + Current Stávající diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_cy.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_cy.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_cy.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_cy.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application - + To &Desktop - + &All Desktops - + Desktop &%1 - + &To Current Desktop - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move - + Resi&ze - + Ma&ximize - + Maximize vertically - + Maximize horizontally - + &Restore - + Mi&nimize - + Roll down - + Roll up - + &Layer - + Always on &top - + &Normal - + Always on &bottom - + &Close @@ -158,53 +168,69 @@ - + Cycle windows on wheel scrolling - + Window &grouping - + Show popup on mouse hover - + Appearance - + Button style - + Maximum button width - - + + + px - + + Mouse Wheel + + + + + Wheel Delta Threshold + + + + + Put buttons of the same class next to each other + + + + Maximum button height - + Auto&rotate buttons when the panel is vertical - + Use icons by WindowClass, if available @@ -225,6 +251,31 @@ + Disabled + + + + + Scroll up to raise, down to minimize + + + + + Scroll up to minimize, down to raise + + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_da.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_da.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_da.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_da.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 Aktivér opgave %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Program - + To &Desktop Til &skrivebord - + &All Desktops &Alle skriveborde - + Desktop &%1 Skrivebord &%1 - + &To Current Desktop &Til nuværende skrivebord - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move &Flyt - + Resi&ze &Tilpas størrelse - + Ma&ximize Ma&ksimer - + Maximize vertically Maksimer lodret - + Maximize horizontally Maksimer vandret - + &Restore &Genskab - + Mi&nimize Mi&nimer - + Roll down Rul ned - + Roll up Rul op - + &Layer &Lag - + Always on &top Altid &øverst - + &Normal &Normal - + Always on &bottom Altid &nederst - + &Close &Luk @@ -153,43 +163,44 @@ Løft minimerede vinduer på nuværende skrivebord - + Cycle windows on wheel scrolling Gennemløb vinduer når der rulles med hjulet - + Window &grouping Vindues&gruppering - + Appearance Udseende - + Maximum button width Maksimum knapbredde - - + + + px px - + Maximum button height Maksimum knaphøjde - + Use icons by WindowClass, if available Brug ikoner fra WindowClass, hvis tilgængeligt - + Auto&rotate buttons when the panel is vertical &Rotér automatisk knapper når panelet er lodret @@ -199,12 +210,27 @@ Luk ved midterklik - + + Mouse Wheel + Musehjul + + + + Wheel Delta Threshold + Hjulets deltatærskel + + + Show popup on mouse hover Vis pop op når musen holdes over - + + Put buttons of the same class next to each other + + + + Button style Knapstil @@ -225,6 +251,31 @@ + Disabled + Deaktiveret + + + + Scroll up to raise, down to minimize + Rul op for at løfte, ned for at minimere + + + + Scroll up to minimize, down to raise + Rul op for at minimere, ned for at løfte + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current Nuværende diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_de.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_de.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_de.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_de.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 Aufgabe %1 aktivieren @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Anwendung - + To &Desktop - Zum &Schreibtisch + Zu Arbei&tsfläche - + &All Desktops - &Alle Schreibtische + &Alle Arbeitsflächen - + Desktop &%1 - Schreibtisch &%1 + Arbeitsfläche &%1 - + &To Current Desktop - Zum ak&tuellen Schreibtisch + Zur ak&tuellen Arbeitsfläche - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move &Verschieben - + Resi&ze &Größe ändern - + Ma&ximize Ma&ximieren - + Maximize vertically Vertikal maximieren - + Maximize horizontally Horizontal maximieren - + &Restore Wiede&rherstellen - + Mi&nimize Mi&nimieren - + Roll down Herunterrollen - + Roll up Hochrollen - + &Layer &Ebene - + Always on &top Immer &oben - + &Normal &Normal - + Always on &bottom Immer &unten - + &Close &Schließen @@ -135,12 +145,12 @@ Show only windows from desktop - Nur Fenster des Schreibtisches anzeigen + Nur Fenster der Arbeitsfläche anzeigen Show only windows from &panel's screen - Nur Fenster auf dem Bildschirm mit der &Leiste anzeigen + Nur Fenster des Bildschirms mit der &Leiste anzeigen @@ -150,7 +160,7 @@ Raise minimized windows on current desktop - Minimierte Fenster auf aktuellen Schreibtisch heben + Minimierte Fenster auf aktuelle Arbeitsfläche heben @@ -158,53 +168,69 @@ Mit Mittelklick schließen - + Cycle windows on wheel scrolling Fensterwechsel durch Scrolling - + Window &grouping Fenster&gruppierung - + Show popup on mouse hover Zeige Popup wenn Maus über Inhalt steht - + Appearance Erscheinungsbild - + Button style Schaltflächenstil - + Maximum button width Maximale Schaltflächenbreite - - + + + px px - + + Mouse Wheel + Mausrad + + + + Wheel Delta Threshold + Rad-Delta-Schwelle + + + + Put buttons of the same class next to each other + + + + Maximum button height Maximale Schaltflächenhöhe - + Auto&rotate buttons when the panel is vertical Schaltflächen bei vertikaler Leiste automatisch d&rehen - + Use icons by WindowClass, if available Fensterklassensymbole verwenden, falls vorhanden @@ -225,6 +251,31 @@ + Disabled + Deaktiviert + + + + Scroll up to raise, down to minimize + + + + + Scroll up to minimize, down to raise + + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current Aktuell diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_el.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_el.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_el.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_el.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 Ενεργοποίηση της εργασίας %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Εφαρμογή - + To &Desktop Στην επι&φάνεια εργασίας - + &All Desktops Ό&λες οι επιφάνειες εργασίας - + Desktop &%1 Επιφάνεια εργασίας &%1 - + &To Current Desktop Στ&ην τρέχουσα επιφάνεια εργασίας - + + Move To &Next Monitor + Μετακίνηση στην &επόμενη οθόνη + + + + Move To &Previous Monitor + Μετακίνηση στην π&ροηγούμενη οθόνη + + + &Move &Μετακίνηση - + Resi&ze Αλλαγή &μεγέθους - + Ma&ximize &Μεγιστοποίηση - + Maximize vertically Μεγιστοποίηση κάθετα - + Maximize horizontally Μεγιστοποίηση οριζόντια - + &Restore &Επαναφορά - + Mi&nimize Ελα&χιστοποίηση - + Roll down Κύλιση κάτω - + Roll up Κύλιση επάνω - + &Layer Στ&ρώση - + Always on &top Πάντα ε&πάνω - + &Normal Κα&νονικό - + Always on &bottom Πάντα &κάτω - + &Close Κλεί&σιμο @@ -153,53 +163,69 @@ Ανύψωση των ελαχιστοποιημένων παραθύρων στην τρέχουσα επιφάνεια εργασίας - + Cycle windows on wheel scrolling Εναλλαγή παραθύρων κατά την περιστροφή της ρόδας του ποντικιού - + Window &grouping Ομα&δοποίηση των παραθύρων - + Show popup on mouse hover Εμφάνιση αναδυόμενου στο πέρασμα του ποντικιού - + Appearance Εμφάνιση - + Maximum button width Μέγιστο πλάτος κουμπιού - - + + + px εικ - + + Mouse Wheel + Τροχός ποντικιού + + + + Wheel Delta Threshold + Κατώτατο όριο Δέλτα τροχού + + + + Put buttons of the same class next to each other + Τοποθέτηση των κουμπιών της ίδιας κλάσης το ένα δίπλα στο άλλο + + + Maximum button height Μέγιστο ύψος του κουμπιού - + Use icons by WindowClass, if available Χρήση των εικονιδίων από την κλάση Παραθύρου, αν είναι διαθέσιμα - + Auto&rotate buttons when the panel is vertical &Αυτόματη περιστροφή των κουμπιών όταν ο πίνακας είναι τοποθετημένος κάθετα - + Button style Ύφος του πλήκτρου @@ -225,6 +251,31 @@ + Disabled + Απενεργοποιημένο + + + + Scroll up to raise, down to minimize + Κύλιση πάνω για ανύψωση, κάτω για ελαχιστοποίηση + + + + Scroll up to minimize, down to raise + Κύλιση πάνω για ελαχιστοποίηση, κάτω για ανύψωση + + + + Scroll up to move to next desktop, down to previous + Κύλιση προς τα πάνω για μετάβαση στην επόμενη επιφάνεια εργασίας, προς τα κάτω για την προηγούμενη + + + + Scroll up to move to previous desktop, down to next + Κύλιση προς τα πάνω για μετάβαση στην προηγούμενη επιφάνεια εργασίας, προς τα κάτω για την επόμενη + + + Current Επιφάνεια εργασίας Τρέχουσα diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_eo.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_eo.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_eo.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_eo.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Aplikaĵo - + To &Desktop &Al labortablo - + &All Desktops Ĉiuj l&abortabloj - + Desktop &%1 Labortablo &%1 - + &To Current Desktop Al ak&tuala labortablo - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move - + Resi&ze - + Ma&ximize Ma&ksimumigi - + Maximize vertically Vertikale maksimumigi - + Maximize horizontally Horizontale maksimumigi - + &Restore &Restaŭri - + Mi&nimize &Malmaksimumigi - + Roll down Malsupren rulumi - + Roll up Supren rulumi - + &Layer Tavo&lo - + Always on &top Ĉiam &supre - + &Normal &Normale - + Always on &bottom Ĉiam &malsupre - + &Close &Fermi @@ -153,53 +163,69 @@ - + Cycle windows on wheel scrolling - + Window &grouping - + Show popup on mouse hover - + Appearance - + Maximum button width - - + + + px - + + Mouse Wheel + + + + + Wheel Delta Threshold + + + + + Put buttons of the same class next to each other + + + + Maximum button height - + Use icons by WindowClass, if available - + Auto&rotate buttons when the panel is vertical - + Button style Stilo de butonoj @@ -225,6 +251,31 @@ + Disabled + + + + + Scroll up to raise, down to minimize + + + + + Scroll up to minimize, down to raise + + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_es.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_es.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_es.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_es.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 Activar la tarea %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Aplicación - + To &Desktop Al &escritorio - + &All Desktops &Todos los escritorios - + Desktop &%1 Escritorio &%1 - + &To Current Desktop &Al escritorio actual - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move &Mover - + Resi&ze Cambiar el tamaño - + Ma&ximize Ma&ximizar - + Maximize vertically Maximizar verticalmente - + Maximize horizontally Maximizar horizontalmente - + &Restore &Restaurar - + Mi&nimize Mi&nimizar - + Roll down Desenrollar - + Roll up Enrollar - + &Layer &Capa - + Always on &top Siempre &encima - + &Normal &Normal - + Always on &bottom Siempre al &fondo - + &Close &Cerrar @@ -153,53 +163,69 @@ Elevar ventanas minimizadas del escritorio actual - + Cycle windows on wheel scrolling Rotar las ventanas con la rueda del ratón - + Window &grouping A&grupación de ventanas - + Show popup on mouse hover Mostrar mensaje de ayuda al mover el ratón encima - + Appearance Apariencia - + Maximum button width Ancho máximo del botón - - + + + px px - + + Mouse Wheel + Rueda del ratón + + + + Wheel Delta Threshold + Umbral de variación de la rueda + + + + Put buttons of the same class next to each other + + + + Maximum button height Alto máximo del botón - + Use icons by WindowClass, if available Usar iconos de WindowClass, si están disponibles - + Auto&rotate buttons when the panel is vertical &Rotar automáticamente los botones cuando el panel esté vertical - + Button style Estilo del botón @@ -225,6 +251,31 @@ + Disabled + Deshabilitado + + + + Scroll up to raise, down to minimize + Desplazar hacia arriba para elevar, hacia abajo para minimizar + + + + Scroll up to minimize, down to raise + Desplazar hacia arriba para minimizar, hacia abajo para elevar + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current Actual diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_es_VE.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_es_VE.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_es_VE.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_es_VE.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Aplicación - + To &Desktop Al &Escritorio - + &All Desktops &Todos los escritorios - + Desktop &%1 Escritorio &%1 - + &To Current Desktop &Al escritorio actual - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move - + Resi&ze - + Ma&ximize Ma&ximizar - + Maximize vertically Maximizar verticalmente - + Maximize horizontally Maximizar Orizzontalmente - + &Restore &Restaurar - + Mi&nimize Mi&nimizar - + Roll down DesEnrolar - + Roll up Enrolar - + &Layer Ca&pa - + Always on &top Siempre &encima - + &Normal &Normal - + Always on &bottom Siempre por de&bajo - + &Close &Cerrar @@ -153,53 +163,69 @@ - + Cycle windows on wheel scrolling - + Window &grouping - + Show popup on mouse hover - + Appearance - + Maximum button width - - + + + px - + + Mouse Wheel + + + + + Wheel Delta Threshold + + + + + Put buttons of the same class next to each other + + + + Maximum button height - + Use icons by WindowClass, if available - + Auto&rotate buttons when the panel is vertical - + Button style Estilo de boton @@ -226,6 +252,31 @@ + Disabled + + + + + Scroll up to raise, down to minimize + + + + + Scroll up to minimize, down to raise + + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_eu.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_eu.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_eu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_eu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Aplikazioa - + To &Desktop &Mahaigainera - + &All Desktops Mahaigain &guztiak - + Desktop &%1 &%1 mahaigaina - + &To Current Desktop &Uneko mahaigainera - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move - + Resi&ze - + Ma&ximize Maximizatu - + Maximize vertically Maximizatu bertikalki - + Maximize horizontally Maximizatu horizontalki - + &Restore &Leheneratu - + Mi&nimize Minimizatu - + Roll down Zabaldu - + Roll up Bildu - + &Layer &Geruza - + Always on &top Beti &goian - + &Normal &Normala - + Always on &bottom Beti &behean - + &Close &Itxi @@ -153,53 +163,69 @@ - + Cycle windows on wheel scrolling - + Window &grouping - + Show popup on mouse hover - + Appearance - + Maximum button width - - + + + px - + + Mouse Wheel + + + + + Wheel Delta Threshold + + + + + Put buttons of the same class next to each other + + + + Maximum button height - + Use icons by WindowClass, if available - + Auto&rotate buttons when the panel is vertical - + Button style Botoi-estiloa @@ -225,6 +251,31 @@ + Disabled + + + + + Scroll up to raise, down to minimize + + + + + Scroll up to minimize, down to raise + + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_fi.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_fi.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_fi.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_fi.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,105 +4,116 @@ LXQtTaskBar - + Activate task %1 - + +Aktivoi tehtävä %1 LXQtTaskButton - + Application Sovellus - + To &Desktop Työ&pöydälle - + &All Desktops &Kaikille työpöydille - + Desktop &%1 Työpöytä &%1 - + &To Current Desktop &Nykyiselle työpöydälle - - &Move + + Move To &Next Monitor - - Resi&ze + + Move To &Previous Monitor - + + &Move + &Siirrä + + + + Resi&ze + Muuta kokoa + + + Ma&ximize Suu&renna - + Maximize vertically Suurenna pystysuunnassa - + Maximize horizontally Suurenna vaakasuunnassa - + &Restore &Palauta - + Mi&nimize Pie&nennä - + Roll down Rullaa alas - + Roll up Rullaa ylös - + &Layer Tas&o - + Always on &top Aina &ylimpänä - + &Normal &Tavallinen - + Always on &bottom Aina &alimpana - + &Close &Sulje @@ -153,53 +164,69 @@ - + Cycle windows on wheel scrolling - + Vaihda ikkunoita hiirenrullaa pyörittämällä - + Window &grouping - + Show popup on mouse hover - + Appearance Ulkonäkö - + Maximum button width Painikkeiden maksimi leveys - - + + + px - + + Mouse Wheel + + + + + Wheel Delta Threshold + + + + + Put buttons of the same class next to each other + + + + Maximum button height Painikkeiden maksimi korkeus - + Use icons by WindowClass, if available - + Auto&rotate buttons when the panel is vertical - + Button style Painiketyyli @@ -225,6 +252,31 @@ + Disabled + + + + + Scroll up to raise, down to minimize + + + + + Scroll up to minimize, down to raise + + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current Nykyinen diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_fr.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_fr.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_fr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_fr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 Activer la tâche %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application - Application(s) + Application - + To &Desktop Vers &le bureau - + &All Desktops &Tous les bureaux - + Desktop &%1 Bureau &%1 - + &To Current Desktop &Vers le bureau courant - + + Move To &Next Monitor + Déplacer vers l'&Écran suivant + + + + Move To &Previous Monitor + Déplacer vers l'&Écran précédent + + + &Move &Déplacer - + Resi&ze Re&dimensionner - + Ma&ximize Ma&ximiser - + Maximize vertically Maximiser verticalement - + Maximize horizontally Maximiser horizontalement - + &Restore &Restaurer - + Mi&nimize Mi&nimiser - + Roll down Dérouler vers le bas - + Roll up Dérouler vers le haut - + &Layer &Disposition - + Always on &top Toujours au-&dessus - + &Normal &Normal - + Always on &bottom Toujours en &bas - + &Close &Fermer @@ -153,53 +163,69 @@ Faire apparaître les fenêtres réduites du bureau actuel - + Cycle windows on wheel scrolling Faire défiler les fenêtres en utilisant la roulette - + Window &grouping &Groupement de fenêtres - + Appearance Apparence - + Maximum button width Largeur maximale des boutons - - + + + px px - + + Mouse Wheel + Roulette de la souris + + + + Wheel Delta Threshold + + + + + Put buttons of the same class next to each other + Placez les boutons de la même classe les uns à côté des autres + + + Maximum button height Hauteur maximale des boutons - + Use icons by WindowClass, if available - Utilisez les icônes par classe de fenêtre, si disponible + Utiliser les icônes par classe de fenêtre, si disponible - + Auto&rotate buttons when the panel is vertical &Rotation automatique des boutons lorsque la barre de tâche est verticale - + Show popup on mouse hover Afficher une bulle au survol de la souris - + Button style Style de boutons @@ -225,6 +251,31 @@ + Disabled + Désactivé + + + + Scroll up to raise, down to minimize + Défiler vers le haut pour élever, vers le bas pour minimiser + + + + Scroll up to minimize, down to raise + Défiler vers le haut pour minimiser, vers le bas pour agrandir + + + + Scroll up to move to next desktop, down to previous + Faites défiler vers le haut pour passer au bureau suivant, vers le bas au précédent + + + + Scroll up to move to previous desktop, down to next + Faites défiler vers le haut pour passer au bureau précédent, vers le bas au suivant + + + Current Courant diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_gl.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_gl.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_gl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_gl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 Activar a tarefa %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application - Aplicativo + Aplicación - + To &Desktop Ao &escritorio - + &All Desktops &Todos os escritorios - + Desktop &%1 Escritorio &%1 - + &To Current Desktop Ao escritorio &actual - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move &Desprazar - + Resi&ze Redi&mensionar - + Ma&ximize Ma&ximizar - + Maximize vertically Maximizar verticalmente - + Maximize horizontally Maximizar horizontalmente - + &Restore &Restaurar - + Mi&nimize Mi&nimizar - + Roll down Desenrolar - + Roll up Enrolar - + &Layer &Disposición - + Always on &top Sempre &enriba - + &Normal - + Always on &bottom Sempre em&baixo - + &Close &Pechar @@ -158,53 +168,69 @@ Pechar co botón central do rato - + Cycle windows on wheel scrolling Percorrer as xanelas coa roda do rato - + Window &grouping A&grupamento de xanelas - + Show popup on mouse hover Amosar a xanela emerxente ao pasar o rato por riba - + Appearance Aparencia - + Button style Estilo do botón - + Maximum button width Largura máxima do botón - - + + + px - + + Mouse Wheel + Roda do rato + + + + Wheel Delta Threshold + Limiar de desprazamento antes do cambio + + + + Put buttons of the same class next to each other + + + + Maximum button height Altura máxima do botón - + Auto&rotate buttons when the panel is vertical &Rotar automaticamente os botóns cando o panel estea en vertical - + Use icons by WindowClass, if available Usar as iconas de clase de xanela, se están dispoñíbeis @@ -225,6 +251,31 @@ + Disabled + Desactivado + + + + Scroll up to raise, down to minimize + Desprácese cara a arriba para elevar, cara a abaixo para minimizar + + + + Scroll up to minimize, down to raise + Desprácese cara a arriba para minimizar, cara a abaixo para elevar + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current Actual diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_he.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_he.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_he.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_he.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 הפעלת משימה %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application יישום - + To &Desktop - ל&שולחן עבודה + ל&שולחן העבודה - + &All Desktops &כל שולחנות העבודה - + Desktop &%1 שולחן עבודה &%1 - + &To Current Desktop לשולחן העבודה ה&נוכחי - + + Move To &Next Monitor + העברה לצג ה&בא + + + + Move To &Previous Monitor + העברה לצד ה&קודם + + + &Move ה&עברה - + Resi&ze &שינוי גודל - + Ma&ximize ה&גדלה - + Maximize vertically הגדלה אנכית - + Maximize horizontally הגדלה אופקית - + &Restore שח&זור - + Mi&nimize ה&קטנה - + Roll down גלגול מטה - + Roll up גלגול מעלה - + &Layer &שכבה - + Always on &top תמיד &עליון - + &Normal &רגיל - + Always on &bottom תמיד ת&חתון - + &Close &סגירה @@ -125,7 +135,7 @@ Task Manager Settings - הגדרות מנהל משימות + הגדרות מנהל המשימות @@ -158,53 +168,69 @@ סגירה עם כפתור אמצעי - + Cycle windows on wheel scrolling דפדוף בין חלונות עם גלילת העכבר - + Window &grouping &קיבוץ חלונות - + Show popup on mouse hover הצגת חלונית עם מעבר העכבר - + Appearance מראה - + Button style סגנון כפתורים - + Maximum button width רוחב הכפתור המרבי - - + + + px פיקסלים - + + Mouse Wheel + גלגלת העכבר + + + + Wheel Delta Threshold + סף גלגול גלגלת + + + + Put buttons of the same class next to each other + הצבת כפתורים מאותה המחלקה זה לצד זה + + + Maximum button height גובה הכפתור המרבי - + Auto&rotate buttons when the panel is vertical הטיה &אוטומטית של כפתורים כאשר הלוח אנכי - + Use icons by WindowClass, if available שימוש בסמלים לפי WindowClass, אם ניתן @@ -225,6 +251,31 @@ + Disabled + מושבת + + + + Scroll up to raise, down to minimize + גלילה למעלה כדי להרים, למטה כדי למזער + + + + Scroll up to minimize, down to raise + גלילה למעלה כדי למזער, למטה כדי להרים + + + + Scroll up to move to next desktop, down to previous + גלילה למעלה על מנת לעבור לשולחן העבודה הבא, ולמטה לקודם + + + + Scroll up to move to previous desktop, down to next + גלילה למעלה על מנת לעבור לשולחן העבודה הקודם, ולמטה להבא + + + Current נוכחי diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_hr.desktop lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_hr.desktop --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=Upravljač zadataka +Comment[hr]=Prebacivanje između pokrenutih programa diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_hr.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_hr.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_hr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_hr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,107 +4,117 @@ LXQtTaskBar - + Activate task %1 - + Aktiviraj zadatak %1 LXQtTaskButton - + Application - Program + Program - + To &Desktop - Na &radnu površinu + Na &radnu površinu - + &All Desktops - &Sve radne površine + &Sve radne površine - + Desktop &%1 - Radna površina &%1 + Radna površina &%1 - + &To Current Desktop - &Na trenutnu radnu površinu + Na &trenutačnu radnu površinu - + + Move To &Next Monitor + Premjesti na &sljedeći monitor + + + + Move To &Previous Monitor + Premjesti na &prethodni monitor + + + &Move - + Pre&mjesti - + Resi&ze - + Promijeni &veličinu - + Ma&ximize - + Ma&ksimiraj - + Maximize vertically - + Maksimiraj okomito - + Maximize horizontally - + Maksimiraj vodoravno - + &Restore - &Obnovi + &Obnovi - + Mi&nimize - + Mi&nimiraj - + Roll down - + Rasklopi naslovnu traku - + Roll up - + Sklopi u naslovnu traku - + &Layer - + S&loj - + Always on &top - Uvijek na &vrhu + Uvijek izna&d - + &Normal - &Normalno + &Normalno - + Always on &bottom - Uvijek na &dnu + Uvijek i&spod - + &Close - &Zatvori + &Zatvori @@ -112,12 +122,12 @@ Group - Grupa + Grupa Close group - Zatvori grupu + Zatvori grupu @@ -125,108 +135,149 @@ Task Manager Settings - Postavke upravitelja zadacima + Upravljač zadataka – Postavke General - Općenito + Opće Show only windows from desktop - + Prikaži samo prozore s radne površine Show only windows from &panel's screen - + Prikaži samo prozore s ekrana ploče Show only minimized windows - + Prikaži samo smanjene prozore Raise minimized windows on current desktop - + Nadigni smanjene prozore na trenutačnoj radnoj površini Close on middle-click - + Zatvori pritiskom srednje gumba - + Cycle windows on wheel scrolling - + Prelazi po prozorima okretanjem kotačića miša - + Window &grouping - Grupiranje prozora + &Grupiranje prozora - + Show popup on mouse hover - + Prikaži skočni prozor prilikom prelaska mišem - + Appearance - Izgled + Izgled - + Button style - + Stil gumba - + Maximum button width - + Maksimalna širina gumba - - + + + px - px + px + + + + Mouse Wheel + Kotačić miša + + + + Wheel Delta Threshold + Prag razlike kotačića + + + + Put buttons of the same class next to each other + Stavi gumbe iste klase jedan pored drugog - + Maximum button height - + Maksimalna visina gumba - + Auto&rotate buttons when the panel is vertical - + Automatski ok&reni gumbe kad ploča stoji okomito - + Use icons by WindowClass, if available - + Koristi ikone na osnovi WindowClass, ako je dostupno Icon and text - Ikona i tekst + Ikona i tekst Only icon - Samo ikona + Samo ikone Only text - Samo tekst + Samo tekst + Disabled + Deaktivirano + + + + Scroll up to raise, down to minimize + Kliži gore za nadizanje, dolje za smanjivanje + + + + Scroll up to minimize, down to raise + Kliži gore za smanjivanje, dolje za nadizanje + + + + Scroll up to move to next desktop, down to previous + Kliži gore za prelaženje na sljedeću radnu površinu, dolje na prethodnu + + + + Scroll up to move to previous desktop, down to next + Kliži gore za prelaženje na prethodnu radnu površinu, dolje na sljedeću + + + Current - + Trenutačna diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_hu.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_hu.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_hu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_hu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 A %1 feladat indítása @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Alkalmazás - + To &Desktop Asztal&ra - + &All Desktops &Az összes asztalra - + Desktop &%1 - &%1. asztal + &%1. asztalra - + &To Current Desktop Az ak&tuális asztalra - + + Move To &Next Monitor + Áthelyezés a &következő monitorra + + + + Move To &Previous Monitor + Áthelyezés az &előző monitorra + + + &Move - + &Mozgatás - + Resi&ze - + Átmé&retezés - + Ma&ximize Ma&ximalizálás - + Maximize vertically Maximalizálás függőlegesen - + Maximize horizontally Maximalizálás vízszintesen - + &Restore &Visszaállítás - + Mi&nimize Mi&nimalizálás - + Roll down Legördítés - + Roll up Felgördítés - + &Layer Réte&g - + Always on &top Mindig &felül - + &Normal &Normál - + Always on &bottom Min&dig alul - + &Close &Bezárás @@ -135,12 +145,12 @@ Show only windows from desktop - Csak az asztal ablakjai látszanak + Csak az asztal ablakai látszanak Show only windows from &panel's screen - Csak a &panel képernyőjének ablakjai látszanak + Csak a &panel képernyőjének ablakai látszanak @@ -153,60 +163,76 @@ A minimalizált ablakok kirakása az aktuális asztalra - + Cycle windows on wheel scrolling - Az ablakok körbe görgetése + Az ablakok körbeléptetése - + Window &grouping - &Ablakcsoportok + &Ablakcsoportosítás - + Show popup on mouse hover - Egérre felugró ablak + Egérre felugró ablak - + Appearance Megjelenés - + Maximum button width Gomb maximális szélessége - - + + + px - pixel + px + + + + Mouse Wheel + Egérkerék + + + + Wheel Delta Threshold + A kerék küszöbértéke + + + + Put buttons of the same class next to each other + Azonos osztályba tartozó gombok egymás mellé helyezése - + Maximum button height Gomb maximális magassága - + Use icons by WindowClass, if available - Ikonok az ablakosztályokból, ha vannak + Ikonok az ablakosztályokból, ha elérhetőek - + Auto&rotate buttons when the panel is vertical - Gombok függőleges panelnál gö&rdülnek + Gombok elfo&rgatása függőleges panelnél - + Button style Gombstílus Close on middle-click - Bezárás középkattintásra + Bezárás középső kattintásra @@ -225,8 +251,33 @@ + Disabled + Kikapcsolva + + + + Scroll up to raise, down to minimize + Görgetés felfelé a felengedéshez, le a minimalizáláshoz + + + + Scroll up to minimize, down to raise + Görgetés felfelé a minimalizáláshoz, le a felengedéshez + + + + Scroll up to move to next desktop, down to previous + Felfelé görgetés a következő asztalhoz, lefelé az előzőhöz + + + + Scroll up to move to previous desktop, down to next + Felfelé görgetés az előző asztalhoz, lefelé a következőhöz + + + Current - Mostani + Jelenlegi diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_ia.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_ia.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_ia.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_ia.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application - + To &Desktop - + &All Desktops - + Desktop &%1 - + &To Current Desktop - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move - + Resi&ze - + Ma&ximize - + Maximize vertically - + Maximize horizontally - + &Restore - + Mi&nimize - + Roll down - + Roll up - + &Layer - + Always on &top - + &Normal - + Always on &bottom - + &Close @@ -133,43 +143,44 @@ - + Cycle windows on wheel scrolling - + Window &grouping - + Appearance - + Maximum button width - - + + + px - + Maximum button height - + Auto&rotate buttons when the panel is vertical - + Use icons by WindowClass, if available @@ -199,12 +210,27 @@ - + + Mouse Wheel + + + + + Wheel Delta Threshold + + + + Show popup on mouse hover - + + Put buttons of the same class next to each other + + + + Button style @@ -225,6 +251,31 @@ + Disabled + + + + + Scroll up to raise, down to minimize + + + + + Scroll up to minimize, down to raise + + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_id.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_id.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_id.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_id.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 Aktifkan tugas %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Aplikasi - + To &Desktop Untuk &Desktop - + &All Desktops Semua Desktop - + Desktop &%1 Desktop &%1 - + &To Current Desktop Untuk Desktop Saat Ini - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move &Pindah - + Resi&ze Ubah ukuran - + Ma&ximize Maksimalkan - + Maximize vertically Maksimalkan secara vertikal - + Maximize horizontally Maksimalkan secara horizontal - + &Restore Pulihkan - + Mi&nimize Minimalkan - + Roll down Gulung kebawah - + Roll up Gulung keatas - + &Layer Lapisan - + Always on &top Selalu diatas - + &Normal &Normal - + Always on &bottom Selalu dibawah - + &Close Tutup @@ -133,43 +143,44 @@ Umum - + Cycle windows on wheel scrolling Putar jendela saat gerigi digulirkan - + Window &grouping Pengelompokan jendela - + Appearance Penampilan - + Maximum button width Lebar tombol maksimal - - + + + px px - + Maximum button height Tinggi tombol maksimal - + Auto&rotate buttons when the panel is vertical Otomatis putar tombol saat panelnya vertikal - + Use icons by WindowClass, if available Gunakan ikon oleh WindowClass, jika tersedia @@ -199,12 +210,27 @@ Angkat jendela yang diminimalkan pada desktop saat ini - + + Mouse Wheel + + + + + Wheel Delta Threshold + + + + Show popup on mouse hover Tampilkan munculan saat tetikus diatasnya - + + Put buttons of the same class next to each other + + + + Button style Gaya tombol @@ -225,6 +251,31 @@ + Disabled + + + + + Scroll up to raise, down to minimize + + + + + Scroll up to minimize, down to raise + + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current Saat ini diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_it.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_it.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_it.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_it.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 Attiva applicazione %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Applicazione - + To &Desktop Al &desktop - + &All Desktops &Tutti i desktop - + Desktop &%1 Desktop &%1 - + &To Current Desktop &Al desktop corrente - + + Move To &Next Monitor + Sposta al monitor &prossimo + + + + Move To &Previous Monitor + Sposta al monitor p&recedente + + + &Move &Sposta - + Resi&ze &Ridimensiona - + Ma&ximize Ma&ssimizza - + Maximize vertically Massimizza verticalmente - + Maximize horizontally Massimizza orizzontalmente - + &Restore &Ripristina - + Mi&nimize Mi&nimizza - + Roll down Srotola - + Roll up Arrotola - + &Layer &Livello - + Always on &top Sempre in &primo piano - + &Normal &Normale - + Always on &bottom Sempre in &secondo piano - + &Close &Chiudi @@ -153,53 +163,69 @@ Alza finestre minimizzate sul desktop attuale - + Cycle windows on wheel scrolling Scorri le finestre con la rotellina - + Window &grouping &Raggruppa finestre della stessa applicazione - + Appearance Aspetto - + Maximum button width Larghezza massima del pulsante - - + + + px px - + + Mouse Wheel + Rotellina del mouse + + + + Wheel Delta Threshold + Soglia + + + + Put buttons of the same class next to each other + Accosta finestre della stessa classe + + + Maximum button height Altezza massima del pulsante - + Use icons by WindowClass, if available Usa icone della classe della finestra se disponibile - + Auto&rotate buttons when the panel is vertical - Ruota &automaticamente se il panello è verticale + Ruota &automaticamente se il pannello è verticale - + Show popup on mouse hover - Mostra popup al passaggio del puntatore + Mostra popup al passaggio del puntatore - + Button style Stile dei pulsanti @@ -225,6 +251,31 @@ + Disabled + Disabilitata + + + + Scroll up to raise, down to minimize + Scrolla insù per alzare, in giù per minimizzare + + + + Scroll up to minimize, down to raise + Scrolla insù per minimizzare, in giù per alzare + + + + Scroll up to move to next desktop, down to previous + Scrolla insù per spostare al desktop prossimo, ingiù al precedente + + + + Scroll up to move to previous desktop, down to next + Scrolla insù per spostare al desktop precedente, ingiù al prossimo + + + Current attuale diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_ja.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_ja.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_ja.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_ja.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 アクティブなタスク %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application アプリケーション - + To &Desktop デスクトップへ(&D) - + &All Desktops すべてのデスクトップ(&A) - + Desktop &%1 デスクトップ &%1 - + &To Current Desktop - 現在のデスクトップへ(&T) + 現在のデスクトップに(&T) - + + Move To &Next Monitor + 次のモニターへ移動(&N) + + + + Move To &Previous Monitor + 前のモニターへ移動(&P) + + + &Move - 移動（&M） + 移動(&M) - + Resi&ze - リサイズ（&z） + サイズの変更(&Z) - + Ma&ximize - 最大化(&x) + 最大化(&X) - + Maximize vertically 縦方向の最大化 - + Maximize horizontally 横方向の最大化 - + &Restore 復元(&R) - + Mi&nimize 最小化(&N) - + Roll down 広げる - + Roll up たたむ - + &Layer レイヤー(&L) - + Always on &top 常に手前に表示(&T) - + &Normal 通常(&N) - + Always on &bottom 常に奥に表示(&B) - + &Close 閉じる(&C) @@ -125,42 +135,42 @@ Task Manager Settings - タスクマネージャーの設定 + タスク管理の設定 - + Auto&rotate buttons when the panel is vertical - パネルが垂直なときにはボタンを回転(&R) + パネルが垂直なときにはボタンを回転させる(&R) - + Button style ボタンのスタイル General - + 一般 Show only windows from desktop - + 次のデスクトップのウィンドウのみを表示する Show only windows from &panel's screen - + パネルのある画面のウィンドウのみを表示する(&P) Show only minimized windows - + 最小化されたウィンドウのみを表示する Raise minimized windows on current desktop - + 最小化されたウィンドウを選択した時には現在のデスクトップに移動させる @@ -168,45 +178,61 @@ 中ボタンのクリックで閉じる - + Cycle windows on wheel scrolling - + ホイールスクロールでウィンドウの切り替え - + Window &grouping - + ウィンドウのグループ化(&G) - + Show popup on mouse hover - + マウスを合わせるとポップアップでタイトルを表示する - + Appearance - + 外観 - + Maximum button width - + ボタンの最大幅 - - + + + px - + ピクセル + + + + Mouse Wheel + マウスのホイール + + + + Wheel Delta Threshold + ホイールの変化量のしきい値 + + + + Put buttons of the same class next to each other + 同じクラスのボタンを隣同士に置く - + Maximum button height - + ボタンの最大高 - + Use icons by WindowClass, if available - + 可能であれば WindowClass のアイコンを使用する @@ -225,8 +251,33 @@ + Disabled + 無効 + + + + Scroll up to raise, down to minimize + スクロールアップで最前面、スクロールダウンで最小化 + + + + Scroll up to minimize, down to raise + スクロールアップで最小化、スクロールダウンで最前面 + + + + Scroll up to move to next desktop, down to previous + スクロールアップで次のデスクトップへ移動、ダウンで前のデスクトップへ + + + + Scroll up to move to previous desktop, down to next + スクロールアップで前のデスクトップへ移動、ダウンで次のデスクトップへ + + + Current - + 現在のデスクトップ diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_ko.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_ko.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_ko.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_ko.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 작업 %1 실행 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application 애플리케이션 - + To &Desktop 바탕화면으로(&D) - + &All Desktops 모든 바탕화면(&A) - + Desktop &%1 바탕화면 &%1 - + &To Current Desktop 현재 바탕화면으로(&T) - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move 이동(&M) - + Resi&ze 크기 조절(&Z) - + Ma&ximize 최대화(&X) - + Maximize vertically 세로로 최대화 - + Maximize horizontally 가로로 최대화 - + &Restore 복원(&R) - + Mi&nimize 최소화(&N) - + Roll down 아래로 내리기 - + Roll up 위로 올리기 - + &Layer 레이어(&L) - + Always on &top 항상 위에(&T) - + &Normal 기본(&N) - + Always on &bottom 항상 아래에(&B) - + &Close 닫기(&C) @@ -133,43 +143,44 @@ 일반 - + Cycle windows on wheel scrolling 휠 스크롤로 창 돌려보기 - + Window &grouping 창 그룹화(&G) - + Appearance 꾸미기 - + Maximum button width 버튼 최대 폭 - - + + + px px - + Maximum button height 버튼 최대 높이 - + Auto&rotate buttons when the panel is vertical 패널이 세로 일 때 버튼 자동 회전(&R) - + Use icons by WindowClass, if available 가능한 경우 WindowClass에 따른 아이콘 사용 @@ -199,12 +210,27 @@ 현재 바탕화면에 최소화한 창 올리기 - + + Mouse Wheel + 마우스 휠 + + + + Wheel Delta Threshold + + + + Show popup on mouse hover - 마우스 호버 할 때 팝업 하기 + 마우스를 올릴 때 팝업 표시 + + + + Put buttons of the same class next to each other + - + Button style 버튼 스타일 @@ -225,6 +251,31 @@ + Disabled + 비활성화 + + + + Scroll up to raise, down to minimize + 스크롤을 올리면 최대화, 내리면 최소화 + + + + Scroll up to minimize, down to raise + 스크롤을 내리면 최소화, 올리면 최대화 + + + + Scroll up to move to next desktop, down to previous + 스크롤을 올리면 다음 데스크톱으로, 내리면 이전 데스크톱으로 이동 + + + + Scroll up to move to previous desktop, down to next + 스크롤을 올리면 이전 데스크톱으로, 내리면 다음 데스크톱으로 이동 + + + Current 현재 diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_lt.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_lt.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_lt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_lt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 Aktyvuoti užduotį %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Programa - + To &Desktop Į &darbalaukį - + &All Desktops &Visus darbalaukius - + Desktop &%1 Darbalaukį &%1 - + &To Current Desktop Į &esamą darbalaukį - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move &Perkelti - + Resi&ze Keisti dy&dį - + Ma&ximize Iš&skleisti - + Maximize vertically Išskleisti vertikaliai - + Maximize horizontally Išskleisti horizontaliai - + &Restore &Atkurti - + Mi&nimize Sus&kleisti - + Roll down - Užraityti + Nuraityti - + Roll up - Nuraityti + Užraityti - + &Layer S&luoksnis - + Always on &top Visada vi&ršuje - + &Normal &Normalus - + Always on &bottom Visada a&pačioje - + &Close &Užverti @@ -158,53 +168,69 @@ Užverti, spustelėjus viduriniu pelės mygtuku - + Cycle windows on wheel scrolling Perjunginėti langus, slenkant pelės ratuku - + Window &grouping Langų &grupavimas - + Show popup on mouse hover Užvedus pelę, rodyti iškylantįjį langą - + Appearance Išvaizda - + Button style Mygtukų stilius - + Maximum button width Didžiausias mygtuko plotis - - + + + px pikselių - + + Mouse Wheel + Pelės ratukas + + + + Wheel Delta Threshold + Ratuko delta slenkstis + + + + Put buttons of the same class next to each other + + + + Maximum button height Didžiausias mygtuko aukštis - + Auto&rotate buttons when the panel is vertical Automatiškai &pasukti mygtukus, jei skydelis vertikalus - + Use icons by WindowClass, if available Jei prieinama, naudoti WindowClass piktogramas @@ -225,6 +251,31 @@ + Disabled + Išjungta + + + + Scroll up to raise, down to minimize + Slinkti aukštyn norint iškelti, žemyn - norint suskleisti + + + + Scroll up to minimize, down to raise + Slinkti aukštyn norint suskleisti, žemyn - norint iškelti + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current Esamo diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_nb_NO.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_nb_NO.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_nb_NO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_nb_NO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,105 +4,115 @@ LXQtTaskBar - + Activate task %1 - Aktiv handling %1 + Aktiver handling %1 LXQtTaskButton - + Application Program - + To &Desktop - Til& skrivebord + Til &skrivebord - + &All Desktops &Alle skrivebord - + Desktop &%1 Skrivebord &%1 - + &To Current Desktop &Til skrivebord i bruk - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move &Flytt - + Resi&ze Endr&e størrelse - + Ma&ximize Ma&ksimer - + Maximize vertically Maksimer vertikalt - + Maximize horizontally Maksimer horisontalt - + &Restore &Gjenopprett - + Mi&nimize Mi&nimer - + Roll down Rull ned - + Roll up Rull opp - + &Layer &Lag - + Always on &top Alltid på &topp - + &Normal - + Always on &bottom Alltid på &bunnen - + &Close &Lukk @@ -158,53 +168,69 @@ Lukk ved midt-klikk - + Cycle windows on wheel scrolling - Skift vindu ved skrolling med hjulet + Skift vindu ved rulling med mushjulet - + Window &grouping - Vindusg&rupering + Vindus&gruppering - + Show popup on mouse hover Vis sprettopprute når musa er over - + Appearance Utseende - + Button style Knappstil - + Maximum button width Maksimal bredde på knapper - - + + + px - pksl + pk + + + + Mouse Wheel + Rullehjul på mus + + + + Wheel Delta Threshold + Avstand å rulle før forandring + + + + Put buttons of the same class next to each other + - + Maximum button height Maksimal høyde på knapper - + Auto&rotate buttons when the panel is vertical Auto&roter knapper når panelet er vertikalt - + Use icons by WindowClass, if available Bruk symboler fra WindowClass, hvis tilgjengelig @@ -225,6 +251,31 @@ + Disabled + skrudd av + + + + Scroll up to raise, down to minimize + Rull opp for å maksimere, ned for å minimere + + + + Scroll up to minimize, down to raise + Rull opp for å minimere, ned for å maksimere + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current Nåværende diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_nl.desktop lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_nl.desktop --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_nl.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_nl.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,12 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Task manager -Comment=Switch between running applications - -#TRANSLATIONS_DIR=../translations - - -# Translations +Name[nl]=Taakbalk Comment[nl]=Wissel tussen draaiende applicaties -Name[nl]=taak-manager diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_nl.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_nl.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_nl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_nl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 Activeer taak %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application - Toepassing + Applicatie - + To &Desktop Naar &bureaublad - + &All Desktops &Alle bureaubladen - + Desktop &%1 Bureaublad &%1 - + &To Current Desktop &Naar huidig bureaublad - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move - Verplaatsen + &Verplaatsen - + Resi&ze - Herschalen + &Herschalen - + Ma&ximize Ma&ximaliseren - + Maximize vertically Verticaal maximaliseren - + Maximize horizontally Horizontaal maximaliseren - + &Restore &Herstellen - + Mi&nimize Mi&nimaliseren - + Roll down Uitrollen - + Roll up Oprollen - + &Layer &Laag - + Always on &top - Altijd bovenop + Altijd &bovenop - + &Normal &Normaal - + Always on &bottom - Altijd onderop + Altijd &onderop - + &Close &Sluiten @@ -117,7 +127,7 @@ Close group - Sluit groep + Groep sluiten @@ -125,7 +135,7 @@ Task Manager Settings - Instellingen van taakbeheerder + Instellingen van Taakbalk @@ -140,7 +150,7 @@ Show only windows from &panel's screen - Toon alleen vensters van &balk's scherm + Toon alleen vensters van scherm van &werkbalk @@ -153,60 +163,76 @@ Verhef geminimaliseerde vensters op huidige bureaublad - + Cycle windows on wheel scrolling - Bladeren door vensters bij muiswieldraaien + Blader door vensters bij scrollen met muiswiel - + Window &grouping Venster&groepering - + Show popup on mouse hover - Toon opduikvenster bij zweven met muispijl + Toon popupvenster bij zweven met muis - + Appearance Uiterlijk - + Maximum button width Maximale breedte van knop - - + + + px px - + + Mouse Wheel + Muiswiel + + + + Wheel Delta Threshold + Drempelwaarde wieldelta + + + + Put buttons of the same class next to each other + + + + Maximum button height Maximale knophoogte - + Use icons by WindowClass, if available - Gebruik pictogrammen van WindowClass, indien beschikbaar + Gebruik pictogrammen van vensterklasse, indien beschikbaar - + Auto&rotate buttons when the panel is vertical - Knoppen automatisch draaien wanneer de balk verticaal is + &Draai knoppen automatisch als de balk verticaal is - + Button style Stijl van knoppen Close on middle-click - Sluiten bij middelklik + Sluit bij middelklik @@ -225,6 +251,31 @@ + Disabled + Uitgeschakeld + + + + Scroll up to raise, down to minimize + Scrol omhoog om naar boven te brengen, naar beneden om te minimaliseren + + + + Scroll up to minimize, down to raise + Scrol omhoog om te minimaliseren, naar beneden om naar boven te brengen + + + + Scroll up to move to next desktop, down to previous + Scrol omhoog om naar het volgende bureaublad te gaan, omlaag voor het vorige bureablad + + + + Scroll up to move to previous desktop, down to next + Scrol omhoog om naar het vorige bureaublad te gaan, omlaag voor het volgende bureablad + + + Current Huidig diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_pl.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_pl.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_pl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_pl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 Aktywuj zadanie %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Aplikacja - + To &Desktop Na &pulpit - + &All Desktops &Wszystkie pulpity - + Desktop &%1 Pulpit &%1 - + &To Current Desktop &Na obecny pulpit - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move &Przenieś - + Resi&ze &Zmień rozmiar - + Ma&ximize Zma&ksymalizuj - + Maximize vertically Zmaksymalizuj pionowo - + Maximize horizontally Zmaksymalizuj poziomo - + &Restore P&rzywróć - + Mi&nimize Zmi&nimalizuj - + Roll down Zwiń - + Roll up Rozwiń - + &Layer &Warstwa - + Always on &top Zawsze na &wierzchu - + &Normal &Normalnie - + Always on &bottom Zawsze pod &spodem - + &Close &Zamknij @@ -153,53 +163,69 @@ Unoś zminimalizowane okna na obecnym pulpicie - + Cycle windows on wheel scrolling Zmieniaj stan okien rolką myszy - + Window &grouping &Grupowanie okien - + Show popup on mouse hover Pokazuj podgląd przy przyłożeniu kursora - + Appearance Wygląd - + Maximum button width Maksymalna szerokość przycisku - - + + + px px - + + Mouse Wheel + Rolka myszy + + + + Wheel Delta Threshold + + + + + Put buttons of the same class next to each other + + + + Maximum button height Maksymalna wysokość przycisku - + Use icons by WindowClass, if available Używaj ikon z WindowClass, jeśli dostępne - + Auto&rotate buttons when the panel is vertical Automatycznie ob&racaj przyciski, jeżeli panel jest pionowy - + Button style Styl przycisku @@ -225,6 +251,31 @@ + Disabled + Wyłączona + + + + Scroll up to raise, down to minimize + Przesunięcie w górę rozwija, w dół minimalizuje + + + + Scroll up to minimize, down to raise + Przesunięcie w górę minimalizuje, w dół rozwija + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current Obecny diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_pt_BR.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_pt_BR.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_pt_BR.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_pt_BR.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 Ativar tarefa %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Aplicativo - + To &Desktop Para a &Área de Trabalho - + &All Desktops - &Todas Áreas de Trabalho + &Todas as Áreas de Trabalho - + Desktop &%1 Área de Trabalho &%1 - + &To Current Desktop &Para a Área de Trabalho atual - + + Move To &Next Monitor + Mover Para o Próximo &Monitor + + + + Move To &Previous Monitor + Mover Para o Monitor &Anterior + + + &Move &Mover - + Resi&ze Redi&mensionar - + Ma&ximize Ma&ximizar - + Maximize vertically Maximizar verticalmente - + Maximize horizontally Maximizar horizontalmente - + &Restore &Restaurar - + Mi&nimize Mi&nimizar - + Roll down Rolar para baixo - + Roll up Rolar para cima - + &Layer &Camada - + Always on &top Sempre em &cima - + &Normal &Normal - + Always on &bottom Sempre &embaixo - + &Close &Fechar @@ -153,53 +163,69 @@ Elevar janelas minimizadas na área de trabalho atual - + Cycle windows on wheel scrolling Circular entre as janelas ao usar a roda do mouse (scroll) - + Window &grouping &Agrupamento de janelas - + Show popup on mouse hover Mostrar lista de janelas ao apontar - + Appearance Aparência - + Maximum button width Tamanho máximo de um botão - - + + + px px - + + Mouse Wheel + Roda do Mouse + + + + Wheel Delta Threshold + Limite Delta da Roda + + + + Put buttons of the same class next to each other + Coloque botões da mesma classe próximos uns dos outros + + + Maximum button height Tamanho máximo da altura de um botão - + Use icons by WindowClass, if available Usar ícones por WindowClass, caso disponível - + Auto&rotate buttons when the panel is vertical Auto&rotacionar botões quando o painel for vertical - + Button style Estilo dos botões @@ -225,6 +251,31 @@ + Disabled + Desabilitado + + + + Scroll up to raise, down to minimize + Rolar para cima para aumentar, para baixo para minimizar + + + + Scroll up to minimize, down to raise + Rolar para cima para minimizar, para baixo para aumentar + + + + Scroll up to move to next desktop, down to previous + Rolar para cima para mover para a próxima área de trabalho, para baixo para a anterior + + + + Scroll up to move to previous desktop, down to next + Rolar para cima para mover para a área de trabalho anterior, para baixo para a próxima + + + Current Atual diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_pt.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_pt.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_pt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_pt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 Ativar tarefa %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Aplicação - + To &Desktop Na área &de trabalho - + &All Desktops Tod&as as áreas de trabalho - + Desktop &%1 Área de trabalho &%1 - + &To Current Desktop Na área de &trabalho atual - + + Move To &Next Monitor + Mover para o mo&nitor seguinte + + + + Move To &Previous Monitor + Mover para o monitor &anterior + + + &Move &Mover - + Resi&ze Re&dimensionar - + Ma&ximize Ma&ximizar - + Maximize vertically Maximizar na vertical - + Maximize horizontally Maximizar na horizontal - + &Restore &Restaurar - + Mi&nimize Mi&nimizar - + Roll down Desenrolar - + Roll up Enrolar - + &Layer Ca&mada - + Always on &top Sempre na &frente - + &Normal &Normal - + Always on &bottom Sempr&e por trás - + &Close Fe&char @@ -153,53 +163,69 @@ Mostrar janelas minimizadas da área de trabalho atual - + Cycle windows on wheel scrolling Percorrer janelas com a roda do rato - + Window &grouping A&grupamento de janelas - + Show popup on mouse hover Mostrar janela ao passar com o rato - + Appearance Aparência - + Maximum button width Largura máxima do botão - - + + + px px - + + Mouse Wheel + Roda do rato + + + + Wheel Delta Threshold + Limite delta da roda do rato + + + + Put buttons of the same class next to each other + Colocar botões da mesma classe juntos + + + Maximum button height Altura máxima do botão - + Use icons by WindowClass, if available Se disponíveis, utilizar os ícones de WindowClass - + Auto&rotate buttons when the panel is vertical &Rodar automaticamente os botões se o painel for vertical - + Button style Estilo dos botões @@ -225,6 +251,31 @@ + Disabled + Desativada + + + + Scroll up to raise, down to minimize + Desloque acima para maximizar e abaixo para minimizar + + + + Scroll up to minimize, down to raise + Desloque acima para minimizar e abaixo para maximizar + + + + Scroll up to move to next desktop, down to previous + Deslocar para cima move-se para a área de trabalho seguinte, para baixo move-se para a anterior + + + + Scroll up to move to previous desktop, down to next + Deslocar para cima move-se para a área de trabalho anterior, para baixo move-se para a seguinte + + + Current Atual diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_ro_RO.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_ro_RO.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_ro_RO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_ro_RO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Aplicație - + To &Desktop Către &desktop - + &All Desktops Toate ecr&anele - + Desktop &%1 Ecranul &%1 - + &To Current Desktop Că&tre ecranul virtual curent - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move - + Resi&ze - + Ma&ximize Ma&ximizează - + Maximize vertically Maximizează pe verticală - + Maximize horizontally Maximizează pe orizontală - + &Restore &Restaurează - + Mi&nimize Mi&nimizează - + Roll down Derulează în jos - + Roll up Derulează în sus - + &Layer &Strat - + Always on &top Întotdeauna de&asupra - + &Normal &Normal - + Always on &bottom Întotdeauna de&desubt - + &Close În&chide @@ -153,53 +163,69 @@ - + Cycle windows on wheel scrolling - + Window &grouping - + Show popup on mouse hover - + Appearance - + Maximum button width - - + + + px - + + Mouse Wheel + + + + + Wheel Delta Threshold + + + + + Put buttons of the same class next to each other + + + + Maximum button height - + Use icons by WindowClass, if available - + Auto&rotate buttons when the panel is vertical - + Button style Stil butoane @@ -225,6 +251,31 @@ + Disabled + + + + + Scroll up to raise, down to minimize + + + + + Scroll up to minimize, down to raise + + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_ru.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_ru.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_ru.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_ru.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 Запустить задачу %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Приложение - + To &Desktop &На рабочий стол - + &All Desktops &Все рабочие столы - + Desktop &%1 Рабочий стол &%1 - + &To Current Desktop На &текущий рабочий стол - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move Пере&местить - + Resi&ze Изм&енить размер - + Ma&ximize Р&азвернуть - + Maximize vertically Развернуть по вертикали - + Maximize horizontally Развернуть по горизонтали - + &Restore &Восстановить - + Mi&nimize &Свернуть - + Roll down Развернуть из заголовока - + Roll up Свернуть в заголовок - + &Layer &Положение - + Always on &top Всегда на&верху - + &Normal &Обычное - + Always on &bottom Всегда в&низу - + &Close &Закрыть @@ -148,43 +158,44 @@ Разворачивать свёрнутые окна на текущем рабочем столе - + Cycle windows on wheel scrolling - Переключать окна колесиком мыши + Переключать окна колёсиком мыши - + Window &grouping &Группировка окон - + Appearance Внешний вид - + Maximum button width Максимальная ширина кнопки - - + + + px пикс - + Maximum button height Максимальная высота кнопки - + Use icons by WindowClass, if available Использовать значки WindowClass, если доступно - + Button style Стиль кнопок @@ -194,12 +205,27 @@ Показывать окна только с рабочего стола - + + Mouse Wheel + Колёсико мыши + + + + Wheel Delta Threshold + Порог чувствительности колёсика мыши + + + Show popup on mouse hover Показывать список при наведении мыши - + + Put buttons of the same class next to each other + + + + Auto&rotate buttons when the panel is vertical Авто&поворот кнопок, когда панель вертикальна @@ -225,6 +251,31 @@ + Disabled + Нет действий + + + + Scroll up to raise, down to minimize + Прокрутка вверх разворачивает окно, вниз — сворачивает + + + + Scroll up to minimize, down to raise + Прокрутка вверх сворачивает окно, вниз — разворачивает + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current Текущий diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_sk_SK.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_sk_SK.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_sk_SK.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_sk_SK.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,105 +4,115 @@ LXQtTaskBar - + Activate task %1 - + Aktivovať úlohu %1 LXQtTaskButton - + Application Aplikácia - + To &Desktop Na &plochu - + &All Desktops &Všetky plochy - + Desktop &%1 Plocha &%1 - + &To Current Desktop &Na aktuálnu plochu - - &Move + + Move To &Next Monitor - - Resi&ze + + Move To &Previous Monitor - + + &Move + &Presunúť + + + + Resi&ze + &Zmeniť veľkosť + + + Ma&ximize Ma&ximalizovať - + Maximize vertically Maximalizovať zvisle - + Maximize horizontally Maximalizovať vodorovne - + &Restore &Obnoviť - + Mi&nimize Mi&nimalizovať - + Roll down Zrolovať nahor - + Roll up Zrolovať dolu - + &Layer &Vrstva - + Always on &top Vždy &navrchu - + &Normal &Normálne - + Always on &bottom Vždy na&spodku - + &Close &Zatvoriť @@ -112,12 +122,12 @@ Group - + Skupina Close group - + Uzatvoriť skupinu @@ -125,88 +135,104 @@ Task Manager Settings - + Nastavenie správcu úloh General - + Všeobecné Show only windows from desktop - + Zobraziť iba okná z pracovnej plochy Show only windows from &panel's screen - + Zobraziť iba okná z obrazovky panela Show only minimized windows - + Zobraziť iba minimalizované okná Raise minimized windows on current desktop - + Maximalizovať všetky okná na aktuálnu plochu - + Cycle windows on wheel scrolling - + Zmena okna rolovaním - + Window &grouping - + Okná & zoskupenie - + Show popup on mouse hover - + Zobraziť okno po prejdení myšou - + Appearance - + Vzhľad - + Maximum button width - + Maximálna šírka tlačidla - - + + + px + px + + + + Mouse Wheel + Kolečko myši + + + + Wheel Delta Threshold + Prah prírastku pri otočení kolečka + + + + Put buttons of the same class next to each other - + Maximum button height - + Maximálna výška tlačítka - + Use icons by WindowClass, if available - + Použiť okenné symboly, ak sú k dispozícii - + Auto&rotate buttons when the panel is vertical - + Automatické otočenie tlačidiel vo vertikálnej polohe panela - + Button style Štýl tlačidiel Close on middle-click - + Zatvoriť kliknutím na stredné tlačítko @@ -225,8 +251,33 @@ - Current + Disabled + Vypnuté + + + + Scroll up to raise, down to minimize + Otočením smerom hore preniesť do popredia, smerom dole minimalizovať + + + + Scroll up to minimize, down to raise + Otočením smerom hore minimalizovať, smerom dole preniesť do popredia + + + + Scroll up to move to next desktop, down to previous + + + Scroll up to move to previous desktop, down to next + + + + + Current + Aktuálny + diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_sl.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_sl.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_sl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_sl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,105 +4,115 @@ LXQtTaskBar - + Activate task %1 - + Aktiviraj opravilo %1 LXQtTaskButton - + Application Program - + To &Desktop &Na namizje - + &All Desktops &Vsa namizja - + Desktop &%1 Namizje &%1 - + &To Current Desktop Na &trenutno namizje - - &Move + + Move To &Next Monitor - - Resi&ze + + Move To &Previous Monitor - + + &Move + P&remakni + + + + Resi&ze + Nastavi &velikost + + + Ma&ximize &Razpni - + Maximize vertically Razpni navpično - + Maximize horizontally Razpni vodoravno - + &Restore &Obnovi - + Mi&nimize Po&manjšaj - + Roll down - Razvij + Minimiziraj - + Roll up - Zvij + Maksimiziraj - + &Layer &Plast - + Always on &top Vedno na &vrhu - + &Normal &Običajno - + Always on &bottom Vedno na &dnu - + &Close &Zapri @@ -112,12 +122,12 @@ Group - + Skupina Close group - + Zapri skupino @@ -125,88 +135,104 @@ Task Manager Settings - + Nastavitve vrstice s programi General - + Splošno Show only windows from desktop - + Prikaži le okna iz namizja Show only windows from &panel's screen - + Prikaži le okna, kjer je orodna vrstica Show only minimized windows - + Prikaži le minimizirana okna Raise minimized windows on current desktop - + Maksimiziraj minimizirana okna na trenutnem namizju - + Cycle windows on wheel scrolling - + Preklapljaj med okni ob vrtenju miškinega kolesca - + Window &grouping - + Okna v skupina&h - + Show popup on mouse hover - + Prikaži pojavno okno, če je miška nad skupino - + Appearance - + Izgled - + Maximum button width - + Največja širina gumba - - + + + px + px + + + + Mouse Wheel + Miškino kolesce + + + + Wheel Delta Threshold + Delta prag (threshold) kolesca + + + + Put buttons of the same class next to each other - + Maximum button height - + Največja širina gumba - + Use icons by WindowClass, if available - + Uporabi ikone atributa WindowClass, če so na voljo - + Auto&rotate buttons when the panel is vertical - + Samodejno obrni gumbe, če je v&rstica navpična - + Button style - Slog z gumbi + Slog gumbov Close on middle-click - + Zapri ob srednjem kliku @@ -216,17 +242,42 @@ Only icon - Samo ikona + Le ikona Only text - Samo besedilo + Le besedilo - Current + Disabled + Onemogočen + + + + Scroll up to raise, down to minimize + Kolesce gor/dor za maksimizacijo/minimizacijo + + + + Scroll up to minimize, down to raise + Kolesce gor/dol za minimizacijo/maksimizacijo + + + + Scroll up to move to next desktop, down to previous + + + Scroll up to move to previous desktop, down to next + + + + + Current + Trenutno + diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_sr_BA.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_sr_BA.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_sr_BA.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_sr_BA.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Програм - + To &Desktop На &површ - + &All Desktops &све површи - + Desktop &%1 површ &%1 - + &To Current Desktop &На тренутну површ - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move - + Resi&ze - + Ma&ximize Ма&ксимизуј - + Maximize vertically Максимизуј вертикално - + Maximize horizontally Максимизуј хоризонтално - + &Restore &Обнови - + Mi&nimize &Минимизуј - + Roll down Одмотај - + Roll up Намотај - + &Layer &Слој - + Always on &top увијек &изнад - + &Normal &нормално - + Always on &bottom увијек испо&д - + &Close &Затвори @@ -153,48 +163,64 @@ - + Cycle windows on wheel scrolling - + Window &grouping - + Show popup on mouse hover - + Appearance - + Maximum button width - - + + + px - + + Mouse Wheel + + + + + Wheel Delta Threshold + + + + + Put buttons of the same class next to each other + + + + Maximum button height - + Use icons by WindowClass, if available - + Auto&rotate buttons when the panel is vertical @@ -204,7 +230,7 @@ - + Button style Стил тастера @@ -225,6 +251,31 @@ + Disabled + + + + + Scroll up to raise, down to minimize + + + + + Scroll up to minimize, down to raise + + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_sr@latin.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_sr@latin.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_sr@latin.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_sr@latin.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application - + To &Desktop - + &All Desktops - + Desktop &%1 - + &To Current Desktop - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move - + Resi&ze - + Ma&ximize - + Maximize vertically - + Maximize horizontally - + &Restore - + Mi&nimize - + Roll down - + Roll up - + &Layer - + Always on &top - + &Normal - + Always on &bottom - + &Close @@ -133,43 +143,44 @@ - + Cycle windows on wheel scrolling - + Window &grouping - + Appearance - + Maximum button width - - + + + px - + Maximum button height - + Auto&rotate buttons when the panel is vertical - + Use icons by WindowClass, if available @@ -199,12 +210,27 @@ - + + Mouse Wheel + + + + + Wheel Delta Threshold + + + + Show popup on mouse hover - + + Put buttons of the same class next to each other + + + + Button style @@ -225,6 +251,31 @@ + Disabled + + + + + Scroll up to raise, down to minimize + + + + + Scroll up to minimize, down to raise + + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_sr_RS.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_sr_RS.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_sr_RS.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_sr_RS.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Програм - + To &Desktop На &површ - + &All Desktops &све површи - + Desktop &%1 површ &%1 - + &To Current Desktop &На тренутну површ - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move - + Resi&ze - + Ma&ximize Ма&ксимизуј - + Maximize vertically Максимизуј вертикално - + Maximize horizontally Максимизуј хоризонтално - + &Restore &Обнови - + Mi&nimize &Минимизуј - + Roll down Одмотај - + Roll up Намотај - + &Layer &Слој - + Always on &top увек &изнад - + &Normal &нормално - + Always on &bottom увек испо&д - + &Close &Затвори @@ -153,53 +163,69 @@ - + Cycle windows on wheel scrolling - + Window &grouping - + Show popup on mouse hover - + Appearance - + Maximum button width - - + + + px - + + Mouse Wheel + + + + + Wheel Delta Threshold + + + + + Put buttons of the same class next to each other + + + + Maximum button height - + Use icons by WindowClass, if available - + Auto&rotate buttons when the panel is vertical - + Button style Стил тастера @@ -225,6 +251,31 @@ + Disabled + + + + + Scroll up to raise, down to minimize + + + + + Scroll up to minimize, down to raise + + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_th_TH.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_th_TH.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_th_TH.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_th_TH.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application โปรแกรม - + To &Desktop ไปยัง &พ&ื&้นโต๊ะ - + &All Desktops &ท&ุกพื้นโต๊ะ - + Desktop &%1 พื้นโต๊ะ &%1 - + &To Current Desktop &ไปยังพื้นโต๊ะปัจจุบัน - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move - + Resi&ze - + Ma&ximize &ขยายแผ่ - + Maximize vertically ขยายแผ่ทางแนวตั้ง - + Maximize horizontally ขยายแผ่ทางแนวนอน - + &Restore &ค&ืนสภาพ - + Mi&nimize &ย&่อเก็บ - + Roll down ม้วนลง - + Roll up ม้วนขึ้น - + &Layer &ลำดับชั้น - + Always on &top ด้าน&หน้าเสมอ - + &Normal &ปกติ - + Always on &bottom ด้านหลัง&งเสมอ - + &Close ปิ&ด @@ -153,53 +163,69 @@ - + Cycle windows on wheel scrolling - + Window &grouping - + Show popup on mouse hover - + Appearance - + Maximum button width - - + + + px - + + Mouse Wheel + + + + + Wheel Delta Threshold + + + + + Put buttons of the same class next to each other + + + + Maximum button height - + Use icons by WindowClass, if available - + Auto&rotate buttons when the panel is vertical - + Button style รูปแบบปุ่ม @@ -225,6 +251,31 @@ + Disabled + + + + + Scroll up to raise, down to minimize + + + + + Scroll up to minimize, down to raise + + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_tr.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_tr.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_tr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_tr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 %1 görevini etkinleştir @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Uygulama - + To &Desktop &Masaüstüne - + &All Desktops &Tüm Masaüstleri - + Desktop &%1 Masaüstü &%1 - + &To Current Desktop &Şimdiki Masaüstüne - + + Move To &Next Monitor + Sonraki Ekrana Taşı + + + + Move To &Previous Monitor + Önceki Ekrana Taşı + + + &Move &Taşı - + Resi&ze &Yeniden Boyutlandır - + Ma&ximize Bü&yüt - + Maximize vertically Dikey büyüt - + Maximize horizontally Yatay büyüt - + &Restore &Geri Yükle - + Mi&nimize Kü&çült - + Roll down Aşağı indir - + Roll up Yukarı çıkar - + &Layer &Katman - + Always on &top Her zaman &üstte - + &Normal &Normal - + Always on &bottom Her zaman &altta - + &Close &Kapat @@ -153,53 +163,69 @@ Geçerli masaüstündeki pencereleri aç - + Cycle windows on wheel scrolling Tekerleği kaydırırken pencereleri döndür - + Window &grouping Pencereleri &gruplama - + Show popup on mouse hover Fare üzerine geldiğinde açılır pencereyi göster - + Appearance Görünüm - + Maximum button width Maksimum düğme genişliği - - + + + px px - + + Mouse Wheel + Fare Tekeri + + + + Wheel Delta Threshold + Tekerlek Delta Eşiği + + + + Put buttons of the same class next to each other + Aynı sınıftaki düğmeleri yan yana koyun + + + Maximum button height Maksimum düğme yüksekliği - + Use icons by WindowClass, if available Mümkün ise pencere tarafından sağlanan simgeyi kullan - + Auto&rotate buttons when the panel is vertical Panel dikey olduğunda düğmeleri otomatik &döndür - + Button style Düğme biçemi @@ -225,6 +251,31 @@ + Disabled + Kapalı + + + + Scroll up to raise, down to minimize + Yükseltmek için yukarı, kültmek için aşağı kaydırın + + + + Scroll up to minimize, down to raise + Küçültmek için yukarı, yükseltmek için aşağı kaydırın + + + + Scroll up to move to next desktop, down to previous + Bir sonraki masaüstüne gitmek için yukarı, bir öncekine gitmek için aşağı kaydırın + + + + Scroll up to move to previous desktop, down to next + Bir önceki masaüstüne gitmek için yukarı, bir sonrakine gitmek için aşağı kaydırın + + + Current Mevcut diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application - + To &Desktop - + &All Desktops - + Desktop &%1 - + &To Current Desktop - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move - + Resi&ze - + Ma&ximize - + Maximize vertically - + Maximize horizontally - + &Restore - + Mi&nimize - + Roll down - + Roll up - + &Layer - + Always on &top - + &Normal - + Always on &bottom - + &Close @@ -158,53 +168,69 @@ - + Cycle windows on wheel scrolling - + Window &grouping - + Show popup on mouse hover - + Appearance - + Button style - + Maximum button width - - + + + px - + + Mouse Wheel + + + + + Wheel Delta Threshold + + + + + Put buttons of the same class next to each other + + + + Maximum button height - + Auto&rotate buttons when the panel is vertical - + Use icons by WindowClass, if available @@ -225,6 +251,31 @@ + Disabled + + + + + Scroll up to raise, down to minimize + + + + + Scroll up to minimize, down to raise + + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_uk.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_uk.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_uk.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_uk.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application Програма - + To &Desktop На &стільницю - + &All Desktops На &всі стільниці - + Desktop &%1 Стільниця &%1 - + &To Current Desktop На &поточну стільницю - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move - + Resi&ze - + Ma&ximize Ма&ксимізувати - + Maximize vertically Максимізувати вертикально - + Maximize horizontally Максимізувати горизонтально - + &Restore &Розгорнути - + Mi&nimize &Згорнути - + Roll down Посунути вниз - + Roll up Посунути вгору - + &Layer &Шар - + Always on &top Завжди з&гори - + &Normal &Типово - + Always on &bottom Завжди з&низу - + &Close З&акрити @@ -153,53 +163,69 @@ Розгорнути мінімізовані вікна на поточній стільниці - + Cycle windows on wheel scrolling - + Window &grouping Групування &вікон - + Show popup on mouse hover - + Appearance Вигляд - + Maximum button width Максимальний розмір кнопки - - + + + px пт - + + Mouse Wheel + + + + + Wheel Delta Threshold + + + + + Put buttons of the same class next to each other + + + + Maximum button height Максимальна висота кнопки - + Use icons by WindowClass, if available Використовувати значки по WindowClass, якщо доступні - + Auto&rotate buttons when the panel is vertical Авто&повертати кнопки коли панель є вертикальна - + Button style Стиль кнопок @@ -225,6 +251,31 @@ + Disabled + + + + + Scroll up to raise, down to minimize + + + + + Scroll up to minimize, down to raise + + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current Поточне diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_zh_CN.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_zh_CN.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_zh_CN.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_zh_CN.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 激活任务 %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application 应用程序 - + To &Desktop 转到桌面(&D) - + &All Desktops 全部桌面(&A) - + Desktop &%1 桌面 &%1 - + &To Current Desktop 转到当前桌面(&T) - + + Move To &Next Monitor + + + + + Move To &Previous Monitor + + + + &Move 移动(&M) - + Resi&ze 更改大小(Z) - + Ma&ximize 最大化(&X) - + Maximize vertically 垂直最大化 - + Maximize horizontally 水平最大化 - + &Restore 恢复(&R) - + Mi&nimize 最小化(&N) - + Roll down 卷下 - + Roll up 卷上 - + &Layer 层(&L) - + Always on &top 总在顶层(&T) - + &Normal 正常(&N) - + Always on &bottom 总在底层(&B) - + &Close 关闭(&C) @@ -153,53 +163,69 @@ 提升当前桌面的最小化窗口 - + Cycle windows on wheel scrolling 转动鼠标滚轮切换窗口 - + Window &grouping 窗口分组(&G) - + Show popup on mouse hover 鼠标移过弹出菜单 - + Appearance 外观 - + Maximum button width 最大按钮宽度 - - + + + px - + + Mouse Wheel + + + + + Wheel Delta Threshold + + + + + Put buttons of the same class next to each other + + + + Maximum button height 最大按钮高度 - + Use icons by WindowClass, if available 如果可用，使用 WindowClass 提供的图标 - + Auto&rotate buttons when the panel is vertical 纵置面板时自动旋转按钮(&R) - + Button style 按钮样式 @@ -225,6 +251,31 @@ + Disabled + + + + + Scroll up to raise, down to minimize + + + + + Scroll up to minimize, down to raise + + + + + Scroll up to move to next desktop, down to previous + + + + + Scroll up to move to previous desktop, down to next + + + + Current 当前桌面 diff -Nru lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_zh_TW.ts lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_zh_TW.ts --- lxqt-panel-0.14.1/plugin-taskbar/translations/taskbar_zh_TW.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-taskbar/translations/taskbar_zh_TW.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtTaskBar - + Activate task %1 啟用任務 %1 @@ -12,97 +12,107 @@ LXQtTaskButton - + Application 應用程式 - + To &Desktop 傳送到桌面(&D) - + &All Desktops 傳送到全部桌面(&A) - + Desktop &%1 桌面 &%1 - + &To Current Desktop 傳送到當前桌面(&T) - + + Move To &Next Monitor + 移動到下一個螢幕(&N) + + + + Move To &Previous Monitor + 移動到前一個螢幕(&N) + + + &Move 移動 (&M) - + Resi&ze 更改大小 (&z) - + Ma&ximize 最大化(&x) - + Maximize vertically 垂直最大化 - + Maximize horizontally 水平最大化 - + &Restore 恢復(&R) - + Mi&nimize 最小化(&n) - + Roll down 放下視窗 - + Roll up 捲起視窗 - + &Layer 層(&L) - + Always on &top 總是在最上層(&t) - + &Normal 正常(&N) - + Always on &bottom 總是在最底層(&b) - + &Close 關閉(&C) @@ -153,53 +163,69 @@ 在當前桌面展開最小化的視窗 - + Cycle windows on wheel scrolling 滾動滾輪時循環顯示視窗 - + Window &grouping 視窗群組 (&g) - + Show popup on mouse hover 當滑鼠懸停時顯示彈出式預覽 - + Appearance 外觀 - + Maximum button width 最大按鈕寬度 - - + + + px 像素 - + + Mouse Wheel + 滑鼠滾輪 + + + + Wheel Delta Threshold + 滾輪位移臨界值 + + + + Put buttons of the same class next to each other + + + + Maximum button height 最大按鈕高度 - + Use icons by WindowClass, if available 如果可以的話，使用WindowClass的圖示 - + Auto&rotate buttons when the panel is vertical 當面板垂直時自動旋轉按鈕 (&r) - + Button style 按鈕樣式 @@ -225,6 +251,31 @@ + Disabled + 不做任何事 + + + + Scroll up to raise, down to minimize + 向上滾顯示視窗，向下滾最小化 + + + + Scroll up to minimize, down to raise + 向上滾最小化，向下滾顯示視窗 + + + + Scroll up to move to next desktop, down to previous + 向上滾移動到下一個桌面，向下滾則移動到前一個 + + + + Scroll up to move to previous desktop, down to next + 向上滾移動到前一個桌面，向下滾則移動到下一個 + + + Current 現在 diff -Nru lxqt-panel-0.14.1/plugin-tray/CMakeLists.txt lxqt-panel-0.16.1/plugin-tray/CMakeLists.txt --- lxqt-panel-0.14.1/plugin-tray/CMakeLists.txt 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/CMakeLists.txt 2020-11-05 16:09:19.000000000 +0000 @@ -11,6 +11,7 @@ pkg_check_modules(XRENDER REQUIRED xrender) set(HEADERS + lxqttrayconfiguration.h lxqttrayplugin.h lxqttray.h trayicon.h @@ -18,12 +19,17 @@ ) set(SOURCES + lxqttrayconfiguration.cpp lxqttrayplugin.cpp lxqttray.cpp trayicon.cpp xfitman.cpp ) +set(UIS + lxqttrayconfiguration.ui +) + set(LIBRARIES ${X11_LIBRARIES} ${XCOMPOSITE_LDFLAGS} diff -Nru lxqt-panel-0.14.1/plugin-tray/lxqttrayconfiguration.cpp lxqt-panel-0.16.1/plugin-tray/lxqttrayconfiguration.cpp --- lxqt-panel-0.14.1/plugin-tray/lxqttrayconfiguration.cpp 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/lxqttrayconfiguration.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,56 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * https://lxqt.org + * + * Copyright: 2019 LXQt team + * Authors: + * John Lindgren + * + * 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 "lxqttrayconfiguration.h" +#include "ui_lxqttrayconfiguration.h" + +LXQtTrayConfiguration::LXQtTrayConfiguration(PluginSettings *settings, QWidget *parent) : + LXQtPanelPluginConfigDialog(settings, parent), + ui(new Ui::LXQtTrayConfiguration) +{ + setAttribute(Qt::WA_DeleteOnClose); + ui->setupUi(this); + + loadSettings(); + + connect(ui->sortIconsCB, &QAbstractButton::toggled, [settings](bool value) { + settings->setValue(QStringLiteral("sortIcons"), value); + }); + connect(ui->spacingSB, static_cast(&QSpinBox::valueChanged), [settings](int value) { + settings->setValue(QStringLiteral("spacing"), value); + }); + + connect(ui->buttons, &QDialogButtonBox::clicked, this, &LXQtTrayConfiguration::dialogButtonsAction); +} + +LXQtTrayConfiguration::~LXQtTrayConfiguration() {} + +void LXQtTrayConfiguration::loadSettings() +{ + ui->sortIconsCB->setChecked(settings().value(QStringLiteral("sortIcons"), false).toBool()); + ui->spacingSB->setValue(settings().value(QStringLiteral("spacing"), 0).toInt()); +} diff -Nru lxqt-panel-0.14.1/plugin-tray/lxqttrayconfiguration.h lxqt-panel-0.16.1/plugin-tray/lxqttrayconfiguration.h --- lxqt-panel-0.14.1/plugin-tray/lxqttrayconfiguration.h 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/lxqttrayconfiguration.h 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,53 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * https://lxqt.org + * + * Copyright: 2019 LXQt team + * Authors: + * John Lindgren + * + * 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 LXQTTRAYCONFIGURATION_H +#define LXQTTRAYCONFIGURATION_H + +#include "../panel/lxqtpanelpluginconfigdialog.h" +#include + +namespace Ui { + class LXQtTrayConfiguration; +} + +class LXQtTrayConfiguration : public LXQtPanelPluginConfigDialog +{ + Q_OBJECT + +public: + explicit LXQtTrayConfiguration(PluginSettings *settings, QWidget *parent = nullptr); + ~LXQtTrayConfiguration(); + +private slots: + void loadSettings() override; + +private: + std::unique_ptr ui; +}; + +#endif // LXQTTRAYCONFIGURATION_H diff -Nru lxqt-panel-0.14.1/plugin-tray/lxqttrayconfiguration.ui lxqt-panel-0.16.1/plugin-tray/lxqttrayconfiguration.ui --- lxqt-panel-0.14.1/plugin-tray/lxqttrayconfiguration.ui 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/lxqttrayconfiguration.ui 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,50 @@ + + + LXQtTrayConfiguration + + + System Tray Settings + + + + + + General + + + + + + Spacing between icons: + + + + + + + px + + + + + + + Sort icons by window class + + + + + + + + + + QDialogButtonBox::Close|QDialogButtonBox::Reset + + + + + + + + diff -Nru lxqt-panel-0.14.1/plugin-tray/lxqttray.cpp lxqt-panel-0.16.1/plugin-tray/lxqttray.cpp --- lxqt-panel-0.14.1/plugin-tray/lxqttray.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/lxqttray.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -34,8 +34,11 @@ #include #include #include +#include +#include #include "trayicon.h" #include "../panel/ilxqtpanel.h" +#include "../panel/pluginsettings.h" #include #include "lxqttray.h" #include "xfitman.h" @@ -77,6 +80,7 @@ mDisplay(QX11Info::display()) { mLayout = new LXQt::GridLayout(this); + mLayout->setSpacing(mPlugin->settings()->value(QStringLiteral("spacing"), 0).toInt()); realign(); _NET_SYSTEM_TRAY_OPCODE = XfitMan::atom("_NET_SYSTEM_TRAY_OPCODE"); // Init the selection later just to ensure that no signals are sent until @@ -171,6 +175,16 @@ /************************************************ ************************************************/ +void LXQtTray::settingsChanged() +{ + mLayout->setSpacing(mPlugin->settings()->value(QStringLiteral("spacing"), 0).toInt()); + sortIcons(); +} + + +/************************************************ + + ************************************************/ void LXQtTray::clientMessageEvent(xcb_generic_event_t *e) { unsigned long opcode; @@ -285,8 +299,8 @@ Display* dsp = mDisplay; Window root = QX11Info::appRootWindow(); - QString s = QString("_NET_SYSTEM_TRAY_S%1").arg(DefaultScreen(dsp)); - Atom _NET_SYSTEM_TRAY_S = XfitMan::atom(s.toLatin1()); + QString s = QStringLiteral("_NET_SYSTEM_TRAY_S%1").arg(DefaultScreen(dsp)); + Atom _NET_SYSTEM_TRAY_S = XfitMan::atom(s.toLatin1().constData()); if (XGetSelectionOwner(dsp, _NET_SYSTEM_TRAY_S) != None) { @@ -396,5 +410,32 @@ mIcons.append(icon); mLayout->addWidget(icon); connect(icon, &QObject::destroyed, this, &LXQtTray::onIconDestroyed); + sortIcons(); } + +/************************************************ + + ************************************************/ +void LXQtTray::sortIcons() +{ + // there is currently no way to un-sort icons once sorted + if(!mPlugin->settings()->value(QStringLiteral("sortIcons"), false).toBool()) + return; + + std::vector items; + + // temporarily remove all icons to sort them + for(QLayoutItem *item; (item = mLayout->takeAt(0)) != nullptr;) + items.push_back(item); + + std::stable_sort(items.begin(), items.end(), [](QLayoutItem *a, QLayoutItem *b) { + auto ai = static_cast(a->widget()); + auto bi = static_cast(b->widget()); + return (ai->appName() < bi->appName()); + }); + + // add them back in sorted order + for(QLayoutItem *item : items) + mLayout->addItem(item); +} diff -Nru lxqt-panel-0.14.1/plugin-tray/lxqttray.h lxqt-panel-0.16.1/plugin-tray/lxqttray.h --- lxqt-panel-0.14.1/plugin-tray/lxqttray.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/lxqttray.h 2020-11-05 16:09:19.000000000 +0000 @@ -53,7 +53,7 @@ Q_OBJECT Q_PROPERTY(QSize iconSize READ iconSize WRITE setIconSize) public: - LXQtTray(ILXQtPanelPlugin *plugin, QWidget* parent = 0); + LXQtTray(ILXQtPanelPlugin *plugin, QWidget* parent = nullptr); ~LXQtTray(); @@ -63,6 +63,7 @@ bool nativeEventFilter(const QByteArray &eventType, void *message, long *); void realign(); + void settingsChanged(); signals: void iconSizeChanged(int iconSize); @@ -85,6 +86,8 @@ long unsigned int data4 = 0) const; void addIcon(Window id); + void sortIcons(); + TrayIcon* findIcon(Window trayId); bool mValid; diff -Nru lxqt-panel-0.14.1/plugin-tray/lxqttrayplugin.cpp lxqt-panel-0.16.1/plugin-tray/lxqttrayplugin.cpp --- lxqt-panel-0.14.1/plugin-tray/lxqttrayplugin.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/lxqttrayplugin.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -27,6 +27,7 @@ #include "lxqttrayplugin.h" +#include "lxqttrayconfiguration.h" #include "lxqttray.h" LXQtTrayPlugin::LXQtTrayPlugin(const ILXQtPanelPluginStartupInfo &startupInfo) : @@ -46,9 +47,18 @@ return mWidget; } +QDialog *LXQtTrayPlugin::configureDialog() +{ + return new LXQtTrayConfiguration(settings()); +} + void LXQtTrayPlugin::realign() { mWidget->realign(); } +void LXQtTrayPlugin::settingsChanged() +{ + mWidget->settingsChanged(); +} diff -Nru lxqt-panel-0.14.1/plugin-tray/lxqttrayplugin.h lxqt-panel-0.16.1/plugin-tray/lxqttrayplugin.h --- lxqt-panel-0.14.1/plugin-tray/lxqttrayplugin.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/lxqttrayplugin.h 2020-11-05 16:09:19.000000000 +0000 @@ -43,9 +43,13 @@ ~LXQtTrayPlugin(); virtual QWidget *widget(); - virtual QString themeId() const { return "Tray"; } - virtual Flags flags() const { return PreferRightAlignment | SingleInstance | NeedsHandle; } + virtual QString themeId() const { return QStringLiteral("Tray"); } + virtual Flags flags() const { return HaveConfigDialog | PreferRightAlignment | SingleInstance | NeedsHandle; } + + QDialog *configureDialog(); + void realign(); + void settingsChanged(); bool isSeparate() const { return true; } diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_arn.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_arn.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_arn.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,32 @@ + + + + + LXQtTrayConfiguration + + + System Tray Settings + + + + + General + + + + + Spacing between icons: + + + + + px + + + + + Sort icons by window class + + + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_ast.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_ast.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_ast.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_ast.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,32 @@ + + + + + LXQtTrayConfiguration + + + System Tray Settings + Axustes de la bandexa del sistema + + + + General + Xeneral + + + + Spacing between icons: + Espariu ente iconos: + + + + px + px + + + + Sort icons by window class + + + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_ca.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_ca.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_ca.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_ca.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,32 @@ + + LXQtTrayConfiguration + + + System Tray Settings + + + + + General + + + + + Spacing between icons: + + + + + px + + + + + Sort icons by window class + + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_cs.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_cs.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_cs.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_cs.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,32 @@ + + LXQtTrayConfiguration + + + System Tray Settings + Nastavení oznamovací oblasti panelu + + + + General + Obecné + + + + Spacing between icons: + Mezery mezi ikonami: + + + + px + px + + + + Sort icons by window class + Řadit ikony podle třídy okna + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_cy.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_cy.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_cy.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_cy.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,32 @@ + + LXQtTrayConfiguration + + + System Tray Settings + + + + + General + + + + + Spacing between icons: + + + + + px + + + + + Sort icons by window class + + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_da.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_da.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_da.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_da.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,32 @@ + + LXQtTrayConfiguration + + + System Tray Settings + Systembakkeindstillinger + + + + General + Generelt + + + + Spacing between icons: + Mellemrum mellem ikoner: + + + + px + px + + + + Sort icons by window class + Sortér ikoner efter vinduesklasse + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_de.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_de.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_de.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_de.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,32 @@ + + LXQtTrayConfiguration + + + System Tray Settings + Einstellungen des Infobereichs + + + + General + Allgemein + + + + Spacing between icons: + Abstand zwischen den Symbolen: + + + + px + px + + + + Sort icons by window class + Symbole nach Fensterklasse sortieren + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_es.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_es.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_es.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_es.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,32 @@ + + + + + LXQtTrayConfiguration + + + System Tray Settings + Configuración de la bandeja del sistema + + + + General + General + + + + Spacing between icons: + Espacio entre iconos: + + + + px + px + + + + Sort icons by window class + Ordenar los iconos por clase de ventana + + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_gl.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_gl.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_gl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_gl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,32 @@ + + LXQtTrayConfiguration + + + System Tray Settings + Axustes da area de notificación do sistema + + + + General + Xeral + + + + Spacing between icons: + Espazo entre iconas: + + + + px + px + + + + Sort icons by window class + Ordenar as iconas por clase de xanela + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_he.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_he.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_he.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_he.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,32 @@ + + + + + LXQtTrayConfiguration + + + System Tray Settings + הגדרות מגש המערכת + + + + General + כללי + + + + Spacing between icons: + ריווח בין סמלים: + + + + px + פיקסלים + + + + Sort icons by window class + סידור סמלים לפי מחלקה של חלון + + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_hr.desktop lxqt-panel-0.16.1/plugin-tray/translations/tray_hr.desktop --- lxqt-panel-0.14.1/plugin-tray/translations/tray_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=Programska traka +Comment[hr]=Prikaži programe u programskoj traci. diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_hr.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_hr.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_hr.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_hr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,32 @@ + + + + + LXQtTrayConfiguration + + + System Tray Settings + Programska traka – Postavke + + + + General + Opće + + + + Spacing between icons: + Razmak između ikona: + + + + px + px + + + + Sort icons by window class + Razvrstaj ikone prema klasi prozora + + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_hu.desktop lxqt-panel-0.16.1/plugin-tray/translations/tray_hu.desktop --- lxqt-panel-0.14.1/plugin-tray/translations/tray_hu.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_hu.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -8,5 +8,5 @@ # Translations -Comment[hu]=A paneltálcára minimalizált, rejtett alkalmazások elérése -Name[hu]=Paneltálca +Comment[hu]=A rendszertálcára minimalizált alkalmazások elérése +Name[hu]=Rendszertálca diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_hu.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_hu.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_hu.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_hu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,32 @@ + + + + + LXQtTrayConfiguration + + + System Tray Settings + Rendszertálca beállításai + + + + General + Általános + + + + Spacing between icons: + Ikonok közötti távolság: + + + + px + px + + + + Sort icons by window class + Ikonok rendezése ablakosztály szerint + + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_id.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_id.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_id.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_id.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,32 @@ + + LXQtTrayConfiguration + + + System Tray Settings + + + + + General + + + + + Spacing between icons: + + + + + px + + + + + Sort icons by window class + + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_it.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_it.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_it.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_it.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,32 @@ + + + + + LXQtTrayConfiguration + + + System Tray Settings + Impostazioni vassoio + + + + General + Generale + + + + Spacing between icons: + Spazio tra le icone: + + + + px + px + + + + Sort icons by window class + Ordina le icone per classe di finestra + + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_ja.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_ja.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_ja.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_ja.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,32 @@ + + + + + LXQtTrayConfiguration + + + System Tray Settings + システムトレイの設定 + + + + General + 一般 + + + + Spacing between icons: + アイコンの間隔: + + + + px + ピクセル + + + + Sort icons by window class + ウィンドウクラスでアイコンを並べ替える + + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_nb_NO.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_nb_NO.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_nb_NO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_nb_NO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,32 @@ + + LXQtTrayConfiguration + + + System Tray Settings + Systemtrauinnstillinger + + + + General + Generelt + + + + Spacing between icons: + Avstand mellom symboler: + + + + px + pk + + + + Sort icons by window class + Sorter symboler etter type vindu + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_nl.desktop lxqt-panel-0.16.1/plugin-tray/translations/tray_nl.desktop --- lxqt-panel-0.14.1/plugin-tray/translations/tray_nl.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_nl.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,12 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=System tray -Comment=Display applications minimized to the system tray. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[nl]=Verborgen pictogrammen tonen -Name[nl]=Systeem vak +Name[nl]=Systeemvak +Comment[nl]=Toon systeemvak-applicaties. diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_nl.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_nl.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_nl.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_nl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,32 @@ + + + + + LXQtTrayConfiguration + + + System Tray Settings + Instellingen voor systeemvak + + + + General + Algemeen + + + + Spacing between icons: + Ruimte tussen pictogrammen: + + + + px + px + + + + Sort icons by window class + Sorteer pictogrammen volgens vensterklasse + + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_pl.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_pl.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_pl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_pl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,32 @@ + + LXQtTrayConfiguration + + + System Tray Settings + Ustawienia zasobnika systemowego + + + + General + Ogólne + + + + Spacing between icons: + Odstęp między ikonami: + + + + px + px + + + + Sort icons by window class + Sortuj ikony według klasy okna + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_pt_BR.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_pt_BR.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_pt_BR.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_pt_BR.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,32 @@ + + LXQtTrayConfiguration + + + System Tray Settings + Configurações da Bandeja do Sistema + + + + General + Geral + + + + Spacing between icons: + Espaçamento entre ícones: + + + + px + px + + + + Sort icons by window class + Classificar ícones por classe de janela + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_ru_RU.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_ru_RU.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_ru_RU.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_ru_RU.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,32 @@ + + LXQtTrayConfiguration + + + System Tray Settings + Параметры системного трея + + + + General + Основные + + + + Spacing between icons: + Расстояние между значками: + + + + px + + + + + Sort icons by window class + Сортировка значков по классам окон + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_sk_SK.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_sk_SK.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_sk_SK.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_sk_SK.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,32 @@ + + + + + LXQtTrayConfiguration + + + System Tray Settings + Nastavenie oznamovacích oblastí panelu + + + + General + Všeobecné + + + + Spacing between icons: + Odstup medzi ikonami: + + + + px + Pixely + + + + Sort icons by window class + Riadiť ikony podľa triedy okna + + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray_tr.ts lxqt-panel-0.16.1/plugin-tray/translations/tray_tr.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray_tr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray_tr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,32 @@ + + LXQtTrayConfiguration + + + System Tray Settings + Sistem Çekmecesi Ayarları + + + + General + Genel + + + + Spacing between icons: + Simgeler arası boşluk: + + + + px + px + + + + Sort icons by window class + Simgeleri pencere sınıfına göre sırala + + diff -Nru lxqt-panel-0.14.1/plugin-tray/translations/tray.ts lxqt-panel-0.16.1/plugin-tray/translations/tray.ts --- lxqt-panel-0.14.1/plugin-tray/translations/tray.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/translations/tray.ts 2020-11-05 16:09:19.000000000 +0000 @@ -1,4 +1,32 @@ + + LXQtTrayConfiguration + + + System Tray Settings + + + + + General + + + + + Spacing between icons: + + + + + px + + + + + Sort icons by window class + + + diff -Nru lxqt-panel-0.14.1/plugin-tray/trayicon.cpp lxqt-panel-0.16.1/plugin-tray/trayicon.cpp --- lxqt-panel-0.14.1/plugin-tray/trayicon.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/trayicon.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -73,6 +73,7 @@ QFrame(parent), mIconId(iconId), mWindowId(0), + mAppName(xfitMan().getApplicationName(mIconId)), mIconSize(iconSize), mDamage(0), mDisplay(QX11Info::display()) @@ -85,14 +86,10 @@ // QX11Info::display() will fail and cause crash. Storing this value improves the efficiency and // also prevent potential crashes caused by this bug. - setObjectName("TrayIcon"); + setObjectName(QStringLiteral("TrayIcon")); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - // NOTE: - // see https://github.com/lxqt/lxqt/issues/945 - // workaround: delayed init because of weird behaviour of some icons/windows (claws-mail) - // (upon starting the app the window for receiving clicks wasn't correctly sized - // no matter what we've done) - QTimer::singleShot(200, [this] { init(); update(); }); + init(); + update(); } diff -Nru lxqt-panel-0.14.1/plugin-tray/trayicon.h lxqt-panel-0.16.1/plugin-tray/trayicon.h --- lxqt-panel-0.14.1/plugin-tray/trayicon.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/trayicon.h 2020-11-05 16:09:19.000000000 +0000 @@ -50,8 +50,10 @@ TrayIcon(Window iconId, QSize const & iconSize, QWidget* parent); virtual ~TrayIcon(); - Window iconId() { return mIconId; } - Window windowId() { return mWindowId; } + Window iconId() const { return mIconId; } + Window windowId() const { return mWindowId; } + QString appName() const { return mAppName; } + void windowDestroyed(Window w); QSize iconSize() const { return mIconSize; } @@ -68,6 +70,7 @@ QRect iconGeometry(); Window mIconId; Window mWindowId; + QString mAppName; QSize mIconSize; Damage mDamage; Display* mDisplay; diff -Nru lxqt-panel-0.14.1/plugin-tray/xfitman.cpp lxqt-panel-0.16.1/plugin-tray/xfitman.cpp --- lxqt-panel-0.14.1/plugin-tray/xfitman.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-tray/xfitman.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -72,10 +72,10 @@ Atom XfitMan::atom(const char* atomName) { static QHash hash; - if (hash.contains(atomName)) - return hash.value(atomName); + if (hash.contains(QString::fromUtf8(atomName))) + return hash.value(QString::fromUtf8(atomName)); Atom atom = XInternAtom(QX11Info::display(), atomName, false); - hash[atomName] = atom; + hash[QString::fromUtf8(atomName)] = atom; return atom; } @@ -145,7 +145,7 @@ } QImage img (data[0], data[1], QImage::Format_ARGB32); - for (int i=0; iaddPixmap(QPixmap::fromImage(img)); @@ -197,10 +197,11 @@ // i got the idea for this from taskbar-plugin of LXPanel - so credits fly out :) QString XfitMan::getWindowTitle(Window _wid) const { - QString name = ""; + QString name = QLatin1String(""); //first try the modern net-wm ones unsigned long length; - unsigned char *data = NULL; + unsigned char *data = nullptr; + Atom utf8Atom = atom("UTF8_STRING"); if (getWindowProperty(_wid, atom("_NET_WM_VISIBLE_NAME"), utf8Atom, &length, &data)) @@ -223,7 +224,7 @@ { if (getWindowProperty(_wid, atom("XA_WM_NAME"), XA_STRING, &length, &data)) { - name = (char*) data; + name = QString::fromUtf8(reinterpret_cast(data)); XFree(data); } } @@ -231,7 +232,7 @@ if (name.isEmpty()) { Status ok = XFetchName(QX11Info::display(), _wid, (char**) &data); - name = QString((char*) data); + name = QString::fromUtf8(reinterpret_cast (data)); if (0 != ok) XFree(data); } @@ -257,7 +258,7 @@ { if (hint.res_name) { - ret = hint.res_name; + ret = QString::fromUtf8(hint.res_name); XFree(hint.res_name); } if (hint.res_class) diff -Nru lxqt-panel-0.14.1/plugin-volume/alsadevice.h lxqt-panel-0.16.1/plugin-volume/alsadevice.h --- lxqt-panel-0.14.1/plugin-volume/alsadevice.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/alsadevice.h 2020-11-05 16:09:19.000000000 +0000 @@ -40,7 +40,7 @@ Q_OBJECT public: - AlsaDevice(AudioDeviceType t, AudioEngine *engine, QObject *parent = 0); + AlsaDevice(AudioDeviceType t, AudioEngine *engine, QObject *parent = nullptr); snd_mixer_t *mixer() const { return m_mixer; } snd_mixer_elem_t *element() const { return m_elem; } diff -Nru lxqt-panel-0.14.1/plugin-volume/alsaengine.cpp lxqt-panel-0.16.1/plugin-volume/alsaengine.cpp --- lxqt-panel-0.14.1/plugin-volume/alsaengine.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/alsaengine.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -35,7 +35,7 @@ AlsaEngine *AlsaEngine::m_instance = 0; -static int alsa_elem_event_callback(snd_mixer_elem_t *elem, unsigned int mask) +static int alsa_elem_event_callback(snd_mixer_elem_t *elem, unsigned int /*mask*/) { AlsaEngine *engine = AlsaEngine::instance(); if (engine) @@ -44,7 +44,7 @@ return 0; } -static int alsa_mixer_event_callback(snd_mixer_t *mixer, unsigned int mask, snd_mixer_elem_t *elem) +static int alsa_mixer_event_callback(snd_mixer_t * /*mixer*/, unsigned int /*mask*/, snd_mixer_elem_t * /*elem*/) { return 0; } @@ -165,10 +165,10 @@ qWarning("Can't get info for card %i: %s\n", cardNum, snd_strerror(error)); } else { // setup mixer and iterate over channels - snd_mixer_t *mixer = 0; + snd_mixer_t *mixer = nullptr; snd_mixer_open(&mixer, 0); snd_mixer_attach(mixer, str); - snd_mixer_selem_register(mixer, NULL, NULL); + snd_mixer_selem_register(mixer, nullptr, nullptr); snd_mixer_load(mixer); // setup event handler for mixer @@ -191,7 +191,7 @@ AlsaDevice *dev = new AlsaDevice(Sink, this, this); dev->setName(QString::fromLatin1(snd_mixer_selem_get_name(mixerElem))); dev->setIndex(cardNum); - dev->setDescription(cardName + " - " + dev->name()); + dev->setDescription(cardName + QStringLiteral(" - ") + dev->name()); // set alsa specific members dev->setCardName(QString::fromLatin1(str)); diff -Nru lxqt-panel-0.14.1/plugin-volume/alsaengine.h lxqt-panel-0.16.1/plugin-volume/alsaengine.h --- lxqt-panel-0.14.1/plugin-volume/alsaengine.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/alsaengine.h 2020-11-05 16:09:19.000000000 +0000 @@ -45,7 +45,7 @@ Q_OBJECT public: - AlsaEngine(QObject *parent = 0); + AlsaEngine(QObject *parent = nullptr); static AlsaEngine *instance(); virtual const QString backendName() const { return QLatin1String("Alsa"); } diff -Nru lxqt-panel-0.14.1/plugin-volume/audiodevice.h lxqt-panel-0.16.1/plugin-volume/audiodevice.h --- lxqt-panel-0.14.1/plugin-volume/audiodevice.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/audiodevice.h 2020-11-05 16:09:19.000000000 +0000 @@ -45,7 +45,7 @@ Q_PROPERTY(AudioDeviceType type READ type CONSTANT) public: - AudioDevice(AudioDeviceType t, AudioEngine *engine, QObject *parent = 0); + AudioDevice(AudioDeviceType t, AudioEngine *engine, QObject *parent = nullptr); ~AudioDevice(); // the volume can range from 0 to 100. diff -Nru lxqt-panel-0.14.1/plugin-volume/audioengine.h lxqt-panel-0.16.1/plugin-volume/audioengine.h --- lxqt-panel-0.14.1/plugin-volume/audioengine.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/audioengine.h 2020-11-05 16:09:19.000000000 +0000 @@ -39,7 +39,7 @@ Q_OBJECT public: - AudioEngine(QObject *parent = 0); + AudioEngine(QObject *parent = nullptr); ~AudioEngine(); const QList &sinks() const { return m_sinks; } diff -Nru lxqt-panel-0.14.1/plugin-volume/lxqtvolumeconfiguration.cpp lxqt-panel-0.16.1/plugin-volume/lxqtvolumeconfiguration.cpp --- lxqt-panel-0.14.1/plugin-volume/lxqtvolumeconfiguration.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/lxqtvolumeconfiguration.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -48,6 +48,7 @@ connect(ui->stepSpinBox, SIGNAL(valueChanged(int)), this, SLOT(stepSpinBoxChanged(int))); connect(ui->ignoreMaxVolumeCheckBox, SIGNAL(toggled(bool)), this, SLOT(ignoreMaxVolumeCheckBoxChanged(bool))); connect(ui->allwaysShowNotificationsCheckBox, &QAbstractButton::toggled, this, &LXQtVolumeConfiguration::allwaysShowNotificationsCheckBoxChanged); + connect(ui->showKeyboardNotificationsCheckBox, &QAbstractButton::toggled, this, &LXQtVolumeConfiguration::showKeyboardNotificationsCheckBoxChanged); // currently, this option is only supported by the pulse audio backend @@ -79,7 +80,7 @@ void LXQtVolumeConfiguration::setSinkList(const QList sinks) { // preserve the current index, as we change the list - int tmp_index = settings().value(SETTINGS_DEVICE, SETTINGS_DEFAULT_DEVICE).toInt(); + int tmp_index = settings().value(QStringLiteral(SETTINGS_DEVICE), SETTINGS_DEFAULT_DEVICE).toInt(); const bool old_block = ui->devAddedCombo->blockSignals(true); ui->devAddedCombo->clear(); @@ -100,67 +101,90 @@ bool canIgnoreMaxVolume = false; if (ui->pulseAudioRadioButton->isChecked()) { - settings().setValue(SETTINGS_AUDIO_ENGINE, "PulseAudio"); + settings().setValue(QStringLiteral(SETTINGS_AUDIO_ENGINE), QStringLiteral("PulseAudio")); canIgnoreMaxVolume = true; } else if(ui->alsaRadioButton->isChecked()) - settings().setValue(SETTINGS_AUDIO_ENGINE, "Alsa"); + settings().setValue(QStringLiteral(SETTINGS_AUDIO_ENGINE), QStringLiteral("Alsa")); else - settings().setValue(SETTINGS_AUDIO_ENGINE, "Oss"); + settings().setValue(QStringLiteral(SETTINGS_AUDIO_ENGINE), QStringLiteral("Oss")); ui->ignoreMaxVolumeCheckBox->setEnabled(canIgnoreMaxVolume); } void LXQtVolumeConfiguration::sinkSelectionChanged(int index) { - settings().setValue(SETTINGS_DEVICE, index >= 0 ? index : 0); + settings().setValue(QStringLiteral(SETTINGS_DEVICE), index >= 0 ? index : 0); } void LXQtVolumeConfiguration::showOnClickedChanged(bool state) { - settings().setValue(SETTINGS_SHOW_ON_LEFTCLICK, state); + settings().setValue(QStringLiteral(SETTINGS_SHOW_ON_LEFTCLICK), state); } void LXQtVolumeConfiguration::muteOnMiddleClickChanged(bool state) { - settings().setValue(SETTINGS_MUTE_ON_MIDDLECLICK, state); + settings().setValue(QStringLiteral(SETTINGS_MUTE_ON_MIDDLECLICK), state); } void LXQtVolumeConfiguration::mixerLineEditChanged(const QString &command) { - settings().setValue(SETTINGS_MIXER_COMMAND, command); + settings().setValue(QStringLiteral(SETTINGS_MIXER_COMMAND), command); } void LXQtVolumeConfiguration::stepSpinBoxChanged(int step) { - settings().setValue(SETTINGS_STEP, step); + settings().setValue(QStringLiteral(SETTINGS_STEP), step); } void LXQtVolumeConfiguration::ignoreMaxVolumeCheckBoxChanged(bool state) { - settings().setValue(SETTINGS_IGNORE_MAX_VOLUME, state); + settings().setValue(QStringLiteral(SETTINGS_IGNORE_MAX_VOLUME), state); } void LXQtVolumeConfiguration::allwaysShowNotificationsCheckBoxChanged(bool state) { - settings().setValue(SETTINGS_ALLWAYS_SHOW_NOTIFICATIONS, state); + settings().setValue(QStringLiteral(SETTINGS_ALLWAYS_SHOW_NOTIFICATIONS), state); + // since always showing notifications is the sufficient condition for showing them with keyboard, + // self-consistency requires setting the latter to true whenever the former is toggled by the user + ui->showKeyboardNotificationsCheckBox->setEnabled(!state); + if (!ui->showKeyboardNotificationsCheckBox->isChecked()) + ui->showKeyboardNotificationsCheckBox->setChecked(true); + else + settings().setValue(QStringLiteral(SETTINGS_SHOW_KEYBOARD_NOTIFICATIONS), true); } +void LXQtVolumeConfiguration::showKeyboardNotificationsCheckBoxChanged(bool state) +{ + settings().setValue(QStringLiteral(SETTINGS_SHOW_KEYBOARD_NOTIFICATIONS), state); +} + + void LXQtVolumeConfiguration::loadSettings() { - QString engine = settings().value(SETTINGS_AUDIO_ENGINE, SETTINGS_DEFAULT_AUDIO_ENGINE).toString().toLower(); - if (engine == "pulseaudio") + QString engine = settings().value(QStringLiteral(SETTINGS_AUDIO_ENGINE), QStringLiteral(SETTINGS_DEFAULT_AUDIO_ENGINE)).toString().toLower(); + if (engine == QLatin1String("pulseaudio")) ui->pulseAudioRadioButton->setChecked(true); - else if (engine == "alsa") + else if (engine == QLatin1String("alsa")) ui->alsaRadioButton->setChecked(true); else ui->ossRadioButton->setChecked(true); - setComboboxIndexByData(ui->devAddedCombo, settings().value(SETTINGS_DEVICE, SETTINGS_DEFAULT_DEVICE), 1); - ui->showOnClickCheckBox->setChecked(settings().value(SETTINGS_SHOW_ON_LEFTCLICK, SETTINGS_DEFAULT_SHOW_ON_LEFTCLICK).toBool()); - ui->muteOnMiddleClickCheckBox->setChecked(settings().value(SETTINGS_MUTE_ON_MIDDLECLICK, SETTINGS_DEFAULT_MUTE_ON_MIDDLECLICK).toBool()); - ui->mixerLineEdit->setText(settings().value(SETTINGS_MIXER_COMMAND, SETTINGS_DEFAULT_MIXER_COMMAND).toString()); - ui->stepSpinBox->setValue(settings().value(SETTINGS_STEP, SETTINGS_DEFAULT_STEP).toInt()); - ui->ignoreMaxVolumeCheckBox->setChecked(settings().value(SETTINGS_IGNORE_MAX_VOLUME, SETTINGS_DEFAULT_IGNORE_MAX_VOLUME).toBool()); - ui->allwaysShowNotificationsCheckBox->setChecked(settings().value(SETTINGS_ALLWAYS_SHOW_NOTIFICATIONS, SETTINGS_DEFAULT_ALLWAYS_SHOW_NOTIFICATIONS).toBool()); + setComboboxIndexByData(ui->devAddedCombo, settings().value(QStringLiteral(SETTINGS_DEVICE), SETTINGS_DEFAULT_DEVICE), 1); + ui->showOnClickCheckBox->setChecked(settings().value(QStringLiteral(SETTINGS_SHOW_ON_LEFTCLICK), SETTINGS_DEFAULT_SHOW_ON_LEFTCLICK).toBool()); + ui->muteOnMiddleClickCheckBox->setChecked(settings().value(QStringLiteral(SETTINGS_MUTE_ON_MIDDLECLICK), SETTINGS_DEFAULT_MUTE_ON_MIDDLECLICK).toBool()); + ui->mixerLineEdit->setText(settings().value(QStringLiteral(SETTINGS_MIXER_COMMAND), QStringLiteral(SETTINGS_DEFAULT_MIXER_COMMAND)).toString()); + ui->stepSpinBox->setValue(settings().value(QStringLiteral(SETTINGS_STEP), SETTINGS_DEFAULT_STEP).toInt()); + ui->ignoreMaxVolumeCheckBox->setChecked(settings().value(QStringLiteral(SETTINGS_IGNORE_MAX_VOLUME), SETTINGS_DEFAULT_IGNORE_MAX_VOLUME).toBool()); + ui->allwaysShowNotificationsCheckBox->setChecked(settings().value(QStringLiteral(SETTINGS_ALLWAYS_SHOW_NOTIFICATIONS), SETTINGS_DEFAULT_ALLWAYS_SHOW_NOTIFICATIONS).toBool()); + // always showing notifications is the sufficient condition for showing them with keyboard + if (ui->allwaysShowNotificationsCheckBox->isChecked()) + { + ui->showKeyboardNotificationsCheckBox->setChecked(true); + ui->showKeyboardNotificationsCheckBox->setEnabled(false); + } + else + { + ui->showKeyboardNotificationsCheckBox->setChecked(settings().value(QStringLiteral(SETTINGS_SHOW_KEYBOARD_NOTIFICATIONS), SETTINGS_DEFAULT_SHOW_KEYBOARD_NOTIFICATIONS).toBool()); + } } diff -Nru lxqt-panel-0.14.1/plugin-volume/lxqtvolumeconfiguration.h lxqt-panel-0.16.1/plugin-volume/lxqtvolumeconfiguration.h --- lxqt-panel-0.14.1/plugin-volume/lxqtvolumeconfiguration.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/lxqtvolumeconfiguration.h 2020-11-05 16:09:19.000000000 +0000 @@ -41,6 +41,7 @@ #define SETTINGS_IGNORE_MAX_VOLUME "ignoreMaxVolume" #define SETTINGS_AUDIO_ENGINE "audioEngine" #define SETTINGS_ALLWAYS_SHOW_NOTIFICATIONS "allwaysShowNotifications" +#define SETTINGS_SHOW_KEYBOARD_NOTIFICATIONS "showKeyboardNotifications" #define SETTINGS_DEFAULT_SHOW_ON_LEFTCLICK true #define SETTINGS_DEFAULT_MUTE_ON_MIDDLECLICK true @@ -59,6 +60,7 @@ #define SETTINGS_DEFAULT_IGNORE_MAX_VOLUME false #define SETTINGS_DEFAULT_IGNORE_MAX_VOLUME false #define SETTINGS_DEFAULT_ALLWAYS_SHOW_NOTIFICATIONS false +#define SETTINGS_DEFAULT_SHOW_KEYBOARD_NOTIFICATIONS true class AudioDevice; @@ -84,6 +86,7 @@ void stepSpinBoxChanged(int step); void ignoreMaxVolumeCheckBoxChanged(bool state); void allwaysShowNotificationsCheckBoxChanged(bool state); + void showKeyboardNotificationsCheckBoxChanged(bool state); protected slots: virtual void loadSettings(); diff -Nru lxqt-panel-0.14.1/plugin-volume/lxqtvolumeconfiguration.ui lxqt-panel-0.16.1/plugin-volume/lxqtvolumeconfiguration.ui --- lxqt-panel-0.14.1/plugin-volume/lxqtvolumeconfiguration.ui 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/lxqtvolumeconfiguration.ui 2020-11-05 16:09:19.000000000 +0000 @@ -86,6 +86,13 @@ + + + Notify about volume changes with keyboard + + + + diff -Nru lxqt-panel-0.14.1/plugin-volume/lxqtvolume.cpp lxqt-panel-0.16.1/plugin-volume/lxqtvolume.cpp --- lxqt-panel-0.14.1/plugin-volume/lxqtvolume.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/lxqtvolume.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -54,25 +54,26 @@ m_engine(0), m_defaultSinkIndex(0), m_defaultSink(0), - m_allwaysShowNotifications(SETTINGS_DEFAULT_ALLWAYS_SHOW_NOTIFICATIONS) + m_allwaysShowNotifications(SETTINGS_DEFAULT_ALLWAYS_SHOW_NOTIFICATIONS), + m_showKeyboardNotifications(SETTINGS_DEFAULT_SHOW_KEYBOARD_NOTIFICATIONS) { m_volumeButton = new VolumeButton(this); - m_notification = new LXQt::Notification("", this); + m_notification = new LXQt::Notification(QLatin1String(""), this); - m_keyVolumeUp = GlobalKeyShortcut::Client::instance()->addAction(QString(), QString("/panel/%1/up").arg(settings()->group()), tr("Increase sound volume"), this); + m_keyVolumeUp = GlobalKeyShortcut::Client::instance()->addAction(QString(), QStringLiteral("/panel/%1/up").arg(settings()->group()), tr("Increase sound volume"), this); if (m_keyVolumeUp) { connect(m_keyVolumeUp, &GlobalKeyShortcut::Action::registrationFinished, this, &LXQtVolume::shortcutRegistered); connect(m_keyVolumeUp, SIGNAL(activated()), this, SLOT(handleShortcutVolumeUp())); } - m_keyVolumeDown = GlobalKeyShortcut::Client::instance()->addAction(QString(), QString("/panel/%1/down").arg(settings()->group()), tr("Decrease sound volume"), this); + m_keyVolumeDown = GlobalKeyShortcut::Client::instance()->addAction(QString(), QStringLiteral("/panel/%1/down").arg(settings()->group()), tr("Decrease sound volume"), this); if (m_keyVolumeDown) { connect(m_keyVolumeDown, &GlobalKeyShortcut::Action::registrationFinished, this, &LXQtVolume::shortcutRegistered); connect(m_keyVolumeDown, SIGNAL(activated()), this, SLOT(handleShortcutVolumeDown())); } - m_keyMuteToggle = GlobalKeyShortcut::Client::instance()->addAction(QString(), QString("/panel/%1/mute").arg(settings()->group()), tr("Mute/unmute sound volume"), this); + m_keyMuteToggle = GlobalKeyShortcut::Client::instance()->addAction(QString(), QStringLiteral("/panel/%1/mute").arg(settings()->group()), tr("Mute/unmute sound volume"), this); if (m_keyMuteToggle) { connect(m_keyMuteToggle, &GlobalKeyShortcut::Action::registrationFinished, this, &LXQtVolume::shortcutRegistered); @@ -99,10 +100,10 @@ if (m_keyVolumeUp->shortcut().isEmpty()) { - m_keyVolumeUp->changeShortcut(DEFAULT_UP_SHORTCUT); + m_keyVolumeUp->changeShortcut(QStringLiteral(DEFAULT_UP_SHORTCUT)); if (m_keyVolumeUp->shortcut().isEmpty()) { - shortcutNotRegistered = " '" DEFAULT_UP_SHORTCUT "'"; + shortcutNotRegistered = QStringLiteral(" '") + QStringLiteral(DEFAULT_UP_SHORTCUT) + QStringLiteral("'"); } } } else if (shortcut == m_keyVolumeDown) @@ -111,10 +112,10 @@ if (m_keyVolumeDown->shortcut().isEmpty()) { - m_keyVolumeDown->changeShortcut(DEFAULT_DOWN_SHORTCUT); + m_keyVolumeDown->changeShortcut(QStringLiteral(DEFAULT_DOWN_SHORTCUT)); if (m_keyVolumeDown->shortcut().isEmpty()) { - shortcutNotRegistered += " '" DEFAULT_DOWN_SHORTCUT "'"; + shortcutNotRegistered += QStringLiteral(" '") + QStringLiteral(DEFAULT_DOWN_SHORTCUT) + QStringLiteral("'"); } } } else if (shortcut == m_keyMuteToggle) @@ -123,10 +124,10 @@ if (m_keyMuteToggle->shortcut().isEmpty()) { - m_keyMuteToggle->changeShortcut(DEFAULT_MUTE_SHORTCUT); + m_keyMuteToggle->changeShortcut(QStringLiteral(DEFAULT_MUTE_SHORTCUT)); if (m_keyMuteToggle->shortcut().isEmpty()) { - shortcutNotRegistered += " '" DEFAULT_MUTE_SHORTCUT "'"; + shortcutNotRegistered += QStringLiteral(" '") + QStringLiteral(DEFAULT_MUTE_SHORTCUT) + QStringLiteral("'"); } } } @@ -169,8 +170,8 @@ void LXQtVolume::settingsChanged() { - m_defaultSinkIndex = settings()->value(SETTINGS_DEVICE, SETTINGS_DEFAULT_DEVICE).toInt(); - QString engineName = settings()->value(SETTINGS_AUDIO_ENGINE, SETTINGS_DEFAULT_AUDIO_ENGINE).toString(); + m_defaultSinkIndex = settings()->value(QStringLiteral(SETTINGS_DEVICE), SETTINGS_DEFAULT_DEVICE).toInt(); + QString engineName = settings()->value(QStringLiteral(SETTINGS_AUDIO_ENGINE), QStringLiteral(SETTINGS_DEFAULT_AUDIO_ENGINE)).toString(); const bool new_engine = !m_engine || m_engine->backendName() != engineName; if (new_engine) { #if defined(USE_PULSEAUDIO) && defined(USE_ALSA) @@ -196,11 +197,14 @@ #endif } - m_volumeButton->setShowOnClicked(settings()->value(SETTINGS_SHOW_ON_LEFTCLICK, SETTINGS_DEFAULT_SHOW_ON_LEFTCLICK).toBool()); - m_volumeButton->setMuteOnMiddleClick(settings()->value(SETTINGS_MUTE_ON_MIDDLECLICK, SETTINGS_DEFAULT_MUTE_ON_MIDDLECLICK).toBool()); - m_volumeButton->setMixerCommand(settings()->value(SETTINGS_MIXER_COMMAND, SETTINGS_DEFAULT_MIXER_COMMAND).toString()); - m_volumeButton->volumePopup()->setSliderStep(settings()->value(SETTINGS_STEP, SETTINGS_DEFAULT_STEP).toInt()); - m_allwaysShowNotifications = settings()->value(SETTINGS_ALLWAYS_SHOW_NOTIFICATIONS, SETTINGS_DEFAULT_ALLWAYS_SHOW_NOTIFICATIONS).toBool(); + m_volumeButton->setShowOnClicked(settings()->value(QStringLiteral(SETTINGS_SHOW_ON_LEFTCLICK), SETTINGS_DEFAULT_SHOW_ON_LEFTCLICK).toBool()); + m_volumeButton->setMuteOnMiddleClick(settings()->value(QStringLiteral(SETTINGS_MUTE_ON_MIDDLECLICK), SETTINGS_DEFAULT_MUTE_ON_MIDDLECLICK).toBool()); + m_volumeButton->setMixerCommand(settings()->value(QStringLiteral(SETTINGS_MIXER_COMMAND), QStringLiteral(SETTINGS_DEFAULT_MIXER_COMMAND)).toString()); + m_volumeButton->volumePopup()->setSliderStep(settings()->value(QStringLiteral(SETTINGS_STEP), SETTINGS_DEFAULT_STEP).toInt()); + m_allwaysShowNotifications = settings()->value(QStringLiteral(SETTINGS_ALLWAYS_SHOW_NOTIFICATIONS), SETTINGS_DEFAULT_ALLWAYS_SHOW_NOTIFICATIONS).toBool(); + m_showKeyboardNotifications = settings()->value(QStringLiteral(SETTINGS_SHOW_KEYBOARD_NOTIFICATIONS), SETTINGS_DEFAULT_SHOW_KEYBOARD_NOTIFICATIONS).toBool() + // in case the config file was edited manually (see LXQtVolumeConfiguration) + || m_allwaysShowNotifications; if (!new_engine) handleSinkListChanged(); @@ -217,7 +221,7 @@ connect(m_defaultSink, &AudioDevice::volumeChanged, this, [this] { LXQtVolume::showNotification(false); }); connect(m_defaultSink, &AudioDevice::muteChanged, this, [this] { LXQtVolume::showNotification(false); }); - m_engine->setIgnoreMaxVolume(settings()->value(SETTINGS_IGNORE_MAX_VOLUME, SETTINGS_DEFAULT_IGNORE_MAX_VOLUME).toBool()); + m_engine->setIgnoreMaxVolume(settings()->value(QStringLiteral(SETTINGS_IGNORE_MAX_VOLUME), SETTINGS_DEFAULT_IGNORE_MAX_VOLUME).toBool()); } if (m_configDialog) @@ -229,7 +233,7 @@ { if (m_defaultSink) { - m_defaultSink->setVolume(m_defaultSink->volume() + settings()->value(SETTINGS_STEP, SETTINGS_DEFAULT_STEP).toInt()); + m_defaultSink->setVolume(m_defaultSink->volume() + settings()->value(QStringLiteral(SETTINGS_STEP), SETTINGS_DEFAULT_STEP).toInt()); showNotification(true); } } @@ -238,7 +242,7 @@ { if (m_defaultSink) { - m_defaultSink->setVolume(m_defaultSink->volume() - settings()->value(SETTINGS_STEP, SETTINGS_DEFAULT_STEP).toInt()); + m_defaultSink->setVolume(m_defaultSink->volume() - settings()->value(QStringLiteral(SETTINGS_STEP), SETTINGS_DEFAULT_STEP).toInt()); showNotification(true); } } @@ -279,11 +283,12 @@ void LXQtVolume::showNotification(bool forceShow) const { - if (forceShow || m_allwaysShowNotifications) + if ((forceShow && m_showKeyboardNotifications) // force only if volume change should be notified with keyboard + || m_allwaysShowNotifications) { if (Q_LIKELY(m_defaultSink)) { - m_notification->setSummary(tr("Volume: %1%%2").arg(QString::number(m_defaultSink->volume())).arg(m_defaultSink->mute() ? tr("(muted)") : "")); + m_notification->setSummary(tr("Volume: %1%%2").arg(QString::number(m_defaultSink->volume())).arg(m_defaultSink->mute() ? tr("(muted)") : QLatin1String(""))); m_notification->update(); } } diff -Nru lxqt-panel-0.14.1/plugin-volume/lxqtvolume.h lxqt-panel-0.16.1/plugin-volume/lxqtvolume.h --- lxqt-panel-0.14.1/plugin-volume/lxqtvolume.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/lxqtvolume.h 2020-11-05 16:09:19.000000000 +0000 @@ -54,7 +54,7 @@ ~LXQtVolume(); virtual QWidget *widget(); - virtual QString themeId() const { return "Volume"; } + virtual QString themeId() const { return QStringLiteral("Volume"); } virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog ; } void realign(); QDialog *configureDialog(); @@ -80,6 +80,7 @@ LXQt::Notification *m_notification; QPointer m_configDialog; bool m_allwaysShowNotifications; + bool m_showKeyboardNotifications; }; diff -Nru lxqt-panel-0.14.1/plugin-volume/ossengine.cpp lxqt-panel-0.16.1/plugin-volume/ossengine.cpp --- lxqt-panel-0.14.1/plugin-volume/ossengine.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/ossengine.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -47,7 +47,7 @@ OssEngine::OssEngine(QObject *parent) : AudioEngine(parent), m_mixer(-1), - m_device(NULL), + m_device(nullptr), m_leftVolume(0), m_rightVolume(0) { @@ -70,9 +70,9 @@ qDebug() << "InitMixer:" << m_mixer; m_device = new AudioDevice(Sink, this); - m_device->setName("Master"); + m_device->setName(QStringLiteral("Master")); m_device->setIndex(0); - m_device->setDescription("Master Volume"); + m_device->setDescription(QStringLiteral("Master Volume")); m_device->setMuteNoCommit(false); updateVolume(); @@ -113,7 +113,7 @@ setVolume(device->volume()); } -void OssEngine::setMute(AudioDevice *device, bool state) +void OssEngine::setMute(AudioDevice * /*device*/, bool state) { if(state) setVolume(0); @@ -121,7 +121,7 @@ setVolume(m_leftVolume); } -void OssEngine::setIgnoreMaxVolume(bool ignore) +void OssEngine::setIgnoreMaxVolume(bool /*ignore*/) { // TODO } diff -Nru lxqt-panel-0.14.1/plugin-volume/ossengine.h lxqt-panel-0.16.1/plugin-volume/ossengine.h --- lxqt-panel-0.14.1/plugin-volume/ossengine.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/ossengine.h 2020-11-05 16:09:19.000000000 +0000 @@ -41,7 +41,7 @@ Q_OBJECT public: - OssEngine(QObject *parent = 0); + OssEngine(QObject *parent = nullptr); ~OssEngine(); virtual const QString backendName() const { return QLatin1String("Oss"); } diff -Nru lxqt-panel-0.14.1/plugin-volume/pulseaudioengine.cpp lxqt-panel-0.16.1/plugin-volume/pulseaudioengine.cpp --- lxqt-panel-0.14.1/plugin-volume/pulseaudioengine.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/pulseaudioengine.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -38,14 +38,14 @@ { PulseAudioEngine *pulseEngine = static_cast(userdata); QMap stateMap; - stateMap[PA_SINK_INVALID_STATE] = "n/a"; - stateMap[PA_SINK_RUNNING] = "RUNNING"; - stateMap[PA_SINK_IDLE] = "IDLE"; - stateMap[PA_SINK_SUSPENDED] = "SUSPENDED"; + stateMap[PA_SINK_INVALID_STATE] = QLatin1String("n/a"); + stateMap[PA_SINK_RUNNING] = QLatin1String("RUNNING"); + stateMap[PA_SINK_IDLE] = QLatin1String("IDLE"); + stateMap[PA_SINK_SUSPENDED] = QLatin1String("SUSPENDED"); if (isLast < 0) { pa_threaded_mainloop_signal(pulseEngine->mainloop(), 0); - qWarning() << QString("Failed to get sink information: %1").arg(pa_strerror(pa_context_errno(context))); + qWarning() << QStringLiteral("Failed to get sink information: %1").arg(QString::fromUtf8(pa_strerror(pa_context_errno(context)))); return; } @@ -57,7 +57,11 @@ pulseEngine->addOrUpdateSink(info); } -static void contextEventCallback(pa_context *context, const char *name, pa_proplist *p, void *userdata) +static void contextEventCallback(pa_context * /*context*/, const char * +#ifdef PULSEAUDIO_ENGINE_DEBUG + name +#endif + , pa_proplist * /*p*/, void * /*userdata*/) { #ifdef PULSEAUDIO_ENGINE_DEBUG qWarning("event received %s", name); @@ -113,7 +117,7 @@ pa_threaded_mainloop_signal(pulseEngine->mainloop(), 0); } -static void contextSubscriptionCallback(pa_context *context, pa_subscription_event_type_t t, uint32_t idx, void *userdata) +static void contextSubscriptionCallback(pa_context * /*context*/, pa_subscription_event_type_t t, uint32_t idx, void *userdata) { PulseAudioEngine *pulseEngine = reinterpret_cast(userdata); if (PA_SUBSCRIPTION_EVENT_REMOVE == t) @@ -323,7 +327,7 @@ return; } - if (pa_context_connect(m_context, NULL, (pa_context_flags_t)0, NULL) < 0) { + if (pa_context_connect(m_context, nullptr, (pa_context_flags_t)0, nullptr) < 0) { pa_threaded_mainloop_unlock(m_mainLoop); m_reconnectionTimer.start(); return; @@ -347,7 +351,7 @@ case PA_CONTEXT_FAILED: default: - qWarning() << QString("Connection failure: %1").arg(pa_strerror(pa_context_errno(m_context))); + qWarning() << QStringLiteral("Connection failure: %1").arg(QString::fromUtf8(pa_strerror(pa_context_errno(m_context)))); keepGoing = false; } diff -Nru lxqt-panel-0.14.1/plugin-volume/pulseaudioengine.h lxqt-panel-0.16.1/plugin-volume/pulseaudioengine.h --- lxqt-panel-0.14.1/plugin-volume/pulseaudioengine.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/pulseaudioengine.h 2020-11-05 16:09:19.000000000 +0000 @@ -49,7 +49,7 @@ Q_OBJECT public: - PulseAudioEngine(QObject *parent = 0); + PulseAudioEngine(QObject *parent = nullptr); ~PulseAudioEngine(); virtual const QString backendName() const { return QLatin1String("PulseAudio"); } diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_arn.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_arn.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_arn.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,118 @@ + + + + + LXQtVolume + + + Increase sound volume + + + + + Decrease sound volume + + + + + Mute/unmute sound volume + + + + + Volume Control: The following shortcuts can not be registered: %1 + + + + + Volume: %1%%2 + + + + + (muted) + + + + + LXQtVolumeConfiguration + + + Volume Control Settings + + + + + Device to control + + + + + ALSA + + + + + PulseAudio + + + + + OSS + + + + + Behavior + + + + + Mute on middle click + + + + + Show on mouse click + + + + + Allow volume beyond 100% (0dB) + + + + + Always notify about volume changes + + + + + Notify about volume changes with keyboard + + + + + Volume adjust step + + + + + External Mixer + + + + + VolumePopup + + + Launch mixer + + + + + Mi&xer + + + + diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_ar.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_ar.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_ar.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_ar.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume - زِد مستوى الصوت + ارفع مستوى الصوت - + Decrease sound volume - أنقِص مستوى الصوت + اخفض مستوى الصوت - + Mute/unmute sound volume اكتم/ألغِ كتم الصوت - + Volume Control: The following shortcuts can not be registered: %1 - التحكم بالصوت: تعذر تسجيل الاختصارات الآتية: %1 + التحكّم بالصوت: تعذّر تسجيل الاختصارات الآتية: %L1 - + Volume: %1%%2 - المستوى: %1٪%2 + المستوى: %L1٪%L2 - + (muted) (مكتوم) @@ -39,7 +39,7 @@ Volume Control Settings - إعدادات التحكم بالصوت + إعدادات التحكّم بالصوت @@ -49,7 +49,7 @@ ALSA - + ALSA @@ -74,25 +74,30 @@ Show on mouse click - اعر بالنقر بالوسط + اعرض بالنقر بالوسط Allow volume beyond 100% (0dB) - اسمح بارتفاع المستوى عن ١٠٠٪ (٠ديسيبيل) + اسمح بارتفاع المستوى على ١٠٠٪ (٠ديسيبيل) Always notify about volume changes - أخطِرني دوما بتغييرات مستوى الصوت + أخطِرني دومًا بتغييرات مستوى الصوت - + + Notify about volume changes with keyboard + أخطِرني بتغييرات مستوى الصوت باستعمال لوحة المفاتيح + + + Volume adjust step عتبة ضبط المستوى - + External Mixer المازج الخارجي @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer أطلِق المازج - + Mi&xer ال&مازج diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_ast.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_ast.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_ast.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_ast.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,118 @@ + + + + + LXQtVolume + + + Increase sound volume + + + + + Decrease sound volume + + + + + Mute/unmute sound volume + + + + + Volume Control: The following shortcuts can not be registered: %1 + + + + + Volume: %1%%2 + + + + + (muted) + + + + + LXQtVolumeConfiguration + + + Volume Control Settings + + + + + Device to control + + + + + ALSA + + + + + PulseAudio + + + + + OSS + + + + + Behavior + + + + + Mute on middle click + + + + + Show on mouse click + + + + + Allow volume beyond 100% (0dB) + + + + + Always notify about volume changes + + + + + Notify about volume changes with keyboard + + + + + Volume adjust step + + + + + External Mixer + + + + + VolumePopup + + + Launch mixer + + + + + Mi&xer + + + + diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_ca.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_ca.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_ca.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_ca.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume Apuja el volum del so - + Decrease sound volume Abaixa el volum del so - + Mute/unmute sound volume Silencia o dessilencia el volum del so - + Volume Control: The following shortcuts can not be registered: %1 Control del volum: Les següents dreceres no es poden registrar: %1 - + Volume: %1%%2 Volum: %1%%2 - + (muted) (silenciat) @@ -87,12 +87,17 @@ Notifica sempre sobre els canvis de volum - + + Notify about volume changes with keyboard + + + + Volume adjust step Pas d'ajust del volum - + External Mixer Mesclador extern @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer Llança el mesclador - + Mi&xer Mes&clador diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_cs.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_cs.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_cs.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_cs.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume Zesílit zvuk - + Decrease sound volume Zeslabit zvuk - + Mute/unmute sound volume Ztlumit/zrušit ztlumení zvuku - + Volume Control: The following shortcuts can not be registered: %1 Ovládání hlasitosti: Následující klávesové zkratky nelze zaregistrovat: %1 - + Volume: %1%%2 Hlasitost: %1%%2 - + (muted) (ztlumeno) @@ -69,12 +69,12 @@ Mute on middle click - Ztlumit kliknutím prostředním tlačítkem + Ztlumit klepnutím prostředním tlačítkem Show on mouse click - Ukázat při kliknutí + Ukázat při klepnutí @@ -87,12 +87,17 @@ Vždy upozornit na změny hlasitosti - + + Notify about volume changes with keyboard + Oznamovat změny hlasitosti, provedené pomocí kláves + + + Volume adjust step Hlasitost měnit v krocích o velikosti - + External Mixer Externí směšovač @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer Spustit směšovač - + Mi&xer &Směšovač diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_cy.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_cy.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_cy.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_cy.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume - + Decrease sound volume - + Mute/unmute sound volume - + Volume Control: The following shortcuts can not be registered: %1 - + Volume: %1%%2 - + (muted) @@ -87,12 +87,17 @@ - + + Notify about volume changes with keyboard + + + + Volume adjust step - + External Mixer @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer - + Mi&xer diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_da.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_da.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_da.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_da.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume Højere lydstyrke - + Decrease sound volume Lavere lydstyrke - + Mute/unmute sound volume Lydløs til/fra - + Volume Control: The following shortcuts can not be registered: %1 Lydstyrkekontrol: følgende genveje kan ikke registreres: %1 - + Volume: %1%%2 Lydstyrke: %1%%2 - + (muted) (lydløst) @@ -84,15 +84,20 @@ Always notify about volume changes - Giv altid besked når lydstyrken ændres + Underret altid når lydstyrken ændres - + + Notify about volume changes with keyboard + Underret når lydstyrken ændres med tastaturet + + + Volume adjust step Trin for lydstyrkejustering - + External Mixer Ekstern mikser @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer Start mikser - + Mi&xer &Mikser diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_de.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_de.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_de.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_de.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume Lautstärke erhöhen - + Decrease sound volume Lautstärke verringern - + Mute/unmute sound volume Lautstärke stummschalten/wiederherstellen - + Volume Control: The following shortcuts can not be registered: %1 Lautstärkeregler: Die folgenden Tastaturkürzel konnten nicht registriert werden: %1 - + Volume: %1%%2 Lautstärke: %1%%2 - + (muted) (stumm) @@ -87,12 +87,17 @@ Immer über Änderungen der Lautstärke benachrichtigen - + + Notify about volume changes with keyboard + Benachrichtigung über Lautstärkeänderungen mit der Tastatur + + + Volume adjust step Lautstärkeschrittweite - + External Mixer Externer Mischer @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer Mischer starten - + Mi&xer &Mischer diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_el.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_el.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_el.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_el.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume Αύξηση της έντασης του ήχου - + Decrease sound volume Μείωση της έντασης του ήχου - + Mute/unmute sound volume Σίγαση/αποσίγαση της έντασης του ήχου - + Volume Control: The following shortcuts can not be registered: %1 Έλεγχος έντασης: Οι ακόλουθες συντομεύσεις δεν μπόρεσαν να καταχωρηθούν: %1 - + Volume: %1%%2 Ένταση: %1%%2 - + (muted) (χωρίς ήχο) @@ -87,12 +87,17 @@ Ειδοποίηση πάντα σε αλλαγές στην ένταση - + + Notify about volume changes with keyboard + Ειδοποίηση αλλαγών στην ένταση με το πληκτρολόγιο + + + Volume adjust step Βήμα προσαρμογής της έντασης - + External Mixer Εξωτερικός μίκτης @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer Εκτέλεση του μίκτη - + Mi&xer Μί&κτης diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_eo.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_eo.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_eo.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_eo.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume - + Decrease sound volume - + Mute/unmute sound volume - + Volume Control: The following shortcuts can not be registered: %1 - + Volume: %1%%2 - + (muted) @@ -87,12 +87,17 @@ - + + Notify about volume changes with keyboard + + + + Volume adjust step - + External Mixer @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer - + Mi&xer diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_es.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_es.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_es.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_es.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume Aumentar el volumen del sonido - + Decrease sound volume Reducir el volumen del sonido - + Mute/unmute sound volume Silenciar/No silenciar el volumen del sonido - + Volume Control: The following shortcuts can not be registered: %1 Control de volumen: los siguientes atajos no han podido registrarse: %1 - + Volume: %1%%2 Volumen: %1%%2 - + (muted) (silenciado) @@ -44,12 +44,12 @@ Device to control - Dispositivo de control + Dispositivo a controlar ALSA - + ALSA @@ -87,12 +87,17 @@ Notificar siempre los cambios de volumen - + + Notify about volume changes with keyboard + Notificar los cambios de volumen con el teclado + + + Volume adjust step Paso del ajuste de volumen - + External Mixer Mezclador externo @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer Ejecuta el mezclador - + Mi&xer &Mezclador diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_es_VE.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_es_VE.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_es_VE.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_es_VE.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume - + Decrease sound volume - + Mute/unmute sound volume - + Volume Control: The following shortcuts can not be registered: %1 - + Volume: %1%%2 - + (muted) @@ -87,12 +87,17 @@ - + + Notify about volume changes with keyboard + + + + Volume adjust step paso de ajuste de volumen - + External Mixer Mexclador @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer - + Mi&xer diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_eu.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_eu.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_eu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_eu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume - + Decrease sound volume - + Mute/unmute sound volume - + Volume Control: The following shortcuts can not be registered: %1 - + Volume: %1%%2 - + (muted) @@ -87,12 +87,17 @@ - + + Notify about volume changes with keyboard + + + + Volume adjust step Bolumen-doikuntzaren pausoa - + External Mixer Kanpoko nahastailea @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer - + Mi&xer diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_fi.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_fi.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_fi.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_fi.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,34 +4,34 @@ LXQtVolume - + Increase sound volume Suurenna äänenvoimakkuutta - + Decrease sound volume Pienennä äänenvoimakkuutta - + Mute/unmute sound volume - + Mykistä/poista mykistys - + Volume Control: The following shortcuts can not be registered: %1 - + Äänenvoimakkuuden hallinta: Seuraavia pikavalintoja ei voida rekisteröidä: %1 - + Volume: %1%%2 - + Äänenvoimakkuus: %1%%2 - + (muted) - + (mykistetty) @@ -39,7 +39,7 @@ Volume Control Settings - + Äänenvoimakkuuden hallinnan asetukset @@ -49,7 +49,7 @@ ALSA - + ALSA @@ -59,7 +59,7 @@ OSS - + OSS @@ -84,15 +84,20 @@ Always notify about volume changes - + Ilmoita aina äänenvoimakkuuden muutoksista - + + Notify about volume changes with keyboard + Ilmoita näppäimistöllä tehdystä äänenvoimakkuuden muutoksesta + + + Volume adjust step Äänenvoimakkuuden säätöväli - + External Mixer Ulkoinen mikseri @@ -100,14 +105,14 @@ VolumePopup - + Launch mixer Avaa mikseri - + Mi&xer - + Mikseri diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_fr.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_fr.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_fr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_fr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume Augmenter le son - + Decrease sound volume Diminuer le son - + Mute/unmute sound volume Désactiver/activer le son - + Volume Control: The following shortcuts can not be registered: %1 Contrôle du volume: les raccourcis suivants ne peuvent pas être enregistrés: %1 - + Volume: %1%%2 Volume: %1%%2 - + (muted) (muet) @@ -87,12 +87,17 @@ Toujours notifier les changements de volume - + + Notify about volume changes with keyboard + Notification lorsque le volume est changé avec un raccourci clavier + + + Volume adjust step Pas du réglage du volume - + External Mixer Mixer externe @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer Démarre le mixer - + Mi&xer Mi&xeur diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_gl.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_gl.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_gl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_gl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume Aumentar o volume do son - + Decrease sound volume Reducir o volume do son - + Mute/unmute sound volume Silenciar/activar o volume do son - + Volume Control: The following shortcuts can not be registered: %1 Control de volume: Non foi posíbel rexistrar os seguintes atallos: %1 - + Volume: %1%%2 - + (muted) (silenciado) @@ -87,12 +87,17 @@ Notificar sempre os cambios de volume - + + Notify about volume changes with keyboard + Notificar sobre os cambios de volume co teclado + + + Volume adjust step Paso do axuste do volume - + External Mixer Mesturador externo @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer Iniciar o mesturador - + Mi&xer &Mesturador diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_he.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_he.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_he.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_he.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume הגברת עצמת השמע - + Decrease sound volume הנמכת עצמת השמע - + Mute/unmute sound volume השתקה/השמעה של צלילים - + Volume Control: The following shortcuts can not be registered: %1 בקרת עצמת שמע: אין אפשרות לרשום את קיצורי הדרך הבאים: %1 - + Volume: %1%%2 עצמת שמע: %1%%2 - + (muted) (מושתק) @@ -49,7 +49,7 @@ ALSA - + ALSA @@ -87,12 +87,17 @@ תמיד להודיע על שינויים בעצמת השמע - + + Notify about volume changes with keyboard + להודיע על שינויי עצמת שמע עם המקלדת + + + Volume adjust step צעדי התאמת עצמת שמע - + External Mixer מערבל חיצוני @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer הפעלת מערבל - + Mi&xer מ&ערבל diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_hr.desktop lxqt-panel-0.16.1/plugin-volume/translations/volume_hr.desktop --- lxqt-panel-0.14.1/plugin-volume/translations/volume_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=Kontrola glasnoće +Comment[hr]=Kotroliraj glasnoću sustava i pokreni omiljeni mikser. diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_hr.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_hr.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_hr.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_hr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,118 @@ + + + + + LXQtVolume + + + Increase sound volume + Povećaj glasnoću + + + + Decrease sound volume + Smanji glasnoću + + + + Mute/unmute sound volume + Isključi/uključi glasnoću + + + + Volume Control: The following shortcuts can not be registered: %1 + Kontrola glasnoće: Nije moguće registrirati sljedeće prečace: %1 + + + + Volume: %1%%2 + Glasnoća: %1 % %2 + + + + (muted) + (zvuk isključen) + + + + LXQtVolumeConfiguration + + + Volume Control Settings + Kontrola glasnoće – Postavke + + + + Device to control + Uređaj za kontrolu + + + + ALSA + ALSA + + + + PulseAudio + PulseAudio + + + + OSS + OSS + + + + Behavior + Ponašanje + + + + Mute on middle click + Isključi zvuk pritiskom srednjeg gumba miša + + + + Show on mouse click + Prikaži pri pritisku miša + + + + Allow volume beyond 100% (0dB) + Dozvoli glasnoću iznad 100 % (0 dB) + + + + Always notify about volume changes + Uvijek obavijesti o promjenama glasnoće + + + + Notify about volume changes with keyboard + Obavijesti o promjenama glasnoće s tipkovnicom + + + + Volume adjust step + Korak prilagođavanja glasnoće + + + + External Mixer + Vanjski mikser + + + + VolumePopup + + + Launch mixer + Pokreni miksera + + + + Mi&xer + Mi&kser + + + diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_hu.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_hu.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_hu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_hu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,34 +4,34 @@ LXQtVolume - + Increase sound volume Hangosítás - + Decrease sound volume Halkítás - + Mute/unmute sound volume - Némítás/megszólaltatás + Némítás/visszahangosítás - + Volume Control: The following shortcuts can not be registered: %1 - Hangerőszabályozó: A %1 gyorsbillentyű regisztrálhatatlan + Hangerőszabályzó: A %1 gyorsbillentyű nincs beállítva - + Volume: %1%%2 - Hangerő: %1% {1%%2?} + Hangerő: %1%%2 - + (muted) - + (némítva) @@ -39,7 +39,7 @@ Volume Control Settings - Hangszabályzó beállítás + Hangerőszabályzó beállítások @@ -49,7 +49,7 @@ ALSA - + ALSA @@ -69,12 +69,12 @@ Mute on middle click - Középkattintásra némul + Némítás középső kattintásra Show on mouse click - Egérkattintásra látszik + Megnyitás csak kattintásra @@ -84,15 +84,20 @@ Always notify about volume changes - A hangerőváltozásról mindig értesít + Hangerőváltoztatásnál mindig értesítsen - + + Notify about volume changes with keyboard + Értesítés amikor a billentyűzetről változtatja a hangerőt + + + Volume adjust step Lépésköz - + External Mixer Külső keverő @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer - Keverő futtatása + Keverő indítása - + Mi&xer Ke&verő diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_id.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_id.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_id.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_id.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume Naikkan volume suara - + Decrease sound volume Turunkan volume suara - + Mute/unmute sound volume Bisukan/hidupkan volume suara - + Volume Control: The following shortcuts can not be registered: %1 Kontrol Volume: Pintasan berikut ini tidak dapat didaftarkan: %1 - + Volume: %1%%2 Volume: %1%%2 - + (muted) (bisu) @@ -87,12 +87,17 @@ Selalu beritahu tentang perubahan volume - + + Notify about volume changes with keyboard + + + + Volume adjust step Langkah menyesuaikan volume - + External Mixer Mikser Eksternal @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer Luncurkan mikser - + Mi&xer Mikser diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_it.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_it.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_it.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_it.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume Aumenta il volume - + Decrease sound volume Riduci il volume - + Mute/unmute sound volume Silenzia/rimuovi silenzio per il volume - + Volume Control: The following shortcuts can not be registered: %1 Controllo volume: la scorciatoia globale '%1' non può essere registrata - + Volume: %1%%2 Volume: %1%%2 - + (muted) (silenziato) @@ -87,12 +87,17 @@ Notifica sempre i cambiamenti di volume - + + Notify about volume changes with keyboard + Notifica cambio volume da tastiera + + + Volume adjust step Passo di regolazione del volume - + External Mixer Mixer esterno @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer Avvia mixer - + Mi&xer Mi&xer diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_ja.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_ja.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_ja.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_ja.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,34 +4,34 @@ LXQtVolume - + Increase sound volume 音量を上げる - + Decrease sound volume 音量を下げる - + Mute/unmute sound volume ミュート/解除 - + Volume Control: The following shortcuts can not be registered: %1 - 音量制御: このショートカットは登録することができません: %1 + 音量調節: このショートカットは登録することができません: %1 - + Volume: %1%%2 - 音量: %1% {1%%2?} + 音量: %1%%2 - + (muted) - + (消音) @@ -39,7 +39,7 @@ Volume Control Settings - 音量制御の設定 + 音量調節の設定 @@ -49,7 +49,7 @@ ALSA - + ALSA @@ -64,7 +64,7 @@ Behavior - 挙動 + 動作 @@ -74,12 +74,12 @@ Show on mouse click - マウスのクリックで表示 + マウスのクリックで表示する Allow volume beyond 100% (0dB) - 100% (0dB)を超える音量を許可 + 100% (0dB) を超える音量を許可する @@ -87,12 +87,17 @@ 音量の変更時には常に通知する - + + Notify about volume changes with keyboard + キーボードでの音量変更を通知する + + + Volume adjust step 音量変更のステップ幅 - + External Mixer 外部ミキサー @@ -100,14 +105,14 @@ VolumePopup - + Launch mixer ミキサーを起動 - + Mi&xer - ミキサー(&x) + ミキサー(&X) diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_lt.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_lt.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_lt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_lt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume Pagarsinti - + Decrease sound volume Tildyti - + Mute/unmute sound volume Nutildyti/įjungti garsį - + Volume Control: The following shortcuts can not be registered: %1 Garsio reguliavimas: Šie spartieji klavišai negali būti užregistruoti: %1 - + Volume: %1%%2 Garsis: %1%%2 - + (muted) (nutildyta) @@ -87,12 +87,17 @@ Visada pranešti apie garsio pakeitimus - + + Notify about volume changes with keyboard + Pranešti apie klaviatūra atliktus garsio pakeitimus + + + Volume adjust step Garsio reguliavimo žingsnis - + External Mixer Išorinis maišiklis @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer Paleisti maišiklį - + Mi&xer Maiši&klis diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_nb_NO.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_nb_NO.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_nb_NO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_nb_NO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume Øk lydvolum - + Decrease sound volume Senk lydvolum - + Mute/unmute sound volume Skru av eller på lydvolum - + Volume Control: The following shortcuts can not be registered: %1 - Volumkontroll: Den følgende tastaturkommandoen kan ikke registreres: %1 + Volumkontroll: Den følgende tastatursnareveien kan ikke registreres: %1 - + Volume: %1%%2 Volum: %1%%2 - + (muted) (skrudd av) @@ -87,12 +87,17 @@ Alltid gi beskjed om volumforandringer - + + Notify about volume changes with keyboard + Gi varsel om volumforandringer fra tastaturet + + + Volume adjust step Volumjusteringssteg - + External Mixer Ekstern mikser @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer Åpne mikser - + Mi&xer Mi&kser diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_nl.desktop lxqt-panel-0.16.1/plugin-volume/translations/volume_nl.desktop --- lxqt-panel-0.14.1/plugin-volume/translations/volume_nl.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_nl.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[nl]=Volume +Comment[nl]=Het volume van de luidsprekers instellen. diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_nl.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_nl.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_nl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_nl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume - Geluidssterkte verhogen + Verhoog volume - + Decrease sound volume - Geluidssterkte verlagen + Verlaag volume - + Mute/unmute sound volume - Demp/ontdemp de geluidssterkte + Demp/ontdemp geluid - + Volume Control: The following shortcuts can not be registered: %1 - Geluidssterktebeheer: de volgende sneltoetsen kunnen niet worden geregistreerd: %1 + Volume: de volgende sneltoetsen kunnen niet worden geregistreerd: %1 - + Volume: %1%%2 - Geluidssterkte: %1%%2 + Volume: %1%%2 - + (muted) (gedempt) @@ -39,7 +39,7 @@ Volume Control Settings - Instellingen van geluidssterktebeheer + Instellingen Volume @@ -49,7 +49,7 @@ ALSA - + ALSA @@ -69,7 +69,7 @@ Mute on middle click - Dempen bij middelklik + Demp bij middelklik @@ -79,20 +79,25 @@ Allow volume beyond 100% (0dB) - Sta geluidssterktes toe boven 100% (0dB) + Sta volumes toe boven 100% (0dB) Always notify about volume changes - Wijzigingen in geluidssterkte altijd melden + Wijzigingen in volume altijd melden - + + Notify about volume changes with keyboard + Wijzigingen in volume vanaf toetsenbord altijd melden + + + Volume adjust step - Bijstellingsstappen voor geluidssterkte + Stapgrootte voor volumeverandering - + External Mixer Extern mengpaneel @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer - Mengpaneel starten + Start mengpaneel - + Mi&xer &Mengpaneel diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_pl.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_pl.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_pl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_pl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume Zwiększ głośność dźwięku - + Decrease sound volume Zmniejsz głośność dźwięku - + Mute/unmute sound volume Wycisz/cofnij wyciszenie dźwięku - + Volume Control: The following shortcuts can not be registered: %1 Kontrola głośności: Nie można zarejestrować następujących skrótów klawiszowych: %1 - + Volume: %1%%2 Głośność: %1%%2 - + (muted) (wyciszony) @@ -87,12 +87,17 @@ Zawsze informuj o zmianie głośności - + + Notify about volume changes with keyboard + Powiadamiaj o zmianie głośności skrótem klawiszowym + + + Volume adjust step Rozmiar kroku przy zmianie głośności - + External Mixer Zewnętrzny mikser @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer Uruchom mikser - + Mi&xer Mi&kser diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_pt_BR.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_pt_BR.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_pt_BR.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_pt_BR.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume Aumentar volume - + Decrease sound volume Diminuir volume - + Mute/unmute sound volume Ativar/desativar som - + Volume Control: The following shortcuts can not be registered: %1 Controle de Volume: Os seguintes atalhos não podem ser registrados: %1 - + Volume: %1%%2 Volume: %1%%2 - + (muted) (mudo) @@ -54,7 +54,7 @@ PulseAudio - + Pulseaudio @@ -87,27 +87,32 @@ Sempre notificar sobre alterações de volume - + + Notify about volume changes with keyboard + Notificar sobre alterações de volume com o teclado + + + Volume adjust step Passos de ajuste do volume - + External Mixer - Mixer externo + Mixador externo VolumePopup - + Launch mixer - Executar Mixer + Executar Mixador - + Mi&xer - Mi&xer + Mi&xador diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_pt.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_pt.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_pt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_pt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume Aumentar volume - + Decrease sound volume Diminuir volume - + Mute/unmute sound volume Silenciar/restaurar volume - + Volume Control: The following shortcuts can not be registered: %1 Controlo de volume: os seguintes atalhos não foram registados: %1 - + Volume: %1%%2 Volume: %1%%2 - + (muted) (sem som) @@ -87,12 +87,17 @@ Notificar sempre sobre a alteração de volume - + + Notify about volume changes with keyboard + Notificar sobre as alterações de volume com o teclado + + + Volume adjust step Nível de ajuste do volume - + External Mixer Gestor de som externo @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer Iniciar gestor de som - + Mi&xer &Gestor de som diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_ro_RO.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_ro_RO.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_ro_RO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_ro_RO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume Mărește volumul sunetului - + Decrease sound volume Micșorează volumul sunetului - + Mute/unmute sound volume - + Volume Control: The following shortcuts can not be registered: %1 Controlul volumului de sunet: Următoarele scurtături nu pot fi înregistrate: %1 - + Volume: %1%%2 Volum de sunet: %1%%2 - + (muted) @@ -87,12 +87,17 @@ Notifica întotdeauna schimbările de volum de sunet - + + Notify about volume changes with keyboard + + + + Volume adjust step Pasul de ajustare a volumului de sunet - + External Mixer Mixer extern @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer Pornește mixerul de sunet - + Mi&xer Mixer de sunet diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_ru.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_ru.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_ru.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_ru.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume Увеличить громкость звука - + Decrease sound volume Уменьшить громкость звука - + Mute/unmute sound volume Выкл/вкл звук - + Volume Control: The following shortcuts can not be registered: %1 Контроль громкости: следующие сочетания клавиш не могут быть зарегистрированы: %1 - + Volume: %1%%2 Громкость: %1%%2 - + (muted) (без звука) @@ -87,12 +87,17 @@ Всегда уведомлять об изменении громкости - + + Notify about volume changes with keyboard + Показывать уведомления о изменении громкости с клавиатуры + + + Volume adjust step Шаг регулировки громкости - + External Mixer Внешний микшер @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer Запустить микшер - + Mi&xer Ми&кшер diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_sk_SK.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_sk_SK.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_sk_SK.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_sk_SK.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,118 @@ + + + + + LXQtVolume + + + Increase sound volume + Zosilniť zvuk + + + + Decrease sound volume + Zoslabiť zvuk + + + + Mute/unmute sound volume + Stlmiť/zrušiť stlmenie zvuku + + + + Volume Control: The following shortcuts can not be registered: %1 + Ovládanie hlasitosti: Nie je možné zaregistrovať následujúce klávesové skratky: %1 + + + + Volume: %1%%2 + Hlasitosť: %1%%2 + + + + (muted) + (stlmené) + + + + LXQtVolumeConfiguration + + + Volume Control Settings + Nastavenie ovládania hlasitosti + + + + Device to control + Ovládanie zariadenia + + + + ALSA + ALSA + + + + PulseAudio + PulseAudio + + + + OSS + OSS + + + + Behavior + Správanie + + + + Mute on middle click + Stlmiť kliknutím na prostredné tlačítko + + + + Show on mouse click + Ukázať pri kliknutí + + + + Allow volume beyond 100% (0dB) + Umožniť nastavenie hlasitosti cez 100% (0 dB) + + + + Always notify about volume changes + Vždy upozorniť na zmenu hlasitosti + + + + Notify about volume changes with keyboard + Oznamovanie zmeny hlasitostí vykonanej pomocou klávesnice + + + + Volume adjust step + Hlasitosť meniť v krokoch o veľkosti + + + + External Mixer + Externý mixér + + + + VolumePopup + + + Launch mixer + Spustiť mixér + + + + Mi&xer + &Mixér + + + diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_sl.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_sl.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_sl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_sl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,34 +4,34 @@ LXQtVolume - + Increase sound volume - + Zvišaj glasnost - + Decrease sound volume - + Znižaj glasnost - + Mute/unmute sound volume - + Izklopi/vklopi zvok - + Volume Control: The following shortcuts can not be registered: %1 - + Nastavitev glasnosti: Sledeče bližnjice ne morejo biti registrirane: %1 - + Volume: %1%%2 - + Glasnost: %1%%2 - + (muted) - + (utišan) @@ -39,7 +39,7 @@ Volume Control Settings - + Nastavitve glasnosti @@ -49,7 +49,7 @@ ALSA - + ALSA @@ -59,7 +59,7 @@ OSS - + OSS @@ -69,12 +69,12 @@ Mute on middle click - Utišaj s srednjim klikom + Utišaj s srednjim klikom na ikono Show on mouse click - Pokaži z miškinim klikom + Odpri drsnik z levim klikom @@ -84,30 +84,35 @@ Always notify about volume changes - + Prikaži obvestilo ob vsaki spremembi glasnosti - + + Notify about volume changes with keyboard + Obvesti, ko se prek tipkovnice nastavi glasnost + + + Volume adjust step Velikost koraka - + External Mixer - Zunanji mešalnik + Zunanji mešalnik zvoka VolumePopup - + Launch mixer - + Zaženi mešalnik zvoka - + Mi&xer - + &Mešalnik diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_sv.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_sv.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_sv.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_sv.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,118 @@ + + + + + LXQtVolume + + + Increase sound volume + Öka ljudvolymen + + + + Decrease sound volume + Minska ljudvolymen + + + + Mute/unmute sound volume + Stäng av/på ljudet + + + + Volume Control: The following shortcuts can not be registered: %1 + Volymkontroll: Följande genvägar kan inte registreras:% 1 + + + + Volume: %1%%2 + Volym: %1%%2 + + + + (muted) + (tyst) + + + + LXQtVolumeConfiguration + + + Volume Control Settings + Inställningar av volymkontroll + + + + Device to control + Enhet att styra + + + + ALSA + ALSA + + + + PulseAudio + PulseAudio + + + + OSS + OSS + + + + Behavior + Beteende + + + + Mute on middle click + Stäng av vid mittenklick + + + + Show on mouse click + Visa med musklick + + + + Allow volume beyond 100% (0dB) + Tillåt volym över 100% (0 dB) + + + + Always notify about volume changes + Meddela alltid om volymförändringar + + + + Notify about volume changes with keyboard + + + + + Volume adjust step + Volymjusteringssteg + + + + External Mixer + Extern mixer + + + + VolumePopup + + + Launch mixer + Starta mixer + + + + Mi&xer + Mi&xer + + + diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_th_TH.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_th_TH.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_th_TH.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_th_TH.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume - + Decrease sound volume - + Mute/unmute sound volume - + Volume Control: The following shortcuts can not be registered: %1 - + Volume: %1%%2 - + (muted) @@ -87,12 +87,17 @@ - + + Notify about volume changes with keyboard + + + + Volume adjust step ช่วงการปรับระดับเสียง - + External Mixer ตัวผสมภายนอก @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer - + Mi&xer diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_tr.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_tr.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_tr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_tr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume Ses seviyesini yükselt - + Decrease sound volume Ses seviyesini azalt - + Mute/unmute sound volume Sessiz/Sesi Aç - + Volume Control: The following shortcuts can not be registered: %1 Ses Kontrol: Aşağıdaki kısayollar kaydedilemez: %1 - + Volume: %1%%2 Ses: %1%%2 - + (muted) (sessiz) @@ -87,12 +87,17 @@ Ses değişiklikleri hakkında her zaman uyar - + + Notify about volume changes with keyboard + Klavye ile ses seviyesi değişikliklerini bildir + + + Volume adjust step Ses ayar adımı - + External Mixer Harici Karıştırıcı @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer Karıştırıcıyı aç - + Mi&xer &Karıştırıcı diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume.ts lxqt-panel-0.16.1/plugin-volume/translations/volume.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume - + Decrease sound volume - + Mute/unmute sound volume - + Volume Control: The following shortcuts can not be registered: %1 - + Volume: %1%%2 - + (muted) @@ -87,12 +87,17 @@ - + + Notify about volume changes with keyboard + + + + Volume adjust step - + External Mixer @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer - + Mi&xer diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_uk.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_uk.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_uk.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_uk.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,34 +4,34 @@ LXQtVolume - + Increase sound volume Збільшити гучність звуку - + Decrease sound volume Зменшити гучність звуку - + Mute/unmute sound volume Вимкнути/ввімкнути гучність звуку - + Volume Control: The following shortcuts can not be registered: %1 Регулятор гучності: не вдалося зареєструвати наступне скорочення: %1 - + Volume: %1%%2 - Гучність: %1% {1%%2?} + Гучність: %1% {1%%2?} - + (muted) - + (вимкнено) @@ -49,7 +49,7 @@ ALSA - + РAЗL @@ -87,12 +87,17 @@ - + + Notify about volume changes with keyboard + + + + Volume adjust step Крок регулювання гучності - + External Mixer Зовнішній мікшер @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer Запустити мікшер - + Mi&xer Мі&кшер diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_zh_CN.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_zh_CN.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_zh_CN.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_zh_CN.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume 增大音量 - + Decrease sound volume 减小音量 - + Mute/unmute sound volume 静音/取消静音 - + Volume Control: The following shortcuts can not be registered: %1 音量控制：无法注册下列快捷键：%1 - + Volume: %1%%2 音量: %1%%2 - + (muted) （静音） @@ -87,12 +87,17 @@ 总是在音量改变时提示 - + + Notify about volume changes with keyboard + 使用键盘更改音量时显示通知 + + + Volume adjust step 声音调整幅度 - + External Mixer 外部混音器 @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer 运行混音器 - + Mi&xer 混音器(&X) diff -Nru lxqt-panel-0.14.1/plugin-volume/translations/volume_zh_TW.ts lxqt-panel-0.16.1/plugin-volume/translations/volume_zh_TW.ts --- lxqt-panel-0.14.1/plugin-volume/translations/volume_zh_TW.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/translations/volume_zh_TW.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,32 +4,32 @@ LXQtVolume - + Increase sound volume 增加音量 - + Decrease sound volume 減少音量 - + Mute/unmute sound volume 靜音/取消靜音 - + Volume Control: The following shortcuts can not be registered: %1 音量控制：以下捷徑無法被註冊：%1 - + Volume: %1%%2 音量：%1%%2 - + (muted) (靜音) @@ -49,7 +49,7 @@ ALSA - + ALSA @@ -87,12 +87,17 @@ 音量改變時總是通知 - + + Notify about volume changes with keyboard + 使用鍵盤改變音量時顯示通知 + + + Volume adjust step 音量調整步驟 - + External Mixer 外掛音量調整程式 @@ -100,12 +105,12 @@ VolumePopup - + Launch mixer 執行混音器 - + Mi&xer 混音器 (&x) diff -Nru lxqt-panel-0.14.1/plugin-volume/volumebutton.cpp lxqt-panel-0.16.1/plugin-volume/volumebutton.cpp --- lxqt-panel-0.14.1/plugin-volume/volumebutton.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/volumebutton.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -52,7 +52,7 @@ // initial icon for button. It will be replaced after devices scan. // In the worst case - no soundcard/pulse - is found it remains // in the button but at least the button is not blank ("invisible") - handleStockIconChanged("dialog-error"); + handleStockIconChanged(QStringLiteral("dialog-error")); m_volumePopup = new VolumePopup(this); m_popupHideTimer.setInterval(1000); @@ -88,7 +88,7 @@ m_mixerCommand = command; } -void VolumeButton::enterEvent(QEvent *event) +void VolumeButton::enterEvent(QEvent * /*event*/) { if (!m_showOnClick) showVolumeSlider(); @@ -103,14 +103,14 @@ QString tooltip = toolTip(); if (!tooltip.isEmpty()) { - *(tooltip.rbegin()) = 'X'; + *(tooltip.rbegin()) = QLatin1Char('X'); QToolTip::showText(event->globalPos(), tooltip); QToolTip::showText(event->globalPos(), toolTip()); } QToolButton::mouseMoveEvent(event); } -void VolumeButton::leaveEvent(QEvent *event) +void VolumeButton::leaveEvent(QEvent * /*event*/) { m_popupHideTimer.start(); } diff -Nru lxqt-panel-0.14.1/plugin-volume/volumebutton.h lxqt-panel-0.16.1/plugin-volume/volumebutton.h --- lxqt-panel-0.14.1/plugin-volume/volumebutton.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/volumebutton.h 2020-11-05 16:09:19.000000000 +0000 @@ -40,7 +40,7 @@ { Q_OBJECT public: - VolumeButton(ILXQtPanelPlugin *plugin, QWidget* parent = 0); + VolumeButton(ILXQtPanelPlugin *plugin, QWidget* parent = nullptr); ~VolumeButton(); void setShowOnClicked(bool state); diff -Nru lxqt-panel-0.14.1/plugin-volume/volumepopup.cpp lxqt-panel-0.16.1/plugin-volume/volumepopup.cpp --- lxqt-panel-0.14.1/plugin-volume/volumepopup.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/volumepopup.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -41,6 +41,7 @@ #include "audioengine.h" #include #include +#include VolumePopup::VolumePopup(QWidget* parent): QDialog(parent, Qt::Dialog | Qt::WindowStaysOnTopHint | Qt::CustomizeWindowHint | Qt::Popup | Qt::X11BypassWindowManagerHint), @@ -49,7 +50,7 @@ m_device(0) { m_mixerButton = new QPushButton(this); - m_mixerButton->setObjectName("MixerLink"); + m_mixerButton->setObjectName(QStringLiteral("MixerLink")); m_mixerButton->setMinimumWidth(1); m_mixerButton->setToolTip(tr("Launch mixer")); m_mixerButton->setText(tr("Mi&xer")); @@ -105,12 +106,12 @@ return QDialog::eventFilter(watched, event); } -void VolumePopup::enterEvent(QEvent *event) +void VolumePopup::enterEvent(QEvent * /*event*/) { emit mouseEntered(); } -void VolumePopup::leaveEvent(QEvent *event) +void VolumePopup::leaveEvent(QEvent * /*event*/) { // qDebug("leaveEvent"); emit mouseLeft(); @@ -142,7 +143,7 @@ // signal emission. m_volumeSlider->blockSignals(true); m_volumeSlider->setValue(volume); - m_volumeSlider->setToolTip(QString("%1%").arg(volume)); + m_volumeSlider->setToolTip(QStringLiteral("%1%").arg(volume)); dynamic_cast(*parent()).setToolTip(m_volumeSlider->toolTip()); //parent is the button on panel m_volumeSlider->blockSignals(false); @@ -163,13 +164,13 @@ QString iconName; if (m_device->volume() <= 0 || m_device->mute()) - iconName = "audio-volume-muted"; + iconName = QLatin1String("audio-volume-muted"); else if (m_device->volume() <= 33) - iconName = "audio-volume-low"; + iconName = QLatin1String("audio-volume-low"); else if (m_device->volume() <= 66) - iconName = "audio-volume-medium"; + iconName = QLatin1String("audio-volume-medium"); else - iconName = "audio-volume-high"; + iconName = QLatin1String("audio-volume-high"); iconName.append(QLatin1String("-panel")); m_muteToggleButton->setIcon(XdgIcon::fromTheme(iconName)); @@ -248,13 +249,16 @@ } - QRect screen = QApplication::desktop()->availableGeometry(m_pos); - - if (rect.right() > screen.right()) - rect.moveRight(screen.right()); - - if (rect.bottom() > screen.bottom()) - rect.moveBottom(screen.bottom()); + if (QScreen const * const screen = QGuiApplication::screenAt(m_pos)) + { + auto const & geometry = screen->availableGeometry(); + + if (rect.right() > geometry.right()) + rect.moveRight(geometry.right()); + + if (rect.bottom() > geometry.bottom()) + rect.moveBottom(geometry.bottom()); + } move(rect.topLeft()); } diff -Nru lxqt-panel-0.14.1/plugin-volume/volumepopup.h lxqt-panel-0.16.1/plugin-volume/volumepopup.h --- lxqt-panel-0.14.1/plugin-volume/volumepopup.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-volume/volumepopup.h 2020-11-05 16:09:19.000000000 +0000 @@ -38,7 +38,7 @@ { Q_OBJECT public: - VolumePopup(QWidget* parent = 0); + VolumePopup(QWidget* parent = nullptr); void openAt(QPoint pos, Qt::Corner anchor); void handleWheelEvent(QWheelEvent *event); diff -Nru lxqt-panel-0.14.1/plugin-worldclock/lxqtworldclockconfiguration.cpp lxqt-panel-0.16.1/plugin-worldclock/lxqtworldclockconfiguration.cpp --- lxqt-panel-0.14.1/plugin-worldclock/lxqtworldclockconfiguration.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/lxqtworldclockconfiguration.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -34,6 +34,8 @@ #include "lxqtworldclockconfigurationtimezones.h" #include "lxqtworldclockconfigurationmanualformat.h" +#include + #include @@ -82,6 +84,8 @@ connect(ui->moveDownPB, SIGNAL(clicked()), SLOT(moveTimeZoneDown())); connect(ui->autorotateCB, SIGNAL(clicked()), SLOT(saveSettings())); + connect(ui->showWeekNumberCB, &QCheckBox::clicked, this, &LXQtWorldClockConfiguration::saveSettings); + connect(ui->showTooltipCB, SIGNAL(clicked()), SLOT(saveSettings())); loadSettings(); } @@ -138,6 +142,7 @@ ui->timeShowSecondsCB->setChecked(settings().value(QLatin1String("timeShowSeconds"), false).toBool()); ui->timePadHourCB->setChecked(settings().value(QLatin1String("timePadHour"), false).toBool()); ui->timeAMPMCB->setChecked(settings().value(QLatin1String("timeAMPM"), false).toBool()); + ui->showTooltipCB->setChecked(settings().value(QLatin1String("showTooltip"), false).toBool()); bool customTimeFormatSelected = ui->timeFormatCB->currentIndex() == ui->timeFormatCB->count() - 1; ui->timeCustomW->setEnabled(customTimeFormatSelected); @@ -204,11 +209,11 @@ ui->advancedManualGB->setChecked(advancedManual); - mDefaultTimeZone = settings().value("defaultTimeZone", QString()).toString(); + mDefaultTimeZone = settings().value(QStringLiteral("defaultTimeZone"), QString()).toString(); ui->timeZonesTW->setRowCount(0); - QList > list = settings().readArray(QLatin1String("timeZones")); + const QList > list = settings().readArray(QLatin1String("timeZones")); int i = 0; for (const auto &map : list) { @@ -229,8 +234,8 @@ ui->timeZonesTW->resizeColumnsToContents(); - ui->autorotateCB->setChecked(settings().value("autoRotate", true).toBool()); - + ui->autorotateCB->setChecked(settings().value(QStringLiteral("autoRotate"), true).toBool()); + ui->showWeekNumberCB->setChecked(settings().value(QL1S("showWeekNumber"), true).toBool()); mLockCascadeSettingChanges = false; } @@ -375,6 +380,8 @@ settings().setValue(QLatin1String("defaultTimeZone"), mDefaultTimeZone); settings().setValue(QLatin1String("useAdvancedManualFormat"), ui->advancedManualGB->isChecked()); settings().setValue(QLatin1String("autoRotate"), ui->autorotateCB->isChecked()); + settings().setValue(QL1S("showWeekNumber"), ui->showWeekNumberCB->isChecked()); + settings().setValue(QLatin1String("showTooltip"), ui->showTooltipCB->isChecked()); } void LXQtWorldClockConfiguration::timeFormatChanged(int index) diff -Nru lxqt-panel-0.14.1/plugin-worldclock/lxqtworldclockconfigurationmanualformat.cpp lxqt-panel-0.16.1/plugin-worldclock/lxqtworldclockconfigurationmanualformat.cpp --- lxqt-panel-0.14.1/plugin-worldclock/lxqtworldclockconfigurationmanualformat.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/lxqtworldclockconfigurationmanualformat.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -38,7 +38,7 @@ QDialog(parent), ui(new Ui::LXQtWorldClockConfigurationManualFormat) { - setObjectName("WorldClockConfigurationManualFormatWindow"); + setObjectName(QStringLiteral("WorldClockConfigurationManualFormatWindow")); setWindowModality(Qt::WindowModal); ui->setupUi(this); diff -Nru lxqt-panel-0.14.1/plugin-worldclock/lxqtworldclockconfigurationmanualformat.h lxqt-panel-0.16.1/plugin-worldclock/lxqtworldclockconfigurationmanualformat.h --- lxqt-panel-0.14.1/plugin-worldclock/lxqtworldclockconfigurationmanualformat.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/lxqtworldclockconfigurationmanualformat.h 2020-11-05 16:09:19.000000000 +0000 @@ -45,7 +45,7 @@ Q_OBJECT public: - explicit LXQtWorldClockConfigurationManualFormat(QWidget *parent = NULL); + explicit LXQtWorldClockConfigurationManualFormat(QWidget *parent = nullptr); ~LXQtWorldClockConfigurationManualFormat(); void setManualFormat(const QString&); diff -Nru lxqt-panel-0.14.1/plugin-worldclock/lxqtworldclockconfigurationmanualformat.ui lxqt-panel-0.16.1/plugin-worldclock/lxqtworldclockconfigurationmanualformat.ui --- lxqt-panel-0.14.1/plugin-worldclock/lxqtworldclockconfigurationmanualformat.ui 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/lxqtworldclockconfigurationmanualformat.ui 2020-11-05 16:09:19.000000000 +0000 @@ -104,8 +104,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> diff -Nru lxqt-panel-0.14.1/plugin-worldclock/lxqtworldclockconfigurationtimezones.cpp lxqt-panel-0.16.1/plugin-worldclock/lxqtworldclockconfigurationtimezones.cpp --- lxqt-panel-0.14.1/plugin-worldclock/lxqtworldclockconfigurationtimezones.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/lxqtworldclockconfigurationtimezones.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -38,7 +38,7 @@ QDialog(parent), ui(new Ui::LXQtWorldClockConfigurationTimeZones) { - setObjectName("WorldClockConfigurationTimeZonesWindow"); + setObjectName(QStringLiteral("WorldClockConfigurationTimeZonesWindow")); setWindowModality(Qt::WindowModal); ui->setupUi(this); @@ -110,8 +110,8 @@ for(const QByteArray &ba : timeZones) { QTimeZone timeZone(ba); - QString ianaId(ba); - QStringList qStrings(QString(ba).split(QLatin1Char('/'))); + QString ianaId(QString::fromUtf8(ba)); + QStringList qStrings(QString::fromUtf8((ba)).split(QLatin1Char('/'))); if ((qStrings.size() == 1) && (qStrings[0].startsWith(QLatin1String("UTC")))) qStrings.prepend(tr("UTC")); diff -Nru lxqt-panel-0.14.1/plugin-worldclock/lxqtworldclockconfigurationtimezones.h lxqt-panel-0.16.1/plugin-worldclock/lxqtworldclockconfigurationtimezones.h --- lxqt-panel-0.14.1/plugin-worldclock/lxqtworldclockconfigurationtimezones.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/lxqtworldclockconfigurationtimezones.h 2020-11-05 16:09:19.000000000 +0000 @@ -45,7 +45,7 @@ Q_OBJECT public: - explicit LXQtWorldClockConfigurationTimeZones(QWidget *parent = NULL); + explicit LXQtWorldClockConfigurationTimeZones(QWidget *parent = nullptr); ~LXQtWorldClockConfigurationTimeZones(); int updateAndExec(); diff -Nru lxqt-panel-0.14.1/plugin-worldclock/lxqtworldclockconfiguration.ui lxqt-panel-0.16.1/plugin-worldclock/lxqtworldclockconfiguration.ui --- lxqt-panel-0.14.1/plugin-worldclock/lxqtworldclockconfiguration.ui 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/lxqtworldclockconfiguration.ui 2020-11-05 16:09:19.000000000 +0000 @@ -7,7 +7,7 @@ 0 0 600 - 686 + 687 @@ -530,6 +530,23 @@ + + + Show &week numbers in popup calendar + + + true + + + + + + + S&how tooltip + + + + Qt::Vertical @@ -584,7 +601,8 @@ moveUpPB moveDownPB autorotateCB - buttons + showWeekNumberCB + showTooltipCB diff -Nru lxqt-panel-0.14.1/plugin-worldclock/lxqtworldclock.cpp lxqt-panel-0.16.1/plugin-worldclock/lxqtworldclock.cpp --- lxqt-panel-0.14.1/plugin-worldclock/lxqtworldclock.cpp 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/lxqtworldclock.cpp 2020-11-05 16:09:19.000000000 +0000 @@ -28,6 +28,8 @@ #include "lxqtworldclock.h" +#include + #include #include #include @@ -38,18 +40,22 @@ #include #include #include +#include LXQtWorldClock::LXQtWorldClock(const ILXQtPanelPluginStartupInfo &startupInfo): QObject(), ILXQtPanelPlugin(startupInfo), - mPopup(NULL), + mPopup(nullptr), mTimer(new QTimer(this)), mUpdateInterval(1), mAutoRotate(true), - mPopupContent(NULL) + mShowWeekNumber(true), + mShowTooltip(false), + mPopupContent(nullptr) { mMainWidget = new QWidget(); + mMainWidget->installEventFilter(this); mContent = new ActiveLabel(); mRotatedWidget = new LXQt::RotatedWidget(*mContent, mMainWidget); @@ -129,7 +135,6 @@ mShownTime = tzNow.addSecs(-tzNow.time().minute() * 60 - tzNow.time().second()); } } - if (!isUpToDate) { const QSize old_size = mContent->sizeHint(); @@ -168,7 +173,7 @@ mTimeZones.clear(); - QList > array = _settings->readArray(QLatin1String("timeZones")); + const QList > array = _settings->readArray(QLatin1String("timeZones")); for (const auto &map : array) { QString timeZoneName = map.value(QLatin1String("timeZone"), QString()).toString(); @@ -220,7 +225,7 @@ bool timeShowSeconds = _settings->value(QLatin1String("timeShowSeconds"), false).toBool(); bool timePadHour = _settings->value(QLatin1String("timePadHour"), false).toBool(); bool timeAMPM = _settings->value(QLatin1String("timeAMPM"), false).toBool(); - + mShowTooltip = _settings->value(QLatin1String("showTooltip"), false).toBool(); // timezone bool showTimezone = _settings->value(QLatin1String("showTimezone"), false).toBool() && !longTimeFormatSelected; @@ -292,9 +297,9 @@ { QString datePortionOrder; QString dateLocale = locale.dateFormat(QLocale::ShortFormat).toLower(); - int yearIndex = dateLocale.indexOf("y"); - int monthIndex = dateLocale.indexOf("m"); - int dayIndex = dateLocale.indexOf("d"); + int yearIndex = dateLocale.indexOf(QLatin1String("y")); + int monthIndex = dateLocale.indexOf(QLatin1String("m")); + int dayIndex = dateLocale.indexOf(QLatin1String("d")); if (yearIndex < dayIndex) // Big-endian (year, month, day) (yyyy MMMM dd, dddd) -> in some Asia countires like China or Japan datePortionOrder = QLatin1String("%1%2%3 %4%5%6"); @@ -346,6 +351,12 @@ realign(); } + bool showWeekNumber = settings()->value(QL1S("showWeekNumber"), true).toBool(); + if (showWeekNumber != mShowWeekNumber) + { + mShowWeekNumber = showWeekNumber; + } + if (mPopup) { updatePopupContent(); @@ -393,6 +404,8 @@ mPopup->layout()->setContentsMargins(0, 0, 0, 0); QCalendarWidget *calendarWidget = new QCalendarWidget(mPopup); + if (!mShowWeekNumber) + calendarWidget->setVerticalHeaderFormat(QCalendarWidget::NoVerticalHeader); mPopup->layout()->addWidget(calendarWidget); QString timeZoneName = mActiveTimeZone; @@ -428,9 +441,9 @@ void LXQtWorldClock::deletePopup() { - mPopupContent = NULL; + mPopupContent = nullptr; mPopup->deleteLater(); - mPopup = NULL; + mPopup = nullptr; } QString LXQtWorldClock::formatDateTime(const QDateTime &datetime, const QString &timeZoneName) @@ -468,7 +481,7 @@ bool LXQtWorldClock::formatHasTimeZone(QString format) { format.replace(QRegExp(QLatin1String("'[^']*'")), QString()); - return format.toLower().contains(QLatin1String("t")); + return format.contains(QLatin1Char('t'), Qt::CaseInsensitive); } QString LXQtWorldClock::preformat(const QString &format, const QTimeZone &timeZone, const QDateTime &dateTime) @@ -571,6 +584,8 @@ } else mRotatedWidget->setOrigin(Qt::TopLeftCorner); + if (mContent->size() != mContent->sizeHint()) + mRotatedWidget->adjustContentSize(); } ActiveLabel::ActiveLabel(QWidget *parent) : @@ -623,3 +638,20 @@ return QDialog::event(event); } + +bool LXQtWorldClock::eventFilter(QObject * watched, QEvent * event) +{ + if (mShowTooltip && watched == mMainWidget && event->type() == QEvent::ToolTip) + { + QHelpEvent *helpEvent = static_cast(event); + QDateTime now = QDateTime::currentDateTime(); + QString timeZoneName = mActiveTimeZone; + if (timeZoneName == QLatin1String("local")) + timeZoneName = QString::fromLatin1(QTimeZone::systemTimeZoneId()); + QTimeZone timeZone(timeZoneName.toLatin1()); + QDateTime tzNow = now.toTimeZone(timeZone); + QToolTip::showText(helpEvent->globalPos(), tzNow.toString(QLocale(QLocale::AnyLanguage, QLocale().country()).dateTimeFormat(QLocale::ShortFormat))); + return false; + } + return QObject::eventFilter(watched, event); +} diff -Nru lxqt-panel-0.14.1/plugin-worldclock/lxqtworldclock.h lxqt-panel-0.16.1/plugin-worldclock/lxqtworldclock.h --- lxqt-panel-0.14.1/plugin-worldclock/lxqtworldclock.h 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/lxqtworldclock.h 2020-11-05 16:09:19.000000000 +0000 @@ -34,6 +34,7 @@ #include #include + #include #include "../panel/ilxqtpanelplugin.h" @@ -61,6 +62,7 @@ virtual void settingsChanged(); virtual void realign(); QDialog *configureDialog(); + bool eventFilter(QObject * watched, QEvent * event); private slots: void timeout(); @@ -84,6 +86,8 @@ QString mFormat; bool mAutoRotate; + bool mShowWeekNumber; + bool mShowTooltip; QLabel *mPopupContent; QDateTime mShownTime; @@ -103,7 +107,7 @@ Q_OBJECT public: - explicit ActiveLabel(QWidget * = NULL); + explicit ActiveLabel(QWidget * = nullptr); signals: void wheelScrolled(int); @@ -120,7 +124,7 @@ Q_OBJECT public: - LXQtWorldClockPopup(QWidget *parent = 0); + LXQtWorldClockPopup(QWidget *parent = nullptr); void show(); diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_arn.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_arn.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_arn.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,342 @@ + + + + + LXQtWorldClock + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' + + + + + LXQtWorldClockConfiguration + + + World Clock Settings + + + + + Display &format + + + + + &Time + + + + + F&ormat: + + + + + + + Short + + + + + + + Long + + + + + + Custom + + + + + Sho&w seconds + + + + + Pad &hour with zero + + + + + T&ime zone + + + + + &Position: + + + + + For&mat: + + + + + + Below + + + + + + Above + + + + + + Before + + + + + + After + + + + + Offset from UTC + + + + + Abbreviation + + + + + IANA id + + + + + + + Custom name + + + + + &Use 12-hour format + + + + + Location identifier + + + + + &Date + + + + + Po&sition: + + + + + Fo&rmat: + + + + + ISO 8601 + + + + + Show &year + + + + + Show day of wee&k + + + + + Pad d&ay with zero + + + + + &Long month and day of week names + + + + + Ad&vanced manual format + + + + + &Customise ... + + + + + Time &zones + + + + + &Add ... + + + + + &Remove + + + + + Set as &default + + + + + &Edit custom name ... + + + + + Move &up + + + + + Move do&wn + + + + + &General + + + + + Auto&rotate when the panel is vertical + + + + + Show &week numbers in popup calendar + + + + + S&how tooltip + + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' + + + + + Input custom time zone name + + + + + LXQtWorldClockConfigurationManualFormat + + + World Clock Manual Format Configuration + + + + + <h1>Custom Date/Time Format Syntax</h1> +<p>A date pattern is a string of characters, where specific strings of characters are replaced with date and time data from a calendar when formatting or used to generate data for a calendar when parsing.</p> +<p>The Date Field Symbol Table below contains the characters used in patterns to show the appropriate formats for a given locale, such as yyyy for the year. Characters may be used multiple times. For example, if y is used for the year, 'yy' might produce '99', whereas 'yyyy' produces '1999'. For most numerical fields, the number of characters specifies the field width. For example, if h is the hour, 'h' might produce '5', but 'hh' produces '05'. For some characters, the count specifies whether an abbreviated or full form should be used, but may have other choices, as given below.</p> +<p>Two single quotes represents a literal single quote, either inside or outside single quotes. Text within single quotes is not interpreted in any way (except for two adjacent single quotes). Otherwise all ASCII letter from a to z and A to Z are reserved as syntax characters, and require quoting if they are to represent literal characters. In addition, certain ASCII punctuation characters may become variable in the future (eg ":" being interpreted as the time separator and '/' as a date separator, and replaced by respective locale-sensitive characters in display).<br /></p> +<table border="1" width="100%" cellpadding="4" cellspacing="0"> +<tr><th width="20%">Code</th><th>Meaning</th></tr> +<tr><td>d</td><td>the day as number without a leading zero (1 to 31)</td></tr> +<tr><td>dd</td><td>the day as number with a leading zero (01 to 31)</td></tr> +<tr><td>ddd</td><td>the abbreviated localized day name (e.g. 'Mon' to 'Sun').</td></tr> +<tr><td>dddd</td><td>the long localized day name (e.g. 'Monday' to 'Sunday').</td></tr> +<tr><td>M</td><td>the month as number without a leading zero (1-12)</td></tr> +<tr><td>MM</td><td>the month as number with a leading zero (01-12)</td></tr> +<tr><td>MMM</td><td>the abbreviated localized month name (e.g. 'Jan' to 'Dec').</td></tr> +<tr><td>MMMM</td><td>the long localized month name (e.g. 'January' to 'December').</td></tr> +<tr><td>yy</td><td>the year as two digit number (00-99)</td></tr> +<tr><td>yyyy</td><td>the year as four digit number</td></tr> +<tr><td>h</td><td>the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display)</td></tr> +<tr><td>hh</td><td>the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display)</td></tr> +<tr><td>H</td><td>the hour without a leading zero (0 to 23, even with AM/PM display)</td></tr> +<tr><td>HH</td><td>the hour with a leading zero (00 to 23, even with AM/PM display)</td></tr> +<tr><td>m</td><td>the minute without a leading zero (0 to 59)</td></tr> +<tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> +<tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> +<tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> +<tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> +<tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> +<tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> +<tr><td>T</td><td>the offset from UTC</td></tr> +<tr><td>TT</td><td>the timezone IANA id</td></tr> +<tr><td>TTT</td><td>the timezone abbreviation</td></tr> +<tr><td>TTTT</td><td>the timezone short display name</td></tr> +<tr><td>TTTTT</td><td>the timezone long display name</td></tr> +<tr><td>TTTTTT</td><td>the timezone custom name. You can change it the 'Time zones' tab of the configuration window</td></tr></table> +<br /><b>Notes:</b> <ul><li>Any characters in the pattern that are not in the ranges of ['a'..'z'] and ['A'..'Z'] will be treated as quoted text. For instance, characters like ':', '.', ' ', '#' and '@' will appear in the resulting time text even they are not enclosed within single quotes. The single quote is used to 'escape' letters. Two single quotes in a row, whether inside or outside a quoted sequence, represent a 'real' single quote.</li><li>Minimal update interval is 1 second. If z or zzz is configured time is shown with the milliseconds fraction, but not updated on millisecond basis (avoiding big performance hit).</li><ul> + + + + + + LXQtWorldClockConfigurationTimeZones + + + World Clock Time Zones + + + + + Time zone + + + + + Name + + + + + Comment + + + + + Country + + + + + UTC + + + + + + Other + + + + + Local timezone + + + + diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_ar.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_ar.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_ar.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_ar.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd، d MMM yyyy'<br/>'TT'</font>' @@ -118,7 +118,7 @@ - + Custom name الاسم المخصّص @@ -228,12 +228,22 @@ &دوّر آليا عندما تكون اللوحة رأسية - + + Show &week numbers in popup calendar + + + + + S&how tooltip + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd، d MMM yyyy'<br/>'TT'</font>' - + Input custom time zone name أدخِل اسم المنطقة الزمنية المخصّص @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_ast.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_ast.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_ast.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_ast.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,342 @@ + + + + + LXQtWorldClock + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' + + + + + LXQtWorldClockConfiguration + + + World Clock Settings + + + + + Display &format + + + + + &Time + + + + + F&ormat: + + + + + + + Short + + + + + + + Long + + + + + + Custom + + + + + Sho&w seconds + + + + + Pad &hour with zero + + + + + T&ime zone + + + + + &Position: + + + + + For&mat: + + + + + + Below + + + + + + Above + + + + + + Before + + + + + + After + + + + + Offset from UTC + + + + + Abbreviation + + + + + IANA id + + + + + + + Custom name + + + + + &Use 12-hour format + + + + + Location identifier + + + + + &Date + + + + + Po&sition: + + + + + Fo&rmat: + + + + + ISO 8601 + + + + + Show &year + + + + + Show day of wee&k + + + + + Pad d&ay with zero + + + + + &Long month and day of week names + + + + + Ad&vanced manual format + + + + + &Customise ... + + + + + Time &zones + + + + + &Add ... + + + + + &Remove + + + + + Set as &default + + + + + &Edit custom name ... + + + + + Move &up + + + + + Move do&wn + + + + + &General + + + + + Auto&rotate when the panel is vertical + + + + + Show &week numbers in popup calendar + + + + + S&how tooltip + + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' + + + + + Input custom time zone name + + + + + LXQtWorldClockConfigurationManualFormat + + + World Clock Manual Format Configuration + + + + + <h1>Custom Date/Time Format Syntax</h1> +<p>A date pattern is a string of characters, where specific strings of characters are replaced with date and time data from a calendar when formatting or used to generate data for a calendar when parsing.</p> +<p>The Date Field Symbol Table below contains the characters used in patterns to show the appropriate formats for a given locale, such as yyyy for the year. Characters may be used multiple times. For example, if y is used for the year, 'yy' might produce '99', whereas 'yyyy' produces '1999'. For most numerical fields, the number of characters specifies the field width. For example, if h is the hour, 'h' might produce '5', but 'hh' produces '05'. For some characters, the count specifies whether an abbreviated or full form should be used, but may have other choices, as given below.</p> +<p>Two single quotes represents a literal single quote, either inside or outside single quotes. Text within single quotes is not interpreted in any way (except for two adjacent single quotes). Otherwise all ASCII letter from a to z and A to Z are reserved as syntax characters, and require quoting if they are to represent literal characters. In addition, certain ASCII punctuation characters may become variable in the future (eg ":" being interpreted as the time separator and '/' as a date separator, and replaced by respective locale-sensitive characters in display).<br /></p> +<table border="1" width="100%" cellpadding="4" cellspacing="0"> +<tr><th width="20%">Code</th><th>Meaning</th></tr> +<tr><td>d</td><td>the day as number without a leading zero (1 to 31)</td></tr> +<tr><td>dd</td><td>the day as number with a leading zero (01 to 31)</td></tr> +<tr><td>ddd</td><td>the abbreviated localized day name (e.g. 'Mon' to 'Sun').</td></tr> +<tr><td>dddd</td><td>the long localized day name (e.g. 'Monday' to 'Sunday').</td></tr> +<tr><td>M</td><td>the month as number without a leading zero (1-12)</td></tr> +<tr><td>MM</td><td>the month as number with a leading zero (01-12)</td></tr> +<tr><td>MMM</td><td>the abbreviated localized month name (e.g. 'Jan' to 'Dec').</td></tr> +<tr><td>MMMM</td><td>the long localized month name (e.g. 'January' to 'December').</td></tr> +<tr><td>yy</td><td>the year as two digit number (00-99)</td></tr> +<tr><td>yyyy</td><td>the year as four digit number</td></tr> +<tr><td>h</td><td>the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display)</td></tr> +<tr><td>hh</td><td>the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display)</td></tr> +<tr><td>H</td><td>the hour without a leading zero (0 to 23, even with AM/PM display)</td></tr> +<tr><td>HH</td><td>the hour with a leading zero (00 to 23, even with AM/PM display)</td></tr> +<tr><td>m</td><td>the minute without a leading zero (0 to 59)</td></tr> +<tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> +<tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> +<tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> +<tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> +<tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> +<tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> +<tr><td>T</td><td>the offset from UTC</td></tr> +<tr><td>TT</td><td>the timezone IANA id</td></tr> +<tr><td>TTT</td><td>the timezone abbreviation</td></tr> +<tr><td>TTTT</td><td>the timezone short display name</td></tr> +<tr><td>TTTTT</td><td>the timezone long display name</td></tr> +<tr><td>TTTTTT</td><td>the timezone custom name. You can change it the 'Time zones' tab of the configuration window</td></tr></table> +<br /><b>Notes:</b> <ul><li>Any characters in the pattern that are not in the ranges of ['a'..'z'] and ['A'..'Z'] will be treated as quoted text. For instance, characters like ':', '.', ' ', '#' and '@' will appear in the resulting time text even they are not enclosed within single quotes. The single quote is used to 'escape' letters. Two single quotes in a row, whether inside or outside a quoted sequence, represent a 'real' single quote.</li><li>Minimal update interval is 1 second. If z or zzz is configured time is shown with the milliseconds fraction, but not updated on millisecond basis (avoiding big performance hit).</li><ul> + + + + + + LXQtWorldClockConfigurationTimeZones + + + World Clock Time Zones + + + + + Time zone + + + + + Name + + + + + Comment + + + + + Country + + + + + UTC + + + + + + Other + + + + + Local timezone + + + + diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_bg.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_bg.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_bg.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_bg.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,342 @@ + + + + + LXQtWorldClock + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' + '<b>1'ЧЧ:мм:сс'</b>2<br/>3<font size="-2">4'ддд, д МММ ГГГГ'<br/>5'ТТ'</font>6' + + + + LXQtWorldClockConfiguration + + + World Clock Settings + Настройки на световния часовник + + + + Display &format + Формат на показване + + + + &Time + &Време + + + + F&ormat: + Формат: + + + + + + Short + Късо + + + + + + Long + Дълго + + + + + Custom + Персонализиран + + + + Sho&w seconds + Покажи секудните + + + + Pad &hour with zero + Pad &час с нула + + + + T&ime zone + Времева зона + + + + &Position: + &Позиция: + + + + For&mat: + Формат: + + + + + Below + Отдолу + + + + + Above + Отгоре + + + + + Before + Преди + + + + + After + След + + + + Offset from UTC + Отместване от UTC + + + + Abbreviation + Съкращение + + + + IANA id + IANA ИД + + + + + + Custom name + Персонализирано име + + + + &Use 12-hour format + &Ползване на 12-часов формат + + + + Location identifier + Идентификатор на местоположението + + + + &Date + &Дата + + + + Po&sition: + Позиция: + + + + Fo&rmat: + Формат: + + + + ISO 8601 + ISO 8601 + + + + Show &year + Покажи &Година + + + + Show day of wee&k + Покажи ден от седмица + + + + Pad d&ay with zero + Pad ден с нула + + + + &Long month and day of week names + &Имена на дълъг месец и ден от седмицата + + + + Ad&vanced manual format + Напреднал ръчен формат + + + + &Customise ... + &Персонализирай ... + + + + Time &zones + Времеви зони + + + + &Add ... + &Добави ... + + + + &Remove + &Премахни + + + + Set as &default + Сложи като &Подразбиране + + + + &Edit custom name ... + &Редактирай персонализирано име ... + + + + Move &up + Премести &нагоре + + + + Move do&wn + Премести надолу + + + + &General + &Главен + + + + Auto&rotate when the panel is vertical + Автоматично завъртане, когато панелът е вертикален + + + + Show &week numbers in popup calendar + + + + + S&how tooltip + + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' + '<b>1'ЧЧ:мм:сс'</b>2<br/>3<font size="-2">4'ддд, д МММ гггг'<br/>5'ТТ'</font>6' + + + + Input custom time zone name + Въведете персонализирано име на часовата зона + + + + LXQtWorldClockConfigurationManualFormat + + + World Clock Manual Format Configuration + Световен Часовник Ръчно Конфигуриране На Формата + + + + <h1>Custom Date/Time Format Syntax</h1> +<p>A date pattern is a string of characters, where specific strings of characters are replaced with date and time data from a calendar when formatting or used to generate data for a calendar when parsing.</p> +<p>The Date Field Symbol Table below contains the characters used in patterns to show the appropriate formats for a given locale, such as yyyy for the year. Characters may be used multiple times. For example, if y is used for the year, 'yy' might produce '99', whereas 'yyyy' produces '1999'. For most numerical fields, the number of characters specifies the field width. For example, if h is the hour, 'h' might produce '5', but 'hh' produces '05'. For some characters, the count specifies whether an abbreviated or full form should be used, but may have other choices, as given below.</p> +<p>Two single quotes represents a literal single quote, either inside or outside single quotes. Text within single quotes is not interpreted in any way (except for two adjacent single quotes). Otherwise all ASCII letter from a to z and A to Z are reserved as syntax characters, and require quoting if they are to represent literal characters. In addition, certain ASCII punctuation characters may become variable in the future (eg ":" being interpreted as the time separator and '/' as a date separator, and replaced by respective locale-sensitive characters in display).<br /></p> +<table border="1" width="100%" cellpadding="4" cellspacing="0"> +<tr><th width="20%">Code</th><th>Meaning</th></tr> +<tr><td>d</td><td>the day as number without a leading zero (1 to 31)</td></tr> +<tr><td>dd</td><td>the day as number with a leading zero (01 to 31)</td></tr> +<tr><td>ddd</td><td>the abbreviated localized day name (e.g. 'Mon' to 'Sun').</td></tr> +<tr><td>dddd</td><td>the long localized day name (e.g. 'Monday' to 'Sunday').</td></tr> +<tr><td>M</td><td>the month as number without a leading zero (1-12)</td></tr> +<tr><td>MM</td><td>the month as number with a leading zero (01-12)</td></tr> +<tr><td>MMM</td><td>the abbreviated localized month name (e.g. 'Jan' to 'Dec').</td></tr> +<tr><td>MMMM</td><td>the long localized month name (e.g. 'January' to 'December').</td></tr> +<tr><td>yy</td><td>the year as two digit number (00-99)</td></tr> +<tr><td>yyyy</td><td>the year as four digit number</td></tr> +<tr><td>h</td><td>the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display)</td></tr> +<tr><td>hh</td><td>the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display)</td></tr> +<tr><td>H</td><td>the hour without a leading zero (0 to 23, even with AM/PM display)</td></tr> +<tr><td>HH</td><td>the hour with a leading zero (00 to 23, even with AM/PM display)</td></tr> +<tr><td>m</td><td>the minute without a leading zero (0 to 59)</td></tr> +<tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> +<tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> +<tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> +<tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> +<tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> +<tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> +<tr><td>T</td><td>the offset from UTC</td></tr> +<tr><td>TT</td><td>the timezone IANA id</td></tr> +<tr><td>TTT</td><td>the timezone abbreviation</td></tr> +<tr><td>TTTT</td><td>the timezone short display name</td></tr> +<tr><td>TTTTT</td><td>the timezone long display name</td></tr> +<tr><td>TTTTTT</td><td>the timezone custom name. You can change it the 'Time zones' tab of the configuration window</td></tr></table> +<br /><b>Notes:</b> <ul><li>Any characters in the pattern that are not in the ranges of ['a'..'z'] and ['A'..'Z'] will be treated as quoted text. For instance, characters like ':', '.', ' ', '#' and '@' will appear in the resulting time text even they are not enclosed within single quotes. The single quote is used to 'escape' letters. Two single quotes in a row, whether inside or outside a quoted sequence, represent a 'real' single quote.</li><li>Minimal update interval is 1 second. If z or zzz is configured time is shown with the milliseconds fraction, but not updated on millisecond basis (avoiding big performance hit).</li><ul> + + + + + + LXQtWorldClockConfigurationTimeZones + + + World Clock Time Zones + Времеви зони на световен часовник + + + + Time zone + Времева зона + + + + Name + Име + + + + Comment + Коментар + + + + Country + Държава + + + + UTC + UTC + + + + + Other + Други + + + + Local timezone + Местна времева зона + + + diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_ca.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_ca.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_ca.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_ca.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -118,7 +118,7 @@ - + Custom name Nom personalitzat @@ -228,12 +228,22 @@ Gi&ra automàticament quan el tauler sigui vertical - + + Show &week numbers in popup calendar + + + + + S&how tooltip + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - + Input custom time zone name Entrada personalitzada de la zona horària @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_cs.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_cs.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_cs.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_cs.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,9 +4,9 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM rrrr'<br/>'ČČ'</font>' + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -118,9 +118,9 @@ - + Custom name - Uživatelem určený název + Uživatelem stanovený název @@ -150,7 +150,7 @@ ISO 8601 - ISO 8601 + dle normy ISO 8601 @@ -228,14 +228,24 @@ Při svisle orientovaném panelu &natočit tak, aby bylo vodorovně - + + Show &week numbers in popup calendar + + + + + S&how tooltip + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM rrrr'<br/>'ČČ'</font>' - + Input custom time zone name - Zadat uživatelem určený název časového pásma + Zadat uživatelem stanovený název časového pásma @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> @@ -284,43 +292,7 @@ <tr><td>TTTTTT</td><td>the timezone custom name. You can change it the 'Time zones' tab of the configuration window</td></tr></table> <br /><b>Notes:</b> <ul><li>Any characters in the pattern that are not in the ranges of ['a'..'z'] and ['A'..'Z'] will be treated as quoted text. For instance, characters like ':', '.', ' ', '#' and '@' will appear in the resulting time text even they are not enclosed within single quotes. The single quote is used to 'escape' letters. Two single quotes in a row, whether inside or outside a quoted sequence, represent a 'real' single quote.</li><li>Minimal update interval is 1 second. If z or zzz is configured time is shown with the milliseconds fraction, but not updated on millisecond basis (avoiding big performance hit).</li><ul> - <h1> Vlastní syntaxe formátu data / času </ h1> -<p> Vzor dat je řetězec znaků, kde jsou specifické řetězce znaků nahrazeny daty a časovými údaji z kalendáře při formátování nebo při generování dat v kalendáři. </ p> -<p> Níže uvedená tabulka symbolů pole údajů obsahuje znaky použité ve vzorcích pro zobrazení vhodných formátů pro daný národní prostředí, například rrrr za rok. Znaky mohou být použity vícekrát. Například, pokud y je použito pro rok, 'yy' může produkovat '99', zatímco 'yyyy' produkuje '1999'. U většiny číselných polí určuje počet znaků šířku pole. Například, jestliže h je hodina, 'h' může produkovat '5', ale 'hh' produkuje '05'. U některých znaků počet určuje, zda má být použita zkrácená nebo úplná forma, ale může mít jiné možnosti, jak je uvedeno níže. </ P> -<p> Dvě samostatné uvozovky představují doslovnou jednoduchou citaci, ať už uvnitř, nebo mimo jednotlivé citace. Text v rámci jednotlivých uvozovek není interpretován žádným způsobem (s výjimkou dvou sousedních jednoduchých uvozovek). V opačném případě jsou všechna písmena ASCII od a do z a A až Z vyhrazena jako syntaktické znaky a vyžadují citování, pokud mají reprezentovat doslovné znaky. Kromě toho se některé znaky interpunkce ASCII mohou v budoucnu změnit (např. ":" Se interpretují jako oddělovač času a "/" jako oddělovač dat a na displeji se nahradí příslušnými znaky národního prostředí). <br /> < / p> -<table border = "1" šířka = "100%" cellpadding = "4" cellspacing = "0"> -<tr> <th width = "20%"> Kód </ th> <th> Význam </ th> </ tr> -<td> d </ td> <td> den jako číslo bez přední nuly (1 až 31) </ td> </ tr> -<tr> <td> dd </ td> <td> den jako číslo s počáteční nulou (01 až 31) </ td> </ tr> -<tr> <td> ddd </ td> <td> zkrácený název lokalizovaného dne (např. 'Mon' to 'Sun'). </ td> -<tr> <td> dddd </ td> <td> dlouhý název lokalizovaného dne (např. 'pondělí' až 'neděle). </ td> -<tr> <td> M </ td> <td> měsíc jako číslo bez přední nuly (1-12) </ td> </ tr> -<tr> <td> MM </ td> <td> měsíc jako číslo s počáteční nulou (01-12) </ td> </ tr> -<tr> <td> MMM </ td> <td> zkrácený název lokalizovaného měsíce (např. 'Jan' až 'Dec'). </ td> -<tr> <td> MMMM </ td> <td> dlouhý lokalizovaný název měsíce (např. 'Leden' až 'Prosinec'). </ td> -<td> yy </ td> <td> rok jako dvoumístné číslo (00-99) </ td> </ tr> -<yyyy </ td> <td> rok jako čtyřmístné číslo </ td> </ tr> -<td> h </ td> <td> hodina bez přední nuly (0 až 23 nebo 1 až 12 v případě zobrazení AM / PM) </ td> </ tr> -<td> hh </ td> <td> hodina s počáteční nulou (00 až 23 nebo 01 až 12, pokud je zobrazení AM / PM) </ td> </ tr> -<td> H </ td> <td> hodina bez přední nuly (0 až 23, i při zobrazení AM / PM) </ td> </ tr> -<hd> </ td> <td> hodina s počáteční nulou (00 až 23, dokonce i s displejem AM / PM) </ td> </ tr> -<tr> <td> m </ td> <td> minuta bez přední nuly (0 až 59) </ td> </ tr> -<tr> <td> mm </ td> <td> minuta s počáteční nulou (00 až 59) </ td> </ tr> -<tr> <td> s </ td> <td> druhé bez přední nuly (0 až 59) </ td> </ tr> -<tr> <td> ss </ td> <td> druhá s počáteční nulou (00 až 59) </ td> </ tr> -<td> </ td> <td> milisekundy bez předních nul (0 až 999) </ td> </ tr> -<td> zzz </ td> <td> milisekundy s předními nulami (000 až 999) </ td> </ tr> -<tr> <td> AP <i> nebo </ i> A </ td> <td> použijte zobrazení AM / PM. <b> A / AP </ b> bude nahrazeno buď "AM" nebo "PM". </ td> </ -<tr> <td> ap <i> nebo </ i> a </ td> <td> použijte zobrazení am / pm. <b> a / ap </ b> bude nahrazen buď "am" nebo "pm". </ td> </ -<tr> <td> t </ td> <td> časové pásmo (např. "CEST") </ td> -<tr> <td> T </ td> <td> offset z UTC </ td> </ tr> -<tr> <td> TT </ td> <td> časová zóna IANA id </ td> </ tr> -<tr> <td> TTT </ td> <td> zkratka časových pásem </ td> </ tr> -<tr> <td> TTTT </ td> <td> krátký zobrazovaný název časového pásma </ td> </ tr> -<tr> <td> TTTTT </ td> <td> dlouhý zobrazovaný název časového pásma </ td> </ tr> -<tr> <td> TTTTTT </ td> <td> vlastní název časového pásma. Můžete změnit kartu "Časové pásma" konfiguračního okna </ td> </ tr> </ table> -<br /> <b> Poznámky: </ b> <ul> <li> Všechny znaky ve vzoru, které nejsou v rozmezí ['a' .. 'z'] a ['A' '] bude považovány za citovaný text. Například znaky jako ':', '.', '', '#' A '@' se objeví ve výsledném textu, i když nejsou zahrnuty do jednotlivých uvozovek. Jediná citace se používá k úniku ypráv. Dvě jednoduché uvozovky v řadě, ať už uvnitř nebo vně citované sekvence, představují "skutečný" jediný citát. </ Li> <li> Minimální interval aktualizace je 1 sekunda. Pokud je z nebo zzz nakonfigurována, čas je zobrazen s milisekundovou frakcí, ale není aktualizován na milisekundách (vyhýbá se velkému výkonu). </ Li> <ul> - + diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_cy.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_cy.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_cy.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_cy.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -118,7 +118,7 @@ - + Custom name @@ -228,12 +228,22 @@ - + + Show &week numbers in popup calendar + + + + + S&how tooltip + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - + Input custom time zone name @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_da.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_da.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_da.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_da.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b><br/><font size="-2">'dddd, d. MMMM yyyy'</font>' @@ -118,7 +118,7 @@ - + Custom name Brugerdefineret navn @@ -228,12 +228,22 @@ &Roter automatisk når panelet er lodret - + + Show &week numbers in popup calendar + + + + + S&how tooltip + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b><br/><font size="-2">'dddd, d. MMMM yyyy'</font>' - + Input custom time zone name Input brugerdefineret tidszone og navn @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> @@ -284,43 +292,7 @@ <tr><td>TTTTTT</td><td>the timezone custom name. You can change it the 'Time zones' tab of the configuration window</td></tr></table> <br /><b>Notes:</b> <ul><li>Any characters in the pattern that are not in the ranges of ['a'..'z'] and ['A'..'Z'] will be treated as quoted text. For instance, characters like ':', '.', ' ', '#' and '@' will appear in the resulting time text even they are not enclosed within single quotes. The single quote is used to 'escape' letters. Two single quotes in a row, whether inside or outside a quoted sequence, represent a 'real' single quote.</li><li>Minimal update interval is 1 second. If z or zzz is configured time is shown with the milliseconds fraction, but not updated on millisecond basis (avoiding big performance hit).</li><ul> - <h1>Brugerdefineret syntaks til format med dato/klokkeslæt</h1> -<p>Et datomønster er en streng af tegn, hvor bestemte strenge af tegn erstattes af data om dato og klokkeslæt fra en kalender med formatering eller brugt til at generere data til en kalender når der parses.</p> -<p>Symboltabellen til datofeltet nedenfor indeholder tegnene som bruges i mønstre til at vise de rette formater for en given lokalitet, såsom yyyy for året. Tegnene kan bruges flere gange. F.eks. hvis y bruges til året, så kan 'yy' måske give '99', hvor 'yyyy' giver '1999'. Til de fleste nummerfeltet, angiver antallet af tegn feltets bredde. F.eks. hvis h er timen, så kan 'h' måske give '5', men 'hh' giver '05'. Ved nogle tegn angiver antallet om en forkortet eller fuld form skal bruges, men kan have andre valg, som givet nedenfor.</p> -<p>To enkelte citationstegn repræsenterer et literal enkelt citationstegn, enten inden i eller udenfor enkelte citationstegn. Tekst inden i enkelte citationstegn fortolkes ikke på nogen måde (undtagen to omgivende enkelte citationstegn). Ellers er alle ASCII-tegn fra a til z og A til Z reserveret som syntakstegn, og kræver citering hvis de skal repræsentere literal tegn. Derudover, kan bestemte ASCII-tegnsætningstegn blive variabler i fremtiden (f.eks. kan ":" fortolkes som klokkeslætsseparatoren og '/' som en datoseparator, og erstattes af respektive lokalitetsfølsomme tegn i visningen).<br /></p> -<table border="1" width="100%" cellpadding="4" cellspacing="0"> -<tr><th width="20%">Kode</th><th>Betydning</th></tr> -<tr><td>d</td><td>dagen som nummer uden et foranstillet nul (1 til 31)</td></tr> -<tr><td>dd</td><td>dagen som nummer med et foranstillet nul (01 til 31)</td></tr> -<tr><td>ddd</td><td>det forkortet oversatte navn på dagen (f.eks. 'Man' til 'Søn').</td></tr> -<tr><td>dddd</td><td>det lange oversatte navn på dagen (f.eks. 'Mandag' til 'Søndag').</td></tr> -<tr><td>M</td><td>måneden som nummer uden et foranstillet nul (1-12)</td></tr> -<tr><td>MM</td><td>måneden som nummer med et foranstillet nul (01-12)</td></tr> -<tr><td>MMM</td><td>det forkortet oversatte navn på måneden (f.eks. 'Jan' til 'Dec').</td></tr> -<tr><td>MMMM</td><td>det lange oversatte navn på måneden (f.eks. 'Januar' til 'December').</td></tr> -<tr><td>yy</td><td>året som nummer på 2 tegn (00-99)</td></tr> -<tr><td>yyyy</td><td>året som nummer på 4 tegn</td></tr> -<tr><td>h</td><td>timen uden et foranstillet nul (0 til 23 eller 1 til 12 hvis visning med AM/PM)</td></tr> -<tr><td>hh</td><td>timen med et foranstillet nul (00 til 23 eller 01 til 12 hvis visning med AM/PM)</td></tr> -<tr><td>H</td><td>timen uden et foranstillet nul (0 til 23, selv ved visning med AM/PM)</td></tr> -<tr><td>HH</td><td>timen med et foranstillet nul (00 til 23, selv ved visning med AM/PM)</td></tr> -<tr><td>m</td><td>minuttet uden et foranstillet nul (0 til 59)</td></tr> -<tr><td>mm</td><td>minuttet med et foranstillet nul (00 til 59)</td></tr> -<tr><td>s</td><td>sekundet uden et foranstillet nul (0 til 59)</td></tr> -<tr><td>ss</td><td>sekundet med et foranstillet nul (00 til 59)</td></tr> -<tr><td>z</td><td>millisekundet uden foranstillede nuller (0 til 999)</td></tr> -<tr><td>zzz</td><td>millisekundet med foranstillede nuller (000 til 999)</td></tr> -<tr><td>AP <i>eller</i> A</td><td>brug visning med AM/PM. <b>A/AP</b> erstattes enten med "AM" eller "PM".</td></tr> -<tr><td>ap <i>eller</i> a</td><td>brug visning med am/pm. <b>a/ap</b> erstattes enten med "am" eller "pm".</td></tr> -<tr><td>t</td><td>tidszonen (f.eks. "CEST")</td></tr> -<tr><td>T</td><td>forskydningen i forhold til UTC</td></tr> -<tr><td>TT</td><td>tidszonen IANA-id</td></tr> -<tr><td>TTT</td><td>tidszonen forkortelse</td></tr> -<tr><td>TTTT</td><td>tidszonen kort navn for visning</td></tr> -<tr><td>TTTTT</td><td>tidszonen langt navn for visning</td></tr> -<tr><td>TTTTTT</td><td>tidszonen tilpasset navn. Du kan ændre det med 'Tidszoner'-fanebladet i konfigurationsvinduet</td></tr></table> -<br /><b>Bemærkninger:</b> <ul><li>Tegn i mønsteret som ikke er i området ['a'..'z'] og ['A'..'Z'] behandles som citeret tekst. Tegn som f.eks. ':', '.', ' ', '#' og '@' vises i den resulterende tidstekst, selv hvis de ikke er omsluttet af enkelte citationstegn. Det enkelte citationstegn bruges til 'undvige' bogstaver. To enkelte citationstegn i træk, hvad enten de er inden i eller udenfor en citeret sætning, repræsenterer et 'ægte' enkelt citationstegn.</li><li>Mindste opdateringsinterval er 1 sekund. Hvis z eller zzz er konfigureret, så vises tiden med brøkdele af millisekunder, men opdateres ikke på basis af millisekunder (for at undgå reduceret ydelse).</li><ul> - + diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_de.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_de.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_de.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_de.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b><br/><font size="-2">'ttt, t MMM jjjj'<br/>'TT'</font>' @@ -14,7 +14,7 @@ World Clock Settings - Weltzeituhr-Einstellungen + Einstellungen der Weltzeituhr @@ -29,7 +29,7 @@ F&ormat: - F&ormat: + &Format: @@ -54,12 +54,12 @@ Sho&w seconds - Sek&unden anzeigen + &Zeige Sekunden Pad &hour with zero - Stunden mit fü&hrender Null + &Stundenanzeige mit führender Null @@ -108,7 +108,7 @@ Offset from UTC - Versatz zu UTC + Abweichung zur UTC @@ -123,7 +123,7 @@ - + Custom name Benutzerdefinierter Name @@ -150,12 +150,12 @@ Show &year - &Jahr anzeigen + Zeige &Jahr Show day of wee&k - &Wochentag anzeigen + &Zeige Wochentag @@ -170,7 +170,7 @@ Ad&vanced manual format - &Erweitertes Benutzerhandbuchsformat + &Erweitertes manuelles Format @@ -225,17 +225,27 @@ Auto&rotate when the panel is vertical - &Bei senkrechter Leiste automatisch drehen + &Bei vertikaler Leiste automatisch drehen - + + Show &week numbers in popup calendar + + + + + S&how tooltip + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - '<b>'HH:mm:ss'</b><br/><font size="-2">'ttt, t MMM jjjj'<br/>'TT'</font>' + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - + Input custom time zone name - Eingabe eines benutzerdefinierten Zeitzonennamens + Eingabe des Namens der benutzerdefinierten Zeitzone @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> @@ -292,7 +300,7 @@ World Clock Time Zones - Weltzeituhr-Zeitzonen + Zeitzonen der Weltzeituhr diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_el.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_el.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_el.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_el.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -118,7 +118,7 @@ - + Custom name Προσαρμοσμένο όνομα @@ -228,12 +228,22 @@ &Αυτόματη περιστροφή όταν ο πίνακας είναι τοποθετημένος κάθετα - + + Show &week numbers in popup calendar + Εμφάνιση των αριθμών &εβδομάδων στο αναδυόμενο ημερολόγιο + + + + S&how tooltip + Εμ&φάνιση υπόδειξης + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - + Input custom time zone name Εισαγωγή του προσαρμοσμένου ονόματος της ζώνης ώρας @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> @@ -304,12 +312,10 @@ <tr><td>hh</td><td>η ώρα με το αρχικό μηδενικό (00 ως 23 ή 01 ως 12 αν απεικονίζεται ως ΠΜ/ΜΜ)</td></tr> <tr><td>H</td><td>η ώρα με το αρχικό μηδενικό (0 ως 23, ακόμα και με απεικόνιση ως ΠΜ/ΜΜ)</td></tr> <tr><td>HH</td><td>η ώρα με το αρχικό μηδενικό (00 ως 23, ακόμα και με απεικόνιση ως ΠΜ/ΜΜ)</td></tr> -<tr><td>m</td><td>τα λεπτά δίχως το αρχικό μηδενικό (0 ως 59)</td></tr> -<tr><td>mm</td><td>τα λεπτά με το αρχικό μηδενικό (00 ως 59)</td></tr> +<tr><td>m</td><td>τα λεπτά δίχως το αρχικό μηδενικό (0 ως )</td></tr> +<tr><td>mm</td><td>τα λεπτά με το αρχικό μηδενικό (0 ως 59)</td></tr> <tr><td>s</td><td>τα δευτερόλεπτα δίχως το αρχικό μηδενικό (0 ως 59)</td></tr> <tr><td>ss</td><td>τα δευτερόλεπτα με το αρχικό μηδενικό (00 ως 59)</td></tr> -<tr><td>z</td><td>τα χιλιοστά δευτερολέπτου δίχως τα αρχικά μηδενικά (0 ως 999)</td></tr> -<tr><td>zzz</td><td>τα χιλιοστά δευτερολέπτου με τα αρχικά μηδενικά (000 ως 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>χρήση της απεικόνισης ως ΠΜ/ΜΜ. Τα <b>A/AP</b> θα αντικατασταθούν από "ΠΠ" ή "ΜΜ".</td></tr> <tr><td>ap <i>or</i> a</td><td>χρήση της απεικόνισης πμ/μμ. Τα <b>a/ap</b> θα αντικατασταθούν από τα "πμ" ή "μμ".</td></tr> <tr><td>t</td><td>η ζώνη ώρας (π.χ. "CEST")</td></tr> diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_es.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_es.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_es.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_es.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -14,7 +14,7 @@ World Clock Settings - Configuración de Reloj mundial + Configuración del reloj mundial @@ -118,7 +118,7 @@ - + Custom name Nombre personalizado @@ -228,12 +228,22 @@ &Rotar automáticamente cuando el panel esté vertical - + + Show &week numbers in popup calendar + + + + + S&how tooltip + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - + Input custom time zone name Introduzca el nombre personalizado de la zona horaria @@ -243,7 +253,7 @@ World Clock Manual Format Configuration - + Configuración manual del formato del reloj mundial @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> @@ -284,43 +292,7 @@ <tr><td>TTTTTT</td><td>the timezone custom name. You can change it the 'Time zones' tab of the configuration window</td></tr></table> <br /><b>Notes:</b> <ul><li>Any characters in the pattern that are not in the ranges of ['a'..'z'] and ['A'..'Z'] will be treated as quoted text. For instance, characters like ':', '.', ' ', '#' and '@' will appear in the resulting time text even they are not enclosed within single quotes. The single quote is used to 'escape' letters. Two single quotes in a row, whether inside or outside a quoted sequence, represent a 'real' single quote.</li><li>Minimal update interval is 1 second. If z or zzz is configured time is shown with the milliseconds fraction, but not updated on millisecond basis (avoiding big performance hit).</li><ul> - <h1>Formato de fecha/hora personalizado</h1> -<p>Un patrón de fecha es una cadena de caracteres, donde determinadas cadenas de caracteres son sustituidas con los datos de fecha y hora de un calendario al ser formateadas o usadas para generar datos para un calendario al ser procesadas.</p> -<p>La tabla de símbolos de campos de fecha de abajo contiene los caracteres usados en patrones para mostrar los formatos apropiados para una configuración regional dada, tales como «yyyy» para el año. Los caracteres se pueden usar varias veces. Por ejemplo, si «y» se usa para el año, «yy» puede resultar en «99», mientras que «yyyy» resultaría en «1999». Para la mayoría de campos numéricos, el número de caracteres especifica el ancho del campo. Por ejemplo, si «h» es la hora, «h» puede resultar en «5», pero «hh» resultaría en «05». Para algunos caracteres, su número especifica si se debe usar un formato abreviado o completo, aunque pueden tener otras opciones, como se muestra abajo.</p> -<p>Dos comillas simples representan una comilla simple literal, tanto dentro como fuera de comillas simples. El texto entre comillas simples no se interpreta de ninguna forma (salvo que sean dos comillas simples juntas). Por otro lado, todas las letras del código ASCII de la «a» a la «z» y de la «A» a la «Z» están reservadas como caracteres sintácticos, y deben entrecomillarse si se quieren representar literalmente. Además, algunos caracteres de puntuación del código ASCII pueden variar en el futuro (p. ej., que «:» se interprete como separador en horas y «/» como separador de fechas, y que se sustituyan por caracteres ajustados a la configuración regional al ser representados).<br /></p> -<table border="1" width="100%" cellpadding="4" cellspacing="0"> -<tr><th width="20%">Código</th><th>Significado</th></tr> -<tr><td>d</td><td>el día como un número sin cero de relleno (1 a 31)</td></tr> -<tr><td>dd</td><td>el día como un número con cero de relleno (01 a 31)</td></tr> -<tr><td>ddd</td><td>el nombre abreviado del día en la configuración regional (p. ej. 'Lun' a 'Dom').</td></tr> -<tr><td>dddd</td><td>el nombre completo del día en la configuración regional (p. ej. 'Lunes' a 'Domingo').</td></tr> -<tr><td>M</td><td>el mes como un número sin cero de relleno (1-12)</td></tr> -<tr><td>MM</td><td>el mes como un número con cero de relleno (01-12)</td></tr> -<tr><td>MMM</td><td>el nombre abreviado del mes en la configuración regional (p. ej. 'Ene' a 'Dic').</td></tr> -<tr><td>MMMM</td><td>el nombre completo del mes en la configuración regional (p. ej. 'Enero' a 'Diciembre').</td></tr> -<tr><td>yy</td><td>el año como un número de dos dígitos (00-99)</td></tr> -<tr><td>yyyy</td><td>el año como un número de cuatro dígitos</td></tr> -<tr><td>h</td><td>la hora sin cero de relleno (0 a 23 o 1 a 12 en formato AM/PM)</td></tr> -<tr><td>hh</td><td>la hora con cero de relleno (00 a 23 o 01 a 12 en formato AM/PM)</td></tr> -<tr><td>H</td><td>la hora sin cero de relleno (0 a 23, incluso en formato AM/PM)</td></tr> -<tr><td>HH</td><td>la hora con cero de relleno (00 a 23, incluso en formato AM/PM)</td></tr> -<tr><td>m</td><td>el minuto sin cero de relleno (0 a 59)</td></tr> -<tr><td>mm</td><td>el minuto con cero de relleno (00 a 59)</td></tr> -<tr><td>s</td><td>el segundo sin cero de relleno (0 a 59)</td></tr> -<tr><td>ss</td><td>el segundo con cero de relleno (00 a 59)</td></tr> -<tr><td>z</td><td>los milisegundos sin ceros de relleno (0 a 999)</td></tr> -<tr><td>zzz</td><td>los milisegundos con ceros de relleno (000 a 999)</td></tr> -<tr><td>AP <i>o</i> A</td><td>usa el formato AM/PM. <b>A/AP</b> se sustituirán por "AM" o "PM".</td></tr> -<tr><td>ap <i>o</i> a</td><td>usa el formato am/pm. <b>a/ap</b> se sustituirán por "am" o "pm".</td></tr> -<tr><td>t</td><td>la zona horaria (p. ej. "CEST")</td></tr> -<tr><td>T</td><td>el desfase respecto UTC</td></tr> -<tr><td>TT</td><td>el identificador de zona horaria de la IANA</td></tr> -<tr><td>TTT</td><td>la forma abreviada de la zona horaria</td></tr> -<tr><td>TTTT</td><td>el nombre corto de la zona horaria</td></tr> -<tr><td>TTTTT</td><td>el nombre completo de la zona horaria</td></tr> -<tr><td>TTTTTT</td><td>el nombre personalizado de la zona horaria. Puede cambiarlo en la pestaña «Zonas horarias» de la ventana de configuración</td></tr></table> -<br /><b>Notas:</b> <ul><li>Cualquiera de los caracteres del patrón que no esté en los rangos ['a'..'z'] y ['A'..'Z'] se trata como un texto entrecomillado. Por ejemplo, caracteres como ':', '.', ' ', '#' y '@' aparecen en el texto resultante de la hora incluso si no están entrecomillados entre comillas simples. La comilla simple se usa para quitar el significado especial de las letras. Dos comillas simples seguidas, tanto dentro como fuera de una secuencia entrecomillada, representan una comilla simple «real».</li><li>El intervalo mínimo de actualización es de 1 segundo. Si se usa «z» o «zzz», la hora muestra los milisegundos, pero no se actualiza cada milisegundo (para evitar una gran penalización en el rendimiento).</li><ul> - + @@ -328,7 +300,7 @@ World Clock Time Zones - Zonas horarias del Reloj mundial + Zonas horarias del reloj mundial diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_fr.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_fr.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_fr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_fr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b> <br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -36,14 +36,14 @@ Short - Court + 12h Long - Long(s) + 24h @@ -123,7 +123,7 @@ - + Custom name Nom personnalisé @@ -175,7 +175,7 @@ &Customise ... - &Personnaliser ... + &Personnaliser... @@ -190,7 +190,7 @@ &Add ... - &Ajouter ... + &Ajouter... @@ -228,12 +228,22 @@ Auto&rotation lorsque le panneau est vertical - + + Show &week numbers in popup calendar + Afficher les numéros de &semaine dans le calendrier contextuel + + + + S&how tooltip + Montrer les infobulles + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b> <br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - + Input custom time zone name Entrez le nom du fuseau horaire personnalisé @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> @@ -284,42 +292,40 @@ <tr><td>TTTTTT</td><td>the timezone custom name. You can change it the 'Time zones' tab of the configuration window</td></tr></table> <br /><b>Notes:</b> <ul><li>Any characters in the pattern that are not in the ranges of ['a'..'z'] and ['A'..'Z'] will be treated as quoted text. For instance, characters like ':', '.', ' ', '#' and '@' will appear in the resulting time text even they are not enclosed within single quotes. The single quote is used to 'escape' letters. Two single quotes in a row, whether inside or outside a quoted sequence, represent a 'real' single quote.</li><li>Minimal update interval is 1 second. If z or zzz is configured time is shown with the milliseconds fraction, but not updated on millisecond basis (avoiding big performance hit).</li><ul> - <h1>Syntaxe du format de date/heure personnalisé</h1> -<p>Un modèle de date est une chaîne de caractères, des chaînes spécifiques étant remplacées par les données de date et d'heure d'un calendrier lors du formatage ou utilisées pour générer des données pour un calendrier lors de l'analyse.</p> -<p>La table des symboles de champ de date ci-dessous contient les caractères utilisés dans les modèles pour afficher les formats appropriés pour un environnement local donné, tel que yyyy pour l'année. Les caractères peuvent être utilisés plusieurs fois. Par exemple, si y est utilisé pour l'année, "yy" peut produire "99", alors que "yyyy" produit "1999". Pour la plupart des champs numériques, le nombre de caractères spécifie la largeur du champ. Par exemple, si h est l'heure, "h" peut produire "5", mais "hh" produit "05". Pour certains caractères, le nombre indique si une forme abrégée ou complète doit être utilisée, mais peut avoir d'autres choix, comme indiqué ci-dessous.</P> -<p>Deux citations simples représentent une citation unique littérale, à l'intérieur ou à l'extérieur de citations simples. Le texte entre guillemets simples n'est interprété d'aucune façon (à l'exception de deux guillemets simples adjacents). Sinon, toutes les lettres ASCII de a à z et de A à Z sont réservées en tant que caractères de syntaxe et nécessitent une citation si elles doivent représenter des caractères littéraux. De plus, certains caractères de ponctuation ASCII risquent de devenir variables à l'avenir (par exemple, ":" étant interprété comme séparateur d'heure et '/' comme séparateur de date, et remplacé par des caractères respectifs respectant les paramètres régionaux).<br/></p> + <h1>Syntaxe du format de date/heure personnalisé</h1> +<p>Un modèle de date est une chaîne de caractères, dans laquelle des chaînes de caractères spécifiques sont remplacées par des données de date et d'heure d'un calendrier lors du formatage ou utilisées pour générer des données pour un calendrier lors de l'analyse.</p> +<p>Le tableau des symboles de champ de date ci-dessous contient les caractères utilisés dans les modèles pour afficher les formats appropriés pour un paramètre régional donné, tel que yyyy pour l'année. Les caractères peuvent être utilisés plusieurs fois. Par exemple, si y est utilisé pour l'année, «yy» peut produire «99», tandis que «yyyy» produit «1999». Pour la plupart des champs numériques, le nombre de caractères spécifie la largeur du champ. Par exemple, si h est l'heure, «h» peut produire «5», mais «hh» produit «05». Pour certains caractères, le décompte spécifie si une forme abrégée ou complète doit être utilisée, mais il peut y avoir d'autres choix, comme indiqué ci-dessous.</p> +<p>Deux guillemets simples représentent un guillemet simple littéral, à l'intérieur ou à l'extérieur des guillemets simples. Le texte entre guillemets simples n'est en aucun cas interprété (à l'exception de deux guillemets simples adjacents). Sinon, toutes les lettres ASCII de a à z et de A à Z sont réservées en tant que caractères de syntaxe et nécessitent des guillemets si elles doivent représenter des caractères littéraux. De plus, certains caractères de ponctuation ASCII peuvent devenir variables à l'avenir (par ex, ":" étant interprété comme le séparateur d'heure et "/" comme un séparateur de date, et remplacé par des caractères sensibles aux paramètres régionaux respectifs affichés).<br /></p> <table border="1" width="100%" cellpadding="4" cellspacing="0"> -<tr> th width = "20%"> Code </ th> <th> Signification </ th> </ tr> -<tr><td>d</td><td>le jour en tant que nombre sans zéro (1 à 31)</td></tr> -<tr><td>dd</td><td>le jour sous forme de nombre avec un zéro (01 à 31) </td></tr> -<tr><td>ddd</td><td>nom abrégé du jour localisé (par exemple, "Mon" à "Soleil").</td></tr> -<tr><td>dddd</td><td>le nom de jour long localisé (par exemple, "lundi" à "dimanche").</td></tr> -<tr><td>M</td><td>le mois sous la forme d'un nombre sans zéro (1-12)</td></tr> -<tr><td>MM</td><td>le mois sous la forme d'un nombre avec un zéro (01-12)</td></tr> -<tr><td>MMM</td><td>nom abrégé du mois localisé (par exemple, "Jan" à "Déc").</td></tr> -<tr><td>MMMM</td><td>nom de mois long localisé (par exemple, "janvier" à "décembre").</td></tr> -<tr><td>yy</td><td>l'année sous forme de numéro à deux chiffres (00-99)</td></tr> -<tr><td>aaaa</td><td>l'année sous forme de numéro à quatre chiffres</td></tr> -<tr><td>h</ td><td>l'heure sans zéro (0 à 23 ou 1 à 12 si affichage AM/PM)</td></tr> -<tr><td>hh</td><td>l'heure précédée d'un zéro (00 à 23 ou 01 à 12 si affichage AM/PM)</td></tr> -<tr><td> H </ td><td>l'heure sans zéro (0 à 23, même avec l'affichage AM / PM) </ td> </ tr> -<tr><td> HH </ td><td>l'heure avec un zéro non significatif (00 à 23, même avec l'affichage AM/PM) </td></tr> -<tr><td>m</td><td>la minute sans zéro (0 à 59)</td></ tr> -<tr><td>mm</td><td>la minute précédée d'un zéro (00 à 59)</td></ tr> -<tr><td>s</td><td>la seconde sans zéro (0 à 59)</td></tr> -<tr><td>ss</td><td>le deuxième avec un zéro non significatif (00 à 59)</td></tr> -<tr><td>z</td><td>les millisecondes sans zéros au début (0 à 999)</td></tr> -<tr><td>zzz</td><td>les millisecondes avec des zéros non significatifs (000 à 999)</td></tr> -<tr><td>AP<i>ou</i>A</td><td>utilise l'affichage AM/PM.<b>A/AP</b>sera remplacé par "AM" ou "PM".</td></tr> -<tr><td>ap<i>ou</i>a</td><td>utilise l'affichage am/pm.<b>a/ap</b>sera remplacé par "am" ou "pm".</td></tr> -<tr><td>t</ td><td>le fuseau horaire (par exemple, "CEST")</td></tr> +<tr><th width="20%">Code</th><th>Signification</th></tr> +<tr><td>d</td><td>le jour sous forme de nombre sans zéro non significatif (1 à 31)</td></tr> +<tr><td>dd</td><td>le jour sous forme de nombre avec un zéro non significatif (01 à 31)</td></tr> +<tr><td>ddd</td><td>le nom abrégé du jour localisé (ex, 'Lun' à 'Dim').</td></tr> +<tr><td>dddd</td><td>le nom complet du jour localisé (ex, 'Lundi' à 'Dimanche').</td></tr> +<tr><td>M</td><td>le mois sous forme de nombre sans zéro non significatif (1-12)</td></tr> +<tr><td>MM</td><td>le mois sous forme de nombre avec zéro non significatif (01-12)</td></tr> +<tr><td>MMM</td><td>le nom abrégé du mois localisé (ex, 'Jan' à 'Déc').</td></tr> +<tr><td>MMMM</td><td>le nom complet du mois localisé ( 'Janvier' à 'Décembre').</td></tr> +<tr><td>yy</td><td>l'année sous forme de nombre à deux chiffres (00-99)</td></tr> +<tr><td>yyyy</td><td>l'année sous forme de nombre à quatre chiffres</td></tr> +<tr><td>h</td><td>l'heure sans zéro non significatif (0 à 23 ou 1 à 12 si affichage AM/PM)</td></tr> +<tr><td>hh</td><td>l'heure avec zéro non significatif (00 à 23 ou 01 à 12 si affichage AM/PM)</td></tr> +<tr><td>H</td><td>l'heure sans zéro non significatif (0 à 23, même si affichage AM/ PM)</td></tr> +<tr><td>HH</td><td>l'heure avec un zéro non significatif (00 à 23, même si affichage AM/PM)</td></tr> +<tr><td>m</td><td>la minute sans zéro non significatif (0 à 59)</td></tr> +<tr><td>mm</td><td>la minute avec un zéro non significatif (00 à 59)</td></tr> +<tr><td>s</td><td>la seconde sans zéro non significatif (0 à 59)</td></tr> +<tr><td>ss</td><td>le second avec un zéro non significatif (00 à 59)</td></tr> +<tr><td>AP <i>ou</i> A</td><td>utiliser l'affichage AM / PM. <b>A/AP</b> sera remplacé par "AM" ou "PM".</td></tr> +<tr><td>ap <i>ou</i> a</td><td>utiliser l'affichage am/pm <b>a/ap</b> sera remplacé par "am" ou "pm".</td></tr> +<tr><td>t</td><td>le fuseau horaire (par exemple "CEST")</td></tr> <tr><td>T</td><td>le décalage par rapport à UTC</td></tr> <tr><td>TT</td><td>l'identifiant IANA du fuseau horaire</td></tr> -<tr><td>TTT</td><td>l'abréviation du fuseau horaire</td></tr> -<tr><td>TTTT</td><td>nom d'affichage abrégé du fuseau horaire</td></tr> -<tr><td>TTTTT</td><td>nom d'affichage complet du fuseau horaire</td></tr> -<tr><td>TTTTTT</td><td>le nom personnalisé du fuseau horaire. Vous pouvez modifier l'onglet "Fuseaux horaires" de la fenêtre de configuration</td></tr></table> -<br/><b>Remarques:</b><ul><li>Tous les caractères du modèle qui ne figurent pas dans les plages de ['a' .. 'z'] et de '' A '..' Z '] sera traité comme un texte cité. Par exemple, des caractères tels que ':', '.', '', '#' Et '@' apparaîtront dans le texte temporel résultant, même s'ils ne sont pas entourés de guillemets simples. La citation simple est utilisée pour "échapper" aux lettres. Deux guillemets simples à la suite, que ce soit à l'intérieur ou à l'extérieur d'une séquence citée, représentent un guillemet simple "réel".</Li><li>L'intervalle de mise à jour minimal est de 1 seconde. Si z ou zzz est configuré, l'heure est indiquée avec la fraction en millisecondes, mais n'est pas mise à jour sur une base milliseconde (évitant ainsi de nuire aux performances).</Li><ul> +<tr><td>TTT</td><td>l'abréviation du fuseau horraire</td></tr> +<tr><td>TTTT</td><td>le nom d'affichage court du fuseau horaire</td></tr> +<tr><td>TTTTT</td><td>le nom d'affichage long du fuseau horaire</td></tr> +<tr><td>TTTTTT</td><td>le nom personnalisé du fuseau horaire. Modifiable dans l'onglet 'Fuseaux horaires' de la fenêtre de configuration</td></tr></table> +<br /><b>Notes:</b> <ul><li>Tous les caractères du motif qui ne sont pas dans les plages ['a' .. 'z'] et ['A' .. 'Z'] seront traités comme du texte entre guillemets. Par exemple, des caractères comme «:», «.», «,», «#» Et «@» apparaîtront dans le texte temporel résultant même s'ils ne sont pas entourés de guillemets simples. Le guillemet simple est utilisé pour «échapper» les lettres. Deux guillemets simples dans une ligne, que ce soit à l'intérieur ou à l'extérieur d'une séquence entre guillemets, représentent un guillemet simple «réel». </li><li> L'intervalle de mise à jour minimal est de 1 seconde. Si z ou zzz est configuré, le temps est affiché avec la fraction de millisecondes, mais il n'est pas mis à jour sur une base de millisecondes (évitant de gros problèmes de performances).</li><ul> diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_gl.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_gl.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_gl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_gl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d de MMM de yyyy'<br/>'TT'</font>' @@ -118,7 +118,7 @@ - + Custom name Nome personalizado @@ -210,12 +210,12 @@ Move &up - Mover cara a&rriba + Mover cara a a&rriba Move do&wn - Mover cara a&baixo + Mover cara a a&baixo @@ -228,12 +228,22 @@ &Rotar automaticamente cando o panel estea en vertical - + + Show &week numbers in popup calendar + + + + + S&how tooltip + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d de MMM de yyyy'<br/>'TT'</font>' - + Input custom time zone name Insira o nome personalizado do fuso horario @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> @@ -284,43 +292,7 @@ <tr><td>TTTTTT</td><td>the timezone custom name. You can change it the 'Time zones' tab of the configuration window</td></tr></table> <br /><b>Notes:</b> <ul><li>Any characters in the pattern that are not in the ranges of ['a'..'z'] and ['A'..'Z'] will be treated as quoted text. For instance, characters like ':', '.', ' ', '#' and '@' will appear in the resulting time text even they are not enclosed within single quotes. The single quote is used to 'escape' letters. Two single quotes in a row, whether inside or outside a quoted sequence, represent a 'real' single quote.</li><li>Minimal update interval is 1 second. If z or zzz is configured time is shown with the milliseconds fraction, but not updated on millisecond basis (avoiding big performance hit).</li><ul> - <h1>Formato personalizado da data/hora</h1> -<p>Un patrón de data é unha cadea de caracteres, onde as cadeas específicas de caracteres substitúense por datos de data e hora dun calendario cando se formatan ou se utilizan para xerar datos para un calendario ao seren procesadas.</p> -<p>A táboa de símbolos de campos de data de embaixo contén os caracteres usados en patróns para amosar os formatos apropiados para unha configuración rexional dada, tales como «yyyy» para o ano. Os caracteres poden usarse varias veces. Por exemplo, usándose «y» para o ano, «yy» da como resultado «99», mentres que «yyyy» daría como resultado «1999». Para a maioría de campos numéricos, o número de caracteres especifica o largo do campo. Por exemplo, sendo «h» a hora, «h» da como resultado «5», mais «hh» resultaría seren «05». Para algúns caracteres, o seu número especifica se debe usarse un formato abreviado ou completo, aínda que poden ter outras opcións, como se amosa embaixo.</p> -<p>Dúas comiñas simples representan unha comiña literal única, tanto dentro como fora de comiñas simples. O texto entre comiñas simples non se interpreta de ningunha forma (salvo que sexan dúas comiñas simples xuntas). Por outra banda, todas as letras do código ASCII da «a» ata a «z» e da «A» ata a «Z» están reservadas como caracteres sintácticos, e deben entrecomiñarse se se queren representar literalmente. Ademais, algúns caracteres de puntuación do código ASCII poden variar o futuro (p. ex., que «:» se interprete como separador en horas e «/» como separador de datas, e que se substitúan por caracteres axustados á configuración rexional ao seren representados).<br /></p> -<table border="1" width="100%" cellpadding="4" cellspacing="0"> -<tr><th width="20%">Código</th><th>Significado</th></tr> -<tr><td>d</td><td>o día coma un número sen cero de recheo (1 a 31)</td></tr> -<tr><td>dd</td><td>o día coma un número con cero de recheo (01 a 31)</td></tr> -<tr><td>ddd</td><td>o nome abreviado do día na configuración rexional (p. ex. «lun» a «dom»).</td></tr> -<tr><td>dddd</td><td>o nome completo do día na configuración rexional (p. ex. «luns» a domingo»).</td></tr> -<tr><td>M</td><td>o mes coma un número sen cero de recheo (1-12)</td></tr> -<tr><td>MM</td><td>o mes coma un número con cero de recheo (01-12)</td></tr> -<tr><td>MMM</td><td>o nome abreviado do mes na configuración rexional (p. ex. «xan» a «dec»).</td></tr> -<tr><td>MMMM</td><td>o nome completo do mes na configuración rexional (p. ex. «xaneiro» a «decembro»).</td></tr> -<tr><td>yy</td><td>o ano coma un número de dous díxitos (00-99)</td></tr> -<tr><td>yyyy</td><td>o ano coma un número de catro díxitos</td></tr> -<tr><td>h</td><td>a hora sen cero de recheo (0 a 23 ou 1 a 12 en formato AM/PM)</td></tr> -<tr><td>hh</td><td>a hora con cero de recheo (00 a 23 ou 01 a 12 en formato AM/PM)</td></tr> -<tr><td>H</td><td>a hora sen cero de recheo (0 a 23, incluso en formato AM/PM)</td></tr> -<tr><td>HH</td><td>a hora con cero de recheo (00 a 23, incluso en formato AM/PM)</td></tr> -<tr><td>m</td><td>o minuto sen cero de recheo (0 a 59)</td></tr> -<tr><td>mm</td><td>o minuto con cero de recheo (00 a 59)</td></tr> -<tr><td>s</td><td>o segundo sen cero de recheo (0 a 59)</td></tr> -<tr><td>ss</td><td>o segundo con cero de recheo (00 a 59)</td></tr> -<tr><td>z</td><td>os milisegundos sen ceros de recheo (0 a 999)</td></tr> -<tr><td>zzz</td><td>os milisegundos con ceros de recheo (000 a 999)</td></tr> -<tr><td>AP <i>ou</i> A</td><td>usa o formato AM/PM. <b>A/AP</b> substituiranse por «AM» ou «PM».</td></tr> -<tr><td>ap <i>ou</i> a</td><td>usa o formato am/pm. <b>a/ap</b> substituiranse por «am» ou «pm».</td></tr> -<tr><td>t</td><td>o fuso horario (p. ex. «CEST»)</td></tr> -<tr><td>T</td><td>a desviación respecto UTC</td></tr> -<tr><td>TT</td><td>o identificador de fuso horario da IANA</td></tr> -<tr><td>TTT</td><td>o formato abreviado do fuso horario</td></tr> -<tr><td>TTTT</td><td>o nome curto do fuso horario</td></tr> -<tr><td>TTTTT</td><td>o nome completo do fuso horario</td></tr> -<tr><td>TTTTTT</td><td>o nombre personalizado do fuso horario. Pode cambialo na lapela «Fusos horarios» da xanela de configuración</td></tr></table> -<br /><b>Notas:</b> <ul><li>Calquera dos caracteres do patrón que non estea nos intervalos ['a'..'z'] e ['A'..'Z'] tratase coma un texto entrecomiñado. Por exemplo, caracteres como «:», «.», « », «#» e «@» aparecen no texto resultante da hora incluso se non están entrecomiñados entre comiñas simples. A comiña simple usase para retirar o significado especial das letras. Dúas comiñas simples seguidas, tanto dentro como fora dunha secuencia entrecomiñada, representan unha comiña simple «real».</li><li>O intervalo mínimo de actualización é de 1 segundo. Se se usa «z» ou «zzz», a hora amosa os milisegundos, mais non se actualiza cada milisegundo (para evitar una gran penalización no rendemento).</li><ul> - + diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_he.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_he.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_he.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_he.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -118,7 +118,7 @@ - + Custom name שם בהתאמה אישית @@ -228,12 +228,22 @@ להטות אוטומטית כאשר הלוח א&נכי - + + Show &week numbers in popup calendar + הצגת מ&ספרי שבועות בלוח השנה הקופץ + + + + S&how tooltip + ה&צגת חלונית עצה + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' ‎'<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>'‎ - + Input custom time zone name להקליד שם של אזור זמן מותאם אישית @@ -243,7 +253,7 @@ World Clock Manual Format Configuration - + הגדרות תצורה ידנית של שעון עולמי @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> @@ -284,7 +292,41 @@ <tr><td>TTTTTT</td><td>the timezone custom name. You can change it the 'Time zones' tab of the configuration window</td></tr></table> <br /><b>Notes:</b> <ul><li>Any characters in the pattern that are not in the ranges of ['a'..'z'] and ['A'..'Z'] will be treated as quoted text. For instance, characters like ':', '.', ' ', '#' and '@' will appear in the resulting time text even they are not enclosed within single quotes. The single quote is used to 'escape' letters. Two single quotes in a row, whether inside or outside a quoted sequence, represent a 'real' single quote.</li><li>Minimal update interval is 1 second. If z or zzz is configured time is shown with the milliseconds fraction, but not updated on millisecond basis (avoiding big performance hit).</li><ul> - + <h1>תחביר תאריך\שעה מותאם אישית </h1> +<p>A date pattern is a string of characters, where specific strings of characters are replaced with date and time data from a calendar when formatting or used to generate data for a calendar when parsing.</p> +<p>The Date Field Symbol Table below contains the characters used in patterns to show the appropriate formats for a given locale, such as yyyy for the year. Characters may be used multiple times. For example, if y is used for the year, 'yy' might produce '99', whereas 'yyyy' produces '1999'. For most numerical fields, the number of characters specifies the field width. For example, if h is the hour, 'h' might produce '5', but 'hh' produces '05'. For some characters, the count specifies whether an abbreviated or full form should be used, but may have other choices, as given below.</p> +<p>Two single quotes represents a literal single quote, either inside or outside single quotes. Text within single quotes is not interpreted in any way (except for two adjacent single quotes). Otherwise all ASCII letter from a to z and A to Z are reserved as syntax characters, and require quoting if they are to represent literal characters. In addition, certain ASCII punctuation characters may become variable in the future (eg ":" being interpreted as the time separator and '/' as a date separator, and replaced by respective locale-sensitive characters in display).<br /></p> +<table border="1" width="100%" cellpadding="4" cellspacing="0"> +<tr><th width="20%">Code</th><th>Meaning</th></tr> +<tr><td>d</td><td>the day as number without a leading zero (1 to 31)</td></tr> +<tr><td>dd</td><td>the day as number with a leading zero (01 to 31)</td></tr> +<tr><td>ddd</td><td>the abbreviated localized day name (e.g. 'Mon' to 'Sun').</td></tr> +<tr><td>dddd</td><td>the long localized day name (e.g. 'Monday' to 'Sunday').</td></tr> +<tr><td>M</td><td>the month as number without a leading zero (1-12)</td></tr> +<tr><td>MM</td><td>the month as number with a leading zero (01-12)</td></tr> +<tr><td>MMM</td><td>the abbreviated localized month name (e.g. 'Jan' to 'Dec').</td></tr> +<tr><td>MMMM</td><td>the long localized month name (e.g. 'January' to 'December').</td></tr> +<tr><td>yy</td><td>the year as two digit number (00-99)</td></tr> +<tr><td>yyyy</td><td>the year as four digit number</td></tr> +<tr><td>h</td><td>the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display)</td></tr> +<tr><td>hh</td><td>the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display)</td></tr> +<tr><td>H</td><td>the hour without a leading zero (0 to 23, even with AM/PM display)</td></tr> +<tr><td>HH</td><td>the hour with a leading zero (00 to 23, even with AM/PM display)</td></tr> +<tr><td>m</td><td>the minute without a leading zero (0 to 59)</td></tr> +<tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> +<tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> +<tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> +<tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> +<tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> +<tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> +<tr><td>T</td><td>the offset from UTC</td></tr> +<tr><td>TT</td><td>the timezone IANA id</td></tr> +<tr><td>TTT</td><td>the timezone abbreviation</td></tr> +<tr><td>TTTT</td><td>the timezone short display name</td></tr> +<tr><td>TTTTT</td><td>the timezone long display name</td></tr> +<tr><td>TTTTTT</td><td>the timezone custom name. You can change it the 'Time zones' tab of the configuration window</td></tr></table> +<br /><b>הערות:</b> <ul><li>Any characters in the pattern that are not in the ranges of ['a'..'z'] and ['A'..'Z'] will be treated as quoted text. For instance, characters like ':', '.', ' ', '#' and '@' will appear in the resulting time text even they are not enclosed within single quotes. The single quote is used to 'escape' letters. Two single quotes in a row, whether inside or outside a quoted sequence, represent a 'real' single quote.</li><li>Minimal update interval is 1 second. If z or zzz is configured time is shown with the milliseconds fraction, but not updated on millisecond basis (avoiding big performance hit).</li><ul> + diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_hr.desktop lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_hr.desktop --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_hr.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[hr]=Svjetski sat +Comment[hr]=Priključak za svjetski sat. diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_hr.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_hr.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_hr.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_hr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,342 @@ + + + + + LXQtWorldClock + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' + '<b>'HH:mm:ss'</b><br/><font size="-2">'dddd, d. MMMM yyyy.'<br/>'TT'</font>' + + + + LXQtWorldClockConfiguration + + + World Clock Settings + Svjetski sat – Postavke + + + + Display &format + &Format prikaza + + + + &Time + &Vrijeme + + + + F&ormat: + F&ormat: + + + + + + Short + Kratki + + + + + + Long + Dugi + + + + + Custom + Prilagođeni + + + + Sho&w seconds + Prikaži se&kunde + + + + Pad &hour with zero + Prikaži sate dvoznamenkasto + + + + T&ime zone + &Vremenska zona + + + + &Position: + &Položaj: + + + + For&mat: + For&mat: + + + + + Below + Ispod + + + + + Above + Iznad + + + + + Before + Ispred + + + + + After + Iza + + + + Offset from UTC + Odmak od UTC-a + + + + Abbreviation + Kratica + + + + IANA id + IANA id + + + + + + Custom name + Prilagođeno ime + + + + &Use 12-hour format + &Koristi 12-satni format + + + + Location identifier + Identifikator mjesta + + + + &Date + &Datum + + + + Po&sition: + P&oložaj: + + + + Fo&rmat: + Fo&rmat: + + + + ISO 8601 + ISO 8601 + + + + Show &year + Prikaži godin&u + + + + Show day of wee&k + Pri&kaži dan u tjednu + + + + Pad d&ay with zero + Prikaži datum d&ana dvoznamenkasto + + + + &Long month and day of week names + &Ispiši mjesec i dan tjedna + + + + Ad&vanced manual format + Napredni &ručni format + + + + &Customise ... + Pri&lagodi … + + + + Time &zones + Vremenske &zone + + + + &Add ... + Dod&aj … + + + + &Remove + &Ukloni + + + + Set as &default + Postavi kao sta&ndardno + + + + &Edit custom name ... + Ure&di prilagođeno ime … + + + + Move &up + Premjesti prema &gore + + + + Move do&wn + Premjesti prema &dolje + + + + &General + &Opće + + + + Auto&rotate when the panel is vertical + Automatski ok&reni kad ploča stoji okomito + + + + Show &week numbers in popup calendar + Prikaži &brojeve tjedana u skočnom kalendaru + + + + S&how tooltip + Prikaži savjetni o&blačić + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' + '<b>'HH:mm:ss'</b><br/><font size="-2">'dddd, d. MMMM yyyy.'<br/>'TT'</font>' + + + + Input custom time zone name + Upiši prilagođeno ime vremenske zone + + + + LXQtWorldClockConfigurationManualFormat + + + World Clock Manual Format Configuration + Priručnik za svjetski sat – Konfiguriranje formata + + + + <h1>Custom Date/Time Format Syntax</h1> +<p>A date pattern is a string of characters, where specific strings of characters are replaced with date and time data from a calendar when formatting or used to generate data for a calendar when parsing.</p> +<p>The Date Field Symbol Table below contains the characters used in patterns to show the appropriate formats for a given locale, such as yyyy for the year. Characters may be used multiple times. For example, if y is used for the year, 'yy' might produce '99', whereas 'yyyy' produces '1999'. For most numerical fields, the number of characters specifies the field width. For example, if h is the hour, 'h' might produce '5', but 'hh' produces '05'. For some characters, the count specifies whether an abbreviated or full form should be used, but may have other choices, as given below.</p> +<p>Two single quotes represents a literal single quote, either inside or outside single quotes. Text within single quotes is not interpreted in any way (except for two adjacent single quotes). Otherwise all ASCII letter from a to z and A to Z are reserved as syntax characters, and require quoting if they are to represent literal characters. In addition, certain ASCII punctuation characters may become variable in the future (eg ":" being interpreted as the time separator and '/' as a date separator, and replaced by respective locale-sensitive characters in display).<br /></p> +<table border="1" width="100%" cellpadding="4" cellspacing="0"> +<tr><th width="20%">Code</th><th>Meaning</th></tr> +<tr><td>d</td><td>the day as number without a leading zero (1 to 31)</td></tr> +<tr><td>dd</td><td>the day as number with a leading zero (01 to 31)</td></tr> +<tr><td>ddd</td><td>the abbreviated localized day name (e.g. 'Mon' to 'Sun').</td></tr> +<tr><td>dddd</td><td>the long localized day name (e.g. 'Monday' to 'Sunday').</td></tr> +<tr><td>M</td><td>the month as number without a leading zero (1-12)</td></tr> +<tr><td>MM</td><td>the month as number with a leading zero (01-12)</td></tr> +<tr><td>MMM</td><td>the abbreviated localized month name (e.g. 'Jan' to 'Dec').</td></tr> +<tr><td>MMMM</td><td>the long localized month name (e.g. 'January' to 'December').</td></tr> +<tr><td>yy</td><td>the year as two digit number (00-99)</td></tr> +<tr><td>yyyy</td><td>the year as four digit number</td></tr> +<tr><td>h</td><td>the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display)</td></tr> +<tr><td>hh</td><td>the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display)</td></tr> +<tr><td>H</td><td>the hour without a leading zero (0 to 23, even with AM/PM display)</td></tr> +<tr><td>HH</td><td>the hour with a leading zero (00 to 23, even with AM/PM display)</td></tr> +<tr><td>m</td><td>the minute without a leading zero (0 to 59)</td></tr> +<tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> +<tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> +<tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> +<tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> +<tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> +<tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> +<tr><td>T</td><td>the offset from UTC</td></tr> +<tr><td>TT</td><td>the timezone IANA id</td></tr> +<tr><td>TTT</td><td>the timezone abbreviation</td></tr> +<tr><td>TTTT</td><td>the timezone short display name</td></tr> +<tr><td>TTTTT</td><td>the timezone long display name</td></tr> +<tr><td>TTTTTT</td><td>the timezone custom name. You can change it the 'Time zones' tab of the configuration window</td></tr></table> +<br /><b>Notes:</b> <ul><li>Any characters in the pattern that are not in the ranges of ['a'..'z'] and ['A'..'Z'] will be treated as quoted text. For instance, characters like ':', '.', ' ', '#' and '@' will appear in the resulting time text even they are not enclosed within single quotes. The single quote is used to 'escape' letters. Two single quotes in a row, whether inside or outside a quoted sequence, represent a 'real' single quote.</li><li>Minimal update interval is 1 second. If z or zzz is configured time is shown with the milliseconds fraction, but not updated on millisecond basis (avoiding big performance hit).</li><ul> + + + + + + LXQtWorldClockConfigurationTimeZones + + + World Clock Time Zones + Svjetski sat – Vremenske zone + + + + Time zone + Vremenska zona + + + + Name + Ime + + + + Comment + Komentar + + + + Country + Zemlja + + + + UTC + UTC + + + + + Other + Ostalo + + + + Local timezone + Lokalna vremenska zona + + + diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_hu.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_hu.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_hu.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_hu.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -14,12 +14,12 @@ World Clock Settings - Világóra beállítás + Világóra beállítások Display &format - Megjelenítés &forma + Megjelenítendő &formátum @@ -54,12 +54,12 @@ Sho&w seconds - &Másodpercek + &Másodpercek megjelenítése Pad &hour with zero - Óra bevezető nu&llával + Óra kezdő nu&llával @@ -69,7 +69,7 @@ &Position: - &Hely: + &Helyzet: @@ -80,30 +80,30 @@ Below - Belül + Alatta Above - Kívül + Felette Before - Előtt + Előtte After - Után + Utána Offset from UTC - UTC eltérés + Eltérés UTC-től @@ -118,14 +118,14 @@ - + Custom name - Egyedi + Egyedi név &Use 12-hour format - 12 ó&rás alak + 12 ó&rás formátum @@ -140,7 +140,7 @@ Po&sition: - H&ely: + H&elyzet: @@ -150,37 +150,37 @@ ISO 8601 - + ISO 8601 Show &year - É&v látszik + É&v megjelenítése Show day of wee&k - Hét napja látszi&k + Hét nap&jainak megjelenítése Pad d&ay with zero - N&ap nullával indul + N&ap nullával kezdődik &Long month and day of week names - &Hosszú hónap és hetinap + &Hosszú hónap- és napnév Ad&vanced manual format - Haladó ké&zi alak + Haladó ké&zi formátum &Customise ... - &Meghatároz... + &Szerkesztés... @@ -190,12 +190,12 @@ &Add ... - Hozzá&ad ... + Hozzá&adás ... &Remove - Tö&röl + Tö&rlés @@ -205,12 +205,12 @@ &Edit custom name ... - Névsz&erkesztés ... + Név sz&erkesztése... Move &up - &Föl + &Fel @@ -228,12 +228,22 @@ Függőleges panelnél gö&rgetés - + + Show &week numbers in popup calendar + A &hét számának megjelenítése a felugró naptárban + + + + S&how tooltip + &Elemleírás megjelenítése + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - + Input custom time zone name Egyéb időzóna név @@ -243,7 +253,7 @@ World Clock Manual Format Configuration - + Világóra kézi formátum beállítása @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> @@ -317,7 +325,7 @@ UTC - + UTC diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_id.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_id.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_id.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_id.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'JJ:mm:dd'</b><br/><font size="-2">'hhh, h BBBB tttt'<br/>'WT'</font>' @@ -118,7 +118,7 @@ - + Custom name Nama kustom @@ -228,12 +228,22 @@ Otomatis putar saat panelnya vertikal - + + Show &week numbers in popup calendar + + + + + S&how tooltip + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'JJ:mm:dd'</b><br/><font size="-2">'hhh, h BBBB tttt'<br/>'WT'</font>' - + Input custom time zone name Masukkan nama zona waktu kustom @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_it.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_it.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_it.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_it.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -59,7 +59,7 @@ Pad &hour with zero - Ora &senza zero iniziale + Ora &con zero iniziale @@ -113,12 +113,12 @@ IANA id - + ID IANA - + Custom name Nome personalizzato @@ -165,7 +165,7 @@ Pad d&ay with zero - Giorno &senza zero iniziale + Giorno &con zero iniziale @@ -228,12 +228,22 @@ &Ruota automaticamente se il pannello è verticale - + + Show &week numbers in popup calendar + Mostra il &numero della settimana nel calendario pop-up + + + + S&how tooltip + &Mostra tooltip + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - + Input custom time zone name Nome personalizzato del fuso orario @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_ja.desktop lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_ja.desktop --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_ja.desktop 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_ja.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -1,7 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin Name[ja]=世界時計 -Comment[ja]=世界時計のウィジェットです - -#TRANSLATIONS_DIR=../translations +Comment[ja]=時計を表示します。表示形式を自由に指定できます。 diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_ja.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_ja.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_ja.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_ja.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,9 +4,9 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' + '<b>'HH:mm:ss'</b><br/><font size="-2">'yyyy/M/d (ddd)'<br/>'TT'</font>' @@ -19,7 +19,7 @@ Display &format - 表示形式 (&F) + 表示形式(&F) @@ -54,17 +54,17 @@ Sho&w seconds - 秒も表示(&W) + 秒を表示する(&W) Pad &hour with zero - 時が一桁のときゼロで埋める(&H) + 時が一桁のとき 0 で埋める(&H) &Use 12-hour format - 12時間制で表示(&U) + 12 時間制で表示する(&U) @@ -79,7 +79,7 @@ For&mat: - 形式(&m): + 形式(&M): @@ -108,7 +108,7 @@ Offset from UTC - UTCからの時差 + UTC からの時差 @@ -123,19 +123,29 @@ IANA id - IANAのID + IANA の ID + + + + Show &week numbers in popup calendar + ポップアップするカレンダーに週番号を表示する(&W) + + + + S&how tooltip + ツールチップを表示する(&H) - + Custom name 指定した名前 &Date - 日時(&D) + 日付(&D) @@ -155,22 +165,22 @@ Show &year - 年を表示(&Y) + 年を表示する(&Y) Show day of wee&k - 曜日を表示(&K) + 曜日を表示する(&K) Pad d&ay with zero - 日が一桁のときゼロで埋める(&A) + 日が一桁のとき 0 で埋める(&A) &Long month and day of week names - 月や曜日を長い名前で表示(&L) + 月や曜日を長い名前で表示する(&L) @@ -180,7 +190,7 @@ &Customise ... - 指定する(&C) + 指定する(&C) ... @@ -190,7 +200,7 @@ &Add ... - 追加(&A) + 追加(&A) ... @@ -205,7 +215,7 @@ &Edit custom name ... - 名前を付ける(&E) + 名前を付ける(&E) ... @@ -228,12 +238,12 @@ パネルが垂直なときには回転する(&R) - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' + '<b>'HH:mm:ss'</b><br/><font size="-2">'yyyy/M/d (ddd)'<br/>'TT'</font>' - + Input custom time zone name タイムゾーンの名前を入力 @@ -243,7 +253,7 @@ World Clock Manual Format Configuration - + 世界時計の形式の手動設定 @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> @@ -284,7 +292,58 @@ <tr><td>TTTTTT</td><td>the timezone custom name. You can change it the 'Time zones' tab of the configuration window</td></tr></table> <br /><b>Notes:</b> <ul><li>Any characters in the pattern that are not in the ranges of ['a'..'z'] and ['A'..'Z'] will be treated as quoted text. For instance, characters like ':', '.', ' ', '#' and '@' will appear in the resulting time text even they are not enclosed within single quotes. The single quote is used to 'escape' letters. Two single quotes in a row, whether inside or outside a quoted sequence, represent a 'real' single quote.</li><li>Minimal update interval is 1 second. If z or zzz is configured time is shown with the milliseconds fraction, but not updated on millisecond basis (avoiding big performance hit).</li><ul> - + <h1>カスタム用の日付時刻フォーマットの形式</h1> +<p>日付パターンは文字列です。解析時にはカレンダー時計からデータを生成・フォーマットされ、特定の文字列がカレンダー時計の日付と時刻のデータに置き換わります。</p> +<p> +以下の日付フィールドの記号表には、年の yyyy など、特定の場所に適した形式を表すためのパターンの文字列があります。 + 文字は複数回使用できます。例えば、y が年に使用されている場合、 yy は 99 を生成しますが、 yyyy は 1999 を生成します。 +ほとんどの数値フィールドでは、文字数がフィールド幅を指定します。 + 例えば、時刻の h の場合、 h は 5 を生成しますが、 hh は 05 を生成します。 +一部の文字では、この文字の並びの数は省略形か完全形のどちらを使用するかを指定しますが、以下の表に示すように他の使用方法もあります。 +</p><p> +2つの連続した一重引用符は、文字内か外側の１つの一重引用符を表します。 +一重引用符内のテキストは、変換されません（隣接する２つの引用符を除く）。 +それ以外の場合、 a から z および A から Z までのすべてのASCII文字は形式の文字として予約されており、文字自身を表す場合は引用符が必要です。 +さらに、特定のASCII記号は将来変更になる可能性があります（例: ":" は時刻の区切り文字として、 '/' は日付の区切り文字としてみられ、それぞれのロケール依存文字に置き換えられます）。 +<br /></p> +<table border="1" width="100%" cellpadding="4" cellspacing="0"> +<tr><th width="20%">記号</th><th>意味</th></tr> +<tr><td> d</td> <td>日（1〜31）先頭に0を付けない数字</td> </tr> +<tr><td>dd</td> <td>日（01〜31）先頭に0を付けた数字</td> </tr> +<tr><td>ddd</td> <td>ローカライズされた曜日の短縮名（例: '月'から '日'）。</td> </tr> +<tr><td>dddd</td> <td>ローカライズされた長い曜日名（例: '月曜日'から '日曜日'）。</td> </tr> +<tr><td> M </ td> <td>月（1〜12）先頭に0を付けない数字</td> </tr> +<tr><td> MM </ td> <td>月（01-12）先頭に0を付けた数字</td> </tr> +<tr><td> MMM</td> <td>ローカライズされた月の省略名（例: '1月'から '12月'）。</td> </tr> +<tr><td> MMMM</td> <td>ローカライズされた長い月の名前（例: '1月'から '12月'）。(訳注: 日本語では MMM と MMMM は同じ表示のようです)</td> </tr> +<tr><td>yy</td> <td>年（00〜99）2桁の数字</td> </tr> +<tr><td> yyyy</td> <td>年を4桁の数字</td> </tr> +<tr><td>h</td> <td>時刻（0〜23、または午前/午後を表示する場合は1〜12）先頭に0なし</td> </tr> +<tr><td>hh</td> <td>時刻（00から23、または午前/午後を表示する場合は01から12）先頭に0がつく</td> </tr> +<tr><td>H</td> <td>時刻（午前/午後の表示でも0〜23）先頭に0なし</td> </tr> +<tr><td>HH</td> <td>時刻（午前/午後の表示でも00〜23）先頭に0がつく</td> </tr> +<tr><td> m</td> <td>分（0〜59）先頭に0なし</td> </tr> +<tr><td> mm</td> <td>分（00から59）先頭に0がつく</td> </tr> +<tr><td> s</td> <td>秒（0〜59）先頭に0なし</td> </tr> +<tr><td>ss</td> <td>秒（00〜59）先頭に0がつく</td> </tr> +<tr> <td> AP <i>または</i> A </td> <td>午前/午後の表示に使用します。 <b> A/AP </b>は "AM" または "PM" に置き換えられます。</td> </tr> +<tr> <td> ap <i>または</i> a </td> <td>午前/午後の表示に使用します。 <b> a/ap </b>は "am" または "pm" に置き換えられます。（訳注: 日本語では AP と ap はどちらも"午前"または"午後"に置き換えられるようです）</td> </tr> +<tr><td>t</td> <td>タイムゾーン（例: "JST"）</td> </tr> +<tr><td> T</td> <td> UTC(世界協定時)からの時差</td> </tr> +<tr><td>TT</td> <td>タイムゾーンの IANA ID </td> </tr> +<tr><td>TTT</td> <td>タイムゾーンの省略形</td> </tr> +<tr><td>TTTT</td> <td>タイムゾーンの短い表示名</td> </tr> +<tr><td>TTTTT</td> <td>タイムゾーンの長い表示名</td> </tr> +<tr><td>TTTTTT</td> <td>タイムゾーンのカスタム名。設定ウィンドウの[タイムゾーン]タブで変更できます。</td> </tr> </table> +<br /><b>注意:</b> <ul><li> +パターン内の ['a' .. 'z'] と ['A' .. 'Z'] の範囲内にない文字は引用テキストとして扱われます。 +たとえば、 ':', '.', ' ', '#', '@'などの文字は、一重引用符(')で囲まれていなくても、結果のテキストに表示されます。 +一重引用符(')は、文字を“エスケープ”するために使用されます。行内の2つの連続した一重引用符は、引用符付き文字列の内側でも外側でも、“実際”の1つの一重引用符を表します。 +</li><li> +最小の更新間隔は1秒です。 +z または zzz が設定されている場合、時刻はミリ秒単位で表示されますが、ミリ秒単位では更新されません（大きなパフォーマンスの低下を避けるため）。 +</li><ul> + @@ -302,7 +361,7 @@ Name - タイムゾーン + 名前 diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_lt.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_lt.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_lt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_lt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -118,7 +118,7 @@ - + Custom name Tinkintas pavadinimas @@ -228,12 +228,22 @@ Automatiškai pasuk&ti, kai skydelis yra vertikalus - + + Show &week numbers in popup calendar + + + + + S&how tooltip + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b><br/><font size="-2">'yyyy MMM d, ddd'<br/>'TT'</font>' - + Input custom time zone name Įrašykite tinkintą laiko juostos pavadinimą @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> @@ -284,43 +292,7 @@ <tr><td>TTTTTT</td><td>the timezone custom name. You can change it the 'Time zones' tab of the configuration window</td></tr></table> <br /><b>Notes:</b> <ul><li>Any characters in the pattern that are not in the ranges of ['a'..'z'] and ['A'..'Z'] will be treated as quoted text. For instance, characters like ':', '.', ' ', '#' and '@' will appear in the resulting time text even they are not enclosed within single quotes. The single quote is used to 'escape' letters. Two single quotes in a row, whether inside or outside a quoted sequence, represent a 'real' single quote.</li><li>Minimal update interval is 1 second. If z or zzz is configured time is shown with the milliseconds fraction, but not updated on millisecond basis (avoiding big performance hit).</li><ul> - <h1>Tinkintos datos/Laiko formato sintaksė</h1> -<p>Datos šablonas yra simbolių eilutė, kurioje tam tikros simbolių eilutės, formatuojant, yra pakeičiamos datos ir laiko duomenimis iš kalendoriaus arba analizuojant, yra naudojamos kalendoriaus duomenų kūrimui.</p> -<p>Žemiau esančioje datų laukelio simbolių lentelėje yra simboliai, kurie naudojami šablonuose, siekiant rodyti atitinkamus nurodytos lokalės formatus, tokie simboliai kaip pvz., yyyy, kurie yra skirti metams. Simboliai gali būti naudojami kelis kartus. Pavyzdžiui, jeigu y yra naudojama metams, "yy" gali atvaizduoti "99", tuo tarpu "yyyy" atvaizduos "1999". Daugelyje skaitmeninių laukelių, simbolių skaičius nustato laukelio plotį. Pavyzdžiui, jeigu h yra valanda, tai "h" gali atvaizduoti "5", tačiau "hh" atvaizduos "05". Kai kuriems simboliams skaičius nustato, ar turėtų būti naudojama pilna ar sutrumpinta forma, tačiau gali būti ir kiti pasirinkimai, kaip tai yra nurodyta žemiau.</p> -<p>Dvi kabutės, nesvarbu ar viengubos kabutės viduje ar išorėje, atvaizduoja viengubą kabutę. Viengubų kabučių viduje esantis tekstas niekaip nėra interpretuojamas (išskyrus dvi viengubas kabutes viena šalia kitos). Kita vertus visos ASCII raidės nuo a iki z ir nuo A iki Z yra rezervuotos kaip sintaksės simboliai, ir yra reikalaujama, kad jos būtų kabutėse, jeigu norima jas atvaizduoti kaip įprastas raides. Be to, tam tikri ASCII punktuacijos simboliai ateityje gali tapti kintamaisiais (pvz., ":" gali būti interpretuojamas kaip laiko skirtuvas, o "/" kaip datos skirtuvas, ir rodinyje gali būti pakeisti atitinkamais lokalės simboliais).<br /></p> -<table border="1" width="100%" cellpadding="4" cellspacing="0"> -<tr><th width="20%">Kodo</th><th>reikšmė</th></tr> -<tr><td>d</td><td>diena kaip skaičius be priekinio nulio (1 iki 31)</td></tr> -<tr><td>dd</td><td>diena kaip skaičius su priekiniu nuliu (01 iki 31)</td></tr> -<tr><td>ddd</td><td>sutrumpintas lokalizuotas dienos pavadinimas (pvz., nuo "Pir" iki "Sek").</td></tr> -<tr><td>dddd</td><td>ilgas lokalizuotas dienos pavadinimas (pvz., nuo "Pirmadienis" iki "Sekmadienis").</td></tr> -<tr><td>M</td><td>mėnesis kaip skaičius be priekinio nulio (1-12)</td></tr> -<tr><td>MM</td><td>mėnesis kaip skaičius su priekiniu nuliu (01-12)</td></tr> -<tr><td>MMM</td><td>sutrumpintas lokalizuotas mėnesio pavadinimas (pvz., nuo "Sau" iki "Gru").</td></tr> -<tr><td>MMMM</td><td>ilgas lokalizuotas mėnesio pavadinimas (pvz., nuo "Sausis" iki "Gruodis").</td></tr> -<tr><td>yy</td><td>metai kaip dviejų skaitmenų skaičius (00-99)</td></tr> -<tr><td>yyyy</td><td>metai kaip keturių skaitmenų skaičius</td></tr> -<tr><td>h</td><td>valanda be priekinio nulio (nuo 0 iki 23 arba nuo 1 iki 12, jeigu yra rodoma AM/PM formatu)</td></tr> -<tr><td>hh</td><td>valanda su priekiniu nuliu (nuo 00 iki 23 arba nuo 01 iki 12, jeigu yra rodoma AM/PM formatu)</td></tr> -<tr><td>H</td><td>valanda be priekinio nulio (nuo 0 iki 23, netgi jeigu yra rodoma AM/PM formatu)</td></tr> -<tr><td>HH</td><td>valanda su priekiniu nuliu (nuo 00 iki 23, netgi jeigu yra rodoma AM/PM formatu)</td></tr> -<tr><td>m</td><td>minutė be priekinio nulio (nuo 0 iki 59)</td></tr> -<tr><td>mm</td><td>minutė su priekiniu nuliu (nuo 00 iki 59)</td></tr> -<tr><td>s</td><td>sekundė be priekinio nulio (nuo 0 iki 59)</td></tr> -<tr><td>ss</td><td>sekundė su priekiniu nuliu (nuo 00 iki 59)</td></tr> -<tr><td>z</td><td>milisekundės be priekinių nulių (nuo 0 iki 999)</td></tr> -<tr><td>zzz</td><td>milisekundės su priekiniais nuliais (nuo 000 iki 999)</td></tr> -<tr><td>AP <i>arba</i> A</td><td>naudoti AM/PM rodymą. <b>A/AP</b> bus pakeista į "AM" arba "PM".</td></tr> -<tr><td>ap <i>arba</i> a</td><td>naudoti am/pm rodymą. <b>a/ap</b> bus pakeista į "am" arba "pm".</td></tr> -<tr><td>t</td><td>laiko juosta (pavyzdžiui, "CEST")</td></tr> -<tr><td>T</td><td>poslinkis nuo UTC (Suderintojo pasaulinio laiko)</td></tr> -<tr><td>TT</td><td>laiko juosta IANA id</td></tr> -<tr><td>TTT</td><td>laiko juostos santrumpa</td></tr> -<tr><td>TTTT</td><td>trumpasis laiko juostos pavadinimas</td></tr> -<tr><td>TTTTT</td><td>ilgasis laiko juostos pavadinimas</td></tr> -<tr><td>TTTTTT</td><td>tinkintas laiko juostos pavadinimas. Jūs galite jį pakeisti konfigūracijos lango "Laiko juostų" kortelėje</td></tr></table> -<br /><b>Pastabos:</b> <ul><li>Bet kurie šablone esantys simboliai, kurie nėra rėžyje ["a".."z"] ir ["A".."Z"] bus laikomi cituotu tekstu. Pavyzdžiui, tokie simboliai kaip ":", ".", " ", "#" ir "@" bus rodomi galutiniame laiko tekste netgi tuo atveju, jeigu jie nebus viengubose kabutėse. Viengubos kabutės yra naudojamos raidžių "ištrūkimui". Dvi viengubos kabutės iš eilės, nesvarbu ar cituojamos sekos viduje ar išorėje, atvaizduoja "tikrąsias" viengubas kabutes.</li><li>Mažiausias atnaujinimo intervalas yra 1 sekundė. Jeigu laiko atvaizdavimui yra naudojama z ar zzz, tuomet laikas bus rodomas su milisekundėmis, tačiau jis nebus atnaujinamas kas milisekundę (tam, kad būtų išvengta našumo sumažėjimo).</li><ul> - + diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_nb_NO.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_nb_NO.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_nb_NO.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_nb_NO.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -49,27 +49,27 @@ Custom - Egendefinert + Selvvalgt Sho&w seconds - Vis& sekunder + &Vis sekunder Pad &hour with zero - Sett& null foran timen + Sett null foran &timen T&ime zone - T&idssone + &Tidssone &Position: - &Posisjon: + &Plassering: @@ -118,9 +118,9 @@ - + Custom name - Egendefinert navn + Selvvalgt navn @@ -130,7 +130,7 @@ Location identifier - Stedsidentifikasjon + Plasseringsidentifikator @@ -140,7 +140,7 @@ Po&sition: - Po&sisjon: + &Plassering: @@ -155,17 +155,17 @@ Show &year - Vis å&r + Vis &år Show day of wee&k - Vis ukedag& + Vis &ukedag Pad d&ay with zero - Sett &null foran dag + Sett null foran &dag @@ -175,17 +175,17 @@ Ad&vanced manual format - Av&ansert manuell formatering + &Avansert manuell formatering &Customise ... - &Forandre ... + &Endre ... Time &zones - Tidss&oner + &Tidssoner @@ -200,7 +200,7 @@ Set as &default - Sett so&m standard + Sett som &standard @@ -210,12 +210,12 @@ Move &up - Flytt& oppover + Flytt &oppover Move do&wn - Flytt n&edover + Flytt &nedover @@ -228,12 +228,22 @@ Auto&roter når panelet er vertikalt - + + Show &week numbers in popup calendar + + + + + S&how tooltip + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - + Input custom time zone name Skriv inn navn på tidssonen @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> @@ -284,43 +292,7 @@ <tr><td>TTTTTT</td><td>the timezone custom name. You can change it the 'Time zones' tab of the configuration window</td></tr></table> <br /><b>Notes:</b> <ul><li>Any characters in the pattern that are not in the ranges of ['a'..'z'] and ['A'..'Z'] will be treated as quoted text. For instance, characters like ':', '.', ' ', '#' and '@' will appear in the resulting time text even they are not enclosed within single quotes. The single quote is used to 'escape' letters. Two single quotes in a row, whether inside or outside a quoted sequence, represent a 'real' single quote.</li><li>Minimal update interval is 1 second. If z or zzz is configured time is shown with the milliseconds fraction, but not updated on millisecond basis (avoiding big performance hit).</li><ul> - <h1>Egendefinert dato og tidssyntaks</h1> -<p>Et datomønster er en rekke bokstaver med spesielle bokstaver som byttes ut med dato og tid fra en kalender når det formateres eller som brukes til å generere data for en kalender når den behandles.</p> -<p>I tabellen under ser man hvilke tegn som brukes i hvilke mønstre for å vise formater som passer for et gitt sted, sånn som yyyy for å vise året med fire tall. Samme tegn kan brukes flere ganger. F.eks. når y viser året, viser yy året med to tall og yyyy året med fire tall. For de fleste tall er antallet tegn det samme som bredden på resultatet man får ut. F.eks. er h timen med ett tall, mens hh er timen vist med to tall. For noen tegn viser antallet tegn om en fullstendig eller forkortet form brukes.</p> -<p>To enkle anførselstegn betyr enkelt anførselstegn, enten på innsiden eller på utsiden av andre enkle anførselsestegn. Tekst på innsiden av enkle anførselstegn blir ikke tolket på noen annen måte (med unntak av når det er to enkle anførselstegn ved siden av hverandre). Ellers er alle bokstaver reservert til å representere dato og tid og krever anførselstegn hvis de skal tolkes som vanlige bokstaver. I tillegg kan visse tegnsettingstegn komme til å bli variabler i framtiden. (For eksempel kan kolon komme til å bli tolket som tidsskilletegn og skråstrek som datoskilletegn og byttet ut med tegn som matcher innstillingen for tidssone og språk.)<br /></p> -<table border="1" width="100%" cellpadding="4" cellspacing="0"> -<tr><th width="20%">Tegn</th><th>Betydning</th></tr> -<tr><td>d</td><td>Dag i måneden uten null foran (1 til 31)</td></tr> -<tr><td>dd</td><td>Dag i måneden med null foran (01 til 31)</td></tr> -<tr><td>ddd</td><td>Forkortet navn på ukedag (f.eks. man).</td></tr> -<tr><td>dddd</td><td>Fullstendig navn på ukedag (f.eks. mandag).</td></tr> -<tr><td>M</td><td>Månedens nummer uten null foran (1 til 12)</td></tr> -<tr><td>MM</td><td>Månedens nummer med null foran (01 til 12)</td></tr> -<tr><td>MMM</td><td>Forkortet navn på måneden (F.eks. jan).</td></tr> -<tr><td>MMMM</td><td>fullstendig navn på måneden (F.eks. januar).</td></tr> -<tr><td>yy</td><td>År uttrykt som to tall (00 til 99)</td></tr> -<tr><td>yyyy</td><td>År uttrykt som fire tall</td></tr> -<tr><td>h</td><td>Timen uten null foran (0 til 23 eller 1 til 12 hvis AM/PM er på)</td></tr> -<tr><td>hh</td><td>Timen med null foran (00 til 23 eller 01 til 12 hvis AM/PM er på)</td></tr> -<tr><td>H</td><td>Timen uten null foran i 24-timers format (0 til 23)</td></tr> -<tr><td>HH</td><td>Timen med null foran i 24-timers format (00 til 23)</td></tr> -<tr><td>m</td><td>Minuttet uten null foran (0 til 59)</td></tr> -<tr><td>mm</td><td>Minuttet med null foran (00 til 59)</td></tr> -<tr><td>s</td><td>Sekundet uten null foran (0 til 59)</td></tr> -<tr><td>ss</td><td>Sekundet med null foran (00 til 59)</td></tr> -<tr><td>z</td><td>Millisekundet uten null foran (0 til 999)</td></tr> -<tr><td>zzz</td><td>Millisekundet med null foran (000 til 999)</td></tr> -<tr><td>AP <i>or</i> A</td><td>Bruk AM/PM med store bokstaver.<b>A/AP</b> byttes ut med "AM" eller "PM".</td></tr> -<tr><td>ap <i>or</i> a</td><td>Bruk am/pm med små bokstaver. <b>a/ap</b>byttes ut med "am" eller "pm".</td></tr> -<tr><td>t</td><td>Tidssonen (f.eks. "CEST")</td></tr> -<tr><td>T</td><td>Forskjellen fra UTC</td></tr> -<tr><td>TT</td><td>Tidssonens IANA-id</td></tr> -<tr><td>TTT</td><td>Tidssonens forkortelse</td></tr> -<tr><td>TTTT</td><td>Forkortet navn på tidssonen</td></tr> -<tr><td>TTTTT</td><td>Langt navn på tidssonen</td></tr> -<tr><td>TTTTTT</td><td>Tidssonens egendefinerte navn. Du kan forandre det i 'Tidssoner'-fanen i konfigurasjonsvinduet.</td></tr></table> -<br /><b>Notes:</b> <ul><li>Ingen andre tegn vil tolkes om. For eksempel vil tegn som komma, punktum, kolon, firkant og alfakrøll dukke opp i klokkens tekst som seg selv, akkurat som om de hadde blitt skrevet med enkle anførselstegn rundt. Enkle anførselstegn brukes til å "escape" et tegn. To enkle anførselstegn etter hverandre, enten på innsiden eller utsiden av anførselstegn, representeter et ekte anførselstegn i klokkens tekst.</li><li>Minste oppdateringsintervall er ett sekund. Hvis z eller zzz blir brukt millisekunder vist, men klokken blir likevel ikke oppdatert hvert millisekund for å hindre at klokken stjeler all datakraften fra maskinen.</li><ul> - + diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_nl.desktop lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_nl.desktop --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_nl.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_nl.desktop 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,2 @@ +Name[nl]=Klok +Comment[nl]=Klok weergeven in werkbalk diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_nl.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_nl.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_nl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_nl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'UU:mm:ss'</b><br/><font size="-2">'ddd, d MMM jjjj'<br/>'TT'</font>' @@ -14,7 +14,7 @@ World Clock Settings - Instellingen van Wereldklok + Instellingen van Klok @@ -123,7 +123,7 @@ - + Custom name Aangepaste naam @@ -228,12 +228,22 @@ &Draai automatisch wanneer de balk verticaal is - + + Show &week numbers in popup calendar + Toon &weeknummers in popupkalender + + + + S&how tooltip + Toon &tooltip + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'UU:mm:ss'</b><br/><font size="-2">'ddd, d MMM jjjj'<br/>'TT'</font>' - + Input custom time zone name Geef aangepaste naam in voor tijdzone @@ -243,7 +253,7 @@ World Clock Manual Format Configuration - + Handmatig instellen klokweergave @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> @@ -284,44 +292,7 @@ <tr><td>TTTTTT</td><td>the timezone custom name. You can change it the 'Time zones' tab of the configuration window</td></tr></table> <br /><b>Notes:</b> <ul><li>Any characters in the pattern that are not in the ranges of ['a'..'z'] and ['A'..'Z'] will be treated as quoted text. For instance, characters like ':', '.', ' ', '#' and '@' will appear in the resulting time text even they are not enclosed within single quotes. The single quote is used to 'escape' letters. Two single quotes in a row, whether inside or outside a quoted sequence, represent a 'real' single quote.</li><li>Minimal update interval is 1 second. If z or zzz is configured time is shown with the milliseconds fraction, but not updated on millisecond basis (avoiding big performance hit).</li><ul> - <h1>Syntax van aangepaste datum/tijd-opmaak</h1> -<p>Een datumpatroon is een tekenreeks, waarvan specifieke tekens worden vervangen door datum- en tijdgegevens van een kalender bij het opmaken of waarvan die worden gebruikt om gegevens aan te maken voor een kalender bij het inlezen.</p> -<p>De datumveld-symbooltabel hieronder bevat de tekens die worden gebruikt in patronen om de juiste opmaak te tonen voor een opgegeven regionale instelling, zoals 'jjjj' voor het jaar. Tekens kunnen meerdere malen worden gebruikt. Bijvoorbeeld: als 'j' wordt gebruikt voor het jaar, dan zou 'jj' '18' kunnen voortbrengen, terwijl 'jjjj' '2018' voortbrengt. Voor de meeste numerieke velden bepaalt het aantal tekens de veldbreedte. Bijvoorbeeld: als 'u' het uur is, dan zou het '5' kunnen voortbrengen, maar 'uu' brengt '05' voort. Voor sommige tekens bepaalt het aantal of er een afgekorte dan wel een volledige vorm wordt gebruikt, maar er kunnen ook andere keuzes zijn, zoals onderstaand aangegeven.</p> -<p>Twee enkele aanhalingstekens representeren een letterlijk enkel aanhalingsteken, hetzij binnen enkele aanhalingstekens hetzij daarbuiten. Tekst binnen enkele aanhalingstekens wordt op geen enkele wijze geïnterpreteerd (behalve twee opeenvolgende enkele aanhalingstekens). Voor de rest worden alle ASCII-letters van a tot en met z en van A tot en met Z gereserveerd als syntax-tekens, waardoor zij tussen aanhalingstekens moeten worden gezet indien zij letterlijke tekens moeten voorstellen. Bovendien zouden bepaalde ASCII-interpunctietekens in de toekomst variabel kunnen worden (bijvoorbeeld ':' geïnterpreteerd als tijdscheidingsteken en '/' als datumscheidingsteken, en worden vervangen door hun respectievelijke regio-afhankelijke tekens op het scherm).<br /></p> -<table border="1" width="100%" cellpadding="4" cellspacing="0"> -<tr><th width="20%">Code</th><th>Betekenis</th></tr> -<tr><td>d</td><td>de dag als getal zonder een inleidende nul (1 tot en met 31)</td></tr> -<tr><td>dd</td><td>de dag als getal met een inleidende nul (01 tot en met 31)</td></tr> -<tr><td>ddd</td><td>de afgekorte regionale dagnaam (bijvoorbeeld 'ma' tot en met 'zo').</td></tr> -<tr><td>dddd</td><td>de lange regionale dagnaam (bijvoorbeeld 'maandag' tot en met 'zondag')</td></tr> -<tr><td>M</td><td>de maand als getal zonder een inleidende nul (1-12)</td></tr> -<tr><td>MM</td><td>de maand als getal met een inleidende nul (01-12)</td></tr> -<tr><td>MMM</td><td>de afgekorte regionale maandnaam (bijvoorbeeld: 'jan' tot en met 'dec').</td></tr> -<tr><td>MMMM</td><td>de lange regionale maandnaam (bijvoorbeeld: 'januari' tot en met 'december').</td></tr> -<tr><td>jj</td><td>het jaar als tweecijferig getal (00-99)</td></tr> -<tr><td>jjjj</td><td>het jaar als viercijferig getal</td></tr> -<tr><td>u</td><td>het uur zonder een inleidende nul (0 tot en met 23 of 1 tot en met 12 indien vm/nm-aanduiding)</td></tr> -<tr><td>uu</td><td>het uur met een inleidende nul (00 tot en met 23 of 01 tot en met 12 indien vm/nm-aanduiding)</td></tr> -<tr><td>U</td><td>het uur zonder een inleidende nul (0 tot en met 23, zelfs met vm/nm-aanduiding)</td></tr> -<tr><td>UU</td><td>het uur met een inleidende nul (00 tot en met 23, zelfs met vm/nm-aanduiding)</td></tr> -<tr><td>m</td><td>de minuut zonder een inleidende nul (0 tot en met 59)</td></tr> -<tr><td>mm</td><td>de minuut met een inleidende nul (00 tot en met 59)</td></tr> -<tr><td>s</td><td>de seconde zonder een inleidende nul (0 tot en met 59)</td></tr> -<tr><td>ss</td><td>de seconde met een inleidende nul (00 tot en met 59)</td></tr> -<tr><td>z</td><td>de milliseconde zonder inleidende nullen (0 tot en met 999)</td></tr> -<tr><td>zzz</td><td>de milliseconde met inleidende nullen (000 tot en met 999)</td></tr> -<tr><td>AP <i>of</i> A</td><td>gebruik VM/NM-aanduiding. <b>A/AP</b> zal worden vervangen door "VM" of "NM".<</td></tr> -<tr><td>ap <i>of</i> a</td><td>gebruik vm/nm-aanduiding. <b>a/ap</b> zal worden vervangen door "vm" of "nm".<</td></tr> -<tr><td>t</td><td>de tijdzone (bijvoorbeeld 'CEST')</td></tr> -<tr><td>T</td><td>het verschil met UTC</td></tr> -<tr><td>TT</td><td>het IANA-id van de tijdzone</td></tr> -<tr><td>TTT</td><td>de afkorting van de tijdzone</td></tr> -<tr><td>TTTT</td><td>de korte naamweergave van de tijdzone</td></tr> -<tr><td>TTTTT</td><td>de lange naamweergave van de tijdzone</td></tr> -<tr><td>TTTTTT</td><td>de aangepaste naam van de tijdzone. U kunt die wijzigen in het tabblad 'Tijdzones' van het instellingenvenster</td></tr> -</table> -<br /><b>Let op:</b> <ul><li>alle tekens in het patroon die niet vallen in het bereik van ['a'..'z'] en ['A'..'Z'] zullen worden behandeld als tekst tussen aanhalingstekens. Bijvoorbeeld: tekens als ':', '.', ' ', '#' en '@' zullen verschijnen in de resulterende tijdtekst, zelfs als ze niet tussen enkele aanhalingstekens zijn geplaatst. Het enkele aanhalingsteken wordt gebruikt om letters 'af te zonderen'. Twee enkele aanhalingstekens achter elkaar, hetzij binnen een geciteerde zin hetzij daarbuiten, stellen een 'echt' enkel aanhalingsteken voor.</li><li>De minimale tussenpoze voor bijwerken is 1 seconde. Indien z of zzz is ingesteld, wordt de tijd getoond met de milliseconden erbij, maar de tijd wordt niet per milliseconde bijgewerkt (om zo een enorme systeembelasting te vermijden!).</li><ul> - + @@ -329,7 +300,7 @@ World Clock Time Zones - Tijdzones van Wereldklok + Tijdzones van Klok diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_pl.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_pl.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_pl.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_pl.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -118,7 +118,7 @@ - + Custom name Niestandardowa nazwa @@ -228,12 +228,22 @@ Ob&racaj automatycznie przy pionowym panelu - + + Show &week numbers in popup calendar + + + + + S&how tooltip + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - + Input custom time zone name Wprowadź niestandardową strefę czasową @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_pt_BR.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_pt_BR.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_pt_BR.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_pt_BR.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,376 @@ + + + + + LXQtWorldClock + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d 'de' MMM 'de' yyyy'<br/>'TT'</font>' + + + + LXQtWorldClockConfiguration + + + World Clock Settings + Configurações do Relógio Mundial + + + + Display &format + Exibir &formato + + + + &Time + &Tempo + + + + F&ormat: + F&ormato: + + + + + + Short + Curto + + + + + + Long + Longo + + + + + Custom + Personalizado + + + + Sho&w seconds + E&xibir segundos + + + + Pad &hour with zero + Mostrar &hora com zero + + + + T&ime zone + Fuso Horár&io + + + + &Position: + &Posição: + + + + For&mat: + For&mato: + + + + + Below + Abaixo + + + + + Above + Acima + + + + + Before + Antes + + + + + After + Depois + + + + Offset from UTC + Deslocamento de UTC + + + + Abbreviation + Abreviação + + + + IANA id + Id IANA + + + + + + Custom name + Nome personalizado + + + + &Use 12-hour format + &Usar formato 12-horas + + + + Location identifier + Identificador de localização + + + + &Date + &Data + + + + Po&sition: + Po&sição: + + + + Fo&rmat: + Fo&rmato: + + + + ISO 8601 + ISO 8601 + + + + Show &year + Exibir A&no + + + + Show day of wee&k + Exibir dia da &semana + + + + Pad d&ay with zero + Pad di&a com zero + + + + &Long month and day of week names + Nomes &longos do mês e dia da semana + + + + Ad&vanced manual format + Formato do manual avançado + + + + &Customise ... + &Customizar ... + + + + Time &zones + Fusos &horários + + + + &Add ... + &Adicionar ... + + + + &Remove + &Remover + + + + Set as &default + Definir como pa&drão + + + + &Edit custom name ... + &Editar nome personalizado ... + + + + Move &up + Mover para ci&ma + + + + Move do&wn + Mover para bai&xo + + + + &General + &Geral + + + + Auto&rotate when the panel is vertical + Gi&rar automaticamente quando o painel está na vertical + + + + Show &week numbers in popup calendar + Exibir os números da &semana no calendário pop-up + + + + S&how tooltip + E&xibir dicas + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' + '<b>'HH:mm:ss'</b><br /><font size="-2">'ddd, d MMM yyyy'<br />'TT'</font>' + + + + Input custom time zone name + Inserir nome do fuso horário personalizado + + + + LXQtWorldClockConfigurationManualFormat + + + World Clock Manual Format Configuration + Configuração Manual do Formato Relógio Mundial + + + + <h1>Custom Date/Time Format Syntax</h1> +<p>A date pattern is a string of characters, where specific strings of characters are replaced with date and time data from a calendar when formatting or used to generate data for a calendar when parsing.</p> +<p>The Date Field Symbol Table below contains the characters used in patterns to show the appropriate formats for a given locale, such as yyyy for the year. Characters may be used multiple times. For example, if y is used for the year, 'yy' might produce '99', whereas 'yyyy' produces '1999'. For most numerical fields, the number of characters specifies the field width. For example, if h is the hour, 'h' might produce '5', but 'hh' produces '05'. For some characters, the count specifies whether an abbreviated or full form should be used, but may have other choices, as given below.</p> +<p>Two single quotes represents a literal single quote, either inside or outside single quotes. Text within single quotes is not interpreted in any way (except for two adjacent single quotes). Otherwise all ASCII letter from a to z and A to Z are reserved as syntax characters, and require quoting if they are to represent literal characters. In addition, certain ASCII punctuation characters may become variable in the future (eg ":" being interpreted as the time separator and '/' as a date separator, and replaced by respective locale-sensitive characters in display).<br /></p> +<table border="1" width="100%" cellpadding="4" cellspacing="0"> +<tr><th width="20%">Code</th><th>Meaning</th></tr> +<tr><td>d</td><td>the day as number without a leading zero (1 to 31)</td></tr> +<tr><td>dd</td><td>the day as number with a leading zero (01 to 31)</td></tr> +<tr><td>ddd</td><td>the abbreviated localized day name (e.g. 'Mon' to 'Sun').</td></tr> +<tr><td>dddd</td><td>the long localized day name (e.g. 'Monday' to 'Sunday').</td></tr> +<tr><td>M</td><td>the month as number without a leading zero (1-12)</td></tr> +<tr><td>MM</td><td>the month as number with a leading zero (01-12)</td></tr> +<tr><td>MMM</td><td>the abbreviated localized month name (e.g. 'Jan' to 'Dec').</td></tr> +<tr><td>MMMM</td><td>the long localized month name (e.g. 'January' to 'December').</td></tr> +<tr><td>yy</td><td>the year as two digit number (00-99)</td></tr> +<tr><td>yyyy</td><td>the year as four digit number</td></tr> +<tr><td>h</td><td>the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display)</td></tr> +<tr><td>hh</td><td>the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display)</td></tr> +<tr><td>H</td><td>the hour without a leading zero (0 to 23, even with AM/PM display)</td></tr> +<tr><td>HH</td><td>the hour with a leading zero (00 to 23, even with AM/PM display)</td></tr> +<tr><td>m</td><td>the minute without a leading zero (0 to 59)</td></tr> +<tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> +<tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> +<tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> +<tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> +<tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> +<tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> +<tr><td>T</td><td>the offset from UTC</td></tr> +<tr><td>TT</td><td>the timezone IANA id</td></tr> +<tr><td>TTT</td><td>the timezone abbreviation</td></tr> +<tr><td>TTTT</td><td>the timezone short display name</td></tr> +<tr><td>TTTTT</td><td>the timezone long display name</td></tr> +<tr><td>TTTTTT</td><td>the timezone custom name. You can change it the 'Time zones' tab of the configuration window</td></tr></table> +<br /><b>Notes:</b> <ul><li>Any characters in the pattern that are not in the ranges of ['a'..'z'] and ['A'..'Z'] will be treated as quoted text. For instance, characters like ':', '.', ' ', '#' and '@' will appear in the resulting time text even they are not enclosed within single quotes. The single quote is used to 'escape' letters. Two single quotes in a row, whether inside or outside a quoted sequence, represent a 'real' single quote.</li><li>Minimal update interval is 1 second. If z or zzz is configured time is shown with the milliseconds fraction, but not updated on millisecond basis (avoiding big performance hit).</li><ul> + + <h1> Sintaxe de formato de data / hora personalizado </h1> +<p> Um padrão de data é uma sequência de caracteres, em que sequências específicas de caracteres são substituídas por dados de data e hora de um calendário durante a formatação ou usados para gerar dados para um calendário durante a análise. </p> +<p> A Tabela de símbolos do campo de data abaixo contém os caracteres usados em padrões para mostrar os formatos apropriados para um determinado local, como aaaa para o ano. Os caracteres podem ser usados várias vezes. Por exemplo, se y for usado para o ano, 'yy' pode produzir '99', enquanto 'yyyy' produz '1999'. Para a maioria dos campos numéricos, o número de caracteres especifica a largura do campo. Por exemplo, se h é a hora, 'h' pode produzir '5', mas 'hh' produz '05'. Para alguns caracteres, a contagem especifica se uma forma abreviada ou completa deve ser usada, mas pode haver outras opções, conforme mostrado abaixo. </p> +<p> Duas aspas simples representam uma aspa simples literal, dentro ou fora das aspas simples. O texto entre aspas simples não é interpretado de forma alguma (exceto para duas aspas simples adjacentes). Caso contrário, todas as letras ASCII de a a z e de A a Z são reservadas como caracteres de sintaxe e requerem aspas para representar caracteres literais. Além disso, certos caracteres de pontuação ASCII podem se tornar variáveis no futuro (por exemplo, ":" sendo interpretado como o separador de hora e '/' como um separador de data, e substituído pelos respectivos caracteres sensíveis ao local no display). <br /> < / p> +<table border = "1" width = "100%" cellpadding = "4" cellspacing = "0"> +<tr> <th width = "20%"> Código </th> <th> Significado </th> </tr> +<tr><td>d</td> <td> o dia como um número sem zero à esquerda (1 a 31) </td> </tr> +<tr><td>dd</td> <td> o dia como um número com um zero à esquerda (01 a 31) </td> </tr> +<tr><td>ddd</td> <td> o nome abreviado do dia localizado (por exemplo, 'Seg' para 'Sol'). </td> </tr> +<tr><td>dddd</td> <td> o nome longo do dia localizado (por exemplo, 'Segunda-feira' a 'Domingo'). </td> </tr> +<tr><td>M</td> <td> o mês como um número sem zero à esquerda (1-12) </td> </tr> +<tr><td>MM</td> <td> o mês como um número com um zero à esquerda (01-12) </td> </tr> +<tr><td>MMM</td> <td> o nome abreviado do mês localizado (por exemplo, 'Jan' a 'Dez'). </td> </tr> +<tr><td>MMMM</td> <td> o nome longo do mês localizado (por exemplo, 'janeiro' a 'dezembro'). </td> </tr> +<tr><td>yy</td> <td> o ano como um número de dois dígitos (00-99) </td> </tr> +<tr><td>yyyy</td> <td> o ano como um número de quatro dígitos </td> </tr> +<tr><td>h</td> <td> a hora sem zero à esquerda (0 a 23 ou 1 a 12 se exibir AM / PM) </td> </tr> +<tr><td>hh</td> <td> a hora com um zero à esquerda (00 a 23 ou 01 a 12 se exibir AM / PM) </td> </tr> +<tr><td>H</td> <td> a hora sem zero à esquerda (0 a 23, mesmo com exibição de AM / PM) </td> </tr> +<tr><td>HH</td> <td> a hora com um zero à esquerda (00 a 23, mesmo com exibição de AM / PM) </td> </tr> +<tr><td>m</td> <td> o minuto sem zero à esquerda (0 a 59) </td> </tr> +<tr><td>mm</td> <td> o minuto com um zero à esquerda (00 a 59) </td> </tr> +<tr><td>s</td> <td> o segundo sem zero à esquerda (0 a 59) </td> </tr> +<tr><td>ss</td> <td> o segundo com um zero à esquerda (00 a 59) </td> </tr> +<tr> <td> AP <i> ou </i> A </td> <td> usa exibição AM / PM. <b> A / AP </b> será substituído por "AM" ou "PM". </td> </tr> +<tr> <td> ap <i> ou </i> a </td> <td> use a exibição am / pm. <b> a / ap </b> será substituído por "am" ou "pm". </td> </tr> +<tr><td>t</td> <td> o fuso horário (por exemplo, "CEST") </td> </tr> +<tr><td>T</td> <td> o deslocamento do UTC </td> </tr> +<tr><td>TT</td> <td> o ID do fuso horário IANA </td> </tr> +<tr><td>TTT</td> <td> a abreviação do fuso horário </td> </tr> +<tr><td>TTTT</td> <td> o nome de exibição abreviado do fuso horário </td> </tr> +<tr><td>TTTTT</td> <td> o nome de exibição longo do fuso horário </td> </tr> +<tr><td>TTTTTT</td> <td> o nome personalizado do fuso horário. Você pode alterá-lo na guia 'Fusos horários' da janela de configuração </td> </tr> </table> +<br /> <b> Observações: </b> <ul> <li> Quaisquer caracteres no padrão que não estejam nos intervalos de ['a' .. 'z'] e ['A' .. 'Z '] será tratado como texto citado. Por exemplo, caracteres como ':', '.', '', '#' E '@' aparecerão no texto da hora resultante, mesmo que não estejam entre aspas simples. A aspa simples é usada para 'escapar' letras. Duas aspas simples consecutivas, seja dentro ou fora de uma sequência entre aspas, representam uma aspa simples 'real'. </li> <li> O intervalo mínimo de atualização é de 1 segundo. Se z ou zzz for configurado, o tempo é mostrado com a fração de milissegundos, mas não atualizado em uma base de milissegundos (evitando grande impacto no desempenho). </li> <ul> + + + + + LXQtWorldClockConfigurationTimeZones + + + World Clock Time Zones + Fusos Horários Relógio Mundial + + + + Time zone + Fuso horário + + + + Name + Nome + + + + Comment + Comentário + + + + Country + País + + + + UTC + UTC + + + + + Other + Outro + + + + Local timezone + Fuso horário local + + + diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_pt.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_pt.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_pt.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_pt.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d de MMM de yyyy'<br/>'TT'</font>' @@ -153,7 +153,7 @@ - + Custom name Nome personalizado @@ -228,12 +228,22 @@ &Rodar automaticamente se o painel for vertical - + + Show &week numbers in popup calendar + Mostrar número da se&mana no calendário + + + + S&how tooltip + &Mostrar dicas + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d de MMM de yyyy'<br/>'TT'</font>' - + Input custom time zone name Digite o nome do fuso horário @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_ru.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_ru.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_ru.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_ru.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -146,9 +146,19 @@ + + Show &week numbers in popup calendar + + + + + S&how tooltip + + + - + Custom name Своё имя @@ -228,12 +238,12 @@ Авто&поворот для вертикальной панели - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - + Input custom time zone name Введите своё имя для часового пояса @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> @@ -284,48 +292,7 @@ <tr><td>TTTTTT</td><td>the timezone custom name. You can change it the 'Time zones' tab of the configuration window</td></tr></table> <br /><b>Notes:</b> <ul><li>Any characters in the pattern that are not in the ranges of ['a'..'z'] and ['A'..'Z'] will be treated as quoted text. For instance, characters like ':', '.', ' ', '#' and '@' will appear in the resulting time text even they are not enclosed within single quotes. The single quote is used to 'escape' letters. Two single quotes in a row, whether inside or outside a quoted sequence, represent a 'real' single quote.</li><li>Minimal update interval is 1 second. If z or zzz is configured time is shown with the milliseconds fraction, but not updated on millisecond basis (avoiding big performance hit).</li><ul> - <h1>Синтаксис пользовательского формата даты/времени</h1> -<p>Шаблон даты — это строка, в которой определённые последовательности символов при форматировании заменяются значениями календарных даты и времени или при синтаксическом анализе используются для раздора соответствующих календарных данных.</p> -<p>Таблица ниже содержит буквы, используемые в шаблонах для отображения соответствующих форматов в данной локали, например, «yyyy» — это год. Отдельные буквы могут повторяться разное количество раз. Например, «y» означает год, тогда значение «yy» может вывести «99», а «yyyy» — «1999». Для большинства числовых полей количество повторяющихся букв определяет ширину поля. Например, «h» — это час, тогда «h» выведет «5», а «hh» — «05». Для некоторых букв количество повторений указывает, следует ли использовать сокращённую или полную форму, но может иметь и другие значения, как указано далее.</p> -<p>Две одинарные кавычки, идущие подряд, дают одну фактическую одинарную кавычку в выводе (как внутри, так и снаружи других кавычек). Если текст заключён внутрь одинарных кавычек, то он никоим образом не интерпретируется (за исключением двух соседних кавычек). В противном случае все латинские буквенные символы таблицы ASCII (от a до z и от A до Z) считаются имеющими специальные значения и требуют обрамления в кавычки, в случае если они подразумеваются непосредственно как буквы. Кроме того, некоторые знаки препинания ASCII также могут стать переменными в будущем (например, «:» может интерпретироваться как разделитель времени, а «/» — как разделитель даты и заменяться соответствующими зависящими от локали символами при отображении).<br/></р> -<table border="1" width="100%" cellpadding="4" cellspacing="0"> -<tr><th width="20%">Код</th><th>Значение</th></tr> -<tr><td>d</td><td>день в виде числа без ведущего нуля (от 1 до 31)</td></tr> -<tr><td>dd</td><td>день в виде числа с ведущим нулём (от 01 до 31)</td></tr> -<tr><td>ddd</td><td>сокращённое локализованное название дня (например, от «пн» до «вс»).</td></tr> -<tr><td>dddd</td><td>длинное локализованное название дня (например, от «понедельник» до «воскресенье»).</td></tr> -<tr><td>M</td><td>месяц в виде числа без ведущего нуля (1-12)</td></tr> -<tr><td>MM</td><td>месяц как число с ведущим нулём (01-12)</td></tr> -<tr><td>MMM</td><td>сокращённое локализованное название месяца (например, от «янв» до «дек»).</td></tr> -<tr><td>MMMM</td><td>длинное локализованное название месяца (например, от «январь» до «декабрь»).</td></tr> -<tr><td>yy</td><td>год в виде двузначного числа (00-99)</td></tr> -<tr><td>yyyy</td><td>год в виде четырёхзначного числа</td></tr> -<tr><td>h</td><td>час без ведущего нуля (от 0 до 23 или от 1 до 12, если используется AM/PM)</td></tr> -<tr><td>hh</td><td>час с ведущим нулём (от 00 до 23 или от 01 до 12, если используется AM/PM)</td></tr> -<tr><td>H</td><td>час без ведущего нуля (от 0 до 23, даже при использовании AM/PM)</td></tr> -<tr><td>HH</td><td>час с ведущим нулём (от 00 до 23, даже при использовании AM/PM)</td></tr> -<tr><td>m</td><td>минуты без ведущего нуля (от 0 до 59)</td></tr> -<tr><td>mm</td><td>минуты с ведущим нулём (от 00 до 59)</td></tr> -<tr><td>s</td><td>секунды без ведущего нуля (от 0 до 59)</td></tr> -<tr><td>ss</td><td>секунды с ведущим нулём (от 00 до 59)</td></tr> -<tr><td>z</td><td>миллисекунды без ведущих нулей (от 0 до 999)</td></tr> -<tr><td>zzz</td><td>миллисекунды с ведущими нулями (от 000 до 999)</td></tr> -<tr><td>AP<i>или</i>A</td><td>использовать формат AM/PM.<b>A/AP</b>будет заменено на «ДП» (до полудня) или «ПП» (после полудня). Конкретные значения могут зависят от локали.</td></tr> -<tr><td>ap<i>или</i>a</td><td>использовать формат am/pm.<b>a/ap</b>будет заменено на «дп» или «пп». Конкретные значения могут зависят от локали.</td></tr> -<tr><td>t</td><td>часовой пояс (например, «MSK»)</td></tr> -<tr><td>T</td><td>смещение относительно UTC (например, «+03:00»)</td></tr> -<tr><td>TT</td><td>идентификатор IANA часового пояса (например «Europe/Moscow»)</td></tr> -<tr><td>TTT</td><td>аббревиатура имени часового пояса (например «MSK»)</td></tr> -<tr><td>TTTT</td><td>краткое имя часового пояса (например «GMT+3»)</td></tr> -<tr><td>TTTTT</td><td>длинное имя часового пояса (например «Москва, стандартное время»)</td></tr> -<tr><td>TTTTTT</td><td>пользовательское имя часового пояса. Вы можете изменить его на вкладке «Часовые пояса»</td></tr> -</table> -<br/><b>Примечания.</b> -<ul> -<li>Любые символы в шаблоне, не входящие в диапазоны ['a' … 'z'] и ['A' … 'Z'] будут рассматриваться как фактический текст. В частности, такие символы, как ':', '.', ' ', '#' и '@', будут отображаться в результирующем тексте, даже если они не заключены в одинарные кавычки. Одиночная кавычка используется для «экранирования» латинских букв. Две одинарные кавычки подряд, внутри или вне других кавычек, представляют собой «настоящие» одинарные кавычки.</li> -<li>Минимальный интервал обновления составляет 1 секунда. Если z или zzz включены в формат, то время будет отображаться с миллисекундами, но не обновляется каждую миллисекунду (во избежание значительного снижения производительности).</li> -</ul> - + diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_sk_SK.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_sk_SK.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_sk_SK.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_sk_SK.ts 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,342 @@ + + + + + LXQtWorldClock + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM rrrr'<br/>'ČČ'</font>' + + + + LXQtWorldClockConfiguration + + + World Clock Settings + Nastavenie hodín zobrazujúcich miestny čas z rôznych časových pásiem + + + + Display &format + &Formát zobrazenia + + + + &Time + &Čas + + + + F&ormat: + &Formát: + + + + + + Short + Krátky + + + + + + Long + Dlhý + + + + + Custom + Určený užívateľom + + + + Sho&w seconds + &Ukazovateľ sekúnd + + + + Pad &hour with zero + &Zarovnať zobrazenie hodín nulou na začiatku + + + + T&ime zone + &Časové pásmo + + + + &Position: + &Poloha: + + + + For&mat: + &Formát: + + + + + Below + Pod + + + + + Above + Nad + + + + + Before + Pred + + + + + After + Za + + + + Offset from UTC + Posuv voči svetovému času (UTC) + + + + Abbreviation + Skratka + + + + IANA id + ID- IANA + + + + + + Custom name + Užívateľom určený názov + + + + &Use 12-hour format + &Použiť 12-hodinový formát + + + + Location identifier + Názov lokality + + + + &Date + &Dátum + + + + Po&sition: + &Umiestnenie: + + + + Fo&rmat: + &Formát: + + + + ISO 8601 + ISO 8601 + + + + Show &year + &Zobraziť rok + + + + Show day of wee&k + &Zobraziť deň v týždni + + + + Pad d&ay with zero + &Zarovnať zobrazenie dňa v mesiaci nulou na začiatku + + + + &Long month and day of week names + &Dlhé názvy mesiacov a dní v týždni + + + + Ad&vanced manual format + &Pokročilý ručný formát + + + + &Customise ... + &Prispôsobiť... + + + + Time &zones + &Časové pásma + + + + &Add ... + &Pridať... + + + + &Remove + &Odstrániť + + + + Set as &default + &Nastaviť na preddefinované + + + + &Edit custom name ... + &Upraviť užívateľom stanovený názov... + + + + Move &up + &Posunúť smerom hore + + + + Move do&wn + &Posunúť smerom dole + + + + &General + &Všeobecné + + + + Auto&rotate when the panel is vertical + &Pri zvisle orientovanom paneli natočiť tak, aby boli vodorovne + + + + Show &week numbers in popup calendar + + + + + S&how tooltip + + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM rrrr'<br/>'ČČ'</font>' + + + + Input custom time zone name + Zadať užívateľom stanovený názov časového pásma + + + + LXQtWorldClockConfigurationManualFormat + + + World Clock Manual Format Configuration + Ručné nastavenie formátu svetových hodín + + + + <h1>Custom Date/Time Format Syntax</h1> +<p>A date pattern is a string of characters, where specific strings of characters are replaced with date and time data from a calendar when formatting or used to generate data for a calendar when parsing.</p> +<p>The Date Field Symbol Table below contains the characters used in patterns to show the appropriate formats for a given locale, such as yyyy for the year. Characters may be used multiple times. For example, if y is used for the year, 'yy' might produce '99', whereas 'yyyy' produces '1999'. For most numerical fields, the number of characters specifies the field width. For example, if h is the hour, 'h' might produce '5', but 'hh' produces '05'. For some characters, the count specifies whether an abbreviated or full form should be used, but may have other choices, as given below.</p> +<p>Two single quotes represents a literal single quote, either inside or outside single quotes. Text within single quotes is not interpreted in any way (except for two adjacent single quotes). Otherwise all ASCII letter from a to z and A to Z are reserved as syntax characters, and require quoting if they are to represent literal characters. In addition, certain ASCII punctuation characters may become variable in the future (eg ":" being interpreted as the time separator and '/' as a date separator, and replaced by respective locale-sensitive characters in display).<br /></p> +<table border="1" width="100%" cellpadding="4" cellspacing="0"> +<tr><th width="20%">Code</th><th>Meaning</th></tr> +<tr><td>d</td><td>the day as number without a leading zero (1 to 31)</td></tr> +<tr><td>dd</td><td>the day as number with a leading zero (01 to 31)</td></tr> +<tr><td>ddd</td><td>the abbreviated localized day name (e.g. 'Mon' to 'Sun').</td></tr> +<tr><td>dddd</td><td>the long localized day name (e.g. 'Monday' to 'Sunday').</td></tr> +<tr><td>M</td><td>the month as number without a leading zero (1-12)</td></tr> +<tr><td>MM</td><td>the month as number with a leading zero (01-12)</td></tr> +<tr><td>MMM</td><td>the abbreviated localized month name (e.g. 'Jan' to 'Dec').</td></tr> +<tr><td>MMMM</td><td>the long localized month name (e.g. 'January' to 'December').</td></tr> +<tr><td>yy</td><td>the year as two digit number (00-99)</td></tr> +<tr><td>yyyy</td><td>the year as four digit number</td></tr> +<tr><td>h</td><td>the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display)</td></tr> +<tr><td>hh</td><td>the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display)</td></tr> +<tr><td>H</td><td>the hour without a leading zero (0 to 23, even with AM/PM display)</td></tr> +<tr><td>HH</td><td>the hour with a leading zero (00 to 23, even with AM/PM display)</td></tr> +<tr><td>m</td><td>the minute without a leading zero (0 to 59)</td></tr> +<tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> +<tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> +<tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> +<tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> +<tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> +<tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> +<tr><td>T</td><td>the offset from UTC</td></tr> +<tr><td>TT</td><td>the timezone IANA id</td></tr> +<tr><td>TTT</td><td>the timezone abbreviation</td></tr> +<tr><td>TTTT</td><td>the timezone short display name</td></tr> +<tr><td>TTTTT</td><td>the timezone long display name</td></tr> +<tr><td>TTTTTT</td><td>the timezone custom name. You can change it the 'Time zones' tab of the configuration window</td></tr></table> +<br /><b>Notes:</b> <ul><li>Any characters in the pattern that are not in the ranges of ['a'..'z'] and ['A'..'Z'] will be treated as quoted text. For instance, characters like ':', '.', ' ', '#' and '@' will appear in the resulting time text even they are not enclosed within single quotes. The single quote is used to 'escape' letters. Two single quotes in a row, whether inside or outside a quoted sequence, represent a 'real' single quote.</li><li>Minimal update interval is 1 second. If z or zzz is configured time is shown with the milliseconds fraction, but not updated on millisecond basis (avoiding big performance hit).</li><ul> + + + + + + LXQtWorldClockConfigurationTimeZones + + + World Clock Time Zones + Časové pásma, z ktorých ukazovať miestny čas + + + + Time zone + Časové pásmo + + + + Name + Názov + + + + Comment + Poznámka + + + + Country + Krajina + + + + UTC + Svetový čas (UTC) + + + + + Other + Ostatné + + + + Local timezone + Miestne časové pásmo + + + diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_tr.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_tr.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_tr.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_tr.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,9 +4,9 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - '<b>'SS:dd:ss'</b><br/><font size="-2">'ggg, g AAA yyyy'<br/>'TT'</font>' + '<b>'HH:mm:ss'</b><br/><font size="-2">'ggg, g AAA yyyy'<br/>'TT'</font>' @@ -118,7 +118,7 @@ - + Custom name Özel isim @@ -228,12 +228,22 @@ Panel dikey olduğunda otomatik yönlendi&r - + + Show &week numbers in popup calendar + Açılır takvimde &hafta numaralarını göster + + + + S&how tooltip + İ&puçlarını göster + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'SS:dd:ss'</b><br/><font size="-2">'ggg, g AAA yyyy'<br/>'TT'</font>' - + Input custom time zone name Özel zaman dilimi adı girin @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -118,7 +118,7 @@ - + Custom name @@ -228,12 +228,22 @@ - + + Show &week numbers in popup calendar + + + + + S&how tooltip + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - + Input custom time zone name @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_uk.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_uk.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_uk.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_uk.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'ГГ:хх:сс'</b><br/><font size="-2">'ддд, д МММ рррр'<br/>'ЧЗ'</font>' @@ -118,7 +118,7 @@ - + Custom name Власна назва @@ -228,12 +228,22 @@ Авто&повертати коли панель є вертикальна - + + Show &week numbers in popup calendar + + + + + S&how tooltip + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' '<b>'ГГ:хх:сс'</b><br/><font size="-2">'ддд, д МММ рррр'<br/>'ЧЗ'</font>' - + Input custom time zone name Введіть назву власної назви часової зони @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> diff -Nru lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_zh_CN.ts lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_zh_CN.ts --- lxqt-panel-0.14.1/plugin-worldclock/translations/worldclock_zh_CN.ts 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/plugin-worldclock/translations/worldclock_zh_CN.ts 2020-11-05 16:09:19.000000000 +0000 @@ -4,7 +4,7 @@ LXQtWorldClock - + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -118,7 +118,7 @@ - + Custom name 自定义名称 @@ -228,12 +228,22 @@ 纵置面板时自动旋转(&R) - + + Show &week numbers in popup calendar + + + + + S&how tooltip + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - + Input custom time zone name 输入自定义时区名称 @@ -271,8 +281,6 @@ <tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> <tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> <tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> -<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> -<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> <tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".</td></tr> <tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".</td></tr> <tr><td>t</td><td>the timezone (e.g. "CEST")</td></tr> diff -Nru lxqt-panel-0.14.1/README.md lxqt-panel-0.16.1/README.md --- lxqt-panel-0.14.1/README.md 2019-02-25 22:16:30.000000000 +0000 +++ lxqt-panel-0.16.1/README.md 2020-11-05 16:09:19.000000000 +0000 @@ -10,7 +10,7 @@ #### 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. +Both provide clock and calendar functionality. plugin-worldclock can display various time zones in addition but lacks a tooltip displaying current date and time upon hovering. These plugins will probably be merged into one, see https://github.com/lxqt/lxqt/issues/312. #### Quick launch (plugin-quicklaunch) @@ -60,65 +60,11 @@ 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. -## Translation (Weblate) +### Translation - -Translation status - - -Translation status - - -Translation status - - -Translation status - - -Translation status - - -Translation status - - -Translation status - - -Translation status - - -Translation status - - -Translation status - - -Translation status - - -Translation status - - -Translation status - - -Translation status - - -Translation status - - -Translation status - - -Translation status - - -Translation status - - -Translation status - - -Translation status +Translations can be done in [LXQt-Weblate](https://translate.lxqt-project.org/projects/lxqt-panel/) + + +Translation status + diff -Nru lxqt-panel-0.14.1/.travis.yml lxqt-panel-0.16.1/.travis.yml --- lxqt-panel-0.14.1/.travis.yml 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-panel-0.16.1/.travis.yml 2020-11-05 16:09:19.000000000 +0000 @@ -0,0 +1,33 @@ +language: cpp + +sudo: required + +dist: bionic + +services: + - docker + +script: + - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash" + +archlinux: + repos: + - archlinuxcn=https://cdn.repo.archlinuxcn.org/$arch + packages: + # See *depends in https://github.com/archlinuxcn/repo/blob/master/archlinuxcn/lxqt-panel-git/PKGBUILD + - git + - cmake + - qt5-tools + - lxqt-build-tools-git + - alsa-lib + - libpulse + - lm_sensors + - libstatgrab + - libsysstat-git + - solid + - menu-cache + - libxcomposite + - lxmenu-data + - libdbusmenu-qt5 + - lxqt-globalkeys-git + script: bash ./.ci/build.sh