diff --git a/.gitignore b/.gitignore index 2da2b48..26e08cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ build *.kdev4 CMakeLists.txt.user +*/translations/lxqt-panel diff --git a/AUTHORS b/AUTHORS index 190d298..a66be6d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4,7 +4,7 @@ Upstream Authors: Copyright: Copyright (c) 2010-2012 Razor team - Copyright (c) 2012-2014 LXQt team + Copyright (c) 2012-2016 LXQt team -License: GPL-2 and LGPL-2.1+ +License: LGPL-2.1+ The full text of the licenses can be found in the 'COPYING' file. diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..b7adcde --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,1421 @@ + +lxqt-panel-0.11.0 / 2016-09-24 +============================== + + * Update README.md: Reflect changes introduced in 1c22479 + * CMakeLists: Fail for unmet dependencies + * mainmenu: Remove setting base style in StyleChange + * mainmenu: Workaround transparent search + * mainmenu: Dispose old menu first when building new + * Add README.md + * sensors: Add default bar scale + * sensors: Check for existence of the max value + * sensors: Add minor code optimization + * mainmenu: Handle QAction disposal correctly + * panel: Don't use autoFillBackground + * Plugin: Fix FTBFS for older Qt versions + * mainmenu: Fix show/hide actions after menu rebuild + * Statusnotifier: Remove setParent on StatusNotifierMenu. + * Add XKB_COMMON_X11_INCLUDE_DIRS + * panel: Remove/deprecate plugin-screensaver (#363) + * Add and Update Arabic Translations for Desktop Files + * Fix updating panel geometry on screen size change + * panel: Fix screen number config change saving + * Separate a String for I18N Enhancement + * plugin: Force config dialog activation/raise + * plugin: Fix crossreferencing of config dialogs + * panel: Dispose unneeded menu + * panel: Destroy panel's config dialog + * showPopupMenu: Remove extraneous setParent() call (#359) + * statusnotifier: fix popup position on right click + * desktopswitch: Take layoutDirection into account + * taskbar: Remove orientation specific logic for DnD + * LXQtPanelLayout: Take layoutDirection into account + * taskbar: Remove forgotten debug + * taskbar: Consider layoutDirection for DnD + * panel: Optimize search a bit + * plugin-volume: Avoid an buffer overflow + * Respect the OnlyShowIn property for menu entries when using menu-cache (#351) + * kbindicator-plugin: fix linking with libxcb-1.12 + * plugin-volume: Handle errors when trying to determine the next card + * Clean up CMakeLists.txt + * plugin/directorymenu: Removes no use code (#350) + * build: Forward translations parameters + * ts-files removal (#346) + * Fix memory leaks + * Use const references with the foreach iterator + * Small fix + * statusnotifier: Fix showing icons in menu + * kbindicator: (Re)Add .desktop translations + * Update desktopswitchconfiguration.ui + * panel: (Re)Add translations dir + * Revert unintended *.desktop files removal + * Remove translations (can be pulled in build time) + * Use external translations + * Update lxqt-panel_it.ts + * Add documentation/comments for PanelPluginsModel. + * Fix segfault on plugin initialization (#338) + * translations: updated german translation (#323) + * plugin-mainmenu: update mainmenu_it.ts (#337) + * Russian translation update + * mainmenu: Use style sheet to override icon + * plugins: Change "repolish" logic + * mainmenu: Reduce delay of popup when using shortcut + * volume: Remove debug + * plugins: Don't unload -> avoid dangling resources + * Added new translated strings. + * Added missing context for lupdate. + * Updated german translation. + * Ask for confirmation when removing a panel + * panel: Add "Lock Panel" functionality + * fix updating panel geometry on screen changes + * Try find a free position when adding a new panel + * LXQtPanelApplication: Use D-Pointers + * Animate auto-hiding panels. + * Add QT_USE_QSTRINGBUILDER to the compile definitions + * tray: Fix SEGFAULT on stop + * mainmenu: Fix visual search problems + * mainmenu: Remove duplicates from search + * mainmenu: Add new configuration options for search + * mainmenu: Workadound QLineEdit's wakups(QTBUG-52021) + * mainmenu: Add configurable way of search + * taskbar: separate adding from changing windows + * plugins: Make buttons flat for cleaner look + * mainmenu: Fix search interacion + * mainmenu: Add search/hide possibility + * taskbar: Add show icon by WindowClass to config + * taskbar: Use icon from theme (based on windowClass) + * panellayout: Do not allow oversized plugins + * panellayout: Avoid plugin margins + * PluginSettings: Make settings object/class public + * Bump year Fix licenses: lxqt-panel is pure LGPL + * worldclock: Fix possible SEGFAULT + * Add comments for ILXQtPanel and LXQtPanel. + * plugin-taskbar: fix German translation of configuration dialogue + * panel: Correct PanelPluginsModel logic + * volume: Avoid infinite cycle in config dialog + * plugins: Use "cleaner" style logic + * mainmenu: Remove unneeded includes + * mainmenu: Fix freeze for some widget styles (e.g. breeze) + * tray: Fix "BadDamage" warning message + * tray: Postpone tray icon initialization + * PluginSettings: Emit settingsChanged only for owned keys + * taskbar: Fix (auto)hide after window menu is shown + * mainmenu: Use directory of current icon for search + * mainmenu: Fix showing icon path in configuration + * plugin-taskbar: avoid icon-only style for groups + * statusnotifier: fix position of context menus + * plugin-quicklaunch: remove preset applications + * plugin-tray: Fix native window sizes for high DPI devices + * taskbar: Refactor/improove window handling logic + * taskbar: Fix multiple groups when WindowClass changes + * plugin settings: Publish PluginSettings symbols + * Add support for nested groups in PluginSettings + * Add PluginSettings::{read,set}Array for atomicity + * Add PluginSettings for shared settings for plugins + * plugins config: remove a lot of redundant code + * LXQtPanelPluginConfigDialog: add ctor overload + * Update lxqt-panel_fr_FR.ts + * Create HR translations for panel and plugins + * lxqt-panel: Update/format and install man page + * plugin-kbindicator: remove ru_RU translations + * plugin-kbindicator: add russian translations + * Update Russian translations for the panel and plugins + * Italian translation update + * Updated german translation. + * Adds comments for lxqtpanelapplication.h. + * Correct some minor spelling mistakes. + * panel-config: Fix background opacity slider + * taskbar: Avoid "noop" button if window ID changes + * mainmenu: Fix URL assembly for Drag&Drop + * panel: Fill background + * mainmenu: Use configurable icon + * worldclock: Fix update interval + * panel: Add periodic hide checking + * clock: Fix content update if transform/autorotate + * quicklaunch: Fix panel hiding upon showing menu + * worldclock: Decrease (unnecessary) wake-ups + * panel: Remove periodic checking for hide + * Prevent panel hiding in case any (standalone) window shown + * plugins: Unify window popup-ing + * directorymenu: Fix indentation (spaces) + * panel: Use override for overriden virt func + * hu translations fixed + * plugin-sysstat: translations fix + * desktop-switch: Hightlight only windows in taskbar + * fix misspelled prefered + +0.10.0 / 2015-10-31 +=================== + + * Fix license file + * panel: Fix reserved space on screen + * mainmenu: Fix close menu by "weird" shortcut + * volume: Handle add/removal of pulse sink correcly + * Workaround to the QStringLiteral static finalization bug + * plugin-mount: Fix SEGFAULT in finalization time + * mainmenu: Fix global shortcut configuration + * taskbar: Enhance show icon for moving + * taskbar: Fix incorrect move between multiple instances + * taskbar: Simplify drag originator logic + * Fix a couple of warnings + * Make panel's settings private for more reliability + * Fix warning about possibly uninitialized variable + * taskbar: Use the icon as the DnD pixmap + * taskbar: Add visual effect to button move + * worldclock: Fix popup showing after closed + * plugins: Unify popups behaviour + * taskbar: Fix showing group popup for DnD + * taskbar: Enhance moving buttons + * CPU count begins with 0 not with 1. + * Updated german translation. + * Added missing cpu10, updated translation template. + * Added some translateable strings, tooltips. + * plugin-statusnotifier: corrected CMakeLists.txt + * panel: referencing symbol in static plugins to not stip the loader object in linking time + * Use "automatic" plugin translations loader + * addplugindialog: show also the plugin ID (desktop file name) + * Optimization on plugin name generation, as suggested by palinek. + * Fix #839 - lxqt-panel plugins enumeration + * Revert "plugin-statusnotifier: fix FTBFS with dbusmenu-qt" + * panel: remeber configured screen + * plugin-statusnotifier: fix FTBFS with dbusmenu-qt + * plugin-statusnotifier: better callable checking for static_assert + * plugin-statusnotifier: polish of SniAsync::propertyGetAsync usage + * Replace QPixmap::grabWindow with QScreen's version + * plugin-statusnotifier: add missing license headers + * plugin-statusnotifier: get all icons from DBus + * plugin-statusnotifier: async communication in DBus + * plugin-statusnotifier: postpone registration of new item to not block DBus response + * plugin-statusnotifier: correct memory release & existing menu check (avoid SEGFAULT) + * Transition LxQt --> LXQt: remnants in TS files + * Italian translation: remove country-specific translation "_IT", several updates + * Rename LxQt to LXQt everywhere + * Update Greek translation Remove country variant from language code + * license text don't match license declaration + * license headers for kbindicator plugin + * plugin-mainmenu: set icon size according to font size + * plugin-mainmenu: removed unused QProxyStyle object + * plugin-statusnotifier: fix popup position on + * Redesigned settings dialog, switching policy setted as global by default + * Update Russian translation + * Removed unneeded entries from include_directories() + * Use CMAKE_AUTORCC. Drop qt5_add_resources(). + * Use CMAKE_AUTOUIC. Drop qt5_wrap_ui(). + * Prefer list(APPEND ...) over set(....) + * panel: QMenu positioning workaround for multihead/multipanel setup + * plugin-sysstat: fix for source strings translation + * plugin-sysstat: translatable type/source strings + * plugin-sysstat: enhanced tooltip texts + * plugin-sysstat: correct configuration displaying/changing + * plugin-spacer: configuration UI load fix + * Removes ancient QT_USE_XXXX variables + * Use find_package() to find libdbusmenu-qt5 + * plugin-sysstat: added tooltip information + * minor fix in German translation of plugin-kbindicator + * Re-added german translation. + * Updated translation template for tooltips. + * Updated german translation. + * Add placeholders to fr translation + * Add french translation + * Remove faulty lithuanian translation + * Complete dutch translation + * Fix romanian translation + * Remove country specific Italian + * Complete italian translation + * Update hungarian translation + * Remove faulty lithaunian + * Update slovenian + * Delte incomplete arabian translations + * Update romanian translations for the desktopswitch plugin + * Update romanian translations for the cpuload plugin + * Update romanian desktop file for the cpuload plugin + * Update romanian translations for the clock plugin + * Update romanian translation for the clock desktop file + * Update romanian translations for the main panel ui + * Add missing romanian translation for the network monitor + * Update romanian translations for the network monitor desktop file + * panel: fix reserved space + * autohide: correctly reserve screen space, always. + * autohide: change only apparent height/width, + * panel-configplugins: Adds tooltips + * kbindicator: depend on xkbcommon & show lang flag + * application: use standard liblxqt unix signal handling to quit + * plugin-showdesktop: remove xcb dependency, use KF5 + * Use KWindowSystem to set window type as Dock + * plugin-taskbar: Enhances Configuration Ui layout + * Updates the build system to use the Targets infrastructure + * plugin-clock: static width based on characters count + * Finish networkmonitor turkish translation + * addplugindialog: prevent segfault on dialog opening + * plugins: new flag to set the need for a flag + * plugin-mainmenu: applying custom font size on the fly + * Added missing german translation, updated template. + * fixes in French and German translation + * plugin-spacer: simplified configuration signal handling + * plugin-mount: avoid realign-resize recursion + * Remove trailing whitespaces + * Replace LXDE-Qt with LXQt in desktop file + * Fix naming and links + * Delete faulty indonesian translation + * Rename greek and french translation file to be country independant + * Delete duplicate russian translation + * Delete duplicate hungary translation + * Delete duplicate danks files + * Delete czech country specific files + * Add polish translation + * Moved croatian translations to the correct directories. + * Updated german translations for the taskbar plugin. + * Added german translation for the spacer plugin. + * Updated german translations for the showdesktop plugin. + * Updated german translations for the sensors plugin. + * Delete Venezuela specific translations + * Correct dutch translations for networkmonitor desktop file + * Improved network monitor Spanish translations + * Provide esperanto translation for networkmonitor + * Correct translation for esperanto desktop file + * Add turkish translation + * Fix lxde/lxqt#684: activate window on some options + * plugins: unified handling for single instance plugins across all panels + * plugins: flag to limit plugins to single instances + * plugin-volume: handle maximum volume proportionally + * plugin-clock: calculate min widget size + * panel: retest conditions for autohide regulary after Leave event + * Updated / unified german translation for taskbar plugin. + * Added german translation for sysstat plugin. + * Added german translation for statusnotifier. + * Updated template by removing old file and trigger an update. + * Updated german translation for the screensaver plugin. + * Updated german translation for the quicklaunch plugin. + * Updated german translation for the networkmonitor plugin. + * Updated german translation for mainmenu plugin. + * Updated template for mount plugin. + * Updated german translation for mount plugin. + * Added german translation for kbindicator plugin. + * Added german translation for DOM. + * Moved croatian translation to correct directory. + * Updated german translation for directorymenu. + * Updated german translation. + * Updated german translation for cpuload plugin. + * Updated german translation for colorpicker plugin. + * Cleaned german desktop file for tray plugin. + * Updated german translation for volume plugin. + * Added german translation for worldclock plugin. + * plugin-clock: adjust size only when needed + * plugin-taskbar: show only particular desktop windows + * panel: only for supported objects the iconSize qproperty styling is applied + * plugin-sensors: (re)added warning timer fequency initialization + * plugin-tray/statusnotifier: icon in .desktop file + * plugin-desktopswitch: Check if the button exists dereferencing it. + * plugin-volume: more obvious popup buttons + * plugin-spacer: slovak translation + * plugin-spacer: translatable type texts + * Updated german translation for clock plugin. + * Added new string to template and german translation. + * plugin-clock: use Qt::PreciseTimer for better accuracy + * panelconfig: default background opacity to 100 & compositing note + * plugin-clock: content down-scaling & proper size adjustments after config change + * Updated german translation, removed now obsolete _de_DE.ts. + * Updated template, sorted line numbers and contexts - like created from scratch by 'lupdate'. + * Better name for dialog window. + * pluginsmodel: fix crash in QAbstractItemModel::endMoveRows for noop move + * plugin-mainmenu: config: editable menu file & button icon + * panel: improve multi-monitor support + * Create networkmonitor_hr.ts + * Create mount_hr.ts + * Create mainmenu_hr.ts + * Create kbindicator_hr.ts + * Create directorymenu_hr.ts + * Create desktopswitch_hr.ts + * Create cpuload_hr.ts + * Hungarian translations added, modified + * plugin-mainmenu: fix crash on changing menu file + * Fixes lxde/lxqt#647, FTBFS + * Update networkmonitor_it.desktop + * Update networkmonitor_it_IT.desktop + * Update networkmonitor_it_IT.desktop + * Update networkmonitor_it.desktop + * Update networkmonitor_it_IT.desktop + * Update networkmonitor_it.desktop + * plugin-networkmonitor: fix faulty French translation + * Fix German translation of panel context menu (addendum). + * Fix German translation of panel context menu. + * panelconfig: improve title and labels + * Update lxqt-panel_es.ts + * panelconfig: fixed type in "cannot reset" note + * Make "spacer" a static plugin. + * panelconfig: no margin for plugins configuration widget + * plugin-mount: popup size handling upon show event + * plugin-mount: startup speedup (potential long time operation is done after object construction) + * plugin-mount: correct popup size handling + * plugin-taskbar: reverting commit b0a1f3d007c2369fdf624f406aa36b883c72fd5f + * panel: fix volume's type in the default config + * panel: save settings after plugin move from config dialog + * panel: plugins correct positiong + * panelconfig: corrected usage of Plugin in button states logic + * CMakeLists: re-enable default building state for plugins + * panel: PanelPluginsModel signals handled directly by layout + * Enable/disable buttons in Manage Plugins dialog + * panel: subclass QAbstractListModel to handle plugins + * panel: separate GUI of panel settings from plugin + * CMakeLists: fix translation loader include (usage of lxqt_app_translation_loader) + * plugin-taskbar: don't stretch along the panel in icon only + * plugin-taskbar: raise minimized windows on current desktop + * plugin-taskbar: show only minimized windows + * plugin-taskbar: fix for show/hide of moved window if "show only panel's screen windows" active + * plugin-taskbar: fix of crash after closing not showed window + * Update Russian translation + * Add QtCreator project file type to .gitignore + * plugin-mainmenu: fixed panel autohide after menu closed + * plugin-mount: remove of doubled signal connection + * plugin-mount: fix error message construction + * plugin-mount: add device actions back + * Fix FTBFS with Qt 5.3 and memory leak + * plugin-mount: typo for updating the status + * plugin-mount: large refactoring and simplification + * plugin-mount: improoved state changes handling + * plugin-taskbar: integrated "current screen only" commit into current master - grouping + * Added show windows from current screen only + * panel: layout elements centering fix + * Refactoring of panel's main + * panel: fixed creation of translation files + * plugin-taskbar: left-aligned labels in case "Only Text" + * plugin-taskbar: initial popup button style fix + * plugin-taskbar: fix grouping popup follow icon/text style + * CMAKE_AUTOMOC=ON and cleanup of all CMakeLists.txt + * Improve panel's configuration dialog arrangement + * plugin-taskbar: configurable maximum button height + * panel: layout position optimization + * plugin-desktopswitch: urgency handling improvements + * plugin-desktopswitch: initial desktop renaming + * plugin-desktopswitch: set urgency for desktops + * plugin-taskbar: correct handling of SkipTaskbar state + * plugin-taskbar: moved handling of KWindowSystem::windowChanged into LxQtTaskBar + * plugin-taskbar: optimized window icon geometry handling + * plugin-taskbar: enhanced "is on current desktop" handling + * plugin-taskbar: fixed group vs. window class handling + * plugin-taskbar: "regroup" every time when visibility is refreshed + * plugin-statusnotifier: correctly place context menu + * plugin-statusnotifier: fix showing menu/icon showing + * plugin-taskbar: proprely handle window class name change + * Fix NetBSD build + * plugin-directorymenu: fixed directory choosing + * plugin-worldclock: use Qt::WindowModal dialogs to not "inactivate" panel + * panelconfig: correct dialog handling (avoid access to deleted object) + * plugins config: use Qt::WindowModal dialogs to not "inactivate" panel + * panelconfig: use Qt::WindowModal dialogs to not "inactivate" panel + * panel: make config dialog top-level window + * plugin-clock: removed unneeded adjusting size of widget to it's content + * plugin-worldclock: removed unneeded adjusting size of widget to it's content + * panel: show panel after lauch if hidable + * plugin-taskbar: optimized calculation of popup position + * panel: widgets manageable from "add plugin dialog" + * Updates translations sources + * plugin-directorymenu: cleanup & icon + * new plugin - directorymenu + * Update mainmenu_it_IT.ts + * Updates translations sources + * panel: correct background of hidden panel + * lxqtpanellayout: respecting contentsMargins() value + * plugin-dom: enhanced properties output + * plugin-screensaver: proper shortcut regstration + * plugin-desktopswitch: proper shortcut regstration + * plugin-volume: proper shortcut regstration + * plugin-showdesktop: proper shortcut regstration + * plugin-desktopswitch: delayed registering shortcuts + * plugin-desktopswitch: refactoring & optimizations + * plugin-desktopswitch: Option to display names instead of numbers + * plugin-volume: avoid warning of hiding overloaded virtual function + * Create kbindicator_it.ts + * Update clock_it_IT.ts + * Update taskbar_it_IT.ts + * Update lxqt-panel_it_IT.ts + * Update lxqt-panel_it.ts + * Add required package xcb-util to plugin-tray + * plugin-spacer: reordered type - default now lined + * panel: auto-hide feature + * plugin-dom: non-stretchable heading + * plugins: static plugins initialization on one place + * plugins: const for ILxQtPanelPluginLibrary::instance + * plugin-mainmenu: if menu shown click on button closes menu + * plugin-clock: configurable first day of week + * panel: fix for multilplicating plugin counts when "Add Panel Widgets" shown and reactivated + * panel: conditional statically linked plugins + * plugin-volume: show perentage tooltip + * plugin-statusnotifier: standardize context menus + * plugin-taskbar: multiple fixes + * plugin-taskbar: large refactoring and cleanup + * plugin-taskbar: fixes for lxqttaskgroup and lxqtgrouppopup + * plugin-taskbar: refactor how we handle settings + * plugin-taskbar: removed eyecandy, re-sorted configuration item(s) and fixes + * plugin-taskbar: initial implementation of window grouping + * panel: added smart pointer guard to main (avoiding ad-hoc SEGFAULTs on application end) + * plugin-statusnotifier: workaround for invalid items + * plugin-statusnotifier: better icon handling + * Require C++11 support + * plugin-statusnotifier: added license to files headers + * plugin-statusnotifier: fix registration of StatusNotifierHost and protocol version + * plugin-statusnotifier: get some ideas from Plasma's + * panel: fix warning in findStaticPlugin + * plugin-statusnotifier: retrieve and cache the icons + * plugin-statusnotifier: handle Status and display correct icon + * plugin-statusnotifier: correctly handle mouse clicks + * plugin-dom: added all widget's properties view + * Added Status Notifier Plugin, from equim/lxqt-panel-plugin-snw + * plugin-dom: added all widget's properties view + * Adds a threshold which a user has to pass when scrolling on the desktopswitch plugin for the lxqt-panel. This makes scrolling less sensitive and more usable. + * Quit gracefully on Unix kill signals + * plugin-mount: Use drive-removable-media icon as fallback + * plugin-spacer: support for stylable spaces + * plugin-mount: Use only one icon instead a list of possible ones + * added support for setting desktoplayout + * plugin-desktopswitch: configurable number of rows + * plugin-networkmonitor: fixed Czech translation + * Fixes #473, mouse wheel on DesktopSwitch not functioning properly. + * plugin-mainmenu: fix for not showing menu for next added widget + * plugin-mainmenu: avoid menu loading if menu file not changed + * panel: connected cleanup to signal aboutToQuit + * Style/headers cleanups in Sensors plugin + * Updated polish translations + * Add support for "local" timezone. Fixes lxde/lxqt#519 + * Simplify update timeout. Fixes lxde/lxqt#525 + * plugin-mount: switch from liblxqt-mount to KF5Solid + * Style cleanups in ColorPicker, DOM, Mount and QuickLaunch plugins + * added separate list of configured plugins to not delete them from configuration in case plugin not found + * Fixing drag and drop of running programs' icons when panel is vertical + * plugin-spacer: suitable icon?! + * new spacer plugin/widget + * plugin-cpuload: configurable bar width + * plugin-cpuload: indentation corrected to follow rquired coding style + * Add some debug code to benchmark the loading time of each plugin during panel startup. + * Make some frequently used plugins "statically-linked" to speed up loading. * The static plugins are: clock, desktopswitch, mainmenu, quicklaunch, showdesktop, taskbar, tray, and worldclock. + * Add missing libxcb linkage to showdesktop and tray plugins since they still uses xcb. + * remove KF5/ prefix from includes as done in lxde/liblxqt/pull/36 + +0.9.0 / 2015-02-05 +================== + + * Change the delay of main menu popup from 500 ms to 250 ms. + * Try to fix lxde/lxqt#459, lxde/lxqt##142, and lxde/lxqt#401 at the same time. * Delay showing the menu when it's activated by shortcut key to workaround keyboard focus related issues. * Code cleanup. Remove unnecessary keyboard event hacks. + * Revert "Fix mainmenu's focus" + * Add icons to the panel plugins + * Add missing action icons to the panel popup menu + * fix networkmonitor_de_DE.desktop for the time being + * Fix mainmenu's focus + * Update Russian translation + * remove specialized leave-menu handling + * Remove teatime plugin + * Portuguese update + * Update Japanese translation + * Add #TRANSLATIONS_DIR to colorpicker.desktop. + * Fix dom.desktop.in (LXDE-Qt to LXQt) + * Update all translations + * Make sure widgets in settings dialog have corrent enabled state when settings are loaded + * Remove a translation message that gotten mixed accidentally + * Update spanish translation + * worldclock: Fix Ui date settings load inconsistency + * Removes ${PLUGIN_DIR} duplicate definition + * Include the BuildPlugin one time only + * Fixes CMake CMP0038 warnings + * Makes the Show Desktop shortcut work again + * Remove plugin settings from panel settings file when plugin is removed + * Portuguese language update + * Rename some text. See lxde/lxqt#416 + * Cleanup of CMakes, using GNUInstallDirs now + * Updates translations sources + * Unify plugin files naming + * Support custom time zone names (as per request in https://github.com/lxde/lxqt/issues/312#issuecomment-68588776 ) + * Rewrite worldclock's configuration + * - Reverse wrong placed translations. + * - Update brazilian portuguese desktop translation + * Toggle lock keys' state on click on keyboard indicator + * Use xcb on Show Desktop plugin. This is related to lxde/lxqt#338 + * Add QX11Extras to cmake include dir + * - Unify naming for a unique lxqt. No more suffixes + * Network Monitor plugin: fix faulty German translation + * Use XdgDesktopFile::load() + * Revert "Commit from LXDE Pootle server by user LStranger.: 391 of 391 strings translated (0 need review)." + * Commit from LXDE Pootle server by user vgezer.: 320 of 320 strings translated (0 need review). + * Update Russian translation + * Commit from LXDE Pootle server by user LStranger.: 391 of 391 strings translated (0 need review). + * Add keyboard navigation to main menu + * Reorganization of mainmenu's configuration panel + * Fixes lxde/lxqt#318 configurable font size in mainmenu + * Commit from LXDE Pootle server by user flywheel.: 262 of 264 strings translated (2 need review). + * Update taskbar buttons' icons on event + * Add KDevelop project file type to .gitignore + * Commit from LXDE Pootle server by user DanWin.: 305 of 305 strings translated (0 need review). + * Commit from LXDE Pootle server by user DanWin.: 294 of 305 strings translated (0 need review). + * Plugin name fixed. Fixes #382 + * Update Russian translation + * Sort plugins alphabetically, remove non-existing plugin-helloworld + * Add time-only formats, improve popup in plugin-worldclock + * Cancel widget move on panel with esc + * Get rid of Xlib on the keyboard indicator + * Fix draggind action from main menu + * Fixes translations generation + * Moves translations from the local to the translations dir + * Uses the new translations cmake modules + * Renames the translations source files + * Reorganize panel configuration dialog + * Make the lxqtmount-qt5 required only when building the mount plugin. + * Custom font color handling. Fixes #101. + * Panel background configuration + * Commit from LXDE Pootle server by user H.Humpel.: 124 of 305 strings translated (0 need review). + * Reset statistics widget only when size changes. Fixes lxde/lxde-qt#353 + * Relax limits on size and update frequency + * Set the systray plugin free form liblxqt's XfitMan + * Fix segfault on i3 when changing workspaces. Fixes lxde/lxde-qt#240 + * Commit from LXDE Pootle server by user rago1975.: 65 of 65 strings translated (0 need review). + * Fixes an FTBFS on openSuse + * Commit from LXDE Pootle server by user JSonic.: 391 of 391 strings translated (0 need review). + * Commit from LXDE Pootle server by user rago1975.: 10 of 10 strings translated (0 need review). + * Commit from LXDE Pootle server by user rago1975.: 24 of 24 strings translated (0 need review). + * Commit from LXDE Pootle server by user rago1975.: 21 of 25 strings translated (0 need review). + * Commit from LXDE Pootle server by user rago1975.: 57 of 57 strings translated (0 need review). + * Commit from LXDE Pootle server by user rago1975.: 39 of 39 strings translated (0 need review). + * Commit from LXDE Pootle server by user KlemenKosir.: 360 of 356 strings translated (0 need review). + * Fixes translations not being loaded. + * Fixes lxde/lxde-qt#325. Drop .desktop files on quicklaunch + * Update Russian translation + * Fix taskbar window filter + * Reset calendar's selected date when showing. Fixes lxde/lxde-qt#322 + * worldclock: get rid of ICU + * CMakeLists.txt cleanup + * Commented line that was causing high CPU and memory usage + * Port to KWindowSystem. Purges Qt4. + * Commit from LXDE Pootle server by user H.Humpel.: 78 of 305 strings translated (0 need review). + * Popup the configuration dialog when the user adds a panel + * Commit from LXDE Pootle server by user Pjotr.: 356 of 356 strings translated (0 need review). + * Commit from LXDE Pootle server by user KlemenKosir.: 285 of 356 strings translated (0 need review). + +0.8.0 / 2014-10-09 +================== + + * Load the plugins translations + * Adapt to the translation infrastructure + * Fix plugin title in context menu + * Allow opening more than one plugin configuration panel. Fixes lxde/lxde-qt#60 + * Make Removable Media's panel be closable with ESC. Fixes lxde/lxde-qt#126 + * Needed for lxde/lxde-qt#140 and #54 + * Make version detection work with Qt4 + * Fixes bug that resets panel configuration on panel deletion + * Make calendar dialog hide when it loses focus + * Fix scroll order after drag and drop + * Use Qt5.2+ for WorldClock plugin instead of ICU4.2+ if possible + * Prevent infinite repainting + * Keep layout direction linked to rotation + * Update copyright info + * Fix lxde/lxde-qt#61 + * Fix iterator type + * Fix lxde/lxde-qt#279 + * Avoid using XdgDesktopFileCache which loads the whole cache just to get info for several files. This can speed up startup of lxqt-panel. + * Adapts to the new libqtxdg XdgMimeType class + * Removes "Set from theme" panel size button + * Commit from LXDE Pootle server by user dforsi.: 57 of 57 strings translated (0 need review). + * Commit from LXDE Pootle server by user psokol.: 16 of 32 strings translated (0 need review). + * Fix incorrect handling of work area and WM_STRUT which cause incorrect popup menu places. + * Workaround for Qt 5 bug #40681 by monitoring QScreen::destroyed() and re-create affected panels manually. * This closes lxde/lxde-qt bug #204, #205, and #206 at the same time. * Store the result of QX11Info::display() and avoid repeated calls to the methods. (When called during the primary screen being destroyed, QX11Info::display() crashes.) + * Force re-creation of the panel window when screen count is changed to workaround Qt bug 40681. * Fix lxde/lxde-qt bug #204, #205, and fix incorrect WM_STRUT & WM_STRUT_PARTIAL X window properties. + * Use the edge of the whole screen instead of that of individual monitors when setting strut as specified in the xdg EWMH spec. + * Fix incorrect _NET_WM_STRUT settings under multi-head environment. + * Do not activate the panel on mouse click. This closes lxde/lxde-qt bug # 161. + * Replace Qt5 only API QWidget::grab() with QWidget::render() when compiled with Qt4. + * Always use percentage (0-100) for the volume of audio devices. + * Delete invalid slot. + * Taskbar buttons manual ordering + * Refactor lxqt taskbar plugin and made using more than 1 taskbar possible. + * Set proper default value for sysstat plugin to turn on cpu monitoring by default. + * Fix the bug that 100% volume cannot be used. * Make AudioDevice::setVolume() accept real volume rather than percent and make all backends consistent. * Set the maximal volume of the alsa devices to 100. + * Fix dropping an action from menu + * Remove repeated find_package() from CMakeLists.txt + * Return 0 for QStyle::SH_MenuBar_AltKeyNavigation style hint of mainmenu. With this, the menu won't be closed when the user press Alt key. + * Avoid duplicated ElidedButtonStyle instances to save some resources. Update the ElidedButtonStyle proxy style when its base style is changed. + * Implements Urgency Hint handling + * Apply the new QStyles correctly to the main menu when the style is changed. + * Fix bug #14: ilxqtpanel.h misses its dependency on lxqtpanelglobals.h. + * Add missing xcb packages to CMakeLists.txt. + * Try to fix lxde-qt bug #208: Volume applet slider closes immediately after touching. * Do not hide the volume popup when realign(). * Activate the popup window, and hide the popup when it's deactivated. * Fix the timeout handling in VolumeButton. + * Update the sink list in the config dialog of volume control plugin when changing audio engine. + * Fix the incorrect default value of audio backend of volume control plugin. + * Properly include sysstat directories + * Use portable SysStat headers + * Use portable LXQt header in .ui files too + * Look for the Qt5 version of SysStat when appropriate + * Set _NET_WM_WINDOW_TYPE_DOCK to the panel to workaround a bug in Qt5. + * Fix incorrect handling of xcb event, fixing tray plugin. + * Fix building kbindicator plugin with Qt5 and XCB (not fully working). + * Try to fix tray plugin. + * Fix taskbar plugin for Qt5. + * Add missing plugin metadata to make them loadable in Qt5. + * Qt5 fixes + * Prepare for Qt5 + * Prepare the CMakeLists.txt files for building with Qt5. + * Make the "Mixer" link in volume plugin be themeable + * emit realigned () is now called always AFTER LxQtPanel::realign() + * Update quicklaunchaction.cpp + * Use the libqtxdg portable headers + * Make it work for vertical panels too + * Panel height handling + * Adapt to the new liblxqtmount portable headers + * Adds the liblxqtmount include dirs to the build system. + * Call for realign() when position is changed and a name fix for positionChanged() + * Remove unused btnClicked slot + * Use new LXQt header files. + * Update clock_pl_PL.ts + * Update lxqt-panel_pl_PL.ts + * Apply again patch for special meaning of negative size for panel + * Improve OSS backend of volume plugin and fix its configuration dialog. + * Add initial OSS support for the volume plugin + * Use the new libqtxdg environment neutral API + * Fix instantiation order + * Plugin wording fixes + * fixed version output and make it less verbose + * cmake option to build without menu-cache even if it is installed + * RGBA support for panel + +0.7.0 / 2014-04-30 +================== + + * Avoid mnemonics in the main application menu caused by & symbol in the name of the desktop apps. + +0.6.99 / 2014-04-29 +=================== + + * Update AUTHORS and COPYING + * Add CPack rules for creating tarball + * Support libstatgrab 0.90 + * Trivial fix + * Fix zh_TW translation for networkmonitor. + * Little fix for the previous commit + * Delay loading of menu icons when they are about to be shown. + * Delay the initiation of mount manager to speed up the startup of the mount plugin + * Fix incorrect signal/slot connections. + * Add a dirty hack to workaround bug #23 - Status icon for GTK3 applications present but not visible. + * Improve handling of app menu tooltips. + * Removed CMAKE_SOURCE_DIR usage from CMakeLists.txt + * Fix bug #11 - moc generation error + * Add missing lib linking for plugins. + * Properly export symbols needed by plugins. + * Include libsysstat cmake package correctly. + * Use gcc visibility to reduce unnecessary symbol exports + * Set NETWM icon geometry for task buttons while the panel is being resized or moved. + * Removed unneeded variable in realign + * Update NETWM icon geometry for task buttons. * Fix incorrect signal connection of ConfigPanelDialog::accept(). + * Fix renaming bugs, replacing lxqt-qt with lxde-qt + * Finish the crazy razor=>lxqt renaming tasks. + * Create default panel on startup if panel/panels list in the config is empty. + * Fix #5 Wrong panel size sometimes (happens randomly) + * Fixed #6. Panel size fluctuated due to change in task buttons. + * Fix drag and drop of application menu items. + * Build main menu with libmenu-cache optionally to speed up loading greatly. + * Replace razormount with lxqtmount and close bug #4. + * Fix issue #1 by replacing razor includes with lxqt ones and use proper namespace. + * Replace links to librazorqt with ${LXQT_LIBRARIES}. + * Explicit namespace added to RotatedWidget class name + * ICU can be found by cmake now + * Fix incorrect header inclusion for lxqt-globalkeys-ui. + * Rename razor-panel to lxqt-panel and fix broken build. * Use the latest liblxqt and liblxqt-globalkeys. + * Empty taskbar collapses to zero size again - fixed + * New resizing algorithm, now we set iconSize. + * Delay when saving settings decreased to 3 seconds. + * Add COPYING and AUTHORS + * Fix for Issue #571 [try plugin] + * Fixed issue #645 "Panel plugins settings cleanup" + * QuckLaunch plugin. Placeholder takes all the available space, regardless of the number of rows of columns. + * Fix for Issue #571 [quicklaunch plugin] + * Add options for the razor-panel. Missing file + * Add options for the razor-panel -h, --help Show help about options --version Show version information -c, --configfile=CONFIGFILE Use alternate configuration file + * razor-desktop and razor-panel: Adds missing tr() to setWindowTitle() + * razorqt-panel/panel: Replace "Delete Panel" by "Remove Panel" + * razorqt-panel/panel: Use capitals for in menus and window titles + * razorqt-panel/panel: Renames "Add plugins ..." to "Add Panel Widgets" + * Removes hardcoded "Add plugin" window title + * razorqt-panel/panel: Save settings right after the close button clicked + * All spinboxes for panel config have step of 1 + * Taskbar does not collapse when empty + * Some plugin alignments fixed + * Include polished + * Panel plugin popups unified and are QDialog based now + * Object renamed for easier theming + * KBIndicator plugin initialization delayed + * Correct tab set as default + * Typo fixed + * More verbose constants + * C includes fixed + * X11 Bool declaration conflict fixed + * No dependencies on STL + * Fix for issue #618 + * Fix for issue #413 + * Fix for Issue #531 This work for me in the OpenBox and KWin + * fixed #455 Panel->automatic height setting (sensors layouting) + * panel: add/remove panel in context menu. And it works. + * Simplified global key shortcut action names since all panels share the same config file. + * panel: single file config is used + * Better text (issue #583) + * Some improvements and optimizations in worldclock plugin + * Main menu has "reset shortcut" feature + * Unique panel & plugin identification + * Global shortcuts client library added and all support for it refactored and fixed. + * Crash on plugin removal fixed + * Memory leak fixed + * World clock has auto-rotation + * Rotated widget requires content + * Standard clock can be autorotated + * A better name for config variable + * Theme change makes properties update (issue #553 fix) + * potential solution for #553 - Cpuload: adjust text color with theme + * hotfix for hardcoded path in init - it's work in progress... + * Add pcmanfm-qt to quicklaunch (when it's installed) + * fixed #578: Please clarify/fix license in razorqt-panel/plugin-mount/mountbutton.* and menudiskitem.* + * panel: more panels in one executable. It allows to start more panels in a time + * initial implementation for #473 Highlight installed plugins. Now it needs to be "designed" + * fixed #561: Feature: drag and drop of local file (URL) in panel taskbar + * fix "shorcut" typo + * panel: set panel position when screen resizes (used eg. in virtualization) + * Fix typos + * Fix Issue #564 for the mainmenu plugin #564 "new panel: cfg "Line size" can be set to 10px but the value is not accepted" + * Rename Maximum button width to Preferr button width in the taskbar + * Fix Issue #564 for the mainmenu plugin #564 "new panel: cfg "Line size" can be set to 10px but the value is not accepted" + * Fix Issue #564 for non separate plugins #564 "new panel: cfg "Line size" can be set to 10px but the value is not accepted" + * Fix Issue #564 for the colorpicker #564 "new panel: cfg "Line size" can be set to 10px but the value is not accepted" + * Fix Issue #564 for the quicklaunch, set correct size for the placeHolder message #564 "new panel: cfg "Line size" can be set to 10px but the value is not accepted" + * Fix Issue #564 for the quicklaunch #564 "new panel: cfg "Line size" can be set to 10px but the value is not accepted" + * Fix Issues for the tray #564 "new panel: cfg "Line size" can be set to 10px but the value is not accepted" + * Fix for Issues #564 "new panel: cfg "Line size" can be set to 10px but the value is not accepted" #563 "new panel: vertical mode makes panel too lerge (width)" + * optimized panel calculations for icons only mode + * fix for tasbar's icon only view - autoreduce size expanding + * Don't use separate Layout for Placeholder in the QuickLaunch. + * Use separate Layout for Placeholder in the QuickLaunch. + * Show placeholder if QuickLaunch is empty. + * The DesktopSwitch buttons is strachable. + * Use RazorGridLayout in the DesktopSwitch plugin. + * Incorrect height for plugins on vert panel. + * Disable TeaTime plugin + * Improving the appearance of the mount popup - 2. + * Improving the appearance of the mount popup. + * The WorldClock plugin is separated + * New plugin Dom tree, usable for theme writers. + * Fix for "Set correct event_mask in the RazorTaskButton" breaks the button titles. https://github.com/Razor-qt/razor-qt/commit/c955007b951c7f4e35206a2f6e9d1911649bae10#commitcomment-2774274 + * Kb indicator plugin simplified + * Fix: If you add several plugins at once, RazorPanel::findNewPluginSettingsGroup allocated one name at all new plugins. + * Removed panel HelloWorld plugin, you can use TeaTime as example plugin. Removed from razorqt-panel/CMakeLists.txt + * Removed panel HelloWorld plugin, you can use TeaTime as example plugin. + * The WorldClock plugin was ported + * The KbIndicator plugin was ported + * The SysStat plugin was ported + * The Sensors plugin: settings().value to mPlugin->settings()->value + * The Sensors plugin was ported + * The NetworkMonitor plugin was ported + * The CpuLoad plugin was ported + * The ColorPicker plugin was ported + * Remove garbage include directivies + * The ShowDesktop plugin was ported + * The ScreenSaver plugin was ported + * Set correct event_mask in the RazorTaskButton + * Refactored rezor-mount plugin, added DeviceAction classes. + * The RazorPanel::calculatePopupWindowPos function handles the situation when the window is out of the screen. + * The Mount plugin was ported + * The QuckLaunch plugin was ported + * Fixed #538 razor-panel: Restore (a minimized window) is not working while using Fluxb + * Network Monitor plugin: provide interface list in configuration + * Removed debug item from plugin menu + * The DesktopSwitch plugin was ported + * Now panel does not take ownership of the config dialog. + * The Volume plugin was ported + * Typo fixed + * Mainmenu: Use xfitman to force focus when menu raised via shortcut + * The Tray plugin was ported + * Fix plugins list was saved incorectly + * Trivial fix for "sysstat/cpustat.hpp not found" + * Style follows the Coding Standard + * Main menu focus fixed if activated by hotkey + * Sysstat panel plugin: collapse when vertical panel is autosizing prevented + * RazorSysStat: fix build on ARM + * Update layout when plugin shows. + * Improved razorpanellayout and new razorgridlayout. + * Fix for devision by zerro exception. + * Layout for TaskBar + * Create a rows on panel only if it's necessary (exists some plugin on this row). + * 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 + * 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 + * Panel WorldClock plugin: Smarter timer interval handling + * plugin-clock: Don't try to get the firstDayofWeek from saved settings + * fixed #484 Ugly mount plugin appearance without any mountpoints present + * Panel Worldclock plugin: proper version dependancy (issue #500) + * Fix various build falures + * Debug included back + * Panel: Duplicated line removed + * Remove ifdef nesting + * Panel Clock plugin: epic failure fixed + * Panel Clock plugin: comment with explanation added + * Panel Clock plugin: C++-style casting used, multilevel if/else changed to switch/case, conversion formula simplified. + * Panel Clock plugin: variable declarations moved to their usage places. + * Panel Clock plugin: C locale initialised only once + * Panel Clock plugin: Implementations reordered + * plugin-mount: Don't add devices that are not usable + * plugin-clock: Get locale LC_TIME from the environment + * plugin-clock: Add missing word to a comment + * plugin-clock: Check if _NL_TIME_WEEK_1STDAY exists + * plugin-clock: Add documentation to firstDayOfWeek() + * plugin-clock: Initialize variable at declaration. + * plugin-clock: Declare one variable per line + * plugin-clock: Use camelCase style for variables + * Add myself to the authors list + * plugin-clock: Fix first day of week auto-detection. Closes #489. + * plugin-clock: Use nl_langinfo() only if available + * WorldClock plugin: all timezones shown on middle click, styles updated + * WorldClock plugin: local timezone used if no timezones selected + * WorldClock plugin: Good default custom format set, synchroTimer removed, main timer sped up, popup calendar added with current day in a region supported + * WorldClock plugin: mouse wheel supported + * WorldClock plugin: main functionality works + * Active timezone support improved + * Time zones can be added to the main list + * Time zone list built from ICU + * Settings loaded and saved + * Config added + * Initial WorldClock plugin skeleton + * SysStat plugin: Custom colours are in separate dialog + * SysStat plugin: Colours and font are read from theme + * potential solution for #484 - to display text placeholder when there is no item connected + * Icon in the TeaTime plugin. + * Plugin emit SettingsChanged only if really changes present + * Fix build on older Qt + * Trtanslations + * Graph uses all available space + * Class variables renamed + * History preserved when possible in Sysstat plugin + * Painting refactored in sysstat plugin + * forced y-position clamping + * Transparent background & theme-able container added + * sysstat: a better fix for older Qt + * panel systat plugin: a potential fix for older Qts + * Handle QSS position property + * panel-volume: add compile time switch for ALSA/Pulseaudio support + * ClockPlugin was ported + * Added IRazorPanelPlugin::calculatePopupWindowPos(), improvements. + * Re-enable kbindicator plugin + * More natural logarithmic scale + * Control over logarithmic scale added + * Dependancy on internal library fixed + * SysStat library and plugin + * Separator between the screens in the select panel position combobox + * Razor-panel: New plugin API + * preliminary manpages primary for razorqt and usefully in venenux + * Simplify code in the PowerManager + * Do not display non-urgent notifications in fallback mode + * Issue #460 fixed + * Style polishing + * Removed unnecessary copied code + * unused member removed, code style is up to Coding Standards + * mainmenu: position menu based on actual width of panel + * Simpler configuration dialogue + * Issue #426 addressed + * Clock plugin simplified: no more custom fonts + * More clear code + * Translations updated + * Translations updated + * first part of fixes based on Coverity Scan (code static analysis) + * Fixes notification in volume + * Font set correctly on theme change + * Custom font for clock plugin applied correctly + * Typos found during translation + * Panel Keyboard indicator plugin - Done + * Panel Keyboard indicator plugin - skeleton + * Translations + * Delete bad en_GB translations + * Update translations + * Fix various typos + * Fix menu for plugins with an ampersand + * Translations updated + * Removed line num from TS files. + * panel-volume: remove unused translation file + * panel-volume: Fix compilation issue when one of the AudioEngines not found + * panel-volume: Fix runtime AudioEngine if multiple are available + * panel-volume: Add logistics to change AudioEngine on runtime + * Translations + * Deleted old translation methods. + * Translations for librazorqt + * panel volume: show some icon when there is no device + * panel-audio: do not crash audio plugin if there is no sound configured in the system + * Fix middle-click config + * convert annoying QMessageBox to RazorNotification + * Make close-on-middle-click optional + * Update panel plugin names and descriptions. Closes issue #361 + * Lazy start and additional nullpoiter check in the razor-tray plugin. + * variable fix for cmake + * fixed #257 razor-panel segfaults - when there is no DBUS server running. The RzMountProvider's RazorMountDeviceList is not handled over pointer/casting anymore because QList is always implicitly shared. + * New translation infrastructure + * First day of week removed from UI + * The first day of week autodetection + * The first day of week autodetection + * Closed Issue #382 + * Updated .ts.src files + * panel-volume: fix issue #362 about max volume - honor device max volume in pulseaudio as a default - add setting to ignore device max volume on pulseaudio + * panel-volume: fix usage of volume adjust step when using scrollwheel + * panel-volume: fix deadlock when sinkinfo retrieval failed + * panel-volume: Use same icon in panel as well as in popup for mute toggle + * Fix for Issue #290 Fails to build on BSD + * panel-volume: Change mixer QPushButton to a QLabel The label includes a link-style text instead of the flat pushbutton, which lacks some indication on some QStyles like Cleanlooks + * panel-volume: visual improvements - add mixer button with label instead of icon - add checkable pushbutton to mute on the popup + * razor-panel/plugin-volume: Use center alignment + * razor-panel: Sets the limits to the panel size (Ui) + * razor-panel: Add panel config size limits (Ui) + * razor-panel: Use PANEL_DEFAULT_SIZE instead of obscure 32s + * razor-panel: Remove minimum size definition from the config ui + * razor-panel: Refactor minimum panel size definition + * New translations for razor-panel plugins + * New translations for razor-panel + * detect soub backends by proper cmake modules because of cmake variable errors on some systems; allow to be built with no pulse (ifdefs) + * panel-volume: add settings defines - Use defines rather than strings for the setting names - Change settings default for mixer to 'qasmixer' for alsa - Change settings default for volume adjust step to 5 + * panel-volume: Add volume adjust step - settings has now an item to adjust volume step - inc/dec volume on AudioDevice is remove as it depends on the settings step + * panel-volume: Finally make members in AudioDevice private + * panel-volume: - Receive updates on external volume changes for alsa - Fix alsa mute setter + * panel-volume: Add alsa event handling, no usage yet + * panel-volume: Try to get proper card name instead of card index + * panel-volume: - Fix mute handling - Add mute setting for alsa backend + * panel-volume: - Add initial alsa channel listing - Volume on selected alsa channel can now be set - No external volume changes are handled in alsa backend - No mute ability in alsa backend + * panel-volume: - fix logic around mute and setVolume - Unmute is volume is reset from eg. inc/dec volume + * panel-volume: add missing files + * panel-volume: Add initial Alsa support, only detects devices so far for a start + * panel-volume: qBound is much nicer, thanks for the hint from Alexander Sokolov + * panel-volume: set proper fallback icon for mixer launcher + * panel-volume: Fix global shortcuts. + * panel-volume: fix bug in setVolume on device, stupid me + * panel-volume: apply utf8 patch from Alexander Sokolov, thanks + * panel-volume: add global shortcuts, yet not configurable + * panel-volume: build fixes - add missing QMetaType include - add define for PA_VOLUME_UI_MAX, which is only defined since pulseaudio 0.9.23 + * panel-volume: - make volumepopup member private - make volumeslider member private + * panel-volume: - Rename slots to proper names - Remove unused destructor + * panel-volume: Set slider value for initial volume value whenever the managed device changes + * panel-volume: Rework pulseaudio state tracking to recover pulseaudio daemon shutdowns and/or restarts. + * panel-volume: Expose ready state from pulseaudioengine + * panel-volume: Rename method to what it actually does + * panel-volume: Add guard when context is not ready + * panel-volume: Improve internal context state tracking + * panel-volume: Finally fix the default behavior to show popup + * panel-volume: Fix creating intances in a different thread + * panel-volume: No need to set the layout explicitly + * panel-volume: Fix margin on popup layout + * panel-volume: Click to show the volume popup is now the default + * panel-volume: Fix settings dialog title + * panel-volume: Make change wheel behavior on volume slider + * panel-volume: Rename to 'Volume Control' + * panel-volume: Fix configuration and add external mixer settings + * panel-volume: use full volume range, even over 100% + * panel-volume: Make device type private + * panel-volume: Add mute toggle on middleclick + * panel-volume: Launch pavucontrol as a default mixer + * panel-volume: Fix segfault + * panel-volume: Add middleclick option + * panel-volume: Change icon accordingly to volume + * panel-volume: Reflect external volume changes in slider + * panel-volume: Start volume plugin + * panel-volume: add settings defines - Use defines rather than strings for the setting names - Change settings default for mixer to 'qasmixer' for alsa - Change settings default for volume adjust step to 5 + * razoor-panel: Adds Orientation property + * razor-panel: Refactors useTheme variables names + * razor-panel: Renames "Use theme size" to "Use automatic sizing" + * panel-volume: Add volume adjust step - settings has now an item to adjust volume step - inc/dec volume on AudioDevice is remove as it depends on the settings step + * panel-volume: Finally make members in AudioDevice private + * panel-volume: - Receive updates on external volume changes for alsa - Fix alsa mute setter + * panel-volume: Add alsa event handling, no usage yet + * panel-volume: Try to get proper card name instead of card index + * panel-volume: - Fix mute handling - Add mute setting for alsa backend + * panel-volume: - Add initial alsa channel listing - Volume on selected alsa channel can now be set - No external volume changes are handled in alsa backend - No mute ability in alsa backend + * panel-volume: - fix logic around mute and setVolume - Unmute is volume is reset from eg. inc/dec volume + * panel-volume: add missing files + * panel-volume: Add initial Alsa support, only detects devices so far for a start + * panel-volume: qBound is much nicer, thanks for the hint from Alexander Sokolov + * panel-volume: set proper fallback icon for mixer launcher + * panel-volume: Fix global shortcuts. + * panel-volume: fix bug in setVolume on device, stupid me + * panel-volume: apply utf8 patch from Alexander Sokolov, thanks + * panel-volume: add global shortcuts, yet not configurable + * panel-volume: build fixes - add missing QMetaType include - add define for PA_VOLUME_UI_MAX, which is only defined since pulseaudio 0.9.23 + * panel-volume: - make volumepopup member private - make volumeslider member private + * panel-volume: - Rename slots to proper names - Remove unused destructor + * panel-volume: Set slider value for initial volume value whenever the managed device changes + * panel-volume: Rework pulseaudio state tracking to recover pulseaudio daemon shutdowns and/or restarts. + * panel-volume: Expose ready state from pulseaudioengine + * panel-volume: Rename method to what it actually does + * panel-volume: Add guard when context is not ready + * panel-volume: Improve internal context state tracking + * panel-volume: Finally fix the default behavior to show popup + * panel-volume: Fix creating intances in a different thread + * panel-volume: No need to set the layout explicitly + * panel-volume: Fix margin on popup layout + * panel-volume: Click to show the volume popup is now the default + * panel-volume: Fix settings dialog title + * panel-volume: Make change wheel behavior on volume slider + * panel-volume: Rename to 'Volume Control' + * panel-volume: Fix configuration and add external mixer settings + * panel-volume: use full volume range, even over 100% + * panel-volume: Make device type private + * panel-volume: Add mute toggle on middleclick + * panel-volume: Launch pavucontrol as a default mixer + * panel-volume: Fix segfault + * panel-volume: Add middleclick option + * panel-volume: Change icon accordingly to volume + * panel-volume: Reflect external volume changes in slider + * panel-volume: Start volume plugin + * razor-panel: Adjust panel size on plugin load/remove + * RazorCpuLoad bar has configurable orientation + * Updated ts.src files + * Panel clock plugin: first day of week is configurable in popup calendar + * Panel clock plugin: tooltip returned back + * networkmonitor: reformat (tabs to spaces) + * networkmonitor: Use appropriate units + * razor-panel: Replace 'Delete' by 'Remove'. Closes #339 + * razor-panel: Read the panel size value when not using the theme size + * part of #329: on-click on notification launces default action or it tries to find appropariate window to raise; xfitman method renamed + one new + * colorpicker: get rid of all the hairy X11 code + * Fix indent + * Color picker as panel plugin, it doesn't change cursor icon yet. + * Syntax fixed + * Prevented potential index overflow problem + * Reordering with context menus fixed + * Showdesktop: display notification instead of a popup + * removed complaining invalid signal-slot connection + * Themes supported + * Second line visibility fixed + * Labels renamed + * Better layout + * configure clock font size (issue #213) + * Show calendar only on left-click + * [297] Sensors panel plugin - blink progress bar when the temperature is too high + * issue #276: annoying sub-menu removed + * razor-panel: Adds mount to the default plugin list + * Fix comma + * razor-panel: Setup Configure Panel>Panel size Ui properly + * Implement Actions and add some more functions + * Implement new RazorNotification class + * Ts.src files updated. + * Language name zh_CN.GB2312 braked cmake process. + * Translations updated + * [193] lm-sensors applet for panel [missing Qt parent assignment to the widgets] + * [193] lm-sensors applet for panel [sensors_cleanup fix] + * Fix a problem with colors + * Issue # 276 Panel context menus redesign + * [193] lm-sensors applet for panel [feature index out of bounds fixed] + * [193] lm-sensors applet for panel [more debug info added] + * [193] lm-sensors applet for panel [more debug info added] + * qt<4.7 compilation fix + * fix compilation for qt4.6.x + * [193] lm-sensors applet for panel + * quicklaunch: fixed layouting (matrix, horiz/vert. panel) broken by previous commit + * fixed #252 [quicklaunch] issue dragging from qtfm + * Move panel position into the configuration dialog + * Convert Panel config dialog to use RazorConfigDialog + * Environments should be "Razor", not "RAZOR" Thanks Alec Moskvin + * Fixed for Preloading menu + * panel cpu plugin: allow user to setup update interval (1sec is default now instead of 0.5). It can drastically reduce CPU load caused bu this plugin + * Move lock screen back in root menu, per amoskvin + * tooltip workaround uses notification system + * Move Lock Screen to the Leave submenu (#210) + * GUI for change razor theme. + * Close application by middle click. + * Set window titles for use with WM's like fvwm + * Typos in code. Thanks Aaron Lewis. * In razor-runner , providers item: title() was typed as tile() * For RazorSettings class , settingsChanged() was typed as settigsChanged() + * Network monitor: don't needlessly set the tooltip + * install fix for panel's network monitor + * Improve size of cpu monitor on change of pannel orientation. + * Fixed error on network interface down. + * Nemo is renamed to NetworkMonitor + * Fixed init settings of panel-plugin network monitor. + * Added Netwok Monitor plugin for razor-panel. + * Added configuration. + * Fixed text cropping (when 100% cpu usage). + * fix default value for custom panel size + * /etc/xdg can vary on some system. Autodetected using qmake in cmake run. + * Properly show &'s in taskbar + * fix for cpuload plugin installation. cmake re-run needed. + * Preloading menu in the main menu plugin. + * Revert "Global shortcuts now based on PSI code." + * Revert "The panel did not receive the focus." + * The panel did not receive the focus. + * Global shortcuts now based on PSI code + * warning if there is no libstatgrab found + * Hide main menu when it's visible. Thanks Aaron Lewis. + * Closes #224: Application menu button don't show full text/icon when text is selected + * Config coresponds XDG directory specification + * Transifex desktop: sr_BA.ts should be a local + * Transifex desktop: local translations + * Transifex desktop: cmake files + * Transifex desktop: Translations pulled + * Transifex desktop: Reomove translations from desktop.in + * Transifex desktop: desktop->desktop.in + * Update Tradidtional Chinese Translations + * CpuLoad plugin required libstatgrab. + * Committer:stuarch modified: razorqt-desktop/config/razor-config-desktop.desktop modified: razorqt-desktop/desktop-razor/plugin-analogclock/resources/analogclock.desktop new file: razorqt-desktop/desktop-razor/plugin-analogclock/translations/analogclock_zh_TW.ts modified: razorqt-desktop/desktop-razor/plugin-helloworld/resources/helloworld.desktop modified: razorqt-desktop/desktop-razor/plugin-iconview/resources/iconview.desktop modified: razorqt-desktop/desktop-razor/plugin-notepad/resources/notepad.desktop new file: razorqt-panel/panel/translations/razor-panel_zh_TW.ts modified: razorqt-panel/plugin-clock/resources/clock.desktop new file: razorqt-panel/plugin-clock/translations/clock_zh_TW.ts modified: razorqt-panel/plugin-desktopswitch/resources/desktopswitch.desktop new file: razorqt-panel/plugin-desktopswitch/translations/desktopswitch_zh_TW.ts modified: razorqt-panel/plugin-helloworld/resources/panelhelloworld.desktop modified: razorqt-panel/plugin-mainmenu/resources/mainmenu.desktop new file: razorqt-panel/plugin-mainmenu/translations/mainmenu_zh_TW.ts modified: razorqt-panel/plugin-mount/resources/mount.desktop new file: razorqt-panel/plugin-mount/translations/mount_zh_TW.ts modified: razorqt-panel/plugin-quicklaunch/resources/quicklaunch.desktop new file: razorqt-panel/plugin-quicklaunch/translations/quicklaunch_zh_TW.ts new file: razorqt-panel/plugin-screensaver/translations/screensaver_zh_TW.ts + * Changing box layout to grid layout in quick launch plugin + * Translations update + * Added support for the online translation service. www.transifex.net + * RazorApplication class implemented; all modules ported to this class + * Update razorqt-panel/panel/translations/razor-panel_it_IT.ts + * A lot of renames. + * CpuLoad depends on Linux. It doesn't work on BSD (using /proc). + * CpuLoad-plugin height fixed on changing of panel position. + * Serbian translation files + * Serbian translations (2 variants) + * Removed dead slots declarations. + * Added simple cpu monitor. + * Greek translation by iosifidis + * Improved searching for devices in the mount plugin. + * Fix desktopswitch shrinking on panel resize + * Ensure Desktopswitch buttons are all the same size + * Plugins alignments depends on the panel positions. + * Added danish translations + * Russian translation + * Panel plugins not found .ts files + * Save quicklaunch button position after moving + * Grey out "All Desktops" when window is on all desktops + * Grey out "All Desktops" when window is on all desktops + * Change Height/Width to Size/Length in panel dialog + * The razormount library now based on the providers. + * Set a default panel height + * The razormount library now based on the providers. + * Make remaining plugins expand + * Fix - icons are clickable on all button area. + * Closes #131 Closes #181 Vertical panel fixed. All plugins should look good. + * Fix a typo + * edit my email address + * fix #169: italian translation + * Finish the code for clock's popup calendar + * Put Move and Delete into plugins' context menus + * Vertical panel. Improved layouting in plugins + * Env variables for plugins dirs RAZORQT_DESKTOP_PLUGINS_DIR & RAZORQT_DESKTOP_PLUGINS_SO_DIR RAZORQT_PANEL_PLUGINS_DIR & RAZORQT_PANEL_PLUGINS_SO_DIR + * Relicense panel & runner + * Relicense panel + * The panel is not correctly positioned in the dual-monitor configurations. + * cmake fix + * razormount rewriten (lgpl2+) + * Fix gmail.ru -> gmail.com + * Hello World plugin for panel + * original and our code compared - it seems 99% rewritem so it's relicensed to lgpl2+ + * Clean up configure panel dialog + * close panel/desktop in the debug builds - for development + * Czech translations (cs_CZ) Desktop files + * SVK translation finalized + * Replaces return"" by return QString() + * Closes #128 + * More translation to german + * more work done + * Initial german release, only a tiny part + * Add "Configure" to plugins' context menus + * Fix crash due to null pointer + * Fix issue #116 + * License audit + * implemented #49: keyboard shortcut for main menu + * Add Chinese(simplified) translation files. + * Switch scroll direction for the pager + * Switch windows when scrolling over taskbar + * Hide moved window (properly this time) + * Apply previous typo fix to newly-added translations + * HU translation by Kristóf Kiszel + * Fix another typo + * Fix typo + * Fix Taskbar in "Show windows from current desktop" mode + * added ability to change panel height/width/alignment + * Initial spanish translation + * razorqt-panel: use MODULE type for plugin libraries + * Add Slovak (sk) translation + * Adds newline to the end of .desktop files + * initial. added ability to change panel height + * Set tooltip only when the tooltip is shown + * Czech translations (cs_CZ) + * Fix a few typos + * XdgDesktopFile is implicitly shared + * huge refactoring of the libraries build organization + * Initialize order fixed + * Init values in tray plugin + * Mem leak in mount plugin & lib + * showdesktop: a bettre fix + * fixed memleak for panel/showdesktop (X11 deallocation) + * handle actions and its parents correctly + * only for debug builds: enable "exit" action in the context menu (for valgrind checking) + * Fix russian translation + * Fix russian translation + * fixed crash in the quicklaunch on the new suse 12.1 + * Fix: segfaults when panel orientation is changed + * Fix: In Fedora 16 tray icons are invisible. + * quicklaunch: do not change button order when you drag'n'drop different mimetype + * quicklaunch: "title" action in the context menu too + * QuickLauncher: Programs do not run, fixed. + * QuickLauncher: Added: * Removing the buttons by dragging. * The menu items "move left" and "move right". + * forgotten files. Sorry. + * quicklaunch: editable icons - delete and move (ctrl+drag) + * Mount: Mount/unmount hide popup dialog + * Panel screensaver: Fix in RU translation. + * refresh desktop switch names on change too + * XfitMan: fix for XfitMan::getDesktopNames() + * XfitMan: fix for XfitMan::getDesktopNames() + * potential fix for "one desktop in openbox" panel crash + * RazorPanel: New icon theme handler for razor-panel plugins. + * RazorPanel: IconThemeChanged handler for razor-panel. + * New icon theme handler. + * iconThemeChanged handler for plugin-showdesktop + * iconThemeChanged handler for plugin-mount + * iconThemeChanged handler for plugin-quicklaunch + * iconThemeChanged handler for taskbar + * iconThemeChanged handler for mainmenu + * Razor-panel: iconThemeChanged & razorThemeChanged functions for plugins. + * Fix for wrong translations of the panel plugins. + * GPL->LGPL where I'm the author + * GPL->LGPL where I'm the author + * Issue #50 razor-mount: Filemanager can open dirs with whitespace in mount points. + * Plugins translations + * Translation for session + * Polish translation part X + * Fix: Desktop Menu Specification category must be X-RAZOR. + * Russian translations + * Russian translations. + * Fixes in polish translation + * Polish translation. Closes #46 + * Closes #43 + * first part of fix for #48 + * fix for "remove/add device" in virtualbox + * Mount plugin: Workaround about duplication of items. + * Mount plugin: Debug messages for "Except that newly inserted CD/DVD is shown twice in the menu widget (using virtualbox)" + * Mount plugin: If the dialog is visible, the button is depressed. + * Mount plugin: A popup window is hidden when the panel changes position. + * Mount plugin: Fix, on dual monitor configurations, popup window always showed on a first monitor. + * New popup window in mount plugin. + * potential fix (workaround) from #40: XdgMenu does not display environment related items + * udev configuration handling; minimal version requirements + * qt4.6 fix for application default icon name + * Translation for mount plugin + * Configure dialog for mount plugin + * In the menu use the ToolButton instead of diskIcon and diskLabel. This looks nicer. + * Fixed: Click on the mount button, doing nothing. + * Fixed: At first start the names already mounted devices are not visible. + * better icon for #39 The appearance of the mount plugin.; tooltip too + * fixed (workaround before real event notifications) #42 mount plugin: display notifications when connected + * Don't use bool typed member to check _NET_SHOWING_DESKTOP property, use Xlib API instead + * Add Ctrl+F(1|2|3|4...) to switch virtual desktops + * Shortcut for showing desktop, also restore windows on another hit + * issue #39 - fix the unmount icon/button drawing + * homepage updated + auto replacement script + * mounting: initial status (mounted/unmounted) when starting + * icons logic for removable media + * initial revision of "removable media" support. Still lots to do but it's functional + * Potential fix2 for issue #18: Panel clock plugin changes your size + * XDG-files are splitted into qtxdg library. + * new panel plugin: "show desktop" + * Polish translation + * Panel plugins can use translation now + * Panel plugins: clock, mainmenu and taskbar translate.h fix. + * fix for build (includes) + * Dialog name changed. Menu file path fix. + * MainMenu plugin configuration window. Closes #16 + * potential fix for issue #18: Panel clock plugin changes your size + * fix for #4 BadWindow when a window is closed + * removed unneeded call + * directories dupport for quicklaunch + * support for regular files in the quicklaunch + * initial support for drop events in the quicklaunch panel plugin + * Closes #1 + * RazorTaskButton: Don't accept the drag event + * Small RazorClockConfiguration fixes. RazorTaskbarConfiguration use RazorSettingsCache now. + * RazorClockConfiguration small fixes and improvements proposed by Alex. RazorClockConfiguration use RazorSettingsCache. Testing new HIG - Reset/Close. Signed-off-by: Maciej Płaza + * Task manager configuration window. Task button with only Icon isn't so big now. User can decide about task button max width. + * Removed accepChanges() declaration + * Clock configuration + * global key shortcut is a new library for razor; plugins updated + * RazorTaskButton with D'n'D support + * Animates the mouse movement to the position of the panel plugin that will be moved + * final port to new settings class; desktopbackgrounddialog improved with initial loading values + * Add: MainMenu tracks changes in the installed programs. + * The project uses RazorTheme. All except the desktop, switched to RazorSettings. + * Remuved garbage from help. + * initial support for screensaver/screen locking + * Added RazorTheme class. + * Fixed multithreaded building. Thanks Gustavo. + * Plugin config dialogs infrastructure. Instead, RazorPanelPlugin::preferredAlignment() introduced RazorPanelPlugin::flags method. + * New RazorSettings class. Now ReadSettings is deprecated. Use RazorSettings instead. + * Separate dir for XdgMenu. Fixed includes. + * Feature 3316330: Tasks from one desktop. Task Manager should have option to show tasks only from one (active) desktop. Now it shows all tasks. Without config GUI. + * Feature 3316331: Task Manager - only icon/text. Task Manager should have ability to show only name or icon (or both) of task. Without config GUI. + * Bug 3314795: The panel is not in the bottom of screen. + * Tracker 3314481: Elided text in the taskbar buttons + * Segfault in MainMenu if xdg-menu file not found. + * Copyright + * Copyright + * Fixed segfault in tray plugin. + * set default razor icon for all apps + * The settings are saved immediately after the change. + * lib_suffix location improved + * Logout dialog in main menu. + * Removed "Exit" item on panel menu. + * Fix: Missing cmake checks 2. + * Fix: Missing cmake checks. + * Fix: Segmetation fault on desktopswitch. + * Fix: Removed saveSettings method from plugins. + * Plugin-clock: added tooltip. + * From XdgIcon deleted parameter "size". + * move addplugindialog into shared lib for panel and desktop + * New /usr/share & ~/razor directory structure. + * Added: Add plugin dialog. + * initial horizontal panels + * Translations. + * In the thene you can specify the tray icon size. + * RazorPanel2 now is main panel. + * Legacy panel + * Mainmrnu plugin added + * battery icon names fixed + * fixed build cmake warnings + * XfitMan.setStrut allowed to reserve a place only from bottom. + * better XDG handling + * initial support for desktop files in quicklaunch + * Changed config param style to "param_style". Added well known menu files. + * fixed crash when there is only one desktop available + * forgotten refactored getClientList + * clocks are placed without additional unrequired space again + * clocks are correct in vertical panels too + * make quicklaunch vertically friendly, part II (final hopefully) + * make quicklaunch vertically friendly + * MainMenu plugin: Added log out menu + * Added XdgDesktopFile::icon method + * New version of main menu plugin + * allow to specify quicklaunch button size (like on netbooks) + * removed unused files + * + * better fix for tasks layout + * include fix; kdm/gdm/*dm session file; fix for taskbar resizing + * panel alignment works now (top/left, center, bottom/right) + * typos fixed in battery plugin; icon auto-size + * You can enable and disable plugins using cmake options. + * The new realization of librasorqt * XdgEnv * XdgDesktopFile * XdgMenu + * experimental: battery plugin for laptops + * better sizing in systray + * forgotten paths + * vertical panels work basically + * configuration reworked (may require to drop ~/.razor); plugins code split; new plugin: spacer + * panel plugins are modularized now; simplified plugin loading + * minor layouting changes + * patch from alex to load relative qss url + * fixed clock behavior for sizing. Using sizeHint now. + * panel plugins share API layout; don't freeze trying to load non-existing theme; experimantal value placeholders in QSS + * initial refactoring for common plugin handling. Work in progress. Done: * all plugins are using the same base class * all plugins can handle dynamic resizing (eg. systray can be smaller after embed app close, taskbar occupies all available space...) * all is fully scriptable with QSS - some layout glitches have to be fixed + * initial API for plugins. No other changes in functionality yet + * Made RazorHal mounting/unmounting work and added a new function to Xfitman for checking if a window wants attention _NET_WM_WINDOW_DEMANDS_ATTENTION - tried to get the buttons at the taskmanager to glow when this is true but it didnt work.. + * + * + * do not set layout too many times + * avoid huge moving of widgets after 1st clocks update + * src formatted with astyle -A1 + * 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 --git a/CMakeLists.txt b/CMakeLists.txt index 4d3dc45..f693f58 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR) project(lxqt-panel) option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF) +option(PULL_TRANSLATIONS "Pull translations" ON) +option(WITH_SCREENSAVER_FALLBACK "Include support for converting the deprecated 'screensaver' plugin to 'quicklaunch'. This requires the lxqt-leave (lxqt-session) to be installed in runtime." ON) # additional cmake files set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) @@ -34,8 +36,6 @@ if (CMAKE_COMPILER_IS_GNUCXX) # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-no-undefined") endif() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - ######################################################################### add_definitions (-Wall) @@ -63,7 +63,10 @@ include(LXQtTranslate) # Warning: This must be before add_subdirectory(panel). Move with caution. set(PLUGIN_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/lxqt-panel") -add_definitions(-DPLUGIN_DIR=\"${PLUGIN_DIR}\") +add_definitions( + -DPLUGIN_DIR=\"${PLUGIN_DIR}\" + -DQT_USE_QSTRINGBUILDER +) message(STATUS "Panel plugins location: ${PLUGIN_DIR}") ######################################################################### @@ -96,14 +99,11 @@ setByDefault(CPULOAD_PLUGIN Yes) if(CPULOAD_PLUGIN) find_library(STATGRAB_LIB statgrab) - if(NOT(${STATGRAB_LIB} MATCHES "NOTFOUND")) - list(APPEND ENABLED_PLUGINS "Cpu Load") - add_subdirectory(plugin-cpuload) - else() - message(STATUS "") - message(STATUS "CPU Load plugin requires libstatgrab") - message(STATUS "") + if(NOT STATGRAB_LIB) + message(FATAL_ERROR "CPU Load plugin requires libstatgrab") endif() + list(APPEND ENABLED_PLUGINS "Cpu Load") + add_subdirectory(plugin-cpuload) endif() setByDefault(DIRECTORYMENU_PLUGIN Yes) @@ -154,24 +154,15 @@ if(QUICKLAUNCH_PLUGIN) add_subdirectory(plugin-quicklaunch) endif() -setByDefault(SCREENSAVER_PLUGIN Yes) -if(SCREENSAVER_PLUGIN) - list(APPEND ENABLED_PLUGINS "Screensaver") - add_subdirectory(plugin-screensaver) -endif() - setByDefault(SENSORS_PLUGIN Yes) if(SENSORS_PLUGIN) find_library(SENSORS_LIB sensors) - if(NOT(${SENSORS_LIB} MATCHES "NOTFOUND")) - list(APPEND ENABLED_PLUGINS "Sensors") - add_subdirectory(plugin-sensors) - else() - message(STATUS "") - message(STATUS "Sensors plugin requires lm_sensors") - message(STATUS "") + if(NOT SENSORS_LIB) + message(FATAL_ERROR "Sensors plugin requires lm_sensors") endif() + list(APPEND ENABLED_PLUGINS "Sensors") + add_subdirectory(plugin-sensors) endif() setByDefault(SHOWDESKTOP_PLUGIN Yes) @@ -186,14 +177,11 @@ setByDefault(NETWORKMONITOR_PLUGIN Yes) if(NETWORKMONITOR_PLUGIN) find_library(STATGRAB_LIB statgrab) - if(NOT(${STATGRAB_LIB} MATCHES "NOTFOUND")) - list(APPEND ENABLED_PLUGINS "Network Monitor") - add_subdirectory(plugin-networkmonitor) - else() - message(STATUS "") - message(STATUS "Network Monitor plugin requires libstatgrab") - message(STATUS "") + if(NOT STATGRAB_LIB) + message(FATAL_ERROR "Network Monitor plugin requires libstatgrab") endif() + list(APPEND ENABLED_PLUGINS "Network Monitor") + add_subdirectory(plugin-networkmonitor) endif() setByDefault(SYSSTAT_PLUGIN Yes) @@ -232,27 +220,25 @@ setByDefault(VOLUME_USE_ALSA Yes) if(VOLUME_PLUGIN) if (VOLUME_USE_PULSEAUDIO) find_package(PulseAudio) + if (NOT PULSEAUDIO_FOUND) + message(FATAL_ERROR "PulseAudio not found, but required (VOLUME_USE_PULSEAUDIO) for Volume plugin!") + endif () endif(VOLUME_USE_PULSEAUDIO) if(VOLUME_USE_ALSA) find_package(ALSA) + if (NOT ALSA_FOUND) + message(FATAL_ERROR "ALSA not found, but required (VOLUME_USE_ALSA) for Volume plugin!") + endif () endif() - if(PULSEAUDIO_FOUND OR ALSA_FOUND) - list(APPEND ENABLED_PLUGINS "Volume") - message(STATUS "") - message(STATUS "Volume plugin will be built") - message(STATUS " ALSA: ${ALSA_FOUND}") - message(STATUS " PulseAudio: ${PULSEAUDIO_FOUND}") - message(STATUS "") - add_subdirectory(plugin-volume) - else() - message(STATUS "") - message(STATUS "Volume plugin requires pulseaudio or alsa") - message(STATUS " ALSA: ${ALSA_FOUND}") - message(STATUS " PulseAudio: ${PULSEAUDIO_FOUND}") - message(STATUS "") - endif() + list(APPEND ENABLED_PLUGINS "Volume") + message(STATUS "") + message(STATUS "Volume plugin will be built") + message(STATUS " ALSA: ${ALSA_FOUND}") + message(STATUS " PulseAudio: ${PULSEAUDIO_FOUND}") + message(STATUS "") + add_subdirectory(plugin-volume) endif() setByDefault(WORLDCLOCK_PLUGIN Yes) diff --git a/README.md b/README.md new file mode 100644 index 0000000..88d2626 --- /dev/null +++ b/README.md @@ -0,0 +1,61 @@ +# lxqt-panel + +## Overview + +`lxqt-panel` represents the taskbar of LXQt. + +The elements available in lxqt-panel are called "plugin" technically. This applies e. g. to the source code where they reside in directories `./plugin-` like `plugin-mainmenu`. In contrast to this they are called "widgets" by the configuration GUI so far. Also, a more descriptive term is used to refer to distinct plugins within the GUI. E. g. the aforementioned `plugin-mainmenu` is called "Application menu" that way. +Configuration dialogue "Add Plugins", see [below](https://github.com/pmattern/lxqt-panel/tree/readme#customizing), is listing all available plugins plus a short description and hence provides an overview of the available ones. +Notes on some of the plugins, sorted by terms used within the GUI in alphabetical order, technical term in parenthesis: + +#### Date & time (plugin-clock) / World clock (plugin-worldclock) + +Both provide clock and calendar functionality. plugin-worldclock can display various time zones in addition but lacks a tooltip displaying current date und time upon hovering. +These plugins will probably be merged into one, see https://github.com/lxde/lxqt/issues/312. + +#### Quick launch (plugin-quicklaunch) + +A plugin to launch applications from the panel. By default it is empty and displays a message "Drop application icons here". Applications need to be available in panel's main menu and can be included into plugin-quicklaunch by drag & drop. + +#### Status Notifier Plugin (plugin-statusnotifier) / System Tray (plugin-tray) + +Both provide a notification area within the panel, that is an area where arbitrary applications can place informational icons. This is frequently used e. g. by chat or mail clients to inform about incoming messages or tools configuring the network to inform about connections. (So it's some kind of counterpart to the desktop notifications displayed by [lxqt-notificationd](https://github.com/lxde/lxqt-notificationd)). +The difference between the two plugins is a technical one. **plugin-tray** is implementing the so-called [System Tray Protocol](https://www.freedesktop.org/wiki/Specifications/systemtray-spec). It's a specification that has been around for years but has some serious technical limitations and in particular won't work under Wayland. **plugin-statusnotifier** on the other hand is implementing the so-called [StatusNotifierItem (SNI)](https://www.freedesktop.org/wiki/Specifications/StatusNotifierItem) specification which can be considered a successor of the System Tray Protocol. +Both plugins are maintained in parallel as not all relevant applications are compatible with SNI so far. In particular both Qt 4 and all GTK applications need some kind of wrapper to deal with it. Both plugins can be used in parallel without any issue, applications supporting both specifications will normally chose to display their icons in plugin-statusnotifier. + +#### Volume control (plugin-volume) + +As indicated by the name, a volume control. Technically Alsa, OSS and PulseAudio can be used as backend. The plugin itself is providing a control to adjust the main volume only but it allows for launching specific UIs of the backend in use like e. g. [pavucontrol-qt](https://github.com/lxde/pavucontrol-qt) to adjust PulseAudio. + +## Installation + +### Compiling source code + +The runtime dependencies are libxcomposite, libdbusmenu-qt5, KGuiAddons, KWindowSystem, Solid, menu-cache, lxmenu-data, [liblxqt](https://github.com/lxde/liblxqt) and [lxqt-globalkeys](https://github.com/lxde/lxqt-globalkeys). +Several plugins or features thereof are optional and need additional runtime dependencies. Namely these are (plugin / feature in parenthesis) Alsa library (Alsa support in plugin-volume), PulseAudio client library (PulseAudio support in plugin-volume), lm-sensors (plugin-sensors), libstatgrab (plugin-cpuload, plugin-networkmonitor), [libsysstat](https://github.com/lxde/libsysstat) (plugin-sysstat). All of them are enabled by default and have to be disabled by CMake variables as required, see below. +In addition CMake is a mandatory build dependency. Git is optionally needed to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxde/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information. + +Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` has to be set to `/usr` on most operating systems, depending on the way library paths are dealt with on 64bit systems variables like CMAKE_INSTALL_LIBDIR may have to be set as well. +By default all available plugins and features thereof are built and CMake fails when dependencies aren't met. Building particular plugins can be disabled by boolean CMake variables `_PLUGIN` where the plugin is referred by its technical term like e. g. in `SYSSTAT_PLUGIN`. Alsa and PulseAudio support in plugin-volume can be disabled by boolean CMake variables `VOLUME_USE_ALSA` and `VOLUME_USE_PULSEAUDIO`. + +To build run `make`, to install `make install` which accepts variable `DESTDIR` as usual. + +### Binary packages + +Official binary packages are provided by all major Linux distributions like Arch Linux, Debian (as of Debian stretch only), Fedora and openSUSE. Just use your package manager to search for string `lxqt-panel`. + +## Configuration, Usage + +### Launching + +The panel is run as a daemon-like [LXQt Module](https://github.com/lxde/lxqt-session#lxqt-modules) the launch of which can be adjusted in section "Basic Settings" of configuration dialogue [LXQt Session Settings](https://github.com/lxde/lxqt-session#lxqt-session-settings) of [lxqt-session](https://github.com/lxde/lxqt-session). + +### Customizing + +To customize the panel itself there's a context menu, that is a menu opened by right-clicking the pointer device. It is comprising sections "\" and "Panel" which allow for configuring the plugin the pointer is currently over and the panel as a whole respectively. + +In section "Panel" topics "Configure Panel" and "Manage Widgets" open different panes of a dialogue "Configure Panel" which allow for configuring the panel as a whole and the various plugins respectively. +Pane "Widgets" allows for configuring and removing all plugins currently included in lxqt-panel. The plus sign opens another dialogue "Add plugins" which is used to add plugins. It comes with a list of all plugins plus some short descriptions and can hence serve as overview what plugins are available. + +Sometimes right-clicking over particular plugins may bring up a context menu dealing with the respective plugin's functionality *only* which means the plugin in question cannot be configured the usual way. This affects e. g. plugin-quicklaunch as soon as items were added (the context menu is limited to topics dealing with the items included in plugin-quicklaunch). +Currently there are two ways to deal with this. Some themes like e. g. `Frost` come with handles at the plugins' left end providing the regular context menu. Also, it can be assumed at least one plugin is included in the panel that's always featuring the regular context menu like e. g. plugin-mainmenu. Either way pane "Widgets" of "Configure Panel" can be accessed and used to configure the particular plugin. diff --git a/cmake/BuildPlugin.cmake b/cmake/BuildPlugin.cmake index c8e3374..b09bbec 100644 --- a/cmake/BuildPlugin.cmake +++ b/cmake/BuildPlugin.cmake @@ -17,6 +17,16 @@ MACRO (BUILD_LXQT_PLUGIN NAME) ${NAME} INSTALL_DIR ${LXQT_TRANSLATIONS_DIR}/${PROGRAM}/${NAME} + PULL_TRANSLATIONS + ${PULL_TRANSLATIONS} + CLEAN_TRANSLATIONS + ${CLEAN_TRANSLATIONS} + TRANSLATIONS_REPO + ${TRANSLATIONS_REPO} + TRANSLATIONS_REFSPEC + ${TRANSLATIONS_REFSPEC} + REPO_SUBDIR + "${PROGRAM}/plugin-${NAME}" ) #lxqt_translate_to(QM_FILES ${CMAKE_INSTALL_FULL_DATAROOTDIR}/lxqt/${PROGRAM}/${PROJECT_NAME}) diff --git a/debian/.gitignore b/debian/.gitignore index ccb09bc..84a32cf 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,7 +1,7 @@ /*.debhelper /*.log /*.substvars +/debhelper-build-stamp /files /lxqt-panel/ -/lxqt-panel-dbg/ diff --git a/debian/changelog b/debian/changelog index fef27ce..e18fd69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,29 @@ +lxqt-panel (0.11.0-2) unstable; urgency=medium + + * Cherry-picking upstream release 0.11.0. + * Synced debian foo with experimental + * Bumped Standards to 3.9.8, no changes needed + * Bumped compat to 10 + * Removed --parallel from rules, standard compat 10 + * Bumped minimum version debhelper (>= 10) + * Bumped minimum version liblxqt0-dev (>= 0.11.0) + * Bumped minimum version liblxqt-globalkeys0-dev (>= 0.11.0), + * Bumped minimum version liblxqt-globalkeys-ui0-dev (>= 0.11.0), + * Bumped minimum version libsysstat-qt5-0-dev (>= 0.3.2) + * Added build-dependency libqt5svg5-dev + * Added build-dependency libqtxdg-dev (>= 2.0.0) + * Added build-dependency libqt5xdgiconloader-dev (>= 2.0.0) + * Added Recommends lxqt-panel-l10n + * Fixed VCS fields, point to the right branch + * Fixed copyrights Format field to https + * Bumped years in copyrights + * Added translation control to rules + * Added hardening options + * Set CMAKE_BUILD_TYPE=RelWithDebInfo + * Exported LC_ALL=C.UTF-8, make builds reproducible + + -- Alf Gaida Tue, 18 Oct 2016 22:10:42 +0200 + lxqt-panel (0.10.0-8) unstable; urgency=medium [ Ralf Jung ] diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index c4e46b5..22692f9 100644 --- a/debian/control +++ b/debian/control @@ -5,24 +5,26 @@ Uploaders: Alf Gaida , Andrew Lee (李健秋) Section: x11 Priority: optional -Build-Depends: cmake (>= 3.0.2), - debhelper (>= 9), +Build-Depends: debhelper (>= 10), + cmake (>= 3.0.2), libasound2-dev, libdbusmenu-qt5-dev, libglib2.0-dev, libicu-dev, - liblxqt0-dev (>= 0.10.0), - liblxqt-globalkeys0-dev, - liblxqt-globalkeys-ui0-dev, libkf5windowsystem-dev, libkf5solid-dev, + liblxqt0-dev (>= 0.11.0), + liblxqt-globalkeys0-dev (>= 0.11.0), + liblxqt-globalkeys-ui0-dev (>= 0.11.0), libmenu-cache-dev, libpulse-dev, + libqt5svg5-dev, libqt5x11extras5-dev, - libqt5xdg-dev (>= 1.3.0), + libqt5xdg-dev (>= 2.0.0), + libqt5xdgiconloader-dev (>= 2.0.0), libsensors4-dev [!hurd-any], libstatgrab-dev [linux-any], - libsysstat-qt5-0-dev (>= 0.3.0), + libsysstat-qt5-0-dev (>= 0.3.2), libx11-dev, libxcomposite-dev, libxcb-util0-dev, @@ -35,7 +37,7 @@ Build-Depends: cmake (>= 3.0.2), pkg-config, qttools5-dev, qttools5-dev-tools -Standards-Version: 3.9.7 +Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-panel.git/?h=debian/sid Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-panel.git Homepage: https://github.com/lxde/lxqt-panel @@ -45,6 +47,7 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, lxmenu-data +Recommends: lxqt-panel-l10n Description: LXQt desktop panel The LXQt desktop panel . diff --git a/debian/copyright b/debian/copyright index f529e5a..ef5bb1b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,14 +1,14 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: lxqt-panel Source: https://github.com/lxde/lxqt-panel Files: * -Copyright: 2012-2015 LXQt team +Copyright: 2012-2016 LXQt team 2010-2012 Razor team License: LGPL-2.1+ Files: debian/* -Copyright: 2014-2015 Alf Gaida +Copyright: 2014-2016 Alf Gaida 2015 Andrew Lee (李健秋) License: LGPL-2.1+ @@ -25,4 +25,3 @@ License: LGPL-2.1+ . On Debian systems, the complete text of the GNU Lesser General Public License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1". - diff --git a/debian/docs b/debian/docs index 62deb04..0b6e0f3 100644 --- a/debian/docs +++ b/debian/docs @@ -1 +1,2 @@ AUTHORS +README.md diff --git a/debian/rules b/debian/rules index 0e183e8..3371b17 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,9 @@ #!/usr/bin/make -f -#export DH_VERBOSE=1 +# export DH_VERBOSE=1 +export LC_ALL=C.UTF-8 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +export DEB_BUILD_MAINT_OPTIONS = hardening=+all DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null) @@ -10,12 +12,16 @@ ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) endif ifeq ($(DEB_HOST_ARCH_OS), hurd) - NOT_LINUX := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO -DSENSORS_PLUGIN=NO + NOT_LINUX := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO -DSENSORS_PLUGIN=NO endif %: - dh ${@} --buildsystem cmake \ - --parallel + dh ${@} --buildsystem cmake override_dh_auto_configure: - dh_auto_configure -- -DDOM_PLUGIN=YES $(NOT_LINUX) + dh_auto_configure --\ + -DPULL_TRANSLATIONS=OFF\ + -DUPDATE_TRANSLATIONS=OFF\ + -DDOM_PLUGIN=YES\ + -DCMAKE_BUILD_TYPE=RelWithDebInfo\ + $(NOT_LINUX) diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc index 05cd1df..4936633 100644 --- a/debian/upstream/signing-key.asc +++ b/debian/upstream/signing-key.asc @@ -1,63 +1,50 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.22 (GNU/Linux) -mQINBFJevCYBEACx+Hvy+Vsuf+V5jeLUnzjAmHoy8DfTeGWr3ts30IapLHrfi0+U -WpzNnISO77yTr4VNboVZH+GHM/rnPfieODfB4ZW6CZLlInMSKUXcgQsEqXpyBZhA -Ib/SPy2bOfHly1uRJes0uRDsH5+v/hD74sByfnjQlrvI68O6wvGZmDFMNNPVO8+/ -OWBSBNkBuVrrZOMSPsLwQGJ4UtUQ4whburaPJG4VZJc5DLbzJGbEuACc0IAEYJS3 -7AfXVXn4j4Gc9F3o1xTUnbOBnwGPquWwUIm3FM7Ec2OdkvMt3EwvnkMAfeVrq3iE -FDD/KZTxdL0BZH3QD8gB7Jm4v4f3Nkobg6JCvCbcH3wBdZW4mASbwWzfRaDC2zHb -ErTglD7PpShLKZZ0pr9okWZEGw4Ku3q8ALi1JXK/ePTmsBlvkVskOJ3Nnd0avgH4 -+Q/vZoKfH8EhNY745rI+8CE9iv6V9XiSUt4CKEWAENt4A8hq6U2vV+jZv3B6AgD7 -ZjiI59yD4YuYubu8rCnNizTgh1voVw3ietknn/x2H5yH8fByWZ5uL87C0ky/uma6 -ZGbiiAtM4kdkyDMrfRV5nlEG9EKAGPVu5mjeSCrfkETwZ9OFPz1AuDye4ZEXrrcC -iRQ7RX6/GtW18aHER0kzGnfwx5KJzkDrRBY8A2PdXLBcrsN4WpK9EX01PQARAQAB -tCNKZXJvbWUgTGVjbGFuY2hlIDxqZXJvbWVAbGVjbGFuLmNoPokCPwQTAQIAKQUC -Ul68JgIbAwUJAeEzgAcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEDfgrx/a -SPNzSHIP/1ewXcC0TFBcvDD7MrIP7anyNfiWfW7cxkR8GSamkg6HTa6Ndyr1FFjJ -OoDFUP37jWhu59CsHxs2D0zRWJktezfvElscRgqbHcdpIznqsGdI8hXCZafhBGVb -sdAB2LRawcXGxnXt7XajPcSVwLWRE62caBqohznU2iWvI780WNjEbZoA0LhZwaFF -UUPJm8ea9v0IkZVKUyg9WONZ1U7FEG9SaEiSpI8kJdx1fvCwZVDV/NRO5GqnJaho -P1LCne4YdwS6pt1/fRgk32IHxxZfHlLzLHxb6v1JmIg72x28qCmGyK9oFBDbbnYu -6Aq8XbHogOrD5vJM2Pfm2IhV0+JHOjfQbddv8tsAH1M+LI+tToXmg5st1AU3wnTn -pda3hjA1avKwkfBPW/osHc8782ViyS9iX2e9iDtMv608guij4NjpGExzGCypHOd8 -+VXRwJDjvgDynkL206MZ+wn0j5wHsIE8F3Y5Bp1thQOrdDli5MYNQoXhjFmH46XT -bcr84IgW0+AiXZdoFUqvwtzrWy2Onuw5R3k4OyV4skN4DkWXyAk/V+Y4K39JvTKf -H9YuiQ9blNzCu8WiAnjKnh9kNl9E/TyEwI6cHFmIPqF8ST9tJytWHtrKvU9csvXX -n8XNJmpcv2R1e6N+VuWWm5zUPTouv3AxCacLbm8Lh3ymGsk7ZEyhiQIcBBABAgAG -BQJSsFYyAAoJEBMY76xfu9vO6v0P/3wSj3/kE4nP4HfgcVJSzi+lm1ycpbLDZtgh -P1G+zJLVmA+E41vEZimeiYQxBAelatJz+CHzQo3LZ2oVChzVrZcVHn9k4P3pib69 -qCVif3/y0Wmecn+u2TWbOvJ7mthfO7T3W7rkW1/9ES7bUaXcXWQ2sjUBVqFkFsVt -xgJDo8wcxA+K4Yf06GCbxFwrB7X5GraWIkzqGnyse3XAQn8aORAXmE8Yd0FHOjEZ -Beb9shChnkYc3lEvNY8ioCaYSF9xr/Iz9cwpfPkpqFiVYWadtb+Gqeh6zC7vPmcT -zHxrgkq1WwQlSBm724tPt9xuGQoOglqEa23vlQZfv20nyrYjLeYUy6pMCRq7vn/n -nkQOcXF7yQlnqR6xKk0tWsM4e6du0ZvbjBbhHV/kBFVGCLm/upTwoMVm0WJTbr4T -5XfIZo7eA0lvGtUhe1PgcOidBikHfAIfYxu0BoMXoL4jbcQdR5+YBDEfsS0jPhCl -mew2ScW/R/UhUknJUVFTma0KHXzEmKiqeeUCDtwEi6fxdicAYkbcekgkfFiD/w8N -Lk3Uf+0x2MdKA36nUobFkk38oU+GW37kFWJs3f1YRuQFao896eNW/E8ekVMLNxOl -nCjnSbabaxDnxPTyW2KlNjf/QUEK4pT6S5QmuCSrle3PQpaSbAZDHzLBIL9gd3m6 -MH7+SvV4uQINBFJevCYBEADiXDUqstSdhIyuionS2KtE3IeEBIqS7GY8QPRBylIZ -ACVHFI/1HxChBqYVGFaDEQn3gj5lUUQPubfWaxzjF6+UNVQW4+cxmTocndAwfDbI -+E5BLdieFUzbAA05MV5ZjPhTNbSk1jpy4bNy0FILwNqc89Y6SoCbv1r3tZLCrBas -1+AfWknBynx0siGMbLFxtzR6hUkNz9URxt13FrzpUWMpAL8ZQGczOTSaWLrZA5l9 -xLzJ9ww8uM+C2Xej3/sANxi+kQE2GVMKurPS0TICwVWZxbdW/ytIkO67Rhse0q3t -vzjdawfCFRxv7XQB2ZJ6irDxbpHiJoojSWCHJadIyCG03iOiaqsSVvi4KnxtUck+ -udOEJUV5sxdzgeRrsDpeaN//KCWW9WjfsSkvOqP6S1gmWpNFdzF5XrzcgvqvSNqo -XejfakUTJqsIIEHO0zGuJFVzJNh2hQ/9dhjIspUORhtNKaljNvePiBrj2yqmd9PY -FlH1KMHe4H+YVIwPiyeNA87Pu+1yNo8gT7mXhGRfibgWjbt146WUJ7+l2StJMApn -eNSCartNaUNPnw96i2l5c9AsJ3SWC6XWpWzOLVj+9XceeA11lu/ogqEMHzx81NjH -2TePxwKTKxZnAvDmqryp++IgY2/OgIoIk3ZRdYu/dPijTOYWfCet/9/9kAFr9PeJ -KwARAQABiQIlBBgBAgAPBQJSXrwmAhsMBQkB4TOAAAoJEDfgrx/aSPNzJv0QAKkx -lCKEZ6ahAUuNWslsHnNWaHFHNawEO3NIEtQZGVFk2BYISupizvjZF6MnymO/9UFM -pzV6fp3xNdqaKWQBjScOgMgCASRixW2tMAKbJGHZKp3dBixpHgXxy2oOGMS+mQ5m -gWy07usq2YesoMD0K/SG6EnoRPHBvrJihArzMFVUY9hD3hk8bhiy8w9bCYFe+gkm -zpQl3/KN01kyt5LjzEBcIOw8qIBQe9Pk8PyOK75lPoNME714LatgOsyw2kaSQ9Sv -hziRGC5z/fV3PmH7XhSjENPKnCJU51GUMMLaL28t9o7Afh6Q8UV31/JO36vmQXQV -+b+0BoGqEmf3AKBASb2Cr2q4pZFjywwSUXHZ9hQyu1tpbE1dS6aI01kM0y270pk7 -W/ajuzuOxAVL1bJAanL/5+DWM03esZPVdEWhxpWEM40Z6Rhq+Xb2a5xfwCN9PmaQ -o9fez0I+yh53s7Ypv0tBj05FPe5L48+pDi6pz5nddN1B0FzF58jVfsBZUjBlY24+ -VwQeAaWkRXZrSEdtBS5ufsi80x/cNCSTJBWqtborKL1iGgf5MDPYRMSvmZXAeIld -pyL/0pbW7iokewyKzpFfo7KEbwLxB+flWaBZ867JpF4yyRj3b4qcvcyV8QnsoB7Z -KhxTl3gGwD/t0HUcu85zcfs4GkealYhIWfGaAso2 -=fF8P +mQINBFXQeMMBEACif4+9pTrC6uNmRng0ZbzLh7p3cazmbnp2YFgDQDJZ7ZNmebxy +ngRuRhjGuDcFAL/37BwJnrBpfZFK9ljoH4Fo5Jm9cOELaTy7AIcEiV9dKMyrKF1E +C76d8jHVuzuPbI92DkFdLZAdk+qjrrAy0x43PvUd+aaBGLcFs1ZMk7gOvElc2d95 +zWWSp5anjukmGbp+EsStnWJkF6VHj56qmklfYy5ioiVBOSpXo/RsACAcIlz8C8A1 +d4tNMiB2uF2OrUfrL8DD6m3nBqep+AYbIQrxMl9kUQH3I33e9kH/L+SHQyE6phS8 +Czq06WjV4TcJ9VWxm7hQCNLYSxhZYYr1AW45lS5+xmfBOq2qeLgvjbFxa8PPrsp6 +Bqgt8MjwUkXjU5IB7YulUBvFU2l0MJZWDBuNy0oNtCe1cU3JyIqLKjvzQQQ9eD5L +o3Ul704TLHz0z+67Rxh05Mi4JvyFMjnooSJkNH8/7yXoBN0ZGOh1/5zMU1gK5bmP +6hKgis2exSZNIS74mF6/PqGgcwk3PyI4T3keUQoNPj11M2EznLHxY19QZfQ5oMed +8xOlHKjpcm8PYMB4gduNXlV7gI9h7UxuC5GuPiP2lmM6wUyHu48divxDk5UYgPEC +xlPI2wHCNDsuy0EruCYIvrMSZfpYCCSrmXiOORBLO5qXkauILLkJarHqjQARAQAB +tCBBbGYgR2FpZGEgPGFnYWlkYUBzaWR1Y3Rpb24ub3JnPokCOAQTAQIAIgUCVdB4 +wwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQQsnI069epeOT2xAAgSHf +41103cnElGf6TokPl4J6hdRPy2CUAjmBtMfr8eajYvGDGgnmsh9AGYGURjfFVCCf +Ag+8b6nF3xg03UmgsuSO8H78HGv9kKzF9aHmLt+SXq3jUX+LnIkFHErZWjFAKdJr +luu1j6ltxLe9PQljxZnugzMaUbW8eEPKvcriiDn3S4/DtikW/jpGA0MTY4ZWs9pZ +L/6iRRH99L2X/cWO4sCgDXCTt4oK0f5OvwiuCoVOM+PYoIm31JICCKOlqamkCn7d +2KH3nsy0v7tXgnrnb/zr8jVGsZLzUE51AFOzb5Ec74/2SAq8X4gbTppttLXEIooq +nbepitW/PePkPY5gpfwHtFbl88qFnir+ABMefqRZkzeh0tsxJVLVHGP1KZykXpv7 +96A6Q1h7Zo9Ny7WwN5Xl02g35LVCaPyzd3A8A4315uMuP3iziq57UktKqh9d5S3t +jfK7e9UfFQZBLfxn2sNPsjdYSNUQp/PXTTk/599h359WVuUIR866T8K7N7EEon3p +qLItZljQ9Nmr/yGwKi9iQgi2LtZj5KUcF1zBLzZKf95FvoqSZqBXdFSjm+eYGaCH +Q2IBnhyP92lEknSK9ystUJXmY69tQKBFqJxScwaS+7a/rfLKssQjSWxqk+SX4QeW +e9z9FUpo71bq0Zkc/M9aOCoEEmhg4Ob/JWy08oC5Ag0EVdB4wwEQAKZDCc/C41y0 +omLFCAJybvHiFScM+jOpyGpQvceoviEhIT7h1br/pnSEMkgPQEDPWJGtKueg1/94 +sXTH24uefr3Y6JdZoBtprxl4JXUoOndgq1QH1xuUsy3/9YWU8Qboy9j8a8w0oCDE +T8Z03KHCwqzD3K+44jhmhF+0eLoaaY8ohS8ziP+DcFKVHyatmS5yCCdjVrj6PxMp +uy/y5SXT1kmiPdVAIzQlM5DlN6o46TV+BH0pPvVYjtwf31o0FckJxy5S1v0koCNB +vX2b7tTDPKzn8G18eUVhGoUTZBUCp1gg36wJ0YY4xgZ9vI/xDCeHeAkyvGtaTAoy +qP4rHoUO5KVRSDh7frSlrdbLGWHaQwOhcqoKd4qP/164wHPGkgHL1vztdOc7l1wx +q3gMh2uwmJR0NRrw4WVuaIqL9lEbGBNijlmGsuqXfsMRhc/qoqgVDWvrcCtEoOwl +TONGobW3jpCCjpa9SeGNjxuY6IVLn0lfX4hItNVY9sFA+H+yj4uBQ7zsmMUXafxt +Yllm0f98yGNg5lnJg4bLOYu3IkpogUKNA3qkZ+6vRtwH70/bJGp7qdx/3G4W5dMX +asd/rJjdELW+R/NVULAmK1ETSklaa3Z6vbTu8bN8gvP8pmMJ8f/U8+qzkuAqc201 +Z4O+s7ZsQfTiz5mm7zPGIYTnppDSno/rABEBAAGJAh8EGAECAAkFAlXQeMMCGwwA +CgkQQsnI069epeMt0g/+JrwLhULD6NOxaLgxboh/KZkh/7ViU4cB+QPT8JIcWxkZ +zj8uk85TUitEUzKmjp/ItCrhQE5WNNWbz/FBnAuLtaQuHhcHMA3Vu95UUCGi1vyZ +ZRlS3YRM6S9BOzrjG7fGQJmO/RU3g6rb0TAwGFxDHj8t4JEDTc3zASG7wV/VTn06 +d8XIH9CZOw3kUuhkQ3OR/PEj1BCeCC+caC+tBjO0fgvDp8RV7NFQQ9kH8R3/xlWd +6KMPtILE6fUft6LubWRGd1P5JBuzXivELolASajewbYtL/s87CCji3ngq0aT9raK +m02wqFzNbX1iv+w2iqPQXq6pdRyxtJ8+Q8Z7zEBGJS5nkrYjsLTduZIjJHYHYH7f +3/ydVjQ3z12iqHKElgaRI7RUmpNiNxVIr+TtuxzeC6G+CF++XNkUtJODvCmRaoJS +waYsitz8+LSv3tawZJ0iQkKc9nerQMuBD+AzIr3i4NgXiEIN513esUtnKzeyIIsL +ntUcBjXKuLCj8OZrZtexjq7edWWbN57/3ikyS2Z7y0i3O30qk5jmccSaS6kA7xTY +WCDFzbN2v2y+vGu9KYn+2HtrP2BtNa8JTh3waNeLUTpn4GV4mMrsZjOy6vhhHb91 +1TKfI1gvjk7lE9xaWmcDjdI55dw3jIq8kK9SdgORGq9/S3g7KJNRjme+6GjqQfk= +=h7ww -----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index c03f192..fefb4ad 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ -version=3 +version=4 opts="pgpsigurlmangle=s/$/.asc/" \ - https://github.com/lxde/lxqt-panel/releases .*/([\d\.]+).tar.gz + https://github.com/lxde/lxqt-panel/releases .*/lxqt-panel-([\d\.]+).tar.xz diff --git a/panel/CMakeLists.txt b/panel/CMakeLists.txt index 4e23b53..5a322a3 100644 --- a/panel/CMakeLists.txt +++ b/panel/CMakeLists.txt @@ -2,10 +2,13 @@ set(PROJECT lxqt-panel) set(PRIV_HEADERS panelpluginsmodel.h + windownotifier.h lxqtpanel.h lxqtpanelapplication.h + lxqtpanelapplication_p.h lxqtpanellayout.h plugin.h + pluginsettings_p.h lxqtpanellimits.h popupmenu.h pluginmoveprocessor.h @@ -19,6 +22,7 @@ set(PRIV_HEADERS # using LXQt namespace in the public headers. set(PUB_HEADERS lxqtpanelglobals.h + pluginsettings.h ilxqtpanelplugin.h ilxqtpanel.h ) @@ -26,10 +30,12 @@ set(PUB_HEADERS set(SOURCES main.cpp panelpluginsmodel.cpp + windownotifier.cpp lxqtpanel.cpp lxqtpanelapplication.cpp lxqtpanellayout.cpp plugin.cpp + pluginsettings.cpp popupmenu.cpp pluginmoveprocessor.cpp lxqtpanelpluginconfigdialog.cpp @@ -58,6 +64,11 @@ add_definitions(-DCOMPILE_LXQT_PANEL) set(PLUGIN_DESKTOPS_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/lxqt/${PROJECT}") add_definitions(-DPLUGIN_DESKTOPS_DIR=\"${PLUGIN_DESKTOPS_DIR}\") +if (WITH_SCREENSAVER_FALLBACK) + message(STATUS "Building with conversion of deprecated 'screensaver' plugin") + add_definitions(-DWITH_SCREENSAVER_FALLBACK "-DLXQT_LOCK_DESKTOP=\"${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications/lxqt-lockscreen.desktop\"") +endif () + project(${PROJECT}) set(QTX_LIBRARIES Qt5::Widgets Qt5::Xml Qt5::DBus) @@ -73,6 +84,16 @@ lxqt_translate_ts(QM_FILES SOURCES ${UI} INSTALL_DIR "${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME}" + PULL_TRANSLATIONS + ${PULL_TRANSLATIONS} + CLEAN_TRANSLATIONS + ${CLEAN_TRANSLATIONS} + TRANSLATIONS_REPO + ${TRANSLATIONS_REPO} + TRANSLATIONS_REFSPEC + ${TRANSLATIONS_REFSPEC} + REPO_SUBDIR + "${PROJECT_NAME}/panel" ) lxqt_app_translation_loader(SOURCES ${PROJECT_NAME}) @@ -95,3 +116,8 @@ target_link_libraries(${PROJECT} install(TARGETS ${PROJECT} RUNTIME DESTINATION bin) install(FILES ${CONFIG_FILES} DESTINATION ${LXQT_ETC_XDG_DIR}/lxqt) install(FILES ${PUB_HEADERS} DESTINATION include/lxqt) +install(FILES + man/lxqt-panel.1 + DESTINATION "${CMAKE_INSTALL_MANDIR}/man1" + COMPONENT Runtime +) diff --git a/panel/config/configpanelwidget.cpp b/panel/config/configpanelwidget.cpp index 3b2a0fe..4b67dfe 100644 --- a/panel/config/configpanelwidget.cpp +++ b/panel/config/configpanelwidget.cpp @@ -75,6 +75,8 @@ ConfigPanelWidget::ConfigPanelWidget(LXQtPanel *panel, QWidget *parent) : mOldHidable = mPanel->hidable(); + mOldAnimation = mPanel->animationTime(); + ui->spinBox_panelSize->setMinimum(PANEL_MINIMUM_SIZE); ui->spinBox_panelSize->setMaximum(PANEL_MAXIMUM_SIZE); @@ -98,6 +100,7 @@ ConfigPanelWidget::ConfigPanelWidget(LXQtPanel *panel, QWidget *parent) : connect(ui->comboBox_alignment, SIGNAL(activated(int)), this, SLOT(editChanged())); connect(ui->comboBox_position, SIGNAL(activated(int)), this, SLOT(positionChanged())); connect(ui->checkBox_hidable, SIGNAL(toggled(bool)), this, SLOT(editChanged())); + connect(ui->spinBox_animation, SIGNAL(valueChanged(int)), this, SLOT(editChanged())); connect(ui->checkBox_customFontColor, SIGNAL(toggled(bool)), this, SLOT(editChanged())); connect(ui->pushButton_customFontColor, SIGNAL(clicked(bool)), this, SLOT(pickFontColor())); @@ -106,7 +109,7 @@ ConfigPanelWidget::ConfigPanelWidget(LXQtPanel *panel, QWidget *parent) : connect(ui->checkBox_customBgImage, SIGNAL(toggled(bool)), this, SLOT(editChanged())); connect(ui->lineEdit_customBgImage, SIGNAL(textChanged(QString)), this, SLOT(editChanged())); connect(ui->pushButton_customBgImage, SIGNAL(clicked(bool)), this, SLOT(pickBackgroundImage())); - connect(ui->slider_opacity, SIGNAL(sliderReleased()), this, SLOT(editChanged())); + connect(ui->slider_opacity, &QSlider::valueChanged, this, &ConfigPanelWidget::editChanged); } @@ -123,6 +126,8 @@ void ConfigPanelWidget::reset() ui->checkBox_hidable->setChecked(mOldHidable); + ui->spinBox_animation->setValue(mOldAnimation); + fillComboBox_alignment(); ui->comboBox_alignment->setCurrentIndex(mOldAlignment + 1); @@ -255,6 +260,7 @@ void ConfigPanelWidget::editChanged() mPanel->setAlignment(align, true); mPanel->setPosition(mScreenNum, mPosition, true); mPanel->setHidable(ui->checkBox_hidable->isChecked(), true); + mPanel->setAnimationTime(ui->spinBox_animation->value(), true); mPanel->setFontColor(ui->checkBox_customFontColor->isChecked() ? mFontColor : QColor(), true); if (ui->checkBox_customBgColor->isChecked()) diff --git a/panel/config/configpanelwidget.h b/panel/config/configpanelwidget.h index 4f1986f..1034827 100644 --- a/panel/config/configpanelwidget.h +++ b/panel/config/configpanelwidget.h @@ -89,6 +89,7 @@ private: LXQtPanel::Alignment mOldAlignment; ILXQtPanel::Position mOldPosition; bool mOldHidable; + int mOldAnimation; int mOldScreenNum; QColor mOldFontColor; QColor mOldBackgroundColor; diff --git a/panel/config/configpanelwidget.ui b/panel/config/configpanelwidget.ui index f9abbcf..1816287 100644 --- a/panel/config/configpanelwidget.ui +++ b/panel/config/configpanelwidget.ui @@ -202,92 +202,103 @@ Alignment && position - + + + + + 0 + 0 + + + + Auto-hide + + + + + + + false + + + Zero means no animation + + + ms + + + 500 + + + 50 + + + + Position: - - + + + + false + + + Zero means no animation + + + Animation duration: + + - + Alignment: - - - - - 0 - - - 0 + + + + Qt::Horizontal + + + + 5 + 5 + + + + + + + + 1 + + + + Left - - 0 + + + + Center - - 0 + + + + Right - - - - 1 - - - - Left - - - - - Center - - - - - Right - - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 15 - 20 - - - - - - - - - 0 - 0 - - - - Auto-hide - - - - + + + + @@ -614,6 +625,48 @@ toggled(bool) compositingL setEnabled(bool) + + + 20 + 20 + + + 20 + 20 + + + + + checkBox_hidable + toggled(bool) + label_animation + setEnabled(bool) + + + 59 + 198 + + + 211 + 198 + + + + + checkBox_hidable + toggled(bool) + spinBox_animation + setEnabled(bool) + + + 59 + 198 + + + 319 + 198 + + diff --git a/panel/config/configpluginswidget.cpp b/panel/config/configpluginswidget.cpp index c1c3c4a..c7a7c06 100644 --- a/panel/config/configpluginswidget.cpp +++ b/panel/config/configpluginswidget.cpp @@ -55,17 +55,16 @@ ConfigPluginsWidget::ConfigPluginsWidget(LXQtPanel *panel, QWidget* parent) : resetButtons(); - connect(ui->listView_plugins, &QListView::activated, plugins, &PanelPluginsModel::onActivatedIndex); connect(ui->listView_plugins->selectionModel(), &QItemSelectionModel::selectionChanged, this, &ConfigPluginsWidget::resetButtons); - connect(ui->pushButton_moveUp, &QToolButton::clicked, plugins, &PanelPluginsModel::onMovePluginUp); - connect(ui->pushButton_moveDown, &QToolButton::clicked, plugins, &PanelPluginsModel::onMovePluginDown); + connect(ui->pushButton_moveUp, &QToolButton::clicked, [this, plugins] { plugins->onMovePluginUp(ui->listView_plugins->currentIndex()); }); + connect(ui->pushButton_moveDown, &QToolButton::clicked, [this, plugins] { plugins->onMovePluginDown(ui->listView_plugins->currentIndex()); }); connect(ui->pushButton_addPlugin, &QPushButton::clicked, this, &ConfigPluginsWidget::showAddPluginDialog); - connect(ui->pushButton_removePlugin, &QToolButton::clicked, plugins, &PanelPluginsModel::onRemovePlugin); + connect(ui->pushButton_removePlugin, &QToolButton::clicked, [this, plugins] { plugins->onRemovePlugin(ui->listView_plugins->currentIndex()); }); - connect(ui->pushButton_pluginConfig, &QToolButton::clicked, plugins, &PanelPluginsModel::onConfigurePlugin); + connect(ui->pushButton_pluginConfig, &QToolButton::clicked, [this, plugins] { plugins->onConfigurePlugin(ui->listView_plugins->currentIndex()); }); connect(plugins, &PanelPluginsModel::pluginAdded, this, &ConfigPluginsWidget::resetButtons); connect(plugins, &PanelPluginsModel::pluginRemoved, this, &ConfigPluginsWidget::resetButtons); diff --git a/panel/ilxqtpanel.h b/panel/ilxqtpanel.h index e7b2844..0ce811f 100644 --- a/panel/ilxqtpanel.h +++ b/panel/ilxqtpanel.h @@ -32,6 +32,7 @@ #include "lxqtpanelglobals.h" class ILXQtPanelPlugin; +class QWidget; /** **/ @@ -39,41 +40,76 @@ class LXQT_PANEL_API ILXQtPanel { public: /** - Specifies the position of the panel on screen. - **/ + * @brief Specifies the position of the panel on screen. + */ enum Position{ - PositionBottom, //! The bottom side of the screen. - PositionTop, //! The top side of the screen. - PositionLeft, //! The left side of the screen. - PositionRight //! The right side of the screen. + PositionBottom, //!< The bottom side of the screen. + PositionTop, //!< The top side of the screen. + PositionLeft, //!< The left side of the screen. + PositionRight //!< The right side of the screen. }; /** - This property holds position of the panel. - Possible values for this property are described by the Position enum - **/ + * @brief Returns the position of the panel. Possible values for the + * return value are described by the Position enum. + */ virtual Position position() const = 0; + /** + * @brief Returns the edge length of the icons that are shown on the panel + * in pixels. The icons are square. + */ virtual int iconSize() const = 0; + /** + * @brief Returns the number of lines/rows of this panel. + */ virtual int lineCount() const = 0; /** - Helper functions for eazy direction checking. - Retuns true if panel on the top or bottom of the screen; otherwise returns false. - **/ + * @brief Helper function for convenient direction/alignment checking. + * @return True if the panel is on the top or the bottom of the + * screen; otherwise returns false. + */ bool isHorizontal() const { return position() == PositionBottom || position() == PositionTop; } /** - Returns global screen coordinates of the panel. You no need to use mapToGlobal. - **/ + * @brief Helper method that returns the global screen coordinates of the + * panel, so you do not need to use QWidget::mapToGlobal() by yourself. + * @return The QRect where the panel is located in global screen + * coordinates. + */ virtual QRect globalGometry() const = 0; /** - Helper functions for calculating global screen position of some popup window with windowSize size. - If you need to show some popup window, you can use it, to get global screen position for the new window. - **/ + * @brief Helper method for calculating the global screen position of a + * popup window with size windowSize. + * @param absolutePos Contains the global screen coordinates where the + * popup should be appear, i.e. the point where the user has clicked. + * @param windowSize The size that the window will occupy. + * @return The global screen position where the popup window can be shown. + */ virtual QRect calculatePopupWindowPos(const QPoint &absolutePos, const QSize &windowSize) const = 0; + /** + * @brief Helper method for calculating the global screen position of a + * popup window with size windowSize. The parameter plugin should be a + * plugin + * @param plugin Plugin that the popup window will belong to. The position + * will be calculated according to the position of the plugin in the panel. + * @param windowSize The size that the window will occupy. + * @return The global screen position where the popup window can be shown. + */ virtual QRect calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const QSize &windowSize) const = 0; + + /*! + * \brief By calling this function, a plugin (or any other object) notifies the panel + * about showing a (standalone) window/menu -> the panel needs this to avoid "hiding" in case any + * standalone window is shown. The widget/window must be shown later than this notification call because + * the panel needs to observe its show/hide/close events. + * + * \param w the window that will be shown + * + */ + virtual void willShowWindow(QWidget * w) = 0; }; #endif // ILXQTPANEL_H diff --git a/panel/ilxqtpanelplugin.h b/panel/ilxqtpanelplugin.h index 1503923..6a4473d 100644 --- a/panel/ilxqtpanelplugin.h +++ b/panel/ilxqtpanelplugin.h @@ -30,9 +30,6 @@ #define ILXQTPANELPLUGIN_H #include -#include // For XEvent -#include -#include #include "ilxqtpanel.h" #include "lxqtpanelglobals.h" @@ -40,7 +37,7 @@ LXQt panel plugins are standalone sharedlibraries (*.so) located in PLUGIN_DIR (define provided by CMakeLists.txt). -Plugin for the panel is a library written on C++. One more necessary thing +Plugin for the panel is a library written in C++. One more necessary thing is a .desktop file describing this plugin. The same may be additional files, like translations. Themselves plugins will be installed to /usr/local/lib/lxqt-panel or /usr/lib/lxqt-panel (dependent on cmake option @@ -50,11 +47,16 @@ like translations. Themselves plugins will be installed to **/ class QDialog; +class PluginSettings; +namespace LXQt +{ + class PluginInfo; +} struct LXQT_PANEL_API ILXQtPanelPluginStartupInfo { ILXQtPanel *lxqtPanel; - QSettings *settings; + PluginSettings *settings; const LXQt::PluginInfo *desktopFile; }; @@ -64,23 +66,20 @@ All plugins *must* be inherited from this one. This class provides some basic API and inherited/implemented plugins GUIs will be responsible on the functionality itself. - -See -How to write the panel plugin for more information about how to make your plugins. **/ class LXQT_PANEL_API ILXQtPanelPlugin { public: /** - This enum describes the properties of an plugin. + This enum describes the properties of a plugin. **/ enum Flag { NoFlags = 0, ///< It does not have any properties set. - PreferRightAlignment = 1, /**< The plugin is prefer right alignment (for example the clock plugin); - otherwise plugin prefer left (like main menu). + PreferRightAlignment = 1, /**< The plugin prefers right alignment (for example the clock plugin); + otherwise the plugin prefers left alignment (like main menu). This flag is used only at the first start, later positions of all - plugins saved in a config, and this saved information is used. */ + plugins are saved in a config, and this saved information is used. */ HaveConfigDialog = 2, ///< The plugin have a configuration dialog. SingleInstance = 4, ///< The plugin allows only one instance to run. NeedsHandle = 8 ///< The plugin needs a handle for the context menu @@ -99,8 +98,8 @@ public: }; /** - Constructs a ILXQtPanelPlugin object with the given startupInfo. You do not have to worry - about the startupInfo parameters, ILXQtPanelPlugin process the parameters yourself. + Constructs an ILXQtPanelPlugin object with the given startupInfo. You do not have to worry + about the startupInfo parameters, ILXQtPanelPlugin processes the parameters itself. **/ ILXQtPanelPlugin(const ILXQtPanelPluginStartupInfo &startupInfo): mSettings(startupInfo.settings), @@ -121,20 +120,20 @@ public: /** Returns the string that is used in the theme QSS file. - If you retuns "WorldClock" string, theme author may write something like `#WorldClock { border: 1px solid red; }` - to set custom border for the your plugin. + If you return "WorldClock" string, theme author may write something like `#WorldClock { border: 1px solid red; }` + to set a custom border for your plugin. **/ virtual QString themeId() const = 0; /** - From users point of view plugin is a some visual widget on the panel. This function retuns pointer to it. - This method called only once, so you are free to return pointer on class member, or create widget on the fly. + From the user's point of view, your plugin is some visual widget on the panel. This function returns a pointer to it. + This method is called only once, so you are free to return the pointer on a class member, or create the widget on the fly. **/ virtual QWidget *widget() = 0; /** Returns the plugin settings dialog. Reimplement this function if your plugin has it. - The panel does not take ownership of the dialog, it would probably a good idea to set Qt::WA_DeleteOnClose + The panel does not take ownership of the dialog, it is probably a good idea to set Qt::WA_DeleteOnClose attribute for the dialog. The default implementation returns 0, no dialog; @@ -174,7 +173,7 @@ public: ILXQtPanel *panel() const { return mPanel; } - QSettings *settings() const { return mSettings; } + PluginSettings *settings() const { return mSettings; } const LXQt::PluginInfo *desktopFile() const { return mDesktopFile; } /** @@ -186,11 +185,21 @@ public: return mPanel->calculatePopupWindowPos(this, windowSize); } + /*! + * \brief By calling this function plugin notifies the panel about showing a (standalone) window/menu. + * + * \param w the shown window + * + */ + inline void willShowWindow(QWidget * w) + { + mPanel->willShowWindow(w); + } virtual bool isSeparate() const { return false; } virtual bool isExpandable() const { return false; } private: - QSettings *mSettings; + PluginSettings *mSettings; ILXQtPanel *mPanel; const LXQt::PluginInfo *mDesktopFile; }; @@ -198,7 +207,7 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(ILXQtPanelPlugin::Flags) /** -Every plugin must has the loader. You shoul only reimplement instance() method, and return your plugin. +Every plugin must have the ILXQtPanelPluginLibrary loader. You should only reimplement the instance() method which should return your plugin. Example: @code class LXQtClockPluginLibrary: public QObject, public ILXQtPanelPluginLibrary diff --git a/panel/lxqtpanel.cpp b/panel/lxqtpanel.cpp index 5159c15..a9d6fb1 100644 --- a/panel/lxqtpanel.cpp +++ b/panel/lxqtpanel.cpp @@ -35,6 +35,7 @@ #include "popupmenu.h" #include "plugin.h" #include "panelpluginsmodel.h" +#include "windownotifier.h" #include #include @@ -44,6 +45,7 @@ #include #include #include +#include #include #include @@ -71,6 +73,8 @@ #define CFG_KEY_OPACITY "opacity" #define CFG_KEY_PLUGINS "plugins" #define CFG_KEY_HIDABLE "hidable" +#define CFG_KEY_ANIMATION "animation-duration" +#define CFG_KEY_LOCKPANEL "lockPanel" /************************************************ Returns the Position by the string. @@ -116,6 +120,7 @@ LXQtPanel::LXQtPanel(const QString &configGroup, LXQt::Settings *settings, QWidg mSettings(settings), mConfigGroup(configGroup), mPlugins{nullptr}, + mStandaloneWindows{new WindowNotifier}, mPanelSize(0), mIconSize(0), mLineCount(0), @@ -125,8 +130,17 @@ LXQtPanel::LXQtPanel(const QString &configGroup, LXQt::Settings *settings, QWidg mScreenNum(0), //whatever (avoid conditional on uninitialized value) mActualScreenNum(0), mHidable(false), - mHidden(false) + mHidden(false), + mAnimationTime(0), + mAnimation(nullptr), + mLockPanel(false) { + //You can find information about the flags and widget attributes in your + //Qt documentation or at http://doc.qt.io/qt-5/qt.html + //Qt::FramelessWindowHint = Produces a borderless window. The user cannot + //move or resize a borderless window via the window system. On X11, ... + //Qt::WindowStaysOnTopHint = Informs the window system that the window + //should stay on top of all other windows. Note that on ... Qt::WindowFlags flags = Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint; // NOTE: by PCMan: @@ -142,18 +156,23 @@ LXQtPanel::LXQtPanel(const QString &configGroup, LXQt::Settings *settings, QWidg flags |= Qt::WindowDoesNotAcceptFocus; setWindowFlags(flags); + //Adds _NET_WM_WINDOW_TYPE_DOCK to the window's _NET_WM_WINDOW_TYPE X11 window property. See http://standards.freedesktop.org/wm-spec/ for more details. setAttribute(Qt::WA_X11NetWmWindowTypeDock); + //Enables tooltips for inactive windows. setAttribute(Qt::WA_AlwaysShowToolTips); + //Indicates that the widget should have a translucent background, i.e., any non-opaque regions of the widgets will be translucent because the widget will have an alpha channel. Setting this ... setAttribute(Qt::WA_TranslucentBackground); + //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)); + //LXQtPanel (inherits QFrame) -> lav (QGridLayout) -> LXQtPanelWidget (QFrame) -> LXQtPanelLayout LXQtPanelWidget = new QFrame(this); LXQtPanelWidget->setObjectName("BackgroundWidget"); QGridLayout* lav = new QGridLayout(); - lav->setMargin(0); + lav->setContentsMargins(0, 0, 0, 0); setLayout(lav); this->layout()->addWidget(LXQtPanelWidget); @@ -170,23 +189,34 @@ LXQtPanel::LXQtPanel(const QString &configGroup, LXQt::Settings *settings, QWidg mHideTimer.setInterval(PANEL_HIDE_DELAY); connect(&mHideTimer, SIGNAL(timeout()), this, SLOT(hidePanelWork())); - connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), this, SLOT(realign())); - connect(QApplication::desktop(), SIGNAL(screenCountChanged(int)), this, SLOT(ensureVisible())); + 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/lxde/lxqt-panel/pull/310 + connect(QApplication::desktop(), &QDesktopWidget::workAreaResized, + this, &LXQtPanel::ensureVisible); + connect(LXQt::Settings::globalSettings(), SIGNAL(settingsChanged()), this, SLOT(update())); connect(lxqtApp, SIGNAL(themeChanged()), this, SLOT(realign())); + connect(mStandaloneWindows.data(), &WindowNotifier::firstShown, [this] { showPanel(true); }); + connect(mStandaloneWindows.data(), &WindowNotifier::lastHidden, this, &LXQtPanel::hidePanel); + readSettings(); - // the old position might be on a visible screen + ensureVisible(); + loadPlugins(); show(); - // show it the first first time, despite setting + // show it the first time, despite setting if (mHidable) { - showPanel(); - QTimer::singleShot(PANEL_HIDE_FIRST_TIME, this, SLOT(hidePanel())); + showPanel(false); + QTimer::singleShot(PANEL_HIDE_FIRST_TIME, this, SLOT(hidePanel())); } } @@ -203,6 +233,8 @@ void LXQtPanel::readSettings() mHidable = mSettings->value(CFG_KEY_HIDABLE, mHidable).toBool(); mHidden = mHidable; + mAnimationTime = mSettings->value(CFG_KEY_ANIMATION, mAnimationTime).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); @@ -232,6 +264,8 @@ void LXQtPanel::readSettings() if (!image.isEmpty()) setBackgroundImage(image, false); + mLockPanel = mSettings->value(CFG_KEY_LOCKPANEL, false).toBool(); + mSettings->endGroup(); } @@ -271,6 +305,9 @@ void LXQtPanel::saveSettings(bool later) mSettings->setValue(CFG_KEY_OPACITY, mOpacity); mSettings->setValue(CFG_KEY_HIDABLE, mHidable); + mSettings->setValue(CFG_KEY_ANIMATION, mAnimationTime); + + mSettings->setValue(CFG_KEY_LOCKPANEL, mLockPanel); mSettings->endGroup(); } @@ -282,12 +319,12 @@ void LXQtPanel::saveSettings(bool later) void LXQtPanel::ensureVisible() { if (!canPlacedOn(mScreenNum, mPosition)) - setPosition(findAvailableScreen(mPosition), mPosition, true); + setPosition(findAvailableScreen(mPosition), mPosition, false); else mActualScreenNum = mScreenNum; - // the screen size might be changed, let's update the reserved screen space. - updateWmStrut(); + // the screen size might be changed + realign(); } @@ -297,6 +334,8 @@ void LXQtPanel::ensureVisible() LXQtPanel::~LXQtPanel() { mLayout->setEnabled(false); + delete mAnimation; + delete mConfigDialog.data(); // do not save settings because of "user deleted panel" functionality saveSettings(); } @@ -352,7 +391,7 @@ int LXQtPanel::getReserveDimension() return mHidable ? PANEL_HIDE_SIZE : qMax(PANEL_MINIMUM_SIZE, mPanelSize); } -void LXQtPanel::setPanelGeometry() +void LXQtPanel::setPanelGeometry(bool animate) { const QRect currentScreen = QApplication::desktop()->screenGeometry(mActualScreenNum); QRect rect; @@ -360,7 +399,7 @@ void LXQtPanel::setPanelGeometry() if (isHorizontal()) { // Horiz panel *************************** - rect.setHeight(mHidden ? PANEL_HIDE_SIZE : qMax(PANEL_MINIMUM_SIZE, mPanelSize)); + rect.setHeight(qMax(PANEL_MINIMUM_SIZE, mPanelSize)); if (mLengthInPercents) rect.setWidth(currentScreen.width() * mLength / 100.0); else @@ -391,14 +430,24 @@ void LXQtPanel::setPanelGeometry() // Vert ....................... if (mPosition == ILXQtPanel::PositionTop) - rect.moveTop(currentScreen.top()); + { + if (mHidden) + rect.moveBottom(currentScreen.top() + PANEL_HIDE_SIZE - 1); + else + rect.moveTop(currentScreen.top()); + } else - rect.moveBottom(currentScreen.bottom()); + { + if (mHidden) + rect.moveTop(currentScreen.bottom() - PANEL_HIDE_SIZE + 1); + else + rect.moveBottom(currentScreen.bottom()); + } } else { // Vert panel *************************** - rect.setWidth(mHidden ? PANEL_HIDE_SIZE : qMax(PANEL_MINIMUM_SIZE, mPanelSize)); + rect.setWidth(qMax(PANEL_MINIMUM_SIZE, mPanelSize)); if (mLengthInPercents) rect.setHeight(currentScreen.height() * mLength / 100.0); else @@ -429,16 +478,69 @@ void LXQtPanel::setPanelGeometry() // Horiz ...................... if (mPosition == ILXQtPanel::PositionLeft) - rect.moveLeft(currentScreen.left()); + { + if (mHidden) + rect.moveRight(currentScreen.left() + PANEL_HIDE_SIZE - 1); + else + rect.moveLeft(currentScreen.left()); + } else - rect.moveRight(currentScreen.right()); + { + if (mHidden) + rect.moveLeft(currentScreen.right() - PANEL_HIDE_SIZE + 1); + else + rect.moveRight(currentScreen.right()); + } } - mLayout->setMargin(mHidden ? PANEL_HIDE_MARGIN : 0); if (rect != geometry()) { - setGeometry(rect); setFixedSize(rect.size()); + if (animate) + { + if (mAnimation == nullptr) + { + mAnimation = new QPropertyAnimation(this, "geometry"); + mAnimation->setEasingCurve(QEasingCurve::Linear); + //Note: for hiding, the margins are set after animation is finished + connect(mAnimation, &QAbstractAnimation::finished, [this] { if (mHidden) setMargins(); }); + } + mAnimation->setDuration(mAnimationTime); + mAnimation->setStartValue(geometry()); + mAnimation->setEndValue(rect); + //Note: for showing-up, the margins are removed instantly + if (!mHidden) + setMargins(); + mAnimation->start(); + } + else + { + setMargins(); + setGeometry(rect); + } + } +} + +void LXQtPanel::setMargins() +{ + if (mHidden) + { + if (isHorizontal()) + { + if (mPosition == ILXQtPanel::PositionTop) + mLayout->setContentsMargins(0, 0, 0, PANEL_HIDE_SIZE); + else + mLayout->setContentsMargins(0, PANEL_HIDE_SIZE, 0, 0); + } + else + { + if (mPosition == ILXQtPanel::PositionLeft) + mLayout->setContentsMargins(0, 0, PANEL_HIDE_SIZE, 0); + else + mLayout->setContentsMargins(PANEL_HIDE_SIZE, 0, 0, 0); + } } + else + mLayout->setContentsMargins(0, 0, 0, 0); } void LXQtPanel::realign() @@ -523,8 +625,8 @@ void LXQtPanel::updateWmStrut() /************************************************ The panel can't be placed on boundary of two displays. - This function checks, is the panel can be placed on the display - @displayNum on @position. + This function checks if the panel can be placed on the display + @screenNum on @position. ************************************************/ bool LXQtPanel::canPlacedOn(int screenNum, LXQtPanel::Position position) { @@ -589,6 +691,7 @@ void LXQtPanel::showConfigDialog() mConfigDialog = new ConfigPanelDialog(this, nullptr /*make it top level window*/); mConfigDialog->showConfigPanelPage(); + mStandaloneWindows->observeWindow(mConfigDialog.data()); mConfigDialog->show(); mConfigDialog->raise(); mConfigDialog->activateWindow(); @@ -608,6 +711,7 @@ void LXQtPanel::showAddPluginDialog() mConfigDialog = new ConfigPanelDialog(this, nullptr /*make it top level window*/); mConfigDialog->showConfigPluginsPage(); + mStandaloneWindows->observeWindow(mConfigDialog.data()); mConfigDialog->show(); mConfigDialog->raise(); mConfigDialog->activateWindow(); @@ -739,7 +843,10 @@ void LXQtPanel::setPosition(int screen, ILXQtPanel::Position position, bool save mLayout->setPosition(mPosition); if (save) + { + mScreenNum = screen; saveSettings(true); + } // Qt 5 adds a new class QScreen and add API for setting the screen of a QWindow. // so we had better use it. However, without this, our program should still work @@ -880,7 +987,7 @@ bool LXQtPanel::event(QEvent *event) event->ignore(); //no break intentionally case QEvent::Enter: - showPanel(); + showPanel(mAnimationTime > 0); break; case QEvent::Leave: @@ -924,8 +1031,13 @@ void LXQtPanel::showPopupMenu(Plugin *plugin) if (m) { menu->addTitle(plugin->windowTitle()); - menu->addActions(m->actions()); - qobject_cast(m)->setParent(menu); + for (auto const & action : m->actions()) + { + action->setParent(menu); + action->setDisabled(mLockPanel); + menu->addAction(action); + } + delete m; } } @@ -936,27 +1048,32 @@ void LXQtPanel::showPopupMenu(Plugin *plugin) menu->addAction(XdgIcon::fromTheme(QLatin1String("configure")), tr("Configure Panel"), this, SLOT(showConfigDialog()) - ); + )->setDisabled(mLockPanel); menu->addAction(XdgIcon::fromTheme("preferences-plugin"), tr("Manage Widgets"), this, SLOT(showAddPluginDialog()) - ); + )->setDisabled(mLockPanel); LXQtPanelApplication *a = reinterpret_cast(qApp); menu->addAction(XdgIcon::fromTheme(QLatin1String("list-add")), - tr("Add Panel"), + tr("Add New Panel"), a, SLOT(addNewPanel()) ); if (a->count() > 1) { menu->addAction(XdgIcon::fromTheme(QLatin1String("list-remove")), - tr("Remove Panel"), + tr("Remove Panel", "Menu Item"), this, SLOT(userRequestForDeletion()) - ); + )->setDisabled(mLockPanel); } + QAction * act_lock = menu->addAction(tr("Lock This Panel")); + act_lock->setCheckable(true); + act_lock->setChecked(mLockPanel); + connect(act_lock, &QAction::triggered, [this] { mLockPanel = !mLockPanel; saveSettings(false); }); + #ifdef DEBUG menu->addSeparator(); menu->addAction("Exit (debug only)", qApp, SLOT(quit())); @@ -967,16 +1084,16 @@ void LXQtPanel::showPopupMenu(Plugin *plugin) * of QDesktopWidget::availableGeometry) */ menu->setGeometry(calculatePopupWindowPos(QCursor::pos(), menu->sizeHint())); + willShowWindow(menu); menu->show(); } Plugin* LXQtPanel::findPlugin(const ILXQtPanelPlugin* iPlugin) const { - Plugin *plugin = nullptr; - for (Plugin *plug : mPlugins->plugins()) + for (auto const & plug : mPlugins->plugins()) if (plug->iPlugin() == iPlugin) - plugin = plug; - return plugin; + return plug; + return nullptr; } /************************************************ @@ -1040,6 +1157,14 @@ QRect LXQtPanel::calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const Q } +/************************************************ + + ************************************************/ +void LXQtPanel::willShowWindow(QWidget * w) +{ + mStandaloneWindows->observeWindow(w); +} + /************************************************ ************************************************/ @@ -1079,6 +1204,15 @@ void LXQtPanel::pluginMoved(Plugin * plug) ************************************************/ void LXQtPanel::userRequestForDeletion() { + const QMessageBox::StandardButton ret + = QMessageBox::warning(this, tr("Remove Panel", "Dialog Title") , + tr("Removing a panel can not be undone.\nDo you want to remove this panel?"), + QMessageBox::Yes | QMessageBox::No); + + if (ret != QMessageBox::Yes) { + return; + } + mSettings->beginGroup(mConfigGroup); QStringList plugins = mSettings->value("plugins").toStringList(); mSettings->endGroup(); @@ -1092,7 +1226,7 @@ void LXQtPanel::userRequestForDeletion() emit deletedByUser(this); } -void LXQtPanel::showPanel() +void LXQtPanel::showPanel(bool animate) { if (mHidable) { @@ -1100,26 +1234,31 @@ void LXQtPanel::showPanel() if (mHidden) { mHidden = false; - setPanelGeometry(); + setPanelGeometry(mAnimationTime > 0 && animate); } } } void LXQtPanel::hidePanel() { - if (mHidable && !mHidden) + if (mHidable && !mHidden + && !mStandaloneWindows->isAnyWindowShown() + ) mHideTimer.start(); } void LXQtPanel::hidePanelWork() { - if (mHidable && !mHidden && !geometry().contains(QCursor::pos())) + if (!geometry().contains(QCursor::pos())) { - mHidden = true; - setPanelGeometry(); - } else - { - mHideTimer.start(); + if (!mStandaloneWindows->isAnyWindowShown()) + { + mHidden = true; + setPanelGeometry(mAnimationTime > 0); + } else + { + mHideTimer.start(); + } } } @@ -1128,7 +1267,7 @@ void LXQtPanel::setHidable(bool hidable, bool save) if (mHidable == hidable) return; - mHidable = mHidden = hidable; + mHidable = hidable; if (save) saveSettings(true); @@ -1136,6 +1275,17 @@ void LXQtPanel::setHidable(bool hidable, bool save) realign(); } +void LXQtPanel::setAnimationTime(int animationTime, bool save) +{ + if (mAnimationTime == animationTime) + return; + + mAnimationTime = animationTime; + + if (save) + saveSettings(true); +} + bool LXQtPanel::isPluginSingletonAndRunnig(QString const & pluginId) const { Plugin const * plugin = mPlugins->pluginByID(pluginId); diff --git a/panel/lxqtpanel.h b/panel/lxqtpanel.h index 8ff4b8c..d086ad2 100644 --- a/panel/lxqtpanel.h +++ b/panel/lxqtpanel.h @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include "ilxqtpanel.h" @@ -48,8 +49,29 @@ class PluginInfo; class LXQtPanelLayout; class ConfigPanelDialog; class PanelPluginsModel; +class WindowNotifier; -/*! \brief The LXQtPanel class provides a single lxqt-panel. +/*! \brief The LXQtPanel class provides a single lxqt-panel. All LXQtPanel + * instances should be created and handled by LXQtPanelApplication. In turn, + * all Plugins should be created and handled by LXQtPanels. + * + * LXQtPanel is just the panel, it does not incorporate any functionality. + * Each function of the panel is implemented by Plugins, even the mainmenu + * (plugin-mainmenu) and the taskbar (plugin-taskbar). So the LXQtPanel is + * just the container for several Plugins while the different Plugins + * incorporate the functions of the panel. Without the Plugins, the panel + * is quite useless because it is just a box occupying space on the screen. + * + * LXQtPanel itself is a window (QFrame/QWidget) and this class is mainly + * responsible for handling the size and position of this window on the + * screen(s) as well as the different settings. The handling of the plugins + * is outsourced in PanelPluginsModel and LXQtPanelLayout. PanelPluginsModel + * is responsible for loading/creating and handling the plugins. + * LXQtPanelLayout is inherited from QLayout and set as layout to the + * background of LXQtPanel, so LXQtPanelLayout is responsible for the + * layout of all the Plugins. + * + * \sa LXQtPanelApplication, Plugin, PanelPluginsModel, LXQtPanelLayout. */ class LXQT_PANEL_API LXQtPanel : public QFrame, public ILXQtPanel { @@ -64,131 +86,571 @@ class LXQT_PANEL_API LXQtPanel : public QFrame, public ILXQtPanel friend class PanelPluginsModel; public: + /** + * @brief Stores how the panel should be aligned. Obviously, this applies + * only if the panel does not occupy 100 % of the available space. If the + * panel is vertical, AlignmentLeft means align to the top border of the + * screen, AlignmentRight means align to the bottom. + */ enum Alignment { - AlignmentLeft = -1, - AlignmentCenter = 0, - AlignmentRight = 1 + AlignmentLeft = -1, //!< Align the panel to the left or top + AlignmentCenter = 0, //!< Center the panel + AlignmentRight = 1 //!< Align the panel to the right or bottom }; + /** + * @brief Creates and initializes the LXQtPanel. Performs the following + * steps: + * 1. Sets Qt window title, flags, attributes. + * 2. Creates the panel layout. + * 3. Prepares the timers. + * 4. Connects signals and slots. + * 5. Reads the settings for this panel. + * 6. Optionally moves the panel to a valid screen (position-dependent). + * 7. Loads the Plugins. + * 8. Shows the panel, even if it is hidable (but then, starts the timer). + * @param configGroup The name of the panel which is used as identifier + * in the config file. + * @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); virtual ~LXQtPanel(); + /** + * @brief Returns the name of this panel which is also used as identifier + * in the config file. + */ QString name() { return mConfigGroup; } + /** + * @brief Reads all the necessary settings from mSettings and stores them + * in local variables. Additionally, calls necessary methods like realign() + * or updateStyleSheet() which need to get called after changing settings. + */ void readSettings(); + /** + * @brief Creates and shows the popup menu (right click menu). If a plugin + * is given as parameter, the menu will be divided in two groups: + * plugin-specific options and panel-related options. As these two are + * shown together, this menu has to be created by LXQtPanel. + * @param plugin The plugin whose menu options will be included in the + * context menu. + */ void showPopupMenu(Plugin *plugin = 0); - // ILXQtPanel ......................... - ILXQtPanel::Position position() const { return mPosition; } - QRect globalGometry() const; + // ILXQtPanel overrides ........ + ILXQtPanel::Position position() const override { return mPosition; } + QRect globalGometry() const override; + QRect calculatePopupWindowPos(QPoint const & absolutePos, QSize const & windowSize) const override; + QRect calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const QSize &windowSize) const override; + void willShowWindow(QWidget * w) override; + // ........ end of ILXQtPanel overrides + + /** + * @brief Searches for a Plugin in the Plugins-list of this panel. Takes + * an ILXQtPanelPlugin as parameter and returns the corresponding Plugin. + * @param iPlugin ILXQtPanelPlugin that we are looking for. + * @return The corresponding Plugin if it is loaded in this panel, nullptr + * otherwise. + */ Plugin *findPlugin(const ILXQtPanelPlugin *iPlugin) const; - QRect calculatePopupWindowPos(QPoint const & absolutePos, QSize const & windowSize) const; - QRect calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const QSize &windowSize) const; // For QSS properties .................. + /** + * @brief Returns the position as string + * + * \sa positionToStr(). + */ QString qssPosition() const; + /** + * @brief Checks if this LXQtPanel can be placed at a given position + * on the screen with the given screenNum. The condition for doing so + * is that the panel is not located between two screens. + * + * For example, if position is PositionRight, there should be no screen to + * the right of the given screen. That means that there should be no + * screen whose left border has a higher x-coordinate than the x-coordinate + * of the right border of the given screen. This method iterates over all + * screens and checks these conditions. + * @param screenNum screen index as it is used by QDesktopWidget methods + * @param position position where the panel should be placed + * @return true if this panel can be placed at the given position on the + * given screen. + * + * \sa findAvailableScreen(), mScreenNum, mActualScreenNum. + */ static bool canPlacedOn(int screenNum, LXQtPanel::Position position); + /** + * @brief Returns a string representation of the given position. This + * string is human-readable and can be used in config files. + * @param position position that should be converted to a string. + * @return the string representation of the given position, i.e. + * "Top", "Left", "Right" or "Bottom". + * + * \sa strToPosition() + */ static QString positionToStr(ILXQtPanel::Position position); + /** + * @brief Returns an ILXQtPanel::Position from the given string. This can + * be used to retrieve ILXQtPanel::Position values from the config files. + * @param str string that should be converted to ILXQtPanel::Position + * @param defaultValue value that will be returned if the string can not + * be converted to an ILXQtPanel::Position. + * @return ILXQtPanel::Position that was determined from str or + * defaultValue if str could not be converted. + * + * \sa positionToStr() + */ static ILXQtPanel::Position strToPosition(const QString &str, ILXQtPanel::Position defaultValue); // Settings + int iconSize() const override { return mIconSize; } //!< Implement ILXQtPanel::iconSize(). + int lineCount() const override { return mLineCount; } //!< Implement ILXQtPanel::lineCount(). int panelSize() const { return mPanelSize; } - int iconSize() const { return mIconSize; } - int lineCount() const { return mLineCount; } int length() const { return mLength; } bool lengthInPercents() const { return mLengthInPercents; } LXQtPanel::Alignment alignment() const { return mAlignment; } int screenNum() const { return mScreenNum; } - QColor fontColor() const { return mFontColor; }; - QColor backgroundColor() const { return mBackgroundColor; }; - QString backgroundImage() const { return mBackgroundImage; }; - int opacity() const { return mOpacity; }; + QColor fontColor() const { return mFontColor; } + QColor backgroundColor() const { return mBackgroundColor; } + QString backgroundImage() const { return mBackgroundImage; } + int opacity() const { return mOpacity; } bool hidable() const { return mHidable; } - + int animationTime() const { return mAnimationTime; } + + /*! + * \brief Checks if a given Plugin is running and has the + * ILXQtPanelPlugin::SingleInstance flag set. + * \param pluginId Plugin Identifier which is the basename of the + * .desktop file that specifies the plugin. + * \return true if the Plugin is running and has the + * ILXQtPanelPlugin::SingleInstance flag set, false otherwise. + */ bool isPluginSingletonAndRunnig(QString const & pluginId) const; public slots: + /** + * @brief Shows the QWidget and makes it visible on all desktops. This + * method is NOT related to showPanel(), hidePanel() and hidePanelWork() + * which handle the LXQt hiding by resizing the panel. + */ void show(); - void showPanel(); + /** + * @brief Shows the panel (immediately) after it had been hidden before. + * Stops the QTimer mHideTimer. This it NOT the same as QWidget::show() + * because hiding the panel in LXQt is done by making it very thin. So + * this method in fact restores the original size of the panel. + * \param animate flag for the panel show-up animation disabling (\sa mAnimationTime). + * + * \sa mHidable, mHidden, mHideTimer, hidePanel(), hidePanelWork() + */ + void showPanel(bool animate); + /** + * @brief Hides the panel (delayed) by starting the QTimer mHideTimer. + * When this timer times out, hidePanelWork() will be called. So this + * method is called when the cursor leaves the panel area but the panel + * will be hidden later. + * + * \sa mHidable, mHidden, mHideTimer, showPanel(), hidePanelWork() + */ void hidePanel(); + /** + * @brief Actually hides the panel. Will be invoked when the QTimer + * mHideTimer times out. That timer will be started by showPanel(). This + * is NOT the same as QWidget::hide() because hiding the panel in LXQt is + * done by making the panel very thin. So this method in fact makes the + * panel very thin while the QWidget stays visible. + * + * \sa mHidable, mHidden, mHideTimer, showPanel(), hidePanel() + */ void hidePanelWork(); // Settings + /** + * @brief All the setter methods are designed similar: + * 1. Check if the given value is different from the current value. If not, + * do not do anything and return. + * 2. Set the value. + * 3. If parameter save is true, call saveSettings(true) to store the + * new settings on the disk. + * 4. If necessary, propagate the new value to child objects, e.g. to + * mLayout. + * 5. If necessary, call update methods like realign() or + * updateStyleSheet(). + * @param value The value that should be set. + * @param save If true, saveSettings(true) will be called. + */ void setPanelSize(int value, bool save); - void setIconSize(int value, bool save); - void setLineCount(int value, bool save); - void setLength(int length, bool inPercents, bool save); - void setPosition(int screen, ILXQtPanel::Position position, bool save); - void setAlignment(LXQtPanel::Alignment value, bool save); - void setFontColor(QColor color, bool save); - void setBackgroundColor(QColor color, bool save); - void setBackgroundImage(QString path, bool save); - void setOpacity(int opacity, bool save); - void setHidable(bool hidable, bool save); - + void setIconSize(int value, bool save); //!< \sa setPanelSize() + void setLineCount(int value, bool save); //!< \sa setPanelSize() + void setLength(int length, bool inPercents, bool save); //!< \sa setPanelSize() + void setPosition(int screen, ILXQtPanel::Position position, bool save); //!< \sa setPanelSize() + void setAlignment(LXQtPanel::Alignment value, bool save); //!< \sa setPanelSize() + void setFontColor(QColor color, bool save); //!< \sa setPanelSize() + void setBackgroundColor(QColor color, bool save); //!< \sa setPanelSize() + void setBackgroundImage(QString path, bool save); //!< \sa setPanelSize() + void setOpacity(int opacity, bool save); //!< \sa setPanelSize() + void setHidable(bool hidable, bool save); //!< \sa setPanelSize() + void setAnimationTime(int animationTime, bool save); //!< \sa setPanelSize() + + /** + * @brief Saves the current configuration, i.e. writes the current + * configuration varibles to mSettings. + * @param later Determines if the settings are written immediately or + * after a short delay. If later==true, the QTimer mDelaySave is started. + * As soon as this timer times out, saveSettings(false) will be called. If + * later==false, settings will be written. + */ void saveSettings(bool later=false); + /** + * @brief Checks if the panel can be placed on the current screen at the + * current position. If it can not, it will be moved on another screen + * where the desired position is possible. + */ void ensureVisible(); signals: + /** + * @brief This signal gets emitted whenever this panel receives a + * QEvent::LayoutRequest, i.e. "Widget layout needs to be redone.". + * The PanelPluginsModel will connect this signal to the individual + * plugins so they can realign, too. + */ void realigned(); + /** + * @brief This signal gets emitted at the end of + * userRequestForDeletion() which in turn gets called when the user + * decides to remove a panel. This signal is used by + * LXQtPanelApplication to get notified whenever an LXQtPanel should + * be removed. + * @param self This LXQtPanel. LXQtPanelApplication will use this + * parameter to identify the LXQtPanel that should be removed. + */ void deletedByUser(LXQtPanel *self); + /** + * @brief This signal is just a relay signal. The pluginAdded signal + * of the PanelPluginsModel (mPlugins) will be connected to this + * signal. Thereby, we can make this signal of a private member + * available as a public signal. + * Currently, this signal is used by LXQtPanelApplication which + * will further re-emit this signal. + */ void pluginAdded(); + /** + * @brief This signal is just a relay signal. The pluginRemoved signal + * of the PanelPluginsModel (mPlugins) will be connected to this + * signal. Thereby, we can make this signal of a private member + * available as a public signal. + * Currently, this signal is used by LXQtPanelApplication which + * will further re-emit this signal. + */ void pluginRemoved(); protected: - bool event(QEvent *event); - void showEvent(QShowEvent *event); + /** + * @brief Overrides QObject::event(QEvent * e). Some functions of + * the panel will be triggered by these events, e.g. showing/hiding + * the panel or showing the context menu. + * @param event The event that was received. + * @return "QObject::event(QEvent *e) should return true if the event e + * was recognized and processed." This is done by passing the event to + * QFrame::event(QEvent *e) at the end. + */ + bool event(QEvent *event) override; + /** + * @brief Overrides QWidget::showEvent(QShowEvent * event). This + * method is called when a widget (in this case: the LXQtPanel) is + * shown. The call could happen before and after the widget is shown. + * This method is just overridden to get notified when the LXQtPanel + * will be shown. Then, LXQtPanel will call realign(). + * @param event The QShowEvent sent by Qt. + */ + void showEvent(QShowEvent *event) override; public slots: + /** + * @brief Shows the ConfigPanelDialog and shows the "Config Panel" + * page, i.e. calls showConfigPanelPage(). If the dialog does not + * exist yet, it will be created before. + * + * The "Configure Panel" button in the context menu of the panel will + * be connected to this slot so this method gets called whenever the + * user clicks that button. + * + * Furthermore, this method will be called by LXQtPanelApplication + * when a new plugin gets added (the LXQtPanel instances are handled + * by LXQtPanelApplication). That is why this method/slot has to be + * public. + */ void showConfigDialog(); private slots: + /** + * @brief Shows the ConfigPanelDialog and shows the "Config Plugins" + * page, i.e. calls showConfigPluginsPage(). If the dialog does not + * exist yet, it will be created before. + * + * The "Manage Widgets" button in the context menu of the panel will + * be connected to this slot so this method gets called whenever the + * user clicks that button. + */ void showAddPluginDialog(); + /** + * @brief Recalculates the geometry of the panel and reserves the + * window manager strut, i.e. it calls setPanelGeometry() and + * updateWmStrut(). + * Two signals will be connected to this slot: + * 1. QDesktopWidget::workAreaResized(int screen) which will be emitted + * when the work area available (on screen) changes. + * 2. LXQt::Application::themeChanged(), i.e. when the user changes + * the theme. + */ void realign(); + /** + * @brief Moves a plugin in PanelPluginsModel, i.e. calls + * PanelPluginsModel::movePlugin(Plugin * plugin, QString const & nameAfter). + * LXQtPanelLayout::pluginMoved() will be connected to this slot so + * it gets called whenever a plugin was moved in the layout by the user. + * @param plug + */ void pluginMoved(Plugin * plug); + /** + * @brief Removes this panel's entries from the config file and emits + * the deletedByUser signal. + * The "Remove Panel" button in the panel's contex menu will + * be connected to this slot, so this method will be called whenever + * the user clicks "Remove Panel". + */ void userRequestForDeletion(); private: + /** + * @brief The LXQtPanelLayout of this panel. All the Plugins will be added + * to the UI via this layout. + */ LXQtPanelLayout* mLayout; + /** + * @brief The LXQt::Settings instance as retrieved from + * LXQtPanelApplication. + */ LXQt::Settings *mSettings; + /** + * @brief The background widget for the panel. This background widget will + * have the background color or the background image if any of these is + * set. This background widget will have the LXQtPanelLayout mLayout which + * will in turn contain all the Plugins. + */ QFrame *LXQtPanelWidget; + /** + * @brief The name of the panel which will also be used as an identifier + * for config files. + */ QString mConfigGroup; + /** + * @brief Pointer to the PanelPluginsModel which will store all the Plugins + * that are loaded. + */ QScopedPointer mPlugins; - + /** + * @brief object for storing info if some standalone window is shown + * (for preventing hide) + */ + QScopedPointer mStandaloneWindows; + + /** + * @brief Returns the screen index of a screen on which this panel could + * be placed at the given position. If possible, the current screen index + * is preserved. So, if the panel can be placed on the current screen, the + * index of that screen will be returned. + * @param position position at which the panel should be placed. + * @return The current screen index if the panel can be placed on the + * current screen or the screen index of a screen that it can be placed on. + * + * \sa canPlacedOn(), mScreenNum, mActualScreenNum. + */ int findAvailableScreen(LXQtPanel::Position position); + /** + * @brief Update the window manager struts _NET_WM_PARTIAL_STRUT and + * _NET_WM_STRUT for this widget. "The purpose of struts is to reserve + * space at the borders of the desktop. This is very useful for a + * docking area, a taskbar or a panel, for instance. The Window Manager + * should take this reserved area into account when constraining window + * positions - maximized windows, for example, should not cover that + * area." + * \sa http://standards.freedesktop.org/wm-spec/wm-spec-latest.html#NETWMSTRUT + */ void updateWmStrut(); + /** + * @brief Loads the plugins, i.e. creates a new PanelPluginsModel. + * Connects the signals and slots and adds all the plugins to the + * layout. + */ void loadPlugins(); - void setPanelGeometry(); + /** + * @brief Calculates and sets the geometry (i.e. the position and the size + * on the screen) of the panel. Considers alignment, position, if the panel + * is hidden and if its geometry should be set with animation. + * \param animate flag if showing/hiding the panel should be animated. + */ + void setPanelGeometry(bool animate = false); + /** + * @brief Sets the contents margins of the panel according to its position + * and hiddenness. All margins are zero for visible panels. + */ + void setMargins(); + /** + * @brief Calculates the height of the panel if it is horizontal or the + * width if the panel is vertical. Considers if the panel is hidden and + * ensures that the result is at least PANEL_MINIMUM_SIZE. + * @return The height/width of the panel. + */ int getReserveDimension(); + /** + * @brief Stores the size of the panel, i.e. the height of a horizontal + * panel or the width of a vertical panel in pixels. If the panel is + * hidden (which is achieved by making the panel very thin), this value + * is unchanged. So this value stores the size of the non-hidden panel. + * + * \sa panelSize(), setPanelSize(). + */ int mPanelSize; + /** + * @brief Stores the edge length of the panel icons in pixels. + * + * \sa ILXQtPanel::iconSize(), setIconSize(). + */ int mIconSize; + /** + * @brief Stores the number of lines/rows of the panel. + * + * \sa ILXQtPanel::lineCount(), setLineCount(). + */ int mLineCount; + /** + * @brief Stores the length of the panel, i.e. the width of a horizontal + * panel or the height of a vertical panel. The unit of this value is + * determined by mLengthInPercents. + * + * \sa mLengthInPercents + */ int mLength; + /** + * @brief Stores if mLength is stored in pixels or relative to the + * screen size in percents. If true, the length is stored in percents, + * otherwise in pixels. + * + * \sa mLength + */ bool mLengthInPercents; + /** + * @brief Stores how this panel is aligned. The meaning of this value + * differs for horizontal and vertical panels. + * + * \sa Alignment. + */ Alignment mAlignment; + /** + * @brief Stores the position where the panel is shown + */ ILXQtPanel::Position mPosition; - int mScreenNum; //!< configured screen (user preference) - int mActualScreenNum; //!< panel currently shown at (if the configured screen is not available) + /** + * @brief Returns the index of the screen on which this panel should be + * shown. This is the user configured value which can differ from the + * screen that the panel is actually shown on. If the panel can not be + * shown on the configured screen, LXQtPanel will determine another + * screen. The screen that the panel is actually shown on is stored in + * mActualScreenNum. + * + * @return The index of the screen on which this panel should be shown. + * + * \sa mActualScreenNum, canPlacedOn(), findAvailableScreen(). + */ + int mScreenNum; + /** + * @brief screen that the panel is currently shown at (this could + * differ from mScreenNum). + * + * \sa mScreenNum, canPlacedOn(), findAvailableScreen(). + */ + int mActualScreenNum; + /** + * @brief QTimer for delayed saving of changed settings. In many cases, + * instead of storing changes to disk immediately we start this timer. + * If this timer times out, we store the changes to disk. This has the + * advantage that we can store a couple of changes with only one write to + * disk. + * + * \sa saveSettings() + */ QTimer mDelaySave; + /** + * @brief Stores if the panel is hidable, i.e. if the panel will be + * hidden after the cursor has left the panel area. + * + * \sa mHidden, mHideTimer, showPanel(), hidePanel(), hidePanelWork() + */ bool mHidable; + /** + * @brief Stores if the panel is currently hidden. + * + * \sa mHidable, mHideTimer, showPanel(), hidePanel(), hidePanelWork() + */ bool mHidden; + /** + * @brief QTimer for hiding the panel. When the cursor leaves the panel + * area, this timer will be started. After this timer has timed out, the + * panel will actually be hidden. + * + * \sa mHidable, mHidden, showPanel(), hidePanel(), hidePanelWork() + */ QTimer mHideTimer; - - QColor mFontColor; - QColor mBackgroundColor; - QString mBackgroundImage; - // 0 to 100 + /** + * @brief Stores the duration of auto-hide animation. + * + * \sa mHidden, mHideTimer, showPanel(), hidePanel(), hidePanelWork() + */ + int mAnimationTime; + + QColor mFontColor; //!< Font color that is used in the style sheet. + QColor mBackgroundColor; //!< Background color that is used in the style sheet. + QString mBackgroundImage; //!< Background image that is used in the style sheet. + /** + * @brief Determines the opacity of the background color. The value + * should be in the range from 0 to 100. This will not affect the opacity + * of a background image. + */ int mOpacity; + + /** + * @brief Pointer to the current ConfigPanelDialog if there is any. Make + * sure to test this pointer for validity because it is lazily loaded. + */ QPointer mConfigDialog; + /** + * @brief The animation used for showing/hiding an auto-hiding panel. + */ + QPropertyAnimation *mAnimation; + + /** + * @brief Flag for providing the configuration options in panel's context menu + */ + bool mLockPanel; + + /** + * @brief Updates the style sheet for the panel. First, the stylesheet is + * created from the preferences. Then, it is set via + * QWidget::setStyleSheet(). + */ void updateStyleSheet(); // settings should be kept private for security diff --git a/panel/lxqtpanelapplication.cpp b/panel/lxqtpanelapplication.cpp index 9cfe707..4015850 100644 --- a/panel/lxqtpanelapplication.cpp +++ b/panel/lxqtpanelapplication.cpp @@ -27,6 +27,7 @@ #include "lxqtpanelapplication.h" +#include "lxqtpanelapplication_p.h" #include "lxqtpanel.h" #include "config/configpaneldialog.h" #include @@ -36,9 +37,47 @@ #include #include +LXQtPanelApplicationPrivate::LXQtPanelApplicationPrivate(LXQtPanelApplication *q) + : mSettings(0), + q_ptr(q) +{ +} + + +ILXQtPanel::Position LXQtPanelApplicationPrivate::computeNewPanelPosition(const LXQtPanel *p, const int screenNum) +{ + Q_Q(LXQtPanelApplication); + QVector screenPositions(4, false); // false means not occupied + + for (int i = 0; i < q->mPanels.size(); ++i) { + if (p != q->mPanels.at(i)) { + // We are not the newly added one + if (screenNum == q->mPanels.at(i)->screenNum()) { // Panels on the same screen + int p = static_cast (q->mPanels.at(i)->position()); + screenPositions[p] = true; // occupied + } + } + } + + int availablePosition = 0; + + for (int i = 0; i < 4; ++i) { // Bottom, Top, Left, Right + if (!screenPositions[i]) { + availablePosition = i; + break; + } + } + + return static_cast (availablePosition); +} + LXQtPanelApplication::LXQtPanelApplication(int& argc, char** argv) - : LXQt::Application(argc, argv, true) + : LXQt::Application(argc, argv, true), + d_ptr(new LXQtPanelApplicationPrivate(this)) + { + Q_D(LXQtPanelApplication); + QCoreApplication::setApplicationName(QLatin1String("lxqt-panel")); QCoreApplication::setApplicationVersion(LXQT_VERSION); @@ -58,9 +97,9 @@ LXQtPanelApplication::LXQtPanelApplication(int& argc, char** argv) const QString configFile = parser.value(configFileOption); if (configFile.isEmpty()) - mSettings = new LXQt::Settings(QLatin1String("panel"), this); + d->mSettings = new LXQt::Settings(QLatin1String("panel"), this); else - mSettings = new LXQt::Settings(configFile, QSettings::IniFormat, this); + d->mSettings = new LXQt::Settings(configFile, QSettings::IniFormat, this); // This is a workaround for Qt 5 bug #40681. Q_FOREACH(QScreen* screen, screens()) @@ -71,7 +110,7 @@ LXQtPanelApplication::LXQtPanelApplication(int& argc, char** argv) connect(this, &QCoreApplication::aboutToQuit, this, &LXQtPanelApplication::cleanup); - QStringList panels = mSettings->value("panels").toStringList(); + QStringList panels = d->mSettings->value("panels").toStringList(); if (panels.isEmpty()) { @@ -86,6 +125,7 @@ LXQtPanelApplication::LXQtPanelApplication(int& argc, char** argv) LXQtPanelApplication::~LXQtPanelApplication() { + delete d_ptr; } void LXQtPanelApplication::cleanup() @@ -95,11 +135,17 @@ void LXQtPanelApplication::cleanup() void LXQtPanelApplication::addNewPanel() { + Q_D(LXQtPanelApplication); + QString name("panel_" + QUuid::createUuid().toString()); + LXQtPanel *p = addPanel(name); - QStringList panels = mSettings->value("panels").toStringList(); + int screenNum = p->screenNum(); + ILXQtPanel::Position newPanelPosition = d->computeNewPanelPosition(p, screenNum); + p->setPosition(screenNum, newPanelPosition, true); + QStringList panels = d->mSettings->value("panels").toStringList(); panels << name; - mSettings->setValue("panels", panels); + d->mSettings->setValue("panels", panels); // Poupup the configuration dialog to allow user configuration right away p->showConfigDialog(); @@ -107,7 +153,9 @@ void LXQtPanelApplication::addNewPanel() LXQtPanel* LXQtPanelApplication::addPanel(const QString& name) { - LXQtPanel *panel = new LXQtPanel(name, mSettings); + Q_D(LXQtPanelApplication); + + LXQtPanel *panel = new LXQtPanel(name, d->mSettings); mPanels << panel; // reemit signals @@ -126,12 +174,14 @@ void LXQtPanelApplication::handleScreenAdded(QScreen* newScreen) void LXQtPanelApplication::reloadPanelsAsNeeded() { + Q_D(LXQtPanelApplication); + // NOTE by PCMan: This is a workaround for Qt 5 bug #40681. // Here we try to re-create the missing panels which are deleted in // LXQtPanelApplication::screenDestroyed(). // qDebug() << "LXQtPanelApplication::reloadPanelsAsNeeded()"; - QStringList names = mSettings->value("panels").toStringList(); + QStringList names = d->mSettings->value("panels").toStringList(); Q_FOREACH(const QString& name, names) { bool found = false; @@ -205,13 +255,14 @@ void LXQtPanelApplication::screenDestroyed(QObject* screenObj) void LXQtPanelApplication::removePanel(LXQtPanel* panel) { + Q_D(LXQtPanelApplication); Q_ASSERT(mPanels.contains(panel)); mPanels.removeAll(panel); - QStringList panels = mSettings->value("panels").toStringList(); + QStringList panels = d->mSettings->value("panels").toStringList(); panels.removeAll(panel->name()); - mSettings->setValue("panels", panels); + d->mSettings->setValue("panels", panels); panel->deleteLater(); } diff --git a/panel/lxqtpanelapplication.h b/panel/lxqtpanelapplication.h index a3fdcbd..728538c 100644 --- a/panel/lxqtpanelapplication.h +++ b/panel/lxqtpanelapplication.h @@ -35,42 +35,148 @@ class QScreen; class LXQtPanel; -namespace LXQt { -class Settings; -} +class LXQtPanelApplicationPrivate; +/*! + * \brief The LXQtPanelApplication class inherits from LXQt::Application and + * is therefore the QApplication that we will create and execute in our + * main()-function. + * + * LXQtPanelApplication itself is not a visible panel, rather it is only + * the container which holds the visible panels. These visible panels are + * LXQtPanel objects which are stored in mPanels. This approach enables us + * to have more than one panel (for example one panel at the top and one + * panel at the bottom of the screen) without additional effort. + */ class LXQtPanelApplication : public LXQt::Application { Q_OBJECT public: + /*! + * \brief Creates a new LXQtPanelApplication with the given command line + * arguments. Performs the following steps: + * 1. Initializes the LXQt::Application, sets application name and version. + * 2. Handles command line arguments. Currently, the only cmdline argument + * is -c = -config = -configfile which chooses a different config file + * for the LXQt::Settings. + * 3. Creates the LXQt::Settings. + * 4. Connects QCoreApplication::aboutToQuit to cleanup(). + * 5. Calls addPanel() for each panel found in the config file. If there is + * none, adds a new panel. + * \param argc + * \param argv + */ explicit LXQtPanelApplication(int& argc, char** argv); ~LXQtPanelApplication(); + /*! + * \brief Determines the number of LXQtPanel objects + * \return the current number of LXQtPanel objects + */ int count() { return mPanels.count(); } + + /*! + * \brief Checks if a given Plugin is running and has the + * ILXQtPanelPlugin::SingleInstance flag set. As Plugins are added to + * LXQtPanel instances, this method only iterates over these LXQtPanel + * instances and lets them check the conditions. + * \param pluginId Plugin Identifier which is the basename of the .desktop + * file that specifies the plugin. + * \return true if the Plugin is running and has the + * ILXQtPanelPlugin::SingleInstance flag set, false otherwise. + */ bool isPluginSingletonAndRunnig(QString const & pluginId) const; public slots: + /*! + * \brief Adds a new LXQtPanel which consists of the following steps: + * 1. Create id/name. + * 2. Create the LXQtPanel: call addPanel(name). + * 3. Update the config file (add the new panel id to the list of panels). + * 4. Show the panel configuration dialog so that the user can add plugins. + * + * This method will create a new LXQtPanel with a new name and add this + * to the config file. So this should only be used while the application + * is running and the user decides to add a new panel. At application + * startup, addPanel() should be used instead. + * + * \note This slot will be used from the LXQtPanel right-click menu. As we + * can only add new panels from a visible panel, we should never run + * lxqt-panel without an LXQtPanel. Without a panel, we have just an + * invisible application. + */ void addNewPanel(); signals: + /*! + * \brief Signal that re-emits the signal pluginAdded() from LXQtPanel. + */ void pluginAdded(); + /*! + * \brief Signal that re-emits the signal pluginRemoved() from LXQtPanel. + */ void pluginRemoved(); private: + /*! + * \brief Holds all the instances of LXQtPanel. + */ QList mPanels; - + /*! + * \brief Creates a new LXQtPanel with the given name and connects the + * appropriate signals and slots. + * This method can be used at application startup. + * \param name Name of the LXQtPanel as it is used in the config file. + * \return The newly created LXQtPanel. + */ LXQtPanel* addPanel(const QString &name); private slots: + /*! + * \brief Removes the given LXQtPanel which consists of the following + * steps: + * 1. Remove the panel from mPanels. + * 2. Remove the panel from the config file. + * 3. Schedule the QObject for deletion: QObject::deleteLater(). + * \param panel LXQtPanel instance that should be removed. + */ void removePanel(LXQtPanel* panel); + /*! + * \brief Connects the QScreen::destroyed signal of a new screen to + * the screenDestroyed() slot so that we can handle this screens' + * destruction as soon as it happens. + * \param newScreen The QScreen that was created and added. + */ void handleScreenAdded(QScreen* newScreen); + /*! + * \brief Handles screen destruction. This is a workaround for a Qt bug. + * For further information, see the implementation notes. + * \param screenObj The QScreen that was destroyed. + */ void screenDestroyed(QObject* screenObj); + /*! + * \brief Reloads the panels. This is the second part of the workaround + * mentioned above. + */ void reloadPanelsAsNeeded(); + /*! + * \brief Deletes all LXQtPanel instances that are stored in mPanels. + */ void cleanup(); private: - LXQt::Settings *mSettings; + /*! + * \brief mSettings is the LXQt::Settings object that is used for the + * current instance of lxqt-panel. Normally, this refers to the config file + * $HOME/.config/lxqt/panel.conf (on Unix systems). This behaviour can be + * changed with the -c command line option. + */ + + LXQtPanelApplicationPrivate *const d_ptr; + + Q_DECLARE_PRIVATE(LXQtPanelApplication) + Q_DISABLE_COPY(LXQtPanelApplication) }; diff --git a/panel/lxqtpanelapplication_p.h b/panel/lxqtpanelapplication_p.h new file mode 100644 index 0000000..4dd2618 --- /dev/null +++ b/panel/lxqtpanelapplication_p.h @@ -0,0 +1,45 @@ +/* + * LXQt - a lightweight, Qt based, desktop toolset + * Copyright (C) 2016 Luís Pereira + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + */ + +#ifndef LXQTPANELAPPLICATION_P_H +#define LXQTPANELAPPLICATION_P_H + +#include "lxqtpanelapplication.h" + +namespace LXQt { +class Settings; +} + +class LXQtPanelApplicationPrivate { + Q_DECLARE_PUBLIC(LXQtPanelApplication) +public: + + LXQtPanelApplicationPrivate(LXQtPanelApplication *q); + ~LXQtPanelApplicationPrivate() {}; + + LXQt::Settings *mSettings; + + ILXQtPanel::Position computeNewPanelPosition(const LXQtPanel *p, const int screenNum); + +private: + LXQtPanelApplication *const q_ptr; +}; + +#endif // LXQTPANELAPPLICATION_P_H diff --git a/panel/lxqtpanellayout.cpp b/panel/lxqtpanellayout.cpp index b59b537..234276b 100644 --- a/panel/lxqtpanellayout.cpp +++ b/panel/lxqtpanellayout.cpp @@ -118,6 +118,7 @@ class LayoutItemGrid { public: explicit LayoutItemGrid(); + ~LayoutItemGrid(); void addItem(QLayoutItem *item); int count() const { return mItems.count(); } @@ -188,6 +189,11 @@ LayoutItemGrid::LayoutItemGrid() clear(); } +LayoutItemGrid::~LayoutItemGrid() +{ + qDeleteAll(mItems); +} + /************************************************ @@ -416,7 +422,7 @@ LXQtPanelLayout::LXQtPanelLayout(QWidget *parent) : mPosition(ILXQtPanel::PositionBottom), mAnimate(false) { - setMargin(0); + setContentsMargins(0, 0, 0, 0); } @@ -633,6 +639,7 @@ void LXQtPanelLayout::setItemGeometry(QLayoutItem *item, const QRect &geometry, ************************************************/ void LXQtPanelLayout::setGeometryHoriz(const QRect &geometry) { + const bool visual_h_reversed = parentWidget() && parentWidget()->isRightToLeft(); // Calc expFactor for expandable plugins like TaskBar. double expFactor; { @@ -644,9 +651,11 @@ void LXQtPanelLayout::setGeometryHoriz(const QRect &geometry) // Calc baselines for plugins like button. QVector baseLines(qMax(mLeftGrid->colCount(), mRightGrid->colCount())); + const int bh = geometry.height() / baseLines.count(); + const int base_center = bh >> 1; + const int height_remain = 0 < bh ? geometry.height() % baseLines.size() : 0; { - int bh = geometry.height() / baseLines.count(); - int base = geometry.top() + (bh >> 1); + int base = geometry.top(); for (auto i = baseLines.begin(), i_e = baseLines.end(); i_e != i; ++i, base += bh) { *i = base; @@ -672,6 +681,7 @@ void LXQtPanelLayout::setGeometryHoriz(const QRect &geometry) for (int r=0; rrowCount(); ++r) { int rw = 0; + int remain = height_remain; for (int c=0; cusedColCount(); ++c) { const LayoutItemInfo &info = mLeftGrid->itemInfo(r, c); @@ -691,13 +701,19 @@ void LXQtPanelLayout::setGeometryHoriz(const QRect &geometry) } else { - rect.setHeight(qMin(info.geometry.height(), geometry.height())); + const int height = qMin(qMin(info.geometry.height(), geometry.height()), bh + (0 < remain-- ? 1 : 0)); + rect.setHeight(height); rect.setWidth(qMin(info.geometry.width(), geometry.width())); - rect.moveCenter(QPoint(0, baseLines[c])); + if (height < bh) + rect.moveCenter(QPoint(0, baseLines[c] + base_center)); + else + rect.moveTop(baseLines[c]); rect.moveLeft(left); } rw = qMax(rw, rect.width()); + if (visual_h_reversed) + rect.moveLeft(geometry.left() + geometry.right() - rect.x() - rect.width() + 1); setItemGeometry(info.item, rect, mAnimate); } } @@ -709,6 +725,7 @@ void LXQtPanelLayout::setGeometryHoriz(const QRect &geometry) for (int r=mRightGrid->rowCount()-1; r>=0; --r) { int rw = 0; + int remain = height_remain; for (int c=0; cusedColCount(); ++c) { const LayoutItemInfo &info = mRightGrid->itemInfo(r, c); @@ -729,13 +746,19 @@ void LXQtPanelLayout::setGeometryHoriz(const QRect &geometry) } else { - rect.setHeight(qMin(info.geometry.height(), geometry.height())); + const int height = qMin(qMin(info.geometry.height(), geometry.height()), bh + (0 < remain-- ? 1 : 0)); + rect.setHeight(height); rect.setWidth(qMin(info.geometry.width(), geometry.width())); - rect.moveCenter(QPoint(0, baseLines[c])); + if (height < bh) + rect.moveCenter(QPoint(0, baseLines[c] + base_center)); + else + rect.moveTop(baseLines[c]); rect.moveRight(right); } rw = qMax(rw, rect.width()); + if (visual_h_reversed) + rect.moveLeft(geometry.left() + geometry.right() - rect.x() - rect.width() + 1); setItemGeometry(info.item, rect, mAnimate); } } @@ -749,6 +772,7 @@ void LXQtPanelLayout::setGeometryHoriz(const QRect &geometry) ************************************************/ void LXQtPanelLayout::setGeometryVert(const QRect &geometry) { + const bool visual_h_reversed = parentWidget() && parentWidget()->isRightToLeft(); // Calc expFactor for expandable plugins like TaskBar. double expFactor; { @@ -760,9 +784,11 @@ void LXQtPanelLayout::setGeometryVert(const QRect &geometry) // Calc baselines for plugins like button. QVector baseLines(qMax(mLeftGrid->colCount(), mRightGrid->colCount())); + const int bw = geometry.width() / baseLines.count(); + const int base_center = bw >> 1; + const int width_remain = 0 < bw ? geometry.width() % baseLines.size() : 0; { - int bw = geometry.width() / baseLines.count(); - int base = geometry.left() + (bw >> 1); + int base = geometry.left(); for (auto i = baseLines.begin(), i_e = baseLines.end(); i_e != i; ++i, base += bw) { *i = base; @@ -787,6 +813,7 @@ void LXQtPanelLayout::setGeometryVert(const QRect &geometry) for (int r=0; rrowCount(); ++r) { int rh = 0; + int remain = width_remain; for (int c=0; cusedColCount(); ++c) { const LayoutItemInfo &info = mLeftGrid->itemInfo(r, c); @@ -807,12 +834,18 @@ void LXQtPanelLayout::setGeometryVert(const QRect &geometry) else { rect.setHeight(qMin(info.geometry.height(), geometry.height())); - rect.setWidth(qMin(info.geometry.width(), geometry.width())); - rect.moveCenter(QPoint(baseLines[c], 0)); + const int width = qMin(qMin(info.geometry.width(), geometry.width()), bw + (0 < remain-- ? 1 : 0)); + rect.setWidth(width); + if (width < bw) + rect.moveCenter(QPoint(baseLines[c] + base_center, 0)); + else + rect.moveLeft(baseLines[c]); rect.moveTop(top); } rh = qMax(rh, rect.height()); + if (visual_h_reversed) + rect.moveLeft(geometry.left() + geometry.right() - rect.x() - rect.width() + 1); setItemGeometry(info.item, rect, mAnimate); } } @@ -825,6 +858,7 @@ void LXQtPanelLayout::setGeometryVert(const QRect &geometry) for (int r=mRightGrid->rowCount()-1; r>=0; --r) { int rh = 0; + int remain = width_remain; for (int c=0; cusedColCount(); ++c) { const LayoutItemInfo &info = mRightGrid->itemInfo(r, c); @@ -845,12 +879,18 @@ void LXQtPanelLayout::setGeometryVert(const QRect &geometry) else { rect.setHeight(qMin(info.geometry.height(), geometry.height())); - rect.setWidth(qMin(info.geometry.width(), geometry.width())); - rect.moveCenter(QPoint(baseLines[c], 0)); + const int width = qMin(qMin(info.geometry.width(), geometry.width()), bw + (0 < remain-- ? 1 : 0)); + rect.setWidth(width); + if (width < bw) + rect.moveCenter(QPoint(baseLines[c] + base_center, 0)); + else + rect.moveLeft(baseLines[c]); rect.moveBottom(bottom); } rh = qMax(rh, rect.height()); + if (visual_h_reversed) + rect.moveLeft(geometry.left() + geometry.right() - rect.x() - rect.width() + 1); setItemGeometry(info.item, rect, mAnimate); } } diff --git a/panel/lxqtpanellimits.h b/panel/lxqtpanellimits.h index 0dfff4f..e819138 100644 --- a/panel/lxqtpanellimits.h +++ b/panel/lxqtpanellimits.h @@ -32,7 +32,6 @@ #define PANEL_MINIMUM_SIZE 16 #define PANEL_MAXIMUM_SIZE 200 #define PANEL_HIDE_SIZE 4 -#define PANEL_HIDE_MARGIN (PANEL_HIDE_SIZE / 2) #define PANEL_DEFAULT_ICON_SIZE 22 #define PANEL_DEFAULT_LINE_COUNT 1 diff --git a/panel/lxqtpanelpluginconfigdialog.cpp b/panel/lxqtpanelpluginconfigdialog.cpp index 6d9e53d..5d9a437 100644 --- a/panel/lxqtpanelpluginconfigdialog.cpp +++ b/panel/lxqtpanelpluginconfigdialog.cpp @@ -36,10 +36,9 @@ /************************************************ ************************************************/ -LXQtPanelPluginConfigDialog::LXQtPanelPluginConfigDialog(QSettings &settings, QWidget *parent) : +LXQtPanelPluginConfigDialog::LXQtPanelPluginConfigDialog(PluginSettings &settings, QWidget *parent) : QDialog(parent), - mSettings(settings), - mOldSettings(settings) + mSettings(settings) { } @@ -55,7 +54,7 @@ LXQtPanelPluginConfigDialog::~LXQtPanelPluginConfigDialog() /************************************************ ************************************************/ -QSettings& LXQtPanelPluginConfigDialog::settings() const +PluginSettings& LXQtPanelPluginConfigDialog::settings() const { return mSettings; } @@ -71,7 +70,7 @@ void LXQtPanelPluginConfigDialog::dialogButtonsAction(QAbstractButton *btn) if (box && box->buttonRole(btn) == QDialogButtonBox::ResetRole) { - mOldSettings.loadToSettings(); + mSettings.loadFromCache(); loadSettings(); } else diff --git a/panel/lxqtpanelpluginconfigdialog.h b/panel/lxqtpanelpluginconfigdialog.h index 23025b6..c869d75 100644 --- a/panel/lxqtpanelpluginconfigdialog.h +++ b/panel/lxqtpanelpluginconfigdialog.h @@ -31,8 +31,8 @@ #include #include -#include #include "lxqtpanelglobals.h" +#include "pluginsettings.h" class QComboBox; @@ -40,10 +40,11 @@ class LXQT_PANEL_API LXQtPanelPluginConfigDialog : public QDialog { Q_OBJECT public: - explicit LXQtPanelPluginConfigDialog(QSettings &settings, QWidget *parent = 0); + explicit LXQtPanelPluginConfigDialog(PluginSettings &settings, QWidget *parent = nullptr); + explicit LXQtPanelPluginConfigDialog(PluginSettings *settings, QWidget *parent = nullptr) : LXQtPanelPluginConfigDialog(*settings, parent) {} virtual ~LXQtPanelPluginConfigDialog(); - QSettings& settings() const; + PluginSettings &settings() const; protected slots: /* @@ -56,8 +57,7 @@ protected: void setComboboxIndexByData(QComboBox *comboBox, const QVariant &data, int defaultIndex = 0) const; private: - QSettings &mSettings; - LXQt::SettingsCache mOldSettings; + PluginSettings &mSettings; }; diff --git a/panel/man/lxqt-panel.1 b/panel/man/lxqt-panel.1 index c3eb14a..3b7435e 100644 --- a/panel/man/lxqt-panel.1 +++ b/panel/man/lxqt-panel.1 @@ -1,57 +1,35 @@ -.TH lxqt-panel "1" "September 2012" "LXQt\ 0.5.0" "LXQt\ Module" +.TH lxqt-panel "1" "2015-11-05" "LXQt 0.10.0" "LXQt Desktop Panel Module" .SH NAME -lxqt-panel \- Panel of \fBLXQt\fR: the faster and lighter QT Desktop Environment +lxqt-panel \- Desktop panel for \fBLXQt\fR: The Lightweight Qt Desktop Environment .SH SYNOPSIS .B lxqt-panel .br .SH DESCRIPTION -This module adds a panel to the desktop. -.P -.P -The \fBLXQt modules\fR are desktop independent tools, -and operate as daemons for the local user for desktop specific operations. -.P -\fBLXQt\fR is an advanced, easy-to-use, and fast desktop environment based on Qt -technologies, ships several core desktop components, all of which are optional: -.P - * Panel \fI(this)\fR - * Desktop - * Application launcher - * Settings center - * Session handler - * Polkit handler - * SSH password access - * Display manager handler -.P -These components perform similar actions to those available in other desktop -environments, and their name is self-descriptive. They are usually not launched -by hand but automatically, when choosing a \fBLXQt\fR session in the Display -Manager. +This module adds a panel, with optional plugins, to the desktop. .SH BEHAVIOR -The module can be run standard alone, and also autostarted at logon. Show a bar panel -by default in bottom of desktop. +The panel can be run independently of \fBLXQt\fR, autostarted at logon, and have +multiple instances. A horizontal bottom panel shows by default on the desktop, +but the alignment, size, autohide, transparency (requires compositor), and other +attributes are user configurable. .P -The panel works with plugins, each component are a plugin, like the menu or the volume icon. +The panel is comprised of plugins which provide a visual widget; like the menu, +clock, or volume. They can be added or removed in the panel Widget settings. .P -Several plugins are loaded by default, the desktop menu and windows workspaces can also managed here. +Several plugins are loaded by default; the desktop menu and windows workspaces +are also managed here. .SH CONFIGURATIONS -By right clickin over there show config setting options for each plugins and also panel itsefl. -.SH AUTOSTART -The module only are showed on \fBLXQt\fR desktop environment, but you can create an autostart action -for you prefered desktop environment. +Right-click over any plugin to reach the panel Configure settings option, or +that of each respective plugin. .SH "REPORTING BUGS" Report bugs to https://github.com/LXDE/LXQt/issues .SH "SEE ALSO" -\fBLXQt\fR it has been tailored for users who value simplicity, speed, and -an intuitive interface, also intended for less powerful machines. See: -.\" any module must refers to session app, for more info on start it +.\" any module must refer to the session application, for module overview and initiation +\fBstartlxqt.1\fR LXQt session initialization and launch script (e.g. in \fB.xinitrc\fR) .P -\fBlxqt-session.1\fR LXQt for manage LXQt complete environment +\fBlxqt-session.1\fR LXQt \fIoverview\fR and complete session environment .P -\fBstart-lxqt.1\fR LXQt display management independient starup. +\fBlxqt-config-session.1\fR LXQt default and autostart applications settings, +plus environment settings .P -\fBlxqt-config.1\fR LXQt config center application for performing settings +\fBlxqt-config.1\fR LXQt settings Configuration Center interface .P -.SH AUTHOR -This manual page was created by \fBPICCORO Lenz McKAY\fR \fI\fR -for \fBLXQt\fR project and VENENUX GNU/Linux but can be used by others. diff --git a/panel/panelpluginsmodel.cpp b/panel/panelpluginsmodel.cpp index 51eb14c..62db4c0 100644 --- a/panel/panelpluginsmodel.cpp +++ b/panel/panelpluginsmodel.cpp @@ -155,7 +155,6 @@ void PanelPluginsModel::removePlugin(pluginslist_t::iterator plugin) beginRemoveRows(QModelIndex(), row, row); mPlugins.erase(plugin); endRemoveRows(); - mActive = mPlugins.isEmpty() ? QModelIndex() : createIndex(mPlugins.size() > row ? row : row - 1, 0); emit pluginRemoved(p); // p can be nullptr mPanel->settings()->setValue(mNamesKey, pluginNames()); if (nullptr != p) @@ -174,17 +173,41 @@ void PanelPluginsModel::removePlugin() void PanelPluginsModel::movePlugin(Plugin * plugin, QString const & nameAfter) { //merge list of plugins (try to preserve original position) + //subtract mPlugin.begin() from the found Plugins to get the model index const int from = std::find_if(mPlugins.begin(), mPlugins.end(), [plugin] (pluginslist_t::const_reference obj) { return plugin == obj.second.data(); }) - mPlugins.begin(); const int to = std::find_if(mPlugins.begin(), mPlugins.end(), [nameAfter] (pluginslist_t::const_reference obj) { return nameAfter == obj.first; }) - mPlugins.begin(); + /* 'from' is the current position of the Plugin to be moved ("moved Plugin"), + * 'to' is the position of the Plugin behind the one that is being moved + * ("behind Plugin"). There are several cases to distinguish: + * 1. from > to: The moved Plugin had been behind the behind Plugin before + * and is moved to the front of the behind Plugin. The moved Plugin will + * be inserted at position 'to', the behind Plugin and all the following + * Plugins (until the former position of the moved Plugin) will increment + * their indexes. + * 2. from < to: The moved Plugin had already been located before the + * behind Plugin. In this case, the move operation only reorders the + * Plugins before the behind Plugin. All the Plugins between the moved + * Plugin and the behind Plugin will decrement their index. Therefore, the + * movedPlugin will not be at position 'to' but rather on position 'to-1'. + * 3. from == to: This does not make sense, we catch this case to prevent + * errors. + * 4. from == to-1: The moved Plugin has not moved because it had already + * been located in front of the behind Plugin. + */ const int to_plugins = from < to ? to - 1 : to; if (from != to && from != to_plugins) { + /* Although the new position of the moved Plugin will be 'to-1' if + * from < to, we insert 'to' here. This is exactly how it is done + * in the Qt documentation. + */ beginMoveRows(QModelIndex(), from, from, QModelIndex(), to); + // For the QList::move method, use the right position mPlugins.move(from, to_plugins); endMoveRows(); emit pluginMoved(plugin); @@ -210,6 +233,25 @@ void PanelPluginsModel::loadPlugins(QStringList const & desktopDirs) qWarning() << QString("Section \"%1\" not found in %2.").arg(name, mPanel->settings()->fileName()); continue; } +#ifdef WITH_SCREENSAVER_FALLBACK + if (QStringLiteral("screensaver") == type) + { + //plugin-screensaver was dropped + //convert settings to plugin-quicklaunch + const QString & lock_desktop = QStringLiteral(LXQT_LOCK_DESKTOP); + qWarning().noquote() << "Found deprecated plugin of type 'screensaver', migrating to 'quicklaunch' with '" << lock_desktop << '\''; + type = QStringLiteral("quicklaunch"); + LXQt::Settings * settings = mPanel->settings(); + settings->beginGroup(name); + settings->remove(QString{});//remove all existing keys + settings->setValue(QStringLiteral("type"), type); + settings->beginWriteArray(QStringLiteral("apps"), 1); + settings->setArrayIndex(0); + settings->setValue(QStringLiteral("desktop"), lock_desktop); + settings->endArray(); + settings->endGroup(); + } +#endif LXQt::PluginInfoList list = LXQt::PluginInfo::search(desktopDirs, "LXQtPanel/Plugin", QString("%1.desktop").arg(type)); if( !list.count()) @@ -228,7 +270,7 @@ void PanelPluginsModel::loadPlugins(QStringList const & desktopDirs) QPointer PanelPluginsModel::loadPlugin(LXQt::PluginInfo const & desktopFile, QString const & settingsGroup) { - std::unique_ptr plugin(new Plugin(desktopFile, mPanel->settings()->fileName(), settingsGroup, mPanel)); + std::unique_ptr plugin(new Plugin(desktopFile, mPanel->settings(), settingsGroup, mPanel)); if (plugin->isLoaded()) { connect(mPanel, &LXQtPanel::realigned, plugin.get(), &Plugin::realign); @@ -261,23 +303,18 @@ QString PanelPluginsModel::findNewPluginSettingsGroup(const QString &pluginType) } } -void PanelPluginsModel::onActivatedIndex(QModelIndex const & index) -{ - mActive = index; -} - -bool PanelPluginsModel::isActiveIndexValid() const +bool PanelPluginsModel::isIndexValid(QModelIndex const & index) const { - return mActive.isValid() && QModelIndex() == mActive.parent() - && 0 == mActive.column() && mPlugins.size() > mActive.row(); + return index.isValid() && QModelIndex() == index.parent() + && 0 == index.column() && mPlugins.size() > index.row(); } -void PanelPluginsModel::onMovePluginUp() +void PanelPluginsModel::onMovePluginUp(QModelIndex const & index) { - if (!isActiveIndexValid()) + if (!isIndexValid(index)) return; - const int row = mActive.row(); + const int row = index.row(); if (0 >= row) return; //can't move up @@ -295,12 +332,12 @@ void PanelPluginsModel::onMovePluginUp() mPanel->settings()->setValue(mNamesKey, pluginNames()); } -void PanelPluginsModel::onMovePluginDown() +void PanelPluginsModel::onMovePluginDown(QModelIndex const & index) { - if (!isActiveIndexValid()) + if (!isIndexValid(index)) return; - const int row = mActive.row(); + const int row = index.row(); if (mPlugins.size() <= row + 1) return; //can't move down @@ -318,22 +355,22 @@ void PanelPluginsModel::onMovePluginDown() mPanel->settings()->setValue(mNamesKey, pluginNames()); } -void PanelPluginsModel::onConfigurePlugin() +void PanelPluginsModel::onConfigurePlugin(QModelIndex const & index) { - if (!isActiveIndexValid()) + if (!isIndexValid(index)) return; - Plugin * const plugin = mPlugins[mActive.row()].second.data(); + Plugin * const plugin = mPlugins[index.row()].second.data(); if (nullptr != plugin && (ILXQtPanelPlugin::HaveConfigDialog & plugin->iPlugin()->flags())) plugin->showConfigureDialog(); } -void PanelPluginsModel::onRemovePlugin() +void PanelPluginsModel::onRemovePlugin(QModelIndex const & index) { - if (!isActiveIndexValid()) + if (!isIndexValid(index)) return; - auto plugin = mPlugins.begin() + mActive.row(); + auto plugin = mPlugins.begin() + index.row(); if (plugin->second.isNull()) removePlugin(std::move(plugin)); else diff --git a/panel/panelpluginsmodel.h b/panel/panelpluginsmodel.h index 7a090c8..b8e78ea 100644 --- a/panel/panelpluginsmodel.h +++ b/panel/panelpluginsmodel.h @@ -38,6 +38,13 @@ namespace LXQt class LXQtPanel; class Plugin; +/*! + * \brief The PanelPluginsModel class implements the Model part of the + * Qt Model/View architecture for the Plugins, i.e. it is the interface + * to access the Plugin data associated with this Panel. The + * PanelPluginsModel takes care for read-access as well as changes + * like adding, removing or moving Plugins. + */ class PanelPluginsModel : public QAbstractListModel { Q_OBJECT @@ -48,55 +55,285 @@ public: QObject * parent = nullptr); ~PanelPluginsModel(); + /*! + * \brief rowCount returns the number of Plugins. It overrides/implements + * QAbstractListModel::rowCount(). + * \param parent The parameter parent should be omitted to get the number of + * Plugins. If it is given and a valid model index, the method returns 0 + * because PanelPluginsModel is not a hierarchical model. + */ virtual int rowCount(const QModelIndex & parent = QModelIndex()) const override; + /*! + * \brief data returns the Plugin data as defined by the Model/View + * architecture. The Plugins itself can be accessed with the role + * Qt::UserRole but they can also be accessed by the methods plugins(), + * pluginByName() and pluginByID(). This method overrides/implements + * QAbstractListModel::data(). + * \param index should be a valid model index to determine the Plugin + * that should be read. + * \param role The Qt::ItemDataRole to determine what kind of data should + * be read, can be one of the following: + * 1. Qt::DisplayRole to return a string that describes the Plugin. + * 2. Qt::DecorationRole to return an icon for the Plugin. + * 3. Qt::UserRole to return a Plugin*. + * \return The data as determined by index and role. + */ virtual QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override; + /*! + * \brief flags returns the item flags for the given model index. For + * all Plugins, this is the same: + * Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemNeverHasChildren. + */ virtual Qt::ItemFlags flags(const QModelIndex & index) const override; + /*! + * \brief pluginNames returns a list of names for all the Plugins in + * this panel. The names are not the human-readable names but the names + * that are used to identify the Plugins, e.g. in the config files. These + * names can be used in the method pluginByName() to get a corresponding + * Plugin. + * + * The plugin names are normally chosen to be equal to the + * filename of the corresponding *.desktop-file. If multiple instances + * of a single plugin-type are created, their names are created by + * appending increasing numbers, e.g. 'mainmenu' and 'mainmenu2'. + * + * \sa findNewPluginSettingsGroup + */ QStringList pluginNames() const; + /*! + * \brief plugins returns a list of Plugins in this panel. + */ QList plugins() const; + /*! + * \brief pluginByName gets a Plugin by its name. + * \param name is the name of the plugin as it is used in the + * config files. A list of names can be retrieved with the + * method pluginNames(). + * \return the Plugin with the given name. + * + * \sa pluginNames + */ Plugin *pluginByName(QString name) const; + /*! + * \brief pluginByID gets a Plugin by its ID. + * \param id is the *.desktop-file-ID of the plugin which in turn is the + * QFileInfo::completeBaseName() of the desktop-file, e.g. "mainmenu". + * + * As these IDs are chosen according to the corresponding + * desktop-file, these IDs are not unique. If multiple + * instances of a single plugin-type are created, they share + * the same ID in this sense. Then, this method will return + * the first plugin of the given type. + * \return the first Plugin found with the given ID. + */ Plugin const *pluginByID(QString id) const; /*! - * \param plugin plugin that has been moved - * \param nameAfter name of plugin that is right after moved plugin + * \brief movePlugin moves a Plugin in the underlying data. + * + * This method is useful whenever a Plugin should be moved several + * positions at once. If a Plugin should only be moved one position + * up or down, consider using onMovePluginUp or onMovePluginDown. + * + * \param plugin Plugin that has been moved + * \param nameAfter name of the Plugin that should be located after + * the moved Plugin after the move operation, so this parameter + * determines the new position of plugin. If an empty string is + * given, plugin will be moved to the end of the list. + * + * \note This method is especially useful for drag and drop reordering. + * Therefore, it will be called whenever the user moves a Plugin in + * the panel ("Move Plugin" in the context menu of the panel). + * + * \sa onMovePluginUp, onMovePluginDown */ void movePlugin(Plugin * plugin, QString const & nameAfter); signals: + /*! + * \brief pluginAdded gets emitted whenever a new Plugin is added + * to the panel. + */ void pluginAdded(Plugin * plugin); + /*! + * \brief pluginRemoved gets emitted whenever a Plugin is removed. + * \param plugin The Plugin that was removed. This could be a nullptr. + */ void pluginRemoved(Plugin * plugin); + /*! + * \brief pluginMoved gets emitted whenever a Plugin is moved. + * + * This signal gets emitted in movePlugin, onMovePluginUp and + * onMovePluginDown. + * + * \param plugin The Plugin that was moved. This could be a nullptr. + * + * \sa pluginMovedUp + */ void pluginMoved(Plugin * plugin); //plugin can be nullptr in case of move of not loaded plugin /*! - * Emiting only move-up for simplification of using (and problematic layout/list move) + * \brief pluginMovedUp gets emitted whenever a Plugin is moved a single + * slot upwards. + * + * When a Plugin is moved a single slot upwards, this signal will be + * emitted additionally to the pluginMoved signal so that two signals + * get emitted. + * + * If a Plugin is moved downwards, that Plugin will swap places with + * the following Plugin so that the result equals moving the following + * Plugin a single slot upwards. So, whenever two adjacent Plugins + * swap their places, this signal gets emitted with the Plugin that + * moves upwards as parameter. + * + * For simplified use, only this signal is implemented. There is no + * similar pluginMovedDown-signal. + * + * This signal gets emitted from onMovePluginUp and onMovePluginDown. + * + * \param plugin The Plugin that moved a slot upwards. + * + * \sa pluginMoved */ void pluginMovedUp(Plugin * plugin); public slots: + /*! + * \brief addPlugin Adds a new Plugin to the model. + * + * \param desktopFile The PluginInfo (which inherits XdgDesktopFile) + * for the Plugin that should be added. + * + * \note AddPluginDialog::pluginSelected is connected to this slot. + */ void addPlugin(const LXQt::PluginInfo &desktopFile); + /*! + * \brief removePlugin Removes a Plugin from the model. + * + * The Plugin to remove is identified by the QObject::sender() method + * when the slot is called. Therefore, this method should only be called + * by connecting a signal that a Plugin will emit to this slot. + * Otherwise, nothing will happen. + * + * \note Plugin::remove is connected to this slot as soon as the + * Plugin is loaded in the PanelPluginsModel. + */ void removePlugin(); // slots for configuration dialog - void onActivatedIndex(QModelIndex const & index); - void onMovePluginUp(); - void onMovePluginDown(); - void onConfigurePlugin(); - void onRemovePlugin(); + /*! + * \brief onMovePluginUp Moves the Plugin corresponding to the given + * model index a slot upwards. + * + * \note The 'Up' button in the configuration widget is connected to this + * slot. + */ + void onMovePluginUp(QModelIndex const & index); + /*! + * \brief onMovePluginDown Moves the Plugin corresponding to the given + * model index a slot downwards. + * + * \note The 'Down' button in the configuration widget is connected to this + * slot. + */ + void onMovePluginDown(QModelIndex const & index); + /*! + * \brief onConfigurePlugin If the Plugin corresponding to the given + * model index has a config dialog (checked via the flag + * ILXQtPanelPlugin::HaveConfigDialog), this method shows + * it by calling plugin->showConfigureDialog(). + * + * \note The 'Configure' button in the configuration widget is connected to + * this slot. + */ + void onConfigurePlugin(QModelIndex const & index); + /*! + * \brief onRemovePlugin Removes the Plugin corresponding to the given + * model index from the Model. + * + * \note The 'Remove' button in the configuration widget is connected to + * this slot. + */ + void onRemovePlugin(QModelIndex const & index); private: + /*! + * \brief pluginslist_t is the data type used for mPlugins which stores + * all the Plugins. + * + * \sa mPlugins + */ typedef QList > > pluginslist_t; private: + /*! + * \brief loadPlugins Loads all the Plugins. + * \param desktopDirs These directories are scanned for corresponding + * .desktop-files which are necessary to load the plugins. + */ void loadPlugins(QStringList const & desktopDirs); + /*! + * \brief loadPlugin Loads a Plugin and connects signals and slots. + * \param desktopFile The desktop file that specifies how to load the + * Plugin. + * \param settingsGroup QString which specifies the settings group. This + * will only be redirected to the Plugin so that it knows how to read + * its settings. + * \return A QPointer to the Plugin that was loaded. + */ QPointer loadPlugin(LXQt::PluginInfo const & desktopFile, QString const & settingsGroup); + /*! + * \brief findNewPluginSettingsGroup Creates a name for a new Plugin + * that is not yet present in the settings file. Whenever multiple + * instances of a single Plugin type are created, they have to be + * distinguished by this name. + * + * The first Plugin of a given type will be named like the type, e.g. + * "mainmenu". If a name is already present, this method tries to + * find a free name by appending increasing integers (starting with 2), + * e.g. "mainmenu2". If, for example, only "mainmenu2" exists because + * "mainmenu" was deleted, "mainmenu" would be returned. So, the method + * always finds the first suitable name that is not yet present in the + * settings file. + * \param pluginType Type of the Plugin. + * \return The created name for the Plugin. + */ QString findNewPluginSettingsGroup(const QString &pluginType) const; - bool isActiveIndexValid() const; + /*! + * \brief isIndexValid Checks if a given model index is valid for the + * underlying data (column 0, row lower than number of Plugins and + * so on). + */ + bool isIndexValid(QModelIndex const & index) const; + /*! + * \brief removePlugin Removes a given Plugin from the model. + */ void removePlugin(pluginslist_t::iterator plugin); + /*! + * \brief mNamesKey The key to the settings-entry that stores the + * names of the Plugins in a panel. Set upon creation, passed as + * a parameter by the panel. + */ const QString mNamesKey; + /*! + * \brief mPlugins Stores all the Plugins. + * + * mPlugins is a QList of elements while each element corresponds to a + * single Plugin. Each element is a QPair of a QString and a QPointer + * while the QPointer points to a Plugin. + * + * To access the elements, you can use indexing or an iterator on the + * list. For each element p, p.first is the name of the Plugin as it + * is used in the configuration files, p.second.data() is the Plugin. + * + * \sa pluginslist_t + */ pluginslist_t mPlugins; + /*! + * \brief mPanel Stores a reference to the LXQtPanel. + */ LXQtPanel * mPanel; - QPersistentModelIndex mActive; }; Q_DECLARE_METATYPE(Plugin const *) diff --git a/panel/plugin.cpp b/panel/plugin.cpp index a4acc78..b606b7c 100644 --- a/panel/plugin.cpp +++ b/panel/plugin.cpp @@ -28,6 +28,7 @@ #include "plugin.h" #include "ilxqtpanelplugin.h" +#include "pluginsettings_p.h" #include "lxqtpanel.h" #include #include @@ -41,7 +42,7 @@ #include #include #include -#include +#include #include #include @@ -75,22 +76,16 @@ QColor Plugin::mMoveMarkerColor= QColor(255, 0, 0, 255); /************************************************ ************************************************/ -Plugin::Plugin(const LXQt::PluginInfo &desktopFile, const QString &settingsFile, const QString &settingsGroup, LXQtPanel *panel) : +Plugin::Plugin(const LXQt::PluginInfo &desktopFile, LXQt::Settings *settings, const QString &settingsGroup, LXQtPanel *panel) : QFrame(panel), mDesktopFile(desktopFile), mPluginLoader(0), mPlugin(0), mPluginWidget(0), mAlignment(AlignLeft), - mSettingsGroup(settingsGroup), mPanel(panel) { - - mSettings = new LXQt::Settings(settingsFile, QSettings::IniFormat, this); - connect(mSettings, SIGNAL(settingsChanged()), this, SLOT(settingsChanged())); - mSettings->beginGroup(settingsGroup); - - mSettingsHash = calcSettingsHash(); + mSettings = PluginSettingsFactory::create(settings, settingsGroup); setWindowTitle(desktopFile.name()); mName = desktopFile.name(); @@ -109,7 +104,7 @@ Plugin::Plugin(const LXQt::PluginInfo &desktopFile, const QString &settingsFile, else { // this plugin is a dynamically loadable module QString baseName = QString("lib%1.so").arg(desktopFile.id()); - foreach(QString dirName, dirs) + foreach(const QString &dirName, dirs) { QFileInfo fi(QDir(dirName), baseName); if (fi.exists()) @@ -155,12 +150,15 @@ Plugin::Plugin(const LXQt::PluginInfo &desktopFile, const QString &settingsFile, { QGridLayout* layout = new QGridLayout(this); layout->setSpacing(0); - layout->setMargin(0); layout->setContentsMargins(0, 0, 0, 0); setLayout(layout); layout->addWidget(mPluginWidget, 0, 0); } + // delay the connection to settingsChanged to avoid conflicts + // while the plugin is still being initialized + connect(mSettings, &PluginSettings::settingsChanged, + this, &Plugin::settingsChanged); saveSettings(); } @@ -171,11 +169,8 @@ Plugin::Plugin(const LXQt::PluginInfo &desktopFile, const QString &settingsFile, Plugin::~Plugin() { delete mPlugin; - if (mPluginLoader) - { - mPluginLoader->unload(); - delete mPluginLoader; - } + delete mPluginLoader; + delete mSettings; } void Plugin::setAlignment(Plugin::Alignment alignment) @@ -306,33 +301,12 @@ bool Plugin::loadModule(const QString &libraryName) } -/************************************************ - - ************************************************/ -QByteArray Plugin::calcSettingsHash() -{ - QCryptographicHash hash(QCryptographicHash::Md5); - QStringList keys = mSettings->allKeys(); - foreach (const QString &key, keys) - { - hash.addData(key.toUtf8()); - hash.addData(mSettings->value(key).toByteArray()); - } - return hash.result(); -} - - /************************************************ ************************************************/ void Plugin::settingsChanged() { - QByteArray hash = calcSettingsHash(); - if (mSettingsHash != hash) - { - mSettingsHash = hash; - mPlugin->settingsChanged(); - } + mPlugin->settingsChanged(); } @@ -463,23 +437,21 @@ void Plugin::realign() ************************************************/ void Plugin::showConfigureDialog() { - // store a pointer to each plugin using the plugins' names - static QHash > refs; - QDialog *dialog = refs[name()].data(); + if (!mConfigDialog) + mConfigDialog = mPlugin->configureDialog(); - if (!dialog) - { - dialog = mPlugin->configureDialog(); - refs[name()] = dialog; - connect(this, SIGNAL(destroyed()), dialog, SLOT(close())); - } - - if (!dialog) + if (!mConfigDialog) return; - dialog->show(); - dialog->raise(); - dialog->activateWindow(); + connect(this, &Plugin::destroyed, mConfigDialog.data(), &QWidget::close); + mPanel->willShowWindow(mConfigDialog); + mConfigDialog->show(); + mConfigDialog->raise(); + mConfigDialog->activateWindow(); + + WId wid = mConfigDialog->windowHandle()->winId(); + KWindowSystem::activateWindow(wid); + KWindowSystem::setOnDesktop(wid, KWindowSystem::currentDesktop()); } diff --git a/panel/plugin.h b/panel/plugin.h index e4de2d8..1e0986c 100644 --- a/panel/plugin.h +++ b/panel/plugin.h @@ -31,9 +31,12 @@ #include #include +#include #include +#include #include "ilxqtpanel.h" #include "lxqtpanelglobals.h" +#include "pluginsettings.h" class QPluginLoader; class QSettings; @@ -55,14 +58,14 @@ public: }; - explicit Plugin(const LXQt::PluginInfo &desktopFile, const QString &settingsFile, const QString &settingsGroup, LXQtPanel *panel); + explicit Plugin(const LXQt::PluginInfo &desktopFile, LXQt::Settings *settings, const QString &settingsGroup, LXQtPanel *panel); ~Plugin(); bool isLoaded() const { return mPlugin != 0; } Alignment alignment() const { return mAlignment; } void setAlignment(Alignment alignment); - QString settingsGroup() const { return mSettingsGroup; } + QString settingsGroup() const { return mSettings->group(); } void saveSettings(); @@ -103,17 +106,15 @@ private: ILXQtPanelPluginLibrary const * findStaticPlugin(const QString &libraryName); const LXQt::PluginInfo mDesktopFile; - QByteArray calcSettingsHash(); QPluginLoader *mPluginLoader; ILXQtPanelPlugin *mPlugin; QWidget *mPluginWidget; Alignment mAlignment; - QSettings *mSettings; - QString mSettingsGroup; + PluginSettings *mSettings; LXQtPanel *mPanel; - QByteArray mSettingsHash; static QColor mMoveMarkerColor; QString mName; + QPointer mConfigDialog; //!< plugin's config dialog (if any) private slots: void settingsChanged(); diff --git a/panel/pluginsettings.cpp b/panel/pluginsettings.cpp new file mode 100644 index 0000000..a047eb9 --- /dev/null +++ b/panel/pluginsettings.cpp @@ -0,0 +1,216 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * http://lxqt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Paulo Lieuthier + * + * 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 "pluginsettings.h" +#include "pluginsettings_p.h" +#include + +class PluginSettingsPrivate +{ +public: + PluginSettingsPrivate(LXQt::Settings* settings, const QString &group) + : mSettings(settings) + , mOldSettings(settings) + , mGroup(group) + { + } + + QString prefix() const; + inline QString fullPrefix() const + { + return mGroup + "/" + prefix(); + } + + LXQt::Settings *mSettings; + LXQt::SettingsCache mOldSettings; + QString mGroup; + QStringList mSubGroups; +}; + +QString PluginSettingsPrivate::prefix() const +{ + if (!mSubGroups.empty()) + return mSubGroups.join('/'); + return QString(); +} + +PluginSettings::PluginSettings(LXQt::Settings* settings, const QString &group, QObject *parent) + : QObject(parent) + , d_ptr(new PluginSettingsPrivate{settings, group}) +{ + Q_D(PluginSettings); + connect(d->mSettings, &LXQt::Settings::settingsChangedFromExternal, this, &PluginSettings::settingsChanged); +} + +QString PluginSettings::group() const +{ + Q_D(const PluginSettings); + return d->mGroup; +} + +PluginSettings::~PluginSettings() +{ +} + +QVariant PluginSettings::value(const QString &key, const QVariant &defaultValue) const +{ + Q_D(const PluginSettings); + d->mSettings->beginGroup(d->fullPrefix()); + QVariant value = d->mSettings->value(key, defaultValue); + d->mSettings->endGroup(); + return value; +} + +void PluginSettings::setValue(const QString &key, const QVariant &value) +{ + Q_D(PluginSettings); + d->mSettings->beginGroup(d->fullPrefix()); + d->mSettings->setValue(key, value); + d->mSettings->endGroup(); + emit settingsChanged(); +} + +void PluginSettings::remove(const QString &key) +{ + Q_D(PluginSettings); + d->mSettings->beginGroup(d->fullPrefix()); + d->mSettings->remove(key); + d->mSettings->endGroup(); + emit settingsChanged(); +} + +bool PluginSettings::contains(const QString &key) const +{ + Q_D(const PluginSettings); + d->mSettings->beginGroup(d->fullPrefix()); + bool ret = d->mSettings->contains(key); + d->mSettings->endGroup(); + return ret; +} + +QList > PluginSettings::readArray(const QString& prefix) +{ + Q_D(PluginSettings); + d->mSettings->beginGroup(d->fullPrefix()); + QList > array; + int size = d->mSettings->beginReadArray(prefix); + for (int i = 0; i < size; ++i) + { + d->mSettings->setArrayIndex(i); + QMap hash; + for (const QString &key : d->mSettings->childKeys()) + hash[key] = d->mSettings->value(key); + array << hash; + } + d->mSettings->endArray(); + d->mSettings->endGroup(); + return array; +} + +void PluginSettings::setArray(const QString &prefix, const QList > &hashList) +{ + Q_D(PluginSettings); + d->mSettings->beginGroup(d->fullPrefix()); + d->mSettings->beginWriteArray(prefix); + int size = hashList.size(); + for (int i = 0; i < size; ++i) + { + d->mSettings->setArrayIndex(i); + QMapIterator it(hashList.at(i)); + while (it.hasNext()) + { + it.next(); + d->mSettings->setValue(it.key(), it.value()); + } + } + d->mSettings->endArray(); + d->mSettings->endGroup(); + emit settingsChanged(); +} + +void PluginSettings::clear() +{ + Q_D(PluginSettings); + d->mSettings->beginGroup(d->mGroup); + d->mSettings->clear(); + d->mSettings->endGroup(); + emit settingsChanged(); +} + +void PluginSettings::sync() +{ + Q_D(PluginSettings); + d->mSettings->beginGroup(d->mGroup); + d->mSettings->sync(); + d->mOldSettings.loadFromSettings(); + d->mSettings->endGroup(); + emit settingsChanged(); +} + +QStringList PluginSettings::allKeys() const +{ + Q_D(const PluginSettings); + d->mSettings->beginGroup(d->fullPrefix()); + QStringList keys = d->mSettings->allKeys(); + d->mSettings->endGroup(); + return keys; +} + +QStringList PluginSettings::childGroups() const +{ + Q_D(const PluginSettings); + d->mSettings->beginGroup(d->fullPrefix()); + QStringList groups = d->mSettings->childGroups(); + d->mSettings->endGroup(); + return groups; +} + +void PluginSettings::beginGroup(const QString &subGroup) +{ + Q_D(PluginSettings); + d->mSubGroups.append(subGroup); +} + +void PluginSettings::endGroup() +{ + Q_D(PluginSettings); + if (!d->mSubGroups.empty()) + d->mSubGroups.removeLast(); +} + +void PluginSettings::loadFromCache() +{ + Q_D(PluginSettings); + d->mSettings->beginGroup(d->mGroup); + d->mOldSettings.loadToSettings(); + d->mSettings->endGroup(); +} + +PluginSettings* PluginSettingsFactory::create(LXQt::Settings *settings, const QString &group, QObject *parent/* = nullptr*/) +{ + return new PluginSettings{settings, group, parent}; +} diff --git a/panel/pluginsettings.h b/panel/pluginsettings.h new file mode 100644 index 0000000..828c1c0 --- /dev/null +++ b/panel/pluginsettings.h @@ -0,0 +1,96 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * http://lxqt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Paulo Lieuthier + * + * 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 PLUGIN_SETTINGS_H +#define PLUGIN_SETTINGS_H + +#include +#include +#include +#include "lxqtpanelglobals.h" + +namespace LXQt +{ + class Settings; +} +class PluginSettingsFactory; +class PluginSettingsPrivate; + +/*! + * \brief + * Settings for particular plugin. This object/class can be used similarly as \sa QSettings. + * Object cannot be constructed direcly (it is the panel's responsibility to construct it for each plugin). + * + * + * \note + * We are relying here on so called "back linking" (calling a function defined in executable + * back from an external library)... + */ +class LXQT_PANEL_API PluginSettings : public QObject +{ + Q_OBJECT + + //for instantiation + friend class PluginSettingsFactory; + +public: + ~PluginSettings(); + + QString group() const; + + QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const; + void setValue(const QString &key, const QVariant &value); + + void remove(const QString &key); + bool contains(const QString &key) const; + + QList > readArray(const QString &prefix); + void setArray(const QString &prefix, const QList > &hashList); + + void clear(); + void sync(); + + QStringList allKeys() const; + QStringList childGroups() const; + + void beginGroup(const QString &subGroup); + void endGroup(); + + void loadFromCache(); + +signals: + void settingsChanged(); + +private: + explicit PluginSettings(LXQt::Settings *settings, const QString &group, QObject *parent = nullptr); + +private: + QScopedPointer d_ptr; + Q_DECLARE_PRIVATE(PluginSettings) +}; + +#endif diff --git a/panel/pluginsettings_p.h b/panel/pluginsettings_p.h new file mode 100644 index 0000000..82e9e45 --- /dev/null +++ b/panel/pluginsettings_p.h @@ -0,0 +1,39 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * http://lxqt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Paulo Lieuthier + * + * 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 PLUGIN_SETTINGS_P_H +#define PLUGIN_SETTINGS_P_H + +#include "pluginsettings.h" + +class PluginSettingsFactory +{ +public: + static PluginSettings * create(LXQt::Settings *settings, const QString &group, QObject *parent = nullptr); +}; + +#endif //PLUGIN_SETTINGS_P_H diff --git a/panel/resources/panel.conf b/panel/resources/panel.conf index 59653f4..e833229 100644 --- a/panel/resources/panel.conf +++ b/panel/resources/panel.conf @@ -13,11 +13,7 @@ type=desktopswitch [quicklaunch] type=quicklaunch -apps/size=5 -apps/1/desktop=firefox.desktop -apps/2/desktop=chromium-browser.desktop -apps/3/desktop=pcmanfm-qt.desktop -apps/5/desktop=lxqt-config.desktop +alignment=Left [taskbar] type=taskbar diff --git a/panel/translations/.gitignore b/panel/translations/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/panel/translations/lxqt-panel.ts b/panel/translations/lxqt-panel.ts deleted file mode 100644 index fd5c8bb..0000000 --- a/panel/translations/lxqt-panel.ts +++ /dev/null @@ -1,346 +0,0 @@ - - - - - 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: - - - - - Rows count: - - - - - Alignment && position - - - - - Position: - - - - - Alignment: - - - - - - Left - - - - - - - Center - - - - - - Right - - - - - Auto-hide - - - - - 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 Panel - - - - - Remove Panel - - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - - main - - - Use alternate configuration file. - - - - - Configuration file - - - - diff --git a/panel/translations/lxqt-panel_ar.ts b/panel/translations/lxqt-panel_ar.ts deleted file mode 100644 index f9370e3..0000000 --- a/panel/translations/lxqt-panel_ar.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - تهيئة اللوحة - - - Panel size - حجم اللوحة - - - Size: - الحجم: - - - px - نقطة ضوئيَّة - - - Use automatic sizing - استخدم التَّحجيم اﻵلي - - - Panel length && position - طول وموقع اللوحة - - - Left - اليسار - - - Center - الوسظ - - - Right - اليمين - - - % - % - - - Alignment: - المحاذاة: - - - Length: - الطُّول: - - - Position: - الموقع: - - - 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 - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - تهيئة اللوحة - - - - Size - - - - - Size: - الحجم: - - - - - px - - - - - Icon size: - - - - - Length: - الطُّول: - - - - <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> - - - - - % - % - - - - px - نقطة ضوئيَّة - - - - Rows count: - - - - - Alignment && position - - - - - - Left - اليسار - - - - - - Center - الوسظ - - - - - Right - اليمين - - - - Alignment: - المحاذاة: - - - - Position: - الموقع: - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - قائمة التطبيقات - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Configure panel... - تهيئة اللوحة... - - - Add plugins ... - ضمُّ إضافات... - - - - LXQtPanelPlugin - - Configure - تهيئة - - - Move - تحريك - - - Remove - إزالة - - - - LXQtPanelPrivate - - Configure panel - تهيئة اللوحة - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_cs.ts b/panel/translations/lxqt-panel_cs.ts deleted file mode 100644 index 68a7ddc..0000000 --- a/panel/translations/lxqt-panel_cs.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Nastavit panel - - - Panel size - Velikost panelu - - - Size: - Velikost: - - - px - px - - - Use automatic sizing - Použít automatickou velikost - - - Panel length && position - Délka &a poloha panelu - - - Left - Zarovnat vlevo - - - Center - Zarovnat na střed - - - Right - Zarovnat vpravo - - - % - % - - - Alignment: - Zarovnání: - - - Length: - Délka: - - - Position: - 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 - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - Nastavit panel - - - - Size - - - - - Size: - Velikost: - - - - - px - - - - - Icon size: - - - - - Length: - Délka: - - - - <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> - - - - - % - % - - - - px - px - - - - Rows count: - - - - - Alignment && position - - - - - - Left - Zarovnat vlevo - - - - - - Center - Zarovnat na střed - - - - - Right - Zarovnat vpravo - - - - Alignment: - Zarovnání: - - - - Position: - Poloha: - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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 - - - - Top - - - - - Bottom - - - - - - Pick color - - - - - Images (*.png *.gif *.jpg) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Panel - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Configure panel... - Nastavit panel... - - - Add plugins ... - Přidat přídavné moduly... - - - - LXQtPanelPlugin - - Configure - Nastavit - - - Move - Přesunout - - - Remove - Odstranit - - - - LXQtPanelPrivate - - Configure panel - Nastavit panel - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_cs_CZ.ts b/panel/translations/lxqt-panel_cs_CZ.ts deleted file mode 100644 index 794d5d2..0000000 --- a/panel/translations/lxqt-panel_cs_CZ.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Nastavit panel - - - Panel size - Velikost panelu - - - Size: - Velikost: - - - px - px - - - Use automatic sizing - Použít automatickou velikost - - - Panel length && position - Délka &a poloha panelu - - - Left - Zarovnat vlevo - - - Center - Zarovnat na střed - - - Right - Zarovnat vpravo - - - % - % - - - Alignment: - Zarovnání: - - - Length: - Délka: - - - Position: - 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 - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - Nastavit panel - - - - Size - - - - - Size: - Velikost: - - - - - px - - - - - Icon size: - - - - - Length: - Délka: - - - - <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> - - - - - % - % - - - - px - px - - - - Rows count: - - - - - Alignment && position - - - - - - Left - Zarovnat vlevo - - - - - - Center - Zarovnat na střed - - - - - Right - Zarovnat vpravo - - - - Alignment: - Zarovnání: - - - - Position: - Poloha: - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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 - - - - Top - - - - - Bottom - - - - - - Pick color - - - - - Images (*.png *.gif *.jpg) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Panel - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Configure panel... - Nastavit panel... - - - Add plugins ... - Přidat přídavné moduly... - - - - LXQtPanelPlugin - - Configure - Nastavit - - - Move - Přesunout - - - Remove - Odstranit - - - - LXQtPanelPrivate - - Configure panel - Nastavit panel - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_da.ts b/panel/translations/lxqt-panel_da.ts deleted file mode 100644 index f78ebf8..0000000 --- a/panel/translations/lxqt-panel_da.ts +++ /dev/null @@ -1,377 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Indstil panel - - - Panel size - Panelstørrelse - - - Size: - Størrelse: - - - px - pkt - - - Use theme size - Brug tema-størrelse - - - Panel lenght & position - Panel længde & position - - - Length: - Længde: - - - Alignment: - Placering: - - - Left - Venstre - - - Center - Midtpå - - - Right - Højre - - - % - % - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - Indstil panel - - - - Size - - - - - Size: - Størrelse: - - - - - px - - - - - Icon size: - - - - - Length: - Længde: - - - - <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> - - - - - % - % - - - - px - pkt - - - - Rows count: - - - - - Alignment && position - - - - - - Left - Venstre - - - - - - Center - Midtpå - - - - - Right - Højre - - - - Alignment: - Placering: - - - - Position: - - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - Top of desktop - Toppen af skrivebordet - - - - Left of desktop - Venstre side af skrivebordet - - - - Right of desktop - Højre side af skrivebordet - - - - Bottom of desktop - Bunden af skrivebordet - - - - Top of desktop %1 - Toppen af skrivebord %1 - - - - Left of desktop %1 - Venstre side af skrivebord %1 - - - - Right of desktop %1 - Højre side af skrivebord %1 - - - - Bottom of desktop %1 - Bunden af skrivebord %1 - - - - Top - - - - - Bottom - - - - - - Pick color - - - - - Images (*.png *.gif *.jpg) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Panel - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - - LXQtPanelPluginPrivate - - Configure - Indstil - - - Move - Flyt - - - Delete - Slet - - - - LXQtPanelPrivate - - Panel - Panel - - - Plugins - Udvidelsesmoduler - - - Add plugins ... - Tilføj udvidelsesmoduler ... - - - Move plugin - Flyt udvidelsesmodul - - - Configure plugin - Indstil udvidelsesmodul - - - Delete plugin - Fjern udvidelsesmodul - - - Show this panel at - Vis dette panel ved - - - Configure panel - Indstil panel - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - - PositionAction - - Top of desktop - Toppen af skrivebordet - - - Bottom of desktop - Bunden af skrivebordet - - - Left of desktop - Venstre side af skrivebordet - - - Right of desktop - Højre side af skrivebordet - - - Top of desktop %1 - Toppen af skrivebord %1 - - - Bottom of desktop %1 - Bunden af skrivebord %1 - - - Left of desktop %1 - Venstre side af skrivebord %1 - - - Right of desktop %1 - Højre side af skrivebord %1 - - - diff --git a/panel/translations/lxqt-panel_da_DK.ts b/panel/translations/lxqt-panel_da_DK.ts deleted file mode 100644 index add9570..0000000 --- a/panel/translations/lxqt-panel_da_DK.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Panelindstillinger - - - Panel size - Panelstørrelse - - - Size: - Størrelse: - - - px - px - - - Use automatic sizing - Brug automatisk dimensionering - - - Panel length && position - Panel længde && position - - - Left - Venstrestillet - - - Center - Midterstillet - - - Right - Højrestillet - - - % - % - - - Alignment: - Tilpasning: - - - Length: - Længde: - - - Position: - Position: - - - Top of desktop - Toppen af skrivebordet - - - Left of desktop - Venstre side af skrivebordet - - - Right of desktop - Højre side af skrivebordet - - - Bottom of desktop - Bunden af skrivebordet - - - Top of desktop %1 - Toppen af skrivebord %1 - - - Left of desktop %1 - Venstre side af skrivebord %1 - - - Right of desktop %1 - Højre side af skrivebord %1 - - - Bottom of desktop %1 - Bunden af skrivebord %1 - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - - - - - Size - - - - - Size: - Størrelse: - - - - - px - - - - - Icon size: - - - - - Length: - Længde: - - - - <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> - - - - - % - % - - - - px - px - - - - Rows count: - - - - - Alignment && position - - - - - - Left - Venstrestillet - - - - - - Center - Midterstillet - - - - - Right - Højrestillet - - - - Alignment: - Tilpasning: - - - - Position: - Position: - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - Top of desktop - Toppen af skrivebordet - - - - Left of desktop - Venstre side af skrivebordet - - - - Right of desktop - Højre side af skrivebordet - - - - Bottom of desktop - Bunden af skrivebordet - - - - Top of desktop %1 - Toppen af skrivebord %1 - - - - Left of desktop %1 - Venstre side af skrivebord %1 - - - - Right of desktop %1 - Højre side af skrivebord %1 - - - - Bottom of desktop %1 - Bunden af skrivebord %1 - - - - Top - - - - - Bottom - - - - - - Pick color - - - - - Images (*.png *.gif *.jpg) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Hej Verden - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Configure panel... - Indstil panelet... - - - Add plugins ... - Tilføj plugins ... - - - - LXQtPanelPlugin - - Configure - Indstil - - - Move - Flyt - - - Remove - Fjern - - - - LXQtPanelPrivate - - Configure panel - Indstil panel - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_de.ts b/panel/translations/lxqt-panel_de.ts deleted file mode 100644 index db3147b..0000000 --- a/panel/translations/lxqt-panel_de.ts +++ /dev/null @@ -1,346 +0,0 @@ - - - - - AddPluginDialog - - - Add Plugins - Plugins hinzufügen - - - - Search: - Suchen: - - - - Add Widget - Widget hinzufügen - - - - Close - Schließen - - - - (only one instance can run at a time) - (es kann nur eine Instanz gleichzeitig ausgeführt werden) - - - - ConfigPanelDialog - - - Configure Panel - Leiste konfigurieren - - - - Panel - Leiste - - - - Widgets - Widgets - - - - ConfigPanelWidget - - - Configure panel - Leiste konfigurieren - - - - Size - Größe - - - - <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>Negative Pixelwerte setzen die Leistenlänge auf den Wert verfügbare Größe minus angegebener Größe.</p><p/><p><i>Z.B. bei "Länge" gesetzt auf -100px und einer Bildschirmgröße von 1000px hat die Leiste eine Größe von 900 px.</i></p> - - - - Size: - Größe: - - - - Length: - Länge: - - - - % - % - - - - px - px - - - - - px - px - - - - Icon size: - Symbolgröße: - - - - Rows count: - Zeilenzahl: - - - - Alignment && position - Ausrichtung und Position - - - - Position: - Position: - - - - Alignment: - Ausrichtung: - - - - - Left - Links - - - - - - Center - Mitte - - - - - Right - Rechts - - - - Auto-hide - Automatisch ausblenden - - - - Custom styling - Eigener Stil - - - - Font color: - Schriftfarbe: - - - - Background color: - Hintergrundfarbe: - - - - Background opacity: - Deckkraft: - - - - <small>Compositing is required for panel transparency.</small> - <small>Für Transparenzeffekt wird Compositing benötigt.</small> - - - - Background image: - Hintergrundbild: - - - - Top of desktop - Oben auf der Arbeitsfläche - - - - Left of desktop - Links auf der Arbeitsfläche - - - - Right of desktop - Rechts auf der Arbeitsfläche - - - - Bottom of desktop - Unten auf der Arbeitsfläche - - - - Top of desktop %1 - Oben auf Arbeitsfläche %1 - - - - Left of desktop %1 - Links auf Arbeitsfläche %1 - - - - Right of desktop %1 - Rechts auf Arbeitsfläche %1 - - - - Bottom of desktop %1 - Unten auf 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) - - - - ConfigPluginsWidget - - - Configure Plugins - Plugins konfigurieren - - - - Note: changes made in this page cannot be reset. - Hinweis: Hier gemachte Änderungen können nicht rückgängig gemacht werden. - - - - Move up - Nach oben schieben - - - - - - - - ... - ... - - - - Move down - Nach unten schieben - - - - Add - Hinzufügen - - - - Remove - Entfernen - - - - Configure - Konfigurieren - - - - LXQtPanel - - - - Panel - Leiste - - - - Configure Panel - Leiste konfigurieren - - - - Manage Widgets - Widgets verwalten - - - - Add Panel - Leiste hinzufügen - - - - Remove Panel - Leiste entfernen - - - - Plugin - - - Configure "%1" - "%1" konfigurieren - - - - Move "%1" - "%1" verschieben - - - - Remove "%1" - "%1" entfernen - - - - main - - - Use alternate configuration file. - Alternative Konfigurationsdatei verwenden. - - - - Configuration file - Konfigurationsdatei - - - diff --git a/panel/translations/lxqt-panel_el.ts b/panel/translations/lxqt-panel_el.ts deleted file mode 100644 index 9e2bf17..0000000 --- a/panel/translations/lxqt-panel_el.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Διαμόρφωση πίνακα - - - Panel size - Μέγεθος πίνακα - - - Size: - Μέγεθος: - - - px - px - - - Use automatic sizing - Χρήση αυτόματου μεγέθους - - - Panel length && position - Μήκος && θέση πίνακα - - - Left - Αριστερά - - - Center - Κέντρο - - - Right - Δεξιά - - - % - % - - - Alignment: - Στοίχιση: - - - Length: - Μήκος: - - - Position: - Θέση: - - - 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 - - - - - Configure Panel - Διαμόρφωση του πίνακα - - - - ConfigPanelWidget - - - Configure panel - Διαμόρφωση του πίνακα - - - - Size - Μέγεθος - - - - Size: - Μέγεθος: - - - - - px - εικ - - - - Icon size: - Μέγεθος εικονιδίων: - - - - Length: - Μήκος: - - - - <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> - - - - % - % - - - - px - εικ - - - - Rows count: - Πλήθος γραμμών: - - - - Alignment && position - Στοίχιση && θέση - - - - - Left - Αριστερά - - - - - - Center - Κέντρο - - - - - Right - Δεξιά - - - - Alignment: - Στοίχιση: - - - - Position: - Θέση: - - - - Auto-hide - Αυτόματη απόκρυψη - - - - Styling - Ύφος - - - - Custom font color: - Προσαρμοσμένο χρώμα γραμματοσειράς: - - - - Custom background image: - Προσαρμοσμένη εικόνα ταπετσαρίας: - - - - Custom background color: - Προσαρμοσμένο χρώμα ταπετσαρίας: - - - - Opacity - Αδιαφάνεια - - - - 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) - - - - LXQtPanel - - - Add Panel Widgets - Προσθήκη γραφικών συστατικών στον πίνακα - - - - - Panel - Πίνακας - - - - Configure Panel... - Διαμόρφωση του πίνακα... - - - - Add Panel Widgets... - Προσθήκη γραφικών συστατικών στον πίνακα... - - - - Add Panel - Προσθήκη πίνακα - - - - Remove Panel - Αφαίρεση πίνακα - - - Configure panel... - Διαμόρφωση του πίνακα... - - - Add plugins ... - Προσθήκη πρόσθετων... - - - - LXQtPanelPlugin - - Configure - Διαμόρφωση - - - Move - Μετακίνηση - - - Remove - Αφαίρεση - - - - LXQtPanelPrivate - - Configure panel - Διαμόρφωση του πίνακα - - - - Plugin - - - Configure "%1" - Διαμόρφωση του «%1» - - - - Move "%1" - Μετακίνηση του «%1» - - - - Remove "%1" - Αφαίρεση του «%1» - - - diff --git a/panel/translations/lxqt-panel_eo.ts b/panel/translations/lxqt-panel_eo.ts deleted file mode 100644 index 8826d82..0000000 --- a/panel/translations/lxqt-panel_eo.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Agordi panelon - - - Panel size - Grando de panelo - - - Size: - Grando: - - - px - rastr - - - Use automatic sizing - Uzi aŭtomatan grandigon - - - Panel length && position - Longo kaj loko de panelo - - - Left - Maldekstre - - - Center - Centre - - - Right - Dekstre - - - % - % - - - Alignment: - Loko: - - - Length: - Longo: - - - Position: - 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 - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - Agordi panelon - - - - Size - - - - - Size: - Grando: - - - - - px - - - - - Icon size: - - - - - Length: - Longo: - - - - <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> - - - - - % - % - - - - px - rastr - - - - Rows count: - - - - - Alignment && position - - - - - - Left - Maldekstre - - - - - - Center - Centre - - - - - Right - Dekstre - - - - Alignment: - Loko: - - - - Position: - Loko: - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Agordoj de muso por LXQto - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Configure panel... - Agordi panelon... - - - Add plugins ... - Aldoni kromprogramojn... - - - - LXQtPanelPlugin - - Configure - Agordi - - - Move - Movi - - - Remove - Forigi - - - - LXQtPanelPrivate - - Configure panel - Agordi panelon - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_es.ts b/panel/translations/lxqt-panel_es.ts deleted file mode 100644 index 10d9dc5..0000000 --- a/panel/translations/lxqt-panel_es.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Configurar panel - - - Panel size - Tamaño del panel - - - Size: - Tamaño: - - - px - px - - - Use automatic sizing - Usar tamaño automático - - - Panel length && position - Largo y posición del panel - - - Left - Izquierda - - - Center - Centro - - - Right - Derecha - - - % - % - - - Alignment: - Alineación: - - - Length: - Largo: - - - Position: - Posición: - - - Top of desktop - Extremo superior del escritorio - - - Left of desktop - Extremo izquierdo del escritorio - - - Right of desktop - Extremo derecho del escritorio - - - Bottom of desktop - Extremo inferior del escritorio - - - Top of desktop %1 - Extremo superior del escritorio %1 - - - Left of desktop %1 - Extremo izquierdo del escritorio %1 - - - Right of desktop %1 - Extremo derecho del escritorio %1 - - - Bottom of desktop %1 - Extremo inferior del escritorio %1 - - - - - Configure Panel - Configurar Panel - - - - ConfigPanelWidget - - - Configure panel - Configurar panel - - - - Size - Tamaño - - - - Size: - Tamaño: - - - - - px - px - - - - Icon size: - Tamaño de ícono: - - - - Length: - Largo: - - - - <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>E.j. "Largo" configurado a -100px, el tamaño de la pantalla es 1000px, entonces el largo real del panel será de 900 px.</i></p> - - - - % - % - - - - px - px - - - - Rows count: - Cantidad de filas: - - - - Alignment && position - Alineación y posición - - - - - Left - Izquierda - - - - - - Center - Centro - - - - - Right - Derecha - - - - Alignment: - Alineación: - - - - Position: - Posición: - - - - Auto-hide - Ocultar automáticamente - - - - Styling - Estilo - - - - Custom font color: - Color de fuente personalizado: - - - - Custom background image: - Imagen de fondo personalizada: - - - - Custom background color: - Color de fondo personalizado: - - - - Opacity - Opacidad - - - - Top of desktop - Extremo superior del escritorio - - - - Left of desktop - Extremo izquierdo del escritorio - - - - Right of desktop - Extremo derecho del escritorio - - - - Bottom of desktop - Extremo inferior del escritorio - - - - Top of desktop %1 - Extremo superior del escritorio %1 - - - - Left of desktop %1 - Extremo izquierdo del escritorio %1 - - - - Right of desktop %1 - Extremo derecho del escritorio %1 - - - - Bottom of desktop %1 - Extremo inferior del escritorio %1 - - - - Top - Arriba - - - - Bottom - Abajo - - - - - Pick color - Seleccione un color - - - - Images (*.png *.gif *.jpg) - Imágenes (*.png *.gif *.jpg) - - - - LXQtPanel - - - Add Panel Widgets - Agregar Widgets al Panel - - - - - Panel - Panel - - - - Configure Panel... - Configurar Panel... - - - - Add Panel Widgets... - Agregar Widgets al Panel... - - - - Add Panel - Agregar Panel - - - - Remove Panel - Eliminar Panel - - - Configure panel... - Configuración del panel... - - - Add plugins ... - Añadir extensiones... - - - - LXQtPanelPlugin - - Configure - Configurar - - - Move - Mover - - - Remove - Quitar - - - - LXQtPanelPrivate - - Configure panel - Configurar panel - - - - Plugin - - - Configure "%1" - Configurar "%1" - - - - Move "%1" - Mover "%1" - - - - Remove "%1" - Eliminar "%1" - - - diff --git a/panel/translations/lxqt-panel_es_UY.ts b/panel/translations/lxqt-panel_es_UY.ts deleted file mode 100644 index ec3c2ce..0000000 --- a/panel/translations/lxqt-panel_es_UY.ts +++ /dev/null @@ -1,310 +0,0 @@ - - - - - ConfigPanelDialog - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - - - - - Size - - - - - Size: - - - - - - px - - - - - Icon size: - - - - - Length: - - - - - <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> - - - - - % - - - - - px - - - - - Rows count: - - - - - Alignment && position - - - - - - Left - - - - - - - Center - - - - - - Right - - - - - Alignment: - - - - - Position: - - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - Top of desktop - Arriba del escritorio - - - - Left of desktop - A la izquierda del escritorio - - - - Right of desktop - A la derecha del escritorio - - - - Bottom of desktop - Abajo del escritorio - - - - Top of desktop %1 - Arriba del escritorio %1 - - - - Left of desktop %1 - A la izquierda del escritorio %1 - - - - Right of desktop %1 - A la derecha del excritorio %1 - - - - Bottom of desktop %1 - Abajo del escritorio %1 - - - - Top - - - - - Bottom - - - - - - Pick color - - - - - Images (*.png *.gif *.jpg) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Panel - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - - LXQtPanelPrivate - - Panel - Panel - - - Plugins - Complementos - - - Add plugins ... - Agregar complemento ... - - - Move plugin - Mover complemento - - - Configure plugin - Configurar complemento - - - Delete plugin - Borrar complemento - - - Show this panel at - Mostrar este complemento - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - - PositionAction - - Top of desktop - Arriba del escritorio - - - Bottom of desktop - Abajo del escritorio - - - Left of desktop - A la izquierda del escritorio - - - Right of desktop - A la derecha del escritorio - - - Top of desktop %1 - Arriba del escritorio %1 - - - Bottom of desktop %1 - Abajo del escritorio %1 - - - Left of desktop %1 - A la izquierda del escritorio %1 - - - Right of desktop %1 - A la derecha del excritorio %1 - - - diff --git a/panel/translations/lxqt-panel_es_VE.ts b/panel/translations/lxqt-panel_es_VE.ts deleted file mode 100644 index 5ae0a76..0000000 --- a/panel/translations/lxqt-panel_es_VE.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Configurar panel - - - Panel size - Tamaño de panel - - - Size: - Tamaño: - - - px - px - - - Use automatic sizing - Tamaño automatico - - - Panel length && position - Tamaño & posicion el panel - - - Left - Izquierda - - - Center - Centrado - - - Right - Derecha - - - % - % - - - Alignment: - Alineacion: - - - Length: - Largo: - - - Position: - 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 - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - Configurar panel - - - - Size - - - - - Size: - Tamaño: - - - - - px - - - - - Icon size: - - - - - Length: - Largo: - - - - <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> - - - - - % - % - - - - px - px - - - - Rows count: - - - - - Alignment && position - - - - - - Left - Izquierda - - - - - - Center - Centrado - - - - - Right - Derecha - - - - Alignment: - Alineacion: - - - - Position: - Posicion: - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Panel - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Configure panel... - Configura el panel - - - Add plugins ... - Agregar plugins - - - - LXQtPanelPlugin - - Configure - Configurar - - - Move - Mover - - - Remove - Remover - - - - LXQtPanelPrivate - - Configure panel - Configurar panel - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_eu.ts b/panel/translations/lxqt-panel_eu.ts deleted file mode 100644 index c4e62aa..0000000 --- a/panel/translations/lxqt-panel_eu.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Konfiguratu panela - - - Panel size - Panelaren tamaina - - - Size: - Tamaina: - - - px - px - - - Use automatic sizing - Erabili tamaina automatikoa - - - Panel length && position - Panelaren luzera eta posizioa - - - Left - Ezkerra - - - Center - Erdia - - - Right - Eskuina - - - % - % - - - Alignment: - Lerrokatzea: - - - Length: - Luzera: - - - Position: - 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 - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - Konfiguratu panela - - - - Size - - - - - Size: - Tamaina: - - - - - px - - - - - Icon size: - - - - - Length: - Luzera: - - - - <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> - - - - - % - % - - - - px - px - - - - Rows count: - - - - - Alignment && position - - - - - - Left - Ezkerra - - - - - - Center - Erdia - - - - - Right - Eskuina - - - - Alignment: - Lerrokatzea: - - - - Position: - Posizioa: - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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 - - - - - Bottom - - - - - - Pick color - - - - - Images (*.png *.gif *.jpg) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Panela - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Configure panel... - Konfiguratu panela... - - - Add plugins ... - Gehitu pluginak... - - - - LXQtPanelPlugin - - Configure - Konfiguratu - - - Move - Mugitu - - - Remove - Kendu - - - - LXQtPanelPrivate - - Configure panel - Konfiguratu panela - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_fi.ts b/panel/translations/lxqt-panel_fi.ts deleted file mode 100644 index 1d767ef..0000000 --- a/panel/translations/lxqt-panel_fi.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Muokkaa paneelia - - - Panel size - Paneelin koko - - - Size: - Koko: - - - px - pikseliä - - - Use automatic sizing - Käytä automaattista kokoa - - - Panel length && position - Paneelin pituus && sijainti - - - Left - Vasemmalla - - - Center - Keskellä - - - Right - Oikealla - - - % - % - - - Alignment: - Kohdistus: - - - Length: - Leveys: - - - Position: - Sijainti: - - - Top of desktop - Työpöydän yläosassa - - - Left of desktop - Työpöydän vasemmassa laidassa - - - Right of desktop - Työpöydän oikeassa laidassa - - - Bottom of desktop - Työpöydän alaosassa - - - Top of desktop %1 - Työpöydän %1 yläosassa - - - Left of desktop %1 - Työpöydän %1 vasemmassa laidassa - - - Right of desktop %1 - Työpöydän %1 oikeassa laidassa - - - Bottom of desktop %1 - Työpöydän %1 alaosassa - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - Muokkaa paneelia - - - - Size - - - - - Size: - Koko: - - - - - px - - - - - Icon size: - - - - - Length: - Leveys: - - - - <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> - - - - - % - % - - - - px - pikseliä - - - - Rows count: - - - - - Alignment && position - - - - - - Left - Vasemmalla - - - - - - Center - Keskellä - - - - - Right - Oikealla - - - - Alignment: - Kohdistus: - - - - Position: - Sijainti: - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - Top of desktop - Työpöydän yläosassa - - - - Left of desktop - Työpöydän vasemmassa laidassa - - - - Right of desktop - Työpöydän oikeassa laidassa - - - - Bottom of desktop - Työpöydän alaosassa - - - - Top of desktop %1 - Työpöydän %1 yläosassa - - - - Left of desktop %1 - Työpöydän %1 vasemmassa laidassa - - - - Right of desktop %1 - Työpöydän %1 oikeassa laidassa - - - - Bottom of desktop %1 - Työpöydän %1 alaosassa - - - - Top - - - - - Bottom - - - - - - Pick color - - - - - Images (*.png *.gif *.jpg) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Paneeli - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Configure panel... - Muokkaa paneelia... - - - Add plugins ... - Lisää liitännäisiä... - - - - LXQtPanelPlugin - - Configure - Muokkaa - - - Move - Siirrä - - - Remove - Poista - - - - LXQtPanelPrivate - - Configure panel - Muokkaa paneelia - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_fr_FR.ts b/panel/translations/lxqt-panel_fr_FR.ts deleted file mode 100644 index 28416e5..0000000 --- a/panel/translations/lxqt-panel_fr_FR.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Configurer le tableau de bord - - - Panel size - Taille du tableau de bord - - - Size: - Taille : - - - px - px - - - Use automatic sizing - Utiliser le dimensionnement automatique - - - Panel length && position - Longueur et position du tableau de bord - - - Left - Gauche - - - Center - Centre - - - Right - Droite - - - % - % - - - Alignment: - Alignement : - - - Length: - Longueur : - - - Position: - 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 - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - Configurer le tableau de bord - - - - Size - - - - - Size: - Taille : - - - - - px - - - - - Icon size: - - - - - Length: - Longueur : - - - - <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> - - - - - % - % - - - - px - px - - - - Rows count: - - - - - Alignment && position - - - - - - Left - Gauche - - - - - - Center - Centre - - - - - Right - Droite - - - - Alignment: - Alignement : - - - - Position: - Position : - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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 - - - - - Bottom - - - - - - Pick color - - - - - Images (*.png *.gif *.jpg) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Bloc-notes - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Configure panel... - Configurer le tableau de bord... - - - Add plugins ... - Ajouter des extensions... - - - - LXQtPanelPlugin - - Configure - Configurer - - - Move - Déplacer - - - Remove - Supprimer - - - - LXQtPanelPrivate - - Configure panel - Configurer le tableau de bord - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_hu.ts b/panel/translations/lxqt-panel_hu.ts deleted file mode 100644 index 73e1cee..0000000 --- a/panel/translations/lxqt-panel_hu.ts +++ /dev/null @@ -1,280 +0,0 @@ - - - - - ConfigPanelDialog - - Top of desktop - Az asztal tetejére - - - Left of desktop - Az asztal bal oldalára - - - Right of desktop - Az asztal jobb oldalára - - - Bottom of desktop - Az asztal aljára - - - Top of desktop %1 - A(z) %1. asztal tetejére - - - Left of desktop %1 - A(z) %1. asztal bal oldalára - - - Right of desktop %1 - A(z) %1. asztal jobb oldalára - - - Bottom of desktop %1 - A(z) %1. asztal aljára - - - - - Configure Panel - Panelbeállítás - - - - ConfigPanelWidget - - - Configure panel - Panelbeállítás - - - - Size - Méret - - - - Size: - Méret: - - - - - px - pixel - - - - Icon size: - Ikonméret: - - - - Length: - Hossz: - - - - <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>Negatív pixel érték azt jelöli, hogy mennyivel rövidebb a panel a képernyőnél.</p><p/><p><i>Például -100px érték esetén az 1000px széles képernyőnél a panel hossza 900px.</i></p - - - - % - - - - - px - pixel - - - - Rows count: - Sorszámláló: - - - - Alignment && position - Igazítás && helyzet - - - - - Left - Balra - - - - - - Center - Középre - - - - - Right - Jobbra - - - - Alignment: - Igazítás: - - - - Position: - Pozíció: - - - - Auto-hide - Automata elrejtés - - - - Styling - Hangolás - - - - Custom font color: - Egyéni betűszín: - - - - Custom background image: - Egyéni háttérkép: - - - - Custom background color: - Egyéni háttérszín: - - - - Opacity - Áttetszőség - - - - Top of desktop - Az asztal tetejére - - - - Left of desktop - Az asztal bal oldalára - - - - Right of desktop - Az asztal jobb oldalára - - - - Bottom of desktop - Az asztal aljára - - - - Top of desktop %1 - A(z) %1. asztal tetejére - - - - Left of desktop %1 - A(z) %1. asztal bal oldalára - - - - Right of desktop %1 - A(z) %1. asztal jobb oldalára - - - - Bottom of desktop %1 - A(z) %1. asztal aljára - - - - Top - Fenn - - - - Bottom - Lenn - - - - - Pick color - Színválasztás - - - - Images (*.png *.gif *.jpg) - Képek (*.png *.gif *.jpg) - - - - LXQtPanel - - - Add Panel Widgets - Panelelem hozzáadás - - - - - Panel - Panel - - - - Configure Panel... - Panel beállítása… - - - - Add Panel Widgets... - Panelelem hozzáadás... - - - - Add Panel - Panel hozzáadás - - - - Remove Panel - Panel törlése - - - Add plugins ... - Bővítmények hozzáadása… - - - - Plugin - - - Configure "%1" - "%1" beállítása - - - - Move "%1" - "%1" mozgatása - - - - Remove "%1" - "%1" törlése - - - diff --git a/panel/translations/lxqt-panel_hu_HU.ts b/panel/translations/lxqt-panel_hu_HU.ts deleted file mode 100644 index ace76b2..0000000 --- a/panel/translations/lxqt-panel_hu_HU.ts +++ /dev/null @@ -1,280 +0,0 @@ - - - - - ConfigPanelDialog - - Top of desktop - Az asztal tetejére - - - Left of desktop - Az asztal bal oldalára - - - Right of desktop - Az asztal jobb oldalára - - - Bottom of desktop - Az asztal aljára - - - Top of desktop %1 - A(z) %1. asztal tetejére - - - Left of desktop %1 - A(z) %1. asztal bal oldalára - - - Right of desktop %1 - A(z) %1. asztal jobb oldalára - - - Bottom of desktop %1 - A(z) %1. asztal aljára - - - - - Configure Panel - Panelbeállítás - - - - ConfigPanelWidget - - - Configure panel - Panelbeállítás - - - - Size - Méret - - - - Size: - Méret: - - - - - px - pixel - - - - Icon size: - Ikonméret: - - - - Length: - Hossz: - - - - <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>Negatív pixel érték azt jelöli, hogy mennyivel rövidebb a panel a képernyőnél.</p><p/><p><i>Például -100px érték esetén az 1000px széles képernyőnél a panel hossza 900px.</i></p - - - - % - - - - - px - pixel - - - - Rows count: - Sorszámláló: - - - - Alignment && position - Igazítás && helyzet - - - - - Left - Balra - - - - - - Center - Középre - - - - - Right - Jobbra - - - - Alignment: - Igazítás: - - - - Position: - Pozíció: - - - - Auto-hide - Automata elrejtés - - - - Styling - Hangolás - - - - Custom font color: - Egyéni betűszín: - - - - Custom background image: - Egyéni háttérkép: - - - - Custom background color: - Egyéni háttérszín: - - - - Opacity - Áttetszőség - - - - Top of desktop - Az asztal tetejére - - - - Left of desktop - Az asztal bal oldalára - - - - Right of desktop - Az asztal jobb oldalára - - - - Bottom of desktop - Az asztal aljára - - - - Top of desktop %1 - A(z) %1. asztal tetejére - - - - Left of desktop %1 - A(z) %1. asztal bal oldalára - - - - Right of desktop %1 - A(z) %1. asztal jobb oldalára - - - - Bottom of desktop %1 - A(z) %1. asztal aljára - - - - Top - Fenn - - - - Bottom - Lenn - - - - - Pick color - Színválasztás - - - - Images (*.png *.gif *.jpg) - Képek (*.png *.gif *.jpg) - - - - LXQtPanel - - - Add Panel Widgets - Panelelem hozzáadás - - - - - Panel - Panel - - - - Configure Panel... - Panel beállítása… - - - - Add Panel Widgets... - Panelelem hozzáadás... - - - - Add Panel - Panel hozzáadás - - - - Remove Panel - Panel törlése - - - Add plugins ... - Bővítmények hozzáadása… - - - - Plugin - - - Configure "%1" - "%1" beállítása - - - - Move "%1" - "%1" mozgatása - - - - Remove "%1" - "%1" törlése - - - diff --git a/panel/translations/lxqt-panel_ia.ts b/panel/translations/lxqt-panel_ia.ts deleted file mode 100644 index 30a1f16..0000000 --- a/panel/translations/lxqt-panel_ia.ts +++ /dev/null @@ -1,252 +0,0 @@ - - - - - ConfigPanelDialog - - Panel size - Dimension de pannello - - - Size: - Dimension - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - - - - - Size - - - - - Size: - Dimension - - - - - px - - - - - Icon size: - - - - - Length: - - - - - <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> - - - - - % - - - - - px - - - - - Rows count: - - - - - Alignment && position - - - - - - Left - - - - - - - Center - - - - - - Right - - - - - Alignment: - - - - - Position: - - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_id_ID.ts b/panel/translations/lxqt-panel_id_ID.ts deleted file mode 100644 index 455133e..0000000 --- a/panel/translations/lxqt-panel_id_ID.ts +++ /dev/null @@ -1,244 +0,0 @@ - - - - - ConfigPanelDialog - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - - - - - Size - - - - - Size: - - - - - - px - - - - - Icon size: - - - - - Length: - - - - - <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> - - - - - % - - - - - px - - - - - Rows count: - - - - - Alignment && position - - - - - - Left - - - - - - - Center - - - - - - Right - - - - - Alignment: - - - - - Position: - - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Hell World - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_it.ts b/panel/translations/lxqt-panel_it.ts deleted file mode 100644 index 775d2bb..0000000 --- a/panel/translations/lxqt-panel_it.ts +++ /dev/null @@ -1,359 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Configura il pannello - - - Panel size - Dimensione pannello - - - Size: - Dimensione: - - - px - px - - - Use automatic sizing - Usa dimensionamento automatico - - - Panel length && position - Lunghezza e posizione del pannello - - - Left - Sinistra - - - Center - Centro - - - Right - Destra - - - % - % - - - Alignment: - Allineamento: - - - Length: - Lunghezza: - - - Position: - 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 - - - - - Configure Panel - Configura panello - - - - ConfigPanelWidget - - - Configure panel - Configura panello - - - - Size - Dimensione - - - - Size: - Dimensione: - - - - - px - - - - - Icon size: - Dimensione icone: - - - - Length: - Lunghezza: - - - - <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>Valori negativi impongano una lunghezza del panello di quel numero di pixel meno dello spazio disponibile. </p><p/><p><i>Esempio: -100px e schermo di 1280px = 1180px</i></p> - - - - % - % - - - - px - px - - - - Rows count: - Numero righe: - - - - Alignment && position - Allineamento e posizione - - - - - Left - Sinistra - - - - - - Center - Centro - - - - - Right - Destra - - - - Alignment: - Allineamento: - - - - Position: - Posizione: - - - - Auto-hide - Nascondi automaticamente - - - - Styling - Aspetto - - - - Custom font color: - Colore carattere personalizzato: - - - - Custom background image: - Immagine sfondo: - - - - Custom background color: - Colore sfondo personalizzato: - - - - Opacity - Trasparenza - - - - 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 colore - - - - Images (*.png *.gif *.jpg) - Immagini (*.png *.gif *.jpg) - - - - LXQtPanel - - - Add Panel Widgets - Aggiungi elementi - - - - - Panel - Panello - - - - Configure Panel... - Configura panello... - - - - Add Panel Widgets... - Call them "plugins" better? - Aggiungi elementi... - - - - Add Panel - Aggiungi panello - - - - Remove Panel - Rimuovi panello - - - Configure panel... - Configura pannello... - - - Add plugins ... - Aggiungi plugin... - - - - LXQtPanelPlugin - - Configure - Configura - - - Move - Sposta - - - Remove - Rimuovi - - - - LXQtPanelPrivate - - Configure panel - Configura pannello - - - - Plugin - - - Configure "%1" - Configura "%1" - - - - Move "%1" - Sposta "%1" - - - - Remove "%1" - Rimuovi "%1" - - - diff --git a/panel/translations/lxqt-panel_ja.ts b/panel/translations/lxqt-panel_ja.ts deleted file mode 100644 index 58d4210..0000000 --- a/panel/translations/lxqt-panel_ja.ts +++ /dev/null @@ -1,244 +0,0 @@ - - - - - ConfigPanelDialog - - - - Configure Panel - パネルを設定 - - - - ConfigPanelWidget - - - Configure panel - パネルを設定 - - - - Size - 大きさ - - - - Size: - 幅: - - - - - px - ピクセル - - - - Icon size: - アイコンの大きさ: - - - - Length: - 長さ: - - - - <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> - - - - % - % - - - - px - ピクセル - - - - Rows count: - 列の数 - - - - Alignment && position - 位置寄せと場所 - - - - - Left - 左寄せ - - - - - - Center - 中央 - - - - - Right - 右寄せ - - - - Alignment: - 位置寄せ: - - - - Position: - 場所: - - - - Auto-hide - - - - - Styling - 見た目 - - - - Custom font color: - フォントの色を変更: - - - - Custom background image: - 背景画像を指定 - - - - Custom background color: - 背景の色を変更: - - - - Opacity - 透明度 - - - - 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) - - - - LXQtPanel - - - Add Panel Widgets - パネルウィジェットを追加 - - - - - Panel - パネル - - - - Configure Panel... - パネルの設定 - - - - Add Panel Widgets... - ウィジェットを追加 - - - - Add Panel - パネルを追加 - - - - Remove Panel - パネルを削除 - - - - Plugin - - - Configure "%1" - "%1" を設定 - - - - Move "%1" - "%1" を移動 - - - - Remove "%1" - "%1" を削除 - - - diff --git a/panel/translations/lxqt-panel_ko.ts b/panel/translations/lxqt-panel_ko.ts deleted file mode 100644 index a42277e..0000000 --- a/panel/translations/lxqt-panel_ko.ts +++ /dev/null @@ -1,244 +0,0 @@ - - - - - ConfigPanelDialog - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - - - - - Size - - - - - Size: - - - - - - px - - - - - Icon size: - - - - - Length: - - - - - <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> - - - - - % - - - - - px - - - - - Rows count: - - - - - Alignment && position - - - - - - Left - - - - - - - Center - - - - - - Right - - - - - Alignment: - - - - - Position: - - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_lt.ts b/panel/translations/lxqt-panel_lt.ts deleted file mode 100644 index 78da977..0000000 --- a/panel/translations/lxqt-panel_lt.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Skydelio konfigūravimas - - - Panel size - Skydelio dydis - - - Size: - Dydis: - - - px - taškeliai - - - Use automatic sizing - Automatinis dydis - - - Panel length && position - Skydelio ilgis ir padėtis - - - Left - Kairinė - - - Center - Centrinė - - - Right - Dešininė - - - % - % - - - Alignment: - Lygiuotė: - - - Length: - Ilgis: - - - Position: - Padėtis: - - - 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 - %1 darbalaukio viršuje - - - Left of desktop %1 - %1 darbalaukio kairėje - - - Right of desktop %1 - %1 darbalaukio dešinėje - - - Bottom of desktop %1 - %1 darbalaukio apačioje - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - Skydelio konfigūravimas - - - - Size - - - - - Size: - Dydis: - - - - - px - - - - - Icon size: - - - - - Length: - Ilgis: - - - - <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> - - - - - % - % - - - - px - taškeliai - - - - Rows count: - - - - - Alignment && position - - - - - - Left - Kairinė - - - - - - Center - Centrinė - - - - - Right - Dešininė - - - - Alignment: - Lygiuotė: - - - - Position: - Padėtis: - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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 - %1 darbalaukio viršuje - - - - Left of desktop %1 - %1 darbalaukio kairėje - - - - Right of desktop %1 - %1 darbalaukio dešinėje - - - - Bottom of desktop %1 - %1 darbalaukio apačioje - - - - Top - - - - - Bottom - - - - - - Pick color - - - - - Images (*.png *.gif *.jpg) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Qlipper - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Configure panel... - Konfigūruoti skydelį... - - - Add plugins ... - Įdėti papildinių... - - - - LXQtPanelPlugin - - Configure - Konfigūruoti - - - Move - Perkelti - - - Remove - Pašalinti - - - - LXQtPanelPrivate - - Configure panel - Skydelio konfigūravimas - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_nl.ts b/panel/translations/lxqt-panel_nl.ts deleted file mode 100644 index 47b7e8d..0000000 --- a/panel/translations/lxqt-panel_nl.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Paneel instellen - - - Panel size - Paneelgrootte - - - Size: - Grootte: - - - px - px - - - Use automatic sizing - Gebruik automatische afmetingen - - - Panel length && position - Lengte && positie van paneel - - - Left - Links - - - Center - Midden - - - Right - Rechts - - - % - % - - - Alignment: - Uitlijning: - - - Length: - Lengte: - - - Position: - Positie: - - - Top of desktop - Bovenaan bureaublad - - - Left of desktop - Linkerzijkant van bureaublad - - - Right of desktop - Rechterzijkant van bureaublad - - - Bottom of desktop - Onderkant van bureaublad - - - Top of desktop %1 - Bovenkant van bureaublad %1 - - - Left of desktop %1 - Linkerzijkant van bureaublad %1 - - - Right of desktop %1 - Rechterzijkant van bureaublad %1 - - - Bottom of desktop %1 - Onderkant van bureaublad %1 - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - - - - - Size - - - - - Size: - Grootte: - - - - - px - - - - - Icon size: - - - - - Length: - Lengte: - - - - <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> - - - - - % - % - - - - px - px - - - - Rows count: - - - - - Alignment && position - - - - - - Left - Links - - - - - - Center - Midden - - - - - Right - Rechts - - - - Alignment: - Uitlijning: - - - - Position: - Positie: - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - Top of desktop - Bovenaan bureaublad - - - - Left of desktop - Linkerzijkant van bureaublad - - - - Right of desktop - Rechterzijkant van bureaublad - - - - Bottom of desktop - Onderkant van bureaublad - - - - Top of desktop %1 - Bovenkant van bureaublad %1 - - - - Left of desktop %1 - Linkerzijkant van bureaublad %1 - - - - Right of desktop %1 - Rechterzijkant van bureaublad %1 - - - - Bottom of desktop %1 - Onderkant van bureaublad %1 - - - - Top - - - - - Bottom - - - - - - Pick color - - - - - Images (*.png *.gif *.jpg) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Paneel - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Configure panel... - Paneel instellen... - - - Add plugins ... - Invoegtoepassingen toevoegen... - - - - LXQtPanelPlugin - - Configure - Instellen - - - Move - Verplaatsen - - - Remove - Verwijderen - - - - LXQtPanelPrivate - - Configure panel - Paneel instellingen - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_pl.ts b/panel/translations/lxqt-panel_pl.ts deleted file mode 100644 index eae2dd9..0000000 --- a/panel/translations/lxqt-panel_pl.ts +++ /dev/null @@ -1,244 +0,0 @@ - - - - - ConfigPanelDialog - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - - - - - Size - - - - - Size: - - - - - - px - - - - - Icon size: - - - - - Length: - - - - - <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> - - - - - % - - - - - px - - - - - Rows count: - - - - - Alignment && position - - - - - - Left - - - - - - - Center - - - - - - Right - - - - - Alignment: - - - - - Position: - - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Menu - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_pl_PL.ts b/panel/translations/lxqt-panel_pl_PL.ts deleted file mode 100644 index 1fc643f..0000000 --- a/panel/translations/lxqt-panel_pl_PL.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Konfiguruj panel - - - Panel size - Rozmiar panelu - - - Size: - Rozmiar: - - - px - px - - - Use automatic sizing - Użyj automatycznego dopasowywania - - - Panel length && position - Długość i położenie panelu - - - Left - Lewa - - - Center - Środek - - - Right - Prawa - - - % - % - - - Alignment: - Wyrównanie: - - - Length: - Długość: - - - Position: - 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 - - - - - Configure Panel - KOnfiguruj Panel - - - - ConfigPanelWidget - - - Configure panel - Konfiguruj panel - - - - Size - Rozmiar - - - - Size: - Rozmiar: - - - - - px - px - - - - Icon size: - Rozmiar ikon: - - - - Length: - Długość: - - - - <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>Ujemna ilość pikseli powoduje zmniejszenie panelu .</p><p/><p><i>Np. "Długość" ustawiona na -100px, rozmiar ekranu 1000px, długość panelu wyniesie 900 px.</i></p> - - - - % - % - - - - px - px - - - - Rows count: - Ilość wierszy: - - - - Alignment && position - Wyrównanie i pozycja - - - - - Left - Lewa - - - - - - Center - Środek - - - - - Right - Prawa - - - - Alignment: - Wyrównanie: - - - - Position: - Pozycja: - - - - Auto-hide - - - - - Styling - Wygląd - - - - Custom font color: - Własny kolor czcionki: - - - - Custom background image: - Własny obrazek tła: - - - - Custom background color: - Własny kolor tła: - - - - Opacity - Przezroczystość - - - - 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) - - - - LXQtPanel - - - Add Panel Widgets - DOdaj Widgety - - - - - Panel - Panel - - - - Configure Panel... - Konfiguruj Panel... - - - - Add Panel Widgets... - Dodaj Widgety... - - - - Add Panel - Dodaj Panel - - - - Remove Panel - Usuń panel - - - Configure panel... - Konfiguruj panel... - - - Add plugins ... - Dodaj wtyczkę ... - - - - LXQtPanelPlugin - - Configure - Konfiguruj - - - Move - Przesuń - - - Remove - Usuń - - - - LXQtPanelPrivate - - Configure panel - Konfiguruj panel - - - - Plugin - - - Configure "%1" - Konfiguruj "%1" - - - - Move "%1" - Przesuń "%1" - - - - Remove "%1" - Usuń "%1" - - - diff --git a/panel/translations/lxqt-panel_pt.ts b/panel/translations/lxqt-panel_pt.ts deleted file mode 100644 index 9ec44ea..0000000 --- a/panel/translations/lxqt-panel_pt.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Configurar painel - - - Panel size - Tamanho do painel - - - Size: - Tamanho: - - - px - px - - - Use automatic sizing - Tamanho automático - - - Panel length && position - Posição e comprimento do painel - - - Left - À esquerda - - - Center - Ao centro - - - Right - À direita - - - % - % - - - Alignment: - Alinhamento - - - Length: - Comprimento: - - - Position: - 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 - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - Configurar painel - - - - Size - - - - - Size: - Tamanho: - - - - - px - - - - - Icon size: - - - - - Length: - Comprimento: - - - - <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> - - - - - % - % - - - - px - px - - - - Rows count: - - - - - Alignment && position - - - - - - Left - À esquerda - - - - - - Center - Ao centro - - - - - Right - À direita - - - - Alignment: - Alinhamento - - - - Position: - Posição: - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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 - - - - - Bottom - - - - - - Pick color - - - - - Images (*.png *.gif *.jpg) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Painel - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Configure panel... - Configurar painel... - - - Add plugins ... - Adicionar extras... - - - - LXQtPanelPlugin - - Configure - Configurar - - - Move - Mover - - - Remove - Remover - - - - LXQtPanelPrivate - - Configure panel - Configurar painel - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_pt_BR.ts b/panel/translations/lxqt-panel_pt_BR.ts deleted file mode 100644 index e1ef0a4..0000000 --- a/panel/translations/lxqt-panel_pt_BR.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Configurar painel - - - Panel size - Tamanho do painel - - - Size: - Tamanho: - - - px - px - - - Use automatic sizing - Usar dimensionamento automático - - - Panel length && position - Comprimento e posição do painel - - - Left - Esquerda - - - Center - Centro - - - Right - Direita - - - % - % - - - Alignment: - Alinhamento: - - - Length: - Comprimento: - - - Position: - Posição: - - - Top of desktop - Na parte superior da área de trabalho - - - Left of desktop - À esquerda da área de trabalho - - - Right of desktop - À direita da área de trabalho - - - Bottom of desktop - Na parte inferior da área de trabalho - - - Top of desktop %1 - Na parte superior da área de trabalho %1 - - - Left of desktop %1 - A esquerda da área de trabalho %1 - - - Right of desktop %1 - À direita da área de trabalho %1 - - - Bottom of desktop %1 - Na parte inferior da área de trabalho %1 - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - Configurar painel - - - - Size - - - - - Size: - Tamanho: - - - - - px - - - - - Icon size: - - - - - Length: - Comprimento: - - - - <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> - - - - - % - % - - - - px - px - - - - Rows count: - - - - - Alignment && position - - - - - - Left - Esquerda - - - - - - Center - Centro - - - - - Right - Direita - - - - Alignment: - Alinhamento: - - - - Position: - Posição: - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - Top of desktop - Na parte superior da área de trabalho - - - - Left of desktop - À esquerda da área de trabalho - - - - Right of desktop - À direita da área de trabalho - - - - Bottom of desktop - Na parte inferior da área de trabalho - - - - Top of desktop %1 - Na parte superior da área de trabalho %1 - - - - Left of desktop %1 - A esquerda da área de trabalho %1 - - - - Right of desktop %1 - À direita da área de trabalho %1 - - - - Bottom of desktop %1 - Na parte inferior da área de trabalho %1 - - - - Top - - - - - Bottom - - - - - - Pick color - - - - - Images (*.png *.gif *.jpg) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Suspender Automaticamente - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Configure panel... - Configurar painel... - - - Add plugins ... - Adicionar plug-ins... - - - - LXQtPanelPlugin - - Configure - Configurar - - - Move - Mover - - - Remove - Remover - - - - LXQtPanelPrivate - - Configure panel - Configurar painel - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_ro_RO.ts b/panel/translations/lxqt-panel_ro_RO.ts deleted file mode 100644 index ab2e869..0000000 --- a/panel/translations/lxqt-panel_ro_RO.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Configurează panoul - - - Panel size - Dimensiune panou - - - Size: - Dimensiune: - - - px - px - - - Use automatic sizing - Utilizează dimensionarea automată - - - Panel length && position - Lungime && poziție panou - - - Left - Stânga - - - Center - Centru - - - Right - Dreapta - - - % - % - - - Alignment: - Aliniere: - - - Length: - Lungime: - - - Position: - 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 - - - - - Configure Panel - Configurează panoul - - - - ConfigPanelWidget - - - Configure panel - Configurează panoul - - - - Size - Dimensiune - - - - Size: - Dimensiune: - - - - - px - px - - - - Icon size: - Dimensiune pictograme: - - - - Length: - Lungime: - - - - <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>Pentru valori negative, dimensiunea panoului va fi calculată ca diferenta dintre marimea disponibilă a ecranului și valoarea introdusă.</p><p/><p><i>De ex. introducând o "lungime" de -100 px si o dimensiune a ecranului de 1000 px, dimensiunea reala a panoului va fi de 900 px.</i></p> - - - - % - % - - - - px - px - - - - Rows count: - Număr coloane: - - - - Alignment && position - Aliniere și poziție - - - - - Left - Stânga - - - - - - Center - Centru - - - - - Right - Dreapta - - - - Alignment: - Aliniere: - - - - Position: - Poziție: - - - - Auto-hide - Auto-ascundere - - - - Styling - Stil - - - - Custom font color: - Culoare de font personalizată - - - - Custom background image: - Imagine de fundal personalizată - - - - Custom background color: - Culoare de fundal personalizată - - - - Opacity - Opacitate - - - - 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) - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Panou - - - - Configure Panel... - Configurează panoul... - - - - Add Panel Widgets... - Adaugă widget de panou - - - - Add Panel - Adaugă panou - - - - Remove Panel - Îndepărtează panou - - - Configure panel... - Configurează panoul... - - - Add plugins ... - Adaugă module.... - - - - LXQtPanelPlugin - - Configure - Configurează - - - Move - Mută - - - Remove - Îndepărtează - - - - LXQtPanelPrivate - - Configure panel - Configurează panoul - - - - Plugin - - - Configure "%1" - Configurează "%1" - - - - Move "%1" - Mută "%1" - - - - Remove "%1" - Îndepărtează "%1" - - - diff --git a/panel/translations/lxqt-panel_ru.ts b/panel/translations/lxqt-panel_ru.ts deleted file mode 100644 index b47f448..0000000 --- a/panel/translations/lxqt-panel_ru.ts +++ /dev/null @@ -1,346 +0,0 @@ - - - - - AddPluginDialog - - - Add Plugins - Добавить плагины - - - - Search: - Найти: - - - - Add Widget - Добавить виджет - - - - Close - Закрыть - - - - (only one instance can run at a time) - (только одна копия может быть запущена за раз) - - - - ConfigPanelDialog - - - Configure Panel - Настроить панель - - - - Panel - Панель - - - - Widgets - Виджеты - - - - ConfigPanelWidget - - - Configure panel - Настроить панель - - - - px - пикс - - - - Rows count: - Количество строк: - - - - Icon 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> - <p>Отрицательное число пикселей устанавливает длину панели на столько же пикселей меньше, чем доступное место экрана.</p><p/><p><i>Т.е. «Длина» выставленная на -100 пикс, размер экрана 1000 пикс, тогда реальная длина панели будет 900 пикс.</i></p> - - - - - Left - Слева - - - - - - Center - По центру - - - - - Right - Справа - - - - % - % - - - - Size - Размер - - - - Size: - Размер: - - - - - px - пикс - - - - Alignment && position - Выравнивание && расположение - - - - Alignment: - Выравнивание: - - - - Custom styling - Пользовательский стиль - - - - Font color: - Цвет шрифта: - - - - Background opacity: - Непрозрачность фона: - - - - <small>Compositing is required for panel transparency.</small> - <small>Композиция необходима для прозрачности панели.</small> - - - - Background image: - Фоновое изображение: - - - - Background color: - Цвет фона: - - - - Auto-hide - Автоматически скрывать - - - - Length: - Длина: - - - - Position: - Расположение: - - - - 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 - Выберите изображение - - - - 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 Panel - Добавить панель - - - - Remove Panel - Удалить панель - - - - Plugin - - - Configure "%1" - Настроить «%1» - - - - Move "%1" - Переместить «%1» - - - - Remove "%1" - Удалить «%1» - - - - main - - - Use alternate configuration file. - Использовать альтернативный конфигурационный файл. - - - - Configuration file - Файл настроек - - - diff --git a/panel/translations/lxqt-panel_ru_RU.ts b/panel/translations/lxqt-panel_ru_RU.ts deleted file mode 100644 index 884902d..0000000 --- a/panel/translations/lxqt-panel_ru_RU.ts +++ /dev/null @@ -1,346 +0,0 @@ - - - - - AddPluginDialog - - - Add Plugins - Добавить плагины - - - - Search: - Найти: - - - - Add Widget - Добавить виджет - - - - Close - Закрыть - - - - (only one instance can run at a time) - (только одна копия может быть запущена за раз) - - - - ConfigPanelDialog - - - Configure Panel - Настроить панель - - - - Panel - Панель - - - - Widgets - Виджеты - - - - ConfigPanelWidget - - - Configure panel - Настроить панель - - - - px - пикс - - - - Rows count: - Количество строк: - - - - Icon 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> - <p>Отрицательное число пикселей устанавливает длину панели на столько же пикселей меньше, чем доступное место экрана.</p><p/><p><i>Т.е. «Длина» выставленная на -100 пикс, размер экрана 1000 пикс, тогда реальная длина панели будет 900 пикс.</i></p> - - - - - Left - Слева - - - - - - Center - По центру - - - - - Right - Справа - - - - % - % - - - - Size - Размер - - - - Size: - Размер: - - - - - px - пикс - - - - Alignment && position - Выравнивание && расположение - - - - Alignment: - Выравнивание: - - - - Custom styling - Пользовательский стиль - - - - Font color: - Цвет шрифта: - - - - Background opacity: - Непрозрачность фона: - - - - <small>Compositing is required for panel transparency.</small> - <small>Композиция необходима для прозрачности панели.</small> - - - - Background image: - Фоновое изображение: - - - - Background color: - Цвет фона: - - - - Auto-hide - Автоматически скрывать - - - - Length: - Длина: - - - - Position: - Расположение: - - - - 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 - Выберите изображение - - - - 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 Panel - Добавить панель - - - - Remove Panel - Удалить панель - - - - Plugin - - - Configure "%1" - Настроить «%1» - - - - Move "%1" - Переместить «%1» - - - - Remove "%1" - Удалить «%1» - - - - main - - - Use alternate configuration file. - Использовать альтернативный конфигурационный файл. - - - - Configuration file - Файл настроек - - - diff --git a/panel/translations/lxqt-panel_sk_SK.ts b/panel/translations/lxqt-panel_sk_SK.ts deleted file mode 100644 index 45b35b8..0000000 --- a/panel/translations/lxqt-panel_sk_SK.ts +++ /dev/null @@ -1,311 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Nastaviť panel - - - px - px - - - Left - Vľavo - - - Center - Stred - - - Right - Vpravo - - - % - % - - - 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 - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - Nastaviť panel - - - - Size - - - - - Size: - - - - - - px - - - - - Icon size: - - - - - Length: - - - - - <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> - - - - - % - % - - - - px - px - - - - Rows count: - - - - - Alignment && position - - - - - - Left - Vľavo - - - - - - Center - Stred - - - - - Right - Vpravo - - - - Alignment: - - - - - Position: - - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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 - - - - - Bottom - - - - - - Pick color - - - - - Images (*.png *.gif *.jpg) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Panel - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Add plugins ... - Pridať moduly... - - - - LXQtPanelPrivate - - Configure panel - Nastaviť panel - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_sl.ts b/panel/translations/lxqt-panel_sl.ts deleted file mode 100644 index 64fca4f..0000000 --- a/panel/translations/lxqt-panel_sl.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Nastavitev pulta - - - Panel size - Velikost pulta - - - Size: - Velikost: - - - px - pik - - - Use automatic sizing - Uporabi samodejno prilagajanje velikosti - - - Panel length && position - Dolžina in položaj pulta - - - Left - Levo - - - Center - Na sredini - - - Right - Desno - - - % - % - - - Alignment: - Poravnava: - - - Length: - Dolžina: - - - Position: - Položaj: - - - Top of desktop - Vrh namizja - - - Left of desktop - Leva stran namizja - - - Right of desktop - Desna stran namizja - - - Bottom of desktop - Dno namizja - - - Top of desktop %1 - Vrh namizja %1 - - - Left of desktop %1 - Leva stran namizja %1 - - - Right of desktop %1 - Desna stran namizja %1 - - - Bottom of desktop %1 - Dno namizja %1 - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - Nastavitev pulta - - - - Size - - - - - Size: - Velikost: - - - - - px - - - - - Icon size: - - - - - Length: - 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> - - - - - % - % - - - - px - pik - - - - Rows count: - - - - - Alignment && position - - - - - - Left - Levo - - - - - - Center - Na sredini - - - - - Right - Desno - - - - Alignment: - Poravnava: - - - - Position: - Položaj: - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - Top of desktop - Vrh namizja - - - - Left of desktop - Leva stran namizja - - - - Right of desktop - Desna stran namizja - - - - Bottom of desktop - Dno namizja - - - - Top of desktop %1 - Vrh namizja %1 - - - - Left of desktop %1 - Leva stran namizja %1 - - - - Right of desktop %1 - Desna stran namizja %1 - - - - Bottom of desktop %1 - Dno namizja %1 - - - - Top - - - - - Bottom - - - - - - Pick color - - - - - Images (*.png *.gif *.jpg) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Pult - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Configure panel... - Nastavitev pulta ... - - - Add plugins ... - Dodaj vstavke ... - - - - LXQtPanelPlugin - - Configure - Nastavitev - - - Move - Premakni - - - Remove - Odstrani - - - - LXQtPanelPrivate - - Configure panel - Nastavitev pulta - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_sr@latin.ts b/panel/translations/lxqt-panel_sr@latin.ts deleted file mode 100644 index ee079a5..0000000 --- a/panel/translations/lxqt-panel_sr@latin.ts +++ /dev/null @@ -1,244 +0,0 @@ - - - - - ConfigPanelDialog - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - - - - - Size - - - - - Size: - - - - - - px - - - - - Icon size: - - - - - Length: - - - - - <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> - - - - - % - - - - - px - - - - - Rows count: - - - - - Alignment && position - - - - - - Left - - - - - - - Center - - - - - - Right - - - - - Alignment: - - - - - Position: - - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Automatsko suspendovanje - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_sr_BA.ts b/panel/translations/lxqt-panel_sr_BA.ts deleted file mode 100644 index 79451e8..0000000 --- a/panel/translations/lxqt-panel_sr_BA.ts +++ /dev/null @@ -1,377 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Подешавање панела - - - % - % - - - px - px - - - Left - Лијево - - - Right - Десно - - - Center - Центар - - - Panel size - Величина панела - - - Size: - Величина: - - - Use theme size - Величина постављена темом - - - Panel lenght & position - Дужина и положај панела - - - Length: - Дужина: - - - Alignment: - Поравнање: - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - - - - - Size - - - - - Size: - Величина: - - - - - px - - - - - Icon size: - - - - - Length: - Дужина: - - - - <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> - - - - - % - % - - - - px - px - - - - Rows count: - - - - - Alignment && position - - - - - - Left - Лијево - - - - - - Center - Центар - - - - - Right - Десно - - - - Alignment: - Поравнање: - - - - Position: - - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Панел - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - - LXQtPanelPluginPrivate - - Configure - Подеси - - - Move - Помјери - - - Delete - Обриши - - - - LXQtPanelPrivate - - Panel - Панел - - - Plugins - Модули - - - Add plugins ... - Додај модуле... - - - Move plugin - Помјери модул - - - Configure plugin - Подеси модул - - - Delete plugin - Обриши модул - - - Show this panel at - Прикажи овај панел на - - - Configure panel - Подеси панел - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - - PositionAction - - Top of desktop - врху површи - - - Bottom of desktop - дну површи - - - Left of desktop - лијевој страни површи - - - Right of desktop - десној страни површи - - - Top of desktop %1 - врху површи %1 - - - Bottom of desktop %1 - дну површи %1 - - - Left of desktop %1 - лијевој страни површи %1 - - - Right of desktop %1 - десној страни површи %1 - - - diff --git a/panel/translations/lxqt-panel_sr_RS.ts b/panel/translations/lxqt-panel_sr_RS.ts deleted file mode 100644 index 7fbd082..0000000 --- a/panel/translations/lxqt-panel_sr_RS.ts +++ /dev/null @@ -1,338 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Подешавање панела - - - Panel size - Величина панела - - - Size: - Величина: - - - px - px - - - Left - Лево - - - Center - Центар - - - Right - Десно - - - % - % - - - Alignment: - Поравнање: - - - Length: - Дужина: - - - 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 - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - - - - - Size - - - - - Size: - Величина: - - - - - px - - - - - Icon size: - - - - - Length: - Дужина: - - - - <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> - - - - - % - % - - - - px - px - - - - Rows count: - - - - - Alignment && position - - - - - - Left - Лево - - - - - - Center - Центар - - - - - Right - Десно - - - - Alignment: - Поравнање: - - - - Position: - - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Панел - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Add plugins ... - Додај модуле... - - - - LXQtPanelPlugin - - Configure - Подеси - - - Move - Помери - - - - LXQtPanelPrivate - - Configure panel - Подеси панел - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_th_TH.ts b/panel/translations/lxqt-panel_th_TH.ts deleted file mode 100644 index 2675a84..0000000 --- a/panel/translations/lxqt-panel_th_TH.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - ปรับแต่งพาเนล - - - Panel size - ขนาดพาเนล - - - Size: - ขนาด: - - - px - px - - - Use automatic sizing - ใช้การปรับขนาดอัตโนมัติ - - - Panel length && position - ความยาว && ตำแหน่งพาเนล - - - Left - ทางซ้าย - - - Center - ตรงกลาง - - - Right - ทางขวา - - - % - % - - - Alignment: - การจัดวาง: - - - Length: - ความยาว: - - - Position: - ตำแหน่ง: - - - 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 - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - ปรับแต่งพาเนล - - - - Size - - - - - Size: - ขนาด: - - - - - px - - - - - Icon size: - - - - - Length: - ความยาว: - - - - <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> - - - - - % - % - - - - px - px - - - - Rows count: - - - - - Alignment && position - - - - - - Left - ทางซ้าย - - - - - - Center - ตรงกลาง - - - - - Right - ทางขวา - - - - Alignment: - การจัดวาง: - - - - Position: - ตำแหน่ง: - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - พาเนล - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Configure panel... - ปรับแต่งพาเนล... - - - Add plugins ... - เพิ่มปลั๊กอิน - - - - LXQtPanelPlugin - - Configure - ปรับแต่ง - - - Move - ย้าย - - - Remove - ลบทิ้ง - - - - LXQtPanelPrivate - - Configure panel - ปรับแต่งพาเนล - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_tr.ts b/panel/translations/lxqt-panel_tr.ts deleted file mode 100644 index 2884500..0000000 --- a/panel/translations/lxqt-panel_tr.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Paneli yapılandır - - - Panel size - Panel boyutu - - - Size: - Boyut: - - - px - px - - - Use automatic sizing - Otomatik boyutlandırmayı kullan - - - Panel length && position - Panel uzunluğu && konumu - - - Left - Sol - - - Center - Merkez - - - Right - Sağ - - - % - % - - - Alignment: - Yerleştirme: - - - Length: - Uzunluk: - - - Position: - Konum: - - - Top of desktop - Masasüstünün üst kısmı - - - Left of desktop - Masaüstünün sol kısmı - - - Right of desktop - Masaüstünün sağ kısmı - - - Bottom of desktop - Masaüstünün alt kısmı - - - Top of desktop %1 - Masaüstünün üst kısmı %1 - - - Left of desktop %1 - Masaüstünün sol kısmı %1 - - - Right of desktop %1 - Masaüstünün sağ kısmı %1 - - - Bottom of desktop %1 - Masaüstünün alt kısmı %1 - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - Paneli yapılandır - - - - Size - - - - - Size: - Boyut: - - - - - px - - - - - Icon size: - - - - - Length: - Uzunluk: - - - - <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> - - - - - % - % - - - - px - px - - - - Rows count: - - - - - Alignment && position - - - - - - Left - Sol - - - - - - Center - Merkez - - - - - Right - Sağ - - - - Alignment: - Yerleştirme: - - - - Position: - Konum: - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - Top of desktop - Masasüstünün üst kısmı - - - - Left of desktop - Masaüstünün sol kısmı - - - - Right of desktop - Masaüstünün sağ kısmı - - - - Bottom of desktop - Masaüstünün alt kısmı - - - - Top of desktop %1 - Masaüstünün üst kısmı %1 - - - - Left of desktop %1 - Masaüstünün sol kısmı %1 - - - - Right of desktop %1 - Masaüstünün sağ kısmı %1 - - - - Bottom of desktop %1 - Masaüstünün alt kısmı %1 - - - - Top - - - - - Bottom - - - - - - Pick color - - - - - Images (*.png *.gif *.jpg) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Not Defteri - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Configure panel... - Paneli yapılandır... - - - Add plugins ... - Eklenti ekle... - - - - LXQtPanelPlugin - - Configure - Yapılandır - - - Move - Taşı - - - Remove - Sil - - - - LXQtPanelPrivate - - Configure panel - Paneli yapılandır - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_uk.ts b/panel/translations/lxqt-panel_uk.ts deleted file mode 100644 index 4f99955..0000000 --- a/panel/translations/lxqt-panel_uk.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - Налаштувати панель - - - Panel size - Розмір панелі - - - Size: - Розмір: - - - px - px - - - Use automatic sizing - Використовувати автоматичний розмір - - - Panel length && position - Довжина та місце панелі - - - Left - Зліва - - - Center - Посередині - - - Right - Справа - - - % - % - - - Alignment: - Вирівнювання: - - - Length: - Довжина: - - - Position: - Місце: - - - 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 - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - Налаштувати панель - - - - Size - - - - - Size: - Розмір: - - - - - px - - - - - Icon size: - - - - - Length: - Довжина: - - - - <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> - - - - - % - % - - - - px - px - - - - Rows count: - - - - - Alignment && position - - - - - - Left - Зліва - - - - - - Center - Посередині - - - - - Right - Справа - - - - Alignment: - Вирівнювання: - - - - Position: - Місце: - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - Панель - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Configure panel... - Налаштувати панель... - - - Add plugins ... - Додати плаґіни... - - - - LXQtPanelPlugin - - Configure - Налаштувати - - - Move - Пересунути - - - Remove - Вилучити - - - - LXQtPanelPrivate - - Configure panel - Налаштувати панель - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_zh_CN.ts b/panel/translations/lxqt-panel_zh_CN.ts deleted file mode 100644 index 1432da6..0000000 --- a/panel/translations/lxqt-panel_zh_CN.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - 配置面板 - - - Panel size - 面板大小 - - - Size: - 大小： - - - px - px - - - Use automatic sizing - 使用自动缩放 - - - Panel length && position - 面板长度和位置 - - - Left - 左 - - - Center - 居中 - - - Right - 右 - - - % - % - - - Alignment: - 对齐： - - - Length: - 长度： - - - Position: - 位置： - - - 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 - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - 配置面板 - - - - Size - - - - - Size: - 大小： - - - - - px - - - - - Icon size: - - - - - Length: - 长度： - - - - <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> - - - - - % - % - - - - px - px - - - - Rows count: - - - - - Alignment && position - - - - - - Left - 左 - - - - - - Center - 居中 - - - - - Right - 右 - - - - Alignment: - 对齐： - - - - Position: - 位置： - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - qxkb - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Configure panel... - 配置面板... - - - Add plugins ... - 添加插件 ... - - - - LXQtPanelPlugin - - Configure - 配置 - - - Move - 移动 - - - Remove - 删除 - - - - LXQtPanelPrivate - - Configure panel - 配置面板 - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/translations/lxqt-panel_zh_TW.ts b/panel/translations/lxqt-panel_zh_TW.ts deleted file mode 100644 index b88971e..0000000 --- a/panel/translations/lxqt-panel_zh_TW.ts +++ /dev/null @@ -1,358 +0,0 @@ - - - - - ConfigPanelDialog - - Configure panel - 設定面板 - - - Panel size - 面板尺寸 - - - Size: - 尺寸： - - - px - px - - - Use automatic sizing - 大小自動調整 - - - Panel length && position - 面板長度以及位置 - - - Left - 向左 - - - Center - 中間 - - - Right - 向右 - - - % - % - - - Alignment: - 對齊： - - - Length: - 長度： - - - Position: - 位置 : - - - 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 - - - - - Configure Panel - - - - - ConfigPanelWidget - - - Configure panel - 設定面板 - - - - Size - - - - - Size: - 尺寸： - - - - - px - - - - - Icon size: - - - - - Length: - 長度： - - - - <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> - - - - - % - % - - - - px - px - - - - Rows count: - - - - - Alignment && position - - - - - - Left - 向左 - - - - - - Center - 中間 - - - - - Right - 向右 - - - - Alignment: - 對齊： - - - - Position: - 位置 : - - - - Auto-hide - - - - - Styling - - - - - Custom font color: - - - - - Custom background image: - - - - - Custom background color: - - - - - Opacity - - - - - 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) - - - - - LXQtPanel - - - Add Panel Widgets - - - - - - Panel - LXQt滑鼠設定 - - - - Configure Panel... - - - - - Add Panel Widgets... - - - - - Add Panel - - - - - Remove Panel - - - - Configure panel... - 面板設定... - - - Add plugins ... - 新增外掛... - - - - LXQtPanelPlugin - - Configure - 設定 - - - Move - 移動 - - - Remove - 移除 - - - - LXQtPanelPrivate - - Configure panel - 設定面板 - - - - Plugin - - - Configure "%1" - - - - - Move "%1" - - - - - Remove "%1" - - - - diff --git a/panel/windownotifier.cpp b/panel/windownotifier.cpp new file mode 100644 index 0000000..0b41057 --- /dev/null +++ b/panel/windownotifier.cpp @@ -0,0 +1,65 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * http://lxqt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Palo Kisa + * + * 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 "windownotifier.h" +#include +#include + +void WindowNotifier::observeWindow(QWidget * w) +{ + //installing the same filter object multiple times doesn't harm + w->installEventFilter(this); +} + + +bool WindowNotifier::eventFilter(QObject * watched, QEvent * event) +{ + QWidget * widget = qobject_cast(watched); //we're observing only QWidgetw + auto it = std::lower_bound(mShownWindows.begin(), mShownWindows.end(), widget); + switch (event->type()) + { + case QEvent::Close: + watched->removeEventFilter(this); + //no break + case QEvent::Hide: + Q_ASSERT(mShownWindows.end() != it); + mShownWindows.erase(it); + if (mShownWindows.isEmpty()) + emit lastHidden(); + break; + case QEvent::Show: + { + const bool first_shown = mShownWindows.isEmpty(); + mShownWindows.insert(it, widget); //we keep the mShownWindows sorted + if (first_shown) + emit firstShown(); + } + default: + break; + } + return false; +} diff --git a/panel/windownotifier.h b/panel/windownotifier.h new file mode 100644 index 0000000..53f2f3f --- /dev/null +++ b/panel/windownotifier.h @@ -0,0 +1,53 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * http://lxqt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Palo Kisa + * + * 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 */ + +#if !defined(WINDOWNOTIFIER_H) +#define WINDOWNOTIFIER_H + +#include + +class QWidget; + +class WindowNotifier : public QObject +{ + Q_OBJECT +public: + using QObject::QObject; + + void observeWindow(QWidget * w); + inline bool isAnyWindowShown() const { return !mShownWindows.isEmpty(); } + + virtual bool eventFilter(QObject * watched, QEvent * event) override; +signals: + void lastHidden(); + void firstShown(); + +private: + QList mShownWindows; //!< known shown windows (sorted) +}; + +#endif diff --git a/plugin-clock/lxqtclock.cpp b/plugin-clock/lxqtclock.cpp index 79c2c17..34d8a63 100644 --- a/plugin-clock/lxqtclock.cpp +++ b/plugin-clock/lxqtclock.cpp @@ -163,6 +163,10 @@ void LXQtClock::showTime() mTimeLabel->setText(new_time); } + //Note: if transformation (custom rendering) is enabled we need the explicit update + //(update doesn't cause superfluous paint events) + mRotatedWidget->update(); + if (mCurrentCharCount != new_char_count) { mCurrentCharCount = new_char_count; @@ -286,6 +290,7 @@ void LXQtClock::activated(ActivationReason reason) { QRect pos = calculatePopupWindowPos(mCalendarPopup->size()); mCalendarPopup->move(pos.topLeft()); + willShowWindow(mCalendarPopup); mCalendarPopup->show(); } else @@ -296,7 +301,7 @@ void LXQtClock::activated(ActivationReason reason) QDialog * LXQtClock::configureDialog() { - return new LXQtClockConfiguration(*settings()); + return new LXQtClockConfiguration(settings()); } bool LXQtClock::eventFilter(QObject *watched, QEvent *event) diff --git a/plugin-clock/lxqtclockconfiguration.cpp b/plugin-clock/lxqtclockconfiguration.cpp index 4090104..6d93e28 100644 --- a/plugin-clock/lxqtclockconfiguration.cpp +++ b/plugin-clock/lxqtclockconfiguration.cpp @@ -33,7 +33,6 @@ #include "lxqtclockconfiguration.h" #include "ui_lxqtclockconfiguration.h" - namespace { class FirstDayCombo : public QStandardItemModel @@ -75,11 +74,9 @@ namespace }; } -LXQtClockConfiguration::LXQtClockConfiguration(QSettings &settings, QWidget *parent) : - QDialog(parent), +LXQtClockConfiguration::LXQtClockConfiguration(PluginSettings *settings, QWidget *parent) : + LXQtPanelPluginConfigDialog(settings, parent), ui(new Ui::LXQtClockConfiguration), - mSettings(settings), - oldSettings(settings), mOldIndex(1) { setAttribute(Qt::WA_DeleteOnClose); @@ -205,21 +202,21 @@ void LXQtClockConfiguration::loadSettings() QString systemDateLocale = QLocale::system().dateFormat(QLocale::ShortFormat).toUpper(); QString systemTimeLocale = QLocale::system().timeFormat(QLocale::ShortFormat).toUpper(); - QString timeFormat = mSettings.value("timeFormat", systemTimeLocale.contains("AP") ? "h:mm AP" : "HH:mm").toString(); + QString timeFormat = settings().value("timeFormat", systemTimeLocale.contains("AP") ? "h:mm AP" : "HH:mm").toString(); ui->showSecondsCB->setChecked(timeFormat.indexOf("ss") > -1); ui->ampmClockCB->setChecked(timeFormat.toUpper().indexOf("AP") > -1); - ui->useUtcCB->setChecked(mSettings.value("UTC", false).toBool()); + ui->useUtcCB->setChecked(settings().value("UTC", false).toBool()); ui->dontShowDateRB->setChecked(true); - ui->showDateBeforeTimeRB->setChecked(mSettings.value("showDate", "no").toString().toLower() == "before"); - ui->showDateAfterTimeRB->setChecked(mSettings.value("showDate", "no").toString().toLower() == "after"); - ui->showDateBelowTimeRB->setChecked(mSettings.value("showDate", "no").toString().toLower() == "below"); + ui->showDateBeforeTimeRB->setChecked(settings().value("showDate", "no").toString().toLower() == "before"); + ui->showDateAfterTimeRB->setChecked(settings().value("showDate", "no").toString().toLower() == "after"); + ui->showDateBelowTimeRB->setChecked(settings().value("showDate", "no").toString().toLower() == "below"); - mCustomDateFormat = mSettings.value("customDateFormat", QString()).toString(); - QString dateFormat = mSettings.value("dateFormat", QLocale::system().dateFormat(QLocale::ShortFormat)).toString(); + mCustomDateFormat = settings().value("customDateFormat", QString()).toString(); + QString dateFormat = settings().value("dateFormat", QLocale::system().dateFormat(QLocale::ShortFormat)).toString(); createDateFormats(); @@ -233,8 +230,8 @@ void LXQtClockConfiguration::loadSettings() } mOldIndex = ui->dateFormatCOB->currentIndex(); - ui->autorotateCB->setChecked(mSettings.value("autoRotate", true).toBool()); - ui->firstDayOfWeekCB->setCurrentIndex(dynamic_cast(*(ui->firstDayOfWeekCB->model())).findIndex(mSettings.value("firstDayOfWeek", -1).toInt())); + ui->autorotateCB->setChecked(settings().value("autoRotate", true).toBool()); + ui->firstDayOfWeekCB->setCurrentIndex(dynamic_cast(*(ui->firstDayOfWeekCB->model())).findIndex(settings().value("firstDayOfWeek", -1).toInt())); } void LXQtClockConfiguration::saveSettings() @@ -244,36 +241,23 @@ void LXQtClockConfiguration::saveSettings() if (ui->showSecondsCB->isChecked()) timeFormat.insert(timeFormat.indexOf("mm") + 2, ":ss"); - mSettings.setValue("timeFormat", timeFormat); + settings().setValue("timeFormat", timeFormat); - mSettings.setValue("UTC", ui->useUtcCB->isChecked()); + settings().setValue("UTC", ui->useUtcCB->isChecked()); - mSettings.setValue("showDate", + settings().setValue("showDate", ui->showDateBeforeTimeRB->isChecked() ? "before" : (ui->showDateAfterTimeRB->isChecked() ? "after" : (ui->showDateBelowTimeRB->isChecked() ? "below" : "no" ))); - mSettings.setValue("customDateFormat", mCustomDateFormat); + settings().setValue("customDateFormat", mCustomDateFormat); if (ui->dateFormatCOB->currentIndex() == (ui->dateFormatCOB->count() - 1)) - mSettings.setValue("dateFormat", mCustomDateFormat); + settings().setValue("dateFormat", mCustomDateFormat); else - mSettings.setValue("dateFormat", ui->dateFormatCOB->itemData(ui->dateFormatCOB->currentIndex())); - - mSettings.setValue("autoRotate", ui->autorotateCB->isChecked()); - mSettings.setValue("firstDayOfWeek", dynamic_cast(*ui->firstDayOfWeekCB->model()).item(ui->firstDayOfWeekCB->currentIndex(), 0)->data(Qt::UserRole)); -} + settings().setValue("dateFormat", ui->dateFormatCOB->itemData(ui->dateFormatCOB->currentIndex())); -void LXQtClockConfiguration::dialogButtonsAction(QAbstractButton *btn) -{ - if (ui->buttons->buttonRole(btn) == QDialogButtonBox::ResetRole) - { - oldSettings.loadToSettings(); - loadSettings(); - } - else - { - close(); - } + settings().setValue("autoRotate", ui->autorotateCB->isChecked()); + settings().setValue("firstDayOfWeek", dynamic_cast(*ui->firstDayOfWeekCB->model()).item(ui->firstDayOfWeekCB->currentIndex(), 0)->data(Qt::UserRole)); } void LXQtClockConfiguration::dateFormatActivated(int index) diff --git a/plugin-clock/lxqtclockconfiguration.h b/plugin-clock/lxqtclockconfiguration.h index 88d0d6b..bf3553a 100644 --- a/plugin-clock/lxqtclockconfiguration.h +++ b/plugin-clock/lxqtclockconfiguration.h @@ -29,30 +29,28 @@ #ifndef LXQTCLOCKCONFIGURATION_H #define LXQTCLOCKCONFIGURATION_H -#include +#include "../panel/lxqtpanelpluginconfigdialog.h" +#include "../panel/pluginsettings.h" + #include #include #include #include -#include - namespace Ui { class LXQtClockConfiguration; } -class LXQtClockConfiguration : public QDialog +class LXQtClockConfiguration : public LXQtPanelPluginConfigDialog { Q_OBJECT public: - explicit LXQtClockConfiguration(QSettings &settings, QWidget *parent = 0); + explicit LXQtClockConfiguration(PluginSettings *settings, QWidget *parent = 0); ~LXQtClockConfiguration(); private: Ui::LXQtClockConfiguration *ui; - QSettings &mSettings; - LXQt::SettingsCache oldSettings; /* Read settings from conf file and put data into controls. @@ -69,7 +67,6 @@ private slots: Saves settings in conf file. */ void saveSettings(); - void dialogButtonsAction(QAbstractButton *btn); void dateFormatActivated(int); private: diff --git a/plugin-clock/translations/clock.ts b/plugin-clock/translations/clock.ts deleted file mode 100644 index e50b115..0000000 --- a/plugin-clock/translations/clock.ts +++ /dev/null @@ -1,113 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - - Clock Settings - - - - - Time - - - - - &Show seconds - - - - - 12 &hour style - - - - - &Use UTC - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - - Date - - - - - Date &format - - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_ar.desktop b/plugin-clock/translations/clock_ar.desktop index 9602b9a..cc1b687 100644 --- a/plugin-clock/translations/clock_ar.desktop +++ b/plugin-clock/translations/clock_ar.desktop @@ -1,12 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ar]=السَّاعة والتَّقويم -Name[ar]=السَّاعة +Name[ar]=التّاريخ والوقت +Comment[ar]=تعرض الوقت الحاليّ. فيها تقويم. diff --git a/plugin-clock/translations/clock_ar.ts b/plugin-clock/translations/clock_ar.ts deleted file mode 100644 index 1dee3d3..0000000 --- a/plugin-clock/translations/clock_ar.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - إعدادات ساعة ريزر - - - - Clock Settings - - - - - Time - الوقت - - - - &Show seconds - إ&ظهار الثَّواني - - - - 12 &hour style - عرض 12 سا&عة - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - &Font - ال&خطُّ - - - Font - الخطُّ - - - - Date - التَّاريخ - - - Show &date - إظهار ال&تَّاريخ - - - D&ate format - تنسيق التَّ&أريخ - - - Fon&t - الخ&طُّ - - - Show date in &new line - إظهار التَّارخ في سطرٍ &جديدٍ - - - &Use theme fonts - استخد&م خطوط الواجهة المخصَّصة - - - Time font - الخطُّ المستخدم للوقت - - - Date font - الخطُّ المستخدم للتَّاريخ - - - Ultra light - فاتحٌ زيادة - - - Light - فاتح - - - Ultra black - أسود دامس - - - Black - أسود - - - Bold - ثخين - - - Demi bold - نصف ثخين - - - Italic - مائل - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_cs.ts b/plugin-clock/translations/clock_cs.ts deleted file mode 100644 index e905954..0000000 --- a/plugin-clock/translations/clock_cs.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - Nastavení hodin - - - - Clock Settings - - - - - Time - Čas - - - - &Show seconds - &Ukázat sekundy - - - - 12 &hour style - 12 &hodinový styl - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - &Font - &Písmo - - - Font - Písmo - - - - Date - Datum - - - Show &date - Ukázat &datum - - - D&ate format - Formát d&ata - - - Fon&t - Pí&smo - - - Show date in &new line - Ukázat datum na &novém řádku - - - &Use theme fonts - &Použít písma motivu - - - Time font - Písmo pro čas - - - Date font - Písmo pro datum - - - Ultra light - Hodně světlé - - - Light - Světlé - - - Ultra black - Hodně černé - - - Black - Černé - - - Bold - Tučné - - - Demi bold - Polotučné - - - Italic - Kurzíva - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_cs_CZ.ts b/plugin-clock/translations/clock_cs_CZ.ts deleted file mode 100644 index 8e868bc..0000000 --- a/plugin-clock/translations/clock_cs_CZ.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - Nastavení hodin - - - - Clock Settings - - - - - Time - Čas - - - - &Show seconds - &Ukázat sekundy - - - - 12 &hour style - 12 &hodinový styl - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - &Font - &Písmo - - - Font - Písmo - - - - Date - Datum - - - Show &date - Ukázat &datum - - - D&ate format - Formát d&ata - - - Fon&t - Pí&smo - - - Show date in &new line - Ukázat datum na &novém řádku - - - &Use theme fonts - &Použít písma motivu - - - Time font - Písmo pro čas - - - Date font - Písmo pro datum - - - Ultra light - Hodně světlé - - - Light - Světlé - - - Ultra black - Hodně černé - - - Black - Černé - - - Bold - Tučné - - - Demi bold - Polotučné - - - Italic - Kurzíva - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_da.ts b/plugin-clock/translations/clock_da.ts deleted file mode 100644 index be74b57..0000000 --- a/plugin-clock/translations/clock_da.ts +++ /dev/null @@ -1,137 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - LXQt Ur-Indstillinger - - - - Clock Settings - - - - - Time - Tid - - - - &Show seconds - - - - - 12 &hour style - - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - Show seconds - Vis sekunder - - - 12 hour style - 12 timers visning - - - - Date - Dato - - - Show date - Vis dato - - - Show date in new line - Vis dato i ny linie - - - Date format - Datoformat - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_da_DK.ts b/plugin-clock/translations/clock_da_DK.ts deleted file mode 100644 index d03562c..0000000 --- a/plugin-clock/translations/clock_da_DK.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - LXQt Urindstillinger - - - - Clock Settings - - - - - Time - Tid - - - - &Show seconds - Vis &sekunder - - - - 12 &hour style - 12 &timers ur - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - &Font - Skri&fttype - - - Font - Skrifttype - - - - Date - Dato - - - Show &date - Vis &dato - - - D&ate format - D&atoformat - - - Fon&t - Skrif&ttype - - - Show date in &new line - Vis dato i &ny linie - - - &Use theme fonts - Br&ug temaskrifttyper - - - Time font - Dato skrifttype - - - Date font - Dato skrifttype - - - Ultra light - Ultralyst - - - Light - Lyst - - - Ultra black - Ultramørkt - - - Black - Mørkt - - - Bold - Fed - - - Demi bold - Halvfed - - - Italic - Kursiv - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_de.ts b/plugin-clock/translations/clock_de.ts deleted file mode 100644 index ddc14e7..0000000 --- a/plugin-clock/translations/clock_de.ts +++ /dev/null @@ -1,131 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - <Basierend auf lokale Datumseinstellungen> - - - - LXQtClockConfiguration - - - Clock Settings - Uhr-Einstellungen - - - - Time - Zeit - - - - &Show seconds - &Sekunden anzeigen - - - - 12 &hour style - 12 Stunden U&hr-Stil - - - - &Use UTC - &UTC verwenden - - - - Date - Datum - - - - Date &format - Datums&format - - - - &Do not show date - &Datum nicht anzeigen - - - - Show date &before time - Datum &vor Zeit anzeigen - - - - Show date &after time - Datum hinter Uhrzeit &anzeigen - - - - Show date below time on new &line - Datum unterha&lb Uhrzeit anzeigen - - - - First day of week in calendar - Erster Wochentag im Kalender - - - - Orientation - Ausrichtung - - - - Auto&rotate when the panel is vertical - Automatisch d&rehen bei vertikaler Leiste - - - - Input custom date format - Eigenes Datumsformat - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - Interpretierte Datumsformatsequenzen sind: - -d Tag als Zahl ohne führende Null (1 bis 31) -dd Tag als Zahl mit führender Null (01 bis 31) -ddd abgekürzter lokalisierter Tagesname (d.h. 'Mon' bis 'Son'). -dddd ganzer lokalisierter Tagesname (d.h. 'Montag' bis 'Sonntag'). -M Monat als Zahl ohne führende Null (1-12) -MM Monat als Zahl mit führender Null (01-12) -MMM abgekürzter lokalisierter Monatsname (d.h. 'Jan' bis 'Dez'). -MMMM ganzer lokalisierter Monatsname (d.h. 'Januar' bis 'Dezember'). -yy Jahr als zweistellige Zahl (00-99) -yyyy Jahr als vierstellige Zahl - -Alle anderen Zeichen werden als Text behandelt. -Jede Zeichenfolge, die in einfachen Hochkommas eingeschlossen ist ('), -wird ebenfalls als Text behandelt und nicht als Ausdruck benutzt. - - -Eigenes Datumsformat: - - - diff --git a/plugin-clock/translations/clock_el.ts b/plugin-clock/translations/clock_el.ts deleted file mode 100644 index e365636..0000000 --- a/plugin-clock/translations/clock_el.ts +++ /dev/null @@ -1,199 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - <locale based> - - - - LXQtClockConfiguration - - LXQt Clock Settings - Ρυθμίσεις ρολογιού LXQt - - - - Clock Settings - Ρυθμίσεις του ρολογιού - - - - Time - Ώρα - - - - &Show seconds - Εμ&φάνιση δευτερολέπτων - - - - 12 &hour style - 12 &ωρη μορφή - - - - &Use UTC - &Χρήση της UTC - - - - Date &format - Μορφή &ημερομηνίας - - - - &Do not show date - &Να μην εμφανίζεται η ημερομηνία - - - - Show date &before time - Εμφάνιση της ημερομηνίας &πριν την ώρα - - - - Show date &after time - Εμφάνιση της ημερομηνίας &μετά την ώρα - - - - Show date below time on new &line - Εμφάνιση της ημερομηνίας κάτω από την ώρα σε νέα &γραμμή - - - - First day of week in calendar - Η πρώτη ημέρα της εβδομάδας στο ημερολόγιο - - - - Orientation - Προσανατολισμός - - - - Auto&rotate when the panel is vertical - Αυτόματη περιστρο&φή όταν ο πίνακας είναι τοποθετημένος κατακόρυφα - - - &Font - &Γραμματοσειρά - - - Font - Γραμματοσειρά - - - - Date - Ημερομηνία - - - Show &date - Εμφάνιση &ημερομηνίας - - - D&ate format - Μορφή η&μερομηνίας - - - Fon&t - Γρ&αμματοσειρά - - - Show date in &new line - Εμφάνιση ημερομηνίας σε &νέα γραμμή - - - &Use theme fonts - Χρήση γραμματοσειρών &θέματος - - - Time font - Γραμματοσειρά ώρας - - - Date font - Γραμματοσειρά ημερομηνίας - - - Ultra light - Υπερβολικά ελαφρύ - - - Light - Ελαφρύ - - - Ultra black - Υπερβολικά μαύρο - - - Black - Μαύρο - - - Bold - Έντονο - - - Demi bold - Ελαφρώς έντονο - - - Italic - Πλάγια - - - - Input custom date format - Εισαγωγή προσαρμοσμένης μορφής ημερομηνίας - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - Οι ερμηνευόμενες ακολουθίες της μορφής της ημερομηνίας είναι: - -d η ημέρα ως αριθμός δίχως το αρχικό μηδενικό (1 ως 31) -dd η ημέρα ως αριθμός με το αρχικό μηδενικό (01 ως 31) -ddd η συντομογραφημένη τοπικοποιημένη ονομασία της ημέρας (π.χ. «Δευ» ως «Κυρ»). -dddd η μακριά τοπικοποιημένη ονομασία της ημέρας (π.χ. «Δευτέρα» ως «Κυριακή»). -M ο μήνας ως αριθμός δίχως το αρχικό μηδενικό (1-12) -MM ο μήνας ως αριθμός με το αρχικό μηδενικό (01-12) -MMM η συντομογραφημένη τοπικοποιημένη ονομασία του μήνα (π.χ. «Ιαν» ως «Δεκ»). -MMMM η μακριά τοπικοποιημένη ονομασία του μήνα (π.χ. «Ιανουάριος» ως «Δεκέμβριος»). -yy το έτος ως διψήφιος αριθμός (00-99) -yyyy το έτος ως τετραψήφιος αριθμός - -Όλοι οι λοιποί χαρακτήρες εισόδου θα διαχειριστούν ως κείμενο. -Οποιαδήποτε ακολουθία χαρακτήρων που εγκλείονται σε μονά εισαγωγικά (') -θα διαχειρίζονται επίσης ως κείμενο και δεν θα χρησιμοποιούνται ως έκφραση. - - -Προσαρμοσμένη μορφή ημερομηνίας: - - - diff --git a/plugin-clock/translations/clock_eo.ts b/plugin-clock/translations/clock_eo.ts deleted file mode 100644 index e68e1f7..0000000 --- a/plugin-clock/translations/clock_eo.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - Agordoj de horloĝo de LXQt - - - - Clock Settings - - - - - Time - Tempo - - - - &Show seconds - Montri &sekundojn - - - - 12 &hour style - 12-&hora aranĝo - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - &Font - &Tiparo - - - Font - Tiparo - - - - Date - Dato - - - Show &date - Montri &daton - - - D&ate format - &Aranĝo de dato - - - Fon&t - &Tiparo - - - Show date in &new line - Montri daton en &nova linio - - - &Use theme fonts - &Uzi tiparojn de etoso - - - Time font - Tiparo de tempo - - - Date font - Tiparo de dato - - - Ultra light - Tre maldike - - - Light - Maldike - - - Ultra black - Tre nigre - - - Black - Nigre - - - Bold - Dike - - - Demi bold - Mezdike - - - Italic - Kursive - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_es.ts b/plugin-clock/translations/clock_es.ts deleted file mode 100644 index ef9efd8..0000000 --- a/plugin-clock/translations/clock_es.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - Configuración del reloj de LXQt - - - - Clock Settings - - - - - Time - Hora - - - - &Show seconds - &Mostrar segundos - - - - 12 &hour style - Estilo de 12 &horas - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - &Font - &Fuente - - - Font - Fuente - - - - Date - Fecha - - - Show &date - Mostrar &fecha - - - D&ate format - Formato de &fecha - - - Fon&t - Fuen&te - - - Show date in &new line - Mostrar fecha en &nueva línea - - - &Use theme fonts - &Usar fuente del tema - - - Time font - Fuente de la hora - - - Date font - Fuente de la fecha - - - Ultra light - Ultra ligero - - - Light - Ligero - - - Ultra black - Ultra negro - - - Black - Negro - - - Bold - Negrita - - - Demi bold - Semi negrita - - - Italic - Cursiva - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_es_UY.ts b/plugin-clock/translations/clock_es_UY.ts deleted file mode 100644 index e68599e..0000000 --- a/plugin-clock/translations/clock_es_UY.ts +++ /dev/null @@ -1,117 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - Configuración de Reloj LXQt - - - - Clock Settings - - - - - Time - Hora - - - - &Show seconds - - - - - 12 &hour style - - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - - Date - Fecha - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_es_VE.ts b/plugin-clock/translations/clock_es_VE.ts deleted file mode 100644 index 078baf9..0000000 --- a/plugin-clock/translations/clock_es_VE.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - Configuración de Reloj LXQt - - - - Clock Settings - - - - - Time - Hora - - - - &Show seconds - Mostrar &Segundos - - - - 12 &hour style - Estilo 12 &horas - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - &Font - &Fuente - - - Font - Fuente - - - - Date - Fecha - - - Show &date - Mostrar &fecha - - - D&ate format - Formato &De Fecha - - - Fon&t - Fuen&te - - - Show date in &new line - Mostrar la fecha en una &nueva linea - - - &Use theme fonts - &Usar las letras del tema - - - Time font - Fuente de hora - - - Date font - Fuente de fecha - - - Ultra light - Ultra delgada - - - Light - Delgada - - - Ultra black - Ultra negrita - - - Black - Negra - - - Bold - Negrita - - - Demi bold - Semi negrilla - - - Italic - Italica - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_eu.ts b/plugin-clock/translations/clock_eu.ts deleted file mode 100644 index ea721e4..0000000 --- a/plugin-clock/translations/clock_eu.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - LXQt erlojuaren ezarpenak - - - - Clock Settings - - - - - Time - Ordua - - - - &Show seconds - &Erakutsi segundoak - - - - 12 &hour style - 12 &orduko estiloa - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - &Font - &Letra-tipoa - - - Font - Letra-tipoa - - - - Date - Data - - - Show &date - Erakutsi &data - - - D&ate format - D&ata-formatua - - - Fon&t - Letra-&tipoa - - - Show date in &new line - Erakutsi data lerro &berri batean - - - &Use theme fonts - &Erabili letra-tipoen gaiak - - - Time font - Orduaren letra-tipoa - - - Date font - Dataren letra-tipoa - - - Ultra light - Ultra argia - - - Light - Argia - - - Ultra black - Ultra beltza - - - Black - Beltza - - - Bold - Lodia - - - Demi bold - Erdi-lodia - - - Italic - Etzana - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_fi.ts b/plugin-clock/translations/clock_fi.ts deleted file mode 100644 index 497f346..0000000 --- a/plugin-clock/translations/clock_fi.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - LXQtin kellon asetukset - - - - Clock Settings - - - - - Time - Aika - - - - &Show seconds - &Näytä sekunnit - - - - 12 &hour style - &12 tunnin esitystapa - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - &Font - &Kirjasin - - - Font - Kirjasin - - - - Date - Päivä - - - Show &date - Näytä &päivä - - - D&ate format - Päiväyksen &muoto - - - Fon&t - Ki&rjasin - - - Show date in &new line - Näytä päivä &omalla rivillä - - - &Use theme fonts - Käytä &teeman kirjasimia - - - Time font - Kirjasin aikaa varten - - - Date font - Kirjasin päiväystä varten - - - Ultra light - Todella vaalea - - - Light - Vaalea - - - Ultra black - Todella musta - - - Black - Musta - - - Bold - Lihavoitu - - - Demi bold - Hieman lihavoitu - - - Italic - Kursivoitu - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_fr_FR.ts b/plugin-clock/translations/clock_fr_FR.ts deleted file mode 100644 index 300a1e3..0000000 --- a/plugin-clock/translations/clock_fr_FR.ts +++ /dev/null @@ -1,129 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - Paramètres de l'horloge de LXQt - - - - Clock Settings - - - - - Time - Heure - - - - &Show seconds - &Montrer les secondes - - - - 12 &hour style - - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - Font - Police - - - - Date - Date - - - Bold - Gras - - - Italic - Italique - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_hu.ts b/plugin-clock/translations/clock_hu.ts deleted file mode 100644 index f067c9a..0000000 --- a/plugin-clock/translations/clock_hu.ts +++ /dev/null @@ -1,131 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - - Clock Settings - Órabeállítás - - - - Time - Idő - - - - &Show seconds - Má&sodpercek - - - - 12 &hour style - 12 órás &stílus - - - - &Use UTC - &UTC használat - - - - &Do not show date - Ne legyen &dátum - - - - Show date &before time - &Dátum az óra előtt - - - - Show date &after time - Dátum &az óra után - - - - Show date below time on new &line - Dátum az órával új sorban - - - - First day of week in calendar - A hét első napja - - - - Orientation - Helyzet - - - - Auto&rotate when the panel is vertical - Függélyes panelnél automata görgetés - - - - Date - Dátum - - - - Date &format - Dá&tumalak - - - - Input custom date format - Egyéni dátumalak - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - Értelmezett dátumformázások: - -d a nap számként bevezető nulla nélkül (1 - 31) -dd a nap számként bevezető nullával (01 - 31) -ddd a nap rövid neve (e.g. 'Mon' to 'Sun'). -dddd a nap hosszú neve (e.g. 'Monday' to 'Sunday'). -M a hónap számként bevezető nulla nélkül (1-12) -MM a hónap számként bevezető nullával (01-12) -MMM a hónap rövid neve (e.g. 'Jan' to 'Dec'). -MMMM a hónap hosszú neve (e.g. 'January' to 'December'). -yy az év két számjeggyel (00-99) -yyyy az év négy számjeggyel - -MInden más karakter szövegként értelmeződik. -Sima zárójelbe (') tett karaktersorozat szövegként van kezelve, -tehát az nem kifejezés. - - -Egyéni dátumalak: - - - diff --git a/plugin-clock/translations/clock_hu_HU.ts b/plugin-clock/translations/clock_hu_HU.ts deleted file mode 100644 index d75fbca..0000000 --- a/plugin-clock/translations/clock_hu_HU.ts +++ /dev/null @@ -1,131 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - - Clock Settings - Órabeállítás - - - - Time - Idő - - - - &Show seconds - Má&sodpercek - - - - 12 &hour style - 12 órás &stílus - - - - &Use UTC - &UTC használat - - - - &Do not show date - Ne legyen &dátum - - - - Show date &before time - &Dátum az óra előtt - - - - Show date &after time - Dátum &az óra után - - - - Show date below time on new &line - Dátum az órával új sorban - - - - First day of week in calendar - A hét első napja - - - - Orientation - Helyzet - - - - Auto&rotate when the panel is vertical - Függélyes panelnél automata görgetés - - - - Date - Dátum - - - - Date &format - Dá&tumalak - - - - Input custom date format - Egyéni dátumalak - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - Értelmezett dátumformázások: - -d a nap számként bevezető nulla nélkül (1 - 31) -dd a nap számként bevezető nullával (01 - 31) -ddd a nap rövid neve (e.g. 'Mon' to 'Sun'). -dddd a nap hosszú neve (e.g. 'Monday' to 'Sunday'). -M a hónap számként bevezető nulla nélkül (1-12) -MM a hónap számként bevezető nullával (01-12) -MMM a hónap rövid neve (e.g. 'Jan' to 'Dec'). -MMMM a hónap hosszú neve (e.g. 'January' to 'December'). -yy az év két számjeggyel (00-99) -yyyy az év négy számjeggyel - -MInden más karakter szövegként értelmeződik. -Sima zárójelbe (') tett karaktersorozat szövegként van kezelve, -tehát az nem kifejezés. - - -Egyéni dátumalak: - - - diff --git a/plugin-clock/translations/clock_ia.ts b/plugin-clock/translations/clock_ia.ts deleted file mode 100644 index 18a7634..0000000 --- a/plugin-clock/translations/clock_ia.ts +++ /dev/null @@ -1,113 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - - Clock Settings - - - - - Time - - - - - &Show seconds - - - - - 12 &hour style - - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - - Date - - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_id_ID.ts b/plugin-clock/translations/clock_id_ID.ts deleted file mode 100644 index 2b1de00..0000000 --- a/plugin-clock/translations/clock_id_ID.ts +++ /dev/null @@ -1,117 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - Setting Waktu LXQt - - - - Clock Settings - - - - - Time - Waktu - - - - &Show seconds - - - - - 12 &hour style - - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - - Date - Tanggal - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_it.ts b/plugin-clock/translations/clock_it.ts deleted file mode 100644 index a1cdceb..0000000 --- a/plugin-clock/translations/clock_it.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - <basato su locale> - - - - LXQtClockConfiguration - - LXQt Clock Settings - Impostazioni dell'orologio di LXQt - - - - Clock Settings - Impostazioni orologio - - - - Time - Ora - - - - &Show seconds - &Mostra i secondi - - - - 12 &hour style - &Stile 12 ore - - - - &Use UTC - &Usa UTC - - - - Date &format - Formato &data - - - - &Do not show date - &Non mostrare la data - - - - Show date &before time - Prima la &data - - - - Show date &after time - Prima l'&ora - - - - Show date below time on new &line - Mostra la data su una &seconda riga - - - - First day of week in calendar - Primo giorno della settimana - - - - Orientation - Orientamento - - - - Auto&rotate when the panel is vertical - &Ruota automaticamente se il panello è verticale - - - &Font - &Carattere - - - Font - Carattere - - - - Date - Data - - - Show &date - Mostra la &data - - - D&ate format - &Formato della data - - - Fon&t - Cara&ttere - - - Show date in &new line - Mostra la data in una &nuova riga - - - &Use theme fonts - &Utilizza i caratteri del tema - - - Time font - Carattere dell'ora - - - Date font - Carattere della data - - - Ultra light - Chiarissimo - - - Light - Chiaro - - - Ultra black - Nerissimo - - - Black - Nero - - - Bold - Grassetto - - - Demi bold - Neretto - - - Italic - Corsivo - - - - Input custom date format - Formato personalizzato - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_ja.ts b/plugin-clock/translations/clock_ja.ts deleted file mode 100644 index a574093..0000000 --- a/plugin-clock/translations/clock_ja.ts +++ /dev/null @@ -1,131 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - - Clock Settings - 時計の設定 - - - - Time - 時刻 - - - - &Show seconds - 秒を表示(&S) - - - - 12 &hour style - 12時間表示(&H) - - - - &Use UTC - UTCを使用する(&U) - - - - Date &format - 日時の形式(&F) - - - - &Do not show date - 日付を表示しない(&D) - - - - Show date &before time - 日付のあとに時刻(&B) - - - - Show date &after time - 時刻のあとに日付(&A) - - - - Show date below time on new &line - 時刻の下に日付(&L) - - - - First day of week in calendar - - - - - Orientation - 回転 - - - - Auto&rotate when the panel is vertical - パネルが縦のときに自動回転(&R) - - - - Date - 日付 - - - - Input custom date format - 日付の表示形式を指定 - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - 解釈される記法: - -d 日(ゼロなし) (1 - 31) -dd 日(ゼロ埋め) (01 - 31) -ddd 曜日（短い） ('月' - '日') -dddd 曜日（長い） ('月曜日' - '日曜日') -M 月（ゼロなし） (1 - 12) -MM 月（ゼロ埋め） (01 - 12) -MMM 月の名称（短い） ('1月' - '12月') -MMMM 月の名称 (長い） ('1月' - '12月'、※日本語では上記と同じ) -yy 西暦年(2桁) (00 - 99) -yyyy 西暦年(4桁) - -そのほかの文字は解釈されず、テキストとして表示されます。 -上記の解釈される文字も、シングルクオーテーション(')で括ると -一般の文字として扱われ、上記の解釈はされません。 - - -日付形式の指定: - - - diff --git a/plugin-clock/translations/clock_ko.ts b/plugin-clock/translations/clock_ko.ts deleted file mode 100644 index 46a068b..0000000 --- a/plugin-clock/translations/clock_ko.ts +++ /dev/null @@ -1,113 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - - Clock Settings - - - - - Time - - - - - &Show seconds - - - - - 12 &hour style - - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - - Date - - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_lt.ts b/plugin-clock/translations/clock_lt.ts deleted file mode 100644 index ad9068e..0000000 --- a/plugin-clock/translations/clock_lt.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - LXQt laikrodžio nuostatos - - - - Clock Settings - - - - - Time - Laikas - - - - &Show seconds - &Rodyti sekundes - - - - 12 &hour style - 12 &valandų stilius - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - &Font - Šri&ftas - - - Font - Šriftas - - - - Date - Data - - - Show &date - Rodyti &datą - - - D&ate format - D&atos formatas - - - Fon&t - Šrif&tas - - - Show date in &new line - Datą rodyti &naujoje eilutėje - - - &Use theme fonts - Na&udoti apipavidalinimo šriftus - - - Time font - Laiko šriftas - - - Date font - Datos šriftas - - - Ultra light - Ypač lengvas - - - Light - Lengvas - - - Ultra black - Ypač juodas - - - Black - Juodas - - - Bold - Pusjuodis - - - Demi bold - Šiek tiek pastorintas - - - Italic - Pasviręs - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_nl.ts b/plugin-clock/translations/clock_nl.ts deleted file mode 100644 index 964fbaf..0000000 --- a/plugin-clock/translations/clock_nl.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - Instellingen van LXQt Klok - - - - Clock Settings - - - - - Time - Tijd - - - - &Show seconds - &Toon seconden - - - - 12 &hour style - 12 &uur stijl - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - &Font - &Lettertype - - - Font - Lettertype - - - - Date - Datum - - - Show &date - Toon &datum - - - D&ate format - Datumnotatie - - - Fon&t - Lettertype - - - Show date in &new line - Toon datum in &nieuwe regel - - - &Use theme fonts - &Gebruik lettertypes van thema - - - Time font - Lettertype voor de tijd - - - Date font - Lettertype voor de datum - - - Ultra light - Ultralicht - - - Light - Licht - - - Ultra black - Ultrazwart - - - Black - Zwart - - - Bold - Vet - - - Demi bold - Halfvet - - - Italic - Schuin - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_pl_PL.ts b/plugin-clock/translations/clock_pl_PL.ts deleted file mode 100644 index 402dfe6..0000000 --- a/plugin-clock/translations/clock_pl_PL.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - Ustawienia zegara LXQt - - - - Clock Settings - Ustawienia zegara - - - - Time - Czas - - - - &Show seconds - &Pokaż sekundy - - - - 12 &hour style - 12 &godzinny styl - - - - &Use UTC - &Użyj UTC - - - - Date &format - &Format daty - - - - &Do not show date - &Nie pokazuj daty - - - - Show date &before time - Poka&ż datę przed godziną - - - - Show date &after time - Pokaż datę &za godziną - - - - Show date below time on new &line - Pokaż datę pod godziną w nowej &linii - - - - First day of week in calendar - - - - - Orientation - Orientacja - - - - Auto&rotate when the panel is vertical - Ob&róć gdy panel jest pionowy - - - &Font - &Czcionka - - - Font - Czcionka - - - - Date - Data - - - Show &date - Pokaż &date - - - D&ate format - Format C&zasu - - - Fon&t - Czcionk&a - - - Show date in &new line - Pokaż datę w &nowej linii - - - &Use theme fonts - &Użyj motywów czcionek - - - Time font - Czcionka czasu - - - Date font - Czcionka daty - - - Ultra light - Bardzo cienka - - - Light - Cienka - - - Ultra black - Bardzo czarna - - - Black - Czarna - - - Bold - Pogrubiona - - - Demi bold - Wpół pogrubiona - - - Italic - Kursywa - - - - Input custom date format - Własny format daty - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_pt.ts b/plugin-clock/translations/clock_pt.ts deleted file mode 100644 index 9584f1b..0000000 --- a/plugin-clock/translations/clock_pt.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - Definições do relógio LXQt - - - - Clock Settings - - - - - Time - Horas - - - - &Show seconds - Mo&strar segundos - - - - 12 &hour style - Estilo 12 &horas - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - &Font - Tipo &de letra - - - Font - Tipo de letra - - - - Date - Data - - - Show &date - Mostrar &data - - - D&ate format - Form&ato da data - - - Fon&t - &Tipo de letra - - - Show date in &new line - Mostrar data em linha disti&nta - - - &Use theme fonts - &Utilizar tipo de letra do tema - - - Time font - Tipo de letra das horas - - - Date font - Tipo de letra da data - - - Ultra light - Mais clara - - - Light - Clara - - - Ultra black - Normal carregado - - - Black - Normal - - - Bold - Negrito - - - Demi bold - Negrito suave - - - Italic - Itálico - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_pt_BR.ts b/plugin-clock/translations/clock_pt_BR.ts deleted file mode 100644 index 78fe9dc..0000000 --- a/plugin-clock/translations/clock_pt_BR.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - Configurações do relógio do LXQt - - - - Clock Settings - - - - - Time - Hora - - - - &Show seconds - &Mostrar segundos - - - - 12 &hour style - Estilo 12 &horas - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - &Font - &Fonte - - - Font - Fonte - - - - Date - Data - - - Show &date - Mostrar &data - - - D&ate format - Formato da d&ata - - - Fon&t - Fon&te - - - Show date in &new line - Mostrar data em &nova linha - - - &Use theme fonts - &Utilizar fontes do tema - - - Time font - Fonte da hora - - - Date font - Fonte da data - - - Ultra light - Super claro - - - Light - Claro - - - Ultra black - Super escuro - - - Black - Escuro - - - Bold - Negrito - - - Demi bold - Semi negrito - - - Italic - Itálico - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_ro_RO.ts b/plugin-clock/translations/clock_ro_RO.ts deleted file mode 100644 index 56fc32e..0000000 --- a/plugin-clock/translations/clock_ro_RO.ts +++ /dev/null @@ -1,147 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - <bazat pe localizare> - - - - LXQtClockConfiguration - - LXQt Clock Settings - Setări ceas LXQt - - - - Clock Settings - Setări ceas - - - - Time - Oră - - - - &Show seconds - Afișează &secundele - - - - 12 &hour style - Stil 12 de &ore - - - - &Use UTC - &Utilizează UTC - - - - Date &format - &Formatul datei - - - - &Do not show date - &Nu afișa data - - - - Show date &before time - Afișează data &înaintea orei - - - - Show date &after time - Afișează data &după timp - - - - Show date below time on new &line - Afișează data pe un &rând nou sub oră - - - - First day of week in calendar - Prima zi a săptămânii - - - - Orientation - Orientare - - - - Auto&rotate when the panel is vertical - Rotire automată când panoul e vertical - - - - Date - Dată - - - Show &date - Afișează &data - - - D&ate format - Format d&ată - - - Show date in &new line - Afișează data pe rând &nou - - - - Input custom date format - Format de dată personalizat - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - Secvențe interpretate pentru formatarea datei sunt: - -d numărul zilei fără zero în față (între 1 și 31) -dd numărul zilei cu zero în față (între 01 și 31) -ddd numele abreviat al zilei (de ex. 'Lu' până 'Du'). -dddd numele lung al zilei (de ex. 'Luni' până 'Duminică'). -M numărul lunii fără zero în față (1-12) -MM numărul lunii cu zero în față (01-12) -MMM numele abreviat și localizat al lunii (de ex. 'Ian' - 'Dec'). -MMMM numele lung și localizat al lunii (de ex. 'Ianuarie' - 'December'). -yy anul ca un număr din 2 cifre (00-99) -yyyy anul ca un număr din 4 cifre - -Orice alt caracter introdus va fi tratat ca text. -Orice secvență de caractere intre ghilimele simple (') -vor fi la fel tratate ca text si nu vor fi interpretate in expresie. - - -Format de dată personalizat: - - - diff --git a/plugin-clock/translations/clock_ru.desktop b/plugin-clock/translations/clock_ru.desktop index c2f060c..c5bc1dc 100644 --- a/plugin-clock/translations/clock_ru.desktop +++ b/plugin-clock/translations/clock_ru.desktop @@ -8,5 +8,5 @@ Comment=Displays the current time. Comes with a calendar. # Translations -Comment[ru]=Часы и календарь +Comment[ru]=Отображение текущего времени. Поставляется с календарем. Name[ru]=Дата и время diff --git a/plugin-clock/translations/clock_ru.ts b/plugin-clock/translations/clock_ru.ts deleted file mode 100644 index 9f0a591..0000000 --- a/plugin-clock/translations/clock_ru.ts +++ /dev/null @@ -1,131 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - - Clock Settings - Настройка даты и времени - - - - Time - Время - - - - &Show seconds - &Показывать секунды - - - - 12 &hour style - 12 &часовой формат - - - - &Use UTC - &Использовать UTC - - - - Date - Дата - - - - Date &format - Ф&ормат даты - - - - &Do not show date - &Не показывать дату - - - - Show date &before time - Показывать дату &перед временем - - - - Show date &after time - Показывать дату &после времени - - - - Show date below time on new &line - Показывать дату под временем новой &строкой - - - - First day of week in calendar - - - - - Orientation - Ориентация - - - - Auto&rotate when the panel is vertical - Авто&поворот для вертикальной панели - - - - Input custom date format - Введите свой формат даты - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - Интерпретация последовательностей формата даты: - -d день как число без ноля перед ним (от 1 до 31) -dd день как число с нолём перед ним (от 01 до 31) -ddd аббревиат́ура названия дня недели (от «Пн» к «Вс»). -dddd полное название дня недели (от «Понедельник» к «Воскресенье»). -M месяц как число без ноля перед ним (от 1 до 12) -MM месяц как число с нолём перед ним (от 01 до 12) -MMM аббревиат́ура названия месяца (от «Янв» до «Дек»). -MMMM полное название месяца (от «Январь» до «Декабрь»). -yy год как двухразрядное число (00-99) -yyyy год как четырёхразрядное число - -Все прочие введёные знаки будут обработаны как текст. -Любая последовательность знаков, заключённая в одинарные кавычки ('), -также будет обработана как текст и не будет использована в выражении. - - -Свой формат даты: - - - diff --git a/plugin-clock/translations/clock_ru_RU.desktop b/plugin-clock/translations/clock_ru_RU.desktop deleted file mode 100644 index f277a45..0000000 --- a/plugin-clock/translations/clock_ru_RU.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ru_RU]=Часы и календарь -Name[ru_RU]=Дата и время diff --git a/plugin-clock/translations/clock_ru_RU.ts b/plugin-clock/translations/clock_ru_RU.ts deleted file mode 100644 index 091b489..0000000 --- a/plugin-clock/translations/clock_ru_RU.ts +++ /dev/null @@ -1,131 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - - Clock Settings - Настройка даты и времени - - - - Time - Время - - - - &Show seconds - &Показывать секунды - - - - 12 &hour style - 12 &часовой формат - - - - &Use UTC - &Использовать UTC - - - - Date - Дата - - - - Date &format - Ф&ормат даты - - - - &Do not show date - &Не показывать дату - - - - Show date &before time - Показывать дату &перед временем - - - - Show date &after time - Показывать дату &после времени - - - - Show date below time on new &line - Показывать дату под временем новой &строкой - - - - First day of week in calendar - - - - - Orientation - Ориентация - - - - Auto&rotate when the panel is vertical - Авто&поворот для вертикальной панели - - - - Input custom date format - Введите свой формат даты - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - Интерпретация последовательностей формата даты: - -d день как число без ноля перед ним (от 1 до 31) -dd день как число с нолём перед ним (от 01 до 31) -ddd аббревиат́ура названия дня недели (от «Пн» к «Вс»). -dddd полное название дня недели (от «Понедельник» к «Воскресенье»). -M месяц как число без ноля перед ним (от 1 до 12) -MM месяц как число с нолём перед ним (от 01 до 12) -MMM аббревиат́ура названия месяца (от «Янв» до «Дек»). -MMMM полное название месяца (от «Январь» до «Декабрь»). -yy год как двухразрядное число (00-99) -yyyy год как четырёхразрядное число - -Все прочие введёные знаки будут обработаны как текст. -Любая последовательность знаков, заключённая в одинарные кавычки ('), -также будет обработана как текст и не будет использована в выражении. - - -Свой формат даты: - - - diff --git a/plugin-clock/translations/clock_sk_SK.ts b/plugin-clock/translations/clock_sk_SK.ts deleted file mode 100644 index a753997..0000000 --- a/plugin-clock/translations/clock_sk_SK.ts +++ /dev/null @@ -1,117 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - Nastavenia hodín prostredia LXQt - - - - Clock Settings - - - - - Time - Čas - - - - &Show seconds - - - - - 12 &hour style - - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - - Date - Dátum - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_sl.ts b/plugin-clock/translations/clock_sl.ts deleted file mode 100644 index 4e6c3f7..0000000 --- a/plugin-clock/translations/clock_sl.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - Nastavitve ure za LXQt - - - - Clock Settings - - - - - Time - Čas - - - - &Show seconds - Pokaži &sekunde - - - - 12 &hour style - 12-&urni slog - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - &Font - &Pisava - - - Font - Pisava - - - - Date - Datum - - - Show &date - Pokaži &datum - - - D&ate format - &Oblika datuma - - - Fon&t - P&isava - - - Show date in &new line - Pokaži datum v &novi vrstici - - - &Use theme fonts - &Uporabi pisavo teme - - - Time font - Pisava za čas - - - Date font - Pisava za datum - - - Ultra light - Ultra lahko - - - Light - Lahko - - - Ultra black - Ultra krepko - - - Black - Krepko - - - Bold - Polkrepko - - - Demi bold - Pol-polkrepko - - - Italic - Ležeče - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_sr@latin.ts b/plugin-clock/translations/clock_sr@latin.ts deleted file mode 100644 index e26bd76..0000000 --- a/plugin-clock/translations/clock_sr@latin.ts +++ /dev/null @@ -1,113 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - - Clock Settings - - - - - Time - - - - - &Show seconds - - - - - 12 &hour style - - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - - Date - - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_sr_BA.ts b/plugin-clock/translations/clock_sr_BA.ts deleted file mode 100644 index 0dc39d7..0000000 --- a/plugin-clock/translations/clock_sr_BA.ts +++ /dev/null @@ -1,137 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - Подешавање Рејзоровог сата - - - - Clock Settings - - - - - Time - Вријеме - - - - &Show seconds - - - - - 12 &hour style - - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - Show seconds - Прикажи секунде - - - 12 hour style - 12-часовни сат - - - - Date - Датум - - - Show date - Прикажи датум - - - Show date in new line - Прикажи датум у новој линији - - - Date format - Формат датума - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_sr_RS.ts b/plugin-clock/translations/clock_sr_RS.ts deleted file mode 100644 index 3e3482e..0000000 --- a/plugin-clock/translations/clock_sr_RS.ts +++ /dev/null @@ -1,117 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - Подешавање Рејзоровог сата - - - - Clock Settings - - - - - Time - Време - - - - &Show seconds - - - - - 12 &hour style - - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - - Date - Датум - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_th_TH.ts b/plugin-clock/translations/clock_th_TH.ts deleted file mode 100644 index 476d56f..0000000 --- a/plugin-clock/translations/clock_th_TH.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - ค่าตั้งนาฬิกา LXQt - - - - Clock Settings - - - - - Time - เวลา - - - - &Show seconds - แ&สดงวินาที - - - - 12 &hour style - รูปแบบ 12 ชั่วโ&มง - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - &Font - แบบอั&กษร - - - Font - แบบอักษร - - - - Date - วันที่ - - - Show &date - แสดง&เวลา - - - D&ate format - รูปแ&บบวันที่ - - - Fon&t - แบบอักษ&ร - - - Show date in &new line - แสดงวันที่ในบรรทัดใ&หม่ - - - &Use theme fonts - &ใช้แบบอักษรของชุดตกแต่ง - - - Time font - แบบอักษรของเวลา - - - Date font - แบบอักษรของวันที่ - - - Ultra light - สว่างจ้า - - - Light - สว่าง - - - Ultra black - ดำมืด - - - Black - ดำ - - - Bold - ตัวหนา - - - Demi bold - ตัวกึ่งหนา - - - Italic - ตัวเอียง - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_tr.ts b/plugin-clock/translations/clock_tr.ts deleted file mode 100644 index cb9fe0f..0000000 --- a/plugin-clock/translations/clock_tr.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - LXQt Saat Ayarları - - - - Clock Settings - - - - - Time - Zaman - - - - &Show seconds - &Saniyeyi göster - - - - 12 &hour style - 12 saatlik &gösterim biçimi - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - &Font - &Yazı tipi - - - Font - Yazı Tipi - - - - Date - Tarih - - - Show &date - Tarihi gö&ster - - - D&ate format - T&arih biçimi - - - Fon&t - Yazı &Tipi - - - Show date in &new line - Tarihi &yeni satırda göster - - - &Use theme fonts - &Tema yazıtipini kullan - - - Time font - Zaman yazı tipi - - - Date font - Tarih yazıtipi - - - Ultra light - Aşırı ince - - - Light - Hafif - - - Ultra black - Aşırı siyah - - - Black - Siyah - - - Bold - Koyu - - - Demi bold - Yarı koyu - - - Italic - Eğik - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_uk.ts b/plugin-clock/translations/clock_uk.ts deleted file mode 100644 index 2b4d2e3..0000000 --- a/plugin-clock/translations/clock_uk.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - Налаштування годинника LXQt - - - - Clock Settings - - - - - Time - Час - - - - &Show seconds - Показувати &секунди - - - - 12 &hour style - 12-&годинний стиль - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - &Font - &Шрифт - - - Font - Шрифт - - - - Date - Дата - - - Show &date - Показувати &дату - - - D&ate format - Формат д&ати - - - Fon&t - Шриф&т - - - Show date in &new line - Показувати дату в &новому рядку - - - &Use theme fonts - &Використовувати шрифти з теми - - - Time font - Шрифт часу - - - Date font - Шрифт дати - - - Ultra light - Надтонкий - - - Light - Тонкий - - - Ultra black - Дуже темний - - - Black - Темний - - - Bold - Жирний - - - Demi bold - Напівжирний - - - Italic - Нахилений - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_zh_CN.ts b/plugin-clock/translations/clock_zh_CN.ts deleted file mode 100644 index 0bc763b..0000000 --- a/plugin-clock/translations/clock_zh_CN.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - LXQt时钟设置 - - - - Clock Settings - - - - - Time - 时间 - - - - &Show seconds - 显示秒(&S) - - - - 12 &hour style - 12小时样式(&H) - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - &Font - 字体(&F) - - - Font - 字体 - - - - Date - 日期 - - - Show &date - 显示日期(&D) - - - D&ate format - 日期格式(&A) - - - Fon&t - 字体(&T) - - - Show date in &new line - 在新行显示日期(&N) - - - &Use theme fonts - 使用主题字体(&U) - - - Time font - 时间字体 - - - Date font - 日期字体 - - - Ultra light - 超亮 - - - Light - 亮 - - - Ultra black - 超黑 - - - Black - 黑 - - - Bold - 黑体 - - - Demi bold - 半粗体 - - - Italic - 斜体 - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-clock/translations/clock_zh_TW.ts b/plugin-clock/translations/clock_zh_TW.ts deleted file mode 100644 index cb48389..0000000 --- a/plugin-clock/translations/clock_zh_TW.ts +++ /dev/null @@ -1,181 +0,0 @@ - - - - - FirstDayCombo - - - <locale based> - - - - - LXQtClockConfiguration - - LXQt Clock Settings - LXQt時鐘設定 - - - - Clock Settings - - - - - Time - 時間 - - - - &Show seconds - 顯示秒(&S) - - - - 12 &hour style - 十二小時制(&h) - - - - &Use UTC - - - - - Date &format - - - - - &Do not show date - - - - - Show date &before time - - - - - Show date &after time - - - - - Show date below time on new &line - - - - - First day of week in calendar - - - - - Orientation - - - - - Auto&rotate when the panel is vertical - - - - &Font - 字體(&F) - - - Font - 字體 - - - - Date - 日期 - - - Show &date - 顯示日期(&d) - - - D&ate format - 日期格式(&a) - - - Fon&t - 字體(&t) - - - Show date in &new line - 日期顯示在下一行中 - - - &Use theme fonts - 使用主題預設字體(&U) - - - Time font - 時間的字體 - - - Date font - 日期的字體 - - - Ultra light - 極亮 - - - Light - 亮 - - - Ultra black - 極暗 - - - Black - 暗 - - - Bold - 粗體 - - - Demi bold - 半粗體 - - - Italic - 斜體 - - - - Input custom date format - - - - - Interpreted sequences of date format are: - -d the day as number without a leading zero (1 to 31) -dd the day as number with a leading zero (01 to 31) -ddd the abbreviated localized day name (e.g. 'Mon' to 'Sun'). -dddd the long localized day name (e.g. 'Monday' to 'Sunday'). -M the month as number without a leading zero (1-12) -MM the month as number with a leading zero (01-12) -MMM the abbreviated localized month name (e.g. 'Jan' to 'Dec'). -MMMM the long localized month name (e.g. 'January' to 'December'). -yy the year as two digit number (00-99) -yyyy the year as four digit number - -All other input characters will be treated as text. -Any sequence of characters that are enclosed in single quotes (') -will also be treated as text and not be used as an expression. - - -Custom date format: - - - - diff --git a/plugin-colorpicker/colorpicker.cpp b/plugin-colorpicker/colorpicker.cpp index 5124394..9c12f65 100644 --- a/plugin-colorpicker/colorpicker.cpp +++ b/plugin-colorpicker/colorpicker.cpp @@ -64,6 +64,7 @@ ColorPickerWidget::ColorPickerWidget(QWidget *parent): layout->addWidget (&mLineEdit); + mButton.setAutoRaise(true); mButton.setIcon(XdgIcon::fromTheme("color-picker", "kcolorchooser")); mCapturing = false; diff --git a/plugin-colorpicker/translations/colorpicker.ts b/plugin-colorpicker/translations/colorpicker.ts deleted file mode 100644 index 6401616..0000000 --- a/plugin-colorpicker/translations/colorpicker.ts +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/plugin-colorpicker/translations/colorpicker_ar.desktop b/plugin-colorpicker/translations/colorpicker_ar.desktop new file mode 100644 index 0000000..c4794cb --- /dev/null +++ b/plugin-colorpicker/translations/colorpicker_ar.desktop @@ -0,0 +1,2 @@ +Name[ar]=لاقط الألوان +Comment[ar]=اعرف اللون تحت المؤشّر. لمطوّري الوِبّ. diff --git a/plugin-colorpicker/translations/colorpicker_ru_RU.desktop b/plugin-colorpicker/translations/colorpicker_ru_RU.desktop deleted file mode 100644 index 9c3de34..0000000 --- a/plugin-colorpicker/translations/colorpicker_ru_RU.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Color picker -Comment=Get the color under the cursor. For web developers. - - -# Translations -Comment[ru_RU]=Получить цвет под курсором мыши. Для веб-разработчиков. -Name[ru_RU]=Цветовая палитра \ No newline at end of file diff --git a/plugin-cpuload/lxqtcpuload.cpp b/plugin-cpuload/lxqtcpuload.cpp index f712672..cad546d 100644 --- a/plugin-cpuload/lxqtcpuload.cpp +++ b/plugin-cpuload/lxqtcpuload.cpp @@ -27,6 +27,7 @@ #include "lxqtcpuload.h" #include "../panel/ilxqtpanelplugin.h" +#include "../panel/pluginsettings.h" #include #include #include diff --git a/plugin-cpuload/lxqtcpuloadconfiguration.cpp b/plugin-cpuload/lxqtcpuloadconfiguration.cpp index d4d400f..8e320e0 100644 --- a/plugin-cpuload/lxqtcpuloadconfiguration.cpp +++ b/plugin-cpuload/lxqtcpuloadconfiguration.cpp @@ -33,11 +33,9 @@ #define BAR_ORIENT_LEFTRIGHT "leftRight" #define BAR_ORIENT_RIGHTLEFT "rightLeft" -LXQtCpuLoadConfiguration::LXQtCpuLoadConfiguration(QSettings *settings, QWidget *parent) : - QDialog(parent), - ui(new Ui::LXQtCpuLoadConfiguration), - mSettings(settings), - mOldSettings(settings) +LXQtCpuLoadConfiguration::LXQtCpuLoadConfiguration(PluginSettings *settings, QWidget *parent) : + LXQtPanelPluginConfigDialog(settings, parent), + ui(new Ui::LXQtCpuLoadConfiguration) { setAttribute(Qt::WA_DeleteOnClose); setObjectName("CpuLoadConfigurationWindow"); @@ -75,54 +73,40 @@ void LXQtCpuLoadConfiguration::fillBarOrientations() void LXQtCpuLoadConfiguration::loadSettings() { - ui->showTextCB->setChecked(mSettings->value("showText", false).toBool()); - ui->barWidthSB->setValue(mSettings->value("barWidth", 20).toInt()); - ui->updateIntervalSpinBox->setValue(mSettings->value("updateInterval", 1000).toInt() / 1000.0); + 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); int boIndex = ui->barOrientationCOB->findData( - mSettings->value("barOrientation", BAR_ORIENT_BOTTOMUP)); + settings().value("barOrientation", BAR_ORIENT_BOTTOMUP)); boIndex = (boIndex < 0) ? 1 : boIndex; ui->barOrientationCOB->setCurrentIndex(boIndex); -// QString menuFile = mSettings->value("menu_file", "").toString(); +// QString menuFile = settings().value("menu_file", "").toString(); // if (menuFile.isEmpty()) // { // menuFile = XdgMenu::getMenuFileName(); // } // ui->menuFilePathLE->setText(menuFile); -// ui->shortcutEd->setKeySequence(mSettings->value("shortcut", "Alt+F1").toString()); +// ui->shortcutEd->setKeySequence(settings().value("shortcut", "Alt+F1").toString()); } void LXQtCpuLoadConfiguration::showTextChanged(bool value) { - mSettings->setValue("showText", value); + settings().setValue("showText", value); } void LXQtCpuLoadConfiguration::barWidthChanged(int value) { - mSettings->setValue("barWidth", value); + settings().setValue("barWidth", value); } void LXQtCpuLoadConfiguration::updateIntervalChanged(double value) { - mSettings->setValue("updateInterval", value*1000); + settings().setValue("updateInterval", value*1000); } void LXQtCpuLoadConfiguration::barOrientationChanged(int index) { - mSettings->setValue("barOrientation", ui->barOrientationCOB->itemData(index).toString()); + settings().setValue("barOrientation", ui->barOrientationCOB->itemData(index).toString()); } - -void LXQtCpuLoadConfiguration::dialogButtonsAction(QAbstractButton *btn) -{ - if (ui->buttons->buttonRole(btn) == QDialogButtonBox::ResetRole) - { - mOldSettings.loadToSettings(); - loadSettings(); - } - else - { - close(); - } -} - diff --git a/plugin-cpuload/lxqtcpuloadconfiguration.h b/plugin-cpuload/lxqtcpuloadconfiguration.h index 2c3c41d..0aadebb 100644 --- a/plugin-cpuload/lxqtcpuloadconfiguration.h +++ b/plugin-cpuload/lxqtcpuloadconfiguration.h @@ -29,9 +29,8 @@ #ifndef LXQTCPULOADCONFIGURATION_H #define LXQTCPULOADCONFIGURATION_H -#include - -#include +#include "../panel/lxqtpanelpluginconfigdialog.h" +#include "../panel/pluginsettings.h" class QSettings; class QAbstractButton; @@ -40,18 +39,16 @@ namespace Ui { class LXQtCpuLoadConfiguration; } -class LXQtCpuLoadConfiguration : public QDialog +class LXQtCpuLoadConfiguration : public LXQtPanelPluginConfigDialog { Q_OBJECT public: - explicit LXQtCpuLoadConfiguration(QSettings *settings, QWidget *parent = 0); + explicit LXQtCpuLoadConfiguration(PluginSettings *settings, QWidget *parent = nullptr); ~LXQtCpuLoadConfiguration(); private: Ui::LXQtCpuLoadConfiguration *ui; - QSettings *mSettings; - LXQt::SettingsCache mOldSettings; /* Fills Bar orientation combobox @@ -63,7 +60,6 @@ private slots: Saves settings in conf file. */ void loadSettings(); - void dialogButtonsAction(QAbstractButton *btn); void showTextChanged(bool value); void barWidthChanged(int value); void updateIntervalChanged(double value); diff --git a/plugin-cpuload/translations/cpuload.ts b/plugin-cpuload/translations/cpuload.ts deleted file mode 100644 index 47c7e27..0000000 --- a/plugin-cpuload/translations/cpuload.ts +++ /dev/null @@ -1,70 +0,0 @@ - - - - - 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 --git a/plugin-cpuload/translations/cpuload_ar.desktop b/plugin-cpuload/translations/cpuload_ar.desktop index 5e1bed3..66c912b 100644 --- a/plugin-cpuload/translations/cpuload_ar.desktop +++ b/plugin-cpuload/translations/cpuload_ar.desktop @@ -1,13 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin - -Name=Cpu monitor -Comment=Displays the current CPU load. - - - - -# Translations -Comment[ar]=مُراقب عبء المعالج -Name[ar]=عبء المعالج +Name[ar]=مرقاب المعالج +Comment[ar]=تعرض حمل المعالج الحاليّ. diff --git a/plugin-cpuload/translations/cpuload_ar.ts b/plugin-cpuload/translations/cpuload_ar.ts deleted file mode 100644 index dac07e6..0000000 --- a/plugin-cpuload/translations/cpuload_ar.ts +++ /dev/null @@ -1,70 +0,0 @@ - - - - - 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 --git a/plugin-cpuload/translations/cpuload_cs.ts b/plugin-cpuload/translations/cpuload_cs.ts deleted file mode 100644 index 88697ba..0000000 --- a/plugin-cpuload/translations/cpuload_cs.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - LXQtCpuLoad - - Cpu load %1% - Vytížení procesoru %1% - - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - LXQt Cpu Load settings - Nastavení vytížení procesoru v LXQtu - - - - CPU Load Settings - - - - - General - Obecné - - - - Show text - Ukázat text - - - - Update interval: - Obnovovací interval: - - - - sec - s - - - - Bar orientation: - Směr pruhu - - - - Bar width: - - - - - Bottom up - Zdola nahoru - - - - Top down - Shora dolů - - - - Left to right - Zleva doprava - - - - Right to left - Zprava doleva - - - diff --git a/plugin-cpuload/translations/cpuload_cs_CZ.ts b/plugin-cpuload/translations/cpuload_cs_CZ.ts deleted file mode 100644 index 89de34b..0000000 --- a/plugin-cpuload/translations/cpuload_cs_CZ.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - LXQtCpuLoad - - Cpu load %1% - Vytížení procesoru %1% - - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - LXQt Cpu Load settings - Nastavení vytížení procesoru v LXQtu - - - - CPU Load Settings - - - - - General - Obecné - - - - Show text - Ukázat text - - - - Update interval: - Obnovovací interval: - - - - sec - s - - - - Bar orientation: - Směr pruhu - - - - Bar width: - - - - - Bottom up - Zdola nahoru - - - - Top down - Shora dolů - - - - Left to right - Zleva doprava - - - - Right to left - Zprava doleva - - - diff --git a/plugin-cpuload/translations/cpuload_da_DK.ts b/plugin-cpuload/translations/cpuload_da_DK.ts deleted file mode 100644 index f1715ea..0000000 --- a/plugin-cpuload/translations/cpuload_da_DK.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - LXQtCpuLoad - - Cpu load %1% - CPU belastning %1% - - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - LXQt Cpu Load settings - LXQt CPU-belastning indstillinger - - - - CPU Load Settings - - - - - General - Generelt - - - - Show text - Vis tekst - - - - Update interval: - Opdateringsinterval: - - - - sec - sek - - - - Bar orientation: - Bjælkens orientering: - - - - Bar width: - - - - - Bottom up - Nedefra - - - - Top down - Oppefra - - - - Left to right - Venstre mod højre - - - - Right to left - Højre mod venstre - - - diff --git a/plugin-cpuload/translations/cpuload_de.ts b/plugin-cpuload/translations/cpuload_de.ts deleted file mode 100644 index 2716f0c..0000000 --- a/plugin-cpuload/translations/cpuload_de.ts +++ /dev/null @@ -1,70 +0,0 @@ - - - - - LXQtCpuLoad - - - CPU load %1% - Prozessorauslastung %1% - - - - LXQtCpuLoadConfiguration - - - CPU Load Settings - Einstellungen zur Prozessorlast-Anzeige - - - - General - Allgemein - - - - Show text - Text anzeigen - - - - Update interval: - Aktualisierungsintervall: - - - - sec - s - - - - Bar orientation: - Balkenrichtung: - - - - Bar width: - Balkenbreite: - - - - Bottom up - von unten nach oben - - - - Top down - von oben nach unten - - - - Left to right - von links nach rechts - - - - Right to left - von rechts nach links - - - diff --git a/plugin-cpuload/translations/cpuload_el.ts b/plugin-cpuload/translations/cpuload_el.ts deleted file mode 100644 index d5c7333..0000000 --- a/plugin-cpuload/translations/cpuload_el.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - LXQtCpuLoad - - Cpu load %1% - Φορτίο επεξεργαστή %1% - - - - CPU load %1% - Φορτίο επεξεργαστή %1% - - - - LXQtCpuLoadConfiguration - - LXQt Cpu Load settings - Ρυθμίσεις φορτίου ΚΜΕ - - - - CPU Load Settings - Ρυθμίσεις του Φορτίου επεξεργαστή - - - - General - Γενικά - - - - Show text - Εμφάνιση κειμένου - - - - Update interval: - Διάστημα ενημέρωσης: - - - - sec - δευτ - - - - Bar orientation: - Προσανατολισμός ράβδου: - - - - Bar width: - Πλάτος ράβδου: - - - - Bottom up - Κάτω προς τα πάνω - - - - Top down - Πάνω προς τα κάτω - - - - Left to right - Αριστερά προς δεξιά - - - - Right to left - Δεξιά προς αριστερά - - - diff --git a/plugin-cpuload/translations/cpuload_eo.ts b/plugin-cpuload/translations/cpuload_eo.ts deleted file mode 100644 index 5c58150..0000000 --- a/plugin-cpuload/translations/cpuload_eo.ts +++ /dev/null @@ -1,70 +0,0 @@ - - - - - LXQtCpuLoad - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - - CPU Load Settings - - - - - General - Ĝenerala - - - - Show text - Montri tekston - - - - Update interval: - - - - - sec - - - - - Bar orientation: - - - - - Bar width: - - - - - Bottom up - - - - - Top down - - - - - Left to right - - - - - Right to left - - - - diff --git a/plugin-cpuload/translations/cpuload_es.ts b/plugin-cpuload/translations/cpuload_es.ts deleted file mode 100644 index ebdee3b..0000000 --- a/plugin-cpuload/translations/cpuload_es.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - LXQtCpuLoad - - Cpu load %1% - Carga de CPU %1% - - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - LXQt Cpu Load settings - Opciones de Carga de CPU LXQt - - - - CPU Load Settings - - - - - General - General - - - - Show text - Mostrar texto - - - - Update interval: - Intervalo de actualización - - - - sec - segundos - - - - Bar orientation: - Orientación de la barra: - - - - Bar width: - - - - - Bottom up - De Abajo hacia Arriba - - - - Top down - De Arriba hacia Abajo - - - - Left to right - De Izquierda a Derecha - - - - Right to left - De Derecha a Izquierda - - - diff --git a/plugin-cpuload/translations/cpuload_es_VE.ts b/plugin-cpuload/translations/cpuload_es_VE.ts deleted file mode 100644 index e3b7e25..0000000 --- a/plugin-cpuload/translations/cpuload_es_VE.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - LXQtCpuLoad - - Cpu load %1% - Cpu al %1% - - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - LXQt Cpu Load settings - Configuracion de Monitor de Cpu LXQt - - - - CPU Load Settings - - - - - General - General - - - - Show text - Mostrar etiqueta - - - - Update interval: - Intervalo actualizacion - - - - sec - seg - - - - Bar orientation: - Orientacion barra - - - - Bar width: - - - - - Bottom up - Abajo a Arriba - - - - Top down - Arriba a abajo - - - - Left to right - Izquierda a derecha - - - - Right to left - Derecha a izquierda - - - diff --git a/plugin-cpuload/translations/cpuload_eu.ts b/plugin-cpuload/translations/cpuload_eu.ts deleted file mode 100644 index b8528c9..0000000 --- a/plugin-cpuload/translations/cpuload_eu.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - LXQtCpuLoad - - Cpu load %1% - PUZaren karga %%1 - - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - LXQt Cpu Load settings - LXQt PUZaren kargaren ezarpenak - - - - CPU Load Settings - - - - - General - Orokorra - - - - Show text - Erakutsi testua - - - - Update interval: - Eguneratze-tartea: - - - - sec - seg - - - - Bar orientation: - Barraren orientazioa: - - - - Bar width: - - - - - Bottom up - Behetik gora - - - - Top down - Goitik behera - - - - Left to right - Ezkerretik eskuinera - - - - Right to left - Eskuinetik ezkerrera - - - diff --git a/plugin-cpuload/translations/cpuload_fi.ts b/plugin-cpuload/translations/cpuload_fi.ts deleted file mode 100644 index 1bd2c8c..0000000 --- a/plugin-cpuload/translations/cpuload_fi.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - LXQtCpuLoad - - Cpu load %1% - Suoritinkuorma %1% - - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - LXQt Cpu Load settings - LXQtin suoritinkuorman asetukset - - - - CPU Load Settings - - - - - General - Yleiset - - - - Show text - Näytä teksti - - - - Update interval: - Päivitysväli: - - - - sec - s - - - - Bar orientation: - - - - - Bar width: - - - - - Bottom up - - - - - Top down - - - - - Left to right - - - - - Right to left - - - - diff --git a/plugin-cpuload/translations/cpuload_fr_FR.ts b/plugin-cpuload/translations/cpuload_fr_FR.ts deleted file mode 100644 index 600b9cb..0000000 --- a/plugin-cpuload/translations/cpuload_fr_FR.ts +++ /dev/null @@ -1,70 +0,0 @@ - - - - - LXQtCpuLoad - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - - CPU Load Settings - - - - - General - Généraux - - - - Show text - Montrer le texte - - - - Update interval: - - - - - sec - - - - - Bar orientation: - - - - - Bar width: - - - - - Bottom up - - - - - Top down - - - - - Left to right - - - - - Right to left - - - - diff --git a/plugin-cpuload/translations/cpuload_hr.ts b/plugin-cpuload/translations/cpuload_hr.ts deleted file mode 100644 index 0a3e354..0000000 --- a/plugin-cpuload/translations/cpuload_hr.ts +++ /dev/null @@ -1,70 +0,0 @@ - - - - - LXQtCpuLoad - - - CPU load %1% - Učitavanje procesora %1 - - - - LXQtCpuLoadConfiguration - - - CPU Load Settings - Postavke učitavanja procesora - - - - General - Općenito - - - - Show text - Pokaži tekst - - - - Update interval: - Interval ažuriranja: - - - - sec - sek - - - - Bar orientation: - Orijentacija trake: - - - - Bar width: - Duljina trake: - - - - Bottom up - Odozdo gore - - - - Top down - Odozgo dolje - - - - Left to right - S lijeva na desno - - - - Right to left - S desna na lijevo - - - diff --git a/plugin-cpuload/translations/cpuload_hu.ts b/plugin-cpuload/translations/cpuload_hu.ts deleted file mode 100644 index 5318ecc..0000000 --- a/plugin-cpuload/translations/cpuload_hu.ts +++ /dev/null @@ -1,70 +0,0 @@ - - - - - LXQtCpuLoad - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - - CPU Load Settings - - - - - General - Általános - - - - Show text - Szöveg megjelenítése - - - - Update interval: - Frissítési köz: - - - - sec - mp - - - - Bar orientation: - Sáv irány: - - - - Bar width: - Sáv szélesség: - - - - Bottom up - Felfele - - - - Top down - Lefele - - - - Left to right - Jobbra - - - - Right to left - Balra - - - diff --git a/plugin-cpuload/translations/cpuload_hu_HU.ts b/plugin-cpuload/translations/cpuload_hu_HU.ts deleted file mode 100644 index 810f55b..0000000 --- a/plugin-cpuload/translations/cpuload_hu_HU.ts +++ /dev/null @@ -1,70 +0,0 @@ - - - - - LXQtCpuLoad - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - - CPU Load Settings - - - - - General - Általános - - - - Show text - Szöveg megjelenítése - - - - Update interval: - Frissítési köz: - - - - sec - mp - - - - Bar orientation: - Sáv irány: - - - - Bar width: - Sáv szélesség: - - - - Bottom up - Felfele - - - - Top down - Lefele - - - - Left to right - Jobbra - - - - Right to left - Balra - - - diff --git a/plugin-cpuload/translations/cpuload_it.ts b/plugin-cpuload/translations/cpuload_it.ts deleted file mode 100644 index ababad9..0000000 --- a/plugin-cpuload/translations/cpuload_it.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - LXQtCpuLoad - - Cpu load %1% - Carico del processore %1% - - - - CPU load %1% - Carico del processore %1% - - - - LXQtCpuLoadConfiguration - - LXQt Cpu Load settings - Impostazioni del carico del processore di LXQt - - - - CPU Load Settings - Impostazioni di carica del processore - - - - General - Generale - - - - Show text - Mostra testo - - - - Update interval: - Intervallo di aggiornamento: - - - - sec - sec - - - - Bar orientation: - Orientamento della barra: - - - - Bar width: - Larghezza barra: - - - - Bottom up - Dal basso all'alto - - - - Top down - Dall'alto al basso - - - - Left to right - Da sinistra a destra - - - - Right to left - Da destra a sinistra - - - diff --git a/plugin-cpuload/translations/cpuload_ja.ts b/plugin-cpuload/translations/cpuload_ja.ts deleted file mode 100644 index 8948f15..0000000 --- a/plugin-cpuload/translations/cpuload_ja.ts +++ /dev/null @@ -1,70 +0,0 @@ - - - - - LXQtCpuLoad - - - CPU load %1% - CPU負荷 %1% - - - - LXQtCpuLoadConfiguration - - - CPU Load Settings - CPUモニターの設定 - - - - General - 一般 - - - - Show text - テキストを表示 - - - - Update interval: - 更新頻度: - - - - sec - 秒 - - - - Bar orientation: - バーの向き: - - - - Bar width: - - - - - Bottom up - 下から上へ - - - - Top down - 上から下へ - - - - Left to right - 左から右へ - - - - Right to left - 右から左へ - - - diff --git a/plugin-cpuload/translations/cpuload_lt.ts b/plugin-cpuload/translations/cpuload_lt.ts deleted file mode 100644 index 0ae6c3e..0000000 --- a/plugin-cpuload/translations/cpuload_lt.ts +++ /dev/null @@ -1,70 +0,0 @@ - - - - - LXQtCpuLoad - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - - CPU Load Settings - - - - - General - Pagrindinės - - - - Show text - Rodyti tekstą - - - - Update interval: - - - - - sec - - - - - Bar orientation: - - - - - Bar width: - - - - - Bottom up - - - - - Top down - - - - - Left to right - - - - - Right to left - - - - diff --git a/plugin-cpuload/translations/cpuload_nl.ts b/plugin-cpuload/translations/cpuload_nl.ts deleted file mode 100644 index 427f0ad..0000000 --- a/plugin-cpuload/translations/cpuload_nl.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - LXQtCpuLoad - - Cpu load %1% - Cpu-belasting %1% - - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - LXQt Cpu Load settings - Instellingen voor CPU-belasting van LXQt - - - - CPU Load Settings - - - - - General - Algemeen - - - - Show text - Tekst weergeven - - - - Update interval: - Tussenpoze voor bijwerken: - - - - sec - sec - - - - Bar orientation: - Balkoriëntatie: - - - - Bar width: - - - - - Bottom up - Van beneden naar boven - - - - Top down - Van boven naar beneden - - - - Left to right - Van links naar rechts - - - - Right to left - Van rechts naar links - - - diff --git a/plugin-cpuload/translations/cpuload_pl_PL.ts b/plugin-cpuload/translations/cpuload_pl_PL.ts deleted file mode 100644 index 5e7458e..0000000 --- a/plugin-cpuload/translations/cpuload_pl_PL.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - LXQtCpuLoad - - Cpu load %1% - Obciążenie CPU %1% - - - - CPU load %1% - Obciążenie procesora %1% - - - - LXQtCpuLoadConfiguration - - LXQt Cpu Load settings - Ustawienia LXQt CPU Load - - - - CPU Load Settings - Obciążenie procesora - ustawienia - - - - General - Ogólne - - - - Show text - Pokaż tekst - - - - Update interval: - Odświeżanie widoku: - - - - sec - sek - - - - Bar orientation: - Orientacja paska stanu - - - - Bar width: - - - - - Bottom up - Z dołu do góry - - - - Top down - Z góry na dół - - - - Left to right - Lewo na prawo - - - - Right to left - Prawo na lewo - - - diff --git a/plugin-cpuload/translations/cpuload_pt.ts b/plugin-cpuload/translations/cpuload_pt.ts deleted file mode 100644 index 0472770..0000000 --- a/plugin-cpuload/translations/cpuload_pt.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - LXQtCpuLoad - - Cpu load %1% - Carga do cpu %1% - - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - LXQt Cpu Load settings - Definições da Carga do cpu - - - - CPU Load Settings - - - - - General - Geral - - - - Show text - Mostrar texto - - - - Update interval: - Intervalo: - - - - sec - seg. - - - - Bar orientation: - Orientação da barra: - - - - Bar width: - - - - - Bottom up - De baixo para cima - - - - Top down - De cima para baixo - - - - Left to right - Da esquerda para a direita - - - - Right to left - Da direita para a esquerda - - - diff --git a/plugin-cpuload/translations/cpuload_pt_BR.ts b/plugin-cpuload/translations/cpuload_pt_BR.ts deleted file mode 100644 index cac3264..0000000 --- a/plugin-cpuload/translations/cpuload_pt_BR.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - LXQtCpuLoad - - Cpu load %1% - Carga da Cpu %1% - - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - LXQt Cpu Load settings - Configurações da Carga Da Cpu - - - - CPU Load Settings - - - - - General - Geral - - - - Show text - Exibir texto - - - - Update interval: - Intervalo de atualização: - - - - sec - seg - - - - Bar orientation: - Orientação da barra: - - - - Bar width: - - - - - Bottom up - De baixo para cima - - - - Top down - De cima para baixo - - - - Left to right - Da esquerda para a direita - - - - Right to left - Da direita para a esquerda - - - diff --git a/plugin-cpuload/translations/cpuload_ro_RO.ts b/plugin-cpuload/translations/cpuload_ro_RO.ts deleted file mode 100644 index 1fc8ae2..0000000 --- a/plugin-cpuload/translations/cpuload_ro_RO.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - LXQtCpuLoad - - Cpu load %1% - Încărcare procesor %1% - - - - CPU load %1% - Încărcare procesor - - - - LXQtCpuLoadConfiguration - - LXQt Cpu Load settings - Setări încărcare procesor LXQt - - - - CPU Load Settings - Setări încărcare procesor - - - - General - General - - - - Show text - Afișează text - - - - Update interval: - Interval de actualizare - - - - sec - sec - - - - Bar orientation: - Orientare bară: - - - - Bar width: - Lățime bară: - - - - Bottom up - De jos în sus - - - - Top down - De sus în jos - - - - Left to right - De la stânga la dreapta - - - - Right to left - De la dreapta la stânga - - - diff --git a/plugin-cpuload/translations/cpuload_ru.ts b/plugin-cpuload/translations/cpuload_ru.ts deleted file mode 100644 index a2d9c31..0000000 --- a/plugin-cpuload/translations/cpuload_ru.ts +++ /dev/null @@ -1,70 +0,0 @@ - - - - - LXQtCpuLoad - - - CPU load %1% - Загрузка процессора %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 --git a/plugin-cpuload/translations/cpuload_ru_RU.desktop b/plugin-cpuload/translations/cpuload_ru_RU.desktop deleted file mode 100644 index 5024212..0000000 --- a/plugin-cpuload/translations/cpuload_ru_RU.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin - -Name=Cpu monitor -Comment=Displays the current CPU load. - - - - -# Translations -Comment[ru_RU]=Отображает текущую загрузку процессора. -Name[ru_RU]=Монитор загрузки процессора diff --git a/plugin-cpuload/translations/cpuload_ru_RU.ts b/plugin-cpuload/translations/cpuload_ru_RU.ts deleted file mode 100644 index 06363a3..0000000 --- a/plugin-cpuload/translations/cpuload_ru_RU.ts +++ /dev/null @@ -1,70 +0,0 @@ - - - - - LXQtCpuLoad - - - CPU load %1% - Загрузка процессора %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 --git a/plugin-cpuload/translations/cpuload_sl.ts b/plugin-cpuload/translations/cpuload_sl.ts deleted file mode 100644 index 22655c0..0000000 --- a/plugin-cpuload/translations/cpuload_sl.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - LXQtCpuLoad - - Cpu load %1% - Uporaba CPE: %1 % - - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - LXQt Cpu Load settings - Nastavitve prikaza uporabe CPE za LXQt - - - - CPU Load Settings - - - - - General - Splošno - - - - Show text - Pokaži besedilo - - - - Update interval: - Hitrost osveževanja: - - - - sec - s - - - - Bar orientation: - Usmerjenost vrstice: - - - - Bar width: - - - - - Bottom up - Od spodaj navzgor - - - - Top down - Od zgoraj navzdol - - - - Left to right - Iz leve proti desni - - - - Right to left - Iz desne proti levi - - - diff --git a/plugin-cpuload/translations/cpuload_th_TH.ts b/plugin-cpuload/translations/cpuload_th_TH.ts deleted file mode 100644 index c18a23d..0000000 --- a/plugin-cpuload/translations/cpuload_th_TH.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - LXQtCpuLoad - - Cpu load %1% - Cpu โหลด %1% - - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - LXQt Cpu Load settings - ค่าตั้ง Cpu โหลด LXQt - - - - CPU Load Settings - - - - - General - ทั่วไป - - - - Show text - แสดงข้อความ - - - - Update interval: - ทิ้งระยะการปรับข้อมูล: - - - - sec - วิ - - - - Bar orientation: - การจัดเรียง: - - - - Bar width: - - - - - Bottom up - ล่างขึ้นบน - - - - Top down - บนลงล่าง - - - - Left to right - ซ้ายไปขวา - - - - Right to left - ขวาไปซ้าย - - - diff --git a/plugin-cpuload/translations/cpuload_tr.ts b/plugin-cpuload/translations/cpuload_tr.ts deleted file mode 100644 index b98f5e9..0000000 --- a/plugin-cpuload/translations/cpuload_tr.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - LXQtCpuLoad - - Cpu load %1% - İşlemci yükü %1% - - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - LXQt Cpu Load settings - LXQt İşlemci Yükü ayarları - - - - CPU Load Settings - - - - - General - Genel - - - - Show text - Metin göster - - - - Update interval: - Güncelleme aralığı: - - - - sec - sn - - - - Bar orientation: - Çubuk yönelimi: - - - - Bar width: - - - - - Bottom up - Aşağıdan yukarı - - - - Top down - Yukarıdan aşağı - - - - Left to right - Soldan sağa - - - - Right to left - Sağdan sola - - - diff --git a/plugin-cpuload/translations/cpuload_uk.ts b/plugin-cpuload/translations/cpuload_uk.ts deleted file mode 100644 index 1ed37e6..0000000 --- a/plugin-cpuload/translations/cpuload_uk.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - LXQtCpuLoad - - Cpu load %1% - Завантаження Cpu %1% - - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - LXQt Cpu Load settings - Налаштування завантаження ЦП LXQt - - - - CPU Load Settings - - - - - General - Загальне - - - - Show text - Показувати текст - - - - Update interval: - Період поновлення: - - - - sec - сек - - - - Bar orientation: - Напрямок планки: - - - - Bar width: - - - - - Bottom up - Знизу вверх - - - - Top down - Зверху вниз - - - - Left to right - Зліва направо - - - - Right to left - Зправа наліво - - - diff --git a/plugin-cpuload/translations/cpuload_zh_CN.ts b/plugin-cpuload/translations/cpuload_zh_CN.ts deleted file mode 100644 index 83565d7..0000000 --- a/plugin-cpuload/translations/cpuload_zh_CN.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - LXQtCpuLoad - - Cpu load %1% - Cpu 负载 %1% - - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - LXQt Cpu Load settings - LXQt Cpu 负载设置 - - - - CPU Load Settings - - - - - General - 常规 - - - - Show text - 显示文本 - - - - Update interval: - 更新间隔： - - - - sec - 秒 - - - - Bar orientation: - 状态栏方向： - - - - Bar width: - - - - - Bottom up - 自下而上 - - - - Top down - 自上而下 - - - - Left to right - 从左到右 - - - - Right to left - 从右到左 - - - diff --git a/plugin-cpuload/translations/cpuload_zh_TW.ts b/plugin-cpuload/translations/cpuload_zh_TW.ts deleted file mode 100644 index 5cbd7b9..0000000 --- a/plugin-cpuload/translations/cpuload_zh_TW.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - LXQtCpuLoad - - Cpu load %1% - CPU使用率 %1% - - - - CPU load %1% - - - - - LXQtCpuLoadConfiguration - - LXQt Cpu Load settings - LXQtCPU使用率提示設定 - - - - CPU Load Settings - - - - - General - 一般 - - - - Show text - 顯示文字 - - - - Update interval: - 更新間隔 - - - - sec - 秒 - - - - Bar orientation: - 進度條方向 - - - - Bar width: - - - - - Bottom up - 由下至上 - - - - Top down - 由上至下 - - - - Left to right - 由左至右 - - - - Right to left - 由右至左 - - - diff --git a/plugin-desktopswitch/desktopswitch.cpp b/plugin-desktopswitch/desktopswitch.cpp index 9531d65..f97a8ef 100644 --- a/plugin-desktopswitch/desktopswitch.cpp +++ b/plugin-desktopswitch/desktopswitch.cpp @@ -26,7 +26,6 @@ * END_COMMON_COPYRIGHT_HEADER */ #include -#include #include #include #include @@ -112,7 +111,7 @@ void DesktopSwitch::shortcutRegistered() void DesktopSwitch::onWindowChanged(WId id, NET::Properties properties, NET::Properties2 properties2) { - if (properties.testFlag(NET::WMState)) + if (properties.testFlag(NET::WMState) && isWindowHighlightable(id)) { KWindowInfo info = KWindowInfo(id, NET::WMDesktop | NET::WMState); int desktop = info.desktop(); @@ -165,6 +164,43 @@ void DesktopSwitch::refresh() } } +bool DesktopSwitch::isWindowHighlightable(WId window) +{ + // this method was borrowed from the taskbar plugin + QFlags ignoreList; + ignoreList |= NET::DesktopMask; + ignoreList |= NET::DockMask; + ignoreList |= NET::SplashMask; + ignoreList |= NET::ToolbarMask; + ignoreList |= NET::MenuMask; + ignoreList |= NET::PopupMenuMask; + ignoreList |= NET::NotificationMask; + + KWindowInfo info(window, NET::WMWindowType | NET::WMState, NET::WM2TransientFor); + if (!info.valid()) + return false; + + if (NET::typeMatchesMask(info.windowType(NET::AllTypesMask), ignoreList)) + return false; + + if (info.state() & NET::SkipTaskbar) + return false; + + // WM_TRANSIENT_FOR hint not set - normal window + WId transFor = info.transientFor(); + if (transFor == 0 || transFor == window || transFor == (WId) QX11Info::appRootWindow()) + return true; + + info = KWindowInfo(transFor, NET::WMWindowType); + + QFlags normalFlag; + normalFlag |= NET::NormalMask; + normalFlag |= NET::DialogMask; + normalFlag |= NET::UtilityMask; + + return !NET::typeMatchesMask(info.windowType(NET::AllTypesMask), normalFlag); +} + DesktopSwitch::~DesktopSwitch() { } @@ -217,13 +253,13 @@ void DesktopSwitch::realign() { mLayout->setRowCount(mRows); mLayout->setColumnCount(0); - mDesktops->setDesktopLayout(NET::OrientationHorizontal, columns, mRows, NET::DesktopLayoutCornerTopLeft); + mDesktops->setDesktopLayout(NET::OrientationHorizontal, columns, mRows, mWidget.isRightToLeft() ? NET::DesktopLayoutCornerTopRight : NET::DesktopLayoutCornerTopLeft); } else { mLayout->setColumnCount(mRows); mLayout->setRowCount(0); - mDesktops->setDesktopLayout(NET::OrientationHorizontal, mRows, columns, NET::DesktopLayoutCornerTopLeft); + mDesktops->setDesktopLayout(NET::OrientationHorizontal, mRows, columns, mWidget.isRightToLeft() ? NET::DesktopLayoutCornerTopRight : NET::DesktopLayoutCornerTopLeft); } mLayout->setEnabled(true); } diff --git a/plugin-desktopswitch/desktopswitch.h b/plugin-desktopswitch/desktopswitch.h index 9d9947b..0062217 100644 --- a/plugin-desktopswitch/desktopswitch.h +++ b/plugin-desktopswitch/desktopswitch.h @@ -86,6 +86,7 @@ private: DesktopSwitchButton::LabelType mLabelType; void refresh(); + bool isWindowHighlightable(WId window); private slots: void setDesktop(int desktop); diff --git a/plugin-desktopswitch/desktopswitchconfiguration.cpp b/plugin-desktopswitch/desktopswitchconfiguration.cpp index 4ad16b9..9bc5e45 100644 --- a/plugin-desktopswitch/desktopswitchconfiguration.cpp +++ b/plugin-desktopswitch/desktopswitchconfiguration.cpp @@ -29,11 +29,9 @@ #include #include -DesktopSwitchConfiguration::DesktopSwitchConfiguration(QSettings *settings, QWidget *parent) - : QDialog(parent) - , ui(new Ui::DesktopSwitchConfiguration) - , mSettings(settings) - , mOldSettings(settings) +DesktopSwitchConfiguration::DesktopSwitchConfiguration(PluginSettings *settings, QWidget *parent) : + LXQtPanelPluginConfigDialog(settings, parent), + ui(new Ui::DesktopSwitchConfiguration) { setAttribute(Qt::WA_DeleteOnClose); setObjectName("DesktopSwitchConfigurationWindow"); @@ -56,8 +54,8 @@ DesktopSwitchConfiguration::~DesktopSwitchConfiguration() void DesktopSwitchConfiguration::loadSettings() { - ui->rowsSB->setValue(mSettings->value("rows", 1).toInt()); - ui->labelTypeCB->setCurrentIndex(mSettings->value("labelType", 0).toInt()); + ui->rowsSB->setValue(settings().value("rows", 1).toInt()); + ui->labelTypeCB->setCurrentIndex(settings().value("labelType", 0).toInt()); } void DesktopSwitchConfiguration::loadDesktopsNames() @@ -79,24 +77,11 @@ void DesktopSwitchConfiguration::loadDesktopsNames() void DesktopSwitchConfiguration::rowsChanged(int value) { - mSettings->setValue("rows", value); + settings().setValue("rows", value); } void DesktopSwitchConfiguration::labelTypeChanged(int type) { - mSettings->setValue("labelType", type); -} - -void DesktopSwitchConfiguration::dialogButtonsAction(QAbstractButton *btn) -{ - if (ui->buttons->buttonRole(btn) == QDialogButtonBox::ResetRole) - { - mOldSettings.loadToSettings(); - loadSettings(); - } - else - { - close(); - } + settings().setValue("labelType", type); } diff --git a/plugin-desktopswitch/desktopswitchconfiguration.h b/plugin-desktopswitch/desktopswitchconfiguration.h index fb6ad3d..7fe06dd 100644 --- a/plugin-desktopswitch/desktopswitchconfiguration.h +++ b/plugin-desktopswitch/desktopswitchconfiguration.h @@ -28,31 +28,28 @@ #ifndef DESKTOPSWITCHCERCONFIGURATION_H #define DESKTOPSWITCHCERCONFIGURATION_H -#include +#include "../panel/lxqtpanelpluginconfigdialog.h" +#include "../panel/pluginsettings.h" -#include #include #include -class QSettings; class QAbstractButton; namespace Ui { class DesktopSwitchConfiguration; } -class DesktopSwitchConfiguration : public QDialog +class DesktopSwitchConfiguration : public LXQtPanelPluginConfigDialog { Q_OBJECT public: - explicit DesktopSwitchConfiguration(QSettings *settings, QWidget *parent = 0); + explicit DesktopSwitchConfiguration(PluginSettings *settings, QWidget *parent = nullptr); ~DesktopSwitchConfiguration(); private: Ui::DesktopSwitchConfiguration *ui; - QSettings *mSettings; - LXQt::SettingsCache mOldSettings; private slots: /* @@ -60,7 +57,6 @@ private slots: */ void loadSettings(); void loadDesktopsNames(); - void dialogButtonsAction(QAbstractButton *btn); void rowsChanged(int value); void labelTypeChanged(int type); }; diff --git a/plugin-desktopswitch/desktopswitchconfiguration.ui b/plugin-desktopswitch/desktopswitchconfiguration.ui index e387800..cb7b2dc 100644 --- a/plugin-desktopswitch/desktopswitchconfiguration.ui +++ b/plugin-desktopswitch/desktopswitchconfiguration.ui @@ -17,7 +17,7 @@ - Rows + Appearance diff --git a/plugin-desktopswitch/translations/desktopswitch.ts b/plugin-desktopswitch/translations/desktopswitch.ts deleted file mode 100644 index 8e780fe..0000000 --- a/plugin-desktopswitch/translations/desktopswitch.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_ar.desktop b/plugin-desktopswitch/translations/desktopswitch_ar.desktop index d64872a..8491ad6 100644 --- a/plugin-desktopswitch/translations/desktopswitch_ar.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_ar.desktop @@ -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[ar]=السماح بتغيير أسطح المكتب اﻻفتراضيَّة -Name[ar]=مفتاح تبديل سطح المكتب +Name[ar]=مبدّل سطح المكتب +Comment[ar]=تسمح بالتّبديل السهل بين أسطح المكتب الوهميّة. diff --git a/plugin-desktopswitch/translations/desktopswitch_ar.ts b/plugin-desktopswitch/translations/desktopswitch_ar.ts deleted file mode 100644 index 9b4b8c2..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_ar.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - سطح المكتب %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_cs.ts b/plugin-desktopswitch/translations/desktopswitch_cs.ts deleted file mode 100644 index 4ed8a99..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_cs.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - Plocha %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_cs_CZ.ts b/plugin-desktopswitch/translations/desktopswitch_cs_CZ.ts deleted file mode 100644 index 25bd4e7..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_cs_CZ.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - Plocha %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_da.ts b/plugin-desktopswitch/translations/desktopswitch_da.ts deleted file mode 100644 index ec70c62..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_da.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - Skrivebord %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_da_DK.ts b/plugin-desktopswitch/translations/desktopswitch_da_DK.ts deleted file mode 100644 index 4b7d15c..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_da_DK.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - Skrivebord %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_de.ts b/plugin-desktopswitch/translations/desktopswitch_de.ts deleted file mode 100644 index 70e8cb8..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_de.ts +++ /dev/null @@ -1,56 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - Zu Arbeitsfläche %1 wechseln - - - - - Desktop %1 - Arbeitsfläche %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - Arbeitsflächenumschalter - Einstellungen - - - - Rows - Zeilen - - - - Desktop labels: - Arbeitsflächenbezeichnungen: - - - - Number of rows: - Anzahl der Zeilen: - - - - Numbers - Ziffern - - - - Names - Namen - - - - Desktop names - Arbeitsflächenbezeichnungen - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_el.ts b/plugin-desktopswitch/translations/desktopswitch_el.ts deleted file mode 100644 index 0431445..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_el.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - Εναλλαγή στην επιφάνεια εργασίας %1 - - - - - Desktop %1 - Επιφάνεια εργασίας %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - Ρυθμίσεις εναλλαγής επιφάνειας εργασίας - - - - Number of rows: - Αριθμός γραμμών: - - - - Desktop labels: - Ετικέτες επιφανειών: - - - - Numbers - Αριθμοί - - - - Names - Ονόματα - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_eo.ts b/plugin-desktopswitch/translations/desktopswitch_eo.ts deleted file mode 100644 index d22161e..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_eo.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - Labortablo %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_es.ts b/plugin-desktopswitch/translations/desktopswitch_es.ts deleted file mode 100644 index d661b75..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_es.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - Escritorio %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_es_UY.ts b/plugin-desktopswitch/translations/desktopswitch_es_UY.ts deleted file mode 100644 index 3139142..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_es_UY.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - Escritorio %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_es_VE.ts b/plugin-desktopswitch/translations/desktopswitch_es_VE.ts deleted file mode 100644 index c936769..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_es_VE.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - Escritorio %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_eu.ts b/plugin-desktopswitch/translations/desktopswitch_eu.ts deleted file mode 100644 index e23ee1b..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_eu.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - %1 mahaigaina - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_fi.ts b/plugin-desktopswitch/translations/desktopswitch_fi.ts deleted file mode 100644 index 5d78386..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_fi.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - Työpöytä %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_fr_FR.ts b/plugin-desktopswitch/translations/desktopswitch_fr_FR.ts deleted file mode 100644 index 884e24b..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_fr_FR.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - Bureau %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_hr.ts b/plugin-desktopswitch/translations/desktopswitch_hr.ts deleted file mode 100644 index 68078e7..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_hr.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - Prebaci na radnu površinu %1 - - - - - Desktop %1 - Radna površina %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - Postavke prebacivaša radnih površina - - - - Number of rows: - Broj redaka: - - - - Desktop labels: - - - - - Numbers - Brojevi - - - - Names - Imena - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_hu.ts b/plugin-desktopswitch/translations/desktopswitch_hu.ts deleted file mode 100644 index 0c05cfb..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_hu.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - %1. asztalra váltás - - - - - Desktop %1 - %1. asztal - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - Asztalváltó beállítás - - - - Number of rows: - Sorok száma: - - - - Desktop labels: - Asztalazonosítók: - - - - Numbers - Számok - - - - Names - Nevek - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_hu_HU.ts b/plugin-desktopswitch/translations/desktopswitch_hu_HU.ts deleted file mode 100644 index 4c43b72..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_hu_HU.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - %1. asztalra váltás - - - - - Desktop %1 - %1. asztal - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - Asztalváltó beállítás - - - - Number of rows: - Sorok száma: - - - - Desktop labels: - Asztalazonosítók: - - - - Numbers - Számok - - - - Names - Nevek - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_ia.ts b/plugin-desktopswitch/translations/desktopswitch_ia.ts deleted file mode 100644 index 053e80f..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_ia.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_id_ID.ts b/plugin-desktopswitch/translations/desktopswitch_id_ID.ts deleted file mode 100644 index f5ff166..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_id_ID.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_it.ts b/plugin-desktopswitch/translations/desktopswitch_it.ts deleted file mode 100644 index 27ded67..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_it.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - Cambia al desktop %1 - - - - - Desktop %1 - Desktop %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - Preferenze cambia desktop - - - - Number of rows: - Numero righe: - - - - Desktop labels: - Etichette desktop: - - - - Numbers - Numeri - - - - Names - Nomi - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_ja.ts b/plugin-desktopswitch/translations/desktopswitch_ja.ts deleted file mode 100644 index 6f5e4c9..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_ja.ts +++ /dev/null @@ -1,53 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - デスクトップ%1に切り替える - - - - - Desktop %1 - デスクトップ %1 - - - - DesktopSwitchButton - - Switch to desktop %1 - デスクトップ%1に切り替える - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_ko.ts b/plugin-desktopswitch/translations/desktopswitch_ko.ts deleted file mode 100644 index 44ccfb1..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_ko.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_lt.ts b/plugin-desktopswitch/translations/desktopswitch_lt.ts deleted file mode 100644 index 99c393c..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_lt.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - %1 darbalaukis - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_nl.ts b/plugin-desktopswitch/translations/desktopswitch_nl.ts deleted file mode 100644 index 977987b..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_nl.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - Bureaublad %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_pl_PL.ts b/plugin-desktopswitch/translations/desktopswitch_pl_PL.ts deleted file mode 100644 index 3e7c7f3..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_pl_PL.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - Pulpit %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_pt.ts b/plugin-desktopswitch/translations/desktopswitch_pt.ts deleted file mode 100644 index b71d7a6..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_pt.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - Área de trabalho %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_pt_BR.ts b/plugin-desktopswitch/translations/desktopswitch_pt_BR.ts deleted file mode 100644 index e7b91e9..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_pt_BR.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - Área de trabalho %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_ro_RO.ts b/plugin-desktopswitch/translations/desktopswitch_ro_RO.ts deleted file mode 100644 index 93055b1..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_ro_RO.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - Comutare la ecranul %1 - - - - - Desktop %1 - Ecranul %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - Setäri de comutare a ecranului - - - - Number of rows: - Numărul de rânduri: - - - - Desktop labels: - Etichetele ecranelor: - - - - Numbers - Numere - - - - Names - Nume - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_ru.ts b/plugin-desktopswitch/translations/desktopswitch_ru.ts deleted file mode 100644 index dead547..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_ru.ts +++ /dev/null @@ -1,53 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - Переключиться на рабочий стол %1 - - - - - Desktop %1 - Рабочий стол %1 - - - - DesktopSwitchButton - - Switch to desktop %1 - Переключиться на рабочий стол %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_ru_RU.desktop b/plugin-desktopswitch/translations/desktopswitch_ru_RU.desktop deleted file mode 100644 index 1ff18e9..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_ru_RU.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Desktop switcher -Comment=Allows easy switching between virtual desktops. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ru_RU]=Позволяет легко переключаться между виртуальными рабочими столами. -Name[ru_RU]=Переключение рабочих столов diff --git a/plugin-desktopswitch/translations/desktopswitch_ru_RU.ts b/plugin-desktopswitch/translations/desktopswitch_ru_RU.ts deleted file mode 100644 index 95aa9c4..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_ru_RU.ts +++ /dev/null @@ -1,53 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - Переключиться на рабочий стол %1 - - - - - Desktop %1 - Рабочий стол %1 - - - - DesktopSwitchButton - - Switch to desktop %1 - Переключиться на рабочий стол %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_sk_SK.ts b/plugin-desktopswitch/translations/desktopswitch_sk_SK.ts deleted file mode 100644 index c5777c5..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_sk_SK.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - Plocha %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_sl.ts b/plugin-desktopswitch/translations/desktopswitch_sl.ts deleted file mode 100644 index 3b9d207..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_sl.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - Namizje %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_sr@latin.ts b/plugin-desktopswitch/translations/desktopswitch_sr@latin.ts deleted file mode 100644 index 1ab6a1d..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_sr@latin.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_sr_BA.ts b/plugin-desktopswitch/translations/desktopswitch_sr_BA.ts deleted file mode 100644 index bc8eaaa..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_sr_BA.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - Површ %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_sr_RS.ts b/plugin-desktopswitch/translations/desktopswitch_sr_RS.ts deleted file mode 100644 index 5001657..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_sr_RS.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - Површ %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_th_TH.ts b/plugin-desktopswitch/translations/desktopswitch_th_TH.ts deleted file mode 100644 index 0f54e7a..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_th_TH.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - พื้นโต๊ะ %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_tr.ts b/plugin-desktopswitch/translations/desktopswitch_tr.ts deleted file mode 100644 index c088b69..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_tr.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - Masaüstü %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_uk.ts b/plugin-desktopswitch/translations/desktopswitch_uk.ts deleted file mode 100644 index 2d513d0..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_uk.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - Стільниця %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_zh_CN.ts b/plugin-desktopswitch/translations/desktopswitch_zh_CN.ts deleted file mode 100644 index 96fe963..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_zh_CN.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - 桌面 %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-desktopswitch/translations/desktopswitch_zh_TW.ts b/plugin-desktopswitch/translations/desktopswitch_zh_TW.ts deleted file mode 100644 index 430f5d1..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_zh_TW.ts +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DesktopSwitch - - - Switch to desktop %1 - - - - - - Desktop %1 - 桌面 %1 - - - - DesktopSwitchConfiguration - - - DesktopSwitch settings - - - - - Number of rows: - - - - - Desktop labels: - - - - - Numbers - - - - - Names - - - - diff --git a/plugin-directorymenu/directorymenu.cpp b/plugin-directorymenu/directorymenu.cpp index 8c5ec28..3a71b80 100644 --- a/plugin-directorymenu/directorymenu.cpp +++ b/plugin-directorymenu/directorymenu.cpp @@ -58,11 +58,11 @@ DirectoryMenu::DirectoryMenu(const ILXQtPanelPluginStartupInfo &startupInfo) : DirectoryMenu::~DirectoryMenu() { - if(mMenu) - { - delete mMenu; - mMenu = 0; - } + if(mMenu) + { + delete mMenu; + mMenu = 0; + } } void DirectoryMenu::showMenu() @@ -76,99 +76,73 @@ void DirectoryMenu::showMenu() buildMenu(QDir::homePath()); } - - int x=0, y=0; - - switch (panel()->position()) - { - case ILXQtPanel::PositionTop: - x = mButton.mapToGlobal(QPoint(0, 0)).x(); - y = panel()->globalGometry().bottom(); - break; - - case ILXQtPanel::PositionBottom: - x = mButton.mapToGlobal(QPoint(0, 0)).x(); - y = panel()->globalGometry().top() - mMenu->sizeHint().height(); - break; - - case ILXQtPanel::PositionLeft: - x = panel()->globalGometry().right(); - y = mButton.mapToGlobal(QPoint(0, 0)).y(); - break; - - case ILXQtPanel::PositionRight: - x = panel()->globalGometry().left() - mMenu->sizeHint().width(); - y = mButton.mapToGlobal(QPoint(0, 0)).y(); - break; - } - + willShowWindow(mMenu); // Just using Qt`s activateWindow() won't work on some WMs like Kwin. // Solution is to execute menu 1ms later using timer - mButton.activateWindow(); - mMenu->exec(QPoint(x, y)); + mMenu->popup(calculatePopupWindowPos(mMenu->sizeHint()).topLeft()); } void DirectoryMenu::buildMenu(const QString& path) { - if(mMenu) - { - delete mMenu; - mMenu = 0; - } + if(mMenu) + { + delete mMenu; + mMenu = 0; + } - mPathStrings.clear(); + mPathStrings.clear(); - mMenu = new QMenu(); + mMenu = new QMenu(); - addActions(mMenu, path); + addActions(mMenu, path); } void DirectoryMenu::openDirectory(const QString& path) { - QDesktopServices::openUrl(QUrl("file://" + QDir::toNativeSeparators(path))); + QDesktopServices::openUrl(QUrl("file://" + QDir::toNativeSeparators(path))); } void DirectoryMenu::addMenu(QString path) { - QSignalMapper* sender = (QSignalMapper* )QObject::sender(); - QMenu* parentMenu = (QMenu*) sender->mapping(path); + QSignalMapper* sender = (QSignalMapper* )QObject::sender(); + QMenu* parentMenu = (QMenu*) sender->mapping(path); - if(parentMenu->isEmpty()) - { - addActions(parentMenu, path); - } + if(parentMenu->isEmpty()) + { + addActions(parentMenu, path); + } } void DirectoryMenu::addActions(QMenu* menu, const QString& path) { - mPathStrings.push_back(path); + mPathStrings.push_back(path); - QAction* openDirectoryAction = menu->addAction(XdgIcon::fromTheme("folder"), tr("Open")); - connect(openDirectoryAction, SIGNAL(triggered()), mOpenDirectorySignalMapper, SLOT(map())); - mOpenDirectorySignalMapper->setMapping(openDirectoryAction, mPathStrings.back()); + QAction* openDirectoryAction = menu->addAction(XdgIcon::fromTheme("folder"), tr("Open")); + connect(openDirectoryAction, SIGNAL(triggered()), mOpenDirectorySignalMapper, SLOT(map())); + mOpenDirectorySignalMapper->setMapping(openDirectoryAction, mPathStrings.back()); - menu->addSeparator(); + menu->addSeparator(); - QDir dir(path); - QFileInfoList list = dir.entryInfoList(); + QDir dir(path); + QFileInfoList list = dir.entryInfoList(); - foreach (const QFileInfo& entry, list) + foreach (const QFileInfo& entry, list) { - if(entry.isDir() && !entry.isHidden()) - { - mPathStrings.push_back(entry.fileName()); + if(entry.isDir() && !entry.isHidden()) + { + mPathStrings.push_back(entry.fileName()); - QMenu* subMenu = menu->addMenu(XdgIcon::fromTheme("folder"), mPathStrings.back()); + QMenu* subMenu = menu->addMenu(XdgIcon::fromTheme("folder"), mPathStrings.back()); - connect(subMenu, SIGNAL(aboutToShow()), mMenuSignalMapper, SLOT(map())); - mMenuSignalMapper->setMapping(subMenu, entry.absoluteFilePath()); - } + connect(subMenu, SIGNAL(aboutToShow()), mMenuSignalMapper, SLOT(map())); + mMenuSignalMapper->setMapping(subMenu, entry.absoluteFilePath()); + } } } QDialog* DirectoryMenu::configureDialog() { - return new DirectoryMenuConfiguration(*settings()); + return new DirectoryMenuConfiguration(settings()); } void DirectoryMenu::settingsChanged() diff --git a/plugin-directorymenu/directorymenuconfiguration.cpp b/plugin-directorymenu/directorymenuconfiguration.cpp index 501d585..833eb52 100644 --- a/plugin-directorymenu/directorymenuconfiguration.cpp +++ b/plugin-directorymenu/directorymenuconfiguration.cpp @@ -38,11 +38,9 @@ #include "ui_directorymenuconfiguration.h" -DirectoryMenuConfiguration::DirectoryMenuConfiguration(QSettings &settings, QWidget *parent) : - QDialog(parent), +DirectoryMenuConfiguration::DirectoryMenuConfiguration(PluginSettings *settings, QWidget *parent) : + LXQtPanelPluginConfigDialog(settings, parent), ui(new Ui::DirectoryMenuConfiguration), - mSettings(settings), - mOldSettings(settings), mBaseDirectory(QDir::homePath()), mDefaultIcon(XdgIcon::fromTheme("folder")) { @@ -66,10 +64,10 @@ DirectoryMenuConfiguration::~DirectoryMenuConfiguration() void DirectoryMenuConfiguration::loadSettings() { - mBaseDirectory.setPath(mSettings.value("baseDirectory", QDir::homePath()).toString()); + mBaseDirectory.setPath(settings().value("baseDirectory", QDir::homePath()).toString()); ui->baseDirectoryB->setText(mBaseDirectory.dirName()); - mIcon = mSettings.value("icon", QString()).toString(); + mIcon = settings().value("icon", QString()).toString(); if(!mIcon.isNull()) { QIcon buttonIcon = QIcon(mIcon); @@ -85,21 +83,8 @@ void DirectoryMenuConfiguration::loadSettings() void DirectoryMenuConfiguration::saveSettings() { - mSettings.setValue("baseDirectory", mBaseDirectory.absolutePath()); - mSettings.setValue("icon", mIcon); -} - -void DirectoryMenuConfiguration::dialogButtonsAction(QAbstractButton *btn) -{ - if (ui->buttons->buttonRole(btn) == QDialogButtonBox::ResetRole) - { - mOldSettings.loadToSettings(); - loadSettings(); - } - else - { - close(); - } + settings().setValue("baseDirectory", mBaseDirectory.absolutePath()); + settings().setValue("icon", mIcon); } void DirectoryMenuConfiguration::showDirectoryDialog() diff --git a/plugin-directorymenu/directorymenuconfiguration.h b/plugin-directorymenu/directorymenuconfiguration.h index a7c6995..e2936ea 100644 --- a/plugin-directorymenu/directorymenuconfiguration.h +++ b/plugin-directorymenu/directorymenuconfiguration.h @@ -30,31 +30,29 @@ #ifndef DIRECTORYMENUCONFIGURATION_H #define DIRECTORYMENUCONFIGURATION_H -#include +#include "../panel/lxqtpanelpluginconfigdialog.h" +#include "../panel/pluginsettings.h" + #include #include #include #include #include -#include - namespace Ui { class DirectoryMenuConfiguration; } -class DirectoryMenuConfiguration : public QDialog +class DirectoryMenuConfiguration : public LXQtPanelPluginConfigDialog { Q_OBJECT public: - explicit DirectoryMenuConfiguration(QSettings &settings, QWidget *parent = 0); + explicit DirectoryMenuConfiguration(PluginSettings *settings, QWidget *parent = nullptr); ~DirectoryMenuConfiguration(); private: Ui::DirectoryMenuConfiguration *ui; - QSettings &mSettings; - LXQt::SettingsCache mOldSettings; QDir mBaseDirectory; QString mIcon; QIcon mDefaultIcon; @@ -69,7 +67,6 @@ private slots: Saves settings in conf file. */ void saveSettings(); - void dialogButtonsAction(QAbstractButton *btn); void showDirectoryDialog(); void showIconDialog(); diff --git a/plugin-directorymenu/translations/directorymenu.ts b/plugin-directorymenu/translations/directorymenu.ts deleted file mode 100644 index d27edc1..0000000 --- a/plugin-directorymenu/translations/directorymenu.ts +++ /dev/null @@ -1,65 +0,0 @@ - - - - - DirectoryMenu - - - Open - - - - - DirectoryMenuConfiguration - - - Directory Menu Settings - - - - - Appearance - - - - - Base directory: - - - - - BaseDirectoryName - - - - - Icon: - - - - - Choose Base Directory - - - - - Choose Icon - - - - - Icons (*.png *.xpm *.jpg) - - - - - Directory Menu - - - - - An error occurred while loading the icon. - - - - diff --git a/plugin-directorymenu/translations/directorymenu_ar.desktop b/plugin-directorymenu/translations/directorymenu_ar.desktop new file mode 100644 index 0000000..013e114 --- /dev/null +++ b/plugin-directorymenu/translations/directorymenu_ar.desktop @@ -0,0 +1,2 @@ +Name[ar]=قائمة الأدلّة +Comment[ar]=تعرض قائمة تظهر محتويات الدّليل diff --git a/plugin-directorymenu/translations/directorymenu_de.ts b/plugin-directorymenu/translations/directorymenu_de.ts deleted file mode 100644 index 415bc4e..0000000 --- a/plugin-directorymenu/translations/directorymenu_de.ts +++ /dev/null @@ -1,65 +0,0 @@ - - - - - DirectoryMenu - - - Open - Öffnen - - - - DirectoryMenuConfiguration - - - Directory Menu Settings - Einstellungen des Verzeichnismenüs - - - - Appearance - Erscheinungsbild - - - - Base directory: - Basisverzeichnis: - - - - BaseDirectoryName - BasisVerzeichnisName - - - - Icon: - Symbol: - - - - 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 --git a/plugin-directorymenu/translations/directorymenu_el.ts b/plugin-directorymenu/translations/directorymenu_el.ts deleted file mode 100644 index 79d6521..0000000 --- a/plugin-directorymenu/translations/directorymenu_el.ts +++ /dev/null @@ -1,65 +0,0 @@ - - - - - DirectoryMenu - - - Open - Άνοιγμα - - - - DirectoryMenuConfiguration - - - Directory Menu Settings - Ρυθμίσεις μενού καταλόγου - - - - Appearance - Εμφάνιση - - - - Base directory: - Βασικός κατάλογος: - - - - BaseDirectoryName - Όνομα βασικού καταλόγου - - - - Icon: - Εικονίδιο: - - - - Choose Base Directory - Επιλέξτε τον βασικό κατάλογο - - - - Choose Icon - Επιλέξτε το εικονίδιο - - - - Icons (*.png *.xpm *.jpg) - Εικονίδια (*.png *.xpm *.jpg) - - - - Directory Menu - Μενού καταλόγου - - - - An error occurred while loading the icon. - Παρουσιάστηκε ένα σφάλμα κατά την φόρτωση του εικονιδίου. - - - diff --git a/plugin-directorymenu/translations/directorymenu_hr.ts b/plugin-directorymenu/translations/directorymenu_hr.ts deleted file mode 100644 index 8c7e6f1..0000000 --- a/plugin-directorymenu/translations/directorymenu_hr.ts +++ /dev/null @@ -1,65 +0,0 @@ - - - - - DirectoryMenu - - - Open - Otvori - - - - DirectoryMenuConfiguration - - - Directory Menu Settings - Postavke izbornika direktorija - - - - Appearance - Izgled - - - - Base directory: - Osnovni direktorij: - - - - BaseDirectoryName - Ime osnovnog direktorija - - - - Icon: - Ikona: - - - - Choose Base Directory - Izaberite osnovni direktorij - - - - Choose Icon - Izaberite ikonu - - - - Icons (*.png *.xpm *.jpg) - Ikone (*.png *.xpm *.jpg) - - - - Directory Menu - Izbornik direktorija - - - - An error occurred while loading the icon. - Došlo je do greške pri učitavanju ikone. - - - diff --git a/plugin-directorymenu/translations/directorymenu_hu.ts b/plugin-directorymenu/translations/directorymenu_hu.ts deleted file mode 100644 index 573fec1..0000000 --- a/plugin-directorymenu/translations/directorymenu_hu.ts +++ /dev/null @@ -1,65 +0,0 @@ - - - - - DirectoryMenu - - - Open - Nyit - - - - DirectoryMenuConfiguration - - - Directory Menu Settings - Könyvtármenü beállítás - - - - Appearance - Kinézet - - - - Base directory: - Alapkönyvtár: - - - - BaseDirectoryName - Alapkönyvtárnév - - - - Icon: - Ikon: - - - - Choose Base Directory - Aapkönyvtár kijelölés - - - - Choose Icon - Ikon kijelölés - - - - Icons (*.png *.xpm *.jpg) - Ikomok (*.png *.xpm *.jpg) - - - - Directory Menu - Könyvtármenü - - - - An error occurred while loading the icon. - Az ikon betöltése sikertelen. - - - diff --git a/plugin-directorymenu/translations/directorymenu_hu_HU.ts b/plugin-directorymenu/translations/directorymenu_hu_HU.ts deleted file mode 100644 index 3bac2f9..0000000 --- a/plugin-directorymenu/translations/directorymenu_hu_HU.ts +++ /dev/null @@ -1,65 +0,0 @@ - - - - - DirectoryMenu - - - Open - Nyit - - - - DirectoryMenuConfiguration - - - Directory Menu Settings - Könyvtármenü beállítás - - - - Appearance - Kinézet - - - - Base directory: - Alapkönyvtár: - - - - BaseDirectoryName - Alapkönyvtárnév - - - - Icon: - Ikon: - - - - Choose Base Directory - Aapkönyvtár kijelölés - - - - Choose Icon - Ikon kijelölés - - - - Icons (*.png *.xpm *.jpg) - Ikomok (*.png *.xpm *.jpg) - - - - Directory Menu - Könyvtármenü - - - - An error occurred while loading the icon. - Az ikon betöltése sikertelen. - - - diff --git a/plugin-directorymenu/translations/directorymenu_it.ts b/plugin-directorymenu/translations/directorymenu_it.ts deleted file mode 100644 index 9bfa337..0000000 --- a/plugin-directorymenu/translations/directorymenu_it.ts +++ /dev/null @@ -1,65 +0,0 @@ - - - - - DirectoryMenu - - - Open - Apri - - - - DirectoryMenuConfiguration - - - Directory Menu Settings - Impostazioni del menu - - - - Appearance - Aspetto - - - - Base directory: - Cartella mostrata: - - - - BaseDirectoryName - Nome della cartella - - - - Icon: - Icona: - - - - Choose Base Directory - Seleziona cartella mostrata - - - - Choose Icon - Seleziona icona - - - - Icons (*.png *.xpm *.jpg) - Icone (*.png .xpm *.jpg) - - - - Directory Menu - Menu cartella - - - - An error occurred while loading the icon. - Errore caricando l'icona. - - - diff --git a/plugin-directorymenu/translations/directorymenu_ru.ts b/plugin-directorymenu/translations/directorymenu_ru.ts deleted file mode 100644 index b900d65..0000000 --- a/plugin-directorymenu/translations/directorymenu_ru.ts +++ /dev/null @@ -1,60 +0,0 @@ - - - - - DirectoryMenu - - - Open - Открыть - - - - DirectoryMenuConfiguration - - - Directory Menu Settings - Настройки меню папки - - - - Appearance - Внешний вид - - - - Base directory: - Начальная папка: - - - - Icon: - Значок: - - - - Choose Base Directory - Выберите начальную папку - - - - Choose Icon - Выберите значок - - - - Icons (*.png *.xpm *.jpg) - Значки (*.png *.xpm *.jpg) - - - - Directory Menu - Меню папки - - - - An error occurred while loading the icon. - Произошла ошибка при загрузке значка. - - - diff --git a/plugin-directorymenu/translations/directorymenu_ru_RU.desktop b/plugin-directorymenu/translations/directorymenu_ru_RU.desktop deleted file mode 100644 index 5a29599..0000000 --- a/plugin-directorymenu/translations/directorymenu_ru_RU.desktop +++ /dev/null @@ -1,2 +0,0 @@ -Name[ru_RU]=Меню папки -Comment[ru_RU]=Показывает меню, отображающее содержимое папки diff --git a/plugin-directorymenu/translations/directorymenu_ru_RU.ts b/plugin-directorymenu/translations/directorymenu_ru_RU.ts deleted file mode 100644 index 00d70bb..0000000 --- a/plugin-directorymenu/translations/directorymenu_ru_RU.ts +++ /dev/null @@ -1,60 +0,0 @@ - - - - - DirectoryMenu - - - Open - Открыть - - - - DirectoryMenuConfiguration - - - Directory Menu Settings - Настройки меню папки - - - - Appearance - Внешний вид - - - - Base directory: - Начальная папка: - - - - Icon: - Значок: - - - - Choose Base Directory - Выберите начальную папку - - - - Choose Icon - Выберите значок - - - - Icons (*.png *.xpm *.jpg) - Значки (*.png *.xpm *.jpg) - - - - Directory Menu - Меню папки - - - - An error occurred while loading the icon. - Произошла ошибка при загрузке значка. - - - diff --git a/plugin-dom/domplugin.cpp b/plugin-dom/domplugin.cpp index ffd05c6..4526b35 100644 --- a/plugin-dom/domplugin.cpp +++ b/plugin-dom/domplugin.cpp @@ -35,6 +35,7 @@ DomPlugin::DomPlugin(const ILXQtPanelPluginStartupInfo &startupInfo): QObject(), ILXQtPanelPlugin(startupInfo) { + mButton.setAutoRaise(true); mButton.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); mButton.setIcon(XdgIcon::fromTheme("preferences-plugin")); connect(&mButton, SIGNAL(clicked()), this, SLOT(showDialog())); @@ -51,6 +52,7 @@ void DomPlugin::showDialog() dialog->setAttribute(Qt::WA_DeleteOnClose); } + willShowWindow(dialog); dialog->show(); dialog->activateWindow(); } diff --git a/plugin-dom/translations/dom.ts b/plugin-dom/translations/dom.ts deleted file mode 100644 index 6ffbe17..0000000 --- a/plugin-dom/translations/dom.ts +++ /dev/null @@ -1,38 +0,0 @@ - - - - - TreeWindow - - - Panel DOM tree - - - - - - Property - - - - - Value - - - - - All properties - - - - - Type - - - - - String value - - - - diff --git a/plugin-dom/translations/dom_ar.desktop b/plugin-dom/translations/dom_ar.desktop new file mode 100644 index 0000000..2e997f6 --- /dev/null +++ b/plugin-dom/translations/dom_ar.desktop @@ -0,0 +1,2 @@ +Name[ar]=شجرة DOM للّوحة +Comment[ar]=تُظهر شجرة DOM للوحة لكسكيوت. diff --git a/plugin-dom/translations/dom_de.ts b/plugin-dom/translations/dom_de.ts deleted file mode 100644 index c1b910d..0000000 --- a/plugin-dom/translations/dom_de.ts +++ /dev/null @@ -1,38 +0,0 @@ - - - - - TreeWindow - - - Panel DOM tree - DOM-Baum der Leiste - - - - - Property - Eigenschaft - - - - Value - Wert - - - - All properties - Alle Eigenschaften - - - - Type - Typ - - - - String value - Zeichenkettenwert - - - diff --git a/plugin-dom/translations/dom_el.ts b/plugin-dom/translations/dom_el.ts deleted file mode 100644 index bb7c4b6..0000000 --- a/plugin-dom/translations/dom_el.ts +++ /dev/null @@ -1,38 +0,0 @@ - - - - - TreeWindow - - - Panel DOM tree - Δέντρο πίνακα DOM - - - - - Property - Ιδιότητα - - - - Value - Τιμή - - - - All properties - Όλες οι ιδιότητες - - - - Type - Τύπος - - - - String value - Τιμή συμβολοσειράς - - - diff --git a/plugin-dom/translations/dom_hu.ts b/plugin-dom/translations/dom_hu.ts deleted file mode 100644 index adfb252..0000000 --- a/plugin-dom/translations/dom_hu.ts +++ /dev/null @@ -1,38 +0,0 @@ - - - - - TreeWindow - - - Panel DOM tree - DOM panel fa - - - - - Property - Tulajdonság - - - - Value - Érték - - - - All properties - Minden tulajdonság - - - - Type - Típus - - - - String value - Kifejezés - - - diff --git a/plugin-dom/translations/dom_hu_HU.ts b/plugin-dom/translations/dom_hu_HU.ts deleted file mode 100644 index 47b5a63..0000000 --- a/plugin-dom/translations/dom_hu_HU.ts +++ /dev/null @@ -1,38 +0,0 @@ - - - - - TreeWindow - - - Panel DOM tree - DOM panel fa - - - - - Property - Tulajdonság - - - - Value - Érték - - - - All properties - Minden tulajdonság - - - - Type - Típus - - - - String value - Kifejezés - - - diff --git a/plugin-dom/translations/dom_ja.ts b/plugin-dom/translations/dom_ja.ts deleted file mode 100644 index 7bf60ed..0000000 --- a/plugin-dom/translations/dom_ja.ts +++ /dev/null @@ -1,38 +0,0 @@ - - - - - TreeWindow - - - Panel DOM tree - パネルのDOMツリー - - - - - Property - プロパティー - - - - Value - 値 - - - - All properties - - - - - Type - - - - - String value - - - - diff --git a/plugin-dom/translations/dom_pt.ts b/plugin-dom/translations/dom_pt.ts deleted file mode 100644 index 17e1bbd..0000000 --- a/plugin-dom/translations/dom_pt.ts +++ /dev/null @@ -1,38 +0,0 @@ - - - - - TreeWindow - - - Panel DOM tree - Árvore do painel DOM - - - - - Property - Propriedade - - - - Value - Valor - - - - All properties - - - - - Type - - - - - String value - - - - diff --git a/plugin-dom/translations/dom_ru.ts b/plugin-dom/translations/dom_ru.ts deleted file mode 100644 index 219982a..0000000 --- a/plugin-dom/translations/dom_ru.ts +++ /dev/null @@ -1,38 +0,0 @@ - - - - - TreeWindow - - - Panel DOM tree - Дерево DOM панели - - - - - Property - Свойство - - - - Value - Значение - - - - All properties - - - - - Type - - - - - String value - - - - diff --git a/plugin-dom/translations/dom_ru_RU.desktop b/plugin-dom/translations/dom_ru_RU.desktop deleted file mode 100644 index 5509973..0000000 --- a/plugin-dom/translations/dom_ru_RU.desktop +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name[ru_RU]=Дерево DOM панели. -Comment[ru_RU]=Показать дерево DOM панели LXQt. diff --git a/plugin-dom/translations/dom_ru_RU.ts b/plugin-dom/translations/dom_ru_RU.ts deleted file mode 100644 index 6d09d78..0000000 --- a/plugin-dom/translations/dom_ru_RU.ts +++ /dev/null @@ -1,38 +0,0 @@ - - - - - TreeWindow - - - Panel DOM tree - Дерево DOM панели - - - - - Property - Свойство - - - - Value - Значение - - - - All properties - - - - - Type - - - - - String value - - - - diff --git a/plugin-kbindicator/CMakeLists.txt b/plugin-kbindicator/CMakeLists.txt index 501d6b8..82b06af 100644 --- a/plugin-kbindicator/CMakeLists.txt +++ b/plugin-kbindicator/CMakeLists.txt @@ -35,8 +35,10 @@ pkg_check_modules(XKB_COMMON_X11 QUIET xkbcommon-x11) if(XKB_COMMON_X11_FOUND) message(STATUS "XkbCommon X11 was found") + include_directories(${XKB_COMMON_X11_INCLUDE_DIRS}) find_package(Qt5 COMPONENTS X11Extras Xml) - pkg_check_modules(XCB_XCB xcb-xkb) + pkg_check_modules(XCB xcb) + pkg_check_modules(XCB_XKB xcb-xkb) set(HEADERS ${HEADERS} @@ -51,7 +53,8 @@ if(XKB_COMMON_X11_FOUND) set(LIBRARIES ${LIBRARIES} ${XKB_COMMON_X11_LIBRARIES} - ${XCB_XCB_LIBRARIES} + ${XCB_LIBRARIES} + ${XCB_XKB_LIBRARIES} Qt5::Xml ) diff --git a/plugin-kbindicator/src/settings.cpp b/plugin-kbindicator/src/settings.cpp index 8e9eb7b..e662120 100644 --- a/plugin-kbindicator/src/settings.cpp +++ b/plugin-kbindicator/src/settings.cpp @@ -30,16 +30,15 @@ Settings::Settings() {} -Settings & Settings::instance() +Settings &Settings::instance() { static Settings _instance; return _instance; } -void Settings::init(QSettings *settings) +void Settings::init(PluginSettings *settings) { m_settings = settings; - m_oldSettings.reset(new LXQt::SettingsCache(settings)); } bool Settings::showCapLock() const @@ -94,4 +93,4 @@ void Settings::setKeeperType(KeeperType type) const } void Settings::restore() -{ m_oldSettings->loadToSettings(); } +{ m_settings->loadFromCache(); } diff --git a/plugin-kbindicator/src/settings.h b/plugin-kbindicator/src/settings.h index 906fb14..e985556 100644 --- a/plugin-kbindicator/src/settings.h +++ b/plugin-kbindicator/src/settings.h @@ -27,8 +27,7 @@ #ifndef _SETTINGS_H_ #define _SETTINGS_H_ -#include -class QSettings; +#include "../panel/pluginsettings.h" enum class KeeperType { @@ -39,11 +38,12 @@ enum class KeeperType class Settings { + public: Settings(); - static Settings & instance(); + static Settings &instance(); - void init(QSettings *settings); + void init(PluginSettings *settings); public: bool showCapLock() const; @@ -52,15 +52,16 @@ public: bool showLayout() const; KeeperType keeperType() const; void restore(); + public: void setShowCapLock(bool show); void setShowNumLock(bool show); void setShowScrollLock(bool show); void setShowLayout(bool show); void setKeeperType(KeeperType type) const; + private: - QSettings *m_settings = 0; - QScopedPointer m_oldSettings; + PluginSettings *m_settings; }; #endif diff --git a/plugin-kbindicator/translations/kbindicator.ts b/plugin-kbindicator/translations/kbindicator.ts deleted file mode 100644 index 140fdbd..0000000 --- a/plugin-kbindicator/translations/kbindicator.ts +++ /dev/null @@ -1,116 +0,0 @@ - - - - - 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 indicator settings - - - - - LEDs - - - - - Show Caps Lock - - - - - Show Num Lock - - - - - Show Scroll Lock - - - - - Show keyboard layout - - - - - Show flags instead labels - - - - - Layout mode: - - - - - Global - - - - - Window - - - - - Application - - - - - Configure layouts... - - - - diff --git a/plugin-kbindicator/translations/kbindicator_ar.desktop b/plugin-kbindicator/translations/kbindicator_ar.desktop new file mode 100644 index 0000000..6454edc --- /dev/null +++ b/plugin-kbindicator/translations/kbindicator_ar.desktop @@ -0,0 +1,2 @@ +Name[ar]=مؤشّر حالة لوحة المفاتيح +Comment[ar]=ملحقة لمؤشّر حالة لوحة المفاتيح وتبديل اللغات. diff --git a/plugin-kbindicator/translations/kbindicator_de.ts b/plugin-kbindicator/translations/kbindicator_de.ts deleted file mode 100644 index a4dd6f7..0000000 --- a/plugin-kbindicator/translations/kbindicator_de.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - Content - - - C - Label for CapsLock indicator - This capital letter is printed on my keyboard. - A - - - - CapsLock - Tooltip for CapsLock indicator - Großbuchstaben - - - - N - Label for NumLock indicator - This digit is printed on my keyboard. - 1 - - - - NumLock - Tooltip for NumLock indicator - Ziffern - - - - S - Label for ScrollLock indicator - From the word "Rollen". - R - - - - ScrollLock - Tooltip for ScrollLock indicator - Rollen - - - - Layout - Layout - - - - Variant - Variante - - - - KbdStateConfig - - - Keyboard state settings - Tastaturstatus - Einstellungen - - - - Lock Indicators - Schalteranzeigen - - - - Show Caps Lock - Feststelltaste anzeigen - - - - Show Num Lock - NumLock-Taste anzeigen - - - - Show Scroll Lock - Rollen-Taste anzeigen - - - - Keyboard Layout Indicator - Tastatur-Layout anzeigen - - - - Switching policy - Umschaltrichtlinie - - - - Configure layouts - Layout konfigurieren - - - - Global - Global - - - - Window - Fenster - - - - Application - Anwendung - - - diff --git a/plugin-kbindicator/translations/kbindicator_el.ts b/plugin-kbindicator/translations/kbindicator_el.ts deleted file mode 100644 index c7886d5..0000000 --- a/plugin-kbindicator/translations/kbindicator_el.ts +++ /dev/null @@ -1,80 +0,0 @@ - - - - - Content - - - Layout - Διάταξη - - - - Variant - Παραλλαγή - - - - KbdStateConfig - - - Dialog - Διάλογος - - - - Leds - Φωτεινοί δίοδοι - - - - Show Caps Lock - Εμφάνιση του κλειδώματος κεφαλαίων - - - - Show Num Lock - Εμφάνιση του κλειδώματος του αριθμητικού πληκτρολογίου - - - - Show Scroll Lock - Εμφάνιση του κλειδώματος της κύλισης - - - - Show keyboard layout - Εμφάνιση της διάταξης του πληκτρολογίου - - - - Show flags instead labels - Εμφάνιση της σημαίας αντί της ετικέτας - - - - Layout mode: - Λειτουργία διάταξης: - - - - Global - Καθολικό - - - - Window - Παράθυρο - - - - Application - Εφαρμογή - - - - Configure layouts - Διαμόρφωση των διατάξεων - - - diff --git a/plugin-kbindicator/translations/kbindicator_hu.desktop b/plugin-kbindicator/translations/kbindicator_hu.desktop new file mode 100644 index 0000000..d83fa0c --- /dev/null +++ b/plugin-kbindicator/translations/kbindicator_hu.desktop @@ -0,0 +1,2 @@ +Name[hu]=Billentyűállapot-kijelző +Comment[hu]=Bővítmény a billentyűállapot kijelzésére és a kiosztás megváltoztatására. diff --git a/plugin-kbindicator/translations/kbindicator_it.ts b/plugin-kbindicator/translations/kbindicator_it.ts deleted file mode 100644 index 1769838..0000000 --- a/plugin-kbindicator/translations/kbindicator_it.ts +++ /dev/null @@ -1,27 +0,0 @@ - - - - - LXQtKbIndicatorConfiguration - - - Keyboard Indicator Settings - Indicatori - - - - Caps Lock - Blocco maiuscolo - - - - Num Lock - Blocco numeri - - - - Scroll Lock - Blocco scorrimento - - - diff --git a/plugin-kbindicator/translations/kbindicator_ja.desktop b/plugin-kbindicator/translations/kbindicator_ja.desktop new file mode 100644 index 0000000..4ad41d9 --- /dev/null +++ b/plugin-kbindicator/translations/kbindicator_ja.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Service +ServiceTypes=LxQtPanel/Plugin +Name[ja]=キーボードインジケーター +Comment[ja]=キーボードインジケーターのプラグイン + +#TRANSLATIONS_DIR=../translations diff --git a/plugin-kbindicator/translations/kbindicator_pt.desktop b/plugin-kbindicator/translations/kbindicator_pt.desktop new file mode 100644 index 0000000..d15b8a1 --- /dev/null +++ b/plugin-kbindicator/translations/kbindicator_pt.desktop @@ -0,0 +1,3 @@ +#Translations +Name[pt]=Indicador de teclado +Comment[pt]=Plugin indicador do teclado diff --git a/plugin-kbindicator/translations/kbindicator_ru.desktop b/plugin-kbindicator/translations/kbindicator_ru.desktop new file mode 100644 index 0000000..9a18877 --- /dev/null +++ b/plugin-kbindicator/translations/kbindicator_ru.desktop @@ -0,0 +1,2 @@ +Name[ru]=Индикатор раскладки клавиатуры +Comment[ru]=Индикатор и плагин переключения раскладки клавиатуры. diff --git a/plugin-mainmenu/CMakeLists.txt b/plugin-mainmenu/CMakeLists.txt index 1d2e683..9db76ec 100644 --- a/plugin-mainmenu/CMakeLists.txt +++ b/plugin-mainmenu/CMakeLists.txt @@ -1,12 +1,14 @@ set(PLUGIN "mainmenu") set(HEADERS + actionview.h lxqtmainmenu.h menustyle.h lxqtmainmenuconfiguration.h ) set(SOURCES + actionview.cpp lxqtmainmenu.cpp menustyle.cpp lxqtmainmenuconfiguration.cpp diff --git a/plugin-mainmenu/actionview.cpp b/plugin-mainmenu/actionview.cpp new file mode 100644 index 0000000..de9ae55 --- /dev/null +++ b/plugin-mainmenu/actionview.cpp @@ -0,0 +1,266 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * http://lxqt.org + * + * Copyright: 2016 LXQt team + * Authors: + * Palo Kisa + * + * 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 "actionview.h" +#ifdef HAVE_MENU_CACHE + #include "xdgcachedmenu.h" +#endif + +#include +#include +#include +#include +#include +#include +#include +#include + +namespace +{ + class SingleActivateStyle : public QProxyStyle + { + public: + using QProxyStyle::QProxyStyle; + virtual int styleHint(StyleHint hint, const QStyleOption * option = 0, const QWidget * widget = 0, QStyleHintReturn * returnData = 0) const override + { + if(hint == QStyle::SH_ItemView_ActivateItemOnSingleClick) + return 1; + return QProxyStyle::styleHint(hint, option, widget, returnData); + + } + }; + + class DelayedIconDelegate : public QStyledItemDelegate + { + public: + DelayedIconDelegate(QObject * parent = nullptr) + : QStyledItemDelegate(parent) + , mMaxItemWidth(300) + { + } + + void setMaxItemWidth(int max) + { + mMaxItemWidth = max; + } + + virtual QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override + { + //the XdgCachedMenuAction does load the icon upon showing its menu +#ifdef HAVE_MENU_CACHE + QIcon icon = index.data(Qt::DecorationRole).value(); + if (icon.isNull()) + { + XdgCachedMenuAction * cached_action = qobject_cast(qvariant_cast(index.data(ActionView::ActionRole))); + Q_ASSERT(nullptr != cached_action); + cached_action->updateIcon(); + const_cast(index.model())->setData(index, cached_action->icon(), Qt::DecorationRole); + } +#endif + QSize s = QStyledItemDelegate::sizeHint(option, index); + s.setWidth(qMin(mMaxItemWidth, s.width())); + return s; + } + private: + int mMaxItemWidth; + }; + +} + +ActionView::ActionView(QWidget * parent /*= nullptr*/) + : QListView(parent) + , mModel{new QStandardItemModel{this}} + , mProxy{new QSortFilterProxyModel{this}} + , mMaxItemsToShow(10) +{ + setEditTriggers(QAbstractItemView::NoEditTriggers); + setSizeAdjustPolicy(AdjustToContents); + setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + setSelectionBehavior(SelectRows); + setSelectionMode(SingleSelection); + + SingleActivateStyle * s = new SingleActivateStyle; + s->setParent(this); + setStyle(s); + mProxy->setSourceModel(mModel); + mProxy->setDynamicSortFilter(true); + mProxy->setFilterRole(FilterRole); + mProxy->setFilterCaseSensitivity(Qt::CaseInsensitive); + mProxy->sort(0); + { + QScopedPointer guard{selectionModel()}; + setModel(mProxy); + } + { + QScopedPointer guard{itemDelegate()}; + setItemDelegate(new DelayedIconDelegate{this}); + } + connect(this, &QAbstractItemView::activated, this, &ActionView::onActivated); +} + +void ActionView::ActionView::clear() +{ + for (int i = mModel->rowCount() - 1; i >= 0; --i) + { + mModel->removeRow(i); + } +} + +void ActionView::addAction(QAction * action) +{ + QStandardItem * item = new QStandardItem; + item->setData(QVariant::fromValue(action), ActionRole); + item->setFont(action->font()); + //Note: XdgCachedMenuAction has delayed icon loading... we are loading the icon + //in QStyledItemDelegate:sizeHint if necessary + item->setIcon(action->icon()); + item->setText(action->text()); + item->setToolTip(action->toolTip()); + QString all = action->text(); + all += '\n'; + all += action->toolTip(); + item->setData(all, FilterRole); + + mModel->appendRow(item); + connect(action, &QObject::destroyed, this, &ActionView::onActionDestroyed); +} + +bool ActionView::existsAction(QAction const * action) const +{ + bool exists = false; + for (int row = mModel->rowCount() - 1; 0 <= row; --row) + { + const QModelIndex index = mModel->index(row, 0); + if (action->text() == mModel->data(index, Qt::DisplayRole) + && action->toolTip() == mModel->data(index, Qt::ToolTipRole) + ) + { + exists = true; + break; + } + + } + return exists; +} + +void ActionView::fillActions(QMenu * menu) +{ + clear(); + fillActionsRecursive(menu); +} + +void ActionView::setFilter(QString const & filter) +{ + mProxy->setFilterFixedString(filter); + const int count = mProxy->rowCount(); + if (0 < count) + { + if (count > mMaxItemsToShow) + { + setCurrentIndex(mProxy->index(mMaxItemsToShow - 1, 0)); + verticalScrollBar()->triggerAction(QScrollBar::SliderToMinimum); + } else + { + setCurrentIndex(mProxy->index(count - 1, 0)); + } + } +} + +void ActionView::setMaxItemsToShow(int max) +{ + mMaxItemsToShow = max; +} + +void ActionView::setMaxItemWidth(int max) +{ + dynamic_cast(itemDelegate())->setMaxItemWidth(max); +} + +void ActionView::activateCurrent() +{ + QModelIndex const index = currentIndex(); + if (index.isValid()) + emit activated(index); +} + +QSize ActionView::viewportSizeHint() const +{ + const int count = mProxy->rowCount(); + QSize s{0, 0}; + if (0 < count) + { + const bool scrollable = mMaxItemsToShow < count; + s.setWidth(sizeHintForColumn(0) + (scrollable ? verticalScrollBar()->sizeHint().width() : 0)); + s.setHeight(sizeHintForRow(0) * (scrollable ? mMaxItemsToShow : count)); + } + return s; +} + +QSize ActionView::minimumSizeHint() const +{ + return QSize{0, 0}; +} + +void ActionView::onActivated(QModelIndex const & index) +{ + QAction * action = qvariant_cast(model()->data(index, ActionRole)); + Q_ASSERT(nullptr != action); + action->trigger(); +} + +void ActionView::onActionDestroyed() +{ + QObject * const action = sender(); + Q_ASSERT(nullptr != action); + for (int i = mModel->rowCount() - 1; 0 <= i; --i) + { + QStandardItem * item = mModel->item(i); + if (action == item->data(ActionRole).value()) + { + mModel->removeRow(i); + break; + } + } +} + +void ActionView::fillActionsRecursive(QMenu * menu) +{ + for (auto const & action : menu->actions()) + { + if (QMenu * sub_menu = action->menu()) + { + fillActionsRecursive(sub_menu); //recursion + } else if (nullptr == qobject_cast(action) + && !action->isSeparator()) + { + //real menu action -> app + if (!existsAction(action)) + addAction(action); + } + } +} + diff --git a/plugin-mainmenu/actionview.h b/plugin-mainmenu/actionview.h new file mode 100644 index 0000000..b86bc2f --- /dev/null +++ b/plugin-mainmenu/actionview.h @@ -0,0 +1,95 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * http://lxqt.org + * + * Copyright: 2016 LXQt team + * Authors: + * Palo Kisa + * + * 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 */ + +#if !defined(ACTION_VIEW_H) +#define ACTION_VIEW_H + +#include + +class QStandardItemModel; +class QSortFilterProxyModel; + +class ActionView : public QListView +{ + Q_OBJECT +public: + enum Role + { + ActionRole = Qt::UserRole + , FilterRole = ActionRole + 1 + }; + +public: + ActionView(QWidget * parent = nullptr); + + /*! \brief Remove all items from model + */ + void clear(); + /*! \brief Add action proxy to the underlying model + */ + void addAction(QAction * action); + /*! \brief Check if action already exists in the view/model. + * + * \note The equality is evaluated just on text() & toolTip() + */ + bool existsAction(QAction const * action) const; + /*! \brief Fill the view with all actions from \param menu + */ + void fillActions(QMenu * menu); + /*! \brief Sets the filter for entries to be presented + */ + void setFilter(QString const & filter); + /*! \brief Set the maximum number of items/results to show + */ + void setMaxItemsToShow(int max); + /*! \brief Set the maximum width of item to show + */ + void setMaxItemWidth(int max); + +public slots: + /*! \brief Trigger action on currently active item + */ + void activateCurrent(); + +protected: + virtual QSize viewportSizeHint() const override; + virtual QSize minimumSizeHint() const override; + +private slots: + void onActivated(QModelIndex const & index); + void onActionDestroyed(); + +private: + void fillActionsRecursive(QMenu * menu); + +private: + QStandardItemModel * mModel; + QSortFilterProxyModel * mProxy; + int mMaxItemsToShow; +}; + +#endif //ACTION_VIEW_H diff --git a/plugin-mainmenu/lxqtmainmenu.cpp b/plugin-mainmenu/lxqtmainmenu.cpp index 9673a4f..8f943dc 100644 --- a/plugin-mainmenu/lxqtmainmenu.cpp +++ b/plugin-mainmenu/lxqtmainmenu.cpp @@ -29,41 +29,40 @@ #include "lxqtmainmenu.h" #include "lxqtmainmenuconfiguration.h" #include "../panel/lxqtpanel.h" -#include -#include -#include -#include -#include +#include "actionview.h" #include #include #include #include #include -#include -#include +#include +#include +#include #include #include // for find_if() #include +#include -#include -#include #include #ifdef HAVE_MENU_CACHE #include "xdgcachedmenu.h" #endif -#include -#include -#include - #define DEFAULT_SHORTCUT "Alt+F1" LXQtMainMenu::LXQtMainMenu(const ILXQtPanelPluginStartupInfo &startupInfo): QObject(), ILXQtPanelPlugin(startupInfo), mMenu(0), - mShortcut(0) + mShortcut(0), + mSearchEditAction{new QWidgetAction{this}}, + mSearchViewAction{new QWidgetAction{this}}, + mMakeDirtyAction{new QAction{this}}, + mFilterMenu(true), + mFilterShow(true), + mFilterShowHideMenu(true), + mHeavyMenuChanges(false) { #ifdef HAVE_MENU_CACHE mMenuCache = NULL; @@ -71,26 +70,49 @@ LXQtMainMenu::LXQtMainMenu(const ILXQtPanelPluginStartupInfo &startupInfo): #endif mDelayedPopup.setSingleShot(true); - mDelayedPopup.setInterval(250); + mDelayedPopup.setInterval(200); connect(&mDelayedPopup, &QTimer::timeout, this, &LXQtMainMenu::showHideMenu); mHideTimer.setSingleShot(true); mHideTimer.setInterval(250); + mButton.setAutoRaise(true); mButton.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); - mButton.installEventFilter(this); + //Notes: + //1. installing event filter to parent widget to avoid infinite loop + // (while setting icon we also need to set the style) + //2. delaying of installEventFilter because in c-tor mButton has no parent widget + // (parent is assigned in panel's logic after widget() call) + QTimer::singleShot(0, [this] { Q_ASSERT(mButton.parentWidget()); mButton.parentWidget()->installEventFilter(this); }); connect(&mButton, &QToolButton::clicked, this, &LXQtMainMenu::showHideMenu); - settingsChanged(); - - mShortcut = GlobalKeyShortcut::Client::instance()->addAction(QString{}, QString("/panel/%1/show_hide").arg(settings()->group()), tr("Show/hide main menu"), this); + mSearchView = new ActionView; + mSearchView->setVisible(false); + connect(mSearchView, &QAbstractItemView::activated, this, &LXQtMainMenu::showHideMenu); + mSearchViewAction->setDefaultWidget(mSearchView); + mSearchEdit = new QLineEdit; + mSearchEdit->setClearButtonEnabled(true); + mSearchEdit->setPlaceholderText(LXQtMainMenu::tr("Search...")); + connect(mSearchEdit, &QLineEdit::textChanged, this, &LXQtMainMenu::searchTextChanged); + 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); if (mShortcut) { connect(mShortcut, &GlobalKeyShortcut::Action::registrationFinished, [this] { if (mShortcut->shortcut().isEmpty()) mShortcut->changeShortcut(DEFAULT_SHORTCUT); }); - connect(mShortcut, &GlobalKeyShortcut::Action::activated, [this] { if (!mHideTimer.isActive()) mDelayedPopup.start(); }); + connect(mShortcut, &GlobalKeyShortcut::Action::activated, [this] { + if (!mHideTimer.isActive()) + // Delay this a little -- if we don't do this, search field + // won't be able to capture focus + // See and + // + mDelayedPopup.start(); + }); } } @@ -100,7 +122,12 @@ LXQtMainMenu::LXQtMainMenu(const ILXQtPanelPluginStartupInfo &startupInfo): ************************************************/ LXQtMainMenu::~LXQtMainMenu() { - mButton.removeEventFilter(this); + mButton.parentWidget()->removeEventFilter(this); + if (mMenu) + { + mMenu->removeAction(mSearchEditAction); + mMenu->removeAction(mSearchViewAction); + } #ifdef HAVE_MENU_CACHE if(mMenuCache) { @@ -130,9 +157,18 @@ void LXQtMainMenu::showMenu() if (!mMenu) return; + willShowWindow(mMenu); // Just using Qt`s activateWindow() won't work on some WMs like Kwin. // Solution is to execute menu 1ms later using timer mMenu->popup(calculatePopupWindowPos(mMenu->sizeHint()).topLeft()); + if (mFilterMenu || mFilterShow) + { + //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 + mSearchEdit->unsetCursor(); + mSearchEdit->setFocus(); + } } #ifdef HAVE_MENU_CACHE @@ -148,6 +184,7 @@ void LXQtMainMenu::menuCacheReloadNotify(MenuCache* cache, gpointer user_data) ************************************************/ void LXQtMainMenu::settingsChanged() { + setButtonIcon(); if (settings()->value("showText", false).toBool()) { mButton.setText(settings()->value("text", "Start").toString()); @@ -199,42 +236,145 @@ void LXQtMainMenu::settingsChanged() setMenuFontSize(); + //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(); + mFilterShowHideMenu = settings()->value("filterShowHideMenu", true).toBool(); + if (mMenu) + { + mSearchEdit->setVisible(mFilterMenu || mFilterShow); + mSearchEditAction->setVisible(mFilterMenu || mFilterShow); + } + mSearchView->setMaxItemsToShow(settings()->value("filterShowMaxItems", 10).toInt()); + mSearchView->setMaxItemWidth(settings()->value("filterShowMaxWidth", 300).toInt()); + realign(); } +static bool filterMenu(QMenu * menu, QString const & filter) +{ + bool has_visible = false; + for (auto const & action : menu->actions()) + { + if (QMenu * sub_menu = action->menu()) + { + action->setVisible(filterMenu(sub_menu, filter)/*recursion*/); + has_visible |= action->isVisible(); + } else if (nullptr != qobject_cast(action)) + { + //our searching widget + has_visible = true; + } else if (!action->isSeparator()) + { + //real menu action -> app + action->setVisible(filter.isEmpty() || action->text().contains(filter, Qt::CaseInsensitive) || action->toolTip().contains(filter, Qt::CaseInsensitive)); + has_visible |= action->isVisible(); + } + } + return has_visible; +} + +static void showHideMenuEntries(QMenu * menu, bool show) +{ + //show/hide the top menu entries + for (auto const & action : menu->actions()) + { + if (nullptr == qobject_cast(action)) + { + action->setVisible(show); + } + } +} + +/************************************************ + + ************************************************/ +void LXQtMainMenu::searchTextChanged(QString const & text) +{ + if (mFilterShow) + { + mHeavyMenuChanges = true; + const bool shown = !text.isEmpty(); + if (mFilterShowHideMenu) + showHideMenuEntries(mMenu, !shown); + if (shown) + mSearchView->setFilter(text); + mSearchView->setVisible(shown); + mSearchViewAction->setVisible(shown); + //TODO: how to force the menu to recalculate it's size in a more elegant way? + mMenu->addAction(mMakeDirtyAction); + mMenu->removeAction(mMakeDirtyAction); + mHeavyMenuChanges = false; + } + if (mFilterMenu && !(mFilterShow && mFilterShowHideMenu)) + filterMenu(mMenu, text); + +} + +/************************************************ + + ************************************************/ +void LXQtMainMenu::setSearchFocus(QAction *action) +{ + if (mFilterMenu || mFilterShow) + { + if(action == mSearchEditAction) + mSearchEdit->setFocus(); + else + mSearchEdit->clearFocus(); + } +} /************************************************ ************************************************/ void LXQtMainMenu::buildMenu() { + if(mMenu) + { + mMenu->removeAction(mSearchEditAction); + mMenu->removeAction(mSearchViewAction); + delete mMenu; + } #ifdef HAVE_MENU_CACHE - XdgCachedMenu* menu = new XdgCachedMenu(mMenuCache, &mButton); + mMenu = new XdgCachedMenu(mMenuCache, &mButton); #else - XdgMenuWidget *menu = new XdgMenuWidget(mXdgMenu, "", &mButton); + mMenu = new XdgMenuWidget(mXdgMenu, "", &mButton); #endif - menu->setObjectName("TopLevelMainMenu"); - menu->setStyle(&mTopMenuStyle); + mMenu->setObjectName("TopLevelMainMenu"); + // Note: the QWidget::ensurePolished() workarounds problem with transparent + // QLineEdit (mSearchEditAction) in menu with Breeze style + // https://bugs.kde.org/show_bug.cgi?id=368048 + mMenu->ensurePolished(); + mMenu->setStyle(&mTopMenuStyle); - menu->addSeparator(); + mMenu->addSeparator(); - Q_FOREACH(QAction* action, menu->actions()) + Q_FOREACH(QAction* action, mMenu->actions()) { if (action->menu()) action->menu()->installEventFilter(this); } - menu->installEventFilter(this); - connect(menu, &QMenu::aboutToHide, &mHideTimer, static_cast(&QTimer::start)); - connect(menu, &QMenu::aboutToShow, &mHideTimer, &QTimer::stop); - // panel notification (needed in case of auto-hide) - connect(menu, &QMenu::aboutToHide, dynamic_cast(panel()), &LXQtPanel::hidePanel); - - QMenu *oldMenu = mMenu; - mMenu = menu; - if(oldMenu) - delete oldMenu; - + mMenu->installEventFilter(this); + connect(mMenu, &QMenu::aboutToHide, &mHideTimer, static_cast(&QTimer::start)); + connect(mMenu, &QMenu::aboutToShow, &mHideTimer, &QTimer::stop); + + mMenu->addSeparator(); + mMenu->addAction(mSearchViewAction); + mMenu->addAction(mSearchEditAction); + connect(mMenu, &QMenu::hovered, this, &LXQtMainMenu::setSearchFocus); + //Note: setting readOnly to true to avoid wake-ups upon the Qt's internal "blink" cursor timer + //(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); }); + mSearchEdit->setVisible(mFilterMenu || mFilterShow); + mSearchEditAction->setVisible(mFilterMenu || mFilterShow); + mSearchView->fillActions(mMenu); + + searchTextChanged(mSearchEdit->text()); setMenuFontSize(); } @@ -261,10 +401,30 @@ void LXQtMainMenu::setMenuFontSize() { subMenu->setFont(menuFont); } + mSearchEdit->setFont(menuFont); + mSearchView->setFont(menuFont); } //icon size the same as the font height - mTopMenuStyle.setIconSize(QFontMetrics(menuFont).height()); + const int icon_size = QFontMetrics(menuFont).height(); + mTopMenuStyle.setIconSize(icon_size); + mSearchView->setIconSize(QSize{icon_size, icon_size}); +} + + +/************************************************ + + ************************************************/ +void LXQtMainMenu::setButtonIcon() +{ + if (settings()->value("ownIcon", false).toBool()) + { + mButton.setStyleSheet(QString("#MainMenu { qproperty-icon: url(%1); }") + .arg(settings()->value(QLatin1String("icon"), QLatin1String(LXQT_GRAPHICS_DIR"/helix.svg")).toString())); + } else + { + mButton.setStyleSheet(QString()); + } } @@ -273,7 +433,7 @@ void LXQtMainMenu::setMenuFontSize() ************************************************/ QDialog *LXQtMainMenu::configureDialog() { - return new LXQtMainMenuConfiguration(*settings(), mShortcut, DEFAULT_SHORTCUT); + return new LXQtMainMenuConfiguration(settings(), mShortcut, DEFAULT_SHORTCUT); } /************************************************ @@ -289,14 +449,13 @@ struct MatchAction bool LXQtMainMenu::eventFilter(QObject *obj, QEvent *event) { - if(obj == &mButton) + if(obj == mButton.parentWidget()) { // the application is given a new QStyle if(event->type() == QEvent::StyleChange) { - // reset proxy style for the menus so they can apply the new styles - mTopMenuStyle.setBaseStyle(NULL); setMenuFontSize(); + setButtonIcon(); } } else if(QMenu* menu = qobject_cast(obj)) @@ -326,6 +485,36 @@ bool LXQtMainMenu::eventFilter(QObject *obj, QEvent *event) menu->setActiveAction(*it); } } + + if (obj == mMenu) + { + if (event->type() == QEvent::Resize) + { + QResizeEvent * e = dynamic_cast(event); + if (e->oldSize().isValid() && e->oldSize() != e->size()) + { + mMenu->move(calculatePopupWindowPos(e->size()).topLeft()); + } + } else if (event->type() == QEvent::KeyPress) + { + QKeyEvent * e = dynamic_cast(event); + if (Qt::Key_Escape == e->key()) + { + if (!mSearchEdit->text().isEmpty()) + { + mSearchEdit->setText(QString{}); + //filter out this to not close the menu + return true; + } + } + } else if (QEvent::ActionChanged == event->type() + || QEvent::ActionAdded == event->type()) + { + //filter this if we are performing heavy changes to reduce flicker + if (mHeavyMenuChanges) + return true; + } + } } return false; } diff --git a/plugin-mainmenu/lxqtmainmenu.h b/plugin-mainmenu/lxqtmainmenu.h index 117cd9f..ec82d59 100644 --- a/plugin-mainmenu/lxqtmainmenu.h +++ b/plugin-mainmenu/lxqtmainmenu.h @@ -47,6 +47,9 @@ class QMenu; +class QWidgetAction; +class QLineEdit; +class ActionView; class LXQtBar; namespace LXQt { @@ -79,6 +82,7 @@ protected: private: void setMenuFontSize(); + void setButtonIcon(); private: QToolButton mButton; @@ -86,6 +90,15 @@ private: QMenu* mMenu; GlobalKeyShortcut::Action *mShortcut; MenuStyle mTopMenuStyle; + QWidgetAction * mSearchEditAction; + QLineEdit * mSearchEdit; + QWidgetAction * mSearchViewAction; + ActionView * mSearchView; + QAction * mMakeDirtyAction; + bool mFilterMenu; //!< searching should perform hiding nonmatching items in menu + bool mFilterShow; //!< searching should list matching items in top menu + bool mFilterShowHideMenu; //!< while searching all (original) menu entries should be hidden + bool mHeavyMenuChanges; //!< flag for filtering some mMenu events while heavy changes are performed #ifdef HAVE_MENU_CACHE MenuCache* mMenuCache; @@ -107,6 +120,8 @@ protected slots: private slots: void showMenu(); void showHideMenu(); + void searchTextChanged(QString const & text); + void setSearchFocus(QAction *action); }; class LXQtMainMenuPluginLibrary: public QObject, public ILXQtPanelPluginLibrary diff --git a/plugin-mainmenu/lxqtmainmenuconfiguration.cpp b/plugin-mainmenu/lxqtmainmenuconfiguration.cpp index c7f09ee..5f97f3b 100644 --- a/plugin-mainmenu/lxqtmainmenuconfiguration.cpp +++ b/plugin-mainmenu/lxqtmainmenuconfiguration.cpp @@ -31,14 +31,13 @@ #include #include #include +#include #include -LXQtMainMenuConfiguration::LXQtMainMenuConfiguration(QSettings &settings, GlobalKeyShortcut::Action * shortcut, const QString &defaultShortcut, QWidget *parent) : - QDialog(parent), +LXQtMainMenuConfiguration::LXQtMainMenuConfiguration(PluginSettings *settings, GlobalKeyShortcut::Action * shortcut, const QString &defaultShortcut, QWidget *parent) : + LXQtPanelPluginConfigDialog(settings, parent), ui(new Ui::LXQtMainMenuConfiguration), - mSettings(settings), - mOldSettings(settings), mDefaultShortcut(defaultShortcut), mShortcut(shortcut) { @@ -46,7 +45,9 @@ LXQtMainMenuConfiguration::LXQtMainMenuConfiguration(QSettings &settings, Global setObjectName("MainMenuConfigurationWindow"); ui->setupUi(this); - ui->chooseMenuFilePB->setIcon(XdgIcon::fromTheme("folder")); + QIcon folder{XdgIcon::fromTheme("folder")}; + ui->chooseMenuFilePB->setIcon(folder); + ui->iconPB->setIcon(folder); connect(ui->buttons, SIGNAL(clicked(QAbstractButton*)), this, SLOT(dialogButtonsAction(QAbstractButton*))); @@ -55,9 +56,15 @@ LXQtMainMenuConfiguration::LXQtMainMenuConfiguration(QSettings &settings, Global connect(ui->showTextCB, SIGNAL(toggled(bool)), this, SLOT(showTextChanged(bool))); connect(ui->textLE, SIGNAL(textEdited(QString)), this, SLOT(textButtonChanged(QString))); connect(ui->chooseMenuFilePB, SIGNAL(clicked()), this, SLOT(chooseMenuFile())); - connect(ui->menuFilePathLE, &QLineEdit::textChanged, [this] (QString const & file) + connect(ui->menuFilePathLE, &QLineEdit::textChanged, [&] (QString const & file) { - mSettings.setValue(QLatin1String("menu_file"), file); + this->settings().setValue(QLatin1String("menu_file"), file); + }); + connect(ui->iconCB, &QCheckBox::toggled, [this] (bool value) { this->settings().setValue("ownIcon", value); }); + connect(ui->iconPB, &QAbstractButton::clicked, this, &LXQtMainMenuConfiguration::chooseIcon); + connect(ui->iconLE, &QLineEdit::textChanged, [&] (QString const & path) + { + this->settings().setValue(QLatin1String("icon"), path); }); connect(ui->shortcutEd, SIGNAL(shortcutGrabbed(QString)), this, SLOT(shortcutChanged(QString))); @@ -67,6 +74,27 @@ LXQtMainMenuConfiguration::LXQtMainMenuConfiguration(QSettings &settings, Global connect(ui->customFontSizeSB, SIGNAL(valueChanged(int)), this, SLOT(customFontSizeChanged(int))); connect(mShortcut, &GlobalKeyShortcut::Action::shortcutChanged, this, &LXQtMainMenuConfiguration::globalShortcutChanged); + + connect(ui->filterMenuCB, &QCheckBox::toggled, [this] (bool enabled) + { + this->settings().setValue("filterMenu", enabled); + }); + connect(ui->filterShowCB, &QCheckBox::toggled, [this] (bool enabled) + { + this->settings().setValue("filterShow", enabled); + }); + connect(ui->filterShowMaxItemsSB, static_cast(&QSpinBox::valueChanged), [this] (int value) + { + this->settings().setValue("filterShowMaxItems", value); + }); + connect(ui->filterShowMaxWidthSB, static_cast(&QSpinBox::valueChanged), [this] (int value) + { + this->settings().setValue("filterShowMaxWidth", value); + }); + connect(ui->filterShowHideMenuCB, &QCheckBox::toggled, [this] (bool enabled) + { + this->settings().setValue("filterShowHideMenu", enabled); + }); } LXQtMainMenuConfiguration::~LXQtMainMenuConfiguration() @@ -76,10 +104,12 @@ LXQtMainMenuConfiguration::~LXQtMainMenuConfiguration() void LXQtMainMenuConfiguration::loadSettings() { - ui->showTextCB->setChecked(mSettings.value("showText", false).toBool()); - ui->textLE->setText(mSettings.value("text", "").toString()); + 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()); - QString menuFile = mSettings.value("menu_file", "").toString(); + QString menuFile = settings().value("menu_file", "").toString(); if (menuFile.isEmpty()) { menuFile = XdgMenu::getMenuFileName(); @@ -87,23 +117,51 @@ void LXQtMainMenuConfiguration::loadSettings() ui->menuFilePathLE->setText(menuFile); ui->shortcutEd->setText(nullptr != mShortcut ? mShortcut->shortcut() : mDefaultShortcut); - ui->customFontCB->setChecked(mSettings.value("customFont", false).toBool()); + ui->customFontCB->setChecked(settings().value("customFont", false).toBool()); LXQt::Settings lxqtSettings("lxqt"); //load system font size as init value QFont systemFont; lxqtSettings.beginGroup(QLatin1String("Qt")); systemFont.fromString(lxqtSettings.value("font", this->font()).toString()); lxqtSettings.endGroup(); - ui->customFontSizeSB->setValue(mSettings.value("customFontSize", systemFont.pointSize()).toInt()); + ui->customFontSizeSB->setValue(settings().value("customFontSize", systemFont.pointSize()).toInt()); + ui->filterMenuCB->setChecked(settings().value("filterMenu", true).toBool()); + const bool filter_show = settings().value("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->filterShowMaxWidthL->setEnabled(filter_show); + ui->filterShowMaxWidthSB->setEnabled(filter_show); + ui->filterShowMaxWidthSB->setValue(settings().value("filterShowMaxWidth", 300).toInt()); + ui->filterShowHideMenuCB->setEnabled(filter_show); + ui->filterShowHideMenuCB->setChecked(settings().value("filterShowHideMenu", true).toBool()); } + void LXQtMainMenuConfiguration::textButtonChanged(const QString &value) { - mSettings.setValue("text", value); + settings().setValue("text", value); } void LXQtMainMenuConfiguration::showTextChanged(bool value) { - mSettings.setValue("showText", value); + settings().setValue("showText", value); +} + +void LXQtMainMenuConfiguration::chooseIcon() +{ + QFileInfo f{ui->iconLE->text()}; + QDir dir = f.dir(); + QFileDialog *d = new QFileDialog(this, + tr("Choose icon file"), + !f.filePath().isEmpty() && dir.exists() ? dir.path() : QLatin1String(LXQT_GRAPHICS_DIR), + tr("Images (*.svg *.png)")); + d->setWindowModality(Qt::WindowModal); + d->setAttribute(Qt::WA_DeleteOnClose); + connect(d, &QFileDialog::fileSelected, [&] (const QString &icon) { + ui->iconLE->setText(icon); + }); + d->show(); } void LXQtMainMenuConfiguration::chooseMenuFile() @@ -136,25 +194,12 @@ void LXQtMainMenuConfiguration::shortcutReset() shortcutChanged(mDefaultShortcut); } -void LXQtMainMenuConfiguration::dialogButtonsAction(QAbstractButton *btn) -{ - if (ui->buttons->buttonRole(btn) == QDialogButtonBox::ResetRole) - { - mOldSettings.loadToSettings(); - loadSettings(); - } - else - { - close(); - } -} - void LXQtMainMenuConfiguration::customFontChanged(bool value) { - mSettings.setValue("customFont", value); + settings().setValue("customFont", value); } void LXQtMainMenuConfiguration::customFontSizeChanged(int value) { - mSettings.setValue("customFontSize", value); + settings().setValue("customFontSize", value); } diff --git a/plugin-mainmenu/lxqtmainmenuconfiguration.h b/plugin-mainmenu/lxqtmainmenuconfiguration.h index 1d1cf4e..550c1a3 100644 --- a/plugin-mainmenu/lxqtmainmenuconfiguration.h +++ b/plugin-mainmenu/lxqtmainmenuconfiguration.h @@ -29,11 +29,9 @@ #ifndef LXQTMAINMENUCONFIGURATION_H #define LXQTMAINMENUCONFIGURATION_H -#include +#include "../panel/lxqtpanelpluginconfigdialog.h" +#include "../panel/pluginsettings.h" -#include - -class QSettings; class QAbstractButton; namespace Ui { @@ -44,18 +42,19 @@ namespace GlobalKeyShortcut { class Action; } -class LXQtMainMenuConfiguration : public QDialog +class LXQtMainMenuConfiguration : public LXQtPanelPluginConfigDialog { Q_OBJECT public: - explicit LXQtMainMenuConfiguration(QSettings &settings, GlobalKeyShortcut::Action * shortcut, const QString &defaultShortcut, QWidget *parent = 0); + explicit LXQtMainMenuConfiguration(PluginSettings *settings, + GlobalKeyShortcut::Action *shortcut, + const QString &defaultShortcut, + QWidget *parent = nullptr); ~LXQtMainMenuConfiguration(); private: Ui::LXQtMainMenuConfiguration *ui; - QSettings &mSettings; - LXQt::SettingsCache mOldSettings; QString mDefaultShortcut; GlobalKeyShortcut::Action * mShortcut; @@ -66,9 +65,9 @@ private slots: Saves settings in conf file. */ void loadSettings(); - void dialogButtonsAction(QAbstractButton *btn); void textButtonChanged(const QString &value); void showTextChanged(bool value); + void chooseIcon(); void chooseMenuFile(); void shortcutReset(); void customFontChanged(bool value); diff --git a/plugin-mainmenu/lxqtmainmenuconfiguration.ui b/plugin-mainmenu/lxqtmainmenuconfiguration.ui index 02a726a..9359fbd 100644 --- a/plugin-mainmenu/lxqtmainmenuconfiguration.ui +++ b/plugin-mainmenu/lxqtmainmenuconfiguration.ui @@ -6,8 +6,8 @@ 0 0 - 434 - 325 + 481 + 501 @@ -30,20 +30,44 @@ + + + Icon: + + + + + + + false + + + + + + + false + + + + + + + Button text: - + false - + true @@ -53,7 +77,7 @@ - + false @@ -139,6 +163,70 @@ + + + + Search + + + + + + max. item width: + + + + + + + Show matching entries: + + + + + + + 20 + + + + + + + Maximum visible items: + + + + + + + Filter menu entries + + + + + + + px + + + 40 + + + 1000 + + + + + + + Hide menu entries while searching + + + + + + @@ -192,5 +280,117 @@ + + iconCB + toggled(bool) + iconLE + setEnabled(bool) + + + 91 + 53 + + + 284 + 53 + + + + + iconCB + toggled(bool) + iconPB + setEnabled(bool) + + + 91 + 53 + + + 431 + 53 + + + + + filterShowCB + toggled(bool) + filterShowMaxItemsSB + setEnabled(bool) + + + 172 + 374 + + + 393 + 374 + + + + + filterShowCB + toggled(bool) + filterShowMaxItemsL + setEnabled(bool) + + + 111 + 374 + + + 269 + 374 + + + + + filterShowCB + toggled(bool) + filterShowMaxWidthSB + setEnabled(bool) + + + 111 + 352 + + + 396 + 378 + + + + + filterShowCB + toggled(bool) + filterShowMaxWidthL + setEnabled(bool) + + + 111 + 352 + + + 269 + 378 + + + + + filterShowCB + toggled(bool) + filterShowHideMenuCB + setEnabled(bool) + + + 110 + 374 + + + 332 + 437 + + + diff --git a/plugin-mainmenu/translations/mainmenu.ts b/plugin-mainmenu/translations/mainmenu.ts deleted file mode 100644 index 381933a..0000000 --- a/plugin-mainmenu/translations/mainmenu.ts +++ /dev/null @@ -1,80 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - - LXQtMainMenuConfiguration - - - General - - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - - - - - Menu file: - - - - - ... - - - - - Keyboard Shortcut - - - - - Click the button to record shortcut: - - - - - Reset - - - - - Choose menu file - - - - - Menu files (*.menu) - - - - diff --git a/plugin-mainmenu/translations/mainmenu_ar.desktop b/plugin-mainmenu/translations/mainmenu_ar.desktop index cb88bc8..51de7fa 100644 --- a/plugin-mainmenu/translations/mainmenu_ar.desktop +++ b/plugin-mainmenu/translations/mainmenu_ar.desktop @@ -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[ar]=بادئ التطبيقات المعتمد على قائمة -Name[ar]=قائمة التطبيقات +Comment[ar]=قائمة لكلّ تطبيقاتك +Name[ar]=قائمة التّطبيقات diff --git a/plugin-mainmenu/translations/mainmenu_ar.ts b/plugin-mainmenu/translations/mainmenu_ar.ts deleted file mode 100644 index 0beadac..0000000 --- a/plugin-mainmenu/translations/mainmenu_ar.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - مغادرة - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - إعدادات قائمة ريزر الرئيسيَّة - - - - General - العامّ - - - Show text - إظهار النَّصّ - - - Button text - نصُّ الزُّرّ - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - ملفُّ القائمة - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - اختصار المفاتيح - - - - Click the button to record shortcut: - اضغط المفتاح لتسجيل الاختصار - - - - Reset - - - - - Choose menu file - اختيار ملفِّ القائمة - - - - Menu files (*.menu) - ملفَّات القائمة (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_cs.ts b/plugin-mainmenu/translations/mainmenu_cs.ts deleted file mode 100644 index 343a631..0000000 --- a/plugin-mainmenu/translations/mainmenu_cs.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Opustit - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - Nastavení hlavní nabídky - - - - General - Obecné - - - Show text - Ukázat text - - - Button text - Text - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Soubor s nabídkou - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - Klávesová zkratka - - - - Click the button to record shortcut: - Klepněte na tlačítko pro nahrání klávesové zkratky: - - - - Reset - - - - - Choose menu file - Vybrat soubor s nabídkou - - - - Menu files (*.menu) - Soubory s nabídkami (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_cs_CZ.ts b/plugin-mainmenu/translations/mainmenu_cs_CZ.ts deleted file mode 100644 index d517311..0000000 --- a/plugin-mainmenu/translations/mainmenu_cs_CZ.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Opustit - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - Nastavení hlavní nabídky - - - - General - Obecné - - - Show text - Ukázat text - - - Button text - Text - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Soubor s nabídkou - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - Klávesová zkratka - - - - Click the button to record shortcut: - Klepněte na tlačítko pro nahrání klávesové zkratky: - - - - Reset - - - - - Choose menu file - Vybrat soubor s nabídkou - - - - Menu files (*.menu) - Soubory s nabídkami (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_da.ts b/plugin-mainmenu/translations/mainmenu_da.ts deleted file mode 100644 index 603d3af..0000000 --- a/plugin-mainmenu/translations/mainmenu_da.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Forlad - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - LXQt Hovedmenu Indstillinger - - - - General - Generelt - - - Show text - Vis tekst - - - Button text - Knaptekst - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Menufil - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - Tastaturgenvej - - - - Click the button to record shortcut: - Klik på knappen for at optage genvej: - - - - Reset - - - - - Choose menu file - Vælg menufil - - - - Menu files (*.menu) - Menufiler (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_da_DK.ts b/plugin-mainmenu/translations/mainmenu_da_DK.ts deleted file mode 100644 index 42fe954..0000000 --- a/plugin-mainmenu/translations/mainmenu_da_DK.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Forlad - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - LXQt Hoved Menu Indstillinger - - - - General - Generelt - - - Show text - Vis tekst - - - Button text - Knaptekst - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Menu konfigurationsfil - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - Tastaturgenveje - - - - Click the button to record shortcut: - Klik for at optage genvej: - - - - Reset - - - - - Choose menu file - Vælg menu konfigurationsfil - - - - Menu files (*.menu) - Menu konfigurationsfiler (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_de.ts b/plugin-mainmenu/translations/mainmenu_de.ts deleted file mode 100644 index acfab0c..0000000 --- a/plugin-mainmenu/translations/mainmenu_de.ts +++ /dev/null @@ -1,75 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - Hauptmenü anzeigen/verstecken - - - - LXQtMainMenuConfiguration - - - Main Menu settings - Hauptmenü-Einstellungen - - - - General - Allgemein - - - - Button text: - Schaltflächentext: - - - - Custom font size: - Eigene Schriftgröße: - - - - pt - pt - - - - Menu file - Menü-Datei - - - - Menu file: - Menü-Datei: - - - - Keyboard Shortcut - Tastenkürzel - - - - Click the button to record shortcut: - Auf die Schaltfläche klicken, um ein Tastenkürzel aufzunehmen: - - - - Reset - Zurücksetzen - - - - Choose menu file - Menü-Datei auswählen - - - - Menu files (*.menu) - Menü-Dateien (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_el.ts b/plugin-mainmenu/translations/mainmenu_el.ts deleted file mode 100644 index 97fd218..0000000 --- a/plugin-mainmenu/translations/mainmenu_el.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - Εμφάνιση/απόκρυψη του κύριου μενού - - - Leave - Έξοδος - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - Ρυθμίσεις κυρίως μενού LXQt - - - - General - Γενικά - - - Show text - Εμφάνιση κειμένου - - - Button text - Κείμενο κουμπιού - - - - Main Menu settings - Ρυθμίσεις του κύριου μενού - - - - Button text: - Κείμενο κουμπιού: - - - - Custom font size: - Προσαρμοσμένο μέγεθος γραμματοσειράς: - - - - pt - pt - - - - Menu file - Αρχείο μενού - - - - Menu file: - Αρχείο μενού: - - - - ... - ... - - - - Keyboard Shortcut - Συντόμευση πληκτρολογίου - - - - Click the button to record shortcut: - Κλικ στο πλήκτρο για εγγραφή της συντόμευσης: - - - - Reset - Επαναφορά - - - - Choose menu file - Επιλογή αρχείου μενού - - - - Menu files (*.menu) - Αρχεία μενού (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_eo.ts b/plugin-mainmenu/translations/mainmenu_eo.ts deleted file mode 100644 index 76dccc5..0000000 --- a/plugin-mainmenu/translations/mainmenu_eo.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Forlasi - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - Agordoj de ĉefa menuo de LXQt - - - - General - Ĝenerala - - - Show text - Montri tekston - - - Button text - Teksto de butonoj - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Menua dosiero - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - Klavkombinoj - - - - Click the button to record shortcut: - Alklaku sur la butono por registi klavkombinon: - - - - Reset - - - - - Choose menu file - lektu menuan dosieron - - - - Menu files (*.menu) - Menuaj dosieroj (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_es.ts b/plugin-mainmenu/translations/mainmenu_es.ts deleted file mode 100644 index 74c1f4a..0000000 --- a/plugin-mainmenu/translations/mainmenu_es.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Salir - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - Configuración del menú principal de LXQt - - - - General - General - - - Show text - Mostrar texto - - - Button text - Texto de los botones - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Archivo del menú - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - Atajos del teclado - - - - Click the button to record shortcut: - Presione el botón para registrar el atajo: - - - - Reset - - - - - Choose menu file - Escoger un archivo de menú - - - - Menu files (*.menu) - Archivos de menú (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_es_UY.ts b/plugin-mainmenu/translations/mainmenu_es_UY.ts deleted file mode 100644 index 07938bc..0000000 --- a/plugin-mainmenu/translations/mainmenu_es_UY.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Salir - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - Configuración del Menú Principal LXQt - - - - General - General - - - Show text - Mostrar etiqueta - - - Button text - Etiqueta del botón - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Archivo de menú - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - - - - - Click the button to record shortcut: - - - - - Reset - - - - - Choose menu file - Seleccionar archivo de menú - - - - Menu files (*.menu) - Archivos de menú (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_es_VE.ts b/plugin-mainmenu/translations/mainmenu_es_VE.ts deleted file mode 100644 index 8abf6b6..0000000 --- a/plugin-mainmenu/translations/mainmenu_es_VE.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Salir - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - Configuración del Menú Principal LXQt - - - - General - General - - - Show text - Mostrar etiqueta - - - Button text - Etiqueta del botón - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Archivo de menú alterno - - - - Menu file: - - - - - ... - Buscar ... - - - - Keyboard Shortcut - Tecla de acceso rapido - - - - Click the button to record shortcut: - Pulsa en el boton para grabar el acceso rapido: - - - - Reset - - - - - Choose menu file - Seleccionar archivo de menú - - - - Menu files (*.menu) - Archivos de menú (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_eu.ts b/plugin-mainmenu/translations/mainmenu_eu.ts deleted file mode 100644 index a04c6f3..0000000 --- a/plugin-mainmenu/translations/mainmenu_eu.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Irten - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - LXQt menu nagusiaren ezarpenak - - - - General - Orokorra - - - Show text - Erakutsi testua - - - Button text - Botoi-testua - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Menu fitxategia - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - Teklatuko lasterbidea - - - - Click the button to record shortcut: - Klikatu botoia lasterbidea grabatzeko: - - - - Reset - - - - - Choose menu file - Aukeratu menu fitxategia - - - - Menu files (*.menu) - Menu fitxategiak (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_fi.ts b/plugin-mainmenu/translations/mainmenu_fi.ts deleted file mode 100644 index 00724f7..0000000 --- a/plugin-mainmenu/translations/mainmenu_fi.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Poistu - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - LXQtin päävalikon asetukset - - - - General - Yleiset - - - Show text - Näytä teksti - - - Button text - Painiketeksti - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Valikkotiedosto - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - Pikanäppäin - - - - Click the button to record shortcut: - Napsauta painiketta nauhoittaaksesi pikanäppäimen: - - - - Reset - - - - - Choose menu file - Valitse valikkotiedosto - - - - Menu files (*.menu) - Valikkotiedostot (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_fr_FR.ts b/plugin-mainmenu/translations/mainmenu_fr_FR.ts deleted file mode 100644 index f3a9766..0000000 --- a/plugin-mainmenu/translations/mainmenu_fr_FR.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Quitter - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - Menu principal des paramètres de LXQt - - - - General - Généraux - - - Show text - Montrer le texte - - - Button text - Texte des boutons - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Fichier de menu - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - Raccourcis clavier - - - - Click the button to record shortcut: - Cliquez sur le bouton pour enregistrer le raccourci : - - - - Reset - - - - - Choose menu file - Choisissez un fichier de menu - - - - Menu files (*.menu) - Fichiers de menu (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_hr.ts b/plugin-mainmenu/translations/mainmenu_hr.ts deleted file mode 100644 index fb4e08e..0000000 --- a/plugin-mainmenu/translations/mainmenu_hr.ts +++ /dev/null @@ -1,75 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - Pokaži/sakrij glavni izbornik - - - - LXQtMainMenuConfiguration - - - General - Općenito - - - - Main Menu settings - Postavke glavnoga izbornika - - - - Button text: - - - - - Custom font size: - Prilagođena veličina fonta: - - - - pt - pt - - - - Menu file - Datoteka izbornika - - - - Menu file: - Datoteka izbornika: - - - - Keyboard Shortcut - Kratica tipkovnice - - - - Click the button to record shortcut: - - - - - Reset - - - - - Choose menu file - Izaberite datoteku izbornika - - - - Menu files (*.menu) - - - - diff --git a/plugin-mainmenu/translations/mainmenu_hu.ts b/plugin-mainmenu/translations/mainmenu_hu.ts deleted file mode 100644 index e6bc78b..0000000 --- a/plugin-mainmenu/translations/mainmenu_hu.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - Menü láttatás/elrejtés - - - Leave - Leállítás - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - LXQt főmenü beállítás - - - - General - Általános - - - Show text - Szöveg megjelenítése - - - Button text - Gombszöveg - - - - Main Menu settings - Menübeállítás - - - - Button text: - Gombszöveg: - - - - Custom font size: - Saját betűnagyság: - - - - pt - .pont - - - - Menu file - Menüfájl - - - - Menu file: - Menüfájl: - - - - ... - … - - - - Keyboard Shortcut - Gyorsbillentyű - - - - Click the button to record shortcut: - Billentyű nyomása a megjegyzéshez... - - - - Reset - Visszaállít - - - - Choose menu file - Menüfájl kiválasztása - - - - Menu files (*.menu) - Menüfájlok (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_hu_HU.ts b/plugin-mainmenu/translations/mainmenu_hu_HU.ts deleted file mode 100644 index a2e723e..0000000 --- a/plugin-mainmenu/translations/mainmenu_hu_HU.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - Menü láttatás/elrejtés - - - Leave - Leállítás - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - LXQt főmenü beállítás - - - - General - Általános - - - Show text - Szöveg megjelenítése - - - Button text - Gombszöveg - - - - Main Menu settings - Menübeállítás - - - - Button text: - Gombszöveg: - - - - Custom font size: - Saját betűnagyság: - - - - pt - .pont - - - - Menu file - Menüfájl - - - - Menu file: - Menüfájl: - - - - ... - … - - - - Keyboard Shortcut - Gyorsbillentyű - - - - Click the button to record shortcut: - Billentyű nyomása a megjegyzéshez... - - - - Reset - Visszaállít - - - - Choose menu file - Menüfájl kiválasztása - - - - Menu files (*.menu) - Menüfájlok (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_ia.ts b/plugin-mainmenu/translations/mainmenu_ia.ts deleted file mode 100644 index ba1201c..0000000 --- a/plugin-mainmenu/translations/mainmenu_ia.ts +++ /dev/null @@ -1,80 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - - LXQtMainMenuConfiguration - - - General - - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - - - - - Menu file: - - - - - ... - - - - - Keyboard Shortcut - - - - - Click the button to record shortcut: - - - - - Reset - - - - - Choose menu file - - - - - Menu files (*.menu) - - - - diff --git a/plugin-mainmenu/translations/mainmenu_id_ID.ts b/plugin-mainmenu/translations/mainmenu_id_ID.ts deleted file mode 100644 index 6ee90de..0000000 --- a/plugin-mainmenu/translations/mainmenu_id_ID.ts +++ /dev/null @@ -1,80 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - - LXQtMainMenuConfiguration - - - General - - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - - - - - Menu file: - - - - - ... - - - - - Keyboard Shortcut - - - - - Click the button to record shortcut: - - - - - Reset - - - - - Choose menu file - - - - - Menu files (*.menu) - - - - diff --git a/plugin-mainmenu/translations/mainmenu_it.desktop b/plugin-mainmenu/translations/mainmenu_it.desktop index 988b388..b267d06 100644 --- a/plugin-mainmenu/translations/mainmenu_it.desktop +++ b/plugin-mainmenu/translations/mainmenu_it.desktop @@ -1,2 +1,2 @@ Comment[it]=Avviatore delle applicazioni basato su menù -Name[it]=Menù delle applicazioni +Name[it]=Menu delle applicazioni diff --git a/plugin-mainmenu/translations/mainmenu_it.ts b/plugin-mainmenu/translations/mainmenu_it.ts deleted file mode 100644 index 891eb34..0000000 --- a/plugin-mainmenu/translations/mainmenu_it.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - Mostra/nascondi menù principale - - - Leave - Esci - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - Impostazioni del menu principale di LXQt - - - - General - Generali - - - Show text - Mostra testo - - - Button text - Testo del pulsante - - - - Main Menu settings - Impostazioni del menù principale di LXQt - - - - Button text: - Testo pulsante: - - - - Custom font size: - Dimensione carattere personalizzato: - - - - pt - - - - - Menu file - File del menù - - - - Menu file: - File del menù: - - - - ... - ... - - - - Keyboard Shortcut - Scorciatoia da tastiera - - - - Click the button to record shortcut: - Fai clic sul pulsante per impostare una scorciatoia: - - - - Reset - Ripristina - - - - Choose menu file - Scegli il file del menù - - - - Menu files (*.menu) - File del menù (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_ja.ts b/plugin-mainmenu/translations/mainmenu_ja.ts deleted file mode 100644 index f8da9ce..0000000 --- a/plugin-mainmenu/translations/mainmenu_ja.ts +++ /dev/null @@ -1,84 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - メインメニューを表示/隠す - - - Leave - 終了 - - - - LXQtMainMenuConfiguration - - - General - 一般 - - - - Main Menu settings - メインメニューの設定 - - - - Button text: - ボタンの文字列: - - - - Custom font size: - フォントサイズの指定: - - - - pt - ポイント - - - - Menu file - メニューファイル - - - - Menu file: - メニューファイル: - - - - ... - ... - - - - Keyboard Shortcut - キーボードショートカット - - - - Click the button to record shortcut: - ショートカットを記録するにはボタンをクリック: - - - - Reset - リセット - - - - Choose menu file - メニューファイルを選択 - - - - Menu files (*.menu) - メニューファイル(*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_ko.ts b/plugin-mainmenu/translations/mainmenu_ko.ts deleted file mode 100644 index 1e8bc9a..0000000 --- a/plugin-mainmenu/translations/mainmenu_ko.ts +++ /dev/null @@ -1,80 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - - LXQtMainMenuConfiguration - - - General - - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - - - - - Menu file: - - - - - ... - - - - - Keyboard Shortcut - - - - - Click the button to record shortcut: - - - - - Reset - - - - - Choose menu file - - - - - Menu files (*.menu) - - - - diff --git a/plugin-mainmenu/translations/mainmenu_lt.ts b/plugin-mainmenu/translations/mainmenu_lt.ts deleted file mode 100644 index 0464355..0000000 --- a/plugin-mainmenu/translations/mainmenu_lt.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Išeiti - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - LXQt pagrindinio meniu nuostatos - - - - General - Pagrindinės - - - Show text - Rodyti tekstą - - - Button text - Mygtuko tekstas - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Meniu rinkmena - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - Spartusis klavišas - - - - Click the button to record shortcut: - Norėdami pakeisti klavišą, spragtelėkite - - - - Reset - - - - - Choose menu file - Pasirinkite meniu failą - - - - Menu files (*.menu) - Meniu failai (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_nl.ts b/plugin-mainmenu/translations/mainmenu_nl.ts deleted file mode 100644 index 6fcea30..0000000 --- a/plugin-mainmenu/translations/mainmenu_nl.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Verlaten - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - Instellingen van hoofdmenu van LXQt - - - - General - Algemeen - - - Show text - Tekst weergeven - - - Button text - Knoptekst - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Menubestand - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - Sneltoets - - - - Click the button to record shortcut: - Klik op de knop om de sneltoets vast te leggen: - - - - Reset - - - - - Choose menu file - Kies menubestand - - - - Menu files (*.menu) - Menubestanden (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_pl_PL.ts b/plugin-mainmenu/translations/mainmenu_pl_PL.ts deleted file mode 100644 index 9615c66..0000000 --- a/plugin-mainmenu/translations/mainmenu_pl_PL.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - Pokaż/ukryj menu - - - Leave - Opuść - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - Ustawienia menu LXQt - - - - General - Ogólne - - - Show text - Pokaż tekst - - - Button text - Tekst - - - - Main Menu settings - Ustawienia Menu - - - - Button text: - Tekst przycisku: - - - - Custom font size: - Własny rozmiar czcionki: - - - - pt - pt - - - - Menu file - Plik menu - - - - Menu file: - Plik menu: - - - - ... - ... - - - - Keyboard Shortcut - Skrót klawiatury - - - - Click the button to record shortcut: - Wciśnij przycisk aby ustawić skrót: - - - - Reset - Zresetuj - - - - Choose menu file - Wybierz plik menu - - - - Menu files (*.menu) - Pliki menu (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_pt.ts b/plugin-mainmenu/translations/mainmenu_pt.ts deleted file mode 100644 index 2cf8c07..0000000 --- a/plugin-mainmenu/translations/mainmenu_pt.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Sair - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - Definições do menu principal do LXQt - - - - General - Geral - - - Show text - Mostrar texto - - - Button text - Texto do botão - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Ficheiro de menu - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - Atalho de teclado - - - - Click the button to record shortcut: - Clique no botão para registar o atalho: - - - - Reset - - - - - Choose menu file - Escolha o ficheiro de menu - - - - Menu files (*.menu) - Ficheiros de menu (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_pt_BR.ts b/plugin-mainmenu/translations/mainmenu_pt_BR.ts deleted file mode 100644 index 39ee211..0000000 --- a/plugin-mainmenu/translations/mainmenu_pt_BR.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Sair - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - Configurações do menu principal do LXQt - - - - General - Geral - - - Show text - Exibir texto - - - Button text - Texto do botão - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Arquvo do menu - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - Atalho do teclado - - - - Click the button to record shortcut: - Clique no botão para gravar o atalho: - - - - Reset - - - - - Choose menu file - Escolher arquivo do menu - - - - Menu files (*.menu) - Arquivos do menu (*.menus) - - - diff --git a/plugin-mainmenu/translations/mainmenu_ro_RO.ts b/plugin-mainmenu/translations/mainmenu_ro_RO.ts deleted file mode 100644 index 3dbc0b7..0000000 --- a/plugin-mainmenu/translations/mainmenu_ro_RO.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Părăsește - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - Setări meniu principal LXQt - - - - General - General - - - Show text - Afișează text - - - Button text - Text buton - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Fișier meniu - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - Tastă rapidă - - - - Click the button to record shortcut: - Apăsați butonul pentru a memora tasta rapidă: - - - - Reset - - - - - Choose menu file - Selectați fișierul meniu - - - - Menu files (*.menu) - Fișiere meniu (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_ru.ts b/plugin-mainmenu/translations/mainmenu_ru.ts deleted file mode 100644 index 69d1c00..0000000 --- a/plugin-mainmenu/translations/mainmenu_ru.ts +++ /dev/null @@ -1,80 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - Показать/скрыть главное меню - - - - LXQtMainMenuConfiguration - - - Main Menu settings - Настройки главного меню - - - - General - Общие - - - - Button text: - Текст кнопки: - - - - Custom font size: - Выбрать кегль: - - - - pt - п - - - - Menu file - Файл меню - - - - Menu file: - Файл меню: - - - - ... - … - - - - Keyboard Shortcut - Сочетание клавиш - - - - Click the button to record shortcut: - Нажмите на кнопку для записи сочетания клавиш: - - - - Reset - Сбросить - - - - Choose menu file - Выбрать файл меню - - - - Menu files (*.menu) - Файл меню (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_ru_RU.desktop b/plugin-mainmenu/translations/mainmenu_ru_RU.desktop deleted file mode 100644 index 439b1d7..0000000 --- a/plugin-mainmenu/translations/mainmenu_ru_RU.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Application menu -Comment=A menu of all your applications. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ru_RU]=Меню всех ваших программ. -Name[ru_RU]=Меню приложений diff --git a/plugin-mainmenu/translations/mainmenu_ru_RU.ts b/plugin-mainmenu/translations/mainmenu_ru_RU.ts deleted file mode 100644 index 5a53ad4..0000000 --- a/plugin-mainmenu/translations/mainmenu_ru_RU.ts +++ /dev/null @@ -1,80 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - Показать/скрыть главное меню - - - - LXQtMainMenuConfiguration - - - Main Menu settings - Настройки главного меню - - - - General - Общие - - - - Button text: - Текст кнопки: - - - - Custom font size: - Выбрать кегль: - - - - pt - п - - - - Menu file - Файл меню - - - - Menu file: - Файл меню: - - - - ... - … - - - - Keyboard Shortcut - Сочетание клавиш - - - - Click the button to record shortcut: - Нажмите на кнопку для записи сочетания клавиш: - - - - Reset - Сбросить - - - - Choose menu file - Выбрать файл меню - - - - Menu files (*.menu) - Файл меню (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_sk_SK.ts b/plugin-mainmenu/translations/mainmenu_sk_SK.ts deleted file mode 100644 index 6314e20..0000000 --- a/plugin-mainmenu/translations/mainmenu_sk_SK.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Opustiť - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - Nastavenia Hlavného menu prostredia LXQt - - - - General - Všeobecné - - - Show text - Zobraziť text - - - Button text - Text tlačidla - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Súbor menu - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - - - - - Click the button to record shortcut: - - - - - Reset - - - - - Choose menu file - Vybrať súbor menu - - - - Menu files (*.menu) - Súbory menu (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_sl.ts b/plugin-mainmenu/translations/mainmenu_sl.ts deleted file mode 100644 index d9b4aa8..0000000 --- a/plugin-mainmenu/translations/mainmenu_sl.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Zapusti - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - Nastavitve glavnega menija - - - - General - Splošno - - - Show text - Pokaži besedilo - - - Button text - Besedilo na gumbih - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Datoteka z menijem - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - Tipkovna bližnjica - - - - Click the button to record shortcut: - Kliknite gumb za nastavitev bližnjice: - - - - Reset - - - - - Choose menu file - Izberite datoteko z menijem - - - - Menu files (*.menu) - Datoteke z menijem (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_sr@latin.ts b/plugin-mainmenu/translations/mainmenu_sr@latin.ts deleted file mode 100644 index 4ff956d..0000000 --- a/plugin-mainmenu/translations/mainmenu_sr@latin.ts +++ /dev/null @@ -1,80 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - - LXQtMainMenuConfiguration - - - General - - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - - - - - Menu file: - - - - - ... - - - - - Keyboard Shortcut - - - - - Click the button to record shortcut: - - - - - Reset - - - - - Choose menu file - - - - - Menu files (*.menu) - - - - diff --git a/plugin-mainmenu/translations/mainmenu_sr_BA.ts b/plugin-mainmenu/translations/mainmenu_sr_BA.ts deleted file mode 100644 index 33f838c..0000000 --- a/plugin-mainmenu/translations/mainmenu_sr_BA.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Напуштање - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - Подешавања главног менија - - - - General - Опште - - - Show text - Прикажи текст - - - Button text - Текст тастера - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Фајл менија - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - Пречица тастатуре - - - - Click the button to record shortcut: - Кликните на тастер да снимите пречицу: - - - - Reset - - - - - Choose menu file - Изабери фајл менија - - - - Menu files (*.menu) - Фајлови менија (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_sr_RS.ts b/plugin-mainmenu/translations/mainmenu_sr_RS.ts deleted file mode 100644 index 179ed68..0000000 --- a/plugin-mainmenu/translations/mainmenu_sr_RS.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Напуштање - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - Подешавања главног менија - - - - General - Опште - - - Show text - Прикажи текст - - - Button text - Текст тастера - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Фајл менија - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - Пречица тастатуре - - - - Click the button to record shortcut: - Кликните на тастер да снимите пречицу: - - - - Reset - - - - - Choose menu file - Изабери фајл менија - - - - Menu files (*.menu) - Фајлови менија (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_th_TH.ts b/plugin-mainmenu/translations/mainmenu_th_TH.ts deleted file mode 100644 index 5782c9b..0000000 --- a/plugin-mainmenu/translations/mainmenu_th_TH.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - ออก - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - ค่าตั้งเมนูหลัก LXQt - - - - General - ทั่วไป - - - Show text - แสดงข้อความ - - - Button text - ข้อความตรงปุ่ม - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - แฟ้มเมนู - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - ปุ่มลัด - - - - Click the button to record shortcut: - กดปุ่มที่จะใช้เป็นปุ่มลัด: - - - - Reset - - - - - Choose menu file - เลือกแฟ้มเมนู - - - - Menu files (*.menu) - แฟ้มเมนู (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_tr.ts b/plugin-mainmenu/translations/mainmenu_tr.ts deleted file mode 100644 index f41bd26..0000000 --- a/plugin-mainmenu/translations/mainmenu_tr.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Çık - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - LXQt Ana Menü ayarları - - - - General - Genel - - - Show text - Metin göster - - - Button text - Düğme metni - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Menü dosyası - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - Klavye Kısayolu - - - - Click the button to record shortcut: - Kısayolu kaydetmek için düğmeye tıklayın: - - - - Reset - - - - - Choose menu file - Menü dosyası seç - - - - Menu files (*.menu) - Menü dosyaları (*.menü) - - - diff --git a/plugin-mainmenu/translations/mainmenu_uk.ts b/plugin-mainmenu/translations/mainmenu_uk.ts deleted file mode 100644 index 00dcd8c..0000000 --- a/plugin-mainmenu/translations/mainmenu_uk.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - Полишити - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - Налаштування головного меню LXQt - - - - General - Загальне - - - Show text - Показувати текст - - - Button text - Текст кнопки - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - Файл меню - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - Клавіатурне скорочення - - - - Click the button to record shortcut: - Натисніть кнопку, щоб змінити клавіатурне скорочення: - - - - Reset - - - - - Choose menu file - Оберіть файл меню - - - - Menu files (*.menu) - Файли меню (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_zh_CN.ts b/plugin-mainmenu/translations/mainmenu_zh_CN.ts deleted file mode 100644 index 136b17c..0000000 --- a/plugin-mainmenu/translations/mainmenu_zh_CN.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - 离开 - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - LXQt主菜单设置 - - - - General - 常规 - - - Show text - 显示文本 - - - Button text - 按钮文本 - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - 菜单文件 - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - 键盘快捷键 - - - - Click the button to record shortcut: - 点击按钮记录快捷键 - - - - Reset - - - - - Choose menu file - 选择菜单文件 - - - - Menu files (*.menu) - 菜单文件 (*.menu) - - - diff --git a/plugin-mainmenu/translations/mainmenu_zh_TW.ts b/plugin-mainmenu/translations/mainmenu_zh_TW.ts deleted file mode 100644 index d6cb878..0000000 --- a/plugin-mainmenu/translations/mainmenu_zh_TW.ts +++ /dev/null @@ -1,96 +0,0 @@ - - - - - LXQtMainMenu - - - Show/hide main menu - - - - Leave - 離開 - - - - LXQtMainMenuConfiguration - - LXQt Main Menu settings - LXQt主選單設定 - - - - General - 通用 - - - Show text - 顯示文件 - - - Button text - 按鈕文件 - - - - Main Menu settings - - - - - Button text: - - - - - Custom font size: - - - - - pt - - - - - Menu file - 選單文件 - - - - Menu file: - - - - - ... - ... - - - - Keyboard Shortcut - 快捷鍵 - - - - Click the button to record shortcut: - 按下按鈕並設定為快捷鍵： - - - - Reset - - - - - Choose menu file - 選擇選單文件 - - - - Menu files (*.menu) - 選單文件 (*.menu) - - - diff --git a/plugin-mainmenu/xdgcachedmenu.cpp b/plugin-mainmenu/xdgcachedmenu.cpp index 11ac97b..255f69e 100644 --- a/plugin-mainmenu/xdgcachedmenu.cpp +++ b/plugin-mainmenu/xdgcachedmenu.cpp @@ -73,6 +73,12 @@ XdgCachedMenu::XdgCachedMenu(MenuCache* menuCache, QWidget* parent): QMenu(paren { // qDebug() << "CREATE MENU FROM CACHE" << menuCache; MenuCacheDir* dir = menu_cache_get_root_dir(menuCache); + + // get current desktop name or fallback to LXQt + const QByteArray xdgDesktop = qgetenv("XDG_CURRENT_DESKTOP"); + const QByteArray desktop = xdgDesktop.isEmpty() ? "LXQt:X-LXQt" : xdgDesktop; + menu_cache_desktop_ = menu_cache_get_desktop_env_flag(menuCache, desktop.constData()); + addMenuItems(this, dir); connect(this, SIGNAL(aboutToShow()), SLOT(onAboutToShow())); } @@ -95,15 +101,25 @@ void XdgCachedMenu::addMenuItems(QMenu* menu, MenuCacheDir* dir) } else { + bool appVisible = type == MENU_CACHE_TYPE_APP + && menu_cache_app_get_is_visible(MENU_CACHE_APP(item), + menu_cache_desktop_); + bool dirVisible = type == MENU_CACHE_TYPE_DIR + && menu_cache_dir_is_visible(MENU_CACHE_DIR(item)); + + if(!appVisible && !dirVisible) + continue; + XdgCachedMenuAction* action = new XdgCachedMenuAction(item, menu); menu->addAction(action); + if(type == MENU_CACHE_TYPE_APP) connect(action, SIGNAL(triggered(bool)), SLOT(onItemTrigerred())); else if(type == MENU_CACHE_TYPE_DIR) { XdgCachedMenu* submenu = new XdgCachedMenu(menu); action->setMenu(submenu); - addMenuItems(submenu, (MenuCacheDir*)item); + addMenuItems(submenu, MENU_CACHE_DIR(item)); } } } @@ -161,7 +177,7 @@ void XdgCachedMenu::handleMouseMoveEvent(QMouseEvent *event) QList urls; char* desktop_file = menu_cache_item_get_file_path(a->item()); - urls << QUrl(desktop_file); + urls << QUrl(QString("file://%1").arg(desktop_file)); g_free(desktop_file); QMimeData *mimeData = new QMimeData(); diff --git a/plugin-mainmenu/xdgcachedmenu.h b/plugin-mainmenu/xdgcachedmenu.h index 4f380d1..980f1d5 100644 --- a/plugin-mainmenu/xdgcachedmenu.h +++ b/plugin-mainmenu/xdgcachedmenu.h @@ -48,6 +48,7 @@ private Q_SLOTS: private: QPoint mDragStartPosition; + guint32 menu_cache_desktop_; }; class XdgCachedMenuAction: public QAction diff --git a/plugin-mount/button.cpp b/plugin-mount/button.cpp index 26473fa..bae833b 100644 --- a/plugin-mount/button.cpp +++ b/plugin-mount/button.cpp @@ -37,6 +37,7 @@ Button::Button(QWidget * parent) : setIcon(XdgIcon::fromTheme(QLatin1String("drive-removable-media"))); setToolTip(tr("Removable media/devices manager")); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + setAutoRaise(true); } Button::~Button() diff --git a/plugin-mount/configuration.cpp b/plugin-mount/configuration.cpp index 4bf54f8..a2cd35f 100644 --- a/plugin-mount/configuration.cpp +++ b/plugin-mount/configuration.cpp @@ -32,7 +32,7 @@ #include #include -Configuration::Configuration(QSettings &settings, QWidget *parent) : +Configuration::Configuration(PluginSettings *settings, QWidget *parent) : LXQtPanelPluginConfigDialog(settings, parent), ui(new Ui::Configuration) { diff --git a/plugin-mount/configuration.h b/plugin-mount/configuration.h index 7fcd872..903288f 100644 --- a/plugin-mount/configuration.h +++ b/plugin-mount/configuration.h @@ -44,7 +44,7 @@ class Configuration : public LXQtPanelPluginConfigDialog Q_OBJECT public: - explicit Configuration(QSettings &settings, QWidget *parent = 0); + explicit Configuration(PluginSettings *settings, QWidget *parent = 0); ~Configuration(); protected slots: diff --git a/plugin-mount/lxqtmountplugin.cpp b/plugin-mount/lxqtmountplugin.cpp index ea3b6dc..064724f 100644 --- a/plugin-mount/lxqtmountplugin.cpp +++ b/plugin-mount/lxqtmountplugin.cpp @@ -54,7 +54,7 @@ QDialog *LXQtMountPlugin::configureDialog() if (mPopup) mPopup->hide(); - Configuration *configWindow = new Configuration(*settings()); + Configuration *configWindow = new Configuration(settings()); configWindow->setAttribute(Qt::WA_DeleteOnClose, true); return configWindow; } diff --git a/plugin-mount/popup.cpp b/plugin-mount/popup.cpp index 1c3e7c1..7993681 100644 --- a/plugin-mount/popup.cpp +++ b/plugin-mount/popup.cpp @@ -90,7 +90,12 @@ Popup::Popup(ILXQtPanelPlugin * plugin, QWidget* parent): void Popup::showHide() { - setVisible(isHidden()); + if (isHidden()) + { + mPlugin->willShowWindow(this); + show(); + } else + close(); } void Popup::onDeviceAdded(QString const & udi) diff --git a/plugin-mount/translations/mount.ts b/plugin-mount/translations/mount.ts deleted file mode 100644 index 50d142b..0000000 --- a/plugin-mount/translations/mount.ts +++ /dev/null @@ -1,90 +0,0 @@ - - - - - Button - - - Removable media/devices manager - - - - - Configuration - - - Removable Media Settings - - - - - Behaviour - - - - - When a device is connected : - - - - - Popup menu - - - - - Show info - - - - - Do nothing - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - - - - - The device <b><nobr>"%1"</nobr></b> is removed. - - - - - Removable media/devices manager - - - - - 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 --git a/plugin-mount/translations/mount_ar.desktop b/plugin-mount/translations/mount_ar.desktop index 2785bca..b9c8ce3 100644 --- a/plugin-mount/translations/mount_ar.desktop +++ b/plugin-mount/translations/mount_ar.desktop @@ -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[ar]=معالج الوسائط القابلة للفصل (يو إس بي و أقراص مدمجة...) -Name[ar]=الوسائط القابلة للفصل +Comment[ar]=لضمّ أو إزالة ضمّ أصابع USB أو الأجهزة البصريّة. +Name[ar]=الوسائط المنفصلة diff --git a/plugin-mount/translations/mount_ar.ts b/plugin-mount/translations/mount_ar.ts deleted file mode 100644 index ecbfe22..0000000 --- a/plugin-mount/translations/mount_ar.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - الجهاز <b><nobr>"%1"</b> موصول. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - الجهاز <b><nobr>"%1"</b> مفصول. - - - - Removable media/devices manager - مدير الوسائط واﻷقراص القابلة للفصل - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - إعدادات مدير ريزر للوسائط القابلة للفصل - - - - Removable Media Settings - - - - - Behaviour - السلوك - - - - When a device is connected - عند وصل الجهاز - - - - Popup menu - القائمة اﻵنيَّة - - - - Show info - إظهار المعلومات - - - - Do nothing - عدم القيام بأيِّ شيء - - - - MenuDiskItem - - Click to access this device from other applications. - اضغط للوصول إلى هذا الجهاز من تطبيقاتٍ أخرى. - - - Click to eject this disc. - اضغط ﻹخراج هذا القرص. - - - - - Removable media/devices manager - مدير الوسائط واﻷقراص القابلة للفصل - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - مدير الوسائط واﻷقراص القابلة للفصل - - - The device <b><nobr>"%1"</nobr></b> is connected. - الجهاز <b><nobr>"%1"</b> موصول. - - - The device <b><nobr>"%1"</nobr></b> is removed. - الجهاز <b><nobr>"%1"</b> مفصول. - - - No devices Available. - ﻻ توجد أجهزة. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_cs.ts b/plugin-mount/translations/mount_cs.ts deleted file mode 100644 index 26cc06e..0000000 --- a/plugin-mount/translations/mount_cs.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - Zařízení <b><nobr>"%1"</nobr></b> je zapojeno. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - Zařízení <b><nobr>"%1"</nobr></b> je odstraněno. - - - - Removable media/devices manager - Správce odstranitelných nosičů/zařízení - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - Nastavení správce odstranitelných zařízení - - - - Removable Media Settings - - - - - Behaviour - Chování - - - - When a device is connected - Když je zařízení zapojeno - - - - Popup menu - Ukázat vyskakovací nabídku - - - - Show info - Ukázat informace - - - - Do nothing - Nedělat nic - - - - MenuDiskItem - - Click to access this device from other applications. - Klepněte pro přistoupení k tomuto zařízení z jiných aplikací. - - - Click to eject this disc. - Klepněte pro vysunutí tohoto disku. - - - - - Removable media/devices manager - Správce odstranitelných nosičů/zařízení - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Správce odstranitelných nosičů/zařízení - - - The device <b><nobr>"%1"</nobr></b> is connected. - Zařízení <b><nobr>"%1"</nobr></b> je zapojeno. - - - The device <b><nobr>"%1"</nobr></b> is removed. - Zařízení <b><nobr>"%1"</nobr></b> je odstraněno. - - - No devices Available. - Nejsou dostupná žádná zařízení. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_cs_CZ.ts b/plugin-mount/translations/mount_cs_CZ.ts deleted file mode 100644 index 94e697c..0000000 --- a/plugin-mount/translations/mount_cs_CZ.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - Zařízení <b><nobr>"%1"</nobr></b> je zapojeno. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - Zařízení <b><nobr>"%1"</nobr></b> je odstraněno. - - - - Removable media/devices manager - Správce odstranitelných nosičů/zařízení - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - Nastavení správce odstranitelných zařízení - - - - Removable Media Settings - - - - - Behaviour - Chování - - - - When a device is connected - Když je zařízení zapojeno - - - - Popup menu - Ukázat vyskakovací nabídku - - - - Show info - Ukázat informace - - - - Do nothing - Nedělat nic - - - - MenuDiskItem - - Click to access this device from other applications. - Klepněte pro přistoupení k tomuto zařízení z jiných aplikací. - - - Click to eject this disc. - Klepněte pro vysunutí tohoto disku. - - - - - Removable media/devices manager - Správce odstranitelných nosičů/zařízení - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Správce odstranitelných nosičů/zařízení - - - The device <b><nobr>"%1"</nobr></b> is connected. - Zařízení <b><nobr>"%1"</nobr></b> je zapojeno. - - - The device <b><nobr>"%1"</nobr></b> is removed. - Zařízení <b><nobr>"%1"</nobr></b> je odstraněno. - - - No devices Available. - Nejsou dostupná žádná zařízení. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_da.ts b/plugin-mount/translations/mount_da.ts deleted file mode 100644 index 7b17792..0000000 --- a/plugin-mount/translations/mount_da.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - Enheden <b><nobr>"%1"</nobr></b> er forbundet. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - Enheden <b><nobr>"%1"</nobr></b> er fjernet. - - - - Removable media/devices manager - Håndtering af medier/enheder - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - LXQt Indstillinger for flytbare medier - - - - Removable Media Settings - - - - - Behaviour - Opførsel - - - - When a device is connected - Når en enhed forbinder - - - - Popup menu - Pop op-menu - - - - Show info - Vis information - - - - Do nothing - Gør intet - - - - MenuDiskItem - - Click to access this device from other applications. - Klik for at tilgå denne enhed fra andre programmer. - - - Click to eject this disc. - Klik for at skubbe disken ud. - - - - - Removable media/devices manager - Håndtering af medier/enheder - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Håndtering af medier/enheder - - - The device <b><nobr>"%1"</nobr></b> is connected. - Enheden <b><nobr>"%1"</nobr></b> er forbundet. - - - The device <b><nobr>"%1"</nobr></b> is removed. - Enheden <b><nobr>"%1"</nobr></b> er fjernet. - - - No devices Available. - Ingen tilgængelige enheder. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_da_DK.ts b/plugin-mount/translations/mount_da_DK.ts deleted file mode 100644 index 20594f9..0000000 --- a/plugin-mount/translations/mount_da_DK.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - Enheden <b><nobr>"%1"</nobr></b> er forbundet. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - Enheden <b><nobr>"%1"</nobr></b> er fjernet. - - - - Removable media/devices manager - Håndtering af flytbare medier - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - Indstillinger til håndtering af flytbare enheder - - - - Removable Media Settings - - - - - Behaviour - Adfærd - - - - When a device is connected - Når en enhed tilsluttes - - - - Popup menu - Popup menu - - - - Show info - Vis info - - - - Do nothing - Gør ingenting - - - - MenuDiskItem - - Click to access this device from other applications. - Klik for at give adgang fra andre programmer. - - - Click to eject this disc. - Skub ud. - - - - - Removable media/devices manager - Håndtering af flytbare medier - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Håndtering af flytbare medier - - - The device <b><nobr>"%1"</nobr></b> is connected. - Enheden <b><nobr>"%1"</nobr></b> er forbundet. - - - The device <b><nobr>"%1"</nobr></b> is removed. - Enheden <b><nobr>"%1"</nobr></b> er fjernet. - - - No devices Available. - Ingen enheder tilgængelige. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_de.ts b/plugin-mount/translations/mount_de.ts deleted file mode 100644 index 335269f..0000000 --- a/plugin-mount/translations/mount_de.ts +++ /dev/null @@ -1,90 +0,0 @@ - - - - - Button - - - Removable media/devices manager - Entfernbare Medien-/Geräteverwaltung - - - - Configuration - - - Removable Media Settings - Entfernbare Medien - Einstellungen - - - - Behaviour - Verhalten - - - - When a device is connected : - Wenn ein Gerät verbunden ist: - - - - Popup menu - Aufklapp-Menü - - - - Show info - Informationen anzeigen - - - - Do nothing - Nichts tun - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - Das Gerät <b><nobr>"%1"</nobr></b> wurde verbunden. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - Das Gerät <b><nobr>"%1"</nobr></b> wurde entfernt. - - - - Removable media/devices manager - Entfernbare Medien-/Geräteverwaltung - - - - MenuDiskItem - - - Mounting of <b><nobr>"%1"</nobr></b> failed: %2 - Das Einbinden von <b><nobr>"%1"</nobr></b> ist fehlgeschlagen: %2 - - - - - Removable media/devices manager - Entfernbare Medien-/Geräteverwaltung - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - Das Lösen von <strong><nobr>"%1"</nobr></strong> ist fehlgeschlagen: %2 - - - - Popup - - - No devices are available - Keine Geräte verfügbar - - - diff --git a/plugin-mount/translations/mount_el.ts b/plugin-mount/translations/mount_el.ts deleted file mode 100644 index 335d366..0000000 --- a/plugin-mount/translations/mount_el.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - Συνδέθηκε η συσκευή <b><nobr>"%1"</nobr></b>. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - Αφαιρέθηκε η συσκευή <b><nobr>"%1"</nobr></b>. - - - - Removable media/devices manager - Διαχειριστής αφαιρούμενων μέσων/συσκευών - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - Ρυθμίσεις διαχειριστή αφαιρούμενων μέσων LXQt - - - - Removable Media Settings - Ρυθμίσεις αφαιρούμενων μέσων - - - - Behaviour - Συμπεριφορά - - - - When a device is connected - Όταν μια συσκευή συνδέεται - - - - Popup menu - Αναδυόμενο μενού - - - - Show info - Εμφάνιση πληροφοριών - - - - Do nothing - Καμία ενέργεια - - - - MenuDiskItem - - Click to access this device from other applications. - Κλίκ για πρόσβαση σε αυτή τη συσκευή από άλλες εφαρμογές. - - - Click to eject this disc. - Κλίκ για εξαγωγή αυτού του δίσκου. - - - - - Removable media/devices manager - Διαχειριστής αφαιρούμενων μέσων/συσκευών - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - Η προσάρτηση του <strong><nobr>"%1"</nobr></strong> απέτυχε: %2 - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - Η αποπροσάρτηση του <strong><nobr>"%1"</nobr></strong> απέτυχε: %2 - - - - MountButton - - - Removable media/devices manager - Διαχειριστής αφαιρούμενων μέσων/συσκευών - - - The device <b><nobr>"%1"</nobr></b> is connected. - Συνδέθηκε η συσκευή <b><nobr>"%1"</nobr></b>. - - - The device <b><nobr>"%1"</nobr></b> is removed. - Αφαιρέθηκε η συσκευή <b><nobr>"%1"</nobr></b>. - - - No devices Available. - Καμία διαθέσιμη συσκευή. - - - - Popup - - - No devices are available - Καμία διαθέσιμη συσκευή - - - diff --git a/plugin-mount/translations/mount_eo.ts b/plugin-mount/translations/mount_eo.ts deleted file mode 100644 index 64b27fc..0000000 --- a/plugin-mount/translations/mount_eo.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - La aparato <b><nobr>"%1"</nobr></b> estas konektita. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - La aparato <b><nobr>"%1"</nobr></b> estas demetita. - - - - Removable media/devices manager - Mastrumilo de demeteblaj aparatoj - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - Agordoj de la mastrumilo de dementeblaj aparatoj de LXQt - - - - Removable Media Settings - - - - - Behaviour - Konduto - - - - When a device is connected - Kiam aparato estas konektita - - - - Popup menu - Ŝprucfenestra menuo - - - - Show info - Montri informojn - - - - Do nothing - Fari nenion - - - - MenuDiskItem - - Click to access this device from other applications. - Alklaku por atingi al ĉi tiu aparato el aliaj aplikaĵoj. - - - Click to eject this disc. - Alklaku por elĵeti ĉi tiun diskon. - - - - - Removable media/devices manager - Mastrumilo de demeteblaj aparatoj - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Mastrumilo de demeteblaj aparatoj - - - The device <b><nobr>"%1"</nobr></b> is connected. - La aparato <b><nobr>"%1"</nobr></b> estas konektita. - - - The device <b><nobr>"%1"</nobr></b> is removed. - La aparato <b><nobr>"%1"</nobr></b> estas demetita. - - - No devices Available. - Neniu disponebla aparato. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_es.ts b/plugin-mount/translations/mount_es.ts deleted file mode 100644 index 39e3482..0000000 --- a/plugin-mount/translations/mount_es.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - Se conectó el dispositivo <b><nobr>"%1"</nobr></b>. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - Se expulsó el dispositivo <b><nobr>"%1"</nobr></b>. - - - - Removable media/devices manager - Gestor de medios y dispositivos extraíbles - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - Configuración del gestor de medios extraíbles de LXQt - - - - Removable Media Settings - - - - - Behaviour - Comportamiento - - - - When a device is connected - Cuando un dispositivo se conecte - - - - Popup menu - Menú contextual - - - - Show info - Mostrar información - - - - Do nothing - No hacer nada - - - - MenuDiskItem - - Click to access this device from other applications. - Haga clic para acceder a este dispositivo desde otras aplicaciones. - - - Click to eject this disc. - Haga clic para expulsar este disco. - - - - - Removable media/devices manager - Gestor de medios y dispositivos extraíbles - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Gestor de medios y dispositivos extraíbles - - - The device <b><nobr>"%1"</nobr></b> is connected. - Se conectó el dispositivo <b><nobr>"%1"</nobr></b>. - - - The device <b><nobr>"%1"</nobr></b> is removed. - Se expulsó el dispositivo <b><nobr>"%1"</nobr></b>. - - - No devices Available. - No hay dispositivos disponibles. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_es_UY.ts b/plugin-mount/translations/mount_es_UY.ts deleted file mode 100644 index 53cbb84..0000000 --- a/plugin-mount/translations/mount_es_UY.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - 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 - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - Configuración de dispositivos desmontables LXQt - - - - Removable Media Settings - - - - - Behaviour - Comportamiento - - - - When a device is connected - Cuando un dispositivo es conectado - - - - Popup menu - Menú emergente - - - - Show info - Mostrar información - - - - Do nothing - No hacer nada - - - - MenuDiskItem - - Click to access this device from other applications. - Presione para acceder a este dispositivo desde otras aplicaciones. - - - Click to eject this disc. - Presione para expulsar este disco. - - - - - Removable media/devices manager - Administrador de dispositivos desmontables - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Administrador de dispositivos desmontables - - - 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. - - - No devices Available. - No hay dispositivos disponibles. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_es_VE.ts b/plugin-mount/translations/mount_es_VE.ts deleted file mode 100644 index dd1c201..0000000 --- a/plugin-mount/translations/mount_es_VE.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - 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 medios y dispositivos - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - Configuración de manejador de dispositivos LXQt - - - - Removable Media Settings - - - - - Behaviour - Comportamiento - - - - When a device is connected - Cuando un dispositivo es conectado - - - - Popup menu - Menú emergente - - - - Show info - Mostrar información - - - - Do nothing - No hacer nada - - - - MenuDiskItem - - Click to access this device from other applications. - Presione para acceder a este dispositivo desde la palicacion por defecto. - - - Click to eject this disc. - Presione para expulsar este disco. - - - - - Removable media/devices manager - Administrador de medios y dispositivos - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Administrador de medios y dispositivos - - - 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. - - - No devices Available. - No hay dispositivos disponibles. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_eu.ts b/plugin-mount/translations/mount_eu.ts deleted file mode 100644 index 744af05..0000000 --- a/plugin-mount/translations/mount_eu.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - <b><nobr>"%1"</nobr></b>gailua konektatuta. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - <b><nobr>"%1"</nobr></b>gailua kenduta. - - - - Removable media/devices manager - Eduki/gailu aldagarrien kudeatzailea - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - LXQt gailu aldagarrien kudeatzailearen ezarpenak - - - - Removable Media Settings - - - - - Behaviour - Portaera - - - - When a device is connected - Gailu bat konektatzean - - - - Popup menu - Laster-menua - - - - Show info - Erakutsi informazioa - - - - Do nothing - Ez egin ezer - - - - MenuDiskItem - - Click to access this device from other applications. - Klikatu gailu hau beste aplikazioetatik atzitzeko. - - - Click to eject this disc. - Klikatu diskoa egozteko. - - - - - Removable media/devices manager - Eduki/gailu aldagarrien kudeatzailea - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Eduki/gailu aldagarrien kudeatzailea - - - The device <b><nobr>"%1"</nobr></b> is connected. - <b><nobr>"%1"</nobr></b>gailua konektatuta. - - - The device <b><nobr>"%1"</nobr></b> is removed. - <b><nobr>"%1"</nobr></b>gailua kenduta. - - - No devices Available. - Gailurik ez erabilgarri. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_fi.ts b/plugin-mount/translations/mount_fi.ts deleted file mode 100644 index db4067d..0000000 --- a/plugin-mount/translations/mount_fi.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - Laite <b><nobr>"%1"</nobr></b> on liitetty. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - Laite <b><nobr>"%1"</nobr></b> on irrotettu. - - - - Removable media/devices manager - Irrotettavien laitteiden ja levyjen hallinta - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - LXQtin irrotettavien laitteiden asetukset - - - - Removable Media Settings - - - - - Behaviour - Toiminta - - - - When a device is connected - Kun laite liitetään - - - - Popup menu - Näytä valikko - - - - Show info - Näytä tiedot - - - - Do nothing - Älä tee mitään - - - - MenuDiskItem - - Click to access this device from other applications. - Napsauta käyttääksesi tätä laitetta muilla sovelluksilla. - - - Click to eject this disc. - Napsauta poistaaksesi tämän levyn. - - - - - Removable media/devices manager - Irrotettavien laitteiden ja levyjen hallinta - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Irrotettavien laitteiden ja levyjen hallinta - - - The device <b><nobr>"%1"</nobr></b> is connected. - Laite <b><nobr>"%1"</nobr></b> on liitetty. - - - The device <b><nobr>"%1"</nobr></b> is removed. - Laite <b><nobr>"%1"</nobr></b> on irrotettu. - - - No devices Available. - Ei laitteita saatavilla. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_fr_FR.ts b/plugin-mount/translations/mount_fr_FR.ts deleted file mode 100644 index aa30818..0000000 --- a/plugin-mount/translations/mount_fr_FR.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - Le périphérique <b><nobr>"%1"</nobr></b>est connecté. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - Le périphérique <b><nobr>"%1"</nobr></b> a été retiré. - - - - Removable media/devices manager - Gestionnaire de médias/périphériques amovibles - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - Paramètres du gestionnaire de médias amovibles - - - - Removable Media Settings - - - - - Behaviour - Comportement - - - - When a device is connected - Quand un périphérique est connecté - - - - Popup menu - Menu pop-up - - - - Show info - Montrer les informations - - - - Do nothing - Ne rien faire - - - - MenuDiskItem - - Click to access this device from other applications. - Cliquez pour accéder à ce périphérique depuis d'autres applications. - - - Click to eject this disc. - Cliquez pour éjecter ce disque. - - - - - Removable media/devices manager - Gestionnaire de médias/périphériques amovibles - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Gestionnaire de médias/périphériques amovibles - - - The device <b><nobr>"%1"</nobr></b> is connected. - Le périphérique <b><nobr>"%1"</nobr></b>est connecté. - - - The device <b><nobr>"%1"</nobr></b> is removed. - Le périphérique <b><nobr>"%1"</nobr></b> a été retiré. - - - No devices Available. - Aucun périphérique disponible. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_hr.ts b/plugin-mount/translations/mount_hr.ts deleted file mode 100644 index 395f717..0000000 --- a/plugin-mount/translations/mount_hr.ts +++ /dev/null @@ -1,90 +0,0 @@ - - - - - Button - - - Removable media/devices manager - Upravitelj uklonjivim medijima/uređajima - - - - Configuration - - - Removable Media Settings - Postavke uklonjivih medija - - - - Behaviour - Ponašanje - - - - When a device is connected : - - - - - Popup menu - - - - - Show info - Pokaži info - - - - Do nothing - Ne čini ništa - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - 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. - - - - Removable media/devices manager - Upravitelj uklonjivim medijima/uređajima - - - - MenuDiskItem - - - Mounting of <b><nobr>"%1"</nobr></b> failed: %2 - Montiranje <b><nobr>"%1"</nobr></b> nije uspjelo: %2 - - - - - Removable media/devices manager - Upravitelj uklonjivim medijima/uređajima - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - Odmontiranje <strong><nobr>"%1"</nobr></strong> nije uspjelo: %2 - - - - Popup - - - No devices are available - Nije dostupan nijedan uređaj - - - diff --git a/plugin-mount/translations/mount_hu.ts b/plugin-mount/translations/mount_hu.ts deleted file mode 100644 index c59ba91..0000000 --- a/plugin-mount/translations/mount_hu.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - A(z) <b><nobr>„%1”</nobr></b> eszköz csatlakoztatva. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - A(z) <b><nobr>„%1”</nobr></b> eszköz eltávolítva. - - - - Removable media/devices manager - Cserélhetőeszköz-kezelő - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - A LXQt cserélhetőeszköz-kezelő beállításai - - - - Removable Media Settings - Cserélhető eszközbeállítás - - - - Behaviour - Működés - - - - When a device is connected - Ha az eszköz csatlakoztatva van - - - - Popup menu - Felugró menü - - - - Show info - Információ megjelenítése - - - - Do nothing - Ne tegyen semmit - - - - MenuDiskItem - - Click to access this device from other applications. - Kattintson az eszköz más alkalmazásokból való eléréséhez. - - - Click to eject this disc. - Kattintson a lemez kiadásához. - - - - - Removable media/devices manager - Cserélhetőeszköz-kezelő - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - A <strong><nobr>"%1"</nobr></strong> csatolása sikertelen: %2 - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - A <strong><nobr>"%1"</nobr></strong> lecsatolása sikertelen: %2 - - - - MountButton - - - Removable media/devices manager - Cserélhetőeszköz-kezelő - - - The device <b><nobr>"%1"</nobr></b> is connected. - A(z) <b><nobr>„%1”</nobr></b> eszköz csatlakoztatva. - - - The device <b><nobr>"%1"</nobr></b> is removed. - A(z) <b><nobr>„%1”</nobr></b> eszköz eltávolítva. - - - No devices Available. - Nem érhetők el eszközök. - - - - Popup - - - No devices are available - Nincs elérhető eszköz - - - diff --git a/plugin-mount/translations/mount_hu_HU.ts b/plugin-mount/translations/mount_hu_HU.ts deleted file mode 100644 index 2a51ca7..0000000 --- a/plugin-mount/translations/mount_hu_HU.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - A(z) <b><nobr>„%1”</nobr></b> eszköz csatlakoztatva. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - A(z) <b><nobr>„%1”</nobr></b> eszköz eltávolítva. - - - - Removable media/devices manager - Cserélhetőeszköz-kezelő - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - A LXQt cserélhetőeszköz-kezelő beállításai - - - - Removable Media Settings - Cserélhető eszközbeállítás - - - - Behaviour - Működés - - - - When a device is connected - Ha az eszköz csatlakoztatva van - - - - Popup menu - Felugró menü - - - - Show info - Információ megjelenítése - - - - Do nothing - Ne tegyen semmit - - - - MenuDiskItem - - Click to access this device from other applications. - Kattintson az eszköz más alkalmazásokból való eléréséhez. - - - Click to eject this disc. - Kattintson a lemez kiadásához. - - - - - Removable media/devices manager - Cserélhetőeszköz-kezelő - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - A <strong><nobr>"%1"</nobr></strong> csatolása sikertelen: %2 - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - A <strong><nobr>"%1"</nobr></strong> lecsatolása sikertelen: %2 - - - - MountButton - - - Removable media/devices manager - Cserélhetőeszköz-kezelő - - - The device <b><nobr>"%1"</nobr></b> is connected. - A(z) <b><nobr>„%1”</nobr></b> eszköz csatlakoztatva. - - - The device <b><nobr>"%1"</nobr></b> is removed. - A(z) <b><nobr>„%1”</nobr></b> eszköz eltávolítva. - - - No devices Available. - Nem érhetők el eszközök. - - - - Popup - - - No devices are available - Nincs elérhető eszköz - - - diff --git a/plugin-mount/translations/mount_ia.ts b/plugin-mount/translations/mount_ia.ts deleted file mode 100644 index 4a2b30f..0000000 --- a/plugin-mount/translations/mount_ia.ts +++ /dev/null @@ -1,90 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - - - - - The device <b><nobr>"%1"</nobr></b> is removed. - - - - - Removable media/devices manager - - - - - LXQtMountConfiguration - - - Removable Media Settings - - - - - Behaviour - - - - - When a device is connected - - - - - Popup menu - - - - - Show info - - - - - Do nothing - - - - - MenuDiskItem - - - - Removable media/devices manager - - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_id_ID.ts b/plugin-mount/translations/mount_id_ID.ts deleted file mode 100644 index 66b153e..0000000 --- a/plugin-mount/translations/mount_id_ID.ts +++ /dev/null @@ -1,98 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - - - - - The device <b><nobr>"%1"</nobr></b> is removed. - - - - - Removable media/devices manager - - - - - LXQtMountConfiguration - - - Removable Media Settings - - - - - Behaviour - - - - - When a device is connected - - - - - Popup menu - - - - - Show info - - - - - Do nothing - - - - - MenuDiskItem - - Click to access this device from other applications. - Klik untuk mengakses device ini dari aplikasi lain. - - - Click to eject this disc. - Klik untuk mengeluarkan disk ini. - - - - - Removable media/devices manager - - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_it.ts b/plugin-mount/translations/mount_it.ts deleted file mode 100644 index f889b13..0000000 --- a/plugin-mount/translations/mount_it.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - Il dispositivo <b><nobr>"%1"</nobr></b> è connesso. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - Il dispositivo <b><nobr>"%1"</nobr></b> è stato rimosso. - - - - Removable media/devices manager - Gestore dei dispositivi rimovibili - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - Impostazioni del gestore dei dispositivi rimovibili di LXQt - - - - Removable Media Settings - Impostazioni dispositivi rimovibili - - - - Behaviour - Comportamento - - - - When a device is connected - Quando un dispositivo è connesso - - - - Popup menu - Menu a comparsa - - - - Show info - Mostra informazioni - - - - Do nothing - Non fare nulla - - - - MenuDiskItem - - Click to access this device from other applications. - Fai clic per accedere al dispositivo da altre applicazioni. - - - Click to eject this disc. - Fai clic per espellere il disco. - - - - - Removable media/devices manager - Gestore dei dispositivi rimovibili - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - Montaggio di <strong><nobr>"%1"</nobr></strong> non riuscito: %2 - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - Smontaggio di <strong><nobr>"%1"</nobr></strong> non riuscito: %2 - - - - MountButton - - - Removable media/devices manager - Gestore dei dispositivi rimovibili - - - The device <b><nobr>"%1"</nobr></b> is connected. - Il dispositivo <b><nobr>"%1"</nobr></b> è connesso. - - - The device <b><nobr>"%1"</nobr></b> is removed. - Il dispositivo <b><nobr>"%1"</nobr></b> è stato rimosso. - - - No devices Available. - Nessun dispositivo disponibile. - - - - Popup - - - No devices are available - Nessun dispositivo presente - - - diff --git a/plugin-mount/translations/mount_ja.ts b/plugin-mount/translations/mount_ja.ts deleted file mode 100644 index c42caa9..0000000 --- a/plugin-mount/translations/mount_ja.ts +++ /dev/null @@ -1,90 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - デバイス <b><nobr>"%1"</nobr></b> は接続されました - - - - The device <b><nobr>"%1"</nobr></b> is removed. - デバイス <b><nobr>"%1"</nobr></b> は接続解除されました - - - - Removable media/devices manager - リムーバルメディア/デバイスの管理 - - - - LXQtMountConfiguration - - - Removable Media Settings - リムーバブルメディアの設定 - - - - Behaviour - 挙動 - - - - When a device is connected - デバイスが接続されたとき - - - - Popup menu - メニューをポップアップ - - - - Show info - 情報を表示 - - - - Do nothing - 何もしない - - - - MenuDiskItem - - - - Removable media/devices manager - リムーバルメディア/デバイスの管理 - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - リムーバルメディア/デバイスの管理 - - - - Popup - - - No devices are available - 接続可能なデバイスはありません - - - diff --git a/plugin-mount/translations/mount_ko.ts b/plugin-mount/translations/mount_ko.ts deleted file mode 100644 index dac33c6..0000000 --- a/plugin-mount/translations/mount_ko.ts +++ /dev/null @@ -1,90 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - - - - - The device <b><nobr>"%1"</nobr></b> is removed. - - - - - Removable media/devices manager - - - - - LXQtMountConfiguration - - - Removable Media Settings - - - - - Behaviour - - - - - When a device is connected - - - - - Popup menu - - - - - Show info - - - - - Do nothing - - - - - MenuDiskItem - - - - Removable media/devices manager - - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_lt.ts b/plugin-mount/translations/mount_lt.ts deleted file mode 100644 index 744e537..0000000 --- a/plugin-mount/translations/mount_lt.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - Įrenginys <b><nobr>"%1"</nobr></b> prijungtas. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - Įrenginys <b><nobr>"%1"</nobr></b> pašalintas - - - - Removable media/devices manager - Pašalinamų įrenginių tvarkytuvė - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - LXQt pašalinamų įrenginių tvarkytuvės nuostatos - - - - Removable Media Settings - - - - - Behaviour - Elgsena - - - - When a device is connected - Prijungus įrenginį - - - - Popup menu - Iškylantis meniu - - - - Show info - Rodyti informaciją - - - - Do nothing - Nieko nedaryti - - - - MenuDiskItem - - Click to access this device from other applications. - Norėdami šį įrenginį pasiekti kitomis programomis, spragtelėkite. - - - Click to eject this disc. - Norėdami išstumti diską, spragtelėkite. - - - - - Removable media/devices manager - Pašalinamų įrenginių tvarkytuvė - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Pašalinamų įrenginių tvarkytuvė - - - The device <b><nobr>"%1"</nobr></b> is connected. - Įrenginys <b><nobr>"%1"</nobr></b> prijungtas. - - - The device <b><nobr>"%1"</nobr></b> is removed. - Įrenginys <b><nobr>"%1"</nobr></b> pašalintas - - - No devices Available. - Įrenginių nėra - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_nl.ts b/plugin-mount/translations/mount_nl.ts deleted file mode 100644 index c737c36..0000000 --- a/plugin-mount/translations/mount_nl.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - Het apparaat <b><nobr>"%1"</nobr></b> is verbonden. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - Het apparaat <b><nobr>"%1"</nobr></b> is verwijderd. - - - - Removable media/devices manager - Beheerder van verwijderbare media/apparaten - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - Instellingen voor beheerder van verwijderbare media in LXQt - - - - Removable Media Settings - - - - - Behaviour - Gedrag - - - - When a device is connected - Wanneer een apparaat wordt verbonden - - - - Popup menu - Opduikmenu - - - - Show info - Toon informatie - - - - Do nothing - Niets doen - - - - MenuDiskItem - - Click to access this device from other applications. - Klik om dit apparaat te benaderen vanuit andere toepassingen. - - - Click to eject this disc. - Klik om deze schijf uit te werpen. - - - - - Removable media/devices manager - Beheerder van verwijderbare media/apparaten - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Beheerder van verwijderbare media/apparaten - - - The device <b><nobr>"%1"</nobr></b> is connected. - Het apparaat <b><nobr>"%1"</nobr></b> is verbonden. - - - The device <b><nobr>"%1"</nobr></b> is removed. - Het apparaat <b><nobr>"%1"</nobr></b> is verwijderd. - - - No devices Available. - Geen apparaten beschikbaar. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_pl_PL.ts b/plugin-mount/translations/mount_pl_PL.ts deleted file mode 100644 index 90b00f9..0000000 --- a/plugin-mount/translations/mount_pl_PL.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - Nośnik <b><nobr>"%1"</nobr></b> jest podłączony. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - Nośnik <b><nobr>"%1"</nobr></b> jest odłączony. - - - - Removable media/devices manager - Menedżer nośników wymiennych - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - Ustawienia menedżera nośników wymiennych - - - - Removable Media Settings - Ustawienia nośników wymiennych - - - - Behaviour - Zachowanie - - - - When a device is connected - Kiedy nośnik jest podłączony - - - - Popup menu - Pokaż listę - - - - Show info - Pokaż informacje - - - - Do nothing - Nic nierób - - - - MenuDiskItem - - Click to access this device from other applications. - Kliknij aby uzyskać dostęp do tego nośnika z innych aplikacji. - - - Click to eject this disc. - Kliknij aby wysunąć ten dysk. - - - - - Removable media/devices manager - Menedżer nośników wymiennych - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Menedżer nośników wymiennych - - - The device <b><nobr>"%1"</nobr></b> is connected. - Nośnik <b><nobr>"%1"</nobr></b> jest podłączony. - - - The device <b><nobr>"%1"</nobr></b> is removed. - Nośnik <b><nobr>"%1"</nobr></b> jest odłączony. - - - No devices Available. - Brak nośników. - - - - Popup - - - No devices are available - Brak dostępnych urządzeń - - - diff --git a/plugin-mount/translations/mount_pt.ts b/plugin-mount/translations/mount_pt.ts deleted file mode 100644 index 0f08900..0000000 --- a/plugin-mount/translations/mount_pt.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - O dispositivo <b><nobr>"%1"</nobr></b> está conectado. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - O dispositivo <b><nobr>"%1"</nobr></b> foi removido. - - - - Removable media/devices manager - Gestor de discos e unidades amovíveis - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - Definições do gestor de unidades e discos amovíveis do LXQt - - - - Removable Media Settings - - - - - Behaviour - Comportamento - - - - When a device is connected - Ao conectar um dispositivo - - - - Popup menu - Menu - - - - Show info - Mostrar informações - - - - Do nothing - Nada fazer - - - - MenuDiskItem - - Click to access this device from other applications. - Clique para aceder a este dispositivo a partir de outras aplicações. - - - Click to eject this disc. - Clique para ejetar este disco. - - - - - Removable media/devices manager - Gestor de discos e unidades amovíveis - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Gestor de discos e unidades amovíveis - - - The device <b><nobr>"%1"</nobr></b> is connected. - O dispositivo <b><nobr>"%1"</nobr></b> está conectado. - - - The device <b><nobr>"%1"</nobr></b> is removed. - O dispositivo <b><nobr>"%1"</nobr></b> foi removido. - - - No devices Available. - Nenhum dispositivo. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_pt_BR.ts b/plugin-mount/translations/mount_pt_BR.ts deleted file mode 100644 index aebe424..0000000 --- a/plugin-mount/translations/mount_pt_BR.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - O dispositivo <b><nobr>"%1"</nobr></br> está conectado. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - O dispositivo <b><nobr>"%1"</nobr></br> foi removido. - - - - Removable media/devices manager - Gerenciador de dispositivos/mídias removíveis - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - Configurações do gerenciador de mídia removível do LXQt - - - - Removable Media Settings - - - - - Behaviour - Comportamento - - - - When a device is connected - Quando o dispositivo for conectado - - - - Popup menu - Menu de contexto - - - - Show info - Exibir informações - - - - Do nothing - Não fazer nada - - - - MenuDiskItem - - Click to access this device from other applications. - Clique para acessar este dispositivo a partir de outros aplicativos. - - - Click to eject this disc. - Clique para ejetar este disco. - - - - - Removable media/devices manager - Gerenciador de dispositivos/mídias removíveis - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Gerenciador de dispositivos/mídias removíveis - - - The device <b><nobr>"%1"</nobr></b> is connected. - O dispositivo <b><nobr>"%1"</nobr></br> está conectado. - - - The device <b><nobr>"%1"</nobr></b> is removed. - O dispositivo <b><nobr>"%1"</nobr></br> foi removido. - - - No devices Available. - Nenhum dispositivo disponível. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_ro_RO.ts b/plugin-mount/translations/mount_ro_RO.ts deleted file mode 100644 index b700eb6..0000000 --- a/plugin-mount/translations/mount_ro_RO.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - Dispozitivul <b><nobr>"%1"</nobr></b> a fost conectat. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - Dispozitivul <b><nobr>"%1"</nobr></b> a fost eliminat. - - - - Removable media/devices manager - Administrator medii/dispozitive detașabile - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - Configurație Administrator medii detașabile - - - - Removable Media Settings - - - - - Behaviour - Comportament - - - - When a device is connected - Când este conectat un dispozitiv - - - - Popup menu - Meniu popup - - - - Show info - Afișează informații - - - - Do nothing - Nicio acțiune - - - - MenuDiskItem - - Click to access this device from other applications. - Apăsați pentru a accesa acest dispozitiv din alte aplicații. - - - Click to eject this disc. - Clic pentru a scoate acest disc. - - - - - Removable media/devices manager - Administrator medii/dispozitive detașabile - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Administrator medii/dispozitive detașabile - - - The device <b><nobr>"%1"</nobr></b> is connected. - Dispozitivul <b><nobr>"%1"</nobr></b> a fost conectat. - - - The device <b><nobr>"%1"</nobr></b> is removed. - Dispozitivul <b><nobr>"%1"</nobr></b> a fost eliminat. - - - No devices Available. - Nu este disponibil nici un dispozitiv. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_ru.ts b/plugin-mount/translations/mount_ru.ts deleted file mode 100644 index 3755931..0000000 --- a/plugin-mount/translations/mount_ru.ts +++ /dev/null @@ -1,90 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - Устройство <b><nobr>«%1»</nobr></b> подключено. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - Устройство <b><nobr>«%1»</nobr></b> отключено. - - - - Removable media/devices manager - Диспетчер отключаемых медиа/устройств - - - - LXQtMountConfiguration - - - Removable Media Settings - Настройки съёмных устройств - - - - Behaviour - Поведение - - - - When a device is connected - Когда устройство подключено - - - - Popup menu - Всплывающее меню - - - - Show info - Показать информацию - - - - Do nothing - Ничего не делать - - - - MenuDiskItem - - - - Removable media/devices manager - - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Диспетчер съёмных медиа/устройств - - - - Popup - - - No devices are available - Нет доступных устройств - - - diff --git a/plugin-mount/translations/mount_ru_RU.desktop b/plugin-mount/translations/mount_ru_RU.desktop deleted file mode 100644 index 5137520..0000000 --- a/plugin-mount/translations/mount_ru_RU.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[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[ru_RU]=Простое подключение и отключение USB и оптических приводов. -Name[ru_RU]=Съёмные устройства diff --git a/plugin-mount/translations/mount_ru_RU.ts b/plugin-mount/translations/mount_ru_RU.ts deleted file mode 100644 index 85927c9..0000000 --- a/plugin-mount/translations/mount_ru_RU.ts +++ /dev/null @@ -1,90 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - Устройство <b><nobr>«%1»</nobr></b> подключено. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - Устройство <b><nobr>«%1»</nobr></b> отключено. - - - - Removable media/devices manager - Диспетчер отключаемых медиа/устройств - - - - LXQtMountConfiguration - - - Removable Media Settings - Настройки съёмных устройств - - - - Behaviour - Поведение - - - - When a device is connected - Когда устройство подключено - - - - Popup menu - Всплывающее меню - - - - Show info - Показать информацию - - - - Do nothing - Ничего не делать - - - - MenuDiskItem - - - - Removable media/devices manager - - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Диспетчер съёмных медиа/устройств - - - - Popup - - - No devices are available - Нет доступных устройств - - - diff --git a/plugin-mount/translations/mount_sk_SK.ts b/plugin-mount/translations/mount_sk_SK.ts deleted file mode 100644 index 1c21639..0000000 --- a/plugin-mount/translations/mount_sk_SK.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - Zariadenie <b><nobr>„%1“</nobr></b> je zapojené. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - Zariadenie <b><nobr>„%1“</nobr></b> je odstránené. - - - - Removable media/devices manager - Správca prenosných médií a zariadení - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - Nastavenia správcu prenosných médií prostredia LXQt - - - - Removable Media Settings - - - - - Behaviour - Správanie - - - - When a device is connected - Pri pripojení zariadenia - - - - Popup menu - Zobraziť menu - - - - Show info - Zobraziť informácie - - - - Do nothing - Nerobiť nič - - - - MenuDiskItem - - Click to access this device from other applications. - Kliknutím môžete pristupovať na toto zariadenie z iných aplikácií. - - - Click to eject this disc. - Kliknutím vysuniete tento disk. - - - - - Removable media/devices manager - Správca prenosných médií a zariadení - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Správca prenosných médií a zariadení - - - The device <b><nobr>"%1"</nobr></b> is connected. - Zariadenie <b><nobr>„%1“</nobr></b> je zapojené. - - - The device <b><nobr>"%1"</nobr></b> is removed. - Zariadenie <b><nobr>„%1“</nobr></b> je odstránené. - - - No devices Available. - Žiadne zariadenia nie sú dostupné. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_sl.ts b/plugin-mount/translations/mount_sl.ts deleted file mode 100644 index f9d6b3d..0000000 --- a/plugin-mount/translations/mount_sl.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - 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. - - - - Removable media/devices manager - Upravljalnik odstranljivih nosilcev/naprav - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - Nastavitve upravljalnika odstranljivih nosilcev - - - - Removable Media Settings - - - - - Behaviour - Obnašanje - - - - When a device is connected - Ko se naprava priključi - - - - Popup menu - Prikaži meni - - - - Show info - Prikaži podatke - - - - Do nothing - Ne naredi nič - - - - MenuDiskItem - - Click to access this device from other applications. - Kliknite, da omogočite dostop do naprave iz programov. - - - Click to eject this disc. - Kliknite za izmet diska. - - - - - Removable media/devices manager - Upravljalnik odstranljivih nosilcev/naprav - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Upravljalnik odstranljivih nosilcev/naprav - - - The device <b><nobr>"%1"</nobr></b> is connected. - 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. - - - No devices Available. - Na voljo ni nobene naprave - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_sr@latin.ts b/plugin-mount/translations/mount_sr@latin.ts deleted file mode 100644 index 4be6451..0000000 --- a/plugin-mount/translations/mount_sr@latin.ts +++ /dev/null @@ -1,90 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - - - - - The device <b><nobr>"%1"</nobr></b> is removed. - - - - - Removable media/devices manager - - - - - LXQtMountConfiguration - - - Removable Media Settings - - - - - Behaviour - - - - - When a device is connected - - - - - Popup menu - - - - - Show info - - - - - Do nothing - - - - - MenuDiskItem - - - - Removable media/devices manager - - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_sr_BA.ts b/plugin-mount/translations/mount_sr_BA.ts deleted file mode 100644 index f25ef83..0000000 --- a/plugin-mount/translations/mount_sr_BA.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - Уређај <b><nobr>„%1“</nobr></b> је прикључен. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - Уређај <b><nobr>„%1“</nobr></b> је уклоњен. - - - - Removable media/devices manager - Менаџер уклоњивих медија/уређаја - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - Подешавање менаџера уклоњивих медија - - - - Removable Media Settings - - - - - Behaviour - Понашање - - - - When a device is connected - Кад је уређај прикључен - - - - Popup menu - прикажи мени - - - - Show info - прикажи инфо - - - - Do nothing - не ради ништа - - - - MenuDiskItem - - Click to access this device from other applications. - Кликните да приступате овом уређају из других програма. - - - Click to eject this disc. - Кликните да избаците диск. - - - - - Removable media/devices manager - Менаџер уклоњивих медија/уређаја - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Менаџер уклоњивих медија/уређаја - - - The device <b><nobr>"%1"</nobr></b> is connected. - Уређај <b><nobr>„%1“</nobr></b> је прикључен. - - - The device <b><nobr>"%1"</nobr></b> is removed. - Уређај <b><nobr>„%1“</nobr></b> је уклоњен. - - - No devices Available. - Нема доступних уређаја. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_sr_RS.ts b/plugin-mount/translations/mount_sr_RS.ts deleted file mode 100644 index f25ef83..0000000 --- a/plugin-mount/translations/mount_sr_RS.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - Уређај <b><nobr>„%1“</nobr></b> је прикључен. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - Уређај <b><nobr>„%1“</nobr></b> је уклоњен. - - - - Removable media/devices manager - Менаџер уклоњивих медија/уређаја - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - Подешавање менаџера уклоњивих медија - - - - Removable Media Settings - - - - - Behaviour - Понашање - - - - When a device is connected - Кад је уређај прикључен - - - - Popup menu - прикажи мени - - - - Show info - прикажи инфо - - - - Do nothing - не ради ништа - - - - MenuDiskItem - - Click to access this device from other applications. - Кликните да приступате овом уређају из других програма. - - - Click to eject this disc. - Кликните да избаците диск. - - - - - Removable media/devices manager - Менаџер уклоњивих медија/уређаја - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Менаџер уклоњивих медија/уређаја - - - The device <b><nobr>"%1"</nobr></b> is connected. - Уређај <b><nobr>„%1“</nobr></b> је прикључен. - - - The device <b><nobr>"%1"</nobr></b> is removed. - Уређај <b><nobr>„%1“</nobr></b> је уклоњен. - - - No devices Available. - Нема доступних уређаја. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_th_TH.ts b/plugin-mount/translations/mount_th_TH.ts deleted file mode 100644 index 2b55eb7..0000000 --- a/plugin-mount/translations/mount_th_TH.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - อุปกรณ์ <b><nobr>"%1"</nobr></b> ถูกเชื่อมต่อแล้ว - - - - The device <b><nobr>"%1"</nobr></b> is removed. - อุปกรณ์ <b><nobr>"%1"</nobr></b> ถูกถอดออกแล้ว - - - - Removable media/devices manager - ตัดจัดการสื่อ/อุปกรณ์แบบถอดเสียบ - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - ค่าตั้งตัวจัดการสื่อแบบถอดเสียบได้ LXQt - - - - Removable Media Settings - - - - - Behaviour - พฤติกรรม - - - - When a device is connected - เมื่ออุปกรณ์ถูกเชื่อมต่อ - - - - Popup menu - เมนูผุดขึ้น - - - - Show info - แสดงข้อมูล - - - - Do nothing - ไม่ต้องทำอะไร - - - - MenuDiskItem - - Click to access this device from other applications. - คลิกเพื่อเข้าใช้อุปกรณ์จากโปรแกรมต่างๆ - - - Click to eject this disc. - คลิกเพื่อดันแผ่นดิสก์ออก - - - - - Removable media/devices manager - ตัดจัดการสื่อ/อุปกรณ์แบบถอดเสียบ - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - ตัดจัดการสื่อ/อุปกรณ์แบบถอดเสียบ - - - The device <b><nobr>"%1"</nobr></b> is connected. - อุปกรณ์ <b><nobr>"%1"</nobr></b> ถูกเชื่อมต่อแล้ว - - - The device <b><nobr>"%1"</nobr></b> is removed. - อุปกรณ์ <b><nobr>"%1"</nobr></b> ถูกถอดออกแล้ว - - - No devices Available. - ไม่มีอุปกรณ์ที่ใช้งานได้ - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_tr.ts b/plugin-mount/translations/mount_tr.ts deleted file mode 100644 index c31c3cb..0000000 --- a/plugin-mount/translations/mount_tr.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - <b><nobr>"%1"</nobr></b> aygıtı bağlı. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - <b><nobr>"%1"</nobr></b> aygıtı çıkarıldı. - - - - Removable media/devices manager - Çıkarılabilir ortam/aygıt yönetici - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - LXQt Çıkarılabilir ortam yönetici ayarları - - - - Removable Media Settings - - - - - Behaviour - Davranış - - - - When a device is connected - Bir aygıt bağlandığında - - - - Popup menu - Açılır menü - - - - Show info - Bilgi görüntüle - - - - Do nothing - Hiç bir şey yapma - - - - MenuDiskItem - - Click to access this device from other applications. - Diğer uygulamalardan bu aygıta erişmek için tıklayın - - - Click to eject this disc. - Bu diski çıkartmak için tıklayın. - - - - - Removable media/devices manager - Çıkarılabilir ortam/aygıt yönetici - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Çıkarılabilir ortam/aygıt yönetici - - - The device <b><nobr>"%1"</nobr></b> is connected. - <b><nobr>"%1"</nobr></b> aygıtı bağlı. - - - The device <b><nobr>"%1"</nobr></b> is removed. - <b><nobr>"%1"</nobr></b> aygıtı çıkarıldı. - - - No devices Available. - Erişilebilir aygıt yok. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_uk.ts b/plugin-mount/translations/mount_uk.ts deleted file mode 100644 index 48b274a..0000000 --- a/plugin-mount/translations/mount_uk.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - Пристрій <b><nobr>"%1"</nobr></b> приєднано. - - - - The device <b><nobr>"%1"</nobr></b> is removed. - Пристрій <b><nobr>"%1"</nobr></b> від’єднано. - - - - Removable media/devices manager - Керування знімними носіями - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - Налаштування знімних носіїв LXQt - - - - Removable Media Settings - - - - - Behaviour - Поведінка - - - - When a device is connected - Коли пристрій приєднано: - - - - Popup menu - показати спливне меню - - - - Show info - показати інформацію - - - - Do nothing - нічого не робити - - - - MenuDiskItem - - Click to access this device from other applications. - Натисніть, щоб надати доступ до цього пристрою іншим програмам. - - - Click to eject this disc. - Натисніть, щоб витягти диск. - - - - - Removable media/devices manager - Керування знімними носіями - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - Керування знімними носіями - - - The device <b><nobr>"%1"</nobr></b> is connected. - Пристрій <b><nobr>"%1"</nobr></b> приєднано. - - - The device <b><nobr>"%1"</nobr></b> is removed. - Пристрій <b><nobr>"%1"</nobr></b> від’єднано. - - - No devices Available. - Пристрої відсутні. - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_zh_CN.ts b/plugin-mount/translations/mount_zh_CN.ts deleted file mode 100644 index d946173..0000000 --- a/plugin-mount/translations/mount_zh_CN.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - 设备 <b><nobr>"%1"</nobr></b> 已连接。 - - - - The device <b><nobr>"%1"</nobr></b> is removed. - 设备 <b><nobr>"%1"</nobr></b> 已移除。 - - - - Removable media/devices manager - 可移动存储设备管理器 - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - LXQt可移动媒体管理器设置 - - - - Removable Media Settings - - - - - Behaviour - 行为 - - - - When a device is connected - 当一个设备连接时 - - - - Popup menu - 弹出菜单 - - - - Show info - 显示信息 - - - - Do nothing - 什么都不做 - - - - MenuDiskItem - - Click to access this device from other applications. - 点击以从其它应用程序访问此设备。 - - - Click to eject this disc. - 点击以弹出该存储卷。 - - - - - Removable media/devices manager - 可移动存储设备管理器 - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - 可移动存储设备管理器 - - - The device <b><nobr>"%1"</nobr></b> is connected. - 设备 <b><nobr>"%1"</nobr></b> 已连接。 - - - The device <b><nobr>"%1"</nobr></b> is removed. - 设备 <b><nobr>"%1"</nobr></b> 已移除。 - - - No devices Available. - 没有可用设备。 - - - - Popup - - - No devices are available - - - - diff --git a/plugin-mount/translations/mount_zh_TW.ts b/plugin-mount/translations/mount_zh_TW.ts deleted file mode 100644 index a855e1f..0000000 --- a/plugin-mount/translations/mount_zh_TW.ts +++ /dev/null @@ -1,114 +0,0 @@ - - - - - DeviceActionInfo - - - The device <b><nobr>"%1"</nobr></b> is connected. - 裝置 <b><nobr>"%1"</nobr></b> 已連接。 - - - - The device <b><nobr>"%1"</nobr></b> is removed. - 裝置 <b><nobr>"%1"</nobr></b> 已卸除。 - - - - Removable media/devices manager - 可卸除式裝置管理員 - - - - LXQtMountConfiguration - - LXQt Removable media manager settings - LXQt可卸除式裝置管理員設定 - - - - Removable Media Settings - - - - - Behaviour - 行為 - - - - When a device is connected - 當一個裝置連接時 - - - - Popup menu - 彈出選單 - - - - Show info - 顯示訊息 - - - - Do nothing - 什麼都不做 - - - - MenuDiskItem - - Click to access this device from other applications. - 點擊以從其他應用程式讀取此裝置。 - - - Click to eject this disc. - 點擊以退出此磁片。 - - - - - Removable media/devices manager - 可卸除式裝置管理員 - - - - Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - - - - - MountButton - - - Removable media/devices manager - 可卸除式裝置管理員 - - - The device <b><nobr>"%1"</nobr></b> is connected. - 裝置 <b><nobr>"%1"</nobr></b> 已連接。 - - - The device <b><nobr>"%1"</nobr></b> is removed. - 裝置 <b><nobr>"%1"</nobr></b> 已卸除。 - - - No devices Available. - 無可用裝置。 - - - - Popup - - - No devices are available - - - - diff --git a/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.cpp b/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.cpp index a1a88bf..e106732 100644 --- a/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.cpp +++ b/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.cpp @@ -38,11 +38,9 @@ extern "C" { #define STATGRAB_NEWER_THAN_0_90 1 #endif -LXQtNetworkMonitorConfiguration::LXQtNetworkMonitorConfiguration(QSettings *settings, QWidget *parent) : - QDialog(parent), - ui(new Ui::LXQtNetworkMonitorConfiguration), - mSettings(settings), - mOldSettings(settings) +LXQtNetworkMonitorConfiguration::LXQtNetworkMonitorConfiguration(PluginSettings *settings, QWidget *parent) : + LXQtPanelPluginConfigDialog(settings, parent), + ui(new Ui::LXQtNetworkMonitorConfiguration) { setAttribute(Qt::WA_DeleteOnClose); setObjectName("NetworkMonitorConfigurationWindow"); @@ -62,13 +60,13 @@ LXQtNetworkMonitorConfiguration::~LXQtNetworkMonitorConfiguration() void LXQtNetworkMonitorConfiguration::saveSettings() { - mSettings->setValue("icon", ui->iconCB->currentIndex()); - mSettings->setValue("interface", ui->interfaceCB->currentText()); + settings().setValue("icon", ui->iconCB->currentIndex()); + settings().setValue("interface", ui->interfaceCB->currentText()); } void LXQtNetworkMonitorConfiguration::loadSettings() { - ui->iconCB->setCurrentIndex(mSettings->value("icon", 1).toInt()); + ui->iconCB->setCurrentIndex(settings().value("icon", 1).toInt()); int count; #ifdef STATGRAB_NEWER_THAN_0_90 @@ -81,20 +79,6 @@ void LXQtNetworkMonitorConfiguration::loadSettings() for (int ix = 0; ix < count; ix++) ui->interfaceCB->addItem(stats[ix].interface_name); - QString interface = mSettings->value("interface").toString(); + QString interface = settings().value("interface").toString(); ui->interfaceCB->setCurrentIndex(qMax(qMin(0, count - 1), ui->interfaceCB->findText(interface))); } - -void LXQtNetworkMonitorConfiguration::dialogButtonsAction(QAbstractButton *btn) -{ - if (ui->buttons->buttonRole(btn) == QDialogButtonBox::ResetRole) - { - mOldSettings.loadToSettings(); - loadSettings(); - } - else - { - close(); - } -} - diff --git a/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.h b/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.h index 0c728b8..9dcc072 100644 --- a/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.h +++ b/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.h @@ -29,11 +29,9 @@ #ifndef LXQTNETWORKMONITORCONFIGURATION_H #define LXQTNETWORKMONITORCONFIGURATION_H -#include +#include "../panel/lxqtpanelpluginconfigdialog.h" +#include "../panel/pluginsettings.h" -#include - -class QSettings; class QAbstractButton; namespace Ui @@ -41,18 +39,16 @@ namespace Ui class LXQtNetworkMonitorConfiguration; } -class LXQtNetworkMonitorConfiguration : public QDialog +class LXQtNetworkMonitorConfiguration : public LXQtPanelPluginConfigDialog { Q_OBJECT public: - explicit LXQtNetworkMonitorConfiguration(QSettings *settings, QWidget *parent = 0); + explicit LXQtNetworkMonitorConfiguration(PluginSettings *settings, QWidget *parent = nullptr); ~LXQtNetworkMonitorConfiguration(); private: Ui::LXQtNetworkMonitorConfiguration *ui; - QSettings *mSettings; - LXQt::SettingsCache mOldSettings; private slots: /* @@ -60,7 +56,6 @@ private slots: */ void saveSettings(); void loadSettings(); - void dialogButtonsAction(QAbstractButton *btn); }; #endif // LXQTNETWORKMONITORCONFIGURATION_H diff --git a/plugin-networkmonitor/translations/networkmonitor.ts b/plugin-networkmonitor/translations/networkmonitor.ts deleted file mode 100644 index a9c7923..0000000 --- a/plugin-networkmonitor/translations/networkmonitor.ts +++ /dev/null @@ -1,95 +0,0 @@ - - - - - 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 --git a/plugin-networkmonitor/translations/networkmonitor_ar.desktop b/plugin-networkmonitor/translations/networkmonitor_ar.desktop new file mode 100644 index 0000000..7cb4515 --- /dev/null +++ b/plugin-networkmonitor/translations/networkmonitor_ar.desktop @@ -0,0 +1,2 @@ +Name[ar]=مرقاب الشّبكة +Comment[ar]=تعرض حالة الشّبكة ونشاطها diff --git a/plugin-networkmonitor/translations/networkmonitor_cs.ts b/plugin-networkmonitor/translations/networkmonitor_cs.ts deleted file mode 100644 index 505f291..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_cs.ts +++ /dev/null @@ -1,99 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - Síťové rozhraní <b>%1</b> - - - - Transmitted %1 - Přeneseno %1 - - - - Received %1 - Přijato %1 - - - - B - B - - - - KiB - KiB - - - - MiB - MiB - - - - GiB - GiB - - - - TiB - TiB - - - - PiB - PiB - - - - LXQtNetworkMonitorConfiguration - - LXQt Network Monitor settings - Nastavení sledování sítě - - - - Network Monitor settings - - - - - General - Obecné - - - - Interface - Rozhraní - - - - Modem - Modem - - - - Monitor - Sledování - - - - Network - Síť - - - - Wireless - Bezdrátové - - - - Icon - Ikona - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_da.ts b/plugin-networkmonitor/translations/networkmonitor_da.ts deleted file mode 100644 index ae36bda..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_da.ts +++ /dev/null @@ -1,99 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - Netværksinterface <b>%1</b> - - - - Transmitted %1 - Sendt %1 - - - - Received %1 - Modtaget %1 - - - - B - B - - - - KiB - KiB - - - - MiB - MiB - - - - GiB - GiB - - - - TiB - TiB - - - - PiB - PiB - - - - LXQtNetworkMonitorConfiguration - - LXQt Network Monitor settings - Indstillinger for LXQt Netværksmonitor - - - - Network Monitor settings - - - - - General - Generelt - - - - Interface - Grænseflade - - - - Modem - Modem - - - - Monitor - Monitor - - - - Network - Netværk - - - - Wireless - Trådløs - - - - Icon - Ikon - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_de.ts b/plugin-networkmonitor/translations/networkmonitor_de.ts deleted file mode 100644 index 79e3f97..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_de.ts +++ /dev/null @@ -1,95 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - Netzwerkschnittstelle <b>%1</b> - - - - Transmitted %1 - Gesendet %1 - - - - Received %1 - Empfangen %1 - - - - B - B - - - - KiB - KiB - - - - MiB - MiB - - - - GiB - GiB - - - - TiB - TiB - - - - PiB - PiB - - - - LXQtNetworkMonitorConfiguration - - - Network Monitor settings - Netzwerkmonitor-Einstellungen - - - - General - Allgemein - - - - Interface - Schnittstelle - - - - Modem - Modem - - - - Monitor - Bildschirm - - - - Network - Netzwerk - - - - Wireless - Drahtlos - - - - Icon - Symbol - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_el.ts b/plugin-networkmonitor/translations/networkmonitor_el.ts deleted file mode 100644 index 6bc1f50..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_el.ts +++ /dev/null @@ -1,99 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - Διεπαφή δικτύου <b>%1</b> - - - - Transmitted %1 - Στάλθηκαν %1 - - - - Received %1 - Λήφθηκαν %1 - - - - B - B - - - - KiB - KiB - - - - MiB - MiB - - - - GiB - GiB - - - - TiB - TiB - - - - PiB - PiB - - - - LXQtNetworkMonitorConfiguration - - LXQt Network Monitor settings - Ρυθμίσεις επίβλεψης δικτύου LXQt - - - - Network Monitor settings - Ρυθμίσεις του επόπτη δικτύου - - - - General - Γενικά - - - - Interface - Διεπαφή - - - - Modem - Μόντεμ - - - - Monitor - Εποπτεία - - - - Network - Δίκτυο - - - - Wireless - Ασύρματο - - - - Icon - Εικονίδιο - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_eo.ts b/plugin-networkmonitor/translations/networkmonitor_eo.ts deleted file mode 100644 index 11f967c..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_eo.ts +++ /dev/null @@ -1,95 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - Reta interfaco <b>%1</b> - - - - Transmitted %1 - Sendita %1 - - - - Received %1 - Ricevita %1 - - - - B - B - - - - KiB - KiB - - - - MiB - MiB - - - - GiB - GiB - - - - TiB - TiB - - - - PiB - PiB - - - - LXQtNetworkMonitorConfiguration - - - Network Monitor settings - Agordoj por ret-observilo - - - - General - Ĝenerala - - - - Interface - Interfaco - - - - Modem - Modemo - - - - Monitor - Observilo - - - - Network - Reto - - - - Wireless - Sendrata - - - - Icon - Bildsimbolo - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_es.ts b/plugin-networkmonitor/translations/networkmonitor_es.ts deleted file mode 100644 index 62f6b2f..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_es.ts +++ /dev/null @@ -1,99 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - Interfaz de red <b>%1</b> - - - - Transmitted %1 - Transmitidos %1 - - - - Received %1 - Recibidos %1 - - - - B - B - - - - KiB - KiB - - - - MiB - MiB - - - - GiB - GiB - - - - TiB - TiB - - - - PiB - PiB - - - - LXQtNetworkMonitorConfiguration - - LXQt Network Monitor settings - Configuración del monitor de redes de LXQt - - - - Network Monitor settings - Configuración del monitor de redes - - - - General - General - - - - Interface - Interfaz - - - - Modem - Módem - - - - Monitor - Monitor - - - - Network - Red - - - - Wireless - Conexión inalámbrica - - - - Icon - Icono - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_eu.ts b/plugin-networkmonitor/translations/networkmonitor_eu.ts deleted file mode 100644 index eb25928..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_eu.ts +++ /dev/null @@ -1,99 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - <b>%1</b> sareko interfazea - - - - Transmitted %1 - %1 transmitituta - - - - Received %1 - %1 jasota - - - - B - B - - - - KiB - KiB - - - - MiB - MiB - - - - GiB - GiB - - - - TiB - TiB - - - - PiB - PiB - - - - LXQtNetworkMonitorConfiguration - - LXQt Network Monitor settings - LXQt sarearen monitorearen ezarpenak - - - - Network Monitor settings - - - - - General - Orokorra - - - - Interface - Interfazea - - - - Modem - Modema - - - - Monitor - Monitorea - - - - Network - Sarea - - - - Wireless - Hari gabekoa - - - - Icon - Ikonoa - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_fi.ts b/plugin-networkmonitor/translations/networkmonitor_fi.ts deleted file mode 100644 index 97e18df..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_fi.ts +++ /dev/null @@ -1,99 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - Verkkoliitäntä <b>%1</b> - - - - Transmitted %1 - Siirretty %1 - - - - Received %1 - Vastaanotettu %1 - - - - B - t - - - - KiB - KiB - - - - MiB - MiB - - - - GiB - GiB - - - - TiB - TiB - - - - PiB - PiB - - - - LXQtNetworkMonitorConfiguration - - LXQt Network Monitor settings - LXQtin verkonhallinnan asetukset - - - - Network Monitor settings - - - - - General - Yleiset - - - - Interface - Liitäntä - - - - Modem - Modeemi - - - - Monitor - - - - - Network - Verkko - - - - Wireless - Langaton - - - - Icon - Kuvake - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_fr.ts b/plugin-networkmonitor/translations/networkmonitor_fr.ts deleted file mode 100644 index e28e8b0..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_fr.ts +++ /dev/null @@ -1,95 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - Interface réseau <b>%1</b> - - - - Transmitted %1 - Transmis %1 - - - - Received %1 - Reçu %1 - - - - B - o - - - - KiB - Ko - - - - MiB - Mo - - - - GiB - Go - - - - TiB - To - - - - PiB - Po - - - - LXQtNetworkMonitorConfiguration - - - Network Monitor settings - Paramètres du moniteur réseau - - - - General - Généraux - - - - Interface - Interface - - - - Modem - Modem - - - - Monitor - Moniteur - - - - Network - Réseau - - - - Wireless - Sans-Fil - - - - Icon - Icône - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_hr.ts b/plugin-networkmonitor/translations/networkmonitor_hr.ts deleted file mode 100644 index 3608fac..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_hr.ts +++ /dev/null @@ -1,95 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - Mrežno sučelje <b>%1</b> - - - - Transmitted %1 - - - - - Received %1 - Primljeno %1 - - - - B - B - - - - KiB - KiB - - - - MiB - MiB - - - - GiB - GiB - - - - TiB - TiB - - - - PiB - PiB - - - - LXQtNetworkMonitorConfiguration - - - Network Monitor settings - Postavke nadzora mreže - - - - General - Općenito - - - - Interface - Sučelje - - - - Modem - Modem - - - - Monitor - Nadzor - - - - Network - Mreža - - - - Wireless - Bežično - - - - Icon - Ikona - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_hu.ts b/plugin-networkmonitor/translations/networkmonitor_hu.ts deleted file mode 100644 index f06febd..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_hu.ts +++ /dev/null @@ -1,95 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - Hálózati eszköz <b>%1</b> - - - - Transmitted %1 - Küldött %1 - - - - Received %1 - Fogadott %1 - - - - B - B - - - - KiB - KiB - - - - MiB - MiB - - - - GiB - GiB - - - - TiB - Tib - - - - PiB - Pib - - - - LXQtNetworkMonitorConfiguration - - - Network Monitor settings - Hálózatfigyelő beállítás - - - - General - Általános - - - - Interface - Eszköz - - - - Modem - - - - - Monitor - - - - - Network - Hálózat - - - - Wireless - - - - - Icon - Ikon - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_it.ts b/plugin-networkmonitor/translations/networkmonitor_it.ts deleted file mode 100644 index b874ac4..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_it.ts +++ /dev/null @@ -1,99 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - Interfaccia di rete <b>%1</b> - - - - Transmitted %1 - Trasmesso %1 - - - - Received %1 - Ricevuto %1 - - - - B - B - - - - KiB - KiB - - - - MiB - MiB - - - - GiB - GiB - - - - TiB - TiB - - - - PiB - PiB - - - - LXQtNetworkMonitorConfiguration - - LXQt Network Monitor settings - Impostazioni del monitor di rete di LXQt - - - - Network Monitor settings - Impostazioni del monitor di rete - - - - General - Generale - - - - Interface - Interfaccia - - - - Modem - Modem - - - - Monitor - Monitor - - - - Network - Rete - - - - Wireless - Wireless - - - - Icon - Icona - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_ja.ts b/plugin-networkmonitor/translations/networkmonitor_ja.ts deleted file mode 100644 index d5ce285..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_ja.ts +++ /dev/null @@ -1,95 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - ネットワークインターフェース <b>%1</b> - - - - Transmitted %1 - 送信 %1 - - - - Received %1 - 受信 %1 - - - - B - B - - - - KiB - KiB - - - - MiB - MiB - - - - GiB - GiB - - - - TiB - TiB - - - - PiB - PiB - - - - LXQtNetworkMonitorConfiguration - - - Network Monitor settings - ネットワークモニターの設定 - - - - General - 一般 - - - - Interface - インターフェース - - - - Modem - モデム - - - - Monitor - モニター - - - - Network - ネットワーク - - - - Wireless - 無線 - - - - Icon - アイコン - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_nl.ts b/plugin-networkmonitor/translations/networkmonitor_nl.ts deleted file mode 100644 index 490827e..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_nl.ts +++ /dev/null @@ -1,99 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - Netwerkkaart <b>%1</b> - - - - Transmitted %1 - Verstuurd %1 - - - - Received %1 - Ontvangen %1 - - - - B - B - - - - KiB - KiB - - - - MiB - MiB - - - - GiB - GiB - - - - TiB - TiB - - - - PiB - PiB - - - - LXQtNetworkMonitorConfiguration - - LXQt Network Monitor settings - Instellingen voor Netwerkbewaker van LXQt - - - - Network Monitor settings - Netwerkmonitorinstellingen - - - - General - Algemeen - - - - Interface - Netwerkkaart - - - - Modem - Modem - - - - Monitor - Bewaker - - - - Network - Netwerk - - - - Wireless - Draadloos - - - - Icon - Pictogram - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_pl.ts b/plugin-networkmonitor/translations/networkmonitor_pl.ts deleted file mode 100644 index 4f815df..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_pl.ts +++ /dev/null @@ -1,99 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - Interfejs sieci <b>%1</b> - - - - Transmitted %1 - Przesłano %1 - - - - Received %1 - Otrzymano %1 - - - - B - B - - - - KiB - KiB - - - - MiB - MiB - - - - GiB - GiB - - - - TiB - TiB - - - - PiB - PiB - - - - LXQtNetworkMonitorConfiguration - - LXQt Network Monitor settings - Ustawienia LXQt Network Monitor - - - - Network Monitor settings - Ustawienia monitora sieci - - - - General - Ogólne - - - - Interface - Interfejs - - - - Modem - Modem - - - - Monitor - Monitor - - - - Network - Sieć - - - - Wireless - Bezprzewodowe - - - - Icon - Ikona - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_pt.ts b/plugin-networkmonitor/translations/networkmonitor_pt.ts deleted file mode 100644 index 971869c..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_pt.ts +++ /dev/null @@ -1,99 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - Interface de rede <b>%1</b> - - - - Transmitted %1 - Enviados %1 - - - - Received %1 - Recebidos %1 - - - - B - B - - - - KiB - KiB - - - - MiB - MiB - - - - GiB - GiB - - - - TiB - TiB - - - - PiB - PiB - - - - LXQtNetworkMonitorConfiguration - - LXQt Network Monitor settings - Definições do monitor de rede do LXQt - - - - Network Monitor settings - - - - - General - Geral - - - - Interface - Interface - - - - Modem - Modem - - - - Monitor - Monitorizar - - - - Network - Rede - - - - Wireless - Rede sem fios - - - - Icon - Ícone - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_pt_BR.ts b/plugin-networkmonitor/translations/networkmonitor_pt_BR.ts deleted file mode 100644 index 38c4c42..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_pt_BR.ts +++ /dev/null @@ -1,99 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - Interface de rede <b>%1</b> - - - - Transmitted %1 - Transmitido %1 - - - - Received %1 - Recebido %1 - - - - B - Byte - - - - KiB - KByte - - - - MiB - MByte - - - - GiB - GByte - - - - TiB - TByte - - - - PiB - PByte - - - - LXQtNetworkMonitorConfiguration - - LXQt Network Monitor settings - Configurações de Monitoramento de Rede - - - - Network Monitor settings - - - - - General - Geral - - - - Interface - Interface - - - - Modem - Modem - - - - Monitor - Monitoramento - - - - Network - Rede - - - - Wireless - Sem fio - - - - Icon - Ícone - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_ro_RO.ts b/plugin-networkmonitor/translations/networkmonitor_ro_RO.ts deleted file mode 100644 index a43987a..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_ro_RO.ts +++ /dev/null @@ -1,99 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - Interfață rețea <b>%1</b> - - - - Transmitted %1 - Transmis %1 - - - - Received %1 - Recepționat %1 - - - - B - B - - - - KiB - KiB - - - - MiB - MiB - - - - GiB - GiB - - - - TiB - TiB - - - - PiB - PiB - - - - LXQtNetworkMonitorConfiguration - - LXQt Network Monitor settings - Setări monitorizare rețea LXQt - - - - Network Monitor settings - Setări monitorizare rețea - - - - General - General - - - - Interface - Interfață - - - - Modem - Modem - - - - Monitor - Monitorizare - - - - Network - Rețea - - - - Wireless - Wireless - - - - Icon - Pictogramă - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_ru.ts b/plugin-networkmonitor/translations/networkmonitor_ru.ts deleted file mode 100644 index b5b8d46..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_ru.ts +++ /dev/null @@ -1,95 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - Сетевой интерфейс <b>%1</b> - - - - Transmitted %1 - Передано %1 - - - - Received %1 - Получено %1 - - - - B - Б - - - - KiB - Кб - - - - MiB - Мб - - - - GiB - Гб - - - - TiB - Тб - - - - PiB - Пб - - - - LXQtNetworkMonitorConfiguration - - - Network Monitor settings - Настройки сетевого монитора - - - - General - Общие - - - - Interface - Интерфейс - - - - Modem - Модем - - - - Monitor - Монитор - - - - Network - Сеть - - - - Wireless - Беспроводная сеть - - - - Icon - Значок - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_th_TH.ts b/plugin-networkmonitor/translations/networkmonitor_th_TH.ts deleted file mode 100644 index ebba4ae..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_th_TH.ts +++ /dev/null @@ -1,99 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - ส่วนติดต่อเครือข่าย <b>%1</b> - - - - Transmitted %1 - ส่ง %1 - - - - Received %1 - รับ %1 - - - - B - B - - - - KiB - KiB - - - - MiB - MiB - - - - GiB - GiB - - - - TiB - TiB - - - - PiB - PiB - - - - LXQtNetworkMonitorConfiguration - - LXQt Network Monitor settings - ค่าตั้งการเฝ้าสังเกตเครือข่าย LXQt - - - - Network Monitor settings - - - - - General - ทั่วไป - - - - Interface - ส่วนติดต่อ - - - - Modem - โมเด็ม - - - - Monitor - เฝ้าสังเกต - - - - Network - เครือข่าย - - - - Wireless - ไรัสาย - - - - Icon - ไอคอน - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_tr.ts b/plugin-networkmonitor/translations/networkmonitor_tr.ts deleted file mode 100644 index 6216cfb..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_tr.ts +++ /dev/null @@ -1,99 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - Ağ arayüzü <b>%1</b> - - - - Transmitted %1 - Gönderilen %1 - - - - Received %1 - Alınan %1 - - - - B - B - - - - KiB - KiB - - - - MiB - MiB - - - - GiB - GiB - - - - TiB - TiB - - - - PiB - PiB - - - - LXQtNetworkMonitorConfiguration - - LXQt Network Monitor settings - LXQt Ağ İzleme ayarları - - - - Network Monitor settings - Ağ İzleme Ayarları - - - - General - Genel - - - - Interface - Arayüz - - - - Modem - Modem - - - - Monitor - Ekran - - - - Network - Ağ - - - - Wireless - Kablosuz - - - - Icon - Simge - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_uk.ts b/plugin-networkmonitor/translations/networkmonitor_uk.ts deleted file mode 100644 index e0ecca6..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_uk.ts +++ /dev/null @@ -1,99 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - Мережевий адаптер <b>%1</b> - - - - Transmitted %1 - Передано %1 - - - - Received %1 - Прийнято %1 - - - - B - Б - - - - KiB - КіБ - - - - MiB - МіБ - - - - GiB - ГіБ - - - - TiB - ТіБ - - - - PiB - ПіБ - - - - LXQtNetworkMonitorConfiguration - - LXQt Network Monitor settings - Налаштування монітору мережі LXQt - - - - Network Monitor settings - - - - - General - Загальне - - - - Interface - Адаптер - - - - Modem - Модем - - - - Monitor - Монітор - - - - Network - Мережевий - - - - Wireless - Бездротовий - - - - Icon - Значок - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_zh_CN.ts b/plugin-networkmonitor/translations/networkmonitor_zh_CN.ts deleted file mode 100644 index 1728164..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_zh_CN.ts +++ /dev/null @@ -1,99 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - 网络接口 <b>%1</b> - - - - Transmitted %1 - 已传输 %1 - - - - Received %1 - 已接收 %1 - - - - B - B - - - - KiB - KiB - - - - MiB - MiB - - - - GiB - GiB - - - - TiB - TiB - - - - PiB - TiB - - - - LXQtNetworkMonitorConfiguration - - LXQt Network Monitor settings - LXQt 网络监测器设置 - - - - Network Monitor settings - - - - - General - 常规 - - - - Interface - 接口 - - - - Modem - 调制解调器 - - - - Monitor - 监测器 - - - - Network - 网络 - - - - Wireless - 无线 - - - - Icon - 图标 - - - diff --git a/plugin-networkmonitor/translations/networkmonitor_zh_TW.ts b/plugin-networkmonitor/translations/networkmonitor_zh_TW.ts deleted file mode 100644 index 3f1e6c6..0000000 --- a/plugin-networkmonitor/translations/networkmonitor_zh_TW.ts +++ /dev/null @@ -1,99 +0,0 @@ - - - - - LXQtNetworkMonitor - - - Network interface <b>%1</b> - 網路介面 <b>%1</b> - - - - Transmitted %1 - 傳送 %1 - - - - Received %1 - 接收 %1 - - - - B - B - - - - KiB - KB - - - - MiB - MB - - - - GiB - GB - - - - TiB - TB - - - - PiB - PB - - - - LXQtNetworkMonitorConfiguration - - LXQt Network Monitor settings - LXQt網路監視器設定 - - - - Network Monitor settings - - - - - General - 一般 - - - - Interface - 介面 - - - - Modem - 數據機 - - - - Monitor - 監視器 - - - - Network - 網路 - - - - Wireless - 無線 - - - - Icon - 圖示 - - - diff --git a/plugin-quicklaunch/lxqtquicklaunch.cpp b/plugin-quicklaunch/lxqtquicklaunch.cpp index 1fee3ff..6709b64 100644 --- a/plugin-quicklaunch/lxqtquicklaunch.cpp +++ b/plugin-quicklaunch/lxqtquicklaunch.cpp @@ -36,13 +36,13 @@ #include #include #include -#include #include #include -#include +#include #include #include #include +#include "../panel/pluginsettings.h" LXQtQuickLaunch::LXQtQuickLaunch(ILXQtPanelPlugin *plugin, QWidget* parent) : @@ -55,20 +55,16 @@ LXQtQuickLaunch::LXQtQuickLaunch(ILXQtPanelPlugin *plugin, QWidget* parent) : mLayout = new LXQt::GridLayout(this); setLayout(mLayout); - QSettings *settings = mPlugin->settings(); - int count = settings->beginReadArray("apps"); - QString desktop; QString file; QString execname; QString exec; QString icon; - for (int i = 0; i < count; ++i) + for (const QMap &app : mPlugin->settings()->readArray("apps")) { - settings->setArrayIndex(i); - desktop = settings->value("desktop", "").toString(); - file = settings->value("file", "").toString(); - if (! desktop.isEmpty()) + desktop = app.value("desktop", "").toString(); + file = app.value("file", "").toString(); + if (!desktop.isEmpty()) { XdgDesktopFile xdg; if (!xdg.load(desktop)) @@ -90,9 +86,9 @@ LXQtQuickLaunch::LXQtQuickLaunch(ILXQtPanelPlugin *plugin, QWidget* parent) : } else { - execname = settings->value("name", "").toString(); - exec = settings->value("exec", "").toString(); - icon = settings->value("icon", "").toString(); + execname = app.value("name", "").toString(); + exec = app.value("exec", "").toString(); + icon = app.value("icon", "").toString(); if (icon.isNull()) { qDebug() << "Icon" << icon << "is not valid (isNull). Skipped."; @@ -102,8 +98,6 @@ LXQtQuickLaunch::LXQtQuickLaunch(ILXQtPanelPlugin *plugin, QWidget* parent) : } } // for - settings->endArray(); - if (mLayout->isEmpty()) showPlaceHolder(); @@ -158,7 +152,7 @@ void LXQtQuickLaunch::realign() void LXQtQuickLaunch::addButton(QuickLaunchAction* action) { mLayout->setEnabled(false); - QuickLaunchButton* btn = new QuickLaunchButton(action, this); + QuickLaunchButton* btn = new QuickLaunchButton(action, mPlugin, this); mLayout->addWidget(btn); connect(btn, SIGNAL(switchButtons(QuickLaunchButton*,QuickLaunchButton*)), this, SLOT(switchButtons(QuickLaunchButton*,QuickLaunchButton*))); @@ -194,7 +188,7 @@ void LXQtQuickLaunch::dropEvent(QDropEvent *e) { const QMimeData *mime = e->mimeData(); - foreach (QUrl url, mime->urls().toSet()) + foreach (const QUrl &url, mime->urls().toSet()) { QString fileName(url.isLocalFile() ? url.toLocalFile() : url.url()); QFileInfo fi(fileName); @@ -290,30 +284,29 @@ void LXQtQuickLaunch::buttonMoveRight() void LXQtQuickLaunch::saveSettings() { - QSettings *settings = mPlugin->settings(); + PluginSettings *settings = mPlugin->settings(); settings->remove("apps"); - settings->beginWriteArray("apps"); - int i = 0; - for(int j=0; jcount(); ++j) + QList > hashList; + int size = mLayout->count(); + for (int j = 0; j < size; ++j) { QuickLaunchButton *b = qobject_cast(mLayout->itemAt(j)->widget()); - if(!b) + if (!b) continue; - settings->setArrayIndex(i); - - QHashIterator it(b->settingsMap()); + // convert QHash to QMap + QMap map; + QHashIterator it(b->settingsMap()); while (it.hasNext()) { it.next(); - settings->setValue(it.key(), it.value()); + map[it.key()] = it.value(); } - - ++i; + hashList << map; } - settings->endArray(); + settings->setArray("apps", hashList); } diff --git a/plugin-quicklaunch/quicklaunchbutton.cpp b/plugin-quicklaunch/quicklaunchbutton.cpp index 2ad733f..d002e68 100644 --- a/plugin-quicklaunch/quicklaunchbutton.cpp +++ b/plugin-quicklaunch/quicklaunchbutton.cpp @@ -27,6 +27,7 @@ #include "quicklaunchbutton.h" #include "lxqtquicklaunch.h" +#include "../panel/ilxqtpanelplugin.h" #include #include #include @@ -39,12 +40,14 @@ #define MIMETYPE "x-lxqt/quicklaunch-button" -QuickLaunchButton::QuickLaunchButton(QuickLaunchAction * act, QWidget * parent) +QuickLaunchButton::QuickLaunchButton(QuickLaunchAction * act, ILXQtPanelPlugin * plugin, QWidget * parent) : QToolButton(parent), - mAct(act) + mAct(act), + mPlugin(plugin) { setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); setAcceptDrops(true); + setAutoRaise(true); setDefaultAction(mAct); mAct->setParent(this); @@ -93,7 +96,8 @@ void QuickLaunchButton::this_customContextMenuRequested(const QPoint & pos) mMoveLeftAct->setEnabled( panel && panel->indexOfButton(this) > 0); mMoveRightAct->setEnabled(panel && panel->indexOfButton(this) < panel->countOfButtons() - 1); - mMenu->popup(mapToGlobal(pos)); + mPlugin->willShowWindow(mMenu); + mMenu->popup(mPlugin->calculatePopupWindowPos(mMenu->sizeHint()).topLeft()); } diff --git a/plugin-quicklaunch/quicklaunchbutton.h b/plugin-quicklaunch/quicklaunchbutton.h index cedaf4c..5d79133 100644 --- a/plugin-quicklaunch/quicklaunchbutton.h +++ b/plugin-quicklaunch/quicklaunchbutton.h @@ -34,13 +34,14 @@ #include #include +class ILXQtPanelPlugin; class QuickLaunchButton : public QToolButton { Q_OBJECT public: - QuickLaunchButton(QuickLaunchAction * act, QWidget* parent = 0); + QuickLaunchButton(QuickLaunchAction * act, ILXQtPanelPlugin * plugin, QWidget* parent = 0); ~QuickLaunchButton(); QHash settingsMap(); @@ -61,6 +62,7 @@ protected: private: QuickLaunchAction *mAct; + ILXQtPanelPlugin * mPlugin; QAction *mDeleteAct; QAction *mMoveLeftAct; QAction *mMoveRightAct; diff --git a/plugin-quicklaunch/translations/quicklaunch.ts b/plugin-quicklaunch/translations/quicklaunch.ts deleted file mode 100644 index 3aa042c..0000000 --- a/plugin-quicklaunch/translations/quicklaunch.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - - - - - Move right - - - - - Remove from quicklaunch - - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_ar.desktop b/plugin-quicklaunch/translations/quicklaunch_ar.desktop index ea355cb..cf870b1 100644 --- a/plugin-quicklaunch/translations/quicklaunch_ar.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_ar.desktop @@ -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[ar]=إطلاق تطبيقاتك المفضَّلة -Name[ar]=البدء السريع +Comment[ar]=نفاذ مباشر لتطبيقاتك المفضّلة. +Name[ar]=إطلاق سريع diff --git a/plugin-quicklaunch/translations/quicklaunch_ar.ts b/plugin-quicklaunch/translations/quicklaunch_ar.ts deleted file mode 100644 index d8f6a6d..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_ar.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - خطاٌ في النَّقل - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - ﻻ يمكن تضمين الملف أو الرَّابط %1 في لوحة البدء السَّريع حاليَّاً - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - إلى اليسار - - - - Move right - إلى اليمين - - - - Remove from quicklaunch - إزالة من لوحة البدء السَّريع - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_cs.ts b/plugin-quicklaunch/translations/quicklaunch_cs.ts deleted file mode 100644 index 2e01986..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_cs.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - Problém s upuštěním - - - - 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 - - - - - QuickLaunchButton - - - Move left - Přesunout vlevo - - - - Move right - Přesunout vpravo - - - - Remove from quicklaunch - Odstranit z rychlého spuštění - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_cs_CZ.ts b/plugin-quicklaunch/translations/quicklaunch_cs_CZ.ts deleted file mode 100644 index 7a9f695..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_cs_CZ.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - Problém s upuštěním - - - - 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 - - - - - QuickLaunchButton - - - Move left - Přesunout vlevo - - - - Move right - Přesunout vpravo - - - - Remove from quicklaunch - Odstranit z rychlého spuštění - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_da.ts b/plugin-quicklaunch/translations/quicklaunch_da.ts deleted file mode 100644 index e33cc5d..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_da.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - Slipfejl - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - Fil/URL '%1' kan ikke indlejres i HurtigStart lige nu - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - Flyt mod venstre - - - - Move right - Flyt mod højre - - - - Remove from quicklaunch - Fjern fra Hurtigstart - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_da_DK.ts b/plugin-quicklaunch/translations/quicklaunch_da_DK.ts deleted file mode 100644 index 3d969d0..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_da_DK.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - Træk og slip fejl - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - Fil/URL '%1' kan ikke blive indlejret i QuickLaunch lige nu - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - Flyt mod venstre - - - - Move right - Flyt mod højre - - - - Remove from quicklaunch - Fjern fra quicklaunch - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_de.ts b/plugin-quicklaunch/translations/quicklaunch_de.ts deleted file mode 100644 index d979ee5..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_de.ts +++ /dev/null @@ -1,42 +0,0 @@ - - - - - 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 - Anwendung/Symbol -hier fallen lassen - - - - QuickLaunchButton - - - Move left - Nach links verschieben - - - - Move right - Nach rechts verschieben - - - - Remove from quicklaunch - Aus der Schnellstartleiste entfernen - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_el.ts b/plugin-quicklaunch/translations/quicklaunch_el.ts deleted file mode 100644 index 4705411..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_el.ts +++ /dev/null @@ -1,42 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - Σφάλμα εναπόθεσης - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - Το αρχείο/η διεύθυνση "%1" δεν μπορεί να ενσωματωθεί για την ώρα στη γρήγορη εκκίνηση - - - - Drop application -icons here - Εναποθέστε εδώ -εικονίδια εφαρμογών - - - - QuickLaunchButton - - - Move left - Μετακίνηση αριστερά - - - - Move right - Μετακίνηση δεξιά - - - - Remove from quicklaunch - Αφαίρεση από τη γρήγορη εκκίνηση - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_eo.ts b/plugin-quicklaunch/translations/quicklaunch_eo.ts deleted file mode 100644 index 1ba64ed..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_eo.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - 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 - - - - - QuickLaunchButton - - - Move left - Movi maldekstren - - - - Move right - Movi dekstren - - - - Remove from quicklaunch - Forigi el rapidlanĉilo - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_es.ts b/plugin-quicklaunch/translations/quicklaunch_es.ts deleted file mode 100644 index 3310bd5..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_es.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - Error al soltar - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - El archivo/URL '%1' por el momento no puede incrustarse en QuickLaunch - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - Mover a la izquierda - - - - Move right - Mover a la derecha - - - - Remove from quicklaunch - Quitar de quicklaunch - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_es_VE.ts b/plugin-quicklaunch/translations/quicklaunch_es_VE.ts deleted file mode 100644 index f48fce4..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_es_VE.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - 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 - - - - - QuickLaunchButton - - - Move left - Mover a la izquierda - - - - Move right - Mover a la derecha - - - - Remove from quicklaunch - Remover de la barra de lanzadores - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_eu.ts b/plugin-quicklaunch/translations/quicklaunch_eu.ts deleted file mode 100644 index 830c0c3..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_eu.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - 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 - - - - - QuickLaunchButton - - - Move left - Mugitu ezkerrera - - - - Move right - Mugitu eskuinera - - - - Remove from quicklaunch - Kendu abio azkarretik - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_fi.ts b/plugin-quicklaunch/translations/quicklaunch_fi.ts deleted file mode 100644 index 6198dcf..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_fi.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - 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 - - - - - QuickLaunchButton - - - Move left - Siirrä vasemmalle - - - - Move right - Siirrä oikealle - - - - Remove from quicklaunch - Poista pikakäynnistyksestä - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_fr_FR.ts b/plugin-quicklaunch/translations/quicklaunch_fr_FR.ts deleted file mode 100644 index d63862d..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_fr_FR.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - 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 - - - - - QuickLaunchButton - - - Move left - Déplacer vers la gauche - - - - Move right - Déplacer vers la droite - - - - Remove from quicklaunch - Enlever du lancement rapide - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_hu.ts b/plugin-quicklaunch/translations/quicklaunch_hu.ts deleted file mode 100644 index 5b7aaed..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_hu.ts +++ /dev/null @@ -1,42 +0,0 @@ - - - - - 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 - - - - QuickLaunchButton - - - Move left - Balra - - - - Move right - Jobbra - - - - Remove from quicklaunch - Eltávolítás a gyorsindítóról - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_hu_HU.ts b/plugin-quicklaunch/translations/quicklaunch_hu_HU.ts deleted file mode 100644 index 812f28b..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_hu_HU.ts +++ /dev/null @@ -1,42 +0,0 @@ - - - - - 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 - - - - QuickLaunchButton - - - Move left - Balra - - - - Move right - Jobbra - - - - Remove from quicklaunch - Eltávolítás a gyorsindítóról - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_ia.ts b/plugin-quicklaunch/translations/quicklaunch_ia.ts deleted file mode 100644 index 68015f5..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_ia.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - - - - - Move right - - - - - Remove from quicklaunch - - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_id_ID.ts b/plugin-quicklaunch/translations/quicklaunch_id_ID.ts deleted file mode 100644 index 6f270ef..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_id_ID.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - - - - - Move right - - - - - Remove from quicklaunch - - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_it.ts b/plugin-quicklaunch/translations/quicklaunch_it.ts deleted file mode 100644 index d404054..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_it.ts +++ /dev/null @@ -1,42 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - Errore di trascinamento - - - - 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 - Trascina applicazioni -dal menù qui - - - - QuickLaunchButton - - - Move left - Sposta a sinistra - - - - Move right - Sposta a destra - - - - Remove from quicklaunch - Rimuovi da Avvio rapido - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_ja.ts b/plugin-quicklaunch/translations/quicklaunch_ja.ts deleted file mode 100644 index d5b2b25..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_ja.ts +++ /dev/null @@ -1,42 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - ドロップエラー - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - ファイル/URL '%1' は現在、クイック起動に埋め込むことができません - - - - Drop application -icons here - アプリケーションアイコンを -ここへドロップ - - - - QuickLaunchButton - - - Move left - 左に移動 - - - - Move right - 右に移動 - - - - Remove from quicklaunch - クイック起動から削除 - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_ko.ts b/plugin-quicklaunch/translations/quicklaunch_ko.ts deleted file mode 100644 index 34b0ffa..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_ko.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - - - - - Move right - - - - - Remove from quicklaunch - - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_lt.ts b/plugin-quicklaunch/translations/quicklaunch_lt.ts deleted file mode 100644 index f0037f3..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_lt.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - Tempimo klaida - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - Failo/URL „%1“ šiuo metu negalima patalpinti greitajame paleidime - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - Perkelti į kairę - - - - Move right - Perkelti į dešinę - - - - Remove from quicklaunch - Pašalinti - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_nl.ts b/plugin-quicklaunch/translations/quicklaunch_nl.ts deleted file mode 100644 index f7894a0..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_nl.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - Neerzetfout - - - - 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 - - - - - QuickLaunchButton - - - Move left - Verplaats naar links - - - - Move right - Verplaats naar rechts - - - - Remove from quicklaunch - Verwijder uit snelstartbalk - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_pl.ts b/plugin-quicklaunch/translations/quicklaunch_pl.ts deleted file mode 100644 index 6ce9e6f..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_pl.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - Przesuń w lewo - - - - Move right - Przesuń w prawo - - - - Remove from quicklaunch - Usuń z szybkiego uruchamiania - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_pl_PL.ts b/plugin-quicklaunch/translations/quicklaunch_pl_PL.ts deleted file mode 100644 index 1c7b9c7..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_pl_PL.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - Problem dodawania - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - Plik/URL '%1' nie może zostać umiesczony na pasku szybkiego uruchamiania - - - - Drop application -icons here - Upuść ikonę aplikacji tutaj - - - - QuickLaunchButton - - - Move left - Przesuń w lewo - - - - Move right - Przesuń w prawo - - - - Remove from quicklaunch - Usuń z paska szybkiego uruchamiania - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_pt.ts b/plugin-quicklaunch/translations/quicklaunch_pt.ts deleted file mode 100644 index fb6acb6..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_pt.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - Erro ao largar - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - Neste momento, não pode incluir o ficheiro/url '%1' no inicio rápido. - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - Mover para a esquerda - - - - Move right - Mover para a direita - - - - Remove from quicklaunch - Remover do inicio rápido - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_pt_BR.ts b/plugin-quicklaunch/translations/quicklaunch_pt_BR.ts deleted file mode 100644 index 8451a4f..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_pt_BR.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - Erro de queda - - - - 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 - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - Mover para a esquerda - - - - Move right - Mover para a direita - - - - Remove from quicklaunch - Remover do lançador rápido - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_ro_RO.ts b/plugin-quicklaunch/translations/quicklaunch_ro_RO.ts deleted file mode 100644 index d3d958f..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_ro_RO.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - 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 - - - - - QuickLaunchButton - - - Move left - Mută spre stânga - - - - Move right - Mută spre dreapta - - - - Remove from quicklaunch - Îndepărtează din lista pentru lansare rapidă - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_ru.ts b/plugin-quicklaunch/translations/quicklaunch_ru.ts deleted file mode 100644 index d07de7d..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_ru.ts +++ /dev/null @@ -1,42 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - Ошибка бросания - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - Файл/URL-адрес '%1' не может быть встроен в быстрый запуск сейчас - - - - Drop application -icons here - Бросьте значки -приложений сюда - - - - QuickLaunchButton - - - Move left - Сдвинуть влево - - - - Move right - Сдвинуть вправо - - - - Remove from quicklaunch - Удалить из быстрого запуска - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_ru_RU.desktop b/plugin-quicklaunch/translations/quicklaunch_ru_RU.desktop deleted file mode 100644 index 7aa4061..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_ru_RU.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Quick launch -Comment=Easy access to your favourite applications. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ru_RU]=Простой доступ к вашим любимым приложениям. -Name[ru_RU]=Быстрый запуск \ No newline at end of file diff --git a/plugin-quicklaunch/translations/quicklaunch_ru_RU.ts b/plugin-quicklaunch/translations/quicklaunch_ru_RU.ts deleted file mode 100644 index caeae91..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_ru_RU.ts +++ /dev/null @@ -1,42 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - Ошибка бросания - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - Файл/URL-адрес '%1' не может быть встроен в быстрый запуск сейчас - - - - Drop application -icons here - Бросьте значки -приложений сюда - - - - QuickLaunchButton - - - Move left - Сдвинуть влево - - - - Move right - Сдвинуть вправо - - - - Remove from quicklaunch - Удалить из быстрого запуска - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_sk_SK.ts b/plugin-quicklaunch/translations/quicklaunch_sk_SK.ts deleted file mode 100644 index 5a56e5c..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_sk_SK.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - CHyba pri pustení - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - Súbor/URL „%1“ nateraz nemožno vložiť do rýchleho spustenia - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - Presunúť vľavo - - - - Move right - Presunúť vpravo - - - - Remove from quicklaunch - Odstrániť z rýchleho spustenia - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_sl.ts b/plugin-quicklaunch/translations/quicklaunch_sl.ts deleted file mode 100644 index 31c53b1..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_sl.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - Napaka spusta - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - Datoteke/lokacije »%1« trenutno ni bilo moč vstaviti v Hitri zagon - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - Premakni levo - - - - Move right - Premakni desno - - - - Remove from quicklaunch - Odstrani iz hitrega zagona - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_sr@latin.ts b/plugin-quicklaunch/translations/quicklaunch_sr@latin.ts deleted file mode 100644 index 877ea7a..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_sr@latin.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - - - - - Move right - - - - - Remove from quicklaunch - - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_sr_BA.ts b/plugin-quicklaunch/translations/quicklaunch_sr_BA.ts deleted file mode 100644 index d76e457..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_sr_BA.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - Грешка испуштања - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - Фајл/УРЛ „%1“ не може бити уграђен у Брзо Покретање за сада - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - Помјери лијево - - - - Move right - Помјери десно - - - - Remove from quicklaunch - Уклони са брзог покретања - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_sr_RS.ts b/plugin-quicklaunch/translations/quicklaunch_sr_RS.ts deleted file mode 100644 index d3c31f0..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_sr_RS.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - Грешка испуштања - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - Фајл/УРЛ „%1“ не може бити уграђен у Брзо Покретање за сада - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - Помери лево - - - - Move right - Помери десно - - - - Remove from quicklaunch - Уклони са брзог покретања - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_th_TH.ts b/plugin-quicklaunch/translations/quicklaunch_th_TH.ts deleted file mode 100644 index 91f13bb..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_th_TH.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - การหย่อนขัดข้อง - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - แฟ้ม/URL '%1' ไม่สามารถฝังตัวไปยังตัวเรียกโปรแกรมด่วนได้ในตอนนี้ - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - ย้ายไปทางซ้าย - - - - Move right - ย้ายไปทางขวา - - - - Remove from quicklaunch - ลบออกจากตัวเรียกโปรแกรมด่วน - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_tr.ts b/plugin-quicklaunch/translations/quicklaunch_tr.ts deleted file mode 100644 index da0e97a..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_tr.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - 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 - - - - - QuickLaunchButton - - - Move left - Sola kaydır - - - - Move right - Sağa kaydır - - - - Remove from quicklaunch - Hızlı başlatıcıdan kaldır - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_uk.ts b/plugin-quicklaunch/translations/quicklaunch_uk.ts deleted file mode 100644 index 6bfc5e0..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_uk.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - Збій при розміщенні - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - Не вдається додати "%1" до швидкого запуску - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - Посунути ліворуч - - - - Move right - Посунути враворуч - - - - Remove from quicklaunch - Вилучити зі швидкого запуску - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_zh_CN.ts b/plugin-quicklaunch/translations/quicklaunch_zh_CN.ts deleted file mode 100644 index 6540f9e..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_zh_CN.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - 出现错误 - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - 文件/URL '%1' 暂时无法被嵌入到快速启动 - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - 左移 - - - - Move right - 右移 - - - - Remove from quicklaunch - 从快速启动删除 - - - diff --git a/plugin-quicklaunch/translations/quicklaunch_zh_TW.ts b/plugin-quicklaunch/translations/quicklaunch_zh_TW.ts deleted file mode 100644 index 415bb8b..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_zh_TW.ts +++ /dev/null @@ -1,41 +0,0 @@ - - - - - LXQtQuickLaunch - - - Drop Error - 移入錯誤 - - - - File/URL '%1' cannot be embedded into QuickLaunch for now - 檔案位址'%1'現在無法嵌入至快速啟動 - - - - Drop application -icons here - - - - - QuickLaunchButton - - - Move left - 往左移 - - - - Move right - 往右移 - - - - Remove from quicklaunch - 從快速啟動中移除 - - - diff --git a/plugin-screensaver/CMakeLists.txt b/plugin-screensaver/CMakeLists.txt deleted file mode 100644 index e687a5d..0000000 --- a/plugin-screensaver/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -set(PLUGIN "screensaver") - -set(HEADERS - panelscreensaver.h -) - -set(SOURCES - panelscreensaver.cpp -) - -set(LIBRARIES - ${LIBRARIES} - lxqt-globalkeys -) - -BUILD_LXQT_PLUGIN(${PLUGIN}) diff --git a/plugin-screensaver/panelscreensaver.cpp b/plugin-screensaver/panelscreensaver.cpp deleted file mode 100644 index 3de2a3c..0000000 --- a/plugin-screensaver/panelscreensaver.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright: 2010-2011 Razor team - * Authors: - * Petr Vanek - * - * 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 -#include - -#include "panelscreensaver.h" - -#define DEFAULT_SHORTCUT "Control+Alt+L" - - -PanelScreenSaver::PanelScreenSaver(const ILXQtPanelPluginStartupInfo &startupInfo) : - QObject(), - ILXQtPanelPlugin(startupInfo) -{ - mSaver = new LXQt::ScreenSaver(this); - - QList actions = mSaver->availableActions(); - if (!actions.empty()) - mButton.setDefaultAction(actions.first()); - //mButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - - - mShortcutKey = GlobalKeyShortcut::Client::instance()->addAction(QString(), QString("/panel/%1/lock").arg(settings()->group()), tr("Lock Screen"), this); - if (mShortcutKey) - { - connect(mShortcutKey, &GlobalKeyShortcut::Action::registrationFinished, this, &PanelScreenSaver::shortcutRegistered); - connect(mShortcutKey, SIGNAL(activated()), mSaver, SLOT(lockScreen())); - } -} - -void PanelScreenSaver::shortcutRegistered() -{ - if (mShortcutKey->shortcut().isEmpty()) - { - mShortcutKey->changeShortcut(DEFAULT_SHORTCUT); - if (mShortcutKey->shortcut().isEmpty()) - { - LXQt::Notification::notify(tr("Panel Screensaver: Global shortcut '%1' cannot be registered").arg(DEFAULT_SHORTCUT)); - } - } -} - -#undef DEFAULT_SHORTCUT diff --git a/plugin-screensaver/panelscreensaver.h b/plugin-screensaver/panelscreensaver.h deleted file mode 100644 index 0f16f85..0000000 --- a/plugin-screensaver/panelscreensaver.h +++ /dev/null @@ -1,75 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright: 2010-2011 Razor team - * Authors: - * Petr Vanek - * - * 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 PANELSCREENSAVER_H -#define PANELSCREENSAVER_H - -#include "../panel/ilxqtpanelplugin.h" -#include - -namespace LXQt { -class ScreenSaver; -} -namespace GlobalKeyShortcut -{ -class Action; -} - -class PanelScreenSaver : public QObject, public ILXQtPanelPlugin -{ - Q_OBJECT - -public: - PanelScreenSaver(const ILXQtPanelPluginStartupInfo &startupInfo); - - virtual QWidget *widget() { return &mButton; } - virtual QString themeId() const { return "PanelScreenSaver"; } - -private slots: - void shortcutRegistered(); - -private: - QToolButton mButton; - LXQt::ScreenSaver * mSaver; - GlobalKeyShortcut::Action * mShortcutKey; -}; - -class PanelScreenSaverLibrary: public QObject, public ILXQtPanelPluginLibrary -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILXQtPanelPluginLibrary) -public: - ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const - { - return new PanelScreenSaver(startupInfo); - } -}; - -#endif - diff --git a/plugin-screensaver/resources/screensaver.desktop.in b/plugin-screensaver/resources/screensaver.desktop.in deleted file mode 100644 index 74b0ccb..0000000 --- a/plugin-screensaver/resources/screensaver.desktop.in +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen -Icon=system-lock-screen - -#TRANSLATIONS_DIR=../translations diff --git a/plugin-screensaver/translations/screensaver.ts b/plugin-screensaver/translations/screensaver.ts deleted file mode 100644 index a7e5827..0000000 --- a/plugin-screensaver/translations/screensaver.ts +++ /dev/null @@ -1,17 +0,0 @@ - - - - - PanelScreenSaver - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_ar.desktop b/plugin-screensaver/translations/screensaver_ar.desktop deleted file mode 100644 index d2475f2..0000000 --- a/plugin-screensaver/translations/screensaver_ar.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ar]=تفعيل حافظ الشَّاشة و/أو قفل الشَّاشة -Name[ar]=حافظ الشَّاشة diff --git a/plugin-screensaver/translations/screensaver_ar.ts b/plugin-screensaver/translations/screensaver_ar.ts deleted file mode 100644 index 2669739..0000000 --- a/plugin-screensaver/translations/screensaver_ar.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - ﻻ يمكن تسجيل الاختصار الشَّامل %1 لحافظ الشَّاشة! - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_cs.desktop b/plugin-screensaver/translations/screensaver_cs.desktop deleted file mode 100644 index 96e2d96..0000000 --- a/plugin-screensaver/translations/screensaver_cs.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[cs]=Zapne šetřič obrazovky a/nebo zamkne obrazovku -Name[cs]=Šetřič obrazovky diff --git a/plugin-screensaver/translations/screensaver_cs.ts b/plugin-screensaver/translations/screensaver_cs.ts deleted file mode 100644 index b2dac8e..0000000 --- a/plugin-screensaver/translations/screensaver_cs.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Klávesovou zkratku pro modul Šetřič obrazovky '%1' nelze zapsat - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_cs_CZ.desktop b/plugin-screensaver/translations/screensaver_cs_CZ.desktop deleted file mode 100644 index 5203999..0000000 --- a/plugin-screensaver/translations/screensaver_cs_CZ.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[cs_CZ]=Zapnout šetřič obrazovky a/nebo zamknout obrazovku -Name[cs_CZ]=Šetřič obrazovky diff --git a/plugin-screensaver/translations/screensaver_cs_CZ.ts b/plugin-screensaver/translations/screensaver_cs_CZ.ts deleted file mode 100644 index 434b079..0000000 --- a/plugin-screensaver/translations/screensaver_cs_CZ.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Klávesovou zkratku pro modul "Šetřič obrazovky" '%1' nelze zapsat - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_da.desktop b/plugin-screensaver/translations/screensaver_da.desktop deleted file mode 100644 index 0c9c3af..0000000 --- a/plugin-screensaver/translations/screensaver_da.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[da]=Aktiverer en pauseskærm og/eller låser skærmen -Name[da]=Pauseskærm diff --git a/plugin-screensaver/translations/screensaver_da.ts b/plugin-screensaver/translations/screensaver_da.ts deleted file mode 100644 index ec68690..0000000 --- a/plugin-screensaver/translations/screensaver_da.ts +++ /dev/null @@ -1,25 +0,0 @@ - - - - - PanelScreenSaver - - Global keyboard shortcut - Globale tastaturgenveje - - - Panel Screensaver Global shortcut: '%1' cannot be registered - Global genvej for skærmskåner : '%1' kan ikke registreres - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_da_DK.desktop b/plugin-screensaver/translations/screensaver_da_DK.desktop deleted file mode 100644 index 0923df2..0000000 --- a/plugin-screensaver/translations/screensaver_da_DK.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[da_DK]=Aktiverer pauseskærm og/eller låser skærmen -Name[da_DK]=Pauseskærm diff --git a/plugin-screensaver/translations/screensaver_da_DK.ts b/plugin-screensaver/translations/screensaver_da_DK.ts deleted file mode 100644 index 4259c72..0000000 --- a/plugin-screensaver/translations/screensaver_da_DK.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Panel Pauseskærm Global genvej: '%1' kan ikke registreres - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_de.desktop b/plugin-screensaver/translations/screensaver_de.desktop deleted file mode 100644 index 72bad46..0000000 --- a/plugin-screensaver/translations/screensaver_de.desktop +++ /dev/null @@ -1,2 +0,0 @@ -Name[de]=Bildschirmschoner -Comment[de]=Bildschirmschoner aktivieren und/oder Bildschirm sperren diff --git a/plugin-screensaver/translations/screensaver_de.ts b/plugin-screensaver/translations/screensaver_de.ts deleted file mode 100644 index 0638eda..0000000 --- a/plugin-screensaver/translations/screensaver_de.ts +++ /dev/null @@ -1,17 +0,0 @@ - - - - - PanelScreenSaver - - - Lock Screen - Bildschirm sperren - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - Für den Bildschirmschoner kann das globale Tastenkürzel '%1' nicht registriert werden - - - diff --git a/plugin-screensaver/translations/screensaver_el.desktop b/plugin-screensaver/translations/screensaver_el.desktop deleted file mode 100644 index 2def9d1..0000000 --- a/plugin-screensaver/translations/screensaver_el.desktop +++ /dev/null @@ -1,2 +0,0 @@ -Name[el]=Προφύλαξη οθόνης -Comment[el]=Ενεργοποίηση της προφύλαξης οθόνης και/ή κλείδωμα της οθόνης diff --git a/plugin-screensaver/translations/screensaver_el.ts b/plugin-screensaver/translations/screensaver_el.ts deleted file mode 100644 index 9869378..0000000 --- a/plugin-screensaver/translations/screensaver_el.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Καθολική συντόμευση προφύλαξης οθόνης πίνακα: Η '%1' δεν μπορεί να εγγραφεί - - - - Lock Screen - Κλείδωμα της οθόνης - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - Πίνακας προφύλαξης οθόνης: Η καθολική συντόμευση '%1' δεν μπορεί να καταχωρηθεί - - - diff --git a/plugin-screensaver/translations/screensaver_eo.desktop b/plugin-screensaver/translations/screensaver_eo.desktop deleted file mode 100644 index 7a7b80b..0000000 --- a/plugin-screensaver/translations/screensaver_eo.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[eo]=Enŝalti ekrankurtenon kaj/aŭ ŝlosi la ekranon -Name[eo]=Ekrankurteno diff --git a/plugin-screensaver/translations/screensaver_eo.ts b/plugin-screensaver/translations/screensaver_eo.ts deleted file mode 100644 index 0488b02..0000000 --- a/plugin-screensaver/translations/screensaver_eo.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Ĉiea klavkombino por ekrankurteno de panelo: '%1' ne registreblas - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_es.desktop b/plugin-screensaver/translations/screensaver_es.desktop deleted file mode 100644 index fa38da6..0000000 --- a/plugin-screensaver/translations/screensaver_es.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[es]=Activa el salvapantallas y/o bloquea la pantalla -Name[es]=Salvapantallas diff --git a/plugin-screensaver/translations/screensaver_es.ts b/plugin-screensaver/translations/screensaver_es.ts deleted file mode 100644 index 35bdb70..0000000 --- a/plugin-screensaver/translations/screensaver_es.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Atajo global del panel del protector de pantalla: imposible registrar '%1' - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_es_VE.desktop b/plugin-screensaver/translations/screensaver_es_VE.desktop deleted file mode 100644 index f611590..0000000 --- a/plugin-screensaver/translations/screensaver_es_VE.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[es_VE]=Activar el salvapantallas y/o bloquear la pantalla -Name[es_VE]=SalvaPantallas diff --git a/plugin-screensaver/translations/screensaver_es_VE.ts b/plugin-screensaver/translations/screensaver_es_VE.ts deleted file mode 100644 index 5218d96..0000000 --- a/plugin-screensaver/translations/screensaver_es_VE.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - El acceso de tecla global '%1' del salva pantallas del panel no pudo registrarse - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_eu.desktop b/plugin-screensaver/translations/screensaver_eu.desktop deleted file mode 100644 index 1631423..0000000 --- a/plugin-screensaver/translations/screensaver_eu.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[eu]=Aktibatu pantaila-babeslea eta/edo blokeatu pantaila -Name[eu]=Pantaila-babeslea diff --git a/plugin-screensaver/translations/screensaver_eu.ts b/plugin-screensaver/translations/screensaver_eu.ts deleted file mode 100644 index 699a6e3..0000000 --- a/plugin-screensaver/translations/screensaver_eu.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Pantaila-babesle panelaren lasterbide globala: ezin da '%1' erregistratu - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_fi.desktop b/plugin-screensaver/translations/screensaver_fi.desktop deleted file mode 100644 index 75753f7..0000000 --- a/plugin-screensaver/translations/screensaver_fi.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[fi]=Aktivoi näytönsäästäjä ja/tai lukitse näyttö -Name[fi]=Näytönsäästäjä diff --git a/plugin-screensaver/translations/screensaver_fi.ts b/plugin-screensaver/translations/screensaver_fi.ts deleted file mode 100644 index 7306c38..0000000 --- a/plugin-screensaver/translations/screensaver_fi.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Paneelin näytönsäästäjän pikanäppäintä '%1' ei voi rekisteröidä - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_fr_FR.desktop b/plugin-screensaver/translations/screensaver_fr_FR.desktop deleted file mode 100644 index eba4720..0000000 --- a/plugin-screensaver/translations/screensaver_fr_FR.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[fr_FR]=Activer un économiseur d'écran et/ou verrouiller l'écran -Name[fr_FR]=Économiseur d'écran diff --git a/plugin-screensaver/translations/screensaver_fr_FR.ts b/plugin-screensaver/translations/screensaver_fr_FR.ts deleted file mode 100644 index 0b0e649..0000000 --- a/plugin-screensaver/translations/screensaver_fr_FR.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Le raccourci clavier global de l'écran de veille : '%1' n'a pas pu être enregistré - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_hu.desktop b/plugin-screensaver/translations/screensaver_hu.desktop deleted file mode 100644 index d95f2d7..0000000 --- a/plugin-screensaver/translations/screensaver_hu.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[hu]=A képernyővédő aktiválása és/vagy a képernyő zárolása -Name[hu]=Képernyővédő diff --git a/plugin-screensaver/translations/screensaver_hu.ts b/plugin-screensaver/translations/screensaver_hu.ts deleted file mode 100644 index 2f9a870..0000000 --- a/plugin-screensaver/translations/screensaver_hu.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - A(z) „%1” gyorsbillentyű a panel képernyővédőjének megjelenítéséhez nem regisztrálható - - - - Lock Screen - Képernyőzár - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - A(z) „%1” gyorsbillentyű a panel képernyővédőjének megjelenítéséhez nem regisztrálható - - - diff --git a/plugin-screensaver/translations/screensaver_hu_HU.ts b/plugin-screensaver/translations/screensaver_hu_HU.ts deleted file mode 100644 index 7f6f9aa..0000000 --- a/plugin-screensaver/translations/screensaver_hu_HU.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - A(z) „%1” gyorsbillentyű a panel képernyővédőjének megjelenítéséhez nem regisztrálható - - - - Lock Screen - Képernyőzár - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - A(z) „%1” gyorsbillentyű a panel képernyővédőjének megjelenítéséhez nem regisztrálható - - - diff --git a/plugin-screensaver/translations/screensaver_ia.desktop b/plugin-screensaver/translations/screensaver_ia.desktop deleted file mode 100644 index 6d953ec..0000000 --- a/plugin-screensaver/translations/screensaver_ia.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations diff --git a/plugin-screensaver/translations/screensaver_ia.ts b/plugin-screensaver/translations/screensaver_ia.ts deleted file mode 100644 index e7ca110..0000000 --- a/plugin-screensaver/translations/screensaver_ia.ts +++ /dev/null @@ -1,17 +0,0 @@ - - - - - PanelScreenSaver - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_id_ID.desktop b/plugin-screensaver/translations/screensaver_id_ID.desktop deleted file mode 100644 index 6d953ec..0000000 --- a/plugin-screensaver/translations/screensaver_id_ID.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations diff --git a/plugin-screensaver/translations/screensaver_id_ID.ts b/plugin-screensaver/translations/screensaver_id_ID.ts deleted file mode 100644 index 2cb2530..0000000 --- a/plugin-screensaver/translations/screensaver_id_ID.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Shortcut global Panel Screensaver: '%1' tidak dapat didaftarkan - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_it.desktop b/plugin-screensaver/translations/screensaver_it.desktop deleted file mode 100644 index fe0cdfc..0000000 --- a/plugin-screensaver/translations/screensaver_it.desktop +++ /dev/null @@ -1,3 +0,0 @@ -Comment[it]=Attiva un salvaschermo e/o blocca lo schermo -Name[it]=Salvaschermo - diff --git a/plugin-screensaver/translations/screensaver_it.ts b/plugin-screensaver/translations/screensaver_it.ts deleted file mode 100644 index 0b47e62..0000000 --- a/plugin-screensaver/translations/screensaver_it.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - La scorciatoia globale per lo screensaver: '%1' non può essere registrata - - - - Lock Screen - Blocca schermo - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - La scorciatoia globale per lo screensaver: '%1' non può essere registrata - - - diff --git a/plugin-screensaver/translations/screensaver_ja.desktop b/plugin-screensaver/translations/screensaver_ja.desktop deleted file mode 100644 index f8cb05e..0000000 --- a/plugin-screensaver/translations/screensaver_ja.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ja]=スクリーンセーバーを起動したり、スクリーンをロックしたりします -Name[ja]=スクリーンセーバーの起動 diff --git a/plugin-screensaver/translations/screensaver_ja.ts b/plugin-screensaver/translations/screensaver_ja.ts deleted file mode 100644 index b5852b1..0000000 --- a/plugin-screensaver/translations/screensaver_ja.ts +++ /dev/null @@ -1,17 +0,0 @@ - - - - - PanelScreenSaver - - - Lock Screen - スクリーンをロック - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - スクリーンセーバー: グローバルショートカット '%1' を登録することができません - - - diff --git a/plugin-screensaver/translations/screensaver_ko.desktop b/plugin-screensaver/translations/screensaver_ko.desktop deleted file mode 100644 index 6d953ec..0000000 --- a/plugin-screensaver/translations/screensaver_ko.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations diff --git a/plugin-screensaver/translations/screensaver_ko.ts b/plugin-screensaver/translations/screensaver_ko.ts deleted file mode 100644 index 55a4faa..0000000 --- a/plugin-screensaver/translations/screensaver_ko.ts +++ /dev/null @@ -1,17 +0,0 @@ - - - - - PanelScreenSaver - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_lt.desktop b/plugin-screensaver/translations/screensaver_lt.desktop deleted file mode 100644 index ad55350..0000000 --- a/plugin-screensaver/translations/screensaver_lt.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[lt]=Aktyvuoja ekrano užsklandą ir/arba užrakina ekraną -Name[lt]=Ekrano užsklanda diff --git a/plugin-screensaver/translations/screensaver_lt.ts b/plugin-screensaver/translations/screensaver_lt.ts deleted file mode 100644 index 46f8737..0000000 --- a/plugin-screensaver/translations/screensaver_lt.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Ekrano užsklandos klavišas: „%1“ negali būti registruojamas - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_nl.desktop b/plugin-screensaver/translations/screensaver_nl.desktop deleted file mode 100644 index 0f0fea2..0000000 --- a/plugin-screensaver/translations/screensaver_nl.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[nl]=Activeer de schermbeveiliging en/of vergrendel het scherm -Name[nl]=Schermbeveiliging diff --git a/plugin-screensaver/translations/screensaver_nl.ts b/plugin-screensaver/translations/screensaver_nl.ts deleted file mode 100644 index ad59586..0000000 --- a/plugin-screensaver/translations/screensaver_nl.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Schermbeveiliging van paneel: systeembrede sneltoets '%1' kan niet worden geregistreerd - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_pl.desktop b/plugin-screensaver/translations/screensaver_pl.desktop deleted file mode 100644 index 51febe6..0000000 --- a/plugin-screensaver/translations/screensaver_pl.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[pl]=Aktywuje wygaszacz ekranu oraz/albo blokuje ekran -Name[pl]=Wygaszacz ekranu diff --git a/plugin-screensaver/translations/screensaver_pl.ts b/plugin-screensaver/translations/screensaver_pl.ts deleted file mode 100644 index 02ee63b..0000000 --- a/plugin-screensaver/translations/screensaver_pl.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Ogólny skrót panelu wygaszacza ekranu: „%1” nie może zostać zarejestrowany - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_pl_PL.desktop b/plugin-screensaver/translations/screensaver_pl_PL.desktop deleted file mode 100644 index e3c0e27..0000000 --- a/plugin-screensaver/translations/screensaver_pl_PL.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[pl_PL]=Włącz wygaszacz ekranu i / lub zablokuj ekran. -Name[pl_PL]=Uruchom wygaszacz ekranu diff --git a/plugin-screensaver/translations/screensaver_pl_PL.ts b/plugin-screensaver/translations/screensaver_pl_PL.ts deleted file mode 100644 index 92a3968..0000000 --- a/plugin-screensaver/translations/screensaver_pl_PL.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Plugin "Wygaszacz ekranu": globalny skrót '%1' nie może zostać zarejestrowany - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_pt.desktop b/plugin-screensaver/translations/screensaver_pt.desktop deleted file mode 100644 index 52f8cb6..0000000 --- a/plugin-screensaver/translations/screensaver_pt.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - -# Translations -Name[pt]=Proteção de ecrã -Comment[pt]=Ativar uma proteção de ecrã e/ou bloquear o ecrã diff --git a/plugin-screensaver/translations/screensaver_pt.ts b/plugin-screensaver/translations/screensaver_pt.ts deleted file mode 100644 index a159d8a..0000000 --- a/plugin-screensaver/translations/screensaver_pt.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Tecla de atalho global: '%1' não pode ser registada - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_pt_BR.desktop b/plugin-screensaver/translations/screensaver_pt_BR.desktop deleted file mode 100644 index 8cba603..0000000 --- a/plugin-screensaver/translations/screensaver_pt_BR.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[pt_BR]=Ativar o protetor de tela e/ou bloquear a tela -Name[pt_BR]=Protetor De Tela diff --git a/plugin-screensaver/translations/screensaver_pt_BR.ts b/plugin-screensaver/translations/screensaver_pt_BR.ts deleted file mode 100644 index 3720191..0000000 --- a/plugin-screensaver/translations/screensaver_pt_BR.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Atalho global do painel do protetor de tela: '%1' não pôde ser registrado - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_ro_RO.desktop b/plugin-screensaver/translations/screensaver_ro_RO.desktop deleted file mode 100644 index 3186fce..0000000 --- a/plugin-screensaver/translations/screensaver_ro_RO.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ro_RO]=Activează protecția de ecran și/sau blochează ecranul -Name[ro_RO]=Protecție ecran diff --git a/plugin-screensaver/translations/screensaver_ro_RO.ts b/plugin-screensaver/translations/screensaver_ro_RO.ts deleted file mode 100644 index 4defc9f..0000000 --- a/plugin-screensaver/translations/screensaver_ro_RO.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Global keyboard shortcut - Tastă rapidă globală - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_ru.desktop b/plugin-screensaver/translations/screensaver_ru.desktop deleted file mode 100644 index 18f0474..0000000 --- a/plugin-screensaver/translations/screensaver_ru.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ru]=Включить хранитель экрана и/или блокировать экран -Name[ru]=Запустить хранитель экрана \ No newline at end of file diff --git a/plugin-screensaver/translations/screensaver_ru.ts b/plugin-screensaver/translations/screensaver_ru.ts deleted file mode 100644 index dbf9d50..0000000 --- a/plugin-screensaver/translations/screensaver_ru.ts +++ /dev/null @@ -1,17 +0,0 @@ - - - - - PanelScreenSaver - - - Lock Screen - Блокировать экран - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - Хранитель экрана панели: глобальное сочетание клавиш '%1' не может быть зарегистрировано - - - diff --git a/plugin-screensaver/translations/screensaver_ru_RU.desktop b/plugin-screensaver/translations/screensaver_ru_RU.desktop deleted file mode 100644 index 5a44d7a..0000000 --- a/plugin-screensaver/translations/screensaver_ru_RU.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ru_RU]=Включить хранитель экрана и/или блокировать экран -Name[ru_RU]=Запустить хранитель экрана diff --git a/plugin-screensaver/translations/screensaver_ru_RU.ts b/plugin-screensaver/translations/screensaver_ru_RU.ts deleted file mode 100644 index 742e0b7..0000000 --- a/plugin-screensaver/translations/screensaver_ru_RU.ts +++ /dev/null @@ -1,17 +0,0 @@ - - - - - PanelScreenSaver - - - Lock Screen - Блокировать экран - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - Хранитель экрана панели: глобальное сочетание клавиш '%1' не может быть зарегистрировано - - - diff --git a/plugin-screensaver/translations/screensaver_sk.desktop b/plugin-screensaver/translations/screensaver_sk.desktop deleted file mode 100644 index 827d5e4..0000000 --- a/plugin-screensaver/translations/screensaver_sk.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[sk]=Aktivovanie šetriča obrazovky alebo zamknutia obrazovky -Name[sk]=Šetrič obrazovky diff --git a/plugin-screensaver/translations/screensaver_sk_SK.ts b/plugin-screensaver/translations/screensaver_sk_SK.ts deleted file mode 100644 index 3e35ca9..0000000 --- a/plugin-screensaver/translations/screensaver_sk_SK.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Globálna klávesová skratka Panelu šetriča: „%1“ nemožno zaregistrovať - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_sl.desktop b/plugin-screensaver/translations/screensaver_sl.desktop deleted file mode 100644 index bec7127..0000000 --- a/plugin-screensaver/translations/screensaver_sl.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[sl]=Vklopite ohranjevalnik zaslona ali pa zaklenite zaslon. -Name[sl]=Ohranjevalnik zaslona diff --git a/plugin-screensaver/translations/screensaver_sl.ts b/plugin-screensaver/translations/screensaver_sl.ts deleted file mode 100644 index c04b712..0000000 --- a/plugin-screensaver/translations/screensaver_sl.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Globalna bližnjica za ohranjevalnik zaslona: »%1« ni moč registrirati - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_sr.desktop b/plugin-screensaver/translations/screensaver_sr.desktop deleted file mode 100644 index 4152dd3..0000000 --- a/plugin-screensaver/translations/screensaver_sr.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[sr]=Активирајте чувара екрана и/или закључајте екран -Name[sr]=Чувар екрана diff --git a/plugin-screensaver/translations/screensaver_sr@ijekavian.desktop b/plugin-screensaver/translations/screensaver_sr@ijekavian.desktop deleted file mode 100644 index c149dd1..0000000 --- a/plugin-screensaver/translations/screensaver_sr@ijekavian.desktop +++ /dev/null @@ -1,2 +0,0 @@ -Name[sr@ijekavian]=Чувар екрана -Comment[sr@ijekavian]=Активирајте чувара екрана и/или закључајте екран diff --git a/plugin-screensaver/translations/screensaver_sr@ijekavianlatin.desktop b/plugin-screensaver/translations/screensaver_sr@ijekavianlatin.desktop deleted file mode 100644 index c78c65f..0000000 --- a/plugin-screensaver/translations/screensaver_sr@ijekavianlatin.desktop +++ /dev/null @@ -1,2 +0,0 @@ -Name[sr@ijekavianlatin]=Čuvar ekrana -Comment[sr@ijekavianlatin]=Aktivirajte čuvara ekrana i/ili zaključajte ekran diff --git a/plugin-screensaver/translations/screensaver_sr@latin.desktop b/plugin-screensaver/translations/screensaver_sr@latin.desktop deleted file mode 100644 index 65b4bd0..0000000 --- a/plugin-screensaver/translations/screensaver_sr@latin.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[sr@latin]=Aktivirajte čuvara ekrana i/ili zaključajte ekran -Name[sr@latin]=Čuvar ekrana diff --git a/plugin-screensaver/translations/screensaver_sr@latin.ts b/plugin-screensaver/translations/screensaver_sr@latin.ts deleted file mode 100644 index 061eab1..0000000 --- a/plugin-screensaver/translations/screensaver_sr@latin.ts +++ /dev/null @@ -1,17 +0,0 @@ - - - - - PanelScreenSaver - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_sr_BA.ts b/plugin-screensaver/translations/screensaver_sr_BA.ts deleted file mode 100644 index e32806b..0000000 --- a/plugin-screensaver/translations/screensaver_sr_BA.ts +++ /dev/null @@ -1,25 +0,0 @@ - - - - - PanelScreenSaver - - Global keyboard shortcut - Глобална пречица тастатуре - - - Panel Screensaver Global shortcut: '%1' cannot be registered - Глобална пречица чувара екрана за панел: „%1“ не може бити регистрована - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_sr_RS.ts b/plugin-screensaver/translations/screensaver_sr_RS.ts deleted file mode 100644 index c8d4794..0000000 --- a/plugin-screensaver/translations/screensaver_sr_RS.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Глобална пречица чувара екрана за панел: „%1“ не може бити регистрована - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_th_TH.desktop b/plugin-screensaver/translations/screensaver_th_TH.desktop deleted file mode 100644 index 398849f..0000000 --- a/plugin-screensaver/translations/screensaver_th_TH.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[th_TH]=เริ่มงานโปรแกรมรักษาหน้าจอ และ/หรือ ล็อคหน้าจอ -Name[th_TH]=โปรแกรมรักษาหน้าจอ diff --git a/plugin-screensaver/translations/screensaver_th_TH.ts b/plugin-screensaver/translations/screensaver_th_TH.ts deleted file mode 100644 index f014b66..0000000 --- a/plugin-screensaver/translations/screensaver_th_TH.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - โปรแกรมรักษาหน้าจอ: ไม่สารมารถตั้ง '%1' เป็นปุ่มลัดส่วนกลางได้ - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_tr.desktop b/plugin-screensaver/translations/screensaver_tr.desktop deleted file mode 100644 index a250493..0000000 --- a/plugin-screensaver/translations/screensaver_tr.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[tr]=Bir ekran koruyucu etkinleştir ve/veya ekranı kilitle -Name[tr]=Ekran koruyucu diff --git a/plugin-screensaver/translations/screensaver_tr.ts b/plugin-screensaver/translations/screensaver_tr.ts deleted file mode 100644 index 0d1e185..0000000 --- a/plugin-screensaver/translations/screensaver_tr.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Panel Ekran Koruyucu Genel kısayolu: '%1' kaydedilemiyor - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_uk.desktop b/plugin-screensaver/translations/screensaver_uk.desktop deleted file mode 100644 index db13a91..0000000 --- a/plugin-screensaver/translations/screensaver_uk.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[uk]=Активувати зберігач екрану та/чи заблокувати екран -Name[uk]=Зберігач екрану diff --git a/plugin-screensaver/translations/screensaver_uk.ts b/plugin-screensaver/translations/screensaver_uk.ts deleted file mode 100644 index 73d977e..0000000 --- a/plugin-screensaver/translations/screensaver_uk.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - Не вдається встановити '%1' глобальним скороченням зберігача екрану - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_zh_CN.GB2312.desktop b/plugin-screensaver/translations/screensaver_zh_CN.GB2312.desktop deleted file mode 100644 index 6d953ec..0000000 --- a/plugin-screensaver/translations/screensaver_zh_CN.GB2312.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations diff --git a/plugin-screensaver/translations/screensaver_zh_CN.desktop b/plugin-screensaver/translations/screensaver_zh_CN.desktop deleted file mode 100644 index edabcb7..0000000 --- a/plugin-screensaver/translations/screensaver_zh_CN.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[zh_CN]=启用屏幕保护并锁定屏幕 -Name[zh_CN]=屏幕保护 diff --git a/plugin-screensaver/translations/screensaver_zh_CN.ts b/plugin-screensaver/translations/screensaver_zh_CN.ts deleted file mode 100644 index 988ad1c..0000000 --- a/plugin-screensaver/translations/screensaver_zh_CN.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - 面板 屏幕保护程序 全局快捷键 '%1' 无法被注册 - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-screensaver/translations/screensaver_zh_TW.desktop b/plugin-screensaver/translations/screensaver_zh_TW.desktop deleted file mode 100644 index 08936b7..0000000 --- a/plugin-screensaver/translations/screensaver_zh_TW.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[zh_TW]=啟動螢幕保護程式並/或鎖上螢幕 -Name[zh_TW]=螢幕保護程式 diff --git a/plugin-screensaver/translations/screensaver_zh_TW.ts b/plugin-screensaver/translations/screensaver_zh_TW.ts deleted file mode 100644 index b03475a..0000000 --- a/plugin-screensaver/translations/screensaver_zh_TW.ts +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PanelScreenSaver - - Panel Screensaver Global shortcut: '%1' cannot be registered - 螢幕保護程式面板全域快捷鍵:'%1'無法被寫入 - - - - Lock Screen - - - - - Panel Screensaver: Global shortcut '%1' cannot be registered - - - - diff --git a/plugin-sensors/lxqtsensors.cpp b/plugin-sensors/lxqtsensors.cpp index a05c7e8..2dc9506 100644 --- a/plugin-sensors/lxqtsensors.cpp +++ b/plugin-sensors/lxqtsensors.cpp @@ -34,6 +34,7 @@ #include #include +static constexpr double DEFAULT_MAX = 200; // 200 Celsius LXQtSensors::LXQtSensors(ILXQtPanelPlugin *plugin, QWidget* parent): QFrame(parent), @@ -140,6 +141,9 @@ void LXQtSensors::updateSensorReadings() // 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 double default_max = use_fahrenheit ? celsiusToFahrenheit(DEFAULT_MAX) : DEFAULT_MAX; for (int i = 0; i < mDetectedChips.size(); ++i) { @@ -151,34 +155,17 @@ void LXQtSensors::updateSensorReadings() { tooltip = features[j].getLabel() + " (" + QChar(0x00B0); - if (mSettings->value("useFahrenheitScale").toBool()) - { - critTemp = celsiusToFahrenheit( - features[j].getValue(SENSORS_SUBFEATURE_TEMP_CRIT)); - maxTemp = celsiusToFahrenheit( - features[j].getValue(SENSORS_SUBFEATURE_TEMP_MAX)); - minTemp = celsiusToFahrenheit( - features[j].getValue(SENSORS_SUBFEATURE_TEMP_MIN)); - curTemp = celsiusToFahrenheit( - features[j].getValue(SENSORS_SUBFEATURE_TEMP_INPUT)); - - tooltip += "F)"; - } - else - { - critTemp = features[j].getValue(SENSORS_SUBFEATURE_TEMP_CRIT); - maxTemp = features[j].getValue(SENSORS_SUBFEATURE_TEMP_MAX); - minTemp = features[j].getValue(SENSORS_SUBFEATURE_TEMP_MIN); - curTemp = features[j].getValue(SENSORS_SUBFEATURE_TEMP_INPUT); - - tooltip += "C)"; - } + critTemp = features[j].getValue(SENSORS_SUBFEATURE_TEMP_CRIT); + maxTemp = features[j].getValue(SENSORS_SUBFEATURE_TEMP_MAX); + minTemp = features[j].getValue(SENSORS_SUBFEATURE_TEMP_MIN); + curTemp = features[j].getValue(SENSORS_SUBFEATURE_TEMP_INPUT); + double temp_to_check = maxTemp == 0.0 ? critTemp : maxTemp; // Check if temperature is too high - if (curTemp >= maxTemp) + if (temp_to_check != 0.0 && curTemp >= temp_to_check) { - if (mSettings->value("warningAboutHighTemperature").toBool()) + if (warn_high) { // Add current progress bar to the "warning container" mHighTemperatureProgressBars.insert(*temperatureProgressBarsIt); @@ -193,8 +180,23 @@ void LXQtSensors::updateSensorReadings() highTemperature = false; } + if (use_fahrenheit) + { + critTemp = celsiusToFahrenheit(critTemp); + maxTemp = celsiusToFahrenheit(maxTemp); + minTemp = celsiusToFahrenheit(minTemp); + curTemp = celsiusToFahrenheit(curTemp); + + tooltip += "F)"; + } + else + { + tooltip += "C)"; + } + + // Set maximum temperature - (*temperatureProgressBarsIt)->setMaximum(critTemp); + (*temperatureProgressBarsIt)->setMaximum(critTemp == 0.0 ? default_max : critTemp); // Set minimum temperature (*temperatureProgressBarsIt)->setMinimum(minTemp); // Set current temperature diff --git a/plugin-sensors/lxqtsensors.h b/plugin-sensors/lxqtsensors.h index 9024ece..ad8cac9 100644 --- a/plugin-sensors/lxqtsensors.h +++ b/plugin-sensors/lxqtsensors.h @@ -29,6 +29,7 @@ #define LXQTSENSORS_H #include "sensors.h" +#include "../panel/pluginsettings.h" #include #include #include @@ -74,7 +75,7 @@ private: QSet mHighTemperatureProgressBars; double celsiusToFahrenheit(double celsius); void initDefaultSettings(); - QSettings *mSettings; + PluginSettings *mSettings; }; diff --git a/plugin-sensors/lxqtsensorsconfiguration.cpp b/plugin-sensors/lxqtsensorsconfiguration.cpp index fc08fd6..aa32b1e 100644 --- a/plugin-sensors/lxqtsensorsconfiguration.cpp +++ b/plugin-sensors/lxqtsensorsconfiguration.cpp @@ -34,11 +34,9 @@ #include -LXQtSensorsConfiguration::LXQtSensorsConfiguration(QSettings *settings, QWidget *parent) : - QDialog(parent), - ui(new Ui::LXQtSensorsConfiguration), - mSettings(settings), - oldSettings(settings) +LXQtSensorsConfiguration::LXQtSensorsConfiguration(PluginSettings *settings, QWidget *parent) : + LXQtPanelPluginConfigDialog(settings, parent), + ui(new Ui::LXQtSensorsConfiguration) { setAttribute(Qt::WA_DeleteOnClose); setObjectName("SensorsConfigurationWindow"); @@ -71,10 +69,10 @@ LXQtSensorsConfiguration::~LXQtSensorsConfiguration() void LXQtSensorsConfiguration::loadSettings() { - ui->updateIntervalSB->setValue(mSettings->value("updateInterval").toInt()); - ui->tempBarWidthSB->setValue(mSettings->value("tempBarWidth").toInt()); + ui->updateIntervalSB->setValue(settings().value("updateInterval").toInt()); + ui->tempBarWidthSB->setValue(settings().value("tempBarWidth").toInt()); - if (mSettings->value("useFahrenheitScale").toBool()) + if (settings().value("useFahrenheitScale").toBool()) { ui->fahrenheitTempScaleRB->setChecked(true); } @@ -82,14 +80,14 @@ void LXQtSensorsConfiguration::loadSettings() // In case of reloading settings we have to clear GUI elements ui->detectedChipsCB->clear(); - mSettings->beginGroup("chips"); - QStringList chipNames = mSettings->childGroups(); + settings().beginGroup("chips"); + QStringList chipNames = settings().childGroups(); for (int i = 0; i < chipNames.size(); ++i) { ui->detectedChipsCB->addItem(chipNames[i]); } - mSettings->endGroup(); + settings().endGroup(); // Load feature for the first chip if exist if (chipNames.size() > 0) @@ -98,26 +96,26 @@ void LXQtSensorsConfiguration::loadSettings() } ui->warningAboutHighTemperatureChB->setChecked( - mSettings->value("warningAboutHighTemperature").toBool()); + settings().value("warningAboutHighTemperature").toBool()); } void LXQtSensorsConfiguration::saveSettings() { - mSettings->setValue("updateInterval", ui->updateIntervalSB->value()); - mSettings->setValue("tempBarWidth", ui->tempBarWidthSB->value()); + settings().setValue("updateInterval", ui->updateIntervalSB->value()); + settings().setValue("tempBarWidth", ui->tempBarWidthSB->value()); if (ui->fahrenheitTempScaleRB->isChecked()) { - mSettings->setValue("useFahrenheitScale", true); + settings().setValue("useFahrenheitScale", true); } else { - mSettings->setValue("useFahrenheitScale", false); + settings().setValue("useFahrenheitScale", false); } - mSettings->beginGroup("chips"); - QStringList chipNames = mSettings->childGroups(); + settings().beginGroup("chips"); + QStringList chipNames = settings().childGroups(); if (chipNames.size()) { @@ -125,49 +123,34 @@ void LXQtSensorsConfiguration::saveSettings() QPushButton* colorButton = NULL; QCheckBox* enabledCheckbox = NULL; - mSettings->beginGroup(chipNames[ui->detectedChipsCB->currentIndex()]); + settings().beginGroup(chipNames[ui->detectedChipsCB->currentIndex()]); - chipFeatureLabels = mSettings->childGroups(); + chipFeatureLabels = settings().childGroups(); for (int j = 0; j < chipFeatureLabels.size(); ++j) { - mSettings->beginGroup(chipFeatureLabels[j]); + settings().beginGroup(chipFeatureLabels[j]); enabledCheckbox = qobject_cast(ui->chipFeaturesT->cellWidget(j, 0)); // We know what we are doing so we don't have to check if enabledCheckbox == 0 - mSettings->setValue("enabled", enabledCheckbox->isChecked()); + settings().setValue("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 - mSettings->setValue( + settings().setValue( "color", colorButton->palette().color(QPalette::Normal, QPalette::Button).name()); - mSettings->endGroup(); + settings().endGroup(); } - mSettings->endGroup(); + settings().endGroup(); } - mSettings->endGroup(); + settings().endGroup(); - mSettings->setValue("warningAboutHighTemperature", + settings().setValue("warningAboutHighTemperature", ui->warningAboutHighTemperatureChB->isChecked()); } - -void LXQtSensorsConfiguration::dialogButtonsAction(QAbstractButton *btn) -{ - if (ui->buttons->buttonRole(btn) == QDialogButtonBox::ResetRole) - { - oldSettings.loadToSettings(); - loadSettings(); - } - else - { - close(); - } -} - - void LXQtSensorsConfiguration::changeProgressBarColor() { QAbstractButton* btn = qobject_cast(sender()); @@ -193,8 +176,8 @@ void LXQtSensorsConfiguration::changeProgressBarColor() void LXQtSensorsConfiguration::detectedChipSelected(int index) { - mSettings->beginGroup("chips"); - QStringList chipNames = mSettings->childGroups(); + settings().beginGroup("chips"); + QStringList chipNames = settings().childGroups(); QStringList chipFeatureLabels; QPushButton* colorButton = NULL; QCheckBox* enabledCheckbox = NULL; @@ -213,16 +196,16 @@ void LXQtSensorsConfiguration::detectedChipSelected(int index) ui->chipFeaturesT->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); ui->chipFeaturesT->setHorizontalHeaderLabels(chipFeaturesLabels); - mSettings->beginGroup(chipNames[index]); - chipFeatureLabels = mSettings->childGroups(); + settings().beginGroup(chipNames[index]); + chipFeatureLabels = settings().childGroups(); for (int j = 0; j < chipFeatureLabels.size(); ++j) { - mSettings->beginGroup(chipFeatureLabels[j]); + settings().beginGroup(chipFeatureLabels[j]); ui->chipFeaturesT->insertRow(j); enabledCheckbox = new QCheckBox(ui->chipFeaturesT); - enabledCheckbox->setChecked(mSettings->value("enabled").toBool()); + enabledCheckbox->setChecked(settings().value("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); @@ -235,18 +218,18 @@ void LXQtSensorsConfiguration::detectedChipSelected(int index) connect(colorButton, SIGNAL(clicked()), this, SLOT(changeProgressBarColor())); QPalette pal = colorButton->palette(); pal.setColor(QPalette::Normal, QPalette::Button, - QColor(mSettings->value("color").toString())); + QColor(settings().value("color").toString())); colorButton->setPalette(pal); ui->chipFeaturesT->setCellWidget(j, 2, colorButton); - mSettings->endGroup(); + settings().endGroup(); } - mSettings->endGroup(); + settings().endGroup(); } else { qDebug() << "Invalid chip index: " << index; } - mSettings->endGroup(); + settings().endGroup(); } diff --git a/plugin-sensors/lxqtsensorsconfiguration.h b/plugin-sensors/lxqtsensorsconfiguration.h index 1fb74da..7c649cb 100644 --- a/plugin-sensors/lxqtsensorsconfiguration.h +++ b/plugin-sensors/lxqtsensorsconfiguration.h @@ -28,30 +28,27 @@ #ifndef LXQTSENSORSCONFIGURATION_H #define LXQTSENSORSCONFIGURATION_H +#include "../panel/lxqtpanelpluginconfigdialog.h" +#include "../panel/pluginsettings.h" #include #include #include -#include #include -#include - namespace Ui { class LXQtSensorsConfiguration; } -class LXQtSensorsConfiguration : public QDialog +class LXQtSensorsConfiguration : public LXQtPanelPluginConfigDialog { Q_OBJECT public: - explicit LXQtSensorsConfiguration(QSettings *settings, QWidget *parent = 0); + explicit LXQtSensorsConfiguration(PluginSettings *settings, QWidget *parent = nullptr); ~LXQtSensorsConfiguration(); private: Ui::LXQtSensorsConfiguration *ui; - QSettings *mSettings; - LXQt::SettingsCache oldSettings; /* Read settings from conf file and put data into controls. @@ -63,7 +60,6 @@ private slots: Saves settings in conf file. */ void saveSettings(); - void dialogButtonsAction(QAbstractButton *btn); void changeProgressBarColor(); void detectedChipSelected(int index); }; diff --git a/plugin-sensors/translations/sensors.ts b/plugin-sensors/translations/sensors.ts deleted file mode 100644 index 5264753..0000000 --- a/plugin-sensors/translations/sensors.ts +++ /dev/null @@ -1,82 +0,0 @@ - - - - - LXQtSensorsConfiguration - - - Sensors Settings - - - - - Common - - - - - Update interval (seconds) - - - - - Temperature bar width - - - - - Temperature scale - - - - - Celsius - - - - - Fahrenheit - - - - - Blink progress bars when the temperature is too high - - - - - Warning about high temperature - - - - - Sensors - - - - - Detected chips: - - - - - Chip features: - - - - - Enabled - - - - - Label - - - - - Color - - - - diff --git a/plugin-sensors/translations/sensors_ar.desktop b/plugin-sensors/translations/sensors_ar.desktop index 4d5bd99..24d0a53 100644 --- a/plugin-sensors/translations/sensors_ar.desktop +++ b/plugin-sensors/translations/sensors_ar.desktop @@ -1,10 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Sensors -Comment=View readings from hardware sensors. - - -# Translations -Name[ar]=إستشعار -Comment[ar]=عرض قراءة من إستشعار لأجهزة (حاليا lm_sensors) +Name[ar]=مجسّات +Comment[ar]=تعرض قراءات من مجسّات العتاد. diff --git a/plugin-sensors/translations/sensors_ca.ts b/plugin-sensors/translations/sensors_ca.ts deleted file mode 100644 index 995d8ba..0000000 --- a/plugin-sensors/translations/sensors_ca.ts +++ /dev/null @@ -1,82 +0,0 @@ - - - - - LXQtSensorsConfiguration - - - Sensors Settings - - - - - Common - - - - - Update interval (seconds) - - - - - Temperature bar width - - - - - Temperature scale - - - - - Celsius - - - - - Fahrenheit - - - - - Blink progress bars when the temperature is too high - - - - - Warning about high temperature - - - - - Sensors - Sensors - - - - Detected chips: - - - - - Chip features: - - - - - Enabled - - - - - Label - - - - - Color - - - - diff --git a/plugin-sensors/translations/sensors_cs.ts b/plugin-sensors/translations/sensors_cs.ts deleted file mode 100644 index defdae2..0000000 --- a/plugin-sensors/translations/sensors_cs.ts +++ /dev/null @@ -1,86 +0,0 @@ - - - - - LXQtSensorsConfiguration - - LXQt Sensors Settings - Nastavení čidel - - - - Sensors Settings - - - - - Common - Běžné - - - - Update interval (seconds) - Obnovovací interval (v sekundách) - - - - Temperature bar width - Šířka proužku s teplotou - - - - Temperature scale - Teplotní stupnice - - - - Celsius - Celsius - - - - Fahrenheit - Fahrenheit - - - - Blink progress bars when the temperature is too high - Blikat proužky ukazujícími nárůst teploty, když je teplota příliš vysoká - - - - Warning about high temperature - Varování při vysoké teplotě - - - - Sensors - Čidla - - - - Detected chips: - Zjištěné čipy: - - - - Chip features: - Vlastnosti čipů: - - - - Enabled - Povoleno - - - - Label - Štítek - - - - Color - Barva - - - diff --git a/plugin-sensors/translations/sensors_cs_CZ.ts b/plugin-sensors/translations/sensors_cs_CZ.ts deleted file mode 100644 index 59de93d..0000000 --- a/plugin-sensors/translations/sensors_cs_CZ.ts +++ /dev/null @@ -1,86 +0,0 @@ - - - - - LXQtSensorsConfiguration - - LXQt Sensors Settings - Nastavení čidel - - - - Sensors Settings - - - - - Common - Běžné - - - - Update interval (seconds) - Obnovovací interval (v sekundách) - - - - Temperature bar width - Šířka proužku s teplotou - - - - Temperature scale - Teplotní stupnice - - - - Celsius - Celsius - - - - Fahrenheit - Fahrenheit - - - - Blink progress bars when the temperature is too high - Blikat proužky ukazujícími nárůst teploty, když je teplota příliš vysoká - - - - Warning about high temperature - Varování při vysoké teplotě - - - - Sensors - Čidla - - - - Detected chips: - Zjištěné čipy: - - - - Chip features: - Vlastnosti čipů: - - - - Enabled - Povoleno - - - - Label - Štítek - - - - Color - Barva - - - diff --git a/plugin-sensors/translations/sensors_da_DK.ts b/plugin-sensors/translations/sensors_da_DK.ts deleted file mode 100644 index 58101cf..0000000 --- a/plugin-sensors/translations/sensors_da_DK.ts +++ /dev/null @@ -1,86 +0,0 @@ - - - - - LXQtSensorsConfiguration - - LXQt Sensors Settings - Indstillinger for LXQt Sensorer - - - - Sensors Settings - - - - - Common - Fælles - - - - Update interval (seconds) - Opdateringsinterval (sekunder) - - - - Temperature bar width - Temperaturbjælke bredde - - - - Temperature scale - Temperaturskala - - - - Celsius - Celsius - - - - Fahrenheit - Fahrenheit - - - - Blink progress bars when the temperature is too high - Blink statuslinjer når temperaturen er for høj - - - - Warning about high temperature - Advarsel om høj temperatur - - - - Sensors - Sensorer - - - - Detected chips: - Fundne chipsæt: - - - - Chip features: - Chipsæt funktioner: - - - - Enabled - Aktiveret - - - - Label - Identifikation - - - - Color - Farve - - - diff --git a/plugin-sensors/translations/sensors_de.ts b/plugin-sensors/translations/sensors_de.ts deleted file mode 100644 index 45c053a..0000000 --- a/plugin-sensors/translations/sensors_de.ts +++ /dev/null @@ -1,82 +0,0 @@ - - - - - LXQtSensorsConfiguration - - - Sensors Settings - Sensor-Einstellungen - - - - Common - Allgemein - - - - Update interval (seconds) - Aktualisierungsintervall (Sekunden) - - - - Temperature bar width - Temperaturbalkenbreite - - - - Temperature scale - Temperaturskala - - - - Celsius - Celsius - - - - Fahrenheit - Fahrenheit - - - - Blink progress bars when the temperature is too high - Blinken der Verlaufsbalken bei zu hoher Temperatur - - - - Warning about high temperature - Warnung bei zu hoher Temperatur - - - - Sensors - Sensoren - - - - Detected chips: - Erkannte Bausteine: - - - - Chip features: - Bausteineigenschaften: - - - - Enabled - Aktiviert - - - - Label - Bezeichnung - - - - Color - Farbe - - - diff --git a/plugin-sensors/translations/sensors_el.ts b/plugin-sensors/translations/sensors_el.ts deleted file mode 100644 index 6b25d1f..0000000 --- a/plugin-sensors/translations/sensors_el.ts +++ /dev/null @@ -1,86 +0,0 @@ - - - - - LXQtSensorsConfiguration - - LXQt Sensors Settings - Ρυθμίσεις αισθητήρων LXQt - - - - Sensors Settings - Ρυθμίσεις αισθητήρων - - - - Common - Κοινές επιλογές - - - - Update interval (seconds) - Διάστημα ανανέωσης (δευτερόλεπτα) - - - - Temperature bar width - Πλάτος γραμμής θερμοκρασίας - - - - Temperature scale - Κλίμακα θερμοκρασίας - - - - Celsius - Κελσίου - - - - Fahrenheit - Φαρενάιτ - - - - Blink progress bars when the temperature is too high - Αναβόσβημα γραμμών προόδου, ​​όταν η θερμοκρασία είναι πολύ υψηλή - - - - Warning about high temperature - Προειδοποίηση υψηλής θερμοκρασίας - - - - Sensors - Αισθητήρες - - - - Detected chips: - Ανιχνευμένα κυκλώματα: - - - - Chip features: - Χαρακτηριστικά κυκλώματος: - - - - Enabled - Ενεργοποιημένο - - - - Label - Ετικέτα - - - - Color - Χρώμα - - - diff --git a/plugin-sensors/translations/sensors_es.ts b/plugin-sensors/translations/sensors_es.ts deleted file mode 100644 index 8151843..0000000 --- a/plugin-sensors/translations/sensors_es.ts +++ /dev/null @@ -1,86 +0,0 @@ - - - - - LXQtSensorsConfiguration - - LXQt Sensors Settings - Opciones de Sensores de LXQt - - - - Sensors Settings - - - - - Common - Común - - - - Update interval (seconds) - Intervalo de actualización (segundos) - - - - Temperature bar width - Ancho de la barra de temperatura - - - - Temperature scale - Escala de temperatura - - - - Celsius - Celsius - - - - Fahrenheit - Fahrenheit - - - - Blink progress bars when the temperature is too high - Parpadeo en las barras de progreso cuando la temperatura es demasiado alta - - - - Warning about high temperature - Advertencia cuando la temperatura sea alta - - - - Sensors - Sensores - - - - Detected chips: - Chips detectado: - - - - Chip features: - Características del chip: - - - - Enabled - Habilitado - - - - Label - Etiqueta - - - - Color - Color - - - diff --git a/plugin-sensors/translations/sensors_es_VE.ts b/plugin-sensors/translations/sensors_es_VE.ts deleted file mode 100644 index ccfac46..0000000 --- a/plugin-sensors/translations/sensors_es_VE.ts +++ /dev/null @@ -1,86 +0,0 @@ - - - - - LXQtSensorsConfiguration - - LXQt Sensors Settings - preferencias de sensor LXQt - - - - Sensors Settings - - - - - Common - Comunes - - - - Update interval (seconds) - Intervalo de actualizacion (segundos) - - - - Temperature bar width - Ancho de la barra indicadora - - - - Temperature scale - Escala de temperatura - - - - Celsius - Celcios - - - - Fahrenheit - Fahrenheit - - - - Blink progress bars when the temperature is too high - parpadear la barra de indicacion cuando la temperatura es alta - - - - Warning about high temperature - Advertir acerca de altas temperaturas - - - - Sensors - Sensores - - - - Detected chips: - Chips detectados - - - - Chip features: - Chips caracteristicas: - - - - Enabled - Habilitado - - - - Label - Etiqueta - - - - Color - Color - - - diff --git a/plugin-sensors/translations/sensors_eu.ts b/plugin-sensors/translations/sensors_eu.ts deleted file mode 100644 index 3e25448..0000000 --- a/plugin-sensors/translations/sensors_eu.ts +++ /dev/null @@ -1,86 +0,0 @@ - - - - - LXQtSensorsConfiguration - - LXQt Sensors Settings - LXQt sentsoreen ezarpenak - - - - Sensors Settings - - - - - Common - Komuna - - - - Update interval (seconds) - Eguneraketa tartea (segundoak) - - - - Temperature bar width - Tenperatura-barraren zabalera - - - - Temperature scale - Tenperaturaren eskala - - - - Celsius - Celsius - - - - Fahrenheit - Fahrenheit - - - - Blink progress bars when the temperature is too high - Kliskatu aurrerapen-barrak tenperatura altuegia denean - - - - Warning about high temperature - Tenperatura altuari buruzko abisua - - - - Sensors - Sentsoreak - - - - Detected chips: - Detektatutako txipak - - - - Chip features: - Txiparen ezaugarriak: - - - - Enabled - Gaituta - - - - Label - Etiketa - - - - Color - Kolorea - - - diff --git a/plugin-sensors/translations/sensors_fi.ts b/plugin-sensors/translations/sensors_fi.ts deleted file mode 100644 index 5c0099d..0000000 --- a/plugin-sensors/translations/sensors_fi.ts +++ /dev/null @@ -1,82 +0,0 @@ - - - - - LXQtSensorsConfiguration - - - Sensors Settings - - - - - Common - - - - - Update interval (seconds) - Päivitysväli (sekunneissa) - - - - Temperature bar width - - - - - Temperature scale - - - - - Celsius - Celsius - - - - Fahrenheit - Fahrenheit - - - - Blink progress bars when the temperature is too high - - - - - Warning about high temperature - Varoitus korkeasta lämpötilasta - - - - Sensors - - - - - Detected chips: - - - - - Chip features: - - - - - Enabled - Käytössä - - - - Label - Nimike - - - - Color - Väri - - - diff --git a/plugin-sensors/translations/sensors_fr_FR.ts b/plugin-sensors/translations/sensors_fr_FR.ts deleted file mode 100644 index 7c4c1c5..0000000 --- a/plugin-sensors/translations/sensors_fr_FR.ts +++ /dev/null @@ -1,82 +0,0 @@ - - - - - LXQtSensorsConfiguration - - - Sensors Settings - - - - - Common - - - - - Update interval (seconds) - - - - - Temperature bar width - - - - - Temperature scale - - - - - Celsius - - - - - Fahrenheit - - - - - Blink progress bars when the temperature is too high - - - - - Warning about high temperature - - - - - Sensors - Capteurs - - - - Detected chips: - - - - - Chip features: - - - - - Enabled - - - - - Label - - - - - Color - - - - diff --git a/plugin-sensors/translations/sensors_hu.ts b/plugin-sensors/translations/sensors_hu.ts deleted file mode 100644 index 1f31d68..0000000 --- a/plugin-sensors/translations/sensors_hu.ts +++ /dev/null @@ -1,82 +0,0 @@ - - - - - LXQtSensorsConfiguration - - - Sensors Settings - Érzékelők beállítása - - - - Common - Általános - - - - Update interval (seconds) - Frissítési köz (másodperc) - - - - Temperature bar width - Hősáv szélesség - - - - Temperature scale - Hőfok skálaérték - - - - Celsius - - - - - Fahrenheit - - - - - Blink progress bars when the temperature is too high - A mutatósáv túl nagy hőfoknál villog - - - - Warning about high temperature - Nagy hőfoknál figyelmeztetés - - - - Sensors - Érzékelők - - - - Detected chips: - Észlelt érzékelők: - - - - Chip features: - Érzékelő jellemzői: - - - - Enabled - Engedélyezve - - - - Label - Felirat - - - - Color - Szín - - - diff --git a/plugin-sensors/translations/sensors_hu_HU.ts b/plugin-sensors/translations/sensors_hu_HU.ts deleted file mode 100644 index 5ca69cb..0000000 --- a/plugin-sensors/translations/sensors_hu_HU.ts +++ /dev/null @@ -1,82 +0,0 @@ - - - - - LXQtSensorsConfiguration - - - Sensors Settings - Érzékelők beállítása - - - - Common - Általános - - - - Update interval (seconds) - Frissítési köz (másodperc) - - - - Temperature bar width - Hősáv szélesség - - - - Temperature scale - Hőfok skálaérték - - - - Celsius - - - - - Fahrenheit - - - - - Blink progress bars when the temperature is too high - A mutatósáv túl nagy hőfoknál villog - - - - Warning about high temperature - Nagy hőfoknál figyelmeztetés - - - - Sensors - Érzékelők - - - - Detected chips: - Észlelt érzékelők: - - - - Chip features: - Érzékelő jellemzői: - - - - Enabled - Engedélyezve - - - - Label - Felirat - - - - Color - Szín - - - diff --git a/plugin-sensors/translations/sensors_it.ts b/plugin-sensors/translations/sensors_it.ts deleted file mode 100644 index 7825fd4..0000000 --- a/plugin-sensors/translations/sensors_it.ts +++ /dev/null @@ -1,86 +0,0 @@ - - - - - LXQtSensorsConfiguration - - LXQt Sensors Settings - Impostazioni dei sensori di LXQt - - - - Sensors Settings - Impostazioni sensori - - - - Common - Comune - - - - Update interval (seconds) - Intervallo di aggiornamento (secondi) - - - - Temperature bar width - Larghezza della barra della temperatura - - - - Temperature scale - Scala della temperatura - - - - Celsius - Celsius - - - - Fahrenheit - Fahrenheit - - - - Blink progress bars when the temperature is too high - Barre di avanzamento lampeggianti quando la temperatura è troppo elevata - - - - Warning about high temperature - Avvertimento per la temperatura elevata - - - - Sensors - Sensori - - - - Detected chips: - Chip rilevati: - - - - Chip features: - Caratteristiche del chip: - - - - Enabled - Attivato - - - - Label - Etichetta - - - - Color - Colore - - - diff --git a/plugin-sensors/translations/sensors_ja.ts b/plugin-sensors/translations/sensors_ja.ts deleted file mode 100644 index 34b310d..0000000 --- a/plugin-sensors/translations/sensors_ja.ts +++ /dev/null @@ -1,82 +0,0 @@ - - - - - LXQtSensorsConfiguration - - - Sensors Settings - センサーウィジェットの設定 - - - - Common - 共通 - - - - Update interval (seconds) - 更新頻度(秒) - - - - Temperature bar width - 温度バーの幅 - - - - Temperature scale - 温度の単位 - - - - Celsius - 摂氏 - - - - Fahrenheit - 華氏 - - - - Blink progress bars when the temperature is too high - 高温時にバーを点滅 - - - - Warning about high temperature - 高温時に警告 - - - - Sensors - センサー - - - - Detected chips: - 検出されたチップ - - - - Chip features: - チップの機能: - - - - Enabled - 有効 - - - - Label - ラベル - - - - Color - 色 - - - diff --git a/plugin-sensors/translations/sensors_pl_PL.ts b/plugin-sensors/translations/sensors_pl_PL.ts deleted file mode 100644 index 0c11504..0000000 --- a/plugin-sensors/translations/sensors_pl_PL.ts +++ /dev/null @@ -1,86 +0,0 @@ - - - - - LXQtSensorsConfiguration - - LXQt Sensors Settings - Ustawienia LXQt Sensors - - - - Sensors Settings - - - - - Common - Ogólne - - - - Update interval (seconds) - Częstotliwość odświeżania (sekundy) - - - - Temperature bar width - Szerokość paska stanu temperatury - - - - Temperature scale - Skala temperatury - - - - Celsius - Celsjusz - - - - Fahrenheit - Fahrenheit - - - - Blink progress bars when the temperature is too high - Mruganie pasków stanu kiedy temperatura jest za wysoka - - - - Warning about high temperature - Ostrzeżenie o wysokiej temperaturze - - - - Sensors - Sensory - - - - Detected chips: - Wykryte chipy: - - - - Chip features: - Cechy chipu: - - - - Enabled - Włączone - - - - Label - Etykieta - - - - Color - Kolor - - - diff --git a/plugin-sensors/translations/sensors_pt.ts b/plugin-sensors/translations/sensors_pt.ts deleted file mode 100644 index ecd3e8d..0000000 --- a/plugin-sensors/translations/sensors_pt.ts +++ /dev/null @@ -1,86 +0,0 @@ - - - - - LXQtSensorsConfiguration - - LXQt Sensors Settings - Definições dos sensores do LXQt - - - - Sensors Settings - - - - - Common - Geral - - - - Update interval (seconds) - Intervalo de atualização (segundos) - - - - Temperature bar width - Largura da barra de temperatura - - - - Temperature scale - Unidade de medida - - - - Celsius - Celsius - - - - Fahrenheit - Fahrenheit - - - - Blink progress bars when the temperature is too high - Barras de evolução intermitentes se a temperatura for elevada - - - - Warning about high temperature - Avisar sobre a temperatura elevada - - - - Sensors - Sensores - - - - Detected chips: - Circuitos detetados: - - - - Chip features: - Funcionalidades do circuito: - - - - Enabled - Ativo - - - - Label - Texto - - - - Color - Cor - - - diff --git a/plugin-sensors/translations/sensors_pt_BR.ts b/plugin-sensors/translations/sensors_pt_BR.ts deleted file mode 100644 index f14afea..0000000 --- a/plugin-sensors/translations/sensors_pt_BR.ts +++ /dev/null @@ -1,86 +0,0 @@ - - - - - LXQtSensorsConfiguration - - LXQt Sensors Settings - Configuraçoes Dos Sensores - - - - Sensors Settings - - - - - Common - Comum - - - - Update interval (seconds) - Intervalo de atualização (segundos) - - - - Temperature bar width - Temperatura em barra com - - - - Temperature scale - Temperatura em escala - - - - Celsius - Celsius - - - - Fahrenheit - Fahrenheit - - - - Blink progress bars when the temperature is too high - Piscar a barra de progresso quando a temperatura está muito alta - - - - Warning about high temperature - Alertar sobre a alta temperatura - - - - Sensors - Sensores - - - - Detected chips: - Chips detectados: - - - - Chip features: - Características do chips: - - - - Enabled - Habilitado - - - - Label - Rótulo - - - - Color - Cor - - - diff --git a/plugin-sensors/translations/sensors_ro_RO.ts b/plugin-sensors/translations/sensors_ro_RO.ts deleted file mode 100644 index e1884b6..0000000 --- a/plugin-sensors/translations/sensors_ro_RO.ts +++ /dev/null @@ -1,82 +0,0 @@ - - - - - LXQtSensorsConfiguration - - - Sensors Settings - - - - - Common - - - - - Update interval (seconds) - Interval de actualizare (secunde) - - - - Temperature bar width - - - - - Temperature scale - - - - - Celsius - Celsius - - - - Fahrenheit - Fahrenheit - - - - Blink progress bars when the temperature is too high - - - - - Warning about high temperature - - - - - Sensors - Senzori - - - - Detected chips: - - - - - Chip features: - - - - - Enabled - - - - - Label - Etichetă - - - - Color - Culoare - - - diff --git a/plugin-sensors/translations/sensors_ru.ts b/plugin-sensors/translations/sensors_ru.ts deleted file mode 100644 index ba47cfd..0000000 --- a/plugin-sensors/translations/sensors_ru.ts +++ /dev/null @@ -1,82 +0,0 @@ - - - - - LXQtSensorsConfiguration - - - Sensors Settings - Настройки сенсоров - - - - Common - Общие - - - - Update interval (seconds) - Интервал обновления (секунды) - - - - Temperature bar width - Ширина температурной шкалы - - - - Temperature scale - Температурная шкала - - - - Celsius - По Цельсию - - - - Fahrenheit - По Фаренгейту - - - - Blink progress bars when the temperature is too high - Мигать индикатором состояния когда температура слишком высока - - - - Warning about high temperature - Предупреждать о высокой температуре - - - - Sensors - Сенсоры - - - - Detected chips: - Обнаруженые чипы: - - - - Chip features: - Возможности чипов: - - - - Enabled - Включён - - - - Label - Метка - - - - Color - Цвет - - - diff --git a/plugin-sensors/translations/sensors_ru_RU.desktop b/plugin-sensors/translations/sensors_ru_RU.desktop deleted file mode 100644 index 8c01516..0000000 --- a/plugin-sensors/translations/sensors_ru_RU.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Sensors -Comment=View readings from hardware sensors. - - -# Translations -Name[ru_RU]=Сенсоры -Comment[ru_RU]=Посмотреть данные с аппаратных сенсоров. \ No newline at end of file diff --git a/plugin-sensors/translations/sensors_ru_RU.ts b/plugin-sensors/translations/sensors_ru_RU.ts deleted file mode 100644 index 5a2848d..0000000 --- a/plugin-sensors/translations/sensors_ru_RU.ts +++ /dev/null @@ -1,82 +0,0 @@ - - - - - LXQtSensorsConfiguration - - - Sensors Settings - Настройки сенсоров - - - - Common - Общие - - - - Update interval (seconds) - Интервал обновления (секунды) - - - - Temperature bar width - Ширина температурной шкалы - - - - Temperature scale - Температурная шкала - - - - Celsius - По Цельсию - - - - Fahrenheit - По Фаренгейту - - - - Blink progress bars when the temperature is too high - Мигать индикатором состояния когда температура слишком высока - - - - Warning about high temperature - Предупреждать о высокой температуре - - - - Sensors - Сенсоры - - - - Detected chips: - Обнаруженые чипы: - - - - Chip features: - Возможности чипов: - - - - Enabled - Включён - - - - Label - Метка - - - - Color - Цвет - - - diff --git a/plugin-sensors/translations/sensors_th_TH.ts b/plugin-sensors/translations/sensors_th_TH.ts deleted file mode 100644 index 66e914e..0000000 --- a/plugin-sensors/translations/sensors_th_TH.ts +++ /dev/null @@ -1,86 +0,0 @@ - - - - - LXQtSensorsConfiguration - - LXQt Sensors Settings - ค่าตั้งตัวตรวจจับ LXQt - - - - Sensors Settings - - - - - Common - ทั่วไป - - - - Update interval (seconds) - ทิ้งระยะการปรับข้อมูล (วินาที) - - - - Temperature bar width - ความกว้างแถบแสดงอุณหภูมิ - - - - Temperature scale - หน่วยของอุณหภูมิ - - - - Celsius - เซลเซียส - - - - Fahrenheit - ฟาห์เรนไฮต์ - - - - Blink progress bars when the temperature is too high - กระพริบตรงแถบเมื่ออุณหภูมิสูงเกินไป - - - - Warning about high temperature - การเตือนเกี่ยวกับอุณภูมิที่สูงเกินไป - - - - Sensors - ตัวตรวจจับ - - - - Detected chips: - ชิปที่พบ: - - - - Chip features: - คุณสมบัติชิป: - - - - Enabled - เปิดใช้ - - - - Label - ป้าย - - - - Color - สี - - - diff --git a/plugin-sensors/translations/sensors_uk.ts b/plugin-sensors/translations/sensors_uk.ts deleted file mode 100644 index fcb27d0..0000000 --- a/plugin-sensors/translations/sensors_uk.ts +++ /dev/null @@ -1,86 +0,0 @@ - - - - - LXQtSensorsConfiguration - - LXQt Sensors Settings - Налаштування сенсорів LXQt - - - - Sensors Settings - - - - - Common - Загальне - - - - Update interval (seconds) - Період поновлення (в секундах) - - - - Temperature bar width - Ширина планки температури - - - - Temperature scale - Шкала температури - - - - Celsius - Цельсія - - - - Fahrenheit - Фаренгейта - - - - Blink progress bars when the temperature is too high - Блимати планками прогресу при занадто високій температурі - - - - Warning about high temperature - Попереджати про високу температуру - - - - Sensors - Сенсори - - - - Detected chips: - Виявлені мікросхеми: - - - - Chip features: - Особливості мікросхеми: - - - - Enabled - Включено - - - - Label - Позначка - - - - Color - Колір - - - diff --git a/plugin-sensors/translations/sensors_zh_CN.ts b/plugin-sensors/translations/sensors_zh_CN.ts deleted file mode 100644 index 58ebf12..0000000 --- a/plugin-sensors/translations/sensors_zh_CN.ts +++ /dev/null @@ -1,86 +0,0 @@ - - - - - LXQtSensorsConfiguration - - LXQt Sensors Settings - LXQt 监测器设置 - - - - Sensors Settings - - - - - Common - 常规 - - - - Update interval (seconds) - 更新间隔(秒) - - - - Temperature bar width - 温度条宽度 - - - - Temperature scale - 温标 - - - - Celsius - 摄氏度 - - - - Fahrenheit - 华氏度 - - - - Blink progress bars when the temperature is too high - 温度过高时闪动进度条 - - - - Warning about high temperature - 高温警告 - - - - Sensors - 监测器 - - - - Detected chips: - 已测芯片： - - - - Chip features: - 芯片功能： - - - - Enabled - 已启用 - - - - Label - 标注 - - - - Color - 颜色 - - - diff --git a/plugin-sensors/translations/sensors_zh_TW.ts b/plugin-sensors/translations/sensors_zh_TW.ts deleted file mode 100644 index 5857223..0000000 --- a/plugin-sensors/translations/sensors_zh_TW.ts +++ /dev/null @@ -1,86 +0,0 @@ - - - - - LXQtSensorsConfiguration - - LXQt Sensors Settings - LXQt溫度感應設定 - - - - Sensors Settings - - - - - Common - 一般 - - - - Update interval (seconds) - 更新間隔(秒) - - - - Temperature bar width - 溫度計寬度 - - - - Temperature scale - 溫標 - - - - Celsius - 攝氏 - - - - Fahrenheit - 華式 - - - - Blink progress bars when the temperature is too high - 當溫度太高時溫度計閃爍 - - - - Warning about high temperature - 高溫警告 - - - - Sensors - 感應器 - - - - Detected chips: - 偵測晶片: - - - - Chip features: - 晶片資訊 - - - - Enabled - 允許 - - - - Label - 標籤 - - - - Color - 顏色 - - - diff --git a/plugin-showdesktop/showdesktop.cpp b/plugin-showdesktop/showdesktop.cpp index 461b9a4..f30f9f7 100644 --- a/plugin-showdesktop/showdesktop.cpp +++ b/plugin-showdesktop/showdesktop.cpp @@ -25,7 +25,6 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#include #include #include #include @@ -34,6 +33,7 @@ #include #include #include "showdesktop.h" +#include "../panel/pluginsettings.h" // Still needed for lxde/lxqt#338 #include @@ -57,6 +57,7 @@ ShowDesktop::ShowDesktop(const ILXQtPanelPluginStartupInfo &startupInfo) : mButton.setDefaultAction(act); mButton.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + mButton.setAutoRaise(true); } void ShowDesktop::shortcutRegistered() diff --git a/plugin-showdesktop/translations/showdesktop.ts b/plugin-showdesktop/translations/showdesktop.ts deleted file mode 100644 index a6c2691..0000000 --- a/plugin-showdesktop/translations/showdesktop.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - - - - - Show Desktop - - - - diff --git a/plugin-showdesktop/translations/showdesktop_ar.desktop b/plugin-showdesktop/translations/showdesktop_ar.desktop index 40ba49d..6b9e22c 100644 --- a/plugin-showdesktop/translations/showdesktop_ar.desktop +++ b/plugin-showdesktop/translations/showdesktop_ar.desktop @@ -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[ar]=تصغير كافَّة النَّوافذ وإظهار سطح المكتب -Name[ar]=إظهار سطح المكتب +Comment[ar]=تصغّر كلّ النّوافذ وتُظهر سطح المكتب +Name[ar]=أظهر سطح المكتب diff --git a/plugin-showdesktop/translations/showdesktop_ar.ts b/plugin-showdesktop/translations/showdesktop_ar.ts deleted file mode 100644 index e2b1e08..0000000 --- a/plugin-showdesktop/translations/showdesktop_ar.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - إظهار سطح المكتب: ﻻ يمكن تسجيل اختصار لوحة المفاتيح العامُّ `%1` - - - - Show Desktop - إظهار سطح المكتب - - - diff --git a/plugin-showdesktop/translations/showdesktop_cs.ts b/plugin-showdesktop/translations/showdesktop_cs.ts deleted file mode 100644 index 8093964..0000000 --- a/plugin-showdesktop/translations/showdesktop_cs.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - Ukázat plochu: Celkovou zkratku '%1' nelze zapsat - - - - Show Desktop - Ukázat pracovní plochu - - - diff --git a/plugin-showdesktop/translations/showdesktop_cs_CZ.ts b/plugin-showdesktop/translations/showdesktop_cs_CZ.ts deleted file mode 100644 index cdaae29..0000000 --- a/plugin-showdesktop/translations/showdesktop_cs_CZ.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - Ukázat plochu: Celkovou zkratku '%1' nelze zapsat - - - - Show Desktop - Ukázat pracovní plochu - - - diff --git a/plugin-showdesktop/translations/showdesktop_da.ts b/plugin-showdesktop/translations/showdesktop_da.ts deleted file mode 100644 index ab2af5c..0000000 --- a/plugin-showdesktop/translations/showdesktop_da.ts +++ /dev/null @@ -1,30 +0,0 @@ - - - - - ShowDesktop - - Global keyboard shortcut - Global tastaturgenvej - - - Panel Show Desktop Global shortcut: '%1' cannot be registered - Global genvej for Vis Skrivebord : '%1' kan ikke registreres - - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - - - - - Show Desktop - Vis skrivebord - - - diff --git a/plugin-showdesktop/translations/showdesktop_da_DK.ts b/plugin-showdesktop/translations/showdesktop_da_DK.ts deleted file mode 100644 index 158a56f..0000000 --- a/plugin-showdesktop/translations/showdesktop_da_DK.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - Vis Skrivebord: Global genvej '%1' kan ikke registreres - - - - Show Desktop - Vis Skrivebord - - - diff --git a/plugin-showdesktop/translations/showdesktop_de.ts b/plugin-showdesktop/translations/showdesktop_de.ts deleted file mode 100644 index f00c7af..0000000 --- a/plugin-showdesktop/translations/showdesktop_de.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - Arbeitsfläche anzeigen - - - - Show Desktop - Arbeitsfläche anzeigen - - - - Show Desktop: Global shortcut '%1' cannot be registered - Das globale Tastaturkürzel zum Arbeitsfläche anzeigen '%1' kann nicht registriert werden - - - diff --git a/plugin-showdesktop/translations/showdesktop_el.ts b/plugin-showdesktop/translations/showdesktop_el.ts deleted file mode 100644 index a0af6d4..0000000 --- a/plugin-showdesktop/translations/showdesktop_el.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - Εμφάνιση επιφάνειας εργασίας - - - - Show Desktop: Global shortcut '%1' cannot be registered - Εμφάνιση επιφάνειας εργασίας: Δεν είναι δυνατή η καταχώριση της καθολικής συντόμευσης "%1" - - - - Show Desktop - Εμφάνιση επιφάνειας εργασίας - - - diff --git a/plugin-showdesktop/translations/showdesktop_eo.ts b/plugin-showdesktop/translations/showdesktop_eo.ts deleted file mode 100644 index c4bfe66..0000000 --- a/plugin-showdesktop/translations/showdesktop_eo.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - Montri labortablon: ĉiea klavkombino '%1' ne registreblas - - - - Show Desktop - Montri labortablon - - - diff --git a/plugin-showdesktop/translations/showdesktop_es.ts b/plugin-showdesktop/translations/showdesktop_es.ts deleted file mode 100644 index d947a16..0000000 --- a/plugin-showdesktop/translations/showdesktop_es.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - Mostrar Escritorio: Atajo global '%1' no puede ser registrado - - - - Show Desktop - Mostrar Escritorio - - - diff --git a/plugin-showdesktop/translations/showdesktop_es_VE.ts b/plugin-showdesktop/translations/showdesktop_es_VE.ts deleted file mode 100644 index d310ccc..0000000 --- a/plugin-showdesktop/translations/showdesktop_es_VE.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - Mostrar escritorio: Acceso de teclado global '%1' no puede registrarse - - - - Show Desktop - Mostrar Escritorio - - - diff --git a/plugin-showdesktop/translations/showdesktop_eu.ts b/plugin-showdesktop/translations/showdesktop_eu.ts deleted file mode 100644 index 65f79ca..0000000 --- a/plugin-showdesktop/translations/showdesktop_eu.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - Erakutsi mahaigaina: Ezin da '%1' lasterbide globala erregistratu - - - - Show Desktop - Erakutsi mahaigaina - - - diff --git a/plugin-showdesktop/translations/showdesktop_fi.ts b/plugin-showdesktop/translations/showdesktop_fi.ts deleted file mode 100644 index 24025ec..0000000 --- a/plugin-showdesktop/translations/showdesktop_fi.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - Näytä työpöytä: globaalia pikanäppäintä '%1' ei voi rekisteröidä - - - - Show Desktop - Näytä työpöytä - - - diff --git a/plugin-showdesktop/translations/showdesktop_fr_FR.ts b/plugin-showdesktop/translations/showdesktop_fr_FR.ts deleted file mode 100644 index ebf9d2d..0000000 --- a/plugin-showdesktop/translations/showdesktop_fr_FR.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - Montrer le bureau : le raccourci global '%1' ne peut pas être défini - - - - Show Desktop - Montrer le bureau - - - diff --git a/plugin-showdesktop/translations/showdesktop_hu.ts b/plugin-showdesktop/translations/showdesktop_hu.ts deleted file mode 100644 index 8975255..0000000 --- a/plugin-showdesktop/translations/showdesktop_hu.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - Asztalmegjelenítés - - - - Show Desktop: Global shortcut '%1' cannot be registered - Asztalmegjelenítés: A '%1' gyorsbillentyű nem regisztrálható - - - - Show Desktop - Asztalmegjelenítés - - - diff --git a/plugin-showdesktop/translations/showdesktop_hu_HU.ts b/plugin-showdesktop/translations/showdesktop_hu_HU.ts deleted file mode 100644 index a3dfb55..0000000 --- a/plugin-showdesktop/translations/showdesktop_hu_HU.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - Asztalmegjelenítés - - - - Show Desktop: Global shortcut '%1' cannot be registered - Asztalmegjelenítés: A '%1' gyorsbillentyű nem regisztrálható - - - - Show Desktop - Asztalmegjelenítés - - - diff --git a/plugin-showdesktop/translations/showdesktop_ia.ts b/plugin-showdesktop/translations/showdesktop_ia.ts deleted file mode 100644 index e6ab8cb..0000000 --- a/plugin-showdesktop/translations/showdesktop_ia.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - - - - - Show Desktop - - - - diff --git a/plugin-showdesktop/translations/showdesktop_id_ID.ts b/plugin-showdesktop/translations/showdesktop_id_ID.ts deleted file mode 100644 index 2b356d5..0000000 --- a/plugin-showdesktop/translations/showdesktop_id_ID.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - - - - - Show Desktop - Tampilkan Desktop - - - diff --git a/plugin-showdesktop/translations/showdesktop_it.ts b/plugin-showdesktop/translations/showdesktop_it.ts deleted file mode 100644 index 964671c..0000000 --- a/plugin-showdesktop/translations/showdesktop_it.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - Mostra scrivania - - - - Show Desktop: Global shortcut '%1' cannot be registered - Mostra scrivania: la scorciatoia globale '%1' non può essere registrata - - - - Show Desktop - Mostra scrivania - - - diff --git a/plugin-showdesktop/translations/showdesktop_ja.ts b/plugin-showdesktop/translations/showdesktop_ja.ts deleted file mode 100644 index 19d0152..0000000 --- a/plugin-showdesktop/translations/showdesktop_ja.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - デスクトップの表示: グローバルなショートカット '%1' は登録できません - - - - Show Desktop - デスクトップを表示 - - - diff --git a/plugin-showdesktop/translations/showdesktop_ko.ts b/plugin-showdesktop/translations/showdesktop_ko.ts deleted file mode 100644 index bc35785..0000000 --- a/plugin-showdesktop/translations/showdesktop_ko.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - - - - - Show Desktop - - - - diff --git a/plugin-showdesktop/translations/showdesktop_lt.ts b/plugin-showdesktop/translations/showdesktop_lt.ts deleted file mode 100644 index e15e2b0..0000000 --- a/plugin-showdesktop/translations/showdesktop_lt.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - Rodyti darbalaukį: globalusis klavišas „%1“ negali būti registruojamas - - - - Show Desktop - Rodyti darbalaukį - - - diff --git a/plugin-showdesktop/translations/showdesktop_nl.ts b/plugin-showdesktop/translations/showdesktop_nl.ts deleted file mode 100644 index bdaf9c0..0000000 --- a/plugin-showdesktop/translations/showdesktop_nl.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - Bureaublad weergeven: systeembrede sneltoets '%1' kan niet worden geregistreerd - - - - Show Desktop - Toon bureaublad - - - diff --git a/plugin-showdesktop/translations/showdesktop_pl_PL.ts b/plugin-showdesktop/translations/showdesktop_pl_PL.ts deleted file mode 100644 index 9793ae5..0000000 --- a/plugin-showdesktop/translations/showdesktop_pl_PL.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - Pokaż Pulpit: Globalny skrót '%1' nie może zostać zarejestrowany - - - - Show Desktop - Pokaż pulpit - - - diff --git a/plugin-showdesktop/translations/showdesktop_pt.ts b/plugin-showdesktop/translations/showdesktop_pt.ts deleted file mode 100644 index 1ae73d2..0000000 --- a/plugin-showdesktop/translations/showdesktop_pt.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - Tecla de atalho global: '%1' não pode ser registada - - - - Show Desktop - Mostrar área de trabalho - - - diff --git a/plugin-showdesktop/translations/showdesktop_pt_BR.ts b/plugin-showdesktop/translations/showdesktop_pt_BR.ts deleted file mode 100644 index 777d91f..0000000 --- a/plugin-showdesktop/translations/showdesktop_pt_BR.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - Mostrar Área De Trabalho: Atalho Global '%1'não pode se registrado - - - - Show Desktop - Exibir a área de trabalho - - - diff --git a/plugin-showdesktop/translations/showdesktop_ro_RO.ts b/plugin-showdesktop/translations/showdesktop_ro_RO.ts deleted file mode 100644 index 9deca7c..0000000 --- a/plugin-showdesktop/translations/showdesktop_ro_RO.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - - - - - Show Desktop - Afișează desktopul - - - diff --git a/plugin-showdesktop/translations/showdesktop_ru.ts b/plugin-showdesktop/translations/showdesktop_ru.ts deleted file mode 100644 index 10a1e7b..0000000 --- a/plugin-showdesktop/translations/showdesktop_ru.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - Показать рабочий стол - - - - Show Desktop: Global shortcut '%1' cannot be registered - Показать рабочий стол: глобальное сочетание клавиш '%1' не может быть зарегистрировано - - - - Show Desktop - Показать рабочий стол - - - diff --git a/plugin-showdesktop/translations/showdesktop_ru_RU.desktop b/plugin-showdesktop/translations/showdesktop_ru_RU.desktop deleted file mode 100644 index dcca717..0000000 --- a/plugin-showdesktop/translations/showdesktop_ru_RU.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Show desktop -Comment=Minimize all windows and show the desktop - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ru_RU]=Свернуть все окна и показать рабочий стол. -Name[ru_RU]=Показать рабочий стол diff --git a/plugin-showdesktop/translations/showdesktop_ru_RU.ts b/plugin-showdesktop/translations/showdesktop_ru_RU.ts deleted file mode 100644 index c6d4427..0000000 --- a/plugin-showdesktop/translations/showdesktop_ru_RU.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - Показать рабочий стол - - - - Show Desktop: Global shortcut '%1' cannot be registered - Показать рабочий стол: глобальное сочетание клавиш '%1' не может быть зарегистрировано - - - - Show Desktop - Показать рабочий стол - - - diff --git a/plugin-showdesktop/translations/showdesktop_sk_SK.ts b/plugin-showdesktop/translations/showdesktop_sk_SK.ts deleted file mode 100644 index 9d31aa4..0000000 --- a/plugin-showdesktop/translations/showdesktop_sk_SK.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - - - - - Show Desktop - Zobraziť plochu - - - diff --git a/plugin-showdesktop/translations/showdesktop_sl.ts b/plugin-showdesktop/translations/showdesktop_sl.ts deleted file mode 100644 index eb9b10a..0000000 --- a/plugin-showdesktop/translations/showdesktop_sl.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - Prikaz namizja: globalne bližnjice »%1« ni moč registrirati - - - - Show Desktop - Pokaži namizje - - - diff --git a/plugin-showdesktop/translations/showdesktop_sr@latin.ts b/plugin-showdesktop/translations/showdesktop_sr@latin.ts deleted file mode 100644 index 6a772ca..0000000 --- a/plugin-showdesktop/translations/showdesktop_sr@latin.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - - - - - Show Desktop - - - - diff --git a/plugin-showdesktop/translations/showdesktop_sr_BA.ts b/plugin-showdesktop/translations/showdesktop_sr_BA.ts deleted file mode 100644 index 46543f8..0000000 --- a/plugin-showdesktop/translations/showdesktop_sr_BA.ts +++ /dev/null @@ -1,30 +0,0 @@ - - - - - ShowDesktop - - Global keyboard shortcut - Глобална пречица тастатуре - - - Panel Show Desktop Global shortcut: '%1' cannot be registered - Глобална пречица приказа површи за панел: „%1“ не може бити регистрована - - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - - - - - Show Desktop - Прикажи радну површ - - - diff --git a/plugin-showdesktop/translations/showdesktop_sr_RS.ts b/plugin-showdesktop/translations/showdesktop_sr_RS.ts deleted file mode 100644 index c5e55e3..0000000 --- a/plugin-showdesktop/translations/showdesktop_sr_RS.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - - - - - Show Desktop - Прикажи радну површ - - - diff --git a/plugin-showdesktop/translations/showdesktop_th_TH.ts b/plugin-showdesktop/translations/showdesktop_th_TH.ts deleted file mode 100644 index ca8ab32..0000000 --- a/plugin-showdesktop/translations/showdesktop_th_TH.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - แสดงพื้นโต๊ะ: ไม่สามารถตั้ง '%1' เป็นปุ่มลัดส่วนกลางได้ - - - - Show Desktop - แสดงพื้นโต๊ะ - - - diff --git a/plugin-showdesktop/translations/showdesktop_tr.ts b/plugin-showdesktop/translations/showdesktop_tr.ts deleted file mode 100644 index ed70e01..0000000 --- a/plugin-showdesktop/translations/showdesktop_tr.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - Masaüstünü Göster: '%1' genel kısayolu kaydedilemiyor - - - - Show Desktop - Masaüstünü Göster - - - diff --git a/plugin-showdesktop/translations/showdesktop_uk.ts b/plugin-showdesktop/translations/showdesktop_uk.ts deleted file mode 100644 index 0229e03..0000000 --- a/plugin-showdesktop/translations/showdesktop_uk.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - Показати стільницю: Не вдалося зареєструвати глобальне скорочення '%1' - - - - Show Desktop - Показати стільницю - - - diff --git a/plugin-showdesktop/translations/showdesktop_zh_CN.ts b/plugin-showdesktop/translations/showdesktop_zh_CN.ts deleted file mode 100644 index 33da8b3..0000000 --- a/plugin-showdesktop/translations/showdesktop_zh_CN.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - 显示桌面：无法注册全局快捷键'%1' - - - - Show Desktop - 显示桌面 - - - diff --git a/plugin-showdesktop/translations/showdesktop_zh_TW.ts b/plugin-showdesktop/translations/showdesktop_zh_TW.ts deleted file mode 100644 index 4190d5a..0000000 --- a/plugin-showdesktop/translations/showdesktop_zh_TW.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ShowDesktop - - - Show desktop - - - - - Show Desktop: Global shortcut '%1' cannot be registered - 顯示桌面:全域快捷鍵'%1'無法被註冊 - - - - Show Desktop - 顯示桌面 - - - diff --git a/plugin-spacer/spacer.cpp b/plugin-spacer/spacer.cpp index 0cb2987..2f5d163 100644 --- a/plugin-spacer/spacer.cpp +++ b/plugin-spacer/spacer.cpp @@ -26,15 +26,15 @@ #include "spacer.h" #include "spacerconfiguration.h" -#include +#include void SpacerWidget::setType(QString const & type) { if (type != mType) { mType = type; - style()->unpolish(this); - style()->polish(this); + QEvent e{QEvent::ThemeChange}; + QApplication::sendEvent(this, &e); } } @@ -43,8 +43,8 @@ void SpacerWidget::setOrientation(QString const & orientation) if (orientation != mOrientation) { mOrientation = orientation; - style()->unpolish(this); - style()->polish(this); + QEvent e{QEvent::ThemeChange}; + QApplication::sendEvent(this, &e); } } diff --git a/plugin-spacer/spacerconfiguration.cpp b/plugin-spacer/spacerconfiguration.cpp index 92aa7d4..b5fb013 100644 --- a/plugin-spacer/spacerconfiguration.cpp +++ b/plugin-spacer/spacerconfiguration.cpp @@ -36,10 +36,9 @@ const QStringList SpacerConfiguration::msTypes = { , QLatin1String(QT_TR_NOOP("invisible")) }; -SpacerConfiguration::SpacerConfiguration(QSettings *settings, QWidget *parent) - : QDialog(parent) - , ui(new Ui::SpacerConfiguration) - , mSettings(settings) +SpacerConfiguration::SpacerConfiguration(PluginSettings *settings, QWidget *parent) : + LXQtPanelPluginConfigDialog(settings, parent), + ui(new Ui::SpacerConfiguration) { setAttribute(Qt::WA_DeleteOnClose); setObjectName("SpacerConfigurationWindow"); @@ -62,16 +61,16 @@ SpacerConfiguration::~SpacerConfiguration() void SpacerConfiguration::loadSettings() { - ui->sizeSB->setValue(mSettings->value("size", 8).toInt()); - ui->typeCB->setCurrentIndex(ui->typeCB->findData(mSettings->value("spaceType", msTypes[0]).toString())); + ui->sizeSB->setValue(settings().value("size", 8).toInt()); + ui->typeCB->setCurrentIndex(ui->typeCB->findData(settings().value("spaceType", msTypes[0]).toString())); } void SpacerConfiguration::sizeChanged(int value) { - mSettings->setValue("size", value); + settings().setValue("size", value); } void SpacerConfiguration::typeChanged(int index) { - mSettings->setValue("spaceType", ui->typeCB->itemData(index, Qt::UserRole)); + settings().setValue("spaceType", ui->typeCB->itemData(index, Qt::UserRole)); } diff --git a/plugin-spacer/spacerconfiguration.h b/plugin-spacer/spacerconfiguration.h index dff712c..70b3055 100644 --- a/plugin-spacer/spacerconfiguration.h +++ b/plugin-spacer/spacerconfiguration.h @@ -28,23 +28,21 @@ #ifndef SPACERCONFIGURATION_H #define SPACERCONFIGURATION_H -#include +#include "../panel/lxqtpanelpluginconfigdialog.h" +#include "../panel/pluginsettings.h" -#include - -class QSettings; class QAbstractButton; namespace Ui { class SpacerConfiguration; } -class SpacerConfiguration : public QDialog +class SpacerConfiguration : public LXQtPanelPluginConfigDialog { Q_OBJECT public: - explicit SpacerConfiguration(QSettings *settings, QWidget *parent = 0); + explicit SpacerConfiguration(PluginSettings *settings, QWidget *parent = nullptr); ~SpacerConfiguration(); public: @@ -52,7 +50,6 @@ public: private: Ui::SpacerConfiguration *ui; - QSettings *mSettings; private slots: /* diff --git a/plugin-spacer/translations/spacer.ts b/plugin-spacer/translations/spacer.ts deleted file mode 100644 index 2f4886e..0000000 --- a/plugin-spacer/translations/spacer.ts +++ /dev/null @@ -1,37 +0,0 @@ - - - - - SpacerConfiguration - - - Spacer Settings - - - - - Space width: - - - - - Space type: - - - - - lined - - - - - dotted - - - - - invisible - - - - diff --git a/plugin-spacer/translations/spacer_ar.desktop b/plugin-spacer/translations/spacer_ar.desktop new file mode 100644 index 0000000..f874936 --- /dev/null +++ b/plugin-spacer/translations/spacer_ar.desktop @@ -0,0 +1,2 @@ +Name[ar]=مُباعد +Comment[ar]=مساحة بين الودجات diff --git a/plugin-spacer/translations/spacer_de.ts b/plugin-spacer/translations/spacer_de.ts deleted file mode 100644 index bea2914..0000000 --- a/plugin-spacer/translations/spacer_de.ts +++ /dev/null @@ -1,37 +0,0 @@ - - - - - SpacerConfiguration - - - Spacer Settings - Leerraum Einstellungen - - - - Space width: - Leerraumbreite: - - - - Space type: - Leerraumtyp: - - - - lined - liniert - - - - dotted - punktiert - - - - invisible - unsichtbar - - - diff --git a/plugin-spacer/translations/spacer_el.ts b/plugin-spacer/translations/spacer_el.ts deleted file mode 100644 index 3ef1a51..0000000 --- a/plugin-spacer/translations/spacer_el.ts +++ /dev/null @@ -1,37 +0,0 @@ - - - - - SpacerConfiguration - - - Spacer Settings - Ρυθμίσεις διαστήματος - - - - Space width: - Πλάτος διαστήματος: - - - - Space type: - Τύπος διαστήματος: - - - - lined - με γραμμές - - - - dotted - διάστικτο - - - - invisible - αόρατο - - - diff --git a/plugin-spacer/translations/spacer_hu.ts b/plugin-spacer/translations/spacer_hu.ts deleted file mode 100644 index 9ee4d68..0000000 --- a/plugin-spacer/translations/spacer_hu.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - SpacerConfiguration - - - Spacer Settings - Távtartóbeállítás - - - - Space width: - Távolság: - - - - Space type: - Táv típus: - - - diff --git a/plugin-spacer/translations/spacer_hu_HU.ts b/plugin-spacer/translations/spacer_hu_HU.ts deleted file mode 100644 index 9394c6c..0000000 --- a/plugin-spacer/translations/spacer_hu_HU.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - SpacerConfiguration - - - Spacer Settings - Távtartóbeállítás - - - - Space width: - Távolság: - - - - Space type: - Táv típus: - - - diff --git a/plugin-spacer/translations/spacer_it.ts b/plugin-spacer/translations/spacer_it.ts deleted file mode 100644 index f5a065c..0000000 --- a/plugin-spacer/translations/spacer_it.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - SpacerConfiguration - - - Spacer Settings - Impostazioni spaziatore - - - - Space width: - Larghezza: - - - - Space type: - Tipo: - - - diff --git a/plugin-spacer/translations/spacer_ru.ts b/plugin-spacer/translations/spacer_ru.ts deleted file mode 100644 index 23b35f2..0000000 --- a/plugin-spacer/translations/spacer_ru.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - SpacerConfiguration - - - Spacer Settings - Настройки разделителя - - - - Space width: - Ширина разделителя: - - - - Space type: - Тип разделителя: - - - diff --git a/plugin-spacer/translations/spacer_ru_RU.desktop b/plugin-spacer/translations/spacer_ru_RU.desktop deleted file mode 100644 index b8c65bf..0000000 --- a/plugin-spacer/translations/spacer_ru_RU.desktop +++ /dev/null @@ -1,2 +0,0 @@ -Name[ru_RU]=Разделитель -Comment[ru_RU]=Промежуток между виджетами diff --git a/plugin-spacer/translations/spacer_ru_RU.ts b/plugin-spacer/translations/spacer_ru_RU.ts deleted file mode 100644 index 2730852..0000000 --- a/plugin-spacer/translations/spacer_ru_RU.ts +++ /dev/null @@ -1,22 +0,0 @@ - - - - - SpacerConfiguration - - - Spacer Settings - Настройки разделителя - - - - Space width: - Ширина разделителя: - - - - Space type: - Тип разделителя: - - - diff --git a/plugin-spacer/translations/spacer_sk.ts b/plugin-spacer/translations/spacer_sk.ts deleted file mode 100644 index 4845e69..0000000 --- a/plugin-spacer/translations/spacer_sk.ts +++ /dev/null @@ -1,37 +0,0 @@ - - - - - SpacerConfiguration - - - Spacer Settings - Nastavenia medzery - - - - Space width: - Šírka medzery: - - - - Space type: - Typ medzery: - - - - lined - plná čiara - - - - dotted - bodkovaná čiara - - - - invisible - neviditeľná - - - diff --git a/plugin-statusnotifier/statusnotifierbutton.cpp b/plugin-statusnotifier/statusnotifierbutton.cpp index fb124c6..37d8c7f 100644 --- a/plugin-statusnotifier/statusnotifierbutton.cpp +++ b/plugin-statusnotifier/statusnotifierbutton.cpp @@ -33,7 +33,25 @@ #include #include "../panel/ilxqtpanelplugin.h" #include "sniasync.h" +#include +namespace +{ + /*! \brief specialized DBusMenuImporter to correctly create actions' icons based + * on name + */ + class MenuImporter : public DBusMenuImporter + { + public: + using DBusMenuImporter::DBusMenuImporter; + + protected: + virtual QIcon iconForName(const QString & name) override + { + return XdgIcon::fromTheme(name); + } + }; +} StatusNotifierButton::StatusNotifierButton(QString service, QString objectPath, ILXQtPanelPlugin* plugin, QWidget *parent) : QToolButton(parent), @@ -42,6 +60,7 @@ StatusNotifierButton::StatusNotifierButton(QString service, QString objectPath, mFallbackIcon(QIcon::fromTheme("application-x-executable")), mPlugin(plugin) { + setAutoRaise(true); interface = new SniAsync(service, objectPath, QDBusConnection::sessionBus(), this); connect(interface, &SniAsync::NewIcon, this, &StatusNotifierButton::newIcon); @@ -53,8 +72,7 @@ StatusNotifierButton::StatusNotifierButton(QString service, QString objectPath, interface->propertyGetAsync(QLatin1String("Menu"), [this] (QDBusObjectPath path) { if (!path.path().isEmpty()) { - mMenu = (new DBusMenuImporter(interface->service(), path.path(), this))->menu(); - dynamic_cast(*mMenu).setParent(this); + mMenu = (new MenuImporter{interface->service(), path.path(), this})->menu(); mMenu->setObjectName(QLatin1String("StatusNotifierMenu")); } }); @@ -129,11 +147,11 @@ void StatusNotifierButton::refetchIcon(Status status) if (themeDir.cd("hicolor") || (themeDir.cd("icons") && themeDir.cd("hicolor"))) { - QStringList sizes = themeDir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot); - foreach (QString dir, sizes) + const QStringList sizes = themeDir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot); + foreach (const QString &dir, sizes) { - QStringList dirs = QDir(themeDir.filePath(dir)).entryList(QDir::AllDirs | QDir::NoDotAndDotDot); - foreach (QString innerDir, dirs) + const QStringList dirs = QDir(themeDir.filePath(dir)).entryList(QDir::AllDirs | QDir::NoDotAndDotDot); + foreach (const QString &innerDir, dirs) { QString file = themeDir.absolutePath() + "/" + dir + "/" + innerDir + "/" + iconName + ".png"; if (QFile::exists(file)) @@ -249,8 +267,10 @@ void StatusNotifierButton::mouseReleaseEvent(QMouseEvent *event) else if (Qt::RightButton == event->button()) { if (mMenu) - mMenu->popup(QCursor::pos()); - else + { + mPlugin->willShowWindow(mMenu); + mMenu->popup(mPlugin->panel()->calculatePopupWindowPos(QCursor::pos(), mMenu->sizeHint()).topLeft()); + } else interface->ContextMenu(QCursor::pos().x(), QCursor::pos().y()); } diff --git a/plugin-statusnotifier/statusnotifierwidget.cpp b/plugin-statusnotifier/statusnotifierwidget.cpp index 691f232..e3b6152 100644 --- a/plugin-statusnotifier/statusnotifierwidget.cpp +++ b/plugin-statusnotifier/statusnotifierwidget.cpp @@ -28,6 +28,7 @@ #include "statusnotifierwidget.h" #include +#include #include "../panel/ilxqtpanelplugin.h" StatusNotifierWidget::StatusNotifierWidget(ILXQtPanelPlugin *plugin, QWidget *parent) : diff --git a/plugin-statusnotifier/translations/statusnotifier.ts b/plugin-statusnotifier/translations/statusnotifier.ts deleted file mode 100644 index 6401616..0000000 --- a/plugin-statusnotifier/translations/statusnotifier.ts +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/plugin-statusnotifier/translations/statusnotifier_ar.desktop b/plugin-statusnotifier/translations/statusnotifier_ar.desktop new file mode 100644 index 0000000..ac44a71 --- /dev/null +++ b/plugin-statusnotifier/translations/statusnotifier_ar.desktop @@ -0,0 +1,2 @@ +Name[ar]=ملحقة لمُخطر الحالة +Comment[ar]=ملحقة لمُخطر الحالة diff --git a/plugin-statusnotifier/translations/statusnotifier_hu.desktop b/plugin-statusnotifier/translations/statusnotifier_hu.desktop new file mode 100644 index 0000000..0d6e64c --- /dev/null +++ b/plugin-statusnotifier/translations/statusnotifier_hu.desktop @@ -0,0 +1,2 @@ +Name[hu]=Állapotjelzés +Comment[hu]=Álapotértesítő bővítmény diff --git a/plugin-statusnotifier/translations/statusnotifier_ru_RU.desktop b/plugin-statusnotifier/translations/statusnotifier_ru_RU.desktop deleted file mode 100644 index 5c5fc79..0000000 --- a/plugin-statusnotifier/translations/statusnotifier_ru_RU.desktop +++ /dev/null @@ -1,2 +0,0 @@ -Name[ru_RU]=Плагин уведомлений -Comment[ru_RU]=Плагин уведомлений diff --git a/plugin-sysstat/lxqtsysstat.cpp b/plugin-sysstat/lxqtsysstat.cpp index e4042ff..a0bc7d7 100644 --- a/plugin-sysstat/lxqtsysstat.cpp +++ b/plugin-sysstat/lxqtsysstat.cpp @@ -213,7 +213,7 @@ void LXQtSysStatContent::updateTitleFontPixelHeight() } } -void LXQtSysStatContent::updateSettings(const QSettings *settings) +void LXQtSysStatContent::updateSettings(const PluginSettings *settings) { double old_updateInterval = mUpdateInterval; int old_minimalSize = mMinimalSize; diff --git a/plugin-sysstat/lxqtsysstat.h b/plugin-sysstat/lxqtsysstat.h index bdf063d..7e91bde 100644 --- a/plugin-sysstat/lxqtsysstat.h +++ b/plugin-sysstat/lxqtsysstat.h @@ -105,7 +105,7 @@ public: LXQtSysStatContent(ILXQtPanelPlugin *plugin, QWidget *parent = NULL); ~LXQtSysStatContent(); - void updateSettings(const QSettings *); + void updateSettings(const PluginSettings *); #undef QSS_COLOUR #define QSS_COLOUR(GETNAME, SETNAME) \ diff --git a/plugin-sysstat/lxqtsysstatconfiguration.cpp b/plugin-sysstat/lxqtsysstatconfiguration.cpp index 3419776..1ca24fd 100644 --- a/plugin-sysstat/lxqtsysstatconfiguration.cpp +++ b/plugin-sysstat/lxqtsysstatconfiguration.cpp @@ -83,11 +83,9 @@ namespace } } -LXQtSysStatConfiguration::LXQtSysStatConfiguration(QSettings *settings, QWidget *parent) : - QDialog(parent), +LXQtSysStatConfiguration::LXQtSysStatConfiguration(PluginSettings *settings, QWidget *parent) : + LXQtPanelPluginConfigDialog(settings, parent), ui(new Ui::LXQtSysStatConfiguration), - mSettings(settings), - oldSettings(settings), mStat(NULL), mColoursDialog(NULL) { @@ -119,27 +117,27 @@ LXQtSysStatConfiguration::~LXQtSysStatConfiguration() void LXQtSysStatConfiguration::loadSettings() { - ui->intervalSB->setValue(mSettings->value("graph/updateInterval", 1.0).toDouble()); - ui->sizeSB->setValue(mSettings->value("graph/minimalSize", 30).toInt()); + ui->intervalSB->setValue(settings().value("graph/updateInterval", 1.0).toDouble()); + ui->sizeSB->setValue(settings().value("graph/minimalSize", 30).toInt()); - ui->linesSB->setValue(mSettings->value("grid/lines", 1).toInt()); + ui->linesSB->setValue(settings().value("grid/lines", 1).toInt()); - ui->titleLE->setText(mSettings->value("title/label", QString()).toString()); + ui->titleLE->setText(settings().value("title/label", QString()).toString()); - int typeIndex = ui->typeCOB->findData(mSettings->value("data/type", msStatTypes[0])); + int typeIndex = ui->typeCOB->findData(settings().value("data/type", msStatTypes[0])); ui->typeCOB->setCurrentIndex((typeIndex >= 0) ? typeIndex : 0); on_typeCOB_currentIndexChanged(ui->typeCOB->currentIndex()); - int sourceIndex = ui->sourceCOB->findData(mSettings->value("data/source", QString())); + int sourceIndex = ui->sourceCOB->findData(settings().value("data/source", QString())); ui->sourceCOB->setCurrentIndex((sourceIndex >= 0) ? sourceIndex : 0); - ui->useFrequencyCB->setChecked(mSettings->value("cpu/useFrequency", true).toBool()); - ui->maximumHS->setValue(PluginSysStat::netSpeedFromString(mSettings->value("net/maximumSpeed", "1 MB/s").toString())); + ui->useFrequencyCB->setChecked(settings().value("cpu/useFrequency", true).toBool()); + ui->maximumHS->setValue(PluginSysStat::netSpeedFromString(settings().value("net/maximumSpeed", "1 MB/s").toString())); on_maximumHS_valueChanged(ui->maximumHS->value()); - ui->logarithmicCB->setChecked(mSettings->value("net/logarithmicScale", true).toBool()); - ui->logScaleSB->setValue(mSettings->value("net/logarithmicScaleSteps", 4).toInt()); + ui->logarithmicCB->setChecked(settings().value("net/logarithmicScale", true).toBool()); + ui->logScaleSB->setValue(settings().value("net/logarithmicScaleSteps", 4).toInt()); - bool useThemeColours = mSettings->value("graph/useThemeColours", true).toBool(); + bool useThemeColours = settings().value("graph/useThemeColours", true).toBool(); ui->useThemeColoursRB->setChecked(useThemeColours); ui->useCustomColoursRB->setChecked(!useThemeColours); ui->customColoursB->setEnabled(!useThemeColours); @@ -147,37 +145,26 @@ void LXQtSysStatConfiguration::loadSettings() void LXQtSysStatConfiguration::saveSettings() { - mSettings->setValue("graph/useThemeColours", ui->useThemeColoursRB->isChecked()); - mSettings->setValue("graph/updateInterval", ui->intervalSB->value()); - mSettings->setValue("graph/minimalSize", ui->sizeSB->value()); + settings().setValue("graph/useThemeColours", ui->useThemeColoursRB->isChecked()); + settings().setValue("graph/updateInterval", ui->intervalSB->value()); + settings().setValue("graph/minimalSize", ui->sizeSB->value()); - mSettings->setValue("grid/lines", ui->linesSB->value()); + settings().setValue("grid/lines", ui->linesSB->value()); - mSettings->setValue("title/label", ui->titleLE->text()); + settings().setValue("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(); - mSettings->setValue("data/type", type); - mSettings->setValue("data/source", ui->sourceCOB->itemData(ui->sourceCOB->currentIndex(), Qt::UserRole)); + settings().setValue("data/type", type); + settings().setValue("data/source", ui->sourceCOB->itemData(ui->sourceCOB->currentIndex(), Qt::UserRole)); - mSettings->setValue("cpu/useFrequency", ui->useFrequencyCB->isChecked()); + settings().setValue("cpu/useFrequency", ui->useFrequencyCB->isChecked()); - mSettings->setValue("net/maximumSpeed", PluginSysStat::netSpeedToString(ui->maximumHS->value())); - mSettings->setValue("net/logarithmicScale", ui->logarithmicCB->isChecked()); - mSettings->setValue("net/logarithmicScaleSteps", ui->logScaleSB->value()); -} - -void LXQtSysStatConfiguration::on_buttons_clicked(QAbstractButton *btn) -{ - if (ui->buttons->buttonRole(btn) == QDialogButtonBox::ResetRole) - { - oldSettings.loadToSettings(); - loadSettings(); - } - else - close(); + settings().setValue("net/maximumSpeed", PluginSysStat::netSpeedToString(ui->maximumHS->value())); + settings().setValue("net/logarithmicScale", ui->logarithmicCB->isChecked()); + settings().setValue("net/logarithmicScaleSteps", ui->logScaleSB->value()); } void LXQtSysStatConfiguration::on_typeCOB_currentIndexChanged(int index) @@ -216,22 +203,22 @@ void LXQtSysStatConfiguration::coloursChanged() { const LXQtSysStatColours::Colours &colours = mColoursDialog->colours(); - mSettings->setValue("grid/colour", colours["grid"].name()); - mSettings->setValue("title/colour", colours["title"].name()); + settings().setValue("grid/colour", colours["grid"].name()); + settings().setValue("title/colour", colours["title"].name()); - mSettings->setValue("cpu/systemColour", colours["cpuSystem"].name()); - mSettings->setValue("cpu/userColour", colours["cpuUser"].name()); - mSettings->setValue("cpu/niceColour", colours["cpuNice"].name()); - mSettings->setValue("cpu/otherColour", colours["cpuOther"].name()); - mSettings->setValue("cpu/frequencyColour", colours["cpuFrequency"].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()); - mSettings->setValue("mem/appsColour", colours["memApps"].name()); - mSettings->setValue("mem/buffersColour", colours["memBuffers"].name()); - mSettings->setValue("mem/cachedColour", colours["memCached"].name()); - mSettings->setValue("mem/swapColour", colours["memSwap"].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()); - mSettings->setValue("net/receivedColour", colours["netReceived"].name()); - mSettings->setValue("net/transmittedColour", colours["netTransmitted"].name()); + settings().setValue("net/receivedColour", colours["netReceived"].name()); + settings().setValue("net/transmittedColour", colours["netTransmitted"].name()); } void LXQtSysStatConfiguration::on_customColoursB_clicked() @@ -246,22 +233,22 @@ void LXQtSysStatConfiguration::on_customColoursB_clicked() const LXQtSysStatColours::Colours &defaultColours = mColoursDialog->defaultColours(); - colours["grid"] = QColor(mSettings->value("grid/colour", defaultColours["grid"] .name()).toString()); - colours["title"] = QColor(mSettings->value("title/colour", defaultColours["title"].name()).toString()); + colours["grid"] = QColor(settings().value("grid/colour", defaultColours["grid"] .name()).toString()); + colours["title"] = QColor(settings().value("title/colour", defaultColours["title"].name()).toString()); - colours["cpuSystem"] = QColor(mSettings->value("cpu/systemColour", defaultColours["cpuSystem"] .name()).toString()); - colours["cpuUser"] = QColor(mSettings->value("cpu/userColour", defaultColours["cpuUser"] .name()).toString()); - colours["cpuNice"] = QColor(mSettings->value("cpu/niceColour", defaultColours["cpuNice"] .name()).toString()); - colours["cpuOther"] = QColor(mSettings->value("cpu/otherColour", defaultColours["cpuOther"] .name()).toString()); - colours["cpuFrequency"] = QColor(mSettings->value("cpu/frequencyColour", defaultColours["cpuFrequency"].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(mSettings->value("mem/appsColour", defaultColours["memApps"] .name()).toString()); - colours["memBuffers"] = QColor(mSettings->value("mem/buffersColour", defaultColours["memBuffers"].name()).toString()); - colours["memCached"] = QColor(mSettings->value("mem/cachedColour", defaultColours["memCached"] .name()).toString()); - colours["memSwap"] = QColor(mSettings->value("mem/swapColour", defaultColours["memSwap"] .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["netReceived"] = QColor(mSettings->value("net/receivedColour", defaultColours["netReceived"] .name()).toString()); - colours["netTransmitted"] = QColor(mSettings->value("net/transmittedColour", defaultColours["netTransmitted"].name()).toString()); + colours["netReceived"] = QColor(settings().value("net/receivedColour", defaultColours["netReceived"] .name()).toString()); + colours["netTransmitted"] = QColor(settings().value("net/transmittedColour", defaultColours["netTransmitted"].name()).toString()); mColoursDialog->setColours(colours); diff --git a/plugin-sysstat/lxqtsysstatconfiguration.h b/plugin-sysstat/lxqtsysstatconfiguration.h index e9b9f2a..3b0e959 100644 --- a/plugin-sysstat/lxqtsysstatconfiguration.h +++ b/plugin-sysstat/lxqtsysstatconfiguration.h @@ -29,13 +29,11 @@ #ifndef LXQTSYSSTATCONFIGURATION_H #define LXQTSYSSTATCONFIGURATION_H -#include - -#include +#include "../panel/lxqtpanelpluginconfigdialog.h" +#include "../panel/pluginsettings.h" #include #include - namespace Ui { class LXQtSysStatConfiguration; } @@ -46,12 +44,12 @@ namespace SysStat { class LXQtSysStatColours; -class LXQtSysStatConfiguration : public QDialog +class LXQtSysStatConfiguration : public LXQtPanelPluginConfigDialog { Q_OBJECT public: - explicit LXQtSysStatConfiguration(QSettings *settings, QWidget *parent = 0); + explicit LXQtSysStatConfiguration(PluginSettings *settings, QWidget *parent = nullptr); ~LXQtSysStatConfiguration(); public slots: @@ -60,7 +58,6 @@ public slots: void on_typeCOB_currentIndexChanged(int); void on_maximumHS_valueChanged(int); void on_customColoursB_clicked(); - void on_buttons_clicked(QAbstractButton *); void coloursChanged(); @@ -72,14 +69,11 @@ signals: private: Ui::LXQtSysStatConfiguration *ui; - QSettings *mSettings; - LXQt::SettingsCache oldSettings; - - void loadSettings(); SysStat::BaseStat *mStat; - LXQtSysStatColours *mColoursDialog; + + void loadSettings(); }; #endif // LXQTSYSSTATCONFIGURATION_H diff --git a/plugin-sysstat/translations/sysstat.ts b/plugin-sysstat/translations/sysstat.ts deleted file mode 100644 index 5f5dc25..0000000 --- a/plugin-sysstat/translations/sysstat.ts +++ /dev/null @@ -1,405 +0,0 @@ - - - - - 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 is 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 --git a/plugin-sysstat/translations/sysstat_ar.desktop b/plugin-sysstat/translations/sysstat_ar.desktop new file mode 100644 index 0000000..2e1bb0d --- /dev/null +++ b/plugin-sysstat/translations/sysstat_ar.desktop @@ -0,0 +1,2 @@ +Name[ar]=إحصائيّات النّظام +Comment[ar]=ملحقة لإحصائيّات النّظام. diff --git a/plugin-sysstat/translations/sysstat_de.ts b/plugin-sysstat/translations/sysstat_de.ts deleted file mode 100644 index 32baedb..0000000 --- a/plugin-sysstat/translations/sysstat_de.ts +++ /dev/null @@ -1,405 +0,0 @@ - - - - - LXQtSysStatColours - - - System Statistics Colors - Systemstatistik-Farben - - - - Graph - Graph - - - - &Grid - &Raster - - - - - - - - - - - - - - - - Change ... - ändern... - - - - T&itle - T&itel - - - - CPU - Prozessor - - - - &Nice - &Priorität - - - - Ot&her - A&ndere - - - - &Frequency - &Frequenz - - - - S&ystem - S&ystem - - - - &User - Ben&utzer - - - - Memory - Speicher - - - - Cache&d - Zwischenspei&cher - - - - S&wap - Ausge&lagert - - - - &Applications - &Anwendungen - - - - &Buffers - Puff&er - - - - Network - Netzwerk - - - - &Received - E&mpfangen - - - - &Transmitted - &Gesendet - - - - LXQtSysStatConfiguration - - - System Statistics Settings - Systemstatistik - Einstellungen - - - - Graph - Graph - - - - &Minimal size - &Mindestgröße - - - - Update &interval - Aktualisierungs&intervall - - - - &Title - &Titel - - - - &Grid lines - &Rasterlinien - - - - <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> - - - - px - px - - - - s - s - - - - Data - Daten - - - - Use &frequency - &Frequenz nutzen - - - - Ma&ximum - Ma&ximum - - - - XXX KBs - XXX KB/s - - - - Lo&garithmic scale - Lo&garithmische Skala - - - - steps - Schritte - - - - &Source - &Quelle - - - - T&ype - T&yp - - - - Colours - Farben - - - - Use t&heme colours - Farben des Farbsc&hemas - - - - Use c&ustom colours - &Eigene Farben - - - - Custom colour ... - auswählen... - - - - CPU - Prozessor - - - - Memory - Speicher - - - - Network - Netzwerk - - - - 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 - Speicher - - - - swap - Ausgelagert - - - - LXQtSysStatContent - - - system: %1%<br>user: %2%<br>nice: %3%<br>other: %4%<br>freq: %5% - CPU tooltip information - System: %1%<br>Nutzer: %2%<br>Priorität: %3%<br>Andere: %4%<br>Freq: %5% - - - - system: %1%<br>user: %2%<br>nice: %3%<br>other: %4%<br>freq: n/a - CPU tooltip information - System: %1%<br>Nutzer: %2%<br>Priorität: %3%<br>Andere: %4%<br>Freq: n/a - - - - apps: %1%<br>buffers: %2%<br>cached: %3% - Memory tooltip information - Anwendungen: %1%<br>Puffer: %2%<br>Cache: %3% - - - - used: %1% - Swap tooltip information - Benutzt: %1% - - - - min: %1%<br>max: %2% - Network tooltip information - Min: %1%<br>Max: %2% - - - diff --git a/plugin-sysstat/translations/sysstat_el.ts b/plugin-sysstat/translations/sysstat_el.ts deleted file mode 100644 index 73f1627..0000000 --- a/plugin-sysstat/translations/sysstat_el.ts +++ /dev/null @@ -1,237 +0,0 @@ - - - - - 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 - - - Graph - Γράφημα - - - - px - εικ - - - - s - δ - - - - Data - Δεδομένα - - - - System Statistics Settings - Ρυθμίσεις στατιστικών του συστήματος - - - - &Minimal size - Ελάχιστο μέ&γεθος - - - - Update &interval - Χρονικό &διάστημα ενημέρωσης - - - - &Title - &Τίτλος - - - - &Grid lines - &Γραμμές καννάβου - - - - <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 - Χρήση της συ&χνότητας - - - - Ma&ximum - Μέγισ&το - - - - Lo&garithmic scale - Λογαρι&θμική κλίμακα - - - - CPU - Επεξεργαστής - - - - Memory - Μνήμη - - - - Network - Δίκτυο - - - - &Source - &Πηγή - - - - T&ype - &Τύπος - - - - Colours - Χρώματα - - - - Use t&heme colours - Χρήση των χρωμάτων του &θέματος - - - - Use c&ustom colours - Χρήση &προσαρμοσμένων χρωμάτων - - - - Custom colour ... - Προσαρμοσμένα χρώματα... - - - - XXX KBs - XXX KBs - - - - steps - βήματα - - - diff --git a/plugin-sysstat/translations/sysstat_hu.desktop b/plugin-sysstat/translations/sysstat_hu.desktop index d5211b8..bc246d3 100644 --- a/plugin-sysstat/translations/sysstat_hu.desktop +++ b/plugin-sysstat/translations/sysstat_hu.desktop @@ -1,3 +1,3 @@ #TRANSLATIONS Name[hu]=Rendszerstatisztika -Comment[pt]=Infó a rendszerállapotról +Comment[hu]=Infó a rendszerállapotról diff --git a/plugin-sysstat/translations/sysstat_hu.ts b/plugin-sysstat/translations/sysstat_hu.ts deleted file mode 100644 index cb8f169..0000000 --- a/plugin-sysstat/translations/sysstat_hu.ts +++ /dev/null @@ -1,237 +0,0 @@ - - - - - LXQtSysStatColours - - - System Statistics Colors - Rendszerstatisztikai színek - - - - Graph - Grafikon - - - - &Grid - &Rács - - - - - - - - - - - - - - - - Change ... - Változtat... - - - - T&itle - Fel&irat - - - - CPU - Processzor - - - - &Nice - - - - - Ot&her - &Egyéb - - - - &Frequency - &Frekvencia - - - - S&ystem - Rend&szer - - - - &User - &Használó - - - - Memory - Memória - - - - Cache&d - &Gyorsított - - - - S&wap - &Lapozó - - - - &Applications - &Alkalmazások - - - - &Buffers - &Pufferek - - - - Network - Hálózat - - - - &Received - &Fogadott - - - - &Transmitted - &Küldött - - - - LXQtSysStatConfiguration - - - Graph - Grafikon - - - - px - pixel - - - - s - mp - - - - Data - Adatok - - - - System Statistics Settings - Rendszerstatisztika beállítás - - - - &Minimal size - Legkisebb &méret - - - - Update &interval - Fr&issítési köz - - - - &Title - Felira&t - - - - &Grid lines - &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 - - - - Ma&ximum - Ma&ximális - - - - Lo&garithmic scale - Lo&garitmikus skála - - - - CPU - Processzor - - - - Memory - Memória - - - - Network - Hálózat - - - - &Source - Forrá&s - - - - T&ype - &Típus - - - - Colours - Színek - - - - Use t&heme colours - &Rendszertémáé - - - - Use c&ustom colours - &Egyéni - - - - Custom colour ... - Egyéni színek... - - - - XXX KBs - - - - - steps - lépés - - - diff --git a/plugin-sysstat/translations/sysstat_hu_HU.ts b/plugin-sysstat/translations/sysstat_hu_HU.ts deleted file mode 100644 index 5e21fe4..0000000 --- a/plugin-sysstat/translations/sysstat_hu_HU.ts +++ /dev/null @@ -1,237 +0,0 @@ - - - - - LXQtSysStatColours - - - System Statistics Colors - Rendszerstatisztikai színek - - - - Graph - Grafikon - - - - &Grid - &Rács - - - - - - - - - - - - - - - - Change ... - Változtat... - - - - T&itle - Fel&irat - - - - CPU - Processzor - - - - &Nice - - - - - Ot&her - &Egyéb - - - - &Frequency - &Frekvencia - - - - S&ystem - Rend&szer - - - - &User - &Használó - - - - Memory - Memória - - - - Cache&d - &Gyorsított - - - - S&wap - &Lapozó - - - - &Applications - &Alkalmazások - - - - &Buffers - &Pufferek - - - - Network - Hálózat - - - - &Received - &Fogadott - - - - &Transmitted - &Küldött - - - - LXQtSysStatConfiguration - - - Graph - Grafikon - - - - px - pixel - - - - s - mp - - - - Data - Adatok - - - - System Statistics Settings - Rendszerstatisztika beállítás - - - - &Minimal size - Legkisebb &méret - - - - Update &interval - Fr&issítési köz - - - - &Title - Felira&t - - - - &Grid lines - &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 - - - - Ma&ximum - Ma&ximális - - - - Lo&garithmic scale - Lo&garitmikus skála - - - - CPU - Processzor - - - - Memory - Memória - - - - Network - Hálózat - - - - &Source - Forrá&s - - - - T&ype - &Típus - - - - Colours - Színek - - - - Use t&heme colours - &Rendszertémáé - - - - Use c&ustom colours - &Egyéni - - - - Custom colour ... - Egyéni színek... - - - - XXX KBs - - - - - steps - lépés - - - diff --git a/plugin-sysstat/translations/sysstat_it.ts b/plugin-sysstat/translations/sysstat_it.ts deleted file mode 100644 index 34717b7..0000000 --- a/plugin-sysstat/translations/sysstat_it.ts +++ /dev/null @@ -1,237 +0,0 @@ - - - - - LXQtSysStatColours - - - System Statistics Colors - Colori delle statistiche - - - - Graph - Grafico - - - - &Grid - &Griglia - - - - - - - - - - - - - - - - Change ... - Cambia ... - - - - T&itle - &Titolo - - - - CPU - - - - - &Nice - - - - - Ot&her - &Altro - - - - &Frequency - &Frequenza - - - - S&ystem - &Sistema - - - - &User - &Utente - - - - Memory - Memoria - - - - Cache&d - &Cache - - - - S&wap - &Swap - - - - &Applications - &Applicazioni - - - - &Buffers - - - - - Network - Rete - - - - &Received - &Ricevuti - - - - &Transmitted - &Trasmessi - - - - LXQtSysStatConfiguration - - - Graph - Grafico - - - - px - - - - - s - - - - - Data - - - - - System Statistics Settings - Impostazioni statistiche del sistema - - - - &Minimal size - &Grandezza minimale - - - - Update &interval - &Intervallo di aggiornamento - - - - &Title - &Titolo - - - - &Grid lines - &Linee 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 minimale se il pannello è orizzontale.</p><p>Altezza minimale se il pannello è verticale.</p></body></html> - - - - Use &frequency - Usa &frequenza - - - - Ma&ximum - &Massimo - - - - Lo&garithmic scale - Scala &logaritmica - - - - CPU - - - - - Memory - Memoria - - - - Network - Rete - - - - &Source - &Sorgente - - - - T&ype - &Tipo - - - - Colours - Colori - - - - Use t&heme colours - Usa colori del &tema - - - - Use c&ustom colours - Colori &personalizzati - - - - Custom colour ... - Colore personalizzato ... - - - - XXX KBs - - - - - steps - intervalli - - - diff --git a/plugin-sysstat/translations/sysstat_ja.ts b/plugin-sysstat/translations/sysstat_ja.ts deleted file mode 100644 index 23e1f46..0000000 --- a/plugin-sysstat/translations/sysstat_ja.ts +++ /dev/null @@ -1,237 +0,0 @@ - - - - - LXQtSysStatColours - - - System Statistics Colors - システム統計の色 - - - - Graph - グラフ - - - - &Grid - グリッド(&G) - - - - - - - - - - - - - - - - Change ... - 変更する - - - - T&itle - タイトル(&T) - - - - CPU - CPU - - - - &Nice - Nice(&N) - - - - Ot&her - その他(&H) - - - - &Frequency - 周波数(&F) - - - - S&ystem - システム(&Y) - - - - &User - ユーザー(&U) - - - - Memory - メモリー - - - - Cache&d - キャッシュ(&D) - - - - S&wap - スワップ(&W) - - - - &Applications - アプリケーション(&A) - - - - &Buffers - バッファー(&B) - - - - Network - ネットワーク - - - - &Received - 受信(&R) - - - - &Transmitted - 送信(&T) - - - - LXQtSysStatConfiguration - - - Graph - グラフ - - - - px - ピクセル - - - - s - 秒 - - - - Data - データー - - - - System Statistics Settings - システム統計の設定 - - - - &Minimal size - サイズの最小値(&M) - - - - Update &interval - 更新頻度(&I) - - - - &Title - タイトル(&T) - - - - &Grid lines - グリッド線の数(&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) - - - - Ma&ximum - 最大(&X) - - - - Lo&garithmic scale - 対数スケール(&G) - - - - CPU - CPU - - - - Memory - メモリー - - - - Network - ネットワーク - - - - &Source - 情報元(&S) - - - - T&ype - 種類(&Y) - - - - Colours - 色 - - - - Use t&heme colours - テーマの色を使用(&H) - - - - Use c&ustom colours - 色を指定(&U) - - - - Custom colour ... - 色を指定する - - - - XXX KBs - XXX KB - - - - steps - ステップ - - - diff --git a/plugin-sysstat/translations/sysstat_pt.ts b/plugin-sysstat/translations/sysstat_pt.ts deleted file mode 100644 index beeb3fe..0000000 --- a/plugin-sysstat/translations/sysstat_pt.ts +++ /dev/null @@ -1,369 +0,0 @@ - - - - - LXQtSysStatColours - - - System Statistics Colors - Cores das estatísticas do sistema - - - - Graph - Gráfico - - - - &Grid - &Grelha - - - - - - - - - - - - - - - - Change ... - Mudar... - - - - T&itle - Tí&tulo - - - - CPU - CPU - - - - &Nice - A&ceitável - - - - Ot&her - O&utras - - - - &Frequency - &Frequência - - - - S&ystem - S&istema - - - - &User - &Utilizador - - - - Memory - Memória - - - - Cache&d - Cac&he - - - - S&wap - S&wap - - - - &Applications - &Aplicações - - - - &Buffers - &Buffers - - - - Network - Rede - - - - &Received - &Recebido - - - - &Transmitted - &Enviado - - - - LXQtSysStatConfiguration - - LXQt SysStat Settings - Definições do LXQt SysStat - - - - Graph - Gráfico - - - Update interval - Intervalo de atualização - - - Minimal size - Tamanho mínimo - - - - px - px - - - - s - s - - - Grid - Grelha - - - Lines - Linhas - - - Colour - Cor - - - Change ... - Mudar... - - - Title - Título - - - Label - Etiqueta - - - Font - Tipo de letra - - - - Data - Dados - - - Type - Tipo - - - - System Statistics Settings - Defiições das estatísticas do sistema - - - - &Minimal size - Tamanho &mínimo - - - - Update &interval - &Intervalo de atualização - - - - &Title - &Título - - - - &Grid lines - 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>Lagura mínima se o painelestiver na horizontal.</p><p>Altura mínima se o painel estiver na vertical.</p></body></html> - - - - Use &frequency - Utilizar &frequência - - - - Ma&ximum - Má&ximo - - - - Lo&garithmic scale - Escala lo&garítmica - - - - CPU - CPU - - - - Memory - Memória - - - - Network - Rede - - - - &Source - &Fonte - - - - T&ype - T&ipo - - - - Colours - Cores - - - - Use t&heme colours - Utili&zar cores do tema - - - - Use c&ustom colours - &Utilizar cores personalizadas - - - - Custom colour ... - Cor personalizada... - - - Source - Fonte - - - System - Sistema - - - User - Utilizador - - - Nice - Aceitável - - - Other - Outras - - - Use Frequency - Utilizar frequência - - - Frequency - Frequência - - - Applications - Aplicações - - - Buffers - Buffers - - - Cached - Cache - - - Used - Utilizado - - - Received - Recebido - - - Transmitted - Enviado - - - Maximum - Máximo - - - - XXX KBs - XXX KBs - - - Logarithmic scale - Escala logarítmica - - - - steps - etapas - - - Ultra light - Ultra claro - - - Light - Claro - - - Ultra black - Ultra escuro - - - Black - Escuro - - - Bold - Negrito - - - Demi bold - Semi-negrito - - - Italic - Itálico - - - diff --git a/plugin-sysstat/translations/sysstat_ru.ts b/plugin-sysstat/translations/sysstat_ru.ts deleted file mode 100644 index c744b07..0000000 --- a/plugin-sysstat/translations/sysstat_ru.ts +++ /dev/null @@ -1,237 +0,0 @@ - - - - - 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 is the panel is vertical.</p></body></html> - <html><head/><body><p>Минимальная ширина для горизонтальной панели.</p><p>Минимальная высота для вертикальной панели.</p></body></html> - - - - px - пикс - - - - s - с - - - - Data - Данные - - - - Use &frequency - Использовать &частоту - - - - Ma&ximum - Ма&ксимум - - - - XXX KBs - XXX Кб - - - - Lo&garithmic scale - Ло&гарифмическая шкала - - - - steps - шаги - - - - CPU - ЦПУ - - - - Memory - Память - - - - Network - Сеть - - - - &Source - &Источник - - - - T&ype - &Тип - - - - Colours - Цвета - - - - Use t&heme colours - Использовать цвета &темы - - - - Use c&ustom colours - Использовать с&вои цвета - - - - Custom colour ... - Свои цвета… - - - diff --git a/plugin-sysstat/translations/sysstat_ru_RU.desktop b/plugin-sysstat/translations/sysstat_ru_RU.desktop deleted file mode 100644 index d895b5e..0000000 --- a/plugin-sysstat/translations/sysstat_ru_RU.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name[ru_RU]=Системная статистика -Comment[ru_RU]=Плагин системной статистики. - -#TRANSLATIONS_DIR=../translations diff --git a/plugin-sysstat/translations/sysstat_ru_RU.ts b/plugin-sysstat/translations/sysstat_ru_RU.ts deleted file mode 100644 index 6b97c40..0000000 --- a/plugin-sysstat/translations/sysstat_ru_RU.ts +++ /dev/null @@ -1,237 +0,0 @@ - - - - - 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 is the panel is vertical.</p></body></html> - <html><head/><body><p>Минимальная ширина для горизонтальной панели.</p><p>Минимальная высота для вертикальной панели.</p></body></html> - - - - px - пикс - - - - s - с - - - - Data - Данные - - - - Use &frequency - Использовать &частоту - - - - Ma&ximum - Ма&ксимум - - - - XXX KBs - XXX Кб - - - - Lo&garithmic scale - Ло&гарифмическая шкала - - - - steps - шаги - - - - CPU - ЦПУ - - - - Memory - Память - - - - Network - Сеть - - - - &Source - &Источник - - - - T&ype - &Тип - - - - Colours - Цвета - - - - Use t&heme colours - Использовать цвета &темы - - - - Use c&ustom colours - Использовать с&вои цвета - - - - Custom colour ... - Свои цвета… - - - diff --git a/plugin-taskbar/lxqttaskbar.cpp b/plugin-taskbar/lxqttaskbar.cpp index 6fd6074..92c1df4 100644 --- a/plugin-taskbar/lxqttaskbar.cpp +++ b/plugin-taskbar/lxqttaskbar.cpp @@ -63,6 +63,7 @@ LXQtTaskBar::LXQtTaskBar(ILXQtPanelPlugin *plugin, QWidget *parent) : mShowOnlyMinimizedTasks(false), mAutoRotate(true), mShowGroupOnHover(true), + mIconByClass(false), mPlugin(plugin), mPlaceHolder(new QWidget(this)), mStyle(new LeftAlignedTextStyle()) @@ -85,6 +86,8 @@ LXQtTaskBar::LXQtTaskBar(ILXQtPanelPlugin *plugin, QWidget *parent) : connect(KWindowSystem::self(), SIGNAL(stackingOrderChanged()), SLOT(refreshTaskList())); connect(KWindowSystem::self(), static_cast(&KWindowSystem::windowChanged) , this, &LXQtTaskBar::onWindowChanged); + connect(KWindowSystem::self(), &KWindowSystem::windowAdded, this, &LXQtTaskBar::onWindowAdded); + connect(KWindowSystem::self(), &KWindowSystem::windowRemoved, this, &LXQtTaskBar::onWindowRemoved); } /************************************************ @@ -179,14 +182,26 @@ void LXQtTaskBar::buttonMove(LXQtTaskGroup * dst, LXQtTaskGroup * src, QPoint co //moving based on taskbar (not signaled by button) QRect occupied = mLayout->occupiedGeometry(); QRect last_empty_row{occupied}; + const QRect last_item_geometry = mLayout->itemAt(size - 1)->geometry(); if (mPlugin->panel()->isHorizontal()) { - last_empty_row.setTopLeft(mLayout->itemAt(size - 1)->geometry().topRight()); + if (isRightToLeft()) + { + last_empty_row.setTopRight(last_item_geometry.topLeft()); + } else + { + last_empty_row.setTopLeft(last_item_geometry.topRight()); + } } else { - last_empty_row.setTopLeft(mLayout->itemAt(size - 1)->geometry().bottomLeft()); + if (isRightToLeft()) + { + last_empty_row.setTopRight(last_item_geometry.topRight()); + } else + { + last_empty_row.setTopLeft(last_item_geometry.topLeft()); + } } - if (occupied.contains(pos) && !last_empty_row.contains(pos)) return; @@ -195,22 +210,27 @@ void LXQtTaskBar::buttonMove(LXQtTaskGroup * dst, LXQtTaskGroup * src, QPoint co { //moving based on signal from child button dst_index = mLayout->indexOf(dst); - if (mPlugin->panel()->isHorizontal()) + } + + //moving lower index to higher one => consider as the QList::move => insert(to, takeAt(from)) + if (src_index < dst_index) + { + if (size == dst_index + || src_index + 1 != dst_index) { - if (dst->rect().center().x() < pos.x()) - ++dst_index; + --dst_index; } else { - if (dst->rect().center().y() < pos.y()) - ++dst_index; + //switching positions of next standing + const int tmp_index = src_index; + src_index = dst_index; + dst_index = tmp_index; } } - //moving lower index to higher one => consider as the QList::move => insert(to, takeAt(from)) - if (src_index < dst_index) - --dst_index; - - if (dst_index == src_index) + if (dst_index == src_index + || mLayout->animatedMoveInProgress() + ) return; mLayout->moveItem(src_index, dst_index, true); @@ -222,57 +242,107 @@ void LXQtTaskBar::buttonMove(LXQtTaskGroup * dst, LXQtTaskGroup * src, QPoint co void LXQtTaskBar::groupBecomeEmptySlot() { //group now contains no buttons - clean up in hash and delete the group - LXQtTaskGroup *group = qobject_cast(sender()); + LXQtTaskGroup * const group = qobject_cast(sender()); Q_ASSERT(group); - mGroupsHash.erase(mGroupsHash.find(group->groupName())); + for (auto i = mKnownWindows.begin(); mKnownWindows.end() != i; ) + { + if (group == *i) + i = mKnownWindows.erase(i); + else + ++i; + } + mLayout->removeWidget(group); group->deleteLater(); } /************************************************ ************************************************/ - -void LXQtTaskBar::addWindow(WId window, QString const & groupId) +void LXQtTaskBar::addWindow(WId window) { - LXQtTaskGroup *group = mGroupsHash.value(groupId); + // If grouping disabled group behaves like regular button + const QString group_id = mGroupingEnabled ? KWindowInfo(window, 0, NET::WM2WindowClass).windowClassClass() : QString("%1").arg(window); + + LXQtTaskGroup *group = nullptr; + auto i_group = mKnownWindows.find(window); + if (mKnownWindows.end() != i_group) + { + if ((*i_group)->groupName() == group_id) + group = *i_group; + else + (*i_group)->onWindowRemoved(window); + } + + //check if window belongs to some existing group + if (!group && mGroupingEnabled) + { + for (auto i = mKnownWindows.cbegin(), i_e = mKnownWindows.cend(); i != i_e; ++i) + { + if ((*i)->groupName() == group_id) + { + group = *i; + break; + } + } + } if (!group) { - group = new LXQtTaskGroup(groupId, KWindowSystem::icon(window), mPlugin, this); + group = new LXQtTaskGroup(group_id, window, this); connect(group, SIGNAL(groupBecomeEmpty(QString)), this, SLOT(groupBecomeEmptySlot())); connect(group, SIGNAL(visibilityChanged(bool)), this, SLOT(refreshPlaceholderVisibility())); - connect(group, &LXQtTaskGroup::popupShown, this, &LXQtTaskBar::groupPopupShown); - connect(group, SIGNAL(windowDisowned(WId)), this, SLOT(refreshTaskList())); + connect(group, &LXQtTaskGroup::popupShown, this, &LXQtTaskBar::popupShown); connect(group, &LXQtTaskButton::dragging, this, [this] (QObject * dragSource, QPoint const & pos) { buttonMove(qobject_cast(sender()), qobject_cast(dragSource), pos); }); mLayout->addWidget(group); - mGroupsHash.insert(groupId, group); group->setToolButtonsStyle(mButtonStyle); } + + mKnownWindows[window] = group; group->addWindow(window); } + /************************************************ ************************************************/ +auto LXQtTaskBar::removeWindow(windowMap_t::iterator pos) -> windowMap_t::iterator +{ + WId const window = pos.key(); + LXQtTaskGroup * const group = *pos; + auto ret = mKnownWindows.erase(pos); + group->onWindowRemoved(window); + return ret; +} + +/************************************************ + ************************************************/ void LXQtTaskBar::refreshTaskList() { + QList new_list; // Just add new windows to groups, deleting is up to the groups - QList tmp = KWindowSystem::stackingOrder(); - - Q_FOREACH (WId wnd, tmp) + for (auto const wnd: KWindowSystem::stackingOrder()) { if (acceptWindow(wnd)) { - // If grouping disabled group behaves like regular button - QString id = mGroupingEnabled ? KWindowInfo(wnd, 0, NET::WM2WindowClass).windowClassClass() : QString("%1").arg(wnd); - addWindow(wnd, id); + new_list << wnd; + addWindow(wnd); } } + //emulate windowRemoved if known window not reported by KWindowSystem + for (auto i = mKnownWindows.begin(), i_e = mKnownWindows.end(); i != i_e; ) + { + if (0 > new_list.indexOf(i.key())) + { + i = removeWindow(i); + } else + ++i; + } + refreshPlaceholderVisibility(); } @@ -281,19 +351,28 @@ void LXQtTaskBar::refreshTaskList() ************************************************/ void LXQtTaskBar::onWindowChanged(WId window, NET::Properties prop, NET::Properties2 prop2) { - // If grouping disabled group behaves like regular button - QString id = mGroupingEnabled ? KWindowInfo(window, 0, NET::WM2WindowClass).windowClassClass() : QString("%1").arg(window); - LXQtTaskGroup *group = mGroupsHash.value(id); + auto i = mKnownWindows.find(window); + if (mKnownWindows.end() != i) + (*i)->onWindowChanged(window, prop, prop2); +} - bool consumed{false}; - if (nullptr != group) - { - consumed = group->onWindowChanged(window, prop, prop2); +void LXQtTaskBar::onWindowAdded(WId window) +{ + auto const pos = mKnownWindows.find(window); + if (mKnownWindows.end() == pos && acceptWindow(window)) + addWindow(window); +} - } +/************************************************ - if (!consumed && acceptWindow(window)) - addWindow(window, id); + ************************************************/ +void LXQtTaskBar::onWindowRemoved(WId window) +{ + auto const pos = mKnownWindows.find(window); + if (mKnownWindows.end() != pos) + { + removeWindow(pos); + } } /************************************************ @@ -304,12 +383,7 @@ void LXQtTaskBar::refreshButtonRotation() bool autoRotate = mAutoRotate && (mButtonStyle != Qt::ToolButtonIconOnly); ILXQtPanel::Position panelPosition = mPlugin->panel()->position(); - QHashIterator j(mGroupsHash); - while(j.hasNext()) - { - j.next(); - j.value()->setAutoRotation(autoRotate,panelPosition); - } + emit buttonRotationRefreshed(autoRotate, panelPosition); } /************************************************ @@ -319,12 +393,13 @@ void LXQtTaskBar::refreshPlaceholderVisibility() { // if no visible group button show placeholder widget bool haveVisibleWindow = false; - QHashIterator j(mGroupsHash); - while (j.hasNext()) + for (auto i = mKnownWindows.cbegin(), i_e = mKnownWindows.cend(); i_e != i; ++i) { - j.next(); - if (j.value()->isVisible()) + if ((*i)->isVisible()) + { haveVisibleWindow = true; + break; + } } mPlaceHolder->setVisible(!haveVisibleWindow); if (haveVisibleWindow) @@ -337,32 +412,15 @@ void LXQtTaskBar::refreshPlaceholderVisibility() } -/************************************************ - - ************************************************/ -void LXQtTaskBar::refreshIconGeometry() -{ - QHashIterator i(mGroupsHash); - while (i.hasNext()) - { - i.next(); - i.value()->refreshIconsGeometry(); - } -} - /************************************************ ************************************************/ void LXQtTaskBar::setButtonStyle(Qt::ToolButtonStyle buttonStyle) { + const Qt::ToolButtonStyle old_style = mButtonStyle; mButtonStyle = buttonStyle; - - QHashIterator i(mGroupsHash); - while (i.hasNext()) - { - i.next(); - i.value()->setToolButtonsStyle(buttonStyle); - } + if (old_style != mButtonStyle) + emit buttonStyleRefreshed(mButtonStyle); } /************************************************ @@ -375,6 +433,7 @@ void LXQtTaskBar::settingsChanged() 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(); @@ -396,16 +455,21 @@ void LXQtTaskBar::settingsChanged() 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(); // Delete all groups if grouping feature toggled and start over if (groupingEnabledOld != mGroupingEnabled) { - Q_FOREACH (LXQtTaskGroup *group, mGroupsHash.values()) + for (int i = mLayout->count() - 1; 0 <= i; --i) { - mLayout->removeWidget(group); - group->deleteLater(); + LXQtTaskGroup * group = qobject_cast(mLayout->itemAt(i)->widget()); + if (nullptr != group) + { + mLayout->takeAt(i); + group->deleteLater(); + } } - mGroupsHash.clear(); + mKnownWindows.clear(); } if (showOnlyOneDesktopTasksOld != mShowOnlyOneDesktopTasks @@ -413,8 +477,9 @@ void LXQtTaskBar::settingsChanged() || showOnlyCurrentScreenTasksOld != mShowOnlyCurrentScreenTasks || showOnlyMinimizedTasksOld != mShowOnlyMinimizedTasks ) - Q_FOREACH (LXQtTaskGroup *group, mGroupsHash) - group->showOnlySettingChanged(); + emit showOnlySettingChanged(); + if (iconByClassOld != mIconByClass) + emit iconByClassChanged(); refreshTaskList(); } @@ -472,9 +537,8 @@ void LXQtTaskBar::realign() mLayout->setEnabled(true); //our placement on screen could have been changed - Q_FOREACH (LXQtTaskGroup *group, mGroupsHash) - group->showOnlySettingChanged(); - refreshIconGeometry(); + emit showOnlySettingChanged(); + emit refreshIconGeometry(); } /************************************************ @@ -531,7 +595,7 @@ void LXQtTaskBar::wheelEvent(QWheelEvent* event) ************************************************/ void LXQtTaskBar::resizeEvent(QResizeEvent* event) { - refreshIconGeometry(); + emit refreshIconGeometry(); return QWidget::resizeEvent(event); } @@ -547,13 +611,3 @@ void LXQtTaskBar::changeEvent(QEvent* event) QFrame::changeEvent(event); } - -void LXQtTaskBar::groupPopupShown(LXQtTaskGroup * const sender) -{ - //close all popups (should they be visible because of close delay) - for (auto group : mGroupsHash) - { - if (group->isVisible() && sender != group) - group->setPopupVisible(false, true/*fast*/); - } -} diff --git a/plugin-taskbar/lxqttaskbar.h b/plugin-taskbar/lxqttaskbar.h index 661d603..2cfa62c 100644 --- a/plugin-taskbar/lxqttaskbar.h +++ b/plugin-taskbar/lxqttaskbar.h @@ -41,7 +41,7 @@ #include #include -#include +#include #include "../panel/ilxqtpanel.h" #include #include @@ -75,30 +75,44 @@ public: bool isAutoRotate() const { return mAutoRotate; } bool isGroupingEnabled() const { return mGroupingEnabled; } bool isShowGroupOnHover() const { return mShowGroupOnHover; } - ILXQtPanel * panel() const { return mPlugin->panel(); } + bool isIconByClass() const { return mIconByClass; } + inline ILXQtPanel * panel() const { return mPlugin->panel(); } + inline ILXQtPanelPlugin * plugin() const { return mPlugin; } public slots: void settingsChanged(); +signals: + void buttonRotationRefreshed(bool autoRotate, ILXQtPanel::Position position); + void buttonStyleRefreshed(Qt::ToolButtonStyle buttonStyle); + void refreshIconGeometry(); + void showOnlySettingChanged(); + void iconByClassChanged(); + void popupShown(LXQtTaskGroup* sender); + protected: virtual void dragEnterEvent(QDragEnterEvent * event); virtual void dragMoveEvent(QDragMoveEvent * event); private slots: - void refreshIconGeometry(); void refreshTaskList(); void refreshButtonRotation(); void refreshPlaceholderVisibility(); void groupBecomeEmptySlot(); - void groupPopupShown(LXQtTaskGroup * const sender); void onWindowChanged(WId window, NET::Properties prop, NET::Properties2 prop2); + void onWindowAdded(WId window); + void onWindowRemoved(WId window); + +private: + typedef QMap windowMap_t; private: - void addWindow(WId window, QString const & groupId); + void addWindow(WId window); + windowMap_t::iterator removeWindow(windowMap_t::iterator pos); void buttonMove(LXQtTaskGroup * dst, LXQtTaskGroup * src, QPoint const & pos); private: - QHash mGroupsHash; + QMap mKnownWindows; //!< Ids of known windows (mapping to buttons/groups) LXQt::GridLayout *mLayout; // Settings @@ -114,6 +128,7 @@ private: bool mAutoRotate; bool mGroupingEnabled; bool mShowGroupOnHover; + bool mIconByClass; bool acceptWindow(WId window) const; void setButtonStyle(Qt::ToolButtonStyle buttonStyle); diff --git a/plugin-taskbar/lxqttaskbarconfiguration.cpp b/plugin-taskbar/lxqttaskbarconfiguration.cpp index 3ed9e09..7999709 100644 --- a/plugin-taskbar/lxqttaskbarconfiguration.cpp +++ b/plugin-taskbar/lxqttaskbarconfiguration.cpp @@ -32,11 +32,9 @@ #include "ui_lxqttaskbarconfiguration.h" #include -LXQtTaskbarConfiguration::LXQtTaskbarConfiguration(QSettings &settings, QWidget *parent): - QDialog(parent), - ui(new Ui::LXQtTaskbarConfiguration), - mSettings(settings), - oldSettings(settings) +LXQtTaskbarConfiguration::LXQtTaskbarConfiguration(PluginSettings *settings, QWidget *parent): + LXQtPanelPluginConfigDialog(settings, parent), + ui(new Ui::LXQtTaskbarConfiguration) { setAttribute(Qt::WA_DeleteOnClose); setObjectName("TaskbarConfigurationWindow"); @@ -71,6 +69,7 @@ LXQtTaskbarConfiguration::LXQtTaskbarConfiguration(QSettings &settings, QWidget 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); } LXQtTaskbarConfiguration::~LXQtTaskbarConfiguration() @@ -80,52 +79,37 @@ LXQtTaskbarConfiguration::~LXQtTaskbarConfiguration() void LXQtTaskbarConfiguration::loadSettings() { - const bool showOnlyOneDesktopTasks = mSettings.value("showOnlyOneDesktopTasks", false).toBool(); + const bool showOnlyOneDesktopTasks = settings().value("showOnlyOneDesktopTasks", false).toBool(); ui->limitByDesktopCB->setChecked(showOnlyOneDesktopTasks); - ui->showDesktopNumCB->setCurrentIndex(ui->showDesktopNumCB->findData(mSettings.value("showDesktopNum", 0).toInt())); + ui->showDesktopNumCB->setCurrentIndex(ui->showDesktopNumCB->findData(settings().value("showDesktopNum", 0).toInt())); ui->showDesktopNumCB->setEnabled(showOnlyOneDesktopTasks); - ui->limitByScreenCB->setChecked(mSettings.value("showOnlyCurrentScreenTasks", false).toBool()); - ui->limitByMinimizedCB->setChecked(mSettings.value("showOnlyMinimizedTasks", false).toBool()); + ui->limitByScreenCB->setChecked(settings().value("showOnlyCurrentScreenTasks", false).toBool()); + ui->limitByMinimizedCB->setChecked(settings().value("showOnlyMinimizedTasks", false).toBool()); - ui->autoRotateCB->setChecked(mSettings.value("autoRotate", true).toBool()); - ui->middleClickCB->setChecked(mSettings.value("closeOnMiddleClick", true).toBool()); - ui->raiseOnCurrentDesktopCB->setChecked(mSettings.value("raiseOnCurrentDesktop", false).toBool()); - ui->buttonStyleCB->setCurrentIndex(ui->buttonStyleCB->findData(mSettings.value("buttonStyle", "IconText"))); - ui->buttonWidthSB->setValue(mSettings.value("buttonWidth", 400).toInt()); - ui->buttonHeightSB->setValue(mSettings.value("buttonHeight", 100).toInt()); - ui->groupingGB->setChecked(mSettings.value("groupingEnabled",true).toBool()); - ui->showGroupOnHoverCB->setChecked(mSettings.value("showGroupOnHover",true).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()); } void LXQtTaskbarConfiguration::saveSettings() { - mSettings.setValue("showOnlyOneDesktopTasks", ui->limitByDesktopCB->isChecked()); - mSettings.setValue("showDesktopNum", ui->showDesktopNumCB->itemData(ui->showDesktopNumCB->currentIndex())); - mSettings.setValue("showOnlyCurrentScreenTasks", ui->limitByScreenCB->isChecked()); - mSettings.setValue("showOnlyMinimizedTasks", ui->limitByMinimizedCB->isChecked()); - mSettings.setValue("buttonStyle", ui->buttonStyleCB->itemData(ui->buttonStyleCB->currentIndex())); - mSettings.setValue("buttonWidth", ui->buttonWidthSB->value()); - mSettings.setValue("buttonHeight", ui->buttonHeightSB->value()); - mSettings.setValue("autoRotate", ui->autoRotateCB->isChecked()); - mSettings.setValue("closeOnMiddleClick", ui->middleClickCB->isChecked()); - mSettings.setValue("raiseOnCurrentDesktop", ui->raiseOnCurrentDesktopCB->isChecked()); - mSettings.setValue("groupingEnabled",ui->groupingGB->isChecked()); - mSettings.setValue("showGroupOnHover",ui->showGroupOnHoverCB->isChecked()); -} - -void LXQtTaskbarConfiguration::dialogButtonsAction(QAbstractButton *btn) -{ - if (ui->buttons->buttonRole(btn) == QDialogButtonBox::ResetRole) - { - /* We have to disable signals for buttonWidthSB to prevent errors. Otherwise not all data - could be restored */ - ui->buttonWidthSB->blockSignals(true); - ui->buttonHeightSB->blockSignals(true); - oldSettings.loadToSettings(); - loadSettings(); - ui->buttonWidthSB->blockSignals(false); - ui->buttonHeightSB->blockSignals(false); - } - else - close(); + 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()); } diff --git a/plugin-taskbar/lxqttaskbarconfiguration.h b/plugin-taskbar/lxqttaskbarconfiguration.h index 157eb2e..ba6054f 100644 --- a/plugin-taskbar/lxqttaskbarconfiguration.h +++ b/plugin-taskbar/lxqttaskbarconfiguration.h @@ -28,27 +28,24 @@ #ifndef LXQTTASKBARCONFIGURATION_H #define LXQTTASKBARCONFIGURATION_H -#include +#include "../panel/lxqtpanelpluginconfigdialog.h" +#include "../panel/pluginsettings.h" #include -#include - namespace Ui { class LXQtTaskbarConfiguration; } -class LXQtTaskbarConfiguration : public QDialog +class LXQtTaskbarConfiguration : public LXQtPanelPluginConfigDialog { Q_OBJECT public: - explicit LXQtTaskbarConfiguration(QSettings &settings, QWidget *parent = 0); + explicit LXQtTaskbarConfiguration(PluginSettings *settings, QWidget *parent = nullptr); ~LXQtTaskbarConfiguration(); private: Ui::LXQtTaskbarConfiguration *ui; - QSettings &mSettings; - LXQt::SettingsCache oldSettings; /* Read settings from conf file and put data into controls. @@ -57,7 +54,6 @@ private: private slots: void saveSettings(); - void dialogButtonsAction(QAbstractButton *btn); }; #endif // LXQTTASKBARCONFIGURATION_H diff --git a/plugin-taskbar/lxqttaskbarconfiguration.ui b/plugin-taskbar/lxqttaskbarconfiguration.ui index 308dd5d..2a9ecee 100644 --- a/plugin-taskbar/lxqttaskbarconfiguration.ui +++ b/plugin-taskbar/lxqttaskbarconfiguration.ui @@ -168,6 +168,13 @@ + + + + Use icons by WindowClass, if available + + + diff --git a/plugin-taskbar/lxqttaskbarplugin.cpp b/plugin-taskbar/lxqttaskbarplugin.cpp index 2e5f732..1c51d82 100644 --- a/plugin-taskbar/lxqttaskbarplugin.cpp +++ b/plugin-taskbar/lxqttaskbarplugin.cpp @@ -45,7 +45,7 @@ LXQtTaskBarPlugin::~LXQtTaskBarPlugin() QDialog *LXQtTaskBarPlugin::configureDialog() { - return new LXQtTaskbarConfiguration(*(settings())); + return new LXQtTaskbarConfiguration(settings()); } void LXQtTaskBarPlugin::realign() diff --git a/plugin-taskbar/lxqttaskbutton.cpp b/plugin-taskbar/lxqttaskbutton.cpp index b3cb5bc..08e4509 100644 --- a/plugin-taskbar/lxqttaskbutton.cpp +++ b/plugin-taskbar/lxqttaskbutton.cpp @@ -32,6 +32,8 @@ #include "lxqttaskgroup.h" #include "lxqttaskbar.h" +#include + #include #include #include @@ -80,6 +82,7 @@ LXQtTaskButton::LXQtTaskButton(const WId window, LXQtTaskBar * taskbar, QWidget mOrigin(Qt::TopLeftCorner), mDrawPixmap(false), mParentTaskBar(taskbar), + mPlugin(mParentTaskBar->plugin()), mDNDTimer(new QTimer(this)) { Q_ASSERT(taskbar); @@ -98,6 +101,8 @@ LXQtTaskButton::LXQtTaskButton(const WId window, LXQtTaskBar * taskbar, QWidget mDNDTimer->setSingleShot(true); mDNDTimer->setInterval(700); connect(mDNDTimer, SIGNAL(timeout()), this, SLOT(activateWithDraggable())); + connect(LXQt::Settings::globalSettings(), SIGNAL(iconThemeChanged()), this, SLOT(updateIcon())); + connect(mParentTaskBar, &LXQtTaskBar::iconByClassChanged, this, &LXQtTaskButton::updateIcon); } /************************************************ @@ -124,9 +129,15 @@ void LXQtTaskButton::updateText() void LXQtTaskButton::updateIcon() { QIcon ico; - QPixmap pix = KWindowSystem::icon(mWindow); - ico.addPixmap(pix); - setIcon(!pix.isNull() ? ico : XdgIcon::defaultApplicationIcon()); + if (mParentTaskBar->isIconByClass()) + { + ico = XdgIcon::fromTheme(QString::fromUtf8(KWindowInfo{mWindow, 0, NET::WM2WindowClass}.windowClassClass()).toLower()); + } + if (ico.isNull()) + { + ico = KWindowSystem::icon(mWindow); + } + setIcon(ico.isNull() ? XdgIcon::defaultApplicationIcon() : ico); } /************************************************ @@ -590,6 +601,7 @@ void LXQtTaskButton::contextMenuEvent(QContextMenuEvent* event) a = menu->addAction(XdgIcon::fromTheme("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); menu->show(); } diff --git a/plugin-taskbar/lxqttaskbutton.h b/plugin-taskbar/lxqttaskbutton.h index fc6014b..a07ffa0 100644 --- a/plugin-taskbar/lxqttaskbutton.h +++ b/plugin-taskbar/lxqttaskbutton.h @@ -74,13 +74,10 @@ public: bool isOnCurrentScreen() const; bool isMinimized() const; void updateText(); - void updateIcon(); Qt::Corner origin() const; virtual void setAutoRotation(bool value, ILXQtPanel::Position position); - LXQtTaskGroup * parentGroup(void) const {return mParentGroup;} - void setParentGroup(LXQtTaskGroup * group) {mParentGroup = group;} LXQtTaskBar * parentTaskBar() const {return mParentTaskBar;} void refreshIconGeometry(QRect const & geom); @@ -102,6 +99,8 @@ public slots: void setOrigin(Qt::Corner); + void updateIcon(); + protected: virtual void dragEnterEvent(QDragEnterEvent *event); virtual void dragMoveEvent(QDragMoveEvent * event); @@ -117,6 +116,8 @@ protected: virtual QMimeData * mimeData(); static bool sDraggging; + inline ILXQtPanelPlugin * plugin() const { return mPlugin; } + private: WId mWindow; bool mUrgencyHint; @@ -124,8 +125,8 @@ private: Qt::Corner mOrigin; QPixmap mPixmap; bool mDrawPixmap; - LXQtTaskGroup * mParentGroup; LXQtTaskBar * mParentTaskBar; + ILXQtPanelPlugin * mPlugin; // 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 diff --git a/plugin-taskbar/lxqttaskgroup.cpp b/plugin-taskbar/lxqttaskgroup.cpp index 6828216..20a6cc7 100644 --- a/plugin-taskbar/lxqttaskgroup.cpp +++ b/plugin-taskbar/lxqttaskgroup.cpp @@ -40,27 +40,31 @@ #include #include #include +#include /************************************************ ************************************************/ -LXQtTaskGroup::LXQtTaskGroup(const QString &groupName, QIcon icon, ILXQtPanelPlugin * plugin, LXQtTaskBar *parent) - : LXQtTaskButton(0, parent, parent), +LXQtTaskGroup::LXQtTaskGroup(const QString &groupName, WId window, LXQtTaskBar *parent) + : LXQtTaskButton(window, parent, parent), mGroupName(groupName), mPopup(new LXQtGroupPopup(this)), - mPlugin(plugin), - mPreventPopup(false) + mPreventPopup(false), + mSingleButton(true) { Q_ASSERT(parent); setObjectName(groupName); setText(groupName); - setIcon(icon); connect(this, SIGNAL(clicked(bool)), this, SLOT(onClicked(bool))); connect(KWindowSystem::self(), SIGNAL(currentDesktopChanged(int)), this, SLOT(onDesktopChanged(int))); - connect(KWindowSystem::self(), SIGNAL(windowRemoved(WId)), this, SLOT(onWindowRemoved(WId))); connect(KWindowSystem::self(), SIGNAL(activeWindowChanged(WId)), this, SLOT(onActiveWindowChanged(WId))); + connect(parent, &LXQtTaskBar::buttonRotationRefreshed, this, &LXQtTaskGroup::setAutoRotation); + connect(parent, &LXQtTaskBar::refreshIconGeometry, this, &LXQtTaskGroup::refreshIconsGeometry); + connect(parent, &LXQtTaskBar::buttonStyleRefreshed, this, &LXQtTaskGroup::setToolButtonsStyle); + connect(parent, &LXQtTaskBar::showOnlySettingChanged, this, &LXQtTaskGroup::refreshVisibility); + connect(parent, &LXQtTaskBar::popupShown, this, &LXQtTaskGroup::groupPopupShown); } /************************************************ @@ -70,7 +74,7 @@ void LXQtTaskGroup::contextMenuEvent(QContextMenuEvent *event) { setPopupVisible(false, true); mPreventPopup = true; - if (windowId()) + if (mSingleButton) { LXQtTaskButton::contextMenuEvent(event); return; @@ -83,7 +87,8 @@ void LXQtTaskGroup::contextMenuEvent(QContextMenuEvent *event) connect(menu, &QMenu::aboutToHide, [this] { mPreventPopup = false; }); - menu->setGeometry(mPlugin->panel()->calculatePopupWindowPos(mapToGlobal(event->pos()), menu->sizeHint())); + menu->setGeometry(plugin()->panel()->calculatePopupWindowPos(mapToGlobal(event->pos()), menu->sizeHint())); + plugin()->willShowWindow(menu); menu->show(); } @@ -114,8 +119,6 @@ LXQtTaskButton * LXQtTaskGroup::addWindow(WId id) setChecked(true); } - btn->setParentGroup(this); - mButtonHash.insert(id, btn); mPopup->addButton(btn); @@ -248,9 +251,15 @@ void LXQtTaskGroup::onChildButtonClicked() void LXQtTaskGroup::setToolButtonsStyle(Qt::ToolButtonStyle style) { setToolButtonStyle(style); + + // do not set icons-only style in the buttons in the group, + // as they'll be indistinguishable + Qt::ToolButtonStyle styleInPopup = style; + if (style == Qt::ToolButtonIconOnly) + styleInPopup = Qt::ToolButtonTextBesideIcon; for (auto & button : mButtonHash) { - button->setToolButtonStyle(style); + button->setToolButtonStyle(styleInPopup); } } @@ -279,7 +288,7 @@ int LXQtTaskGroup::visibleButtonsCount() const ************************************************/ void LXQtTaskGroup::draggingTimerTimeout() { - if (windowId()) + if (mSingleButton) setPopupVisible(false); } @@ -305,6 +314,7 @@ void LXQtTaskGroup::regroup() if (cont == 1) { + mSingleButton = true; // Get first visible button LXQtTaskButton * button = NULL; foreach (LXQtTaskButton *btn, mButtonHash.values()) @@ -327,21 +337,13 @@ void LXQtTaskGroup::regroup() hide(); else { + mSingleButton = false; QString t = QString("%1 - %2 windows").arg(mGroupName).arg(cont); setText(t); setToolTip(parentTaskBar()->isShowGroupOnHover() ? QString() : t); - setWindowId(0); } } -/************************************************ - - ************************************************/ -void LXQtTaskGroup::showOnlySettingChanged() -{ - refreshVisibility(); -} - /************************************************ ************************************************/ @@ -350,7 +352,7 @@ void LXQtTaskGroup::recalculateFrameIfVisible() if (mPopup->isVisible()) { recalculateFrameSize(); - if (mPlugin->panel()->position() == ILXQtPanel::PositionBottom) + if (plugin()->panel()->position() == ILXQtPanel::PositionBottom) recalculateFramePosition(); } } @@ -409,7 +411,7 @@ QMimeData * LXQtTaskGroup::mimeData() ************************************************/ void LXQtTaskGroup::setPopupVisible(bool visible, bool fast) { - if (visible && !mPreventPopup && 0 == windowId()) + if (visible && !mPreventPopup && !mSingleButton) { if (!mPopup->isVisible()) { @@ -418,6 +420,7 @@ void LXQtTaskGroup::setPopupVisible(bool visible, bool fast) recalculateFramePosition(); } + plugin()->willShowWindow(mPopup); mPopup->show(); emit popupShown(this); } @@ -433,7 +436,7 @@ void LXQtTaskGroup::refreshIconsGeometry() QRect rect = geometry(); rect.moveTo(mapToGlobal(QPoint(0, 0))); - if (windowId()) + if (mSingleButton) { refreshIconGeometry(rect); return; @@ -442,7 +445,7 @@ void LXQtTaskGroup::refreshIconsGeometry() foreach(LXQtTaskButton *but, mButtonHash.values()) { but->refreshIconGeometry(rect); - but->setIconSize(QSize(mPlugin->panel()->iconSize(), mPlugin->panel()->iconSize())); + but->setIconSize(QSize(plugin()->panel()->iconSize(), plugin()->panel()->iconSize())); } } @@ -471,7 +474,7 @@ QSize LXQtTaskGroup::recalculateFrameSize() int LXQtTaskGroup::recalculateFrameHeight() const { int cont = visibleButtonsCount(); - int h = !mPlugin->panel()->isHorizontal() && parentTaskBar()->isAutoRotate() ? width() : height(); + int h = !plugin()->panel()->isHorizontal() && parentTaskBar()->isAutoRotate() ? width() : height(); return cont * h + (cont + 1) * mPopup->spacing(); } @@ -484,7 +487,7 @@ int LXQtTaskGroup::recalculateFrameWidth() const int minimum = 300; int hh = width(); - if (!mPlugin->panel()->isHorizontal() && !parentTaskBar()->isAutoRotate()) + if (!plugin()->panel()->isHorizontal() && !parentTaskBar()->isAutoRotate()) hh = height(); if (hh < minimum) @@ -500,7 +503,7 @@ QPoint LXQtTaskGroup::recalculateFramePosition() { // Set position int x_offset = 0, y_offset = 0; - switch (mPlugin->panel()->position()) + switch (plugin()->panel()->position()) { case ILXQtPanel::PositionTop: y_offset += height(); @@ -588,25 +591,21 @@ bool LXQtTaskGroup::onWindowChanged(WId window, NET::Properties prop, NET::Prope if (mButtonHash.contains(window)) buttons.append(mButtonHash.value(window)); - // If group contains only one window properties must be changed also on button group + // If group is based on that window properties must be changed also on button group if (window == windowId()) buttons.append(this); - foreach (LXQtTaskButton * button, buttons) + if (!buttons.isEmpty()) { consumed = true; // if class is changed the window won't belong to our group any more - if (parentTaskBar()->isGroupingEnabled() && prop2.testFlag(NET::WM2WindowClass) && this != button) + if (parentTaskBar()->isGroupingEnabled() && prop2.testFlag(NET::WM2WindowClass)) { KWindowInfo info(window, 0, NET::WM2WindowClass); if (info.windowClassClass() != mGroupName) { - //remove this window from this group - //Note: can't optimize case when there is only one window in this group - // because mGroupName is a hash key in taskbar - emit windowDisowned(window); + consumed = false; onWindowRemoved(window); - continue; } } // window changed virtual desktop @@ -620,25 +619,22 @@ bool LXQtTaskGroup::onWindowChanged(WId window, NET::Properties prop, NET::Prope } if (prop.testFlag(NET::WMVisibleName) || prop.testFlag(NET::WMName)) - button->updateText(); + std::for_each(buttons.begin(), buttons.end(), std::mem_fn(&LXQtTaskButton::updateText)); // XXX: we are setting window icon geometry -> don't need to handle NET::WMIconGeometry - if (prop.testFlag(NET::WMIcon)) - button->updateIcon(); + // Icon of the button can be based on windowClass + if (prop.testFlag(NET::WMIcon) || prop2.testFlag(NET::WM2WindowClass)) + std::for_each(buttons.begin(), buttons.end(), std::mem_fn(&LXQtTaskButton::updateIcon)); if (prop.testFlag(NET::WMState)) { KWindowInfo info{window, NET::WMState}; - if (info.hasState(NET::SkipTaskbar) && this != button) + if (info.hasState(NET::SkipTaskbar)) { - //remove this window from this group - //Note: can't optimize case when there is only one window in this group - // because mGroupName is a hash key in taskbar - emit windowDisowned(window); + consumed = false; onWindowRemoved(window); - continue; } - button->setUrgencyHint(info.hasState(NET::DemandsAttention)); + std::for_each(buttons.begin(), buttons.end(), std::bind(&LXQtTaskButton::setUrgencyHint, std::placeholders::_1, info.hasState(NET::DemandsAttention))); if (parentTaskBar()->isShowOnlyMinimizedTasks()) { @@ -652,3 +648,13 @@ bool LXQtTaskGroup::onWindowChanged(WId window, NET::Properties prop, NET::Prope return consumed; } + +/************************************************ + + ************************************************/ +void LXQtTaskGroup::groupPopupShown(LXQtTaskGroup * const sender) +{ + //close all popups (should they be visible because of close delay) + if (this != sender && isVisible()) + setPopupVisible(false, true/*fast*/); +} diff --git a/plugin-taskbar/lxqttaskgroup.h b/plugin-taskbar/lxqttaskgroup.h index f95cfbd..93b7ea8 100644 --- a/plugin-taskbar/lxqttaskgroup.h +++ b/plugin-taskbar/lxqttaskgroup.h @@ -50,11 +50,10 @@ class LXQtTaskGroup: public LXQtTaskButton Q_OBJECT public: - LXQtTaskGroup(const QString & groupName, QIcon icon ,ILXQtPanelPlugin * plugin, LXQtTaskBar * parent); + LXQtTaskGroup(const QString & groupName, WId window, LXQtTaskBar * parent); QString groupName() const { return mGroupName; } - void removeButton(WId window); int buttonsCount() const; int visibleButtonsCount() const; @@ -66,13 +65,14 @@ public: LXQtTaskButton * getNextPrevChildButton(bool next, bool circular); bool onWindowChanged(WId window, NET::Properties prop, NET::Properties2 prop2); - void refreshIconsGeometry(); - void showOnlySettingChanged(); void setAutoRotation(bool value, ILXQtPanel::Position position); void setToolButtonsStyle(Qt::ToolButtonStyle style); void setPopupVisible(bool visible = true, bool fast = false); +public slots: + void onWindowRemoved(WId window); + protected: QMimeData * mimeData(); @@ -91,28 +91,28 @@ private slots: void onClicked(bool checked); void onChildButtonClicked(); void onActiveWindowChanged(WId window); - void onWindowRemoved(WId window); void onDesktopChanged(int number); void closeGroup(); + void refreshIconsGeometry(); + void refreshVisibility(); + void groupPopupShown(LXQtTaskGroup* sender); signals: void groupBecomeEmpty(QString name); void visibilityChanged(bool visible); void popupShown(LXQtTaskGroup* sender); - void windowDisowned(WId window); private: QString mGroupName; LXQtGroupPopup * mPopup; LXQtTaskButtonHash mButtonHash; - ILXQtPanelPlugin * mPlugin; bool mPreventPopup; + bool mSingleButton; //!< flag if this group should act as a "standard" button (no groupping or only one "shown" window in group) QSize recalculateFrameSize(); QPoint recalculateFramePosition(); void recalculateFrameIfVisible(); - void refreshVisibility(); void regroup(); }; diff --git a/plugin-taskbar/translations/taskbar.ts b/plugin-taskbar/translations/taskbar.ts deleted file mode 100644 index a948819..0000000 --- a/plugin-taskbar/translations/taskbar.ts +++ /dev/null @@ -1,199 +0,0 @@ - - - - - LXQtTaskButton - - - Application - - - - - To &Desktop - - - - - &All Desktops - - - - - Desktop &%1 - - - - - &To Current Desktop - - - - - 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 c&urrent desktop - - - - - Show only windows from &panel's screen - - - - - Show only minimized windows - - - - - Raise minimized windows on current desktop - - - - - Close on middle-click - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Button style - - - - - Maximum button width - - - - - - px - - - - - Maximum button height - - - - - Auto&rotate buttons when the panel is vertical - - - - - Icon and text - - - - - Only icon - - - - - Only text - - - - diff --git a/plugin-taskbar/translations/taskbar_ar.desktop b/plugin-taskbar/translations/taskbar_ar.desktop index 9fee415..6b7def7 100644 --- a/plugin-taskbar/translations/taskbar_ar.desktop +++ b/plugin-taskbar/translations/taskbar_ar.desktop @@ -1,12 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Task manager -Comment=Switch between running applications - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ar]=التبديل بين التطبيقات الجارية +Comment[ar]=بدّل بين التّطبيقات العاملة Name[ar]=مدير المهامّ diff --git a/plugin-taskbar/translations/taskbar_ar.ts b/plugin-taskbar/translations/taskbar_ar.ts deleted file mode 100644 index b6f7062..0000000 --- a/plugin-taskbar/translations/taskbar_ar.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - التطبيق - - - - To &Desktop - إلى س&طح المكتب - - - - &All Desktops - كا&فَّة أسطح المكتب - - - - Desktop &%1 - سطح المكتب &%1 - - - - &To Current Desktop - إلى سطح المكتب ال&حالي - - - - 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 - - LXQt Task Manager Settings - إعدادات مدير مهام ريزر - - - Window List Content - محتوى قائمة النَّوافذ - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - إظهار نوافذ سطح المكتب الحاليّ - - - Show windows from all desktops - إظهار نوافذ كافَّة اﻷسطح المكتبيَّة - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - مظهر قائمة النَّوافذ - - - - Button style - شكل الزُّرّ - - - Max button width - عرض زرِّ التكبير - - - - Close on middle-click - إغلاق عند الضغط على زرّ الفأرة اﻷوسط - - - - Icon and text - أيقونةٌ ونصٌّ - - - - Only icon - أيقونةٌ فقط - - - - Only text - نصٌّ فقط - - - diff --git a/plugin-taskbar/translations/taskbar_cs.ts b/plugin-taskbar/translations/taskbar_cs.ts deleted file mode 100644 index 682f0e7..0000000 --- a/plugin-taskbar/translations/taskbar_cs.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Program - - - - To &Desktop - Na &plochu - - - - &All Desktops - &Všechny plochy - - - - Desktop &%1 - Plocha &%1 - - - - &To Current Desktop - &Na nynější plochu - - - - Ma&ximize - Zvě&tšit - - - - Maximize vertically - Zvětšit svisle - - - - Maximize horizontally - Zvětšit vodorovně - - - - &Restore - &Obnovit - - - - Mi&nimize - &Zmenšit - - - - Roll down - Sbalit - - - - Roll up - Rozbalit - - - - &Layer - &Vrstva - - - - Always on &top - Vždy &nahoře - - - - &Normal - &Obvyklé - - - - Always on &bottom - Vždy &dole - - - - &Close - &Zavřít - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - Nastavení správce úkolů - - - Window List Content - Obsah seznamu oken - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Ukázat okna z nynější plochy - - - Show windows from all desktops - Ukázat okna ze všech ploch - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - Vzhled seznamu oken - - - - Button style - Styl tlačítek - - - Max button width - Největší šířka tlačítka - - - - Close on middle-click - Zavřít klepnutím prostředním tlačítkem - - - - Icon and text - Ikona a text - - - - Only icon - Pouze ikona - - - - Only text - Pouze text - - - diff --git a/plugin-taskbar/translations/taskbar_cs_CZ.ts b/plugin-taskbar/translations/taskbar_cs_CZ.ts deleted file mode 100644 index 8662eab..0000000 --- a/plugin-taskbar/translations/taskbar_cs_CZ.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Program - - - - To &Desktop - Na &plochu - - - - &All Desktops - &Všechny plochy - - - - Desktop &%1 - Plocha &%1 - - - - &To Current Desktop - &Na nynější plochu - - - - Ma&ximize - Zvě&tšit - - - - Maximize vertically - Zvětšit svisle - - - - Maximize horizontally - Zvětšit vodorovně - - - - &Restore - &Obnovit - - - - Mi&nimize - &Zmenšit - - - - Roll down - Sbalit - - - - Roll up - Rozbalit - - - - &Layer - &Vrstva - - - - Always on &top - Vždy &nahoře - - - - &Normal - &Obvyklé - - - - Always on &bottom - Vždy &dole - - - - &Close - &Zavřít - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - Nastavení správce úkolů - - - Window List Content - Obsah seznamu oken - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Ukázat okna z nynější plochy - - - Show windows from all desktops - Ukázat okna ze všech ploch - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - Vzhled seznamu oken - - - - Button style - Styl tlačítek - - - Max button width - Největší šířka tlačítka - - - - Close on middle-click - Zavřít klepnutím prostředním tlačítkem - - - - Icon and text - Ikona a text - - - - Only icon - Pouze ikona - - - - Only text - Pouze text - - - diff --git a/plugin-taskbar/translations/taskbar_da.ts b/plugin-taskbar/translations/taskbar_da.ts deleted file mode 100644 index 3f3f176..0000000 --- a/plugin-taskbar/translations/taskbar_da.ts +++ /dev/null @@ -1,211 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Program - - - - To &Desktop - Til skrivebor&d - - - - &All Desktops - &Alle skriveborde - - - - Desktop &%1 - Skrivebord &%1 - - - - &To Current Desktop - &Til aktuelt skrivebord - - - - Ma&ximize - Ma&ksimer - - - - Maximize vertically - Maksimer vertikalt - - - - Maximize horizontally - Maksimer horisontalt - - - - &Restore - &Gendan - - - - Mi&nimize - Mi&nimer - - - - Roll down - Rul ned - - - - Roll up - Rul op - - - - &Layer - &Lag - - - - Always on &top - Al&tid øverst - - - - &Normal - &Normal - - - - Always on &bottom - Altid &nederst - - - - &Close - &Luk - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - LXQt Opgavehåndtering Indstillinger - - - Window List Content - Indhold af vinduesliste - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Vis vinduer fra aktuelle skrivebord - - - - Auto&rotate buttons when the panel is vertical - - - - - Close on middle-click - - - - wlcB - wlcB - - - Show windows from all desktops - Vis vinduer fra alle skriveborde - - - Window List Appearance - Udseende af Vinduesliste - - - - Button style - Knapstil - - - Max button width - Maks knapbredde - - - - Icon and text - Ikon og tekst - - - - Only icon - Kun ikon - - - - Only text - Kun tekst - - - diff --git a/plugin-taskbar/translations/taskbar_da_DK.ts b/plugin-taskbar/translations/taskbar_da_DK.ts deleted file mode 100644 index 20fd4b3..0000000 --- a/plugin-taskbar/translations/taskbar_da_DK.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Program - - - - To &Desktop - Til &Skrivebord - - - - &All Desktops - A&lle Skriveborde - - - - Desktop &%1 - Skrivebord &%1 - - - - &To Current Desktop - Til Nuværende Skrivebor&d - - - - Ma&ximize - Ma&ksimer - - - - Maximize vertically - Maksimer vertikalt - - - - Maximize horizontally - Maksimer horisontalt - - - - &Restore - &Gendan - - - - Mi&nimize - Mi&nimer - - - - Roll down - Rul ned - - - - Roll up - Rul op - - - - &Layer - &Lag - - - - Always on &top - Altid &Ovenpå - - - - &Normal - &Normal - - - - Always on &bottom - Altid Ned&erst - - - - &Close - &Afslut - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - LXQt Jobliste Indstillinger - - - Window List Content - Indhold Af Vinduesliste - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Vis vinduer fra nuværende skrivebord - - - Show windows from all desktops - Vis vinduer fra alle skriveborde - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - Udseende af vinduesliste - - - - Button style - Knap stil - - - Max button width - Maks. knapbredde - - - - Close on middle-click - Luk ved midterklik - - - - Icon and text - Ikon og tekst - - - - Only icon - Kun ikoner - - - - Only text - Kun tekst - - - diff --git a/plugin-taskbar/translations/taskbar_de.ts b/plugin-taskbar/translations/taskbar_de.ts deleted file mode 100644 index c29299e..0000000 --- a/plugin-taskbar/translations/taskbar_de.ts +++ /dev/null @@ -1,204 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Anwendung - - - - To &Desktop - Zur Arb&eitsfläche - - - - &All Desktops - &Alle Arbeitsflächen - - - - Desktop &%1 - Arbeitsfläche &%1 - - - - &To Current Desktop - Zur ak&tuellen Arbeitsfläche - - - - Ma&ximize - Ma&ximieren - - - - Maximize vertically - Vertikal maximieren - - - - Maximize horizontally - Horizontal maximieren - - - - &Restore - &Wiederherstellen - - - - 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 - - - - LXQtTaskGroup - - - Group - Gruppe - - - - Close group - Gruppe schließen - - - - LXQtTaskbarConfiguration - - - Task Manager Settings - Anwendungsverwalter - Einstellungen - - - - General - Allgemein - - - - Show only windows from desktop - Nur Fenster der Arbeitsfläche anzeigen - - - - Show only windows from &panel's screen - Nur Fenster aus der &Taskleiste anzeigen - - - - Show only minimized windows - Nur minimierte Fenster anzeigen - - - - Raise minimized windows on current desktop - Minimierte Fenster auf aktuelle Arbeitsfläche heben - - - - Close on middle-click - Fenster bei Mittelklick schließen - - - - Window &grouping - Fensteranordnun&g - - - - Show popup on mouse hover - Popup beim Überfahren mit dem Mauszeiger - - - - Appearance - Erscheinungsbild - - - - Button style - Schaltflächenstil - - - - Maximum button width - Max. Schaltflächenbreite - - - - - px - px - - - - Maximum button height - Max. Schaltflächenhöhe - - - - Auto&rotate buttons when the panel is vertical - Schaltflächen automatisch d&rehen bei vertikaler Leiste - - - - Icon and text - Symbol und Text - - - - Only icon - Nur Symbol - - - - Only text - Nur Text - - - - Current - Aktuell - - - diff --git a/plugin-taskbar/translations/taskbar_el.ts b/plugin-taskbar/translations/taskbar_el.ts deleted file mode 100644 index 44cd9df..0000000 --- a/plugin-taskbar/translations/taskbar_el.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Εφαρμογή - - - - To &Desktop - Στην επι&φάνεια εργασίας - - - - &All Desktops - Ό&λες οι επιφάνειες εργασίας - - - - Desktop &%1 - Επιφάνεια εργασίας &%1 - - - - &To Current Desktop - Στ&ην τρέχουσα επιφάνεια εργασίας - - - - 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 - - LXQt Task Manager Settings - Ρυθμίσεις του διαχειριστή εργασιών LXQt - - - Window List Content - Περιεχόμενο της λίστας των παραθύρων - - - - Task Manager Settings - Ρυθμίσεις του διαχειριστή εργασιών - - - - General - Γενικά - - - - Show windows from c&urrent desktop - Εμφάνιση των παραθύρων της &τρέχουσας επιφάνειας εργασίας - - - - Show windows from all des&ktops - Εμφάνιση των παραθύρων &όλων των επιφανειών εργασίας - - - - Window &grouping - Ομα&δοποίηση των παραθύρων - - - - Show popup on mouse hover - Εμφάνιση αναδυόμενου κατά το πέρασμα του ποντικιού - - - - Appearance - Εμφάνιση - - - - Maximum button width - Μέγιστο πλάτος κουμπιού - - - - px - εικ - - - Show windows from current desktop - Εμφάνιση των παραθύρων της τρέχουσας επιφάνειας εργασίας - - - Show windows from all desktops - Εμφάνιση παραθύρων όλων των επιφανειών εργασίας - - - - Auto&rotate buttons when the panel is vertical - &Αυτόματη περιστροφή των κουμπιών όταν ο πίνακας είναι τοποθετημένος κάθετα - - - Window List Appearance - Εμφάνιση της λίστας των παραθύρων - - - - Button style - Ύφος του πλήκτρου - - - Max button width - Μέγιστο πλάτος πλήκτρου - - - - Close on middle-click - Κλείσιμο με μεσαίο κλικ - - - - Icon and text - Εικόνα και κείμενο - - - - Only icon - Μόνο εικόνα - - - - Only text - Μόνο κείμενο - - - diff --git a/plugin-taskbar/translations/taskbar_eo.ts b/plugin-taskbar/translations/taskbar_eo.ts deleted file mode 100644 index c44c8e8..0000000 --- a/plugin-taskbar/translations/taskbar_eo.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Aplikaĵo - - - - To &Desktop - &Al labortablo - - - - &All Desktops - Ĉiuj l&abortabloj - - - - Desktop &%1 - Labortablo &%1 - - - - &To Current Desktop - Al ak&tuala labortablo - - - - 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 - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - Agordoj de taskmastrumilo de LXQto - - - Window List Content - Enhavo de listo de fenestroj - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Montri fenestrojn el aktuala labortablo - - - Show windows from all desktops - Montri fenestrojn el ĉiuj labortabloj - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - Apero de listo de fenestroj - - - - Button style - Stilo de butonoj - - - Max button width - Maksimuma grando de butonoj - - - - Close on middle-click - - - - - Icon and text - Piktogramo kaj teksto - - - - Only icon - Nur piktogramoj - - - - Only text - Nur teksto - - - diff --git a/plugin-taskbar/translations/taskbar_es.ts b/plugin-taskbar/translations/taskbar_es.ts deleted file mode 100644 index c2968af..0000000 --- a/plugin-taskbar/translations/taskbar_es.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Aplicación - - - - To &Desktop - Al &escritorio - - - - &All Desktops - &Todos los escritorios - - - - Desktop &%1 - Escritorio &%1 - - - - &To Current Desktop - &Al escritorio actual - - - - Ma&ximize - Ma&ximizar - - - - Maximize vertically - Maximizar verticalmente - - - - Maximize horizontally - Maximizar horizontalmente - - - - &Restore - &Restauar - - - - Mi&nimize - Mi&nimizar - - - - Roll down - Desplegar - - - - Roll up - Enrollar - - - - &Layer - &Capa - - - - Always on &top - Siempre &encima - - - - &Normal - &Normal - - - - Always on &bottom - Siempre al &fondo - - - - &Close - &Cerrar - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - Opciones del administrador de tareas de LXQt - - - Window List Content - Contenido del listado de ventanas - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Mostrar ventanas del escritorio actual - - - Show windows from all desktops - Mostrar ventanas de todos los escritorios - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - Apariencia de la lista de ventanas - - - - Button style - Estilo del botón - - - Max button width - Ancho máximo del botón - - - - Close on middle-click - Cerrar con el boton central - - - - Icon and text - Icono y texto - - - - Only icon - Solo icono - - - - Only text - Solo texto - - - diff --git a/plugin-taskbar/translations/taskbar_es_VE.ts b/plugin-taskbar/translations/taskbar_es_VE.ts deleted file mode 100644 index 37c91b8..0000000 --- a/plugin-taskbar/translations/taskbar_es_VE.ts +++ /dev/null @@ -1,208 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Aplicación - - - - To &Desktop - Al &Escritorio - - - - &All Desktops - &Todos los escritorios - - - - Desktop &%1 - Escritorio &%1 - - - - &To Current Desktop - &Al escritorio actual - - - - 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 - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - Configuaracion de lista de tareas LXQt - - - Window List Content - Lista de ventanas - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Mostrar ventanas del escritorio activo - - - Show windows from all desktops - Mostrar ventanas de todos los escritorios - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - Apariencia de la lista de ventanas - - - - Button style - Estilo de boton - - - Max button width - Ancho maximo - - - - Close on middle-click - Cerrar en click medio - - - - Icon and text - Icono y texto - - - - Only icon - Solo iconos - - - - Only text - -Solo texto - - - diff --git a/plugin-taskbar/translations/taskbar_eu.ts b/plugin-taskbar/translations/taskbar_eu.ts deleted file mode 100644 index 6601ca5..0000000 --- a/plugin-taskbar/translations/taskbar_eu.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Aplikazioa - - - - To &Desktop - &Mahaigainera - - - - &All Desktops - Mahaigain &guztiak - - - - Desktop &%1 - &%1 mahaigaina - - - - &To Current Desktop - &Uneko mahaigainera - - - - 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 - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - LXQt ataza-kudeatzailearen ezarpenak - - - Window List Content - Leiho-zerrendaren edukia - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Erakutsi uneko mahaigaineko leihoak - - - Show windows from all desktops - Erakutsi mahaigain guztietako leihoak - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - Leiho-zerrendaren itxura - - - - Button style - Botoi-estiloa - - - Max button width - Botoien zabalera maximoa - - - - Close on middle-click - Itxi erdiko botoia klikatzean - - - - Icon and text - Ikonoa eta testua - - - - Only icon - Ikonoa soilik - - - - Only text - Testua soilik - - - diff --git a/plugin-taskbar/translations/taskbar_fi.ts b/plugin-taskbar/translations/taskbar_fi.ts deleted file mode 100644 index 916136f..0000000 --- a/plugin-taskbar/translations/taskbar_fi.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - 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 - - - - 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 - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - LXQt:n tehtävienhallinnan asetukset - - - Window List Content - Ikkunaluettelon sisältö - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Näytä ikkunat nykyiseltä työpöydältä - - - Show windows from all desktops - Näytä ikkunat kaikilta työpöydiltä - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - Ikkunaluettelon ulkoasu - - - - Button style - Painiketyyli - - - Max button width - Painikkeen enimmäisleveys - - - - Close on middle-click - Sulje hiiren keskimmäisen painikkeen painalluksella - - - - Icon and text - Kuvake ja teksti - - - - Only icon - Pelkkä kuvake - - - - Only text - Pelkkä teksti - - - diff --git a/plugin-taskbar/translations/taskbar_fr_FR.ts b/plugin-taskbar/translations/taskbar_fr_FR.ts deleted file mode 100644 index 524f6d1..0000000 --- a/plugin-taskbar/translations/taskbar_fr_FR.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Application - - - - To &Desktop - Vers &le bureau - - - - &All Desktops - &Tous les bureaux - - - - Desktop &%1 - Bureau &%1 - - - - &To Current Desktop - &Vers le bureau courant - - - - Ma&ximize - Maximiser - - - - Maximize vertically - Maximiser verticalement - - - - Maximize horizontally - Maximiser horizontalement - - - - &Restore - &Restaurer - - - - Mi&nimize - Mi&nimiser - - - - Roll down - Enrouler vers le bas - - - - Roll up - Enrouler vers le haut - - - - &Layer - &Calque - - - - Always on &top - Toujours au &dessus - - - - &Normal - &Normal - - - - Always on &bottom - Toujours en &bas - - - - &Close - &Fermer - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - Paramètres du gestionnaire des tâches de LXQt - - - Window List Content - Contenu de la liste des fenêtres - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Montrer les fenêtres du bureau actuel - - - Show windows from all desktops - Montrer les fenêtres de tous les bureaux - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - Apparence de la liste des fenêtres - - - - Button style - Style de boutons - - - Max button width - Largeur maximale du bouton - - - - Close on middle-click - Fermer d'un clic du milieu - - - - Icon and text - Icone et texte - - - - Only icon - Icone seule - - - - Only text - Texte seul - - - diff --git a/plugin-taskbar/translations/taskbar_hu.ts b/plugin-taskbar/translations/taskbar_hu.ts deleted file mode 100644 index 78334d5..0000000 --- a/plugin-taskbar/translations/taskbar_hu.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Alkalmazás - - - - To &Desktop - Erre az asztal&ra - - - - &All Desktops - &Az összes asztalra - - - - Desktop &%1 - &%1. asztal - - - - &To Current Desktop - Az ak&tuális asztalra - - - - 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 - - - - LXQtTaskGroup - - - Group - Csoport - - - - Close group - Csoport bezárás - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - A LXQt feladatkezelő beállításai - - - Window List Content - Az ablaklista tartalma - - - - Task Manager Settings - Feladatkezelő beállítása - - - - General - Általános - - - - Show windows from c&urrent desktop - A jelenlegi asztal ablakai látszanak - - - - Show windows from all des&ktops - Az összes asztal ablakai létszanak - - - - Window &grouping - &Ablakcsoportok - - - - Show popup on mouse hover - Egérre felbukkanó jelzés - - - - Appearance - Megjelenés - - - - Maximum button width - Gomb maximális szélessége - - - - px - pixel - - - Show windows from current desktop - A jelenlegi asztal ablakai - - - Show windows from all desktops - Az összes asztal ablakai - - - - Auto&rotate buttons when the panel is vertical - Gombok függőleges panelnál gördülnek - - - Window List Appearance - Az ablaklista megjelenése - - - - Button style - Gombstílus: - - - Max button width - Max. gombszélesség - - - - Close on middle-click - Középkattintásra bezárul - - - - Icon and text - Ikon és szöveg - - - - Only icon - Csak ikon - - - - Only text - Csak szöveg - - - diff --git a/plugin-taskbar/translations/taskbar_hu_HU.ts b/plugin-taskbar/translations/taskbar_hu_HU.ts deleted file mode 100644 index 11ffcfd..0000000 --- a/plugin-taskbar/translations/taskbar_hu_HU.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Alkalmazás - - - - To &Desktop - Erre az asztal&ra - - - - &All Desktops - &Az összes asztalra - - - - Desktop &%1 - &%1. asztal - - - - &To Current Desktop - Az ak&tuális asztalra - - - - 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 - - - - LXQtTaskGroup - - - Group - Csoport - - - - Close group - Csoport bezárás - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - A LXQt feladatkezelő beállításai - - - Window List Content - Az ablaklista tartalma - - - - Task Manager Settings - Feladatkezelő beállítása - - - - General - Általános - - - - Show windows from c&urrent desktop - A jelenlegi asztal ablakai látszanak - - - - Show windows from all des&ktops - Az összes asztal ablakai létszanak - - - - Window &grouping - &Ablakcsoportok - - - - Show popup on mouse hover - Egérre felbukkanó jelzés - - - - Appearance - Megjelenés - - - - Maximum button width - Gomb maximális szélessége - - - - px - pixel - - - Show windows from current desktop - A jelenlegi asztal ablakai - - - Show windows from all desktops - Az összes asztal ablakai - - - - Auto&rotate buttons when the panel is vertical - Gombok függőleges panelnál gördülnek - - - Window List Appearance - Az ablaklista megjelenése - - - - Button style - Gombstílus: - - - Max button width - Max. gombszélesség - - - - Close on middle-click - Középkattintásra bezárul - - - - Icon and text - Ikon és szöveg - - - - Only icon - Csak ikon - - - - Only text - Csak szöveg - - - diff --git a/plugin-taskbar/translations/taskbar_ia.ts b/plugin-taskbar/translations/taskbar_ia.ts deleted file mode 100644 index dbabdfb..0000000 --- a/plugin-taskbar/translations/taskbar_ia.ts +++ /dev/null @@ -1,183 +0,0 @@ - - - - - LXQtTaskButton - - - Application - - - - - To &Desktop - - - - - &All Desktops - - - - - Desktop &%1 - - - - - &To Current Desktop - - - - - 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 windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - - Auto&rotate buttons when the panel is vertical - - - - - Close on middle-click - - - - - Button style - - - - - Icon and text - - - - - Only icon - - - - - Only text - - - - diff --git a/plugin-taskbar/translations/taskbar_id_ID.ts b/plugin-taskbar/translations/taskbar_id_ID.ts deleted file mode 100644 index 68bd93f..0000000 --- a/plugin-taskbar/translations/taskbar_id_ID.ts +++ /dev/null @@ -1,183 +0,0 @@ - - - - - LXQtTaskButton - - - Application - - - - - To &Desktop - - - - - &All Desktops - - - - - Desktop &%1 - - - - - &To Current Desktop - - - - - 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 windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - - Auto&rotate buttons when the panel is vertical - - - - - Close on middle-click - - - - - Button style - - - - - Icon and text - - - - - Only icon - - - - - Only text - - - - diff --git a/plugin-taskbar/translations/taskbar_it.ts b/plugin-taskbar/translations/taskbar_it.ts deleted file mode 100644 index 4baa209..0000000 --- a/plugin-taskbar/translations/taskbar_it.ts +++ /dev/null @@ -1,219 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Applicazione - - - - To &Desktop - Al &desktop - - - - &All Desktops - &Tutti i desktop - - - - Desktop &%1 - Desktop &%1 - - - - &To Current Desktop - &Al desktop corrente - - - - 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 - - - - LXQtTaskGroup - - - Group - Gruppo - - - - Close group - Chiudi gruppo - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - Impostazioni del Task Manager di LXQt - - - Window List Content - Mostra finestre - - - - Task Manager Settings - Impostazioni della barra applicazioni - - - - General - Generali - - - - Show windows from c&urrent desktop - Mostra finestre del &desktop attuale - - - - Show windows from all des&ktops - Mostra finestre di &tutti desktop - - - - Window &grouping - &Ragruppa finestre della stessa applicazione - - - - Show popup on mouse hover - Mostra popup al passaggio del mouse - - - - Appearance - Aspetto - - - - Maximum button width - Larghezza massima del pulsante - - - - px - px - - - Taskbar Contents - Contenuti della barra - - - Show windows from current desktop - Mostra finestre del desktop corrente - - - Show windows from all desktops - Mostra finestre da tutti i desktop - - - Taskbar Appearance - Aspetto - - - Minimum button width - Larghezza minima dei pulsanti - - - - Auto&rotate buttons when the panel is vertical - Ruota &automaticamente se il panello è verticale - - - Window List Appearance - Aspetto delle finestre - - - - Button style - Stile dei pulsanti - - - Max button width - Larghezza massima dei pulsanti - - - - Close on middle-click - Chiudi con un click del tasto centrale - - - - Icon and text - Icone e testo - - - - Only icon - Solo icone - - - - Only text - Solo testo - - - diff --git a/plugin-taskbar/translations/taskbar_ja.ts b/plugin-taskbar/translations/taskbar_ja.ts deleted file mode 100644 index 8fb6941..0000000 --- a/plugin-taskbar/translations/taskbar_ja.ts +++ /dev/null @@ -1,203 +0,0 @@ - - - - - LXQtTaskButton - - - Application - アプリケーション - - - - To &Desktop - デスクトップへ(&D) - - - - &All Desktops - すべてのデスクトップ(&A) - - - - Desktop &%1 - デスクトップ &%1 - - - - &To Current Desktop - 現在のデスクトップへ(&T) - - - - 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) - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - - Task Manager Settings - タスクマネージャーの設定 - - - Taskbar Contents - タスクバーの内容 - - - Show windows from current desktop - 現在のデスクトップのウィンドウを表示 - - - Show windows from all desktops - 全てのデスクトップのウィンドウを表示 - - - Taskbar Appearance - タスクバーの見た目 - - - Minimum button width - ボタン幅の最小値 - - - - Auto&rotate buttons when the panel is vertical - パネルが垂直なときにはボタンを回転(&R) - - - - Button style - ボタンのスタイル - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Close on middle-click - 中ボタンのクリックで閉じる - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - - Icon and text - アイコンとテキスト - - - - Only icon - アイコンのみ - - - - Only text - テキストのみ - - - diff --git a/plugin-taskbar/translations/taskbar_ko.ts b/plugin-taskbar/translations/taskbar_ko.ts deleted file mode 100644 index 14bd851..0000000 --- a/plugin-taskbar/translations/taskbar_ko.ts +++ /dev/null @@ -1,183 +0,0 @@ - - - - - LXQtTaskButton - - - Application - - - - - To &Desktop - - - - - &All Desktops - - - - - Desktop &%1 - - - - - &To Current Desktop - - - - - 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 windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - - Auto&rotate buttons when the panel is vertical - - - - - Close on middle-click - - - - - Button style - - - - - Icon and text - - - - - Only icon - - - - - Only text - - - - diff --git a/plugin-taskbar/translations/taskbar_lt.ts b/plugin-taskbar/translations/taskbar_lt.ts deleted file mode 100644 index c17039b..0000000 --- a/plugin-taskbar/translations/taskbar_lt.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Programa - - - - To &Desktop - Į &darbalaukį - - - - &All Desktops - &visus darbalaukius - - - - Desktop &%1 - &%1 darbalaukį - - - - &To Current Desktop - &Į dabartinį darbalaukį - - - - Ma&ximize - &Išdidinti - - - - Maximize vertically - Išdidinti vertikaliai - - - - Maximize horizontally - Išdidinti horizontaliai - - - - &Restore - &Atstatyti - - - - Mi&nimize - &Nuleisti - - - - Roll down - Išvynioti - - - - Roll up - Suvynioti - - - - &Layer - S&luoksnis - - - - Always on &top - Visada &viršuje - - - - &Normal - Įpras&tas - - - - Always on &bottom - Visada vi&ršuje - - - - &Close - &Užverti - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - LXQt užduočių tvarkutyvės nuostatos - - - Window List Content - Langų sąrašo turinys - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Rodyti tik šio darbalaukio langus - - - Show windows from all desktops - Rodyti visų darbalaukių langus - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - Langų sąrašo išvaizda - - - - Button style - Mygtuko stilius - - - Max button width - Didžiausias leidžiamas plotis - - - - Close on middle-click - - - - - Icon and text - Ženkliukas ir tekstas - - - - Only icon - Tik ženkliukas - - - - Only text - Tik tekstas - - - diff --git a/plugin-taskbar/translations/taskbar_nl.ts b/plugin-taskbar/translations/taskbar_nl.ts deleted file mode 100644 index 506d006..0000000 --- a/plugin-taskbar/translations/taskbar_nl.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Toepassing - - - - To &Desktop - Naar &bureaublad - - - - &All Desktops - &Alle bureaubladen - - - - Desktop &%1 - Bureaublad &%1 - - - - &To Current Desktop - &Naar huidig bureaublad - - - - 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 - - - - &Normal - &Normaal - - - - Always on &bottom - Altijd onderop - - - - &Close - &Sluiten - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - Instellingen voor taakbeheerder van LXQt - - - Window List Content - Inhoud van vensterlijst - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Toon vensters van huidig bureaublad - - - Show windows from all desktops - Toon vensters van alle bureaubladen - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - Uiterlijk van vensterlijst - - - - Button style - Stijl van knoppen - - - Max button width - Maximale knopbreedte - - - - Close on middle-click - Sluiten bij middelklik - - - - Icon and text - Pictogram en tekst - - - - Only icon - Alleen pictogram - - - - Only text - Alleen tekst - - - diff --git a/plugin-taskbar/translations/taskbar_pl_PL.ts b/plugin-taskbar/translations/taskbar_pl_PL.ts deleted file mode 100644 index f69f07b..0000000 --- a/plugin-taskbar/translations/taskbar_pl_PL.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Aplikacja - - - - To &Desktop - Na &pulpit - - - - &All Desktops - &Wszystkie pulpity - - - - Desktop &%1 - Pulpit &%1 - - - - &To Current Desktop - &Na obecny pulpit - - - - Ma&ximize - Zma&ksymalizuj - - - - Maximize vertically - Zmaksymalizuj pionowo - - - - Maximize horizontally - Zmaksymalizuj poziomo - - - - &Restore - &Odzyskaj - - - - 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 - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - Ustawienia listy zadań LXQt - - - Window List Content - Zawartość listy zadań - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Pokazuj okna z obecnego pulpitu - - - Show windows from all desktops - Pokazuj okna ze wszystkich pulpitów - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - Wygląd listy zadań - - - - Button style - Styl przycisku - - - Max button width - Maksymalna szerokość - - - - Close on middle-click - Zamknij środkowym klawiszem - - - - Icon and text - Ikona i tekst - - - - Only icon - Tylko ikona - - - - Only text - Tylko tekst - - - diff --git a/plugin-taskbar/translations/taskbar_pt.ts b/plugin-taskbar/translations/taskbar_pt.ts deleted file mode 100644 index 5fe1d5e..0000000 --- a/plugin-taskbar/translations/taskbar_pt.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - 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 - - - - Ma&ximize - Ma&ximizar - - - - Maximize vertically - Maximizar na vertical - - - - Maximize horizontally - Maximizar na horizontal - - - - &Restore - &Restaurar - - - - Mi&nimize - Mi&nimizar - - - - Roll down - Enrolar para baixo - - - - Roll up - Enrolar para cima - - - - &Layer - Ca&mada - - - - Always on &top - Sempre na &frente - - - - &Normal - &Normal - - - - Always on &bottom - Sempre a&trás - - - - &Close - Fe&char - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - Definições do gestor de tarefas LXQt - - - Window List Content - Conteúdo da lista de janelas - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Mostrar janelas da área de trabalho atual - - - Show windows from all desktops - Mostrar janelas de todas as áreas de trabalho - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - Aparência da lista de janelas - - - - Button style - Estilo dos botões - - - Max button width - Largura máxima do botão - - - - Close on middle-click - Fechar com a roda do rato - - - - Icon and text - Ícones e texto - - - - Only icon - Ícones - - - - Only text - Texto - - - diff --git a/plugin-taskbar/translations/taskbar_pt_BR.ts b/plugin-taskbar/translations/taskbar_pt_BR.ts deleted file mode 100644 index d702762..0000000 --- a/plugin-taskbar/translations/taskbar_pt_BR.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Aplicativo - - - - To &Desktop - Para a área &de trabalho - - - - &All Desktops - Todas &as áreas de trabalho - - - - Desktop &%1 - Área de trabalho &%1 - - - - &To Current Desktop - Para a área de &trabalho atual - - - - 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 em &baixo - - - - &Close - &Fechar - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - Configurações do gerenciador de tarefas do LXQt - - - Window List Content - Conteúdo da lista de janelas - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Exibir as janelas da área de trabalho atual - - - Show windows from all desktops - Exibir as janelas de todas as áreas de trabalho - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - Aparência da lista de janelas - - - - Button style - Estilo dos botões - - - Max button width - Largura máxima do botão - - - - Close on middle-click - Fechar em meio clique - - - - Icon and text - Ícone e texto - - - - Only icon - Apenas ícone - - - - Only text - Apenas texto - - - diff --git a/plugin-taskbar/translations/taskbar_ro_RO.ts b/plugin-taskbar/translations/taskbar_ro_RO.ts deleted file mode 100644 index dd208fc..0000000 --- a/plugin-taskbar/translations/taskbar_ro_RO.ts +++ /dev/null @@ -1,203 +0,0 @@ - - - - - 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 - - - - 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 - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - Window List Content - Conținut listă ferestre - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Afișează ferestrele de pe ecranul virtual curent - - - Show windows from all desktops - Afișează ferestrele din toate ecranele virtuale - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - Aspect listă ferestre - - - - Button style - Stil butoane - - - Max button width - Lățime maximă butoane - - - - Close on middle-click - Închide prin clic pe butonul din mijloc - - - - Icon and text - Pictograme și text - - - - Only icon - Doar pictograme - - - - Only text - Doar text - - - diff --git a/plugin-taskbar/translations/taskbar_ru.ts b/plugin-taskbar/translations/taskbar_ru.ts deleted file mode 100644 index db02412..0000000 --- a/plugin-taskbar/translations/taskbar_ru.ts +++ /dev/null @@ -1,204 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Приложение - - - - To &Desktop - &На рабочий стол - - - - &All Desktops - &Все рабочие столы - - - - Desktop &%1 - Рабочий стол &%1 - - - - &To Current Desktop - На &текущий рабочий стол - - - - 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 &panel's screen - Показывать окна только с экрана &панели - - - - Show only minimized windows - Показывать только свёрнутые окна - - - - Raise minimized windows on current desktop - Разворачивать свёрнутые окна на текущем рабочем столе - - - - Window &grouping - &Группировка окон - - - - Show popup on mouse hover - Показать всплывающее окно при наведении мыши - - - - Appearance - Внешний вид - - - - Maximum button width - Максимальная ширина кнопки - - - - - px - пикс - - - - Maximum button height - Максимальная высота кнопки - - - - Button style - Стиль кнопок - - - - Show only windows from desktop - Показывать окна только с рабочего стола - - - - Auto&rotate buttons when the panel is vertical - Авто&поворот кнопок, когда панель вертикальна - - - - Close on middle-click - Закрыть по щелчку средней кнопки мыши - - - - Icon and text - Значок и текст - - - - Only icon - Только значок - - - - Only text - Только текст - - - - Current - Текущий - - - diff --git a/plugin-taskbar/translations/taskbar_ru_RU.desktop b/plugin-taskbar/translations/taskbar_ru_RU.desktop deleted file mode 100644 index f271705..0000000 --- a/plugin-taskbar/translations/taskbar_ru_RU.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Task manager -Comment=Switch between running applications - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ru_RU]=Переключиться между запущенными приложениями -Name[ru_RU]=Панель задач \ No newline at end of file diff --git a/plugin-taskbar/translations/taskbar_ru_RU.ts b/plugin-taskbar/translations/taskbar_ru_RU.ts deleted file mode 100644 index f2db1c4..0000000 --- a/plugin-taskbar/translations/taskbar_ru_RU.ts +++ /dev/null @@ -1,204 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Приложение - - - - To &Desktop - &На рабочий стол - - - - &All Desktops - &Все рабочие столы - - - - Desktop &%1 - Рабочий стол &%1 - - - - &To Current Desktop - На &текущий рабочий стол - - - - 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 &panel's screen - Показывать окна только с экрана &панели - - - - Show only minimized windows - Показывать только свёрнутые окна - - - - Raise minimized windows on current desktop - Разворачивать свёрнутые окна на текущем рабочем столе - - - - Window &grouping - &Группировка окон - - - - Show popup on mouse hover - Показать всплывающее окно при наведении мыши - - - - Appearance - Внешний вид - - - - Maximum button width - Максимальная ширина кнопки - - - - - px - пикс - - - - Maximum button height - Максимальная высота кнопки - - - - Button style - Стиль кнопок - - - - Show only windows from desktop - Показывать окна только с рабочего стола - - - - Auto&rotate buttons when the panel is vertical - Авто&поворот кнопок, когда панель вертикальна - - - - Close on middle-click - Закрыть по щелчку средней кнопки мыши - - - - Icon and text - Значок и текст - - - - Only icon - Только значок - - - - Only text - Только текст - - - - Current - Текущий - - - diff --git a/plugin-taskbar/translations/taskbar_sk_SK.ts b/plugin-taskbar/translations/taskbar_sk_SK.ts deleted file mode 100644 index 0fcb053..0000000 --- a/plugin-taskbar/translations/taskbar_sk_SK.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Aplikácia - - - - To &Desktop - Na &plochu - - - - &All Desktops - &Všetky plochy - - - - Desktop &%1 - Plocha &%1 - - - - &To Current Desktop - &Na aktuálnu plochu - - - - 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ť - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - Nastavenia správcu úloh prostredia LXQt - - - Window List Content - Obsah zoznamu okien - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Zobraziť okná z aktuálnej plochy - - - Show windows from all desktops - Zobraziť okná z každej plochy - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - Vzhľad zoznamu okien - - - - Button style - Štýl tlačidiel - - - Max button width - Maximálna šírka tlačidla - - - - Close on middle-click - - - - - Icon and text - Ikona a text - - - - Only icon - Iba ikona - - - - Only text - Iba text - - - diff --git a/plugin-taskbar/translations/taskbar_sl.ts b/plugin-taskbar/translations/taskbar_sl.ts deleted file mode 100644 index b338739..0000000 --- a/plugin-taskbar/translations/taskbar_sl.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Program - - - - To &Desktop - &Na namizje - - - - &All Desktops - &Vsa namizja - - - - Desktop &%1 - Namizje &%1 - - - - &To Current Desktop - Na &trenutno namizje - - - - Ma&ximize - &Razpni - - - - Maximize vertically - Razpni navpično - - - - Maximize horizontally - Razpni vodoravno - - - - &Restore - &Obnovi - - - - Mi&nimize - Po&manjšaj - - - - Roll down - Razvij - - - - Roll up - Zvij - - - - &Layer - &Plast - - - - Always on &top - Vedno na &vrhu - - - - &Normal - &Običajno - - - - Always on &bottom - Vedno na &dnu - - - - &Close - &Zapri - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - Nastavitve upravitelja opravil za LXQt - - - Window List Content - Vsebina seznama oken - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Pokaži okna s trenutnega namizja - - - Show windows from all desktops - Pokaži okna z vseh namizij - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - Videz seznama oken - - - - Button style - Slog z gumbi - - - Max button width - Največja širina gumbov - - - - Close on middle-click - - - - - Icon and text - Ikona in besedilo - - - - Only icon - Samo ikona - - - - Only text - Samo besedilo - - - diff --git a/plugin-taskbar/translations/taskbar_sr@latin.ts b/plugin-taskbar/translations/taskbar_sr@latin.ts deleted file mode 100644 index 75ad954..0000000 --- a/plugin-taskbar/translations/taskbar_sr@latin.ts +++ /dev/null @@ -1,183 +0,0 @@ - - - - - LXQtTaskButton - - - Application - - - - - To &Desktop - - - - - &All Desktops - - - - - Desktop &%1 - - - - - &To Current Desktop - - - - - 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 windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - - Auto&rotate buttons when the panel is vertical - - - - - Close on middle-click - - - - - Button style - - - - - Icon and text - - - - - Only icon - - - - - Only text - - - - diff --git a/plugin-taskbar/translations/taskbar_sr_BA.ts b/plugin-taskbar/translations/taskbar_sr_BA.ts deleted file mode 100644 index d21eb03..0000000 --- a/plugin-taskbar/translations/taskbar_sr_BA.ts +++ /dev/null @@ -1,211 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Програм - - - - To &Desktop - На &површ - - - - &All Desktops - &све површи - - - - Desktop &%1 - површ &%1 - - - - &To Current Desktop - &На тренутну површ - - - - 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 - - LXQt Task Manager Settings - Подешавања менаџера задатака - - - Window List Content - Садржај листе прозора - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Прикажи прозоре са тренутне површи - - - - Auto&rotate buttons when the panel is vertical - - - - - Close on middle-click - - - - wlcB - wlcB - - - Show windows from all desktops - Прикажи прозоре са свих површи - - - Window List Appearance - Изглед листе прозора - - - - Button style - Стил тастера - - - Max button width - Макс. ширина тастера - - - - Icon and text - икона и текст - - - - Only icon - само икона - - - - Only text - само текст - - - diff --git a/plugin-taskbar/translations/taskbar_sr_RS.ts b/plugin-taskbar/translations/taskbar_sr_RS.ts deleted file mode 100644 index 32b5803..0000000 --- a/plugin-taskbar/translations/taskbar_sr_RS.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Програм - - - - To &Desktop - На &површ - - - - &All Desktops - &све површи - - - - Desktop &%1 - површ &%1 - - - - &To Current Desktop - &На тренутну површ - - - - 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 - - LXQt Task Manager Settings - Подешавања менаџера задатака - - - Window List Content - Садржај листе прозора - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Прикажи прозоре са тренутне површи - - - Show windows from all desktops - Прикажи прозоре са свих површи - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - Изглед листе прозора - - - - Button style - Стил тастера - - - Max button width - Макс. ширина тастера - - - - Close on middle-click - - - - - Icon and text - икона и текст - - - - Only icon - само икона - - - - Only text - само текст - - - diff --git a/plugin-taskbar/translations/taskbar_th_TH.ts b/plugin-taskbar/translations/taskbar_th_TH.ts deleted file mode 100644 index ccb7abd..0000000 --- a/plugin-taskbar/translations/taskbar_th_TH.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - โปรแกรม - - - - To &Desktop - ไปยัง &พ&ื&้นโต๊ะ - - - - &All Desktops - &ท&ุกพื้นโต๊ะ - - - - Desktop &%1 - พื้นโต๊ะ &%1 - - - - &To Current Desktop - &ไปยังพื้นโต๊ะปัจจุบัน - - - - 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 - - LXQt Task Manager Settings - ค่าตั้งตัวจัดการงาน LXQt - - - Window List Content - การแสดงรายการหน้าต่าง - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - แสดงหน้าต่างเฉพาะพื้นโต๊ะปัจจุบัน - - - Show windows from all desktops - แสดงหน้าต่างจากทุกพื้นโต๊ะ - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - ลักษณะรายการหน้าต่าง - - - - Button style - รูปแบบปุ่ม - - - Max button width - ความกว้างปุ่มขนาดสูงสุด - - - - Close on middle-click - ปิดด้วยการคลิกปุ่มกลาง - - - - Icon and text - ไอคอนและข้อความ - - - - Only icon - ไอคอนเท่านั้น - - - - Only text - ข้อความเท่านั้น - - - diff --git a/plugin-taskbar/translations/taskbar_tr.ts b/plugin-taskbar/translations/taskbar_tr.ts deleted file mode 100644 index 49cde65..0000000 --- a/plugin-taskbar/translations/taskbar_tr.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Uygulama - - - - To &Desktop - &Masaüstüne - - - - &All Desktops - &Tüm Masaüstlerine - - - - Desktop &%1 - Masaüstü &%1 - - - - &To Current Desktop - &Şimdiki Masaüstüne - - - - Ma&ximize - Bü&yüt - - - - Maximize vertically - Dikey büyüt - - - - Maximize horizontally - Yatay büyüt - - - - &Restore - &Geri getir - - - - 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 - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - LXQt Görev Yöneticisi Ayarları - - - Window List Content - Pencere Listesi İçeriği - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Şimdiki masaüstündeki pencereleri göster - - - Show windows from all desktops - Tüm masaüstlerindeki pencereleri göster - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - Pencere Listesi Görünümü - - - - Button style - Düğme biçimi - - - Max button width - En fazla düğme genişliği - - - - Close on middle-click - Orta tıklama ile kapat - - - - Icon and text - Simge ve metin - - - - Only icon - Sadece simge - - - - Only text - Sadece metin - - - diff --git a/plugin-taskbar/translations/taskbar_uk.ts b/plugin-taskbar/translations/taskbar_uk.ts deleted file mode 100644 index 50ae185..0000000 --- a/plugin-taskbar/translations/taskbar_uk.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - Програма - - - - To &Desktop - На &стільницю - - - - &All Desktops - На &всі стільниці - - - - Desktop &%1 - Стільниця &%1 - - - - &To Current Desktop - На &поточну стільницю - - - - 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 - - LXQt Task Manager Settings - Налаштування списку вікон - - - Window List Content - Вміст списку вікон - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - Показувати вікна поточної стільниці - - - Show windows from all desktops - Показувати вікна всіх стільниць - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - Вигляд списку вікон - - - - Button style - Стиль кнопок - - - Max button width - Макс. довжина кнопки - - - - Close on middle-click - Закривати по середній кнопці миші - - - - Icon and text - Значок та текст - - - - Only icon - Лише значок - - - - Only text - Лише текст - - - diff --git a/plugin-taskbar/translations/taskbar_zh_CN.ts b/plugin-taskbar/translations/taskbar_zh_CN.ts deleted file mode 100644 index 66a7e0b..0000000 --- a/plugin-taskbar/translations/taskbar_zh_CN.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - 应用程序 - - - - To &Desktop - 到&桌面 - - - - &All Desktops - &全部桌面 - - - - Desktop &%1 - 桌面 &%1 - - - - &To Current Desktop - &到当前桌面 - - - - 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 - - LXQt Task Manager Settings - LXQt任务管理器设置 - - - Window List Content - 窗口列表内容 - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - 显示当前桌面的窗口 - - - Show windows from all desktops - 显示所有桌面的窗口 - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - 窗口列表外观 - - - - Button style - 按钮样式 - - - Max button width - 最大按钮宽度 - - - - Close on middle-click - 鼠标中击时关闭 - - - - Icon and text - 图标和文字 - - - - Only icon - 仅图标 - - - - Only text - 仅文字 - - - diff --git a/plugin-taskbar/translations/taskbar_zh_TW.ts b/plugin-taskbar/translations/taskbar_zh_TW.ts deleted file mode 100644 index 3c63f3f..0000000 --- a/plugin-taskbar/translations/taskbar_zh_TW.ts +++ /dev/null @@ -1,207 +0,0 @@ - - - - - LXQtTaskButton - - - Application - 應用程式 - - - - To &Desktop - 傳送到桌面(&D) - - - - &All Desktops - 傳送到全部桌面(&A) - - - - Desktop &%1 - 桌面 &%1 - - - - &To Current Desktop - 傳送到當前桌面(&T) - - - - 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) - - - - LXQtTaskGroup - - - Group - - - - - Close group - - - - - LXQtTaskbarConfiguration - - LXQt Task Manager Settings - LXQt工作管理員設定 - - - Window List Content - 視窗清單內容 - - - - Task Manager Settings - - - - - General - - - - - Show windows from c&urrent desktop - - - - - Show windows from all des&ktops - - - - - Window &grouping - - - - - Show popup on mouse hover - - - - - Appearance - - - - - Maximum button width - - - - - px - - - - Show windows from current desktop - 顯示當前桌面視窗 - - - Show windows from all desktops - 顯示所有桌面視窗 - - - - Auto&rotate buttons when the panel is vertical - - - - Window List Appearance - 視窗清單外觀 - - - - Button style - 按鈕樣式 - - - Max button width - 最大按鈕寬度 - - - - Close on middle-click - 按滑鼠中鍵關閉 - - - - Icon and text - 圖示與文字 - - - - Only icon - 僅圖示 - - - - Only text - 僅文字 - - - diff --git a/plugin-tray/lxqttray.cpp b/plugin-tray/lxqttray.cpp index 5cae55a..79ba975 100644 --- a/plugin-tray/lxqttray.cpp +++ b/plugin-tray/lxqttray.cpp @@ -125,6 +125,7 @@ bool LXQtTray::nativeEventFilter(const QByteArray &eventType, void *message, lon icon = findIcon(event_window); if (icon) { + icon->windowDestroyed(event_window); mIcons.removeAll(icon); delete icon; } @@ -359,6 +360,8 @@ void LXQtTray::startTray() ************************************************/ void LXQtTray::stopTray() { + for (auto & icon : mIcons) + disconnect(icon, &QObject::destroyed, this, &LXQtTray::onIconDestroyed); qDeleteAll(mIcons); if (mTrayId) { @@ -372,16 +375,21 @@ void LXQtTray::stopTray() /************************************************ ************************************************/ -void LXQtTray::addIcon(Window winId) +void LXQtTray::onIconDestroyed(QObject * icon) { - TrayIcon* icon = new TrayIcon(winId, this); - if (!icon->isValid()) - { - delete icon; - return; - } + //in the time QOjbect::destroyed is emitted, the child destructor + //is already finished, so the qobject_cast to child will return nullptr in all cases + mIcons.removeAll(static_cast(icon)); +} +/************************************************ + + ************************************************/ +void LXQtTray::addIcon(Window winId) +{ + TrayIcon* icon = new TrayIcon(winId, mIconSize, this); mIcons.append(icon); mLayout->addWidget(icon); + connect(icon, &QObject::destroyed, this, &LXQtTray::onIconDestroyed); } diff --git a/plugin-tray/lxqttray.h b/plugin-tray/lxqttray.h index 457085e..9bb5714 100644 --- a/plugin-tray/lxqttray.h +++ b/plugin-tray/lxqttray.h @@ -70,6 +70,7 @@ signals: private slots: void startTray(); void stopTray(); + void onIconDestroyed(QObject * icon); private: VisualID getVisual(); diff --git a/plugin-tray/translations/tray.ts b/plugin-tray/translations/tray.ts deleted file mode 100644 index 6401616..0000000 --- a/plugin-tray/translations/tray.ts +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/plugin-tray/translations/tray_ar.desktop b/plugin-tray/translations/tray_ar.desktop index 046c236..019c965 100644 --- a/plugin-tray/translations/tray_ar.desktop +++ b/plugin-tray/translations/tray_ar.desktop @@ -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[ar]=الوصول إلى التطبيقات المخفيَّة المصغَّرة في دفَّة النّظام -Name[ar]=دفَّة النِّظام +Comment[ar]=تعرض التّطبيقات مصغّرة إلى صينيّة النّظام. +Name[ar]=صينيّة النّظام diff --git a/plugin-tray/translations/tray_ru_RU.desktop b/plugin-tray/translations/tray_ru_RU.desktop deleted file mode 100644 index 5bfe9a8..0000000 --- a/plugin-tray/translations/tray_ru_RU.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=System tray -Comment=Display applications minimized to the system tray. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ru_RU]=Значки программ, свернутых в системный лоток. -Name[ru_RU]=Системный лоток \ No newline at end of file diff --git a/plugin-tray/trayicon.cpp b/plugin-tray/trayicon.cpp index 24f517b..f34b96f 100644 --- a/plugin-tray/trayicon.cpp +++ b/plugin-tray/trayicon.cpp @@ -69,11 +69,11 @@ int windowErrorHandler(Display *d, XErrorEvent *e) /************************************************ ************************************************/ -TrayIcon::TrayIcon(Window iconId, QWidget* parent): +TrayIcon::TrayIcon(Window iconId, QSize const & iconSize, QWidget* parent): QFrame(parent), mIconId(iconId), mWindowId(0), - mIconSize(TRAY_ICON_SIZE_DEFAULT, TRAY_ICON_SIZE_DEFAULT), + mIconSize(iconSize), mDamage(0), mDisplay(QX11Info::display()) { @@ -87,7 +87,12 @@ TrayIcon::TrayIcon(Window iconId, QWidget* parent): setObjectName("TrayIcon"); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - mValid = init(); + // NOTE: + // see https://github.com/lxde/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(); }); } @@ -95,12 +100,16 @@ TrayIcon::TrayIcon(Window iconId, QWidget* parent): /************************************************ ************************************************/ -bool TrayIcon::init() +void TrayIcon::init() { Display* dsp = mDisplay; XWindowAttributes attr; - if (! XGetWindowAttributes(dsp, mIconId, &attr)) return false; + if (! XGetWindowAttributes(dsp, mIconId, &attr)) + { + deleteLater(); + return; + } // qDebug() << "New tray icon ***********************************"; // qDebug() << " * window id: " << hex << mIconId; @@ -117,7 +126,7 @@ bool TrayIcon::init() set_attr.border_pixel = 0; mask = CWColormap|CWBackPixel|CWBorderPixel; - mWindowId = XCreateWindow(dsp, this->winId(), 0, 0, mIconSize.width(), mIconSize.height(), + mWindowId = XCreateWindow(dsp, this->winId(), 0, 0, mIconSize.width() * metric(PdmDevicePixelRatio), mIconSize.height() * metric(PdmDevicePixelRatio), 0, attr.depth, InputOutput, visual, mask, &set_attr); @@ -134,7 +143,9 @@ bool TrayIcon::init() qWarning() << "* Not icon_swallow *"; qWarning() << "****************************************"; XDestroyWindow(dsp, mWindowId); - return false; + mWindowId = 0; + deleteLater(); + return; } @@ -157,7 +168,8 @@ bool TrayIcon::init() { qWarning() << "TrayIcon: xembed error"; XDestroyWindow(dsp, mWindowId); - return false; + deleteLater(); + return; } } @@ -184,10 +196,9 @@ bool TrayIcon::init() XMapWindow(dsp, mIconId); XMapRaised(dsp, mWindowId); - XResizeWindow(dsp, mWindowId, mIconSize.width(), mIconSize.height()); - XResizeWindow(dsp, mIconId, mIconSize.width(), mIconSize.height()); - - return true; + const QSize req_size{mIconSize * metric(PdmDevicePixelRatio)}; + XResizeWindow(dsp, mWindowId, req_size.width(), req_size.height()); + XResizeWindow(dsp, mIconId, req_size.width(), req_size.height()); } @@ -209,7 +220,8 @@ TrayIcon::~TrayIcon() XUnmapWindow(dsp, mIconId); XReparentWindow(dsp, mIconId, QX11Info::appRootWindow(), 0, 0); - XDestroyWindow(dsp, mWindowId); + if (mWindowId) + XDestroyWindow(dsp, mWindowId); XSync(dsp, False); XSetErrorHandler(old); } @@ -234,11 +246,12 @@ void TrayIcon::setIconSize(QSize iconSize) { mIconSize = iconSize; + const QSize req_size{mIconSize * metric(PdmDevicePixelRatio)}; if (mWindowId) - xfitMan().resizeWindow(mWindowId, mIconSize.width(), mIconSize.height()); + xfitMan().resizeWindow(mWindowId, req_size.width(), req_size.height()); if (mIconId) - xfitMan().resizeWindow(mIconId, mIconSize.width(), mIconSize.height()); + xfitMan().resizeWindow(mIconId, req_size.width(), req_size.height()); } @@ -247,27 +260,31 @@ void TrayIcon::setIconSize(QSize iconSize) ************************************************/ bool TrayIcon::event(QEvent *event) { - switch (event->type()) + if (mWindowId) { - case QEvent::Paint: - draw(static_cast(event)); - break; + switch (event->type()) + { + case QEvent::Paint: + draw(static_cast(event)); + break; - case QEvent::Resize: - { - QRect rect = iconGeometry(); - xfitMan().moveWindow(mWindowId, rect.left(), rect.top()); - } - break; + case QEvent::Move: + case QEvent::Resize: + { + QRect rect = iconGeometry(); + xfitMan().moveWindow(mWindowId, rect.left(), rect.top()); + } + break; - case QEvent::MouseButtonPress: - case QEvent::MouseButtonRelease: - case QEvent::MouseButtonDblClick: - event->accept(); - break; + case QEvent::MouseButtonPress: + case QEvent::MouseButtonRelease: + case QEvent::MouseButtonDblClick: + event->accept(); + break; - default: - break; + default: + break; + } } return QFrame::event(event); @@ -356,6 +373,17 @@ void TrayIcon::draw(QPaintEvent* /*event*/) } +/************************************************ + + ************************************************/ +void TrayIcon::windowDestroyed(Window w) +{ + //damage is destroyed if it's parent window was destroyed + if (mIconId == w) + mDamage = 0; +} + + /************************************************ ************************************************/ diff --git a/plugin-tray/trayicon.h b/plugin-tray/trayicon.h index 28912fe..15ef9ef 100644 --- a/plugin-tray/trayicon.h +++ b/plugin-tray/trayicon.h @@ -47,13 +47,12 @@ class TrayIcon: public QFrame Q_PROPERTY(QSize iconSize READ iconSize WRITE setIconSize) public: - TrayIcon(Window iconId, QWidget* parent); + TrayIcon(Window iconId, QSize const & iconSize, QWidget* parent); virtual ~TrayIcon(); Window iconId() { return mIconId; } Window windowId() { return mWindowId; } - - bool isValid() const { return mValid; } + void windowDestroyed(Window w); QSize iconSize() const { return mIconSize; } void setIconSize(QSize iconSize); @@ -65,11 +64,10 @@ protected: void draw(QPaintEvent* event); private: - bool init(); + void init(); QRect iconGeometry(); Window mIconId; Window mWindowId; - bool mValid; QSize mIconSize; Damage mDamage; Display* mDisplay; diff --git a/plugin-volume/alsaengine.cpp b/plugin-volume/alsaengine.cpp index 026479f..a268f43 100644 --- a/plugin-volume/alsaengine.cpp +++ b/plugin-volume/alsaengine.cpp @@ -130,15 +130,23 @@ void AlsaEngine::discoverDevices() { int error; int cardNum = -1; + const int BUFF_SIZE = 64; while (1) { - error = snd_card_next(&cardNum); + if ((error = snd_card_next(&cardNum)) < 0) { + qWarning("Can't get the next card number: %s\n", snd_strerror(error)); + break; + } if (cardNum < 0) break; - char str[64]; - sprintf(str, "hw:%i", cardNum); + char str[BUFF_SIZE]; + const size_t n = snprintf(str, sizeof(str), "hw:%i", cardNum); + if (BUFF_SIZE <= n) { + qWarning("AlsaEngine::discoverDevices: Buffer too small\n"); + continue; + } snd_ctl_t *cardHandle; if ((error = snd_ctl_open(&cardHandle, str, 0)) < 0) { diff --git a/plugin-volume/lxqtvolume.cpp b/plugin-volume/lxqtvolume.cpp index 2f0422b..4383668 100644 --- a/plugin-volume/lxqtvolume.cpp +++ b/plugin-volume/lxqtvolume.cpp @@ -40,7 +40,6 @@ #include "ossengine.h" #include -#include #include #include #include @@ -165,7 +164,6 @@ 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(); - qDebug() << "settingsChanged" << engineName; const bool new_engine = !m_engine || m_engine->backendName() != engineName; if (new_engine) { #if defined(USE_PULSEAUDIO) && defined(USE_ALSA) @@ -254,14 +252,14 @@ void LXQtVolume::realign() QDialog *LXQtVolume::configureDialog() { - if(!m_configDialog) - { - m_configDialog = new LXQtVolumeConfiguration(*settings()); - m_configDialog->setAttribute(Qt::WA_DeleteOnClose, true); - - if (m_engine) - m_configDialog->setSinkList(m_engine->sinks()); - } + if (!m_configDialog) + { + m_configDialog = new LXQtVolumeConfiguration(settings()); + m_configDialog->setAttribute(Qt::WA_DeleteOnClose, true); + + if (m_engine) + m_configDialog->setSinkList(m_engine->sinks()); + } return m_configDialog; } diff --git a/plugin-volume/lxqtvolumeconfiguration.cpp b/plugin-volume/lxqtvolumeconfiguration.cpp index 30ff381..26a9746 100644 --- a/plugin-volume/lxqtvolumeconfiguration.cpp +++ b/plugin-volume/lxqtvolumeconfiguration.cpp @@ -33,7 +33,7 @@ #include #include -LXQtVolumeConfiguration::LXQtVolumeConfiguration(QSettings &settings, QWidget *parent) : +LXQtVolumeConfiguration::LXQtVolumeConfiguration(PluginSettings *settings, QWidget *parent) : LXQtPanelPluginConfigDialog(settings, parent), ui(new Ui::LXQtVolumeConfiguration) { @@ -76,6 +76,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(); + const bool old_block = ui->devAddedCombo->blockSignals(true); ui->devAddedCombo->clear(); foreach (const AudioDevice *dev, sinks) { @@ -83,6 +84,7 @@ void LXQtVolumeConfiguration::setSinkList(const QList sinks) } ui->devAddedCombo->setCurrentIndex(tmp_index); + ui->devAddedCombo->blockSignals(old_block); } void LXQtVolumeConfiguration::audioEngineChanged(bool checked) diff --git a/plugin-volume/lxqtvolumeconfiguration.h b/plugin-volume/lxqtvolumeconfiguration.h index 8b6689c..65ef6fb 100644 --- a/plugin-volume/lxqtvolumeconfiguration.h +++ b/plugin-volume/lxqtvolumeconfiguration.h @@ -29,6 +29,7 @@ #define LXQTVOLUMECONFIGURATION_H #include "../panel/lxqtpanelpluginconfigdialog.h" +#include "../panel/pluginsettings.h" #include @@ -67,7 +68,7 @@ class LXQtVolumeConfiguration : public LXQtPanelPluginConfigDialog Q_OBJECT public: - explicit LXQtVolumeConfiguration(QSettings &settings, QWidget *parent = 0); + explicit LXQtVolumeConfiguration(PluginSettings *settings, QWidget *parent = nullptr); ~LXQtVolumeConfiguration(); public slots: diff --git a/plugin-volume/translations/volume.ts b/plugin-volume/translations/volume.ts deleted file mode 100644 index 42d09c9..0000000 --- a/plugin-volume/translations/volume.ts +++ /dev/null @@ -1,104 +0,0 @@ - - - - - LXQtVolume - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - - Volume Control Settings - - - - - Device to control - - - - - Alsa - - - - - PulseAudio - - - - - OSS - - - - - Behavior - - - - - Mute on middle click - - - - - Show on mouse click - - - - - Allow volume beyond 100% (0dB) - - - - - Volume adjust step - - - - - External Mixer - - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_ar.desktop b/plugin-volume/translations/volume_ar.desktop new file mode 100644 index 0000000..cc73cd1 --- /dev/null +++ b/plugin-volume/translations/volume_ar.desktop @@ -0,0 +1,2 @@ +Name[ar]=تحكّم بمستوى الصّوت +Comment[ar]=تحكّم بمستوى صوت النّظام وأطلق المازج المفضّل لك. diff --git a/plugin-volume/translations/volume_ar.ts b/plugin-volume/translations/volume_ar.ts deleted file mode 100644 index 62be6ca..0000000 --- a/plugin-volume/translations/volume_ar.ts +++ /dev/null @@ -1,108 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - إظهار سطح المكتب: ﻻ يمكن تسجيل اختصار لوحة المفاتيح العامُّ `%1` - - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - - Volume Control Settings - - - - - Device to control - - - - - Alsa - - - - - PulseAudio - - - - - OSS - - - - - Behavior - - - - - Mute on middle click - - - - - Show on mouse click - - - - - Allow volume beyond 100% (0dB) - - - - - Volume adjust step - - - - - External Mixer - - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_cs.ts b/plugin-volume/translations/volume_cs.ts deleted file mode 100644 index 98a6eaa..0000000 --- a/plugin-volume/translations/volume_cs.ts +++ /dev/null @@ -1,112 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - Ukázat plochu: Celkovou zkratku '%1' nelze zapsat - - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - LXQt Volume Control Settings - Nastavení ovládání hlasitosti - - - - Volume Control Settings - - - - - Device to control - Zařízení k ovládání - - - - Alsa - Alsa - - - - PulseAudio - PulseAudio - - - - OSS - - - - - Behavior - Chování - - - - Mute on middle click - Ztlumit při klepnutí prostředním tlačítkem - - - - Show on mouse click - Ukázat při klepnutí myší - - - - Allow volume beyond 100% (0dB) - Povolit hlasitost přes 100% (0dB) - - - - Volume adjust step - Krok úpravy hlasitosti - - - - External Mixer - Vnější směšovač - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_cs_CZ.ts b/plugin-volume/translations/volume_cs_CZ.ts deleted file mode 100644 index 25f37f7..0000000 --- a/plugin-volume/translations/volume_cs_CZ.ts +++ /dev/null @@ -1,112 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - Ukázat plochu: Celkovou zkratku '%1' nelze zapsat - - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - LXQt Volume Control Settings - Nastavení ovládání hlasitosti - - - - Volume Control Settings - - - - - Device to control - Zařízení k ovládání - - - - Alsa - Alsa - - - - PulseAudio - PulseAudio - - - - OSS - - - - - Behavior - Chování - - - - Mute on middle click - Ztlumit při klepnutí prostředním tlačítkem - - - - Show on mouse click - Ukázat při klepnutí myší - - - - Allow volume beyond 100% (0dB) - Povolit hlasitost přes 100% (0dB) - - - - Volume adjust step - Krok úpravy hlasitosti - - - - External Mixer - Vnější směšovač - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_da_DK.ts b/plugin-volume/translations/volume_da_DK.ts deleted file mode 100644 index 0daf213..0000000 --- a/plugin-volume/translations/volume_da_DK.ts +++ /dev/null @@ -1,112 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - Vis Skrivebord: Global genvej '%1' kan ikke registreres - - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - LXQt Volume Control Settings - Indstillinger for LXQt Lydstyrkekontrol - - - - Volume Control Settings - - - - - Device to control - Enhed som styres - - - - Alsa - ALSA - - - - PulseAudio - PulseAudio - - - - OSS - - - - - Behavior - Adfærd - - - - Mute on middle click - Lydløs ved midterklik - - - - Show on mouse click - Vis ved museklik - - - - Allow volume beyond 100% (0dB) - Tillad lydstyrke over 100% (0dB) - - - - Volume adjust step - Trin for lydstyrkejustering - - - - External Mixer - Ekstern mixer - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_de.ts b/plugin-volume/translations/volume_de.ts deleted file mode 100644 index 1d1cfbc..0000000 --- a/plugin-volume/translations/volume_de.ts +++ /dev/null @@ -1,104 +0,0 @@ - - - - - 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ärkeeinstellung: Die folgenden Tastaturkürzel konnten nicht registriert werden: %1 - - - - - Volume: %1 - Lautstärke: %1 - - - - LXQtVolumeConfiguration - - - Volume Control Settings - Lautstärkeeinstellungen - - - - Device to control - Zu steuerndes Gerät - - - - Alsa - ALSA - - - - PulseAudio - PulseAudio - - - - OSS - OSS - - - - Behavior - Verhalten - - - - Mute on middle click - Stummschaltung per Mittelklick - - - - Show on mouse click - Bei Mausklick anzeigen - - - - Allow volume beyond 100% (0dB) - Lautstärke über 100% (0dB) erlauben - - - - Volume adjust step - Lautstärkeschrittweite - - - - External Mixer - Externer Mischer - - - - VolumePopup - - - Launch mixer - Mischer starten - - - - Mi&xer - &Mischer - - - diff --git a/plugin-volume/translations/volume_el.ts b/plugin-volume/translations/volume_el.ts deleted file mode 100644 index 07a3b8f..0000000 --- a/plugin-volume/translations/volume_el.ts +++ /dev/null @@ -1,112 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - Εμφάνιση επιφάνειας εργασίας: Δεν είναι δυνατή η καταχώριση της καθολικής συντόμευσης "%1" - - - - Increase sound volume - Αύξηση της έντασης του ήχου - - - - Decrease sound volume - Μείωση της έντασης του ήχου - - - - Mute/unmute sound volume - Σίγαση/αποσίγαση της έντασης του ήχου - - - - Volume Control: The following shortcuts can not be registered: %1 - Έλεγχος έντασης: Οι ακόλουθες συντομεύσεις μπόρεσαν να καταχωρηθούν: %1 - - - - - Volume: %1 - Ένταση: %1 - - - - LXQtVolumeConfiguration - - LXQt Volume Control Settings - Ρυθμίσεις ελέγχου έντασης ήχου του LXQt - - - - Volume Control Settings - Ρυθμίσεις του ελέγχου έντασης του ήχου - - - - Device to control - Συσκευή για έλεγχο - - - - Alsa - Alsa - - - - PulseAudio - PulseAudio - - - - OSS - OSS - - - - Behavior - Συμπεριφορά - - - - Mute on middle click - Σίγαση με μεσαίο κλικ - - - - Show on mouse click - Εμφάνιση με κλικ - - - - Allow volume beyond 100% (0dB) - Να επιτρέπεται ένταση πάνω από 100% (0dB) - - - - Volume adjust step - Βήμα προσαρμογής έντασης - - - - External Mixer - Εξωτερικός μίκτης - - - - VolumePopup - - - Launch mixer - Εκτέλεση του μίκτη - - - - Mixer - Μίκτης - - - diff --git a/plugin-volume/translations/volume_eo.ts b/plugin-volume/translations/volume_eo.ts deleted file mode 100644 index 137d49e..0000000 --- a/plugin-volume/translations/volume_eo.ts +++ /dev/null @@ -1,108 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - Montri labortablon: ĉiea klavkombino '%1' ne registreblas - - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - - Volume Control Settings - - - - - Device to control - - - - - Alsa - - - - - PulseAudio - - - - - OSS - - - - - Behavior - - - - - Mute on middle click - - - - - Show on mouse click - - - - - Allow volume beyond 100% (0dB) - - - - - Volume adjust step - - - - - External Mixer - - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_es.ts b/plugin-volume/translations/volume_es.ts deleted file mode 100644 index 29322f4..0000000 --- a/plugin-volume/translations/volume_es.ts +++ /dev/null @@ -1,112 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - Mostrar Escritorio: Atajo global '%1' no puede ser registrado - - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - LXQt Volume Control Settings - Opciones del Control de Volumen de LXQt - - - - Volume Control Settings - - - - - Device to control - Dispositivo de control - - - - Alsa - Alsa - - - - PulseAudio - PulseAudio - - - - OSS - - - - - Behavior - Comportamiento - - - - Mute on middle click - Silenciar con click central - - - - Show on mouse click - Mostrar con un click - - - - Allow volume beyond 100% (0dB) - Permitir que el volumen sobrepase el 100% (0dB) - - - - Volume adjust step - Tamaño del ajuste de volumen - - - - External Mixer - Mezclador externo - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_es_VE.ts b/plugin-volume/translations/volume_es_VE.ts deleted file mode 100644 index 2b2675c..0000000 --- a/plugin-volume/translations/volume_es_VE.ts +++ /dev/null @@ -1,112 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - Mostrar escritorio: Acceso de teclado global '%1' no puede registrarse - - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - LXQt Volume Control Settings - Preferencias de control de volumen de LXQt - - - - Volume Control Settings - - - - - Device to control - Disositivo - - - - Alsa - Alsa - - - - PulseAudio - PulseAudio - - - - OSS - - - - - Behavior - Comportamiento - - - - Mute on middle click - Silenciar en clic medio - - - - Show on mouse click - Mostrar en clic de raton - - - - Allow volume beyond 100% (0dB) - permitir volumen mas alla de 100% (0db) - - - - Volume adjust step - paso de ajuste de volumen - - - - External Mixer - Mexclador - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_eu.ts b/plugin-volume/translations/volume_eu.ts deleted file mode 100644 index 47a0d7c..0000000 --- a/plugin-volume/translations/volume_eu.ts +++ /dev/null @@ -1,112 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - Erakutsi mahaigaina: Ezin da '%1' lasterbide globala erregistratu - - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - LXQt Volume Control Settings - LXQt bolumen-kontrolaren ezarpenak - - - - Volume Control Settings - - - - - Device to control - Kontrolatu beharreko gailua - - - - Alsa - Alsa - - - - PulseAudio - PulseAudio - - - - OSS - - - - - Behavior - Portaera - - - - Mute on middle click - Mututu erdiko botoiarekin klikatzean - - - - Show on mouse click - Erakutsi saguarekin klikatzean - - - - Allow volume beyond 100% (0dB) - Baimendu % 100etik (0dB) gorako bolumena - - - - Volume adjust step - Bolumen-doikuntzaren pausoa - - - - External Mixer - Kanpoko nahastailea - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_fi.ts b/plugin-volume/translations/volume_fi.ts deleted file mode 100644 index 03c378b..0000000 --- a/plugin-volume/translations/volume_fi.ts +++ /dev/null @@ -1,112 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - Näytä työpöytä: globaalia pikanäppäintä '%1' ei voi rekisteröidä - - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - LXQt Volume Control Settings - LXQtin äänenhallinnan asetukset - - - - Volume Control Settings - - - - - Device to control - Hallittava laite - - - - Alsa - Alsa - - - - PulseAudio - PulseAudio - - - - OSS - - - - - Behavior - Toiminta - - - - Mute on middle click - Vaimenna hiiren keskimmäisen painikkeen painalluksella - - - - Show on mouse click - Näytä hiiren painalluksella - - - - Allow volume beyond 100% (0dB) - Salli yli 100 %:n äänenvoimakkuus (0 dB) - - - - Volume adjust step - Äänenvoimakkuuden säätöväli - - - - External Mixer - Ulkoinen mikseri - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_fr_FR.ts b/plugin-volume/translations/volume_fr_FR.ts deleted file mode 100644 index fd7c5f4..0000000 --- a/plugin-volume/translations/volume_fr_FR.ts +++ /dev/null @@ -1,108 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - Montrer le bureau : le raccourci global '%1' ne peut pas être défini - - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - - Volume Control Settings - - - - - Device to control - - - - - Alsa - - - - - PulseAudio - - - - - OSS - - - - - Behavior - - - - - Mute on middle click - - - - - Show on mouse click - - - - - Allow volume beyond 100% (0dB) - - - - - Volume adjust step - - - - - External Mixer - - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_hu.ts b/plugin-volume/translations/volume_hu.ts deleted file mode 100644 index 6362698..0000000 --- a/plugin-volume/translations/volume_hu.ts +++ /dev/null @@ -1,104 +0,0 @@ - - - - - LXQtVolume - - - Increase sound volume - Hangosítás - - - - Decrease sound volume - Halkítás - - - - Mute/unmute sound volume - Némítás/megszólaltatás - - - - Volume Control: The following shortcuts can not be registered: %1 - Hangerőszabályozó: A %1 gyorsbillentyű regisztrálhatatlan - - - - - Volume: %1 - Hangerő: %1 - - - - LXQtVolumeConfiguration - - - Volume Control Settings - Hangszabályzó beállítás - - - - Device to control - Eszközbeállítás - - - - Alsa - - - - - PulseAudio - - - - - OSS - - - - - Behavior - Működés - - - - Mute on middle click - Középkattintásra némul - - - - Show on mouse click - Egérkattintásra látszik - - - - Allow volume beyond 100% (0dB) - Hangerő tartomány 100% (0dB) - - - - Volume adjust step - Lépésköz - - - - External Mixer - Külső keverő - - - - VolumePopup - - - Launch mixer - Keverő futtatása - - - - Mixer - Keverő - - - diff --git a/plugin-volume/translations/volume_hu_HU.ts b/plugin-volume/translations/volume_hu_HU.ts deleted file mode 100644 index 0550169..0000000 --- a/plugin-volume/translations/volume_hu_HU.ts +++ /dev/null @@ -1,104 +0,0 @@ - - - - - LXQtVolume - - - Increase sound volume - Hangosítás - - - - Decrease sound volume - Halkítás - - - - Mute/unmute sound volume - Némítás/megszólaltatás - - - - Volume Control: The following shortcuts can not be registered: %1 - Hangerőszabályozó: A %1 gyorsbillentyű regisztrálhatatlan - - - - - Volume: %1 - Hangerő: %1 - - - - LXQtVolumeConfiguration - - - Volume Control Settings - Hangszabályzó beállítás - - - - Device to control - Eszközbeállítás - - - - Alsa - - - - - PulseAudio - - - - - OSS - - - - - Behavior - Működés - - - - Mute on middle click - Középkattintásra némul - - - - Show on mouse click - Egérkattintásra látszik - - - - Allow volume beyond 100% (0dB) - Hangerő tartomány 100% (0dB) - - - - Volume adjust step - Lépésköz - - - - External Mixer - Külső keverő - - - - VolumePopup - - - Launch mixer - Keverő futtatása - - - - Mixer - Keverő - - - diff --git a/plugin-volume/translations/volume_it.ts b/plugin-volume/translations/volume_it.ts deleted file mode 100644 index 56fef27..0000000 --- a/plugin-volume/translations/volume_it.ts +++ /dev/null @@ -1,112 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - Mostra desktop: la scorciatoia globale '%1' non può essere registrata - - - - Increase sound volume - Alza volume - - - - Decrease sound volume - Abbassa volume - - - - Mute/unmute sound volume - Muta/smuta audio - - - - Volume Control: The following shortcuts can not be registered: %1 - Controllo volume: la scorciatoia globale '%1' non può essere registrata - - - - - Volume: %1 - Volume: %1 - - - - LXQtVolumeConfiguration - - LXQt Volume Control Settings - Impostazioni del controllo del volume di LXQt - - - - Volume Control Settings - Impostazioni controllo volume - - - - Device to control - Dispositivo da controllare - - - - Alsa - Alsa - - - - PulseAudio - PulseAudio - - - - OSS - OSS - - - - Behavior - Comportamento - - - - Mute on middle click - Muta al click centrale del mouse - - - - Show on mouse click - Mostra al click del mouse - - - - Allow volume beyond 100% (0dB) - Permetti volume oltre il 100% (0dB) - - - - Volume adjust step - Valore di regolazione del volume - - - - External Mixer - Mixer esterno - - - - VolumePopup - - - Launch mixer - Avvia mixer - - - - Mixer - Mixer - - - diff --git a/plugin-volume/translations/volume_ja.ts b/plugin-volume/translations/volume_ja.ts deleted file mode 100644 index cd8b390..0000000 --- a/plugin-volume/translations/volume_ja.ts +++ /dev/null @@ -1,104 +0,0 @@ - - - - - LXQtVolume - - - Increase sound volume - 音量を上げる - - - - Decrease sound volume - 音量を下げる - - - - Mute/unmute sound volume - ミュート/解除 - - - - Volume Control: The following shortcuts can not be registered: %1 - 音量制御: このショートカットは登録することができません: %1 - - - - - Volume: %1 - 音量: %1 - - - - LXQtVolumeConfiguration - - - Volume Control Settings - 音量制御の設定 - - - - Device to control - 制御するデバイス - - - - Alsa - ALSA - - - - PulseAudio - PulseAudio - - - - OSS - OSS - - - - Behavior - 挙動 - - - - Mute on middle click - 中ボタンのクリックでミュート - - - - Show on mouse click - マウスのクリックで表示 - - - - Allow volume beyond 100% (0dB) - 100% (0dB)を超える音量を許可 - - - - Volume adjust step - 音量変更のステップ幅 - - - - External Mixer - 外部ミキサー - - - - VolumePopup - - - Launch mixer - ミキサーを起動 - - - - Mixer - ミキサー - - - diff --git a/plugin-volume/translations/volume_lt.ts b/plugin-volume/translations/volume_lt.ts deleted file mode 100644 index aa35017..0000000 --- a/plugin-volume/translations/volume_lt.ts +++ /dev/null @@ -1,108 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - Rodyti darbalaukį: globalusis klavišas „%1“ negali būti registruojamas - - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - - Volume Control Settings - - - - - Device to control - - - - - Alsa - - - - - PulseAudio - - - - - OSS - - - - - Behavior - - - - - Mute on middle click - - - - - Show on mouse click - - - - - Allow volume beyond 100% (0dB) - - - - - Volume adjust step - - - - - External Mixer - - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_nl.ts b/plugin-volume/translations/volume_nl.ts deleted file mode 100644 index 0e1ac0f..0000000 --- a/plugin-volume/translations/volume_nl.ts +++ /dev/null @@ -1,112 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - Bureaublad weergeven: systeembrede sneltoets '%1' kan niet worden geregistreerd - - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - LXQt Volume Control Settings - Instellingen voor volumebeheer van LXQt - - - - Volume Control Settings - - - - - Device to control - Apparaat om te beheren - - - - Alsa - Alsa - - - - PulseAudio - PulseAudio - - - - OSS - - - - - Behavior - Gedrag - - - - Mute on middle click - Dempen bij middelklik - - - - Show on mouse click - Tonen bij muisklik - - - - Allow volume beyond 100% (0dB) - Volume hoger dan 100% toestaan (0dB) - - - - Volume adjust step - Trap voor bijstellen van volume - - - - External Mixer - Extern mengpaneel - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_pl_PL.ts b/plugin-volume/translations/volume_pl_PL.ts deleted file mode 100644 index c88cae0..0000000 --- a/plugin-volume/translations/volume_pl_PL.ts +++ /dev/null @@ -1,112 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - Pokaż Pulpit: Globalny skrót '%1' nie może zostać zarejestrowany - - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - LXQt Volume Control Settings - Ustawienia regulacji poziomu dźwięku LXQt - - - - Volume Control Settings - - - - - Device to control - Używane urządzenie - - - - Alsa - ALSA - - - - PulseAudio - PulseAudio - - - - OSS - - - - - Behavior - Zachowanie - - - - Mute on middle click - Wycisz na klikniecie środkowym przyciskiem myszy - - - - Show on mouse click - Pokaż na kliknięcie myszką - - - - Allow volume beyond 100% (0dB) - Pozwól poziom dźwięku powyżej 100% (0db) - - - - Volume adjust step - Stopień regulowania poziomu dźwięku - - - - External Mixer - Zewnętrzny mikser - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_pt.ts b/plugin-volume/translations/volume_pt.ts deleted file mode 100644 index e3e6973..0000000 --- a/plugin-volume/translations/volume_pt.ts +++ /dev/null @@ -1,112 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - Tecla de atalho global: "%1" não pode ser registada - - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - LXQt Volume Control Settings - Definições do controlo de volume do LXQt - - - - Volume Control Settings - - - - - Device to control - Dispositivo a controlar - - - - Alsa - Alsa - - - - PulseAudio - PulseAudio - - - - OSS - - - - - Behavior - Comportamento - - - - Mute on middle click - Silenciar com a roda do rato - - - - Show on mouse click - Mostrar ao clicar com o rato - - - - Allow volume beyond 100% (0dB) - Permitir volume abaixo de 100% (0dB) - - - - Volume adjust step - Nível de ajuste do volume - - - - External Mixer - Gestor de som externo - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_pt_BR.ts b/plugin-volume/translations/volume_pt_BR.ts deleted file mode 100644 index 836cd40..0000000 --- a/plugin-volume/translations/volume_pt_BR.ts +++ /dev/null @@ -1,112 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - Mostrar Área De Trabalho: Atalho Global '%1'não pode se registrado - - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - LXQt Volume Control Settings - Configurações Do Controle De Volume - - - - Volume Control Settings - - - - - Device to control - Dispositivo para controlar - - - - Alsa - Alsa - - - - PulseAudio - PulseAudio - - - - OSS - - - - - Behavior - Comportamento - - - - Mute on middle click - Mudo no clique do meio - - - - Show on mouse click - Mostrar no clique do mouse - - - - Allow volume beyond 100% (0dB) - Permitir o volume além de 100% (0dB) - - - - Volume adjust step - Ajustar passo do volume - - - - External Mixer - Mixer Externo - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_ro_RO.ts b/plugin-volume/translations/volume_ro_RO.ts deleted file mode 100644 index a427e0b..0000000 --- a/plugin-volume/translations/volume_ro_RO.ts +++ /dev/null @@ -1,108 +0,0 @@ - - - - - LXQtVolume - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - LXQt Volume Control Settings - Setări control volum LXQt - - - - Volume Control Settings - - - - - Device to control - Dispozitiv de controlat - - - - Alsa - Alsa - - - - PulseAudio - PulseAudio - - - - OSS - - - - - Behavior - Comportament - - - - Mute on middle click - - - - - Show on mouse click - Afișează la clic de maus - - - - Allow volume beyond 100% (0dB) - Permite volum dincolo de 100% (0dB) - - - - Volume adjust step - - - - - External Mixer - Mixer extern - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_ru.desktop b/plugin-volume/translations/volume_ru.desktop index 817f2f2..9881f27 100644 --- a/plugin-volume/translations/volume_ru.desktop +++ b/plugin-volume/translations/volume_ru.desktop @@ -8,5 +8,5 @@ Comment=Control the system's volume and launch your preferred mixer. # Translations -Comment[ru]=Контролировать громкость звука в системе и запустить предпочтитаемый микшер. +Comment[ru]=Управлять громкостью звука в системе и запустить предпочитаемый микшер. Name[ru]=Регулятор громкости \ No newline at end of file diff --git a/plugin-volume/translations/volume_ru.ts b/plugin-volume/translations/volume_ru.ts deleted file mode 100644 index 637c4de..0000000 --- a/plugin-volume/translations/volume_ru.ts +++ /dev/null @@ -1,104 +0,0 @@ - - - - - LXQtVolume - - - Increase sound volume - Увеличить громкость звука - - - - Decrease sound volume - Уменьшить громкость звука - - - - Mute/unmute sound volume - Выкл/вкл звук - - - - Volume Control: The following shortcuts can not be registered: %1 - Контроль громкости: следующие сочетания клавиш не могут быть зарегистрированы: %1 - - - - - Volume: %1 - Громкость: %1 - - - - LXQtVolumeConfiguration - - - Volume Control Settings - Настройки контроля громкости - - - - Device to control - Контролируемое устройство - - - - Alsa - Alsa - - - - PulseAudio - PulseAudio - - - - OSS - OSS - - - - Behavior - Поведение - - - - Mute on middle click - Отключать звук при щелчке средней кнопкой мыши - - - - Show on mouse click - Показать по щелчку мыши - - - - Allow volume beyond 100% (0dB) - Разрешить громкость выше 100% (0Дб) - - - - Volume adjust step - Шаг регулировки громкости - - - - External Mixer - Внешний микшер - - - - VolumePopup - - - Launch mixer - Запустить микшер - - - - Mixer - Микшер - - - diff --git a/plugin-volume/translations/volume_ru_RU.desktop b/plugin-volume/translations/volume_ru_RU.desktop deleted file mode 100644 index 725af38..0000000 --- a/plugin-volume/translations/volume_ru_RU.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Volume control -Comment=Control the system's volume and launch your preferred mixer. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ru_RU]=Контролировать громкость звука в системе и запустить предпочтитаемый микшер. -Name[ru_RU]=Регулятор громкости \ No newline at end of file diff --git a/plugin-volume/translations/volume_ru_RU.ts b/plugin-volume/translations/volume_ru_RU.ts deleted file mode 100644 index 81323e7..0000000 --- a/plugin-volume/translations/volume_ru_RU.ts +++ /dev/null @@ -1,104 +0,0 @@ - - - - - LXQtVolume - - - Increase sound volume - Увеличить громкость звука - - - - Decrease sound volume - Уменьшить громкость звука - - - - Mute/unmute sound volume - Выкл/вкл звук - - - - Volume Control: The following shortcuts can not be registered: %1 - Контроль громкости: следующие сочетания клавиш не могут быть зарегистрированы: %1 - - - - - Volume: %1 - Громкость: %1 - - - - LXQtVolumeConfiguration - - - Volume Control Settings - Настройки контроля громкости - - - - Device to control - Контролируемое устройство - - - - Alsa - Alsa - - - - PulseAudio - PulseAudio - - - - OSS - OSS - - - - Behavior - Поведение - - - - Mute on middle click - Отключать звук при щелчке средней кнопкой мыши - - - - Show on mouse click - Показать по щелчку мыши - - - - Allow volume beyond 100% (0dB) - Разрешить громкость выше 100% (0Дб) - - - - Volume adjust step - Шаг регулировки громкости - - - - External Mixer - Внешний микшер - - - - VolumePopup - - - Launch mixer - Запустить микшер - - - - Mixer - Микшер - - - diff --git a/plugin-volume/translations/volume_sl.ts b/plugin-volume/translations/volume_sl.ts deleted file mode 100644 index 633e538..0000000 --- a/plugin-volume/translations/volume_sl.ts +++ /dev/null @@ -1,112 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - Prikaz namizja: globalne bližnjice »%1« ni moč registrirati - - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - LXQt Volume Control Settings - Nastavitve upravljalnika glasnosti LXQt - - - - Volume Control Settings - - - - - Device to control - Naprava - - - - Alsa - ALSA - - - - PulseAudio - PulseAudio - - - - OSS - - - - - Behavior - Obnašanje - - - - Mute on middle click - Utišaj s srednjim klikom - - - - Show on mouse click - Pokaži z miškinim klikom - - - - Allow volume beyond 100% (0dB) - Dovoli glasnost, večjo od 100% (0 dB) - - - - Volume adjust step - Velikost koraka - - - - External Mixer - Zunanji mešalnik - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_th_TH.ts b/plugin-volume/translations/volume_th_TH.ts deleted file mode 100644 index 2cf318b..0000000 --- a/plugin-volume/translations/volume_th_TH.ts +++ /dev/null @@ -1,112 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - แสดงพื้นโต๊ะ: ไม่สามารถตั้ง '%1' เป็นปุ่มลัดส่วนกลางได้ - - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - LXQt Volume Control Settings - ค่าตั้งควบคุมระดับเสียง LXQt - - - - Volume Control Settings - - - - - Device to control - อุปกรณ์ที่จะควบคุม - - - - Alsa - Alsa - - - - PulseAudio - PulseAudio - - - - OSS - - - - - Behavior - พฤติกรรม - - - - Mute on middle click - ปิดเสียงด้วยการคลิกปุ่มกลาง - - - - Show on mouse click - แสดงขึ้นมาเมื่อถูกคลิก - - - - Allow volume beyond 100% (0dB) - อนุญาตให้ใช้ระดับเสียงเกินกว่า 100% (0dB) - - - - Volume adjust step - ช่วงการปรับระดับเสียง - - - - External Mixer - ตัวผสมภายนอก - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_uk.ts b/plugin-volume/translations/volume_uk.ts deleted file mode 100644 index d1aa751..0000000 --- a/plugin-volume/translations/volume_uk.ts +++ /dev/null @@ -1,112 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - Показати стільницю: Не вдалося зареєструвати глобальне скорочення '%1' - - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - LXQt Volume Control Settings - Налаштування регулятора гучності LXQt - - - - Volume Control Settings - - - - - Device to control - Контролювати пристрій - - - - Alsa - Alsa - - - - PulseAudio - PulseAudio - - - - OSS - - - - - Behavior - Поведінка - - - - Mute on middle click - Приглушити по середній кнопці - - - - Show on mouse click - Показати по кнопці миші - - - - Allow volume beyond 100% (0dB) - Дозволяти гучність вище 100% (0 дБ) - - - - Volume adjust step - Крок регулювання гучності - - - - External Mixer - Зовнішній мікшер - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_zh_CN.ts b/plugin-volume/translations/volume_zh_CN.ts deleted file mode 100644 index 4ef36af..0000000 --- a/plugin-volume/translations/volume_zh_CN.ts +++ /dev/null @@ -1,112 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - 显示桌面：无法注册全局快捷键'%1' - - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - LXQt Volume Control Settings - LXQt 声音控制设置 - - - - Volume Control Settings - - - - - Device to control - 控制设备 - - - - Alsa - Alsa - - - - PulseAudio - PulseAudio - - - - OSS - - - - - Behavior - 行为 - - - - Mute on middle click - 鼠标中击时静音 - - - - Show on mouse click - 显示鼠标点击 - - - - Allow volume beyond 100% (0dB) - 允许声音超过 100%(0分贝) - - - - Volume adjust step - 声音调整幅度 - - - - External Mixer - 外部混音器 - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/translations/volume_zh_TW.ts b/plugin-volume/translations/volume_zh_TW.ts deleted file mode 100644 index 3948727..0000000 --- a/plugin-volume/translations/volume_zh_TW.ts +++ /dev/null @@ -1,112 +0,0 @@ - - - - - LXQtVolume - - Show Desktop: Global shortcut '%1' cannot be registered - 顯示桌面:全域快捷鍵'%1'無法被註冊 - - - - Increase sound volume - - - - - Decrease sound volume - - - - - Mute/unmute sound volume - - - - - Volume Control: The following shortcuts can not be registered: %1 - - - - - - Volume: %1 - - - - - LXQtVolumeConfiguration - - LXQt Volume Control Settings - LXQt音量調整設定 - - - - Volume Control Settings - - - - - Device to control - 設置裝置 - - - - Alsa - ALSA - - - - PulseAudio - PulseAudio - - - - OSS - - - - - Behavior - 行為 - - - - Mute on middle click - 按滑鼠中鍵時靜音 - - - - Show on mouse click - 滑鼠點擊時顯示 - - - - Allow volume beyond 100% (0dB) - 允許音量超過 100% (0dB) - - - - Volume adjust step - 音量調整步驟 - - - - External Mixer - 外掛音量調整程式 - - - - VolumePopup - - - Launch mixer - - - - - Mixer - - - - diff --git a/plugin-volume/volumebutton.cpp b/plugin-volume/volumebutton.cpp index a738a1a..4c85e7c 100644 --- a/plugin-volume/volumebutton.cpp +++ b/plugin-volume/volumebutton.cpp @@ -45,6 +45,7 @@ VolumeButton::VolumeButton(ILXQtPanelPlugin *plugin, QWidget* parent): m_showOnClick(true), m_muteOnMiddleClick(true) { + setAutoRaise(true); // 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") @@ -133,6 +134,7 @@ void VolumeButton::showVolumeSlider() m_volumePopup->updateGeometry(); m_volumePopup->adjustSize(); QRect pos = mPlugin->calculatePopupWindowPos(m_volumePopup->size()); + mPlugin->willShowWindow(m_volumePopup); m_volumePopup->openAt(pos.topLeft(), Qt::TopLeftCorner); m_volumePopup->activateWindow(); } diff --git a/plugin-worldclock/lxqtworldclock.cpp b/plugin-worldclock/lxqtworldclock.cpp index 7386049..54a89e5 100644 --- a/plugin-worldclock/lxqtworldclock.cpp +++ b/plugin-worldclock/lxqtworldclock.cpp @@ -46,7 +46,6 @@ LXQtWorldClock::LXQtWorldClock(const ILXQtPanelPluginStartupInfo &startupInfo): mPopup(NULL), mTimer(new QTimer(this)), mUpdateInterval(1), - mLastUpdate(0), mAutoRotate(true), mPopupContent(NULL) { @@ -67,6 +66,7 @@ LXQtWorldClock::LXQtWorldClock(const ILXQtPanelPluginStartupInfo &startupInfo): settingsChanged(); + mTimer->setTimerType(Qt::PreciseTimer); connect(mTimer, SIGNAL(timeout()), SLOT(timeout())); connect(mContent, SIGNAL(wheelScrolled(int)), SLOT(wheelScrolled(int))); @@ -79,47 +79,54 @@ LXQtWorldClock::~LXQtWorldClock() void LXQtWorldClock::timeout() { - QDateTime now = QDateTime::currentDateTime(); - qint64 nowMsec = now.toMSecsSinceEpoch(); - if ((mLastUpdate / mUpdateInterval) == (nowMsec / mUpdateInterval)) - return; - - mLastUpdate = nowMsec; + if (QDateTime{}.time().msec() > 500) + restartTimer(); + setTimeText(); +} +void LXQtWorldClock::setTimeText() +{ + QDateTime now = QDateTime::currentDateTime(); QString timeZoneName = mActiveTimeZone; if (timeZoneName == QLatin1String("local")) timeZoneName = QString::fromLatin1(QTimeZone::systemTimeZoneId()); - mContent->setText(formatDateTime(now, timeZoneName)); - - mRotatedWidget->update(); - - updatePopupContent(); + QString time_text = formatDateTime(now, timeZoneName); + if (mContent->text() != time_text) + { + mContent->setText(time_text); + mRotatedWidget->update(); + updatePopupContent(); + } } -void LXQtWorldClock::restartTimer(int updateInterval) +void LXQtWorldClock::restartTimer() { - mUpdateInterval = updateInterval; - mTimer->start(qMin(100, updateInterval)); + mTimer->stop(); + mTimer->setInterval(mUpdateInterval); + + int delay = static_cast((mUpdateInterval - (static_cast(QTime::currentTime().msecsSinceStartOfDay()) % mUpdateInterval)) % mUpdateInterval); + QTimer::singleShot(delay, Qt::PreciseTimer, this, &LXQtWorldClock::setTimeText); + QTimer::singleShot(delay, Qt::PreciseTimer, mTimer, SLOT(start())); } void LXQtWorldClock::settingsChanged() { - QSettings *_settings = settings(); + PluginSettings *_settings = settings(); QString oldFormat = mFormat; mTimeZones.clear(); - int size = _settings->beginReadArray(QLatin1String("timeZones")); - for (int i = 0; i < size; ++i) + QList > array = _settings->readArray(QLatin1String("timeZones")); + for (const auto &map : array) { - _settings->setArrayIndex(i); - QString timeZoneName = _settings->value(QLatin1String("timeZone"), QString()).toString(); + QString timeZoneName = map.value(QLatin1String("timeZone"), QString()).toString(); mTimeZones.append(timeZoneName); - mTimeZoneCustomNames[timeZoneName] = _settings->value(QLatin1String("customName"), QString()).toString(); + mTimeZoneCustomNames[timeZoneName] = map.value(QLatin1String("customName"), + QString()).toString(); } - _settings->endArray(); + if (mTimeZones.isEmpty()) mTimeZones.append(QLatin1String("local")); @@ -264,18 +271,22 @@ void LXQtWorldClock::settingsChanged() if ((oldFormat != mFormat)) { - int updateInterval = 0; - + int update_interval; QString format = mFormat; format.replace(QRegExp(QLatin1String("'[^']*'")), QString()); - if (format.contains(QLatin1String("z"))) - updateInterval = 1; - else if (format.contains(QLatin1String("s"))) - updateInterval = 1000; + //don't support updating on milisecond basis -> big performance hit + if (format.contains(QLatin1String("s"))) + update_interval = 1000; + else if (format.contains(QLatin1String("m"))) + update_interval = 60000; else - updateInterval = 60000; + update_interval = 3600000; - restartTimer(updateInterval); + if (update_interval != mUpdateInterval) + { + mUpdateInterval = update_interval; + restartTimer(); + } } bool autoRotate = settings()->value(QLatin1String("autoRotate"), true).toBool(); @@ -292,7 +303,7 @@ void LXQtWorldClock::settingsChanged() mPopup->setGeometry(calculatePopupWindowPos(mPopup->size())); } - timeout(); + setTimeText(); } QDialog *LXQtWorldClock::configureDialog() @@ -305,7 +316,7 @@ void LXQtWorldClock::wheelScrolled(int delta) if (mTimeZones.count() > 1) { mActiveTimeZone = mTimeZones[(mTimeZones.indexOf(mActiveTimeZone) + ((delta > 0) ? -1 : 1) + mTimeZones.size()) % mTimeZones.size()]; - timeout(); + setTimeText(); } } @@ -356,6 +367,7 @@ void LXQtWorldClock::activated(ActivationReason reason) mPopup->adjustSize(); mPopup->setGeometry(calculatePopupWindowPos(mPopup->size())); + willShowWindow(mPopup); mPopup->show(); } else diff --git a/plugin-worldclock/lxqtworldclock.h b/plugin-worldclock/lxqtworldclock.h index 29f9db2..8bbc4d4 100644 --- a/plugin-worldclock/lxqtworldclock.h +++ b/plugin-worldclock/lxqtworldclock.h @@ -66,6 +66,7 @@ private slots: void timeout(); void wheelScrolled(int); void deletePopup(); + void setTimeText(); private: QWidget *mMainWidget; @@ -75,7 +76,6 @@ private: QTimer *mTimer; int mUpdateInterval; - qint64 mLastUpdate; QStringList mTimeZones; QMap mTimeZoneCustomNames; @@ -86,7 +86,7 @@ private: bool mAutoRotate; QLabel *mPopupContent; - void restartTimer(int); + void restartTimer(); QString formatDateTime(const QDateTime &datetime, const QString &timeZoneName); void updatePopupContent(); diff --git a/plugin-worldclock/lxqtworldclockconfiguration.cpp b/plugin-worldclock/lxqtworldclockconfiguration.cpp index 3a35067..d0e759f 100644 --- a/plugin-worldclock/lxqtworldclockconfiguration.cpp +++ b/plugin-worldclock/lxqtworldclockconfiguration.cpp @@ -37,14 +37,12 @@ #include -LXQtWorldClockConfiguration::LXQtWorldClockConfiguration(QSettings *settings, QWidget *parent) : - QDialog(parent), +LXQtWorldClockConfiguration::LXQtWorldClockConfiguration(PluginSettings *settings, QWidget *parent) : + LXQtPanelPluginConfigDialog(settings, parent), ui(new Ui::LXQtWorldClockConfiguration), - mSettings(settings), - mOldSettings(settings), mLockCascadeSettingChanges(false), - mConfigurationTimeZones(NULL), - mConfigurationManualFormat(NULL) + mConfigurationTimeZones(nullptr), + mConfigurationManualFormat(nullptr) { setAttribute(Qt::WA_DeleteOnClose); setObjectName(QLatin1String("WorldClockConfigurationWindow")); @@ -99,10 +97,10 @@ void LXQtWorldClockConfiguration::loadSettings() bool longTimeFormatSelected = false; - QString formatType = mSettings->value(QLatin1String("formatType"), QString()).toString(); - QString dateFormatType = mSettings->value(QLatin1String("dateFormatType"), QString()).toString(); - bool advancedManual = mSettings->value(QLatin1String("useAdvancedManualFormat"), false).toBool(); - mManualFormat = mSettings->value(QLatin1String("customFormat"), tr("''HH:mm:ss'
'ddd, d MMM yyyy'
'TT''")).toString(); + QString formatType = settings().value(QLatin1String("formatType"), QString()).toString(); + QString dateFormatType = settings().value(QLatin1String("dateFormatType"), QString()).toString(); + bool advancedManual = settings().value(QLatin1String("useAdvancedManualFormat"), false).toBool(); + mManualFormat = settings().value(QLatin1String("customFormat"), tr("''HH:mm:ss'
'ddd, d MMM yyyy'
'TT''")).toString(); // backward compatibility if (formatType == QLatin1String("custom")) @@ -137,9 +135,9 @@ void LXQtWorldClockConfiguration::loadSettings() else // if (formatType == QLatin1String("custom-timeonly")) ui->timeFormatCB->setCurrentIndex(2); - ui->timeShowSecondsCB->setChecked(mSettings->value(QLatin1String("timeShowSeconds"), false).toBool() ? Qt::Checked : Qt:: Unchecked); - ui->timePadHourCB->setChecked(mSettings->value(QLatin1String("timePadHour"), false).toBool() ? Qt::Checked : Qt:: Unchecked); - ui->timeAMPMCB->setChecked(mSettings->value(QLatin1String("timeAMPM"), false).toBool() ? Qt::Checked : Qt:: Unchecked); + ui->timeShowSecondsCB->setChecked(settings().value(QLatin1String("timeShowSeconds"), false).toBool() ? Qt::Checked : Qt:: Unchecked); + ui->timePadHourCB->setChecked(settings().value(QLatin1String("timePadHour"), false).toBool() ? Qt::Checked : Qt:: Unchecked); + ui->timeAMPMCB->setChecked(settings().value(QLatin1String("timeAMPM"), false).toBool() ? Qt::Checked : Qt:: Unchecked); bool customTimeFormatSelected = ui->timeFormatCB->currentIndex() == ui->timeFormatCB->count() - 1; ui->timeCustomW->setEnabled(customTimeFormatSelected); @@ -147,9 +145,9 @@ void LXQtWorldClockConfiguration::loadSettings() ui->timezoneGB->setEnabled(!longTimeFormatSelected); // timezone - ui->timezoneGB->setChecked(mSettings->value(QLatin1String("showTimezone"), false).toBool() && !longTimeFormatSelected); + ui->timezoneGB->setChecked(settings().value(QLatin1String("showTimezone"), false).toBool() && !longTimeFormatSelected); - QString timezonePosition = mSettings->value(QLatin1String("timezonePosition"), QString()).toString(); + QString timezonePosition = settings().value(QLatin1String("timezonePosition"), QString()).toString(); if (timezonePosition == QLatin1String("above")) ui->timezonePositionCB->setCurrentIndex(1); else if (timezonePosition == QLatin1String("before")) @@ -159,7 +157,7 @@ void LXQtWorldClockConfiguration::loadSettings() else // if (timezonePosition == QLatin1String("below")) ui->timezonePositionCB->setCurrentIndex(0); - QString timezoneFormatType = mSettings->value(QLatin1String("timezoneFormatType"), QString()).toString(); + QString timezoneFormatType = settings().value(QLatin1String("timezoneFormatType"), QString()).toString(); if (timezoneFormatType == QLatin1String("short")) ui->timezoneFormatCB->setCurrentIndex(0); else if (timezoneFormatType == QLatin1String("long")) @@ -172,10 +170,10 @@ void LXQtWorldClockConfiguration::loadSettings() ui->timezoneFormatCB->setCurrentIndex(4); // date - bool dateIsChecked = mSettings->value(QLatin1String("showDate"), false).toBool(); + bool dateIsChecked = settings().value(QLatin1String("showDate"), false).toBool(); ui->dateGB->setChecked(dateIsChecked); - QString datePosition = mSettings->value(QLatin1String("datePosition"), QString()).toString(); + QString datePosition = settings().value(QLatin1String("datePosition"), QString()).toString(); if (datePosition == QLatin1String("above")) ui->datePositionCB->setCurrentIndex(1); else if (datePosition == QLatin1String("before")) @@ -194,10 +192,10 @@ void LXQtWorldClockConfiguration::loadSettings() else // if (dateFormatType == QLatin1String("custom")) ui->dateFormatCB->setCurrentIndex(3); - ui->dateShowYearCB->setChecked(mSettings->value(QLatin1String("dateShowYear"), false).toBool() ? Qt::Checked : Qt:: Unchecked); - ui->dateShowDoWCB->setChecked(mSettings->value(QLatin1String("dateShowDoW"), false).toBool() ? Qt::Checked : Qt:: Unchecked); - ui->datePadDayCB->setChecked(mSettings->value(QLatin1String("datePadDay"), false).toBool() ? Qt::Checked : Qt:: Unchecked); - ui->dateLongNamesCB->setChecked(mSettings->value(QLatin1String("dateLongNames"), false).toBool() ? Qt::Checked : Qt:: Unchecked); + ui->dateShowYearCB->setChecked(settings().value(QLatin1String("dateShowYear"), false).toBool() ? Qt::Checked : Qt:: Unchecked); + ui->dateShowDoWCB->setChecked(settings().value(QLatin1String("dateShowDoW"), false).toBool() ? Qt::Checked : Qt:: Unchecked); + ui->datePadDayCB->setChecked(settings().value(QLatin1String("datePadDay"), false).toBool() ? Qt::Checked : Qt:: Unchecked); + ui->dateLongNamesCB->setChecked(settings().value(QLatin1String("dateLongNames"), false).toBool() ? Qt::Checked : Qt:: Unchecked); bool customDateFormatSelected = ui->dateFormatCB->currentIndex() == ui->dateFormatCB->count() - 1; ui->dateCustomW->setEnabled(dateIsChecked && customDateFormatSelected); @@ -206,31 +204,32 @@ void LXQtWorldClockConfiguration::loadSettings() ui->advancedManualGB->setChecked(advancedManual); - mDefaultTimeZone = mSettings->value("defaultTimeZone", QString()).toString(); + mDefaultTimeZone = settings().value("defaultTimeZone", QString()).toString(); ui->timeZonesTW->setRowCount(0); - int size = mSettings->beginReadArray(QLatin1String("timeZones")); - for (int i = 0; i < size; ++i) + QList > list = settings().readArray(QLatin1String("timeZones")); + int i = 0; + for (const auto &map : list) { - mSettings->setArrayIndex(i); ui->timeZonesTW->setRowCount(ui->timeZonesTW->rowCount() + 1); - QString timeZoneName = mSettings->value(QLatin1String("timeZone"), QString()).toString(); + QString timeZoneName = map.value(QLatin1String("timeZone"), QString()).toString(); if (mDefaultTimeZone.isEmpty()) mDefaultTimeZone = timeZoneName; ui->timeZonesTW->setItem(i, 0, new QTableWidgetItem(timeZoneName)); - ui->timeZonesTW->setItem(i, 1, new QTableWidgetItem(mSettings->value(QLatin1String("customName"), QString()).toString())); + ui->timeZonesTW->setItem(i, 1, new QTableWidgetItem(map.value(QLatin1String("customName"), + QString()).toString())); setBold(i, mDefaultTimeZone == timeZoneName); + ++i; } - mSettings->endArray(); ui->timeZonesTW->resizeColumnsToContents(); - ui->autorotateCB->setChecked(mSettings->value("autoRotate", true).toBool()); + ui->autorotateCB->setChecked(settings().value("autoRotate", true).toBool()); mLockCascadeSettingChanges = false; @@ -256,13 +255,13 @@ void LXQtWorldClockConfiguration::saveSettings() formatType = QLatin1String("custom-timeonly"); break; } - mSettings->setValue(QLatin1String("formatType"), formatType); + settings().setValue(QLatin1String("formatType"), formatType); - mSettings->setValue(QLatin1String("timeShowSeconds"), ui->timeShowSecondsCB->isChecked()); - mSettings->setValue(QLatin1String("timePadHour"), ui->timePadHourCB->isChecked()); - mSettings->setValue(QLatin1String("timeAMPM"), ui->timeAMPMCB->isChecked()); + settings().setValue(QLatin1String("timeShowSeconds"), ui->timeShowSecondsCB->isChecked()); + settings().setValue(QLatin1String("timePadHour"), ui->timePadHourCB->isChecked()); + settings().setValue(QLatin1String("timeAMPM"), ui->timeAMPMCB->isChecked()); - mSettings->setValue(QLatin1String("showTimezone"), ui->timezoneGB->isChecked()); + settings().setValue(QLatin1String("showTimezone"), ui->timezoneGB->isChecked()); QString timezonePosition; switch (ui->timezonePositionCB->currentIndex()) @@ -283,7 +282,7 @@ void LXQtWorldClockConfiguration::saveSettings() timezonePosition = QLatin1String("after"); break; } - mSettings->setValue(QLatin1String("timezonePosition"), timezonePosition); + settings().setValue(QLatin1String("timezonePosition"), timezonePosition); QString timezoneFormatType; switch (ui->timezoneFormatCB->currentIndex()) @@ -308,9 +307,9 @@ void LXQtWorldClockConfiguration::saveSettings() timezoneFormatType = QLatin1String("iana"); break; } - mSettings->setValue(QLatin1String("timezoneFormatType"), timezoneFormatType); + settings().setValue(QLatin1String("timezoneFormatType"), timezoneFormatType); - mSettings->setValue(QLatin1String("showDate"), ui->dateGB->isChecked()); + settings().setValue(QLatin1String("showDate"), ui->dateGB->isChecked()); QString datePosition; switch (ui->datePositionCB->currentIndex()) @@ -331,7 +330,7 @@ void LXQtWorldClockConfiguration::saveSettings() datePosition = QLatin1String("after"); break; } - mSettings->setValue(QLatin1String("datePosition"), datePosition); + settings().setValue(QLatin1String("datePosition"), datePosition); QString dateFormatType; switch (ui->dateFormatCB->currentIndex()) @@ -352,46 +351,30 @@ void LXQtWorldClockConfiguration::saveSettings() dateFormatType = QLatin1String("custom"); break; } - mSettings->setValue(QLatin1String("dateFormatType"), dateFormatType); - - mSettings->setValue(QLatin1String("dateShowYear"), ui->dateShowYearCB->isChecked()); - mSettings->setValue(QLatin1String("dateShowDoW"), ui->dateShowDoWCB->isChecked()); - mSettings->setValue(QLatin1String("datePadDay"), ui->datePadDayCB->isChecked()); - mSettings->setValue(QLatin1String("dateLongNames"), ui->dateLongNamesCB->isChecked()); - - mSettings->setValue(QLatin1String("customFormat"), mManualFormat); + settings().setValue(QLatin1String("dateFormatType"), dateFormatType); + settings().setValue(QLatin1String("dateShowYear"), ui->dateShowYearCB->isChecked()); + settings().setValue(QLatin1String("dateShowDoW"), ui->dateShowDoWCB->isChecked()); + settings().setValue(QLatin1String("datePadDay"), ui->datePadDayCB->isChecked()); + settings().setValue(QLatin1String("dateLongNames"), ui->dateLongNamesCB->isChecked()); - mSettings->remove(QLatin1String("timeZones")); + settings().setValue(QLatin1String("customFormat"), mManualFormat); + settings().remove(QLatin1String("timeZones")); + QList > array; int size = ui->timeZonesTW->rowCount(); - mSettings->beginWriteArray(QLatin1String("timeZones"), size); for (int i = 0; i < size; ++i) { - mSettings->setArrayIndex(i); - mSettings->setValue(QLatin1String("timeZone"), ui->timeZonesTW->item(i, 0)->text()); - mSettings->setValue(QLatin1String("customName"), ui->timeZonesTW->item(i, 1)->text()); + QMap map; + map[QLatin1String("timeZone")] = ui->timeZonesTW->item(i, 0)->text(); + map[QLatin1String("customName")] = ui->timeZonesTW->item(i, 1)->text(); + array << map; } - mSettings->endArray(); - - mSettings->setValue(QLatin1String("defaultTimeZone"), mDefaultTimeZone); - - - mSettings->setValue(QLatin1String("useAdvancedManualFormat"), ui->advancedManualGB->isChecked()); + settings().setArray(QLatin1String("timeZones"), array); - - mSettings->setValue(QLatin1String("autoRotate"), ui->autorotateCB->isChecked()); -} - -void LXQtWorldClockConfiguration::dialogButtonsAction(QAbstractButton *button) -{ - if (ui->buttons->buttonRole(button) == QDialogButtonBox::ResetRole) - { - mOldSettings.loadToSettings(); - loadSettings(); - } - else - close(); + settings().setValue(QLatin1String("defaultTimeZone"), mDefaultTimeZone); + settings().setValue(QLatin1String("useAdvancedManualFormat"), ui->advancedManualGB->isChecked()); + settings().setValue(QLatin1String("autoRotate"), ui->autorotateCB->isChecked()); } void LXQtWorldClockConfiguration::timeFormatChanged(int index) diff --git a/plugin-worldclock/lxqtworldclockconfiguration.h b/plugin-worldclock/lxqtworldclockconfiguration.h index 19c422e..438cb39 100644 --- a/plugin-worldclock/lxqtworldclockconfiguration.h +++ b/plugin-worldclock/lxqtworldclockconfiguration.h @@ -29,14 +29,12 @@ #ifndef LXQT_PANEL_WORLDCLOCK_CONFIGURATION_H #define LXQT_PANEL_WORLDCLOCK_CONFIGURATION_H -#include - -#include +#include "../panel/lxqtpanelpluginconfigdialog.h" +#include "../panel/pluginsettings.h" #include #include #include - namespace Ui { class LXQtWorldClockConfiguration; } @@ -45,12 +43,12 @@ class LXQtWorldClockConfigurationTimeZones; class LXQtWorldClockConfigurationManualFormat; class QTableWidgetItem; -class LXQtWorldClockConfiguration : public QDialog +class LXQtWorldClockConfiguration : public LXQtPanelPluginConfigDialog { Q_OBJECT public: - explicit LXQtWorldClockConfiguration(QSettings *settings, QWidget *parent = NULL); + explicit LXQtWorldClockConfiguration(PluginSettings *settings, QWidget *parent = nullptr); ~LXQtWorldClockConfiguration(); public slots: @@ -58,8 +56,6 @@ public slots: private: Ui::LXQtWorldClockConfiguration *ui; - QSettings *mSettings; - LXQt::SettingsCache mOldSettings; /* Read settings from conf file and put data into controls. @@ -67,11 +63,6 @@ private: void loadSettings(); private slots: - /* - Saves settings in conf file. - */ - void dialogButtonsAction(QAbstractButton *); - void timeFormatChanged(int); void dateGroupToggled(bool); void dateFormatChanged(int); diff --git a/plugin-worldclock/lxqtworldclockconfigurationmanualformat.ui b/plugin-worldclock/lxqtworldclockconfigurationmanualformat.ui index dd51501..103be21 100644 --- a/plugin-worldclock/lxqtworldclockconfigurationmanualformat.ui +++ b/plugin-worldclock/lxqtworldclockconfigurationmanualformat.ui @@ -115,7 +115,7 @@ <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> -<p><br /><b>Note:</b> 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.</p> +<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> diff --git a/plugin-worldclock/lxqtworldclockconfigurationtimezones.cpp b/plugin-worldclock/lxqtworldclockconfigurationtimezones.cpp index 178d63f..2674983 100644 --- a/plugin-worldclock/lxqtworldclockconfigurationtimezones.cpp +++ b/plugin-worldclock/lxqtworldclockconfigurationtimezones.cpp @@ -106,7 +106,7 @@ int LXQtWorldClockConfigurationTimeZones::updateAndExec() QMap parentItems; - foreach(QByteArray ba, QTimeZone::availableTimeZoneIds()) + foreach(const QByteArray &ba, QTimeZone::availableTimeZoneIds()) { QTimeZone timeZone(ba); QString ianaId(ba); diff --git a/plugin-worldclock/translations/worldclock.ts b/plugin-worldclock/translations/worldclock.ts deleted file mode 100644 index 32c44a4..0000000 --- a/plugin-worldclock/translations/worldclock.ts +++ /dev/null @@ -1,334 +0,0 @@ - - - - - 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 - - - - - '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - - - - - Input custom time zone name - - - - - LXQtWorldClockConfigurationManualFormat - - - World Clock Time Zones - - - - - <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>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 (for example "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> -<p><br /><b>Note:</b> 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.</p> - - - - - - LXQtWorldClockConfigurationTimeZones - - - World Clock Time Zones - - - - - Time zone - - - - - Name - - - - - Comment - - - - - Country - - - - - UTC - - - - - - Other - - - - - Local timezone - - - - diff --git a/plugin-worldclock/translations/worldclock_ar.desktop b/plugin-worldclock/translations/worldclock_ar.desktop new file mode 100644 index 0000000..9e3a920 --- /dev/null +++ b/plugin-worldclock/translations/worldclock_ar.desktop @@ -0,0 +1,2 @@ +Name[ar]=ساعة العالم +Comment[ar]=ملحقة لساعة العالم. diff --git a/plugin-worldclock/translations/worldclock_de.ts b/plugin-worldclock/translations/worldclock_de.ts deleted file mode 100644 index 595ff3f..0000000 --- a/plugin-worldclock/translations/worldclock_de.ts +++ /dev/null @@ -1,370 +0,0 @@ - - - - - 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>' - - - - LXQtWorldClockConfiguration - - - World Clock Settings - Weltzeituhr - Einstellungen - - - - Display &format - Anzeige&format - - - - &Time - &Zeit - - - - F&ormat: - F&ormat: - - - - - - Short - Kurz - - - - - - Long - Lang - - - - - Custom - Eigenes - - - - Sho&w seconds - Se&kunden anzeigen - - - - Pad &hour with zero - Stunden mit fü&hrender Null - - - - &Use 12-hour format - 12-St&undenformat benutzen - - - - T&ime zone - Ze&itzone - - - - &Position: - &Position: - - - - For&mat: - For&mat: - - - - - Below - Unter - - - - - Above - Über - - - - - Before - Vor - - - - - After - Nach - - - - Offset from UTC - Versatz zu UTC - - - - Abbreviation - Abkürzung - - - - Location identifier - Ortsbezeichnung - - - - - - Custom name - Eigener Name - - - - &Date - &Datum - - - - Po&sition: - &Position: - - - - Fo&rmat: - Fo&rmat: - - - - ISO 8601 - ISO 8601 - - - - Show &year - &Jahr anzeigen - - - - Show day of wee&k - &Wochentag anzeigen - - - - Pad d&ay with zero - T&ag mit führender Null - - - - &Long month and day of week names - &Lange Monats- und Wochentagsbezeichnungen - - - - Ad&vanced manual format - &Erweitertes manuelles Format - - - - &Customise ... - &Ändern... - - - - Time &zones - &Zeitzonen - - - - IANA id - IANA-ID - - - - &Add ... - &Hinzufügen ... - - - - &Remove - &Entfernen - - - - Set as &default - Als &Default setzen - - - - &Edit custom name ... - &Eigenen Namen bearbeiten... - - - - Move &up - Nach &oben - - - - Move do&wn - Nach &unten - - - - &General - All&gemein - - - - Auto&rotate when the panel is vertical - &Bei senkrechter Leiste automatisch drehen - - - - '<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 - Eigenen Zeitzonennamen eingeben - - - - LXQtWorldClockConfigurationManualFormat - - - World Clock Time Zones - Weltzeituhr Zeitzonen - - - - <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>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 (for example "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> -<p><br /><b>Note:</b> 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.</p> - - <h1>Syntax für eigenes Datums-/Zeitformat </h1> -<p>Ein Datumsmuster ist eine Zeichenkette, in der bestimmte Zeichenfolgen durch Datums- und Zeitangaben eines Kalenders ersetzt werden.</p> -<p>In der unten angegebenen Tabelle sind die Zeichenfolgen angegeben, für die eine Ersetzung vorgenommen wird. Dabei können einzelne Zeichen mehrfach angegeben werden, um die Bedeutung zu verändern. Beispielsweise wird y zur Darstellung des Jahres benutzt. Dabei produziert 'yy' z.B. '99', und 'yyyy' produziert dann '1999'. Bei den meisten numerischen Feldern bestimmt die Anzahl der Zeichen die Feldbreite. Beispielsweise bei h, das zur Darstellung der Stunden dient, könnte 'h' eine '5' produzieren, aber 'hh' ergäbe '05'. Bei einigen Zeichen wird durch die Anzahl bestimmt, ob die abgekürzte oder ausgeschriebene Form benutzt werden soll.</p> -<p>Zwei Hochkommas werden durch ein einzelnes Hochkomma ersetzt, sowohl innerhalb als auch außerhalb Hochkommas. Text innerhalb einfacher Hochkommas wird nicht ersetzt (abgesehen von zwei aufeinander folgenden Hochkommas). Ansonsten sind alle ASCII-Zeichen von a bis z und A bis Z reservierte Zeichen und müssen in Hochkommas stehen, wenn sie für sich selbst stehen sollen. Außerdem könnten bestimmte Satzzeichen zukünftig als Variablen aufgefasst werden (z.B. könnte ":" als Trennzeichen zwischen Zeitbestandteilen und '/' als Datumstrenner interpretiert werden, welche durch entsprechende lokale Zeichen in der Anzeige ersetzt werden).<br /></p> -<table border="1" width="100%" cellpadding="4" cellspacing="0"> -<tr><th width="20%">Code</th><th>Bedeutung</th></tr> -<tr><td>d</td><td>Tag als Zahl ohne führende Null (1 bis 31)</td></tr> -<tr><td>dd</td><td>Tag als Zahl mit führender Null (01 bis 31)</td></tr> -<tr><td>ddd</td><td>Abgekürzter lokalisierter Tagesname (z.B. 'Mon' bis 'Son').</td></tr> -<tr><td>dddd</td><td>Ausgeschriebener lokalisierter Tagesname (z.B. 'Montag' bis 'Sonntag</td></tr> -<tr><td>M</td><td>Monat als Zahl ohne führende Null (1-12)</td></tr> -<tr><td>MM</td><td>Monat als Zahl mit führender Null (01-12)</td></tr> -<tr><td>MMM</td><td>Abgekürzter lokalisierter Monatsname (z.B. 'Jan' bis 'Dez').</td></tr> -<tr><td>MMMM</td><td>Ausgeschriebener lokalisierter Monatsname (z.B. 'Januar' bis 'Dezember').</td></tr> -<tr><td>yy</td><td>Jahr als zweistellige Zahl (00-99)</td></tr> -<tr><td>yyyy</td><td>Jahr als vierstellige Zahl</td></tr> -<tr><td>h</td><td>Stunde ohne führende Null (0 bis 23 oder 1 bis 12 bei AM/PM-Anzeige)</td></tr> -<tr><td>hh</td><td>Stunde mit führender Null (00 bis 23 oder 01 bis 12 bei AM/PM-Anzeige)</td></tr> -<tr><td>H</td><td>Stunde ohne führende Null (0 bis 23, selbst bei AM/PM-Anzeige)</td></tr> -<tr><td>HH</td><td>Stunde mit führender Null (00 bis 23, selbst bei AM/PM-Anzeige)</td></tr> -<tr><td>m</td><td>Minute ohne führende Null (0 bis 59)</td></tr> -<tr><td>mm</td><td>Minute mit führender Null (00 bis 59)</td></tr> -<tr><td>s</td><td>Sekunde ohne führende Null (0 bis 59)</td></tr> -<tr><td>ss</td><td>Sekunde mit führender Null (00 bis 59)</td></tr> -<tr><td>z</td><td>Millisekunden ohne führende Nullen (0 bis 999)</td></tr> -<tr><td>zzz</td><td>Millisekunden mit führenden Nullen (000 bis 999)</td></tr> -<tr><td>AP <i>oder</i> A</td><td>AM/PM-Anzeige nutzen. <b>A/AP</b> wird durch "AM" oder "PM" ersetzt.<</td></tr> -<tr><td>ap <i>oder</i> a</td><td>am/pm-Anzeige nutzen. <b>a/ap</b> wird durch "am" oder "pm" ersetzt.<</td></tr> -<tr><td>t</td><td>Zeitzone (z.B. "CEST")</td></tr> -<tr><td>T</td><td>Offset zu UTC</td></tr> -<tr><td>TT</td><td>Zeitzone IANA-ID</td></tr> -<tr><td>TTT</td><td>Zeitzone abgekürzt</td></tr> -<tr><td>TTTT</td><td>Zeitzone kurz</td></tr> -<tr><td>TTTTT</td><td>Zeitzone lang</td></tr> -<tr><td>TTTTTT</td><td>Eigener Name für die Zeitzone. Dieser kann im Reiter 'Zeitzonen' gesetzt werden.</td></tr></table> -<p><br /><b>Hinweis:</b> Jedes Zeichen, das nicht in den Bereichen ['a'..'z'] und ['A'..'Z'] liegt, wird als in Hochkommas eingeschlossener Text behandelt. Zeichen wie ':', '.', ' ', '#' und '@' erscheinen im resultierenden Text auch wenn sie nicht in Hochkommas eingeschlossen sind. Das Hochkomma wird als Fluchtzeichen verwendet. Zwei aufeinander folgende Hochkommas repräsentieren ein 'echtes' Hochkomma.</p> - - - - - LXQtWorldClockConfigurationTimeZones - - - World Clock Time Zones - Weltzeituhr Zeitzonen - - - - Time zone - Zeitzone - - - - Name - Name - - - - Comment - Kommentar - - - - Country - Land - - - - UTC - UTC - - - - - Other - Andere - - - - Local timezone - Lokale Zeitzone - - - diff --git a/plugin-worldclock/translations/worldclock_el.ts b/plugin-worldclock/translations/worldclock_el.ts deleted file mode 100644 index 965bbc0..0000000 --- a/plugin-worldclock/translations/worldclock_el.ts +++ /dev/null @@ -1,370 +0,0 @@ - - - - - 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>' - - - - 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 - Διαφορά από την 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 - Συμπλή&ρωση της ημέρας με μηδενικά - - - - &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 - &Αυτόματη περιστροφή όταν ο πίνακας είναι τοποθετημένος κάθετα - - - - '<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 - Εισαγωγή του προσαρμοσμένου ονόματος της ζώνης ώρας - - - - LXQtWorldClockConfigurationManualFormat - - - World Clock Time Zones - Ζώνες ώρας του παγκόσμιου ρολογιού - - - - <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>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 (for example "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> -<p><br /><b>Note:</b> 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.</p> - - <h1>Προσαρμοσμένη σύνταξη ημερομηνίας/ώρας</h1> -<p>Μια σχηματομορφή ημερομηνίας είναι μια συμβολοσειρά χαρακτήρων, όπου συγκεκριμένοι χαρακτήρες αντικαθιστώνται με τα δεδομένα της ημερομηνίας και της ώρας από ένα ημερολόγιο κατά την μορφοποίηση ή όταν χρησιμοποιείται για την δημιουργία δεδομένον ημερολογίου κατά την ανάλυση.</p> -<p>Ο παρακάτω πίνακας του πεδίου συμβόλου της ημερομηνίας περιέχει τους χαρακτήρες που χρησιμοποιούνται στις σχηματομορφές για να εμφανίσουν τις κατάλληλες μορφές για μια δοσμένη τοπικότητα, όπως yyyy για το έτος. Οι χαρακτήρες μπορούν να χρησιμοποιηθούν περισσότερες φορές. Για παράδειγμα, αν χρησιμοποιείται για το έτος,το 'yy' μπορεί να παράγει '99', ενώ το 'yyyy' παράγει '1999'. Για τα περισσότερα των αριθμητικών πεδίων, το πλήθος των χαρακτήρων καθορίζει το πλάτος του πεδίου. Για παράδειγμα, αν h είναι η ώρα, το 'h' μπορεί να παράγει '5', αλλά το 'hh' παράγει '05'. Για ορισμένους χαρακτήρες, το πλήθος καθορίζει αν θα χρησιμοποιείται μια πλήρης ή συντομογραφημένη μορφή, αλλά μπορεί να έχει και άλλες επιλογές, όπως αναφέρεται παρακάτω.</p> -<p>Δυο μονά εισαγωγικά αναπαριστούν κυριολεκτικά μονά εισαγωγικά, είτε εσωτερικά είτε εξωτερικά μονά εισαγωγικά. Το κείμενο που εσωκλείεται σε μονά εισαγωγικά δεν ερμηνεύεται σε καμιά περίπτωση (εκτός των δυο παρακείμενων μονών εισαγωγικών). Διαφορετικά όλα τα γράμματα ASCII από το a ως το z και από το A ως το Z είναι δεσμευμένα ως χαρακτήρες σύνταξης, και απαιτούνται εισαγωγικά αν πρόκειται να αναπαραστήσουν κυριολεκτικούς χαρακτήρες. Επιπρόσθετα, ορισμένοι χαρακτήρες στίξης 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)</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 αν απεικονίζεται ως ΠΜ/ΜΜ)</td></tr> -<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>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> -<tr><td>T</td><td>η διαφορά από την ώρα UTC</td></tr> -<tr><td>TT</td><td>το αναγνωριστικό IANA της ζώνης ώρας</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> -<p><br /><b>Σημείωση:</b> Οποιοσδήποτε χαρακτήρας στη σχηματομορφή που δεν είναι σε εύρος του ['a'..'z'] και ['A'..'Z'] θα διαχειρίζεται ως κείμενο σε εισαγωγικά. Παραδείγματος χάριν, οι χαρακτήρες όπως ':', '.', ' ', '#' και '@' θα εμφανίζονται στο τελικό κείμενο της ώρας ακόμα και αν δεν είναι έγκλειστοι σε μονά εισαγωγικά. Τα μονά εισαγωγικά χρησιμοποιούνται για τη «διαφυγή» γραμμάτων. Δυο μονά εισαγωγικά σε μια γραμμή, είτε εσωτερικά είτε εξωτερικά της ακολουθίας έγκλειστης σε εισαγωγικά, αναπαριστούν ένα ζεύγος «πραγματικών» μονών εισαγωγικών.</p> - - - - - LXQtWorldClockConfigurationTimeZones - - - World Clock Time Zones - Ζώνες ώρας του παγκόσμιου ρολογιού - - - - Time zone - Ζώνη ώρας - - - - Name - Όνομα - - - - Comment - Σχόλιο - - - - Country - Χώρα - - - - UTC - UTC - - - - - Other - Άλλο - - - - Local timezone - Τοπικής ζώνης ώρας - - - diff --git a/plugin-worldclock/translations/worldclock_hu.ts b/plugin-worldclock/translations/worldclock_hu.ts deleted file mode 100644 index a5e333e..0000000 --- a/plugin-worldclock/translations/worldclock_hu.ts +++ /dev/null @@ -1,334 +0,0 @@ - - - - - LXQtWorldClock - - - '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - - - - - LXQtWorldClockConfiguration - - - World Clock Settings - Világóra beállítás - - - - Display &format - Megjelenítés &forma - - - - &Time - &Idő - - - - F&ormat: - F&ormátum: - - - - - - Short - Rövid - - - - - - Long - Hosszú - - - - - Custom - Egyéni - - - - Sho&w seconds - &Másodpercek - - - - Pad &hour with zero - Óra bevezető nullával - - - - T&ime zone - &Időzóna - - - - &Position: - &Hely - - - - For&mat: - Fo&rmátum: - - - - - Below - Belül - - - - - Above - Kívül - - - - - Before - Előtt - - - - - After - Után - - - - Offset from UTC - UTC eltérés - - - - Abbreviation - Rövidítés - - - - IANA id - - - - - - - Custom name - Egyedi - - - - &Use 12-hour format - 12 ó&rás alak - - - - Location identifier - Helyazonosító - - - - &Date - &Dátum - - - - Po&sition: - H&ely - - - - Fo&rmat: - Fo&rmátum: - - - - ISO 8601 - - - - - Show &year - É&v látszik - - - - Show day of wee&k - Hét napja látszi&k - - - - Pad d&ay with zero - N&ap nullával indul - - - - &Long month and day of week names - &Hosszú hónap és hetinap - - - - Ad&vanced manual format - Haladó kézi forma - - - - &Customise ... - &Meghatároz... - - - - Time &zones - Idő&zónák - - - - &Add ... - Hozzá&ad - - - - &Remove - Tö&röl - - - - Set as &default - Alapértelmez - - - - &Edit custom name ... - Névsz&erkesztés - - - - Move &up - &Föl - - - - Move do&wn - &Le - - - - &General - Általáno&s - - - - Auto&rotate when the panel is vertical - Függöleges panelnél görgetés - - - - '<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 - - - - LXQtWorldClockConfigurationManualFormat - - - World Clock Time Zones - Világóra időzónák - - - - <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>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 (for example "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> -<p><br /><b>Note:</b> 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.</p> - - - - - - LXQtWorldClockConfigurationTimeZones - - - World Clock Time Zones - Világóra időzónák - - - - Time zone - Időzóna - - - - Name - Név - - - - Comment - Megjegyzés - - - - Country - Ország - - - - UTC - - - - - - Other - Egyéb - - - - Local timezone - Helyi idő - - - diff --git a/plugin-worldclock/translations/worldclock_hu_HU.ts b/plugin-worldclock/translations/worldclock_hu_HU.ts deleted file mode 100644 index 76ab27d..0000000 --- a/plugin-worldclock/translations/worldclock_hu_HU.ts +++ /dev/null @@ -1,334 +0,0 @@ - - - - - LXQtWorldClock - - - '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - - - - - LXQtWorldClockConfiguration - - - World Clock Settings - Világóra beállítás - - - - Display &format - Megjelenítés &forma - - - - &Time - &Idő - - - - F&ormat: - F&ormátum: - - - - - - Short - Rövid - - - - - - Long - Hosszú - - - - - Custom - Egyéni - - - - Sho&w seconds - &Másodpercek - - - - Pad &hour with zero - Óra bevezető nullával - - - - T&ime zone - &Időzóna - - - - &Position: - &Hely - - - - For&mat: - Fo&rmátum: - - - - - Below - Belül - - - - - Above - Kívül - - - - - Before - Előtt - - - - - After - Után - - - - Offset from UTC - UTC eltérés - - - - Abbreviation - Rövidítés - - - - IANA id - - - - - - - Custom name - Egyedi - - - - &Use 12-hour format - 12 ó&rás alak - - - - Location identifier - Helyazonosító - - - - &Date - &Dátum - - - - Po&sition: - H&ely - - - - Fo&rmat: - Fo&rmátum: - - - - ISO 8601 - - - - - Show &year - É&v látszik - - - - Show day of wee&k - Hét napja látszi&k - - - - Pad d&ay with zero - N&ap nullával indul - - - - &Long month and day of week names - &Hosszú hónap és hetinap - - - - Ad&vanced manual format - Haladó kézi forma - - - - &Customise ... - &Meghatároz... - - - - Time &zones - Idő&zónák - - - - &Add ... - Hozzá&ad - - - - &Remove - Tö&röl - - - - Set as &default - Alapértelmez - - - - &Edit custom name ... - Névsz&erkesztés - - - - Move &up - &Föl - - - - Move do&wn - &Le - - - - &General - Általáno&s - - - - Auto&rotate when the panel is vertical - Függöleges panelnél görgetés - - - - '<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 - - - - LXQtWorldClockConfigurationManualFormat - - - World Clock Time Zones - Világóra időzónák - - - - <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>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 (for example "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> -<p><br /><b>Note:</b> 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.</p> - - - - - - LXQtWorldClockConfigurationTimeZones - - - World Clock Time Zones - Világóra időzónák - - - - Time zone - Időzóna - - - - Name - Név - - - - Comment - Megjegyzés - - - - Country - Ország - - - - UTC - - - - - - Other - Egyéb - - - - Local timezone - Helyi idő - - - diff --git a/plugin-worldclock/translations/worldclock_it.ts b/plugin-worldclock/translations/worldclock_it.ts deleted file mode 100644 index c9b5f28..0000000 --- a/plugin-worldclock/translations/worldclock_it.ts +++ /dev/null @@ -1,328 +0,0 @@ - - - - - LXQtWorldClock - - - '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - - - - - LXQtWorldClockConfiguration - - - World Clock Settings - Impostazioni orologio mondiale - - - - Display &format - &Aspetto - - - - &Time - &Ora - - - - F&ormat: - F&ormato: - - - - - - Short - Breve - - - - - - Long - Esteso - - - - - Custom - Personalizzato - - - - Sho&w seconds - &Mostra secondi - - - - Pad &hour with zero - Ora &senza zero iniziale - - - - T&ime zone - &Fuso orario - - - - &Position: - &Posizione: - - - - For&mat: - F&ormato: - - - - - Below - Sotto - - - - - Above - Sopra - - - - - Before - Prima - - - - - After - Dopo - - - - Offset from UTC - Differenza da UTC - - - - Abbreviation - Abbreviazione - - - - IANA id - - - - - - - Custom name - Nome personalizzato - - - - &Use 12-hour format - &Usa formato 12 ore - - - - Location identifier - Nome località - - - - &Date - &Data - - - - Po&sition: - &Posizione: - - - - Fo&rmat: - F&ormato: - - - - ISO 8601 - - - - - Show &year - Mostra l'&anno - - - - Show day of wee&k - Mostra &giorno della settimana - - - - Pad d&ay with zero - Giorno &senza zero iniziale - - - - &Long month and day of week names - Nome &esteso per mese e giorno della settimana - - - - Ad&vanced manual format - Formato avanzato &personalizzato - - - - &Customise ... - &Personalizza... - - - - Time &zones - Fu&si orari - - - - &Add ... - &Aggiungi... - - - - &Remove - &Rimuovi - - - - Set as &default - &Imponi come predefinito - - - - &Edit custom name ... - &Personalizza nome... - - - - Move &up - &Sù - - - - Move do&wn - &Giù - - - - &General - A&ltro - - - - Auto&rotate when the panel is vertical - &Ruota automaticamente se il panello è verticale - - - - '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - - - - - Input custom time zone name - Nome personalizzato - - - - LXQtWorldClockConfigurationManualFormat - - - World Clock Time Zones - Fusi orari orologio mondiale - - - - <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>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 (for example "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> -<p><br /><b>Note:</b> 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.</p> - - - - - - LXQtWorldClockConfigurationTimeZones - - - World Clock Time Zones - Fusi orari orologio mondiale - - - - Time zone - Fuso orario - - - - Name - Nome - - - - Comment - Commento - - - - Country - Paese - - - - UTC - - - - - Other - Altro - - - diff --git a/plugin-worldclock/translations/worldclock_ja.ts b/plugin-worldclock/translations/worldclock_ja.ts deleted file mode 100644 index e6a5034..0000000 --- a/plugin-worldclock/translations/worldclock_ja.ts +++ /dev/null @@ -1,370 +0,0 @@ - - - - - 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>' - - - - LXQtWorldClockConfiguration - - - World Clock Settings - 世界時計の設定 - - - - Display &format - 表示形式 (&F) - - - - &Time - 時刻(&T) - - - - F&ormat: - 形式(&O): - - - - - - Short - 短い - - - - - - Long - 長い - - - - - Custom - 指定する - - - - Sho&w seconds - 秒も表示(&W) - - - - Pad &hour with zero - 時が一桁のときゼロで埋める(&H) - - - - &Use 12-hour format - 12時間制で表示(&U) - - - - T&ime zone - タイムゾーン(&I) - - - - &Position: - 位置(&P): - - - - For&mat: - 形式(&M) - - - - - Below - 下 - - - - - Above - 上 - - - - - Before - 前 - - - - - After - 後 - - - - Offset from UTC - UTCからの時差 - - - - Abbreviation - 短縮形 - - - - Location identifier - 場所 - - - - IANA id - IANAのID - - - - - - Custom name - 指定した名前 - - - - &Date - 日時(&D) - - - - Po&sition: - 位置(&S): - - - - Fo&rmat: - 形式(&R): - - - - ISO 8601 - ISO 8601 - - - - Show &year - 年を表示(&Y) - - - - Show day of wee&k - 曜日を表示(&K) - - - - Pad d&ay with zero - 日が一桁のときゼロで埋める(&A) - - - - &Long month and day of week names - 月や曜日を長い名前で表示(&L) - - - - Ad&vanced manual format - 形式を詳しく指定する(&V) - - - - &Customise ... - 指定する(&C) - - - - Time &zones - タイムゾーン(&Z) - - - - &Add ... - 追加(&A) - - - - &Remove - 削除(&R) - - - - Set as &default - デフォルトにする(&D) - - - - &Edit custom name ... - 名前を付ける(&E) - - - - Move &up - 上へ(&U) - - - - Move do&wn - 下へ(&W) - - - - &General - 一般(&G) - - - - Auto&rotate when the panel is vertical - パネルが垂直なときには回転する(&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>' - - - - Input custom time zone name - タイムゾーンの名前を入力 - - - - LXQtWorldClockConfigurationManualFormat - - - World Clock Time Zones - 世界時計のタイムゾーン - - - - <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>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 (for example "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> -<p><br /><b>Note:</b> 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.</p> - - <h1>日時形式の指定方法</h1> -<p>日時の表現パターンは文字列で表記します。特定の文字列は生成処理時に解釈され、カレンダー上の日時の情報に置き換えられます。</p> -<p>以下の日付フィールドのシンボル表は、例えば yyyy が年を意味するといったように、設定されているロケールに合わせた形式で表示されるパターン文字列を示しています。また、同じ文字を並べるものがあり、例えば y は年を示すために用い、'yy' なら '99'、'yyyy' なら '1999' といったように生成されます。数字を示す多くのフィールドは、文字長を表しています。例えば、時を示す h は、'h' は '5'、'hh' は '05' を生成します。繰り返す回数により短縮名かフルネームかを区別するものもあります。そのほか下表に示す通りです。</p> -<p>引用符内か否かに関わらず、シングルクオーテーションを2つ続けると、シングルクオーテーション文字1つを表します。シングルクオーテーション内の文字列は、（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)</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>月(短縮名) ('1月'-'12月'、※英語ならJan...).</td></tr> -<tr><td>MMMM</td><td>月(フルネーム) ('1月'-'12月'、※英語ならJanuary...).</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)</td></tr> -<tr><td>hh</td><td>時(ゼロ埋めする) (00-23、午前/午後表示時は 01-12)</td></tr> -<tr><td>H</td><td>時(ゼロ埋めしない) (0-23、常に24時間制)</td></tr> -<tr><td>HH</td><td>時(ゼロ埋めする) (00-23、常に24時間制)</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>午前/午後。<b>A や AP</b> は "午前"または"午後"に置き換えられる（※英語ならAM/PM）<</td></tr> -<tr><td>ap <i>または</i> a</td><td>午前/午後。<b>a や ap</b> は "午前"または"午後"に置き換えられる（※英語ならam/pm）<</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> -<p><br /><b>Note:</b> ['a'..'z'] および ['A'..'Z'] 以外の文字は解釈されません。例えば ':' や '.'、' '、'#'、'@'のような文字は、引用符で括らなくとも、そのまま表示されます。シングルクオーテーションは、'エスケープ文字'として使用します。連続するシングルクオーテーションは、'本物の' 1個のシングルクオーテーションを表します。</p> - - - - - LXQtWorldClockConfigurationTimeZones - - - World Clock Time Zones - 世界時計のタイムゾーン - - - - Time zone - 都市 - - - - Name - タイムゾーン - - - - Comment - 備考 - - - - Country - 国名 - - - - UTC - UTC - - - - - Other - その他 - - - - Local timezone - - - - diff --git a/plugin-worldclock/translations/worldclock_pt.ts b/plugin-worldclock/translations/worldclock_pt.ts deleted file mode 100644 index f4cb4e0..0000000 --- a/plugin-worldclock/translations/worldclock_pt.ts +++ /dev/null @@ -1,393 +0,0 @@ - - - - - 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>' - - - - LXQtWorldClockConfiguration - - - World Clock Settings - Definições do relógio mundial - - - &Short, time only - &Curto, apenas horas - - - &Long, time only - &Longo, apenas horas - - - S&hort, date && time - C&urto, hora e data - - - L&ong, date && time - L&ongo, hora e data - - - &Custom - &Personalizar - - - <html><head/><body><p><span style=" font-size:x-large; font-weight:600;">Custom Date/Time Format Syntax</span></p><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 &quot;:&quot; 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" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;" width="100%" cellspacing="0" cellpadding="4"><tr><td width="20%"><p align="center"><span style=" font-weight:600;">Code</span></p></td><td><p align="center"><span style=" font-weight:600;">Meaning</span></p></td></tr><tr><td><p>d</p></td><td><p>the day as number without a leading zero (1 to 31)</p></td></tr><tr><td><p>dd</p></td><td><p>the day as number with a leading zero (01 to 31)</p></td></tr><tr><td><p>ddd</p></td><td><p>the abbreviated localized day name (e.g. 'Mon' to 'Sun').</p></td></tr><tr><td><p>dddd</p></td><td><p>the long localized day name (e.g. 'Monday' to 'Sunday</p></td></tr><tr><td><p>M</p></td><td><p>the month as number without a leading zero (1-12)</p></td></tr><tr><td><p>MM</p></td><td><p>the month as number with a leading zero (01-12)</p></td></tr><tr><td><p>MMM</p></td><td><p>the abbreviated localized month name (e.g. 'Jan' to 'Dec').</p></td></tr><tr><td><p>MMMM</p></td><td><p>the long localized month name (e.g. 'January' to 'December').</p></td></tr><tr><td><p>yy</p></td><td><p>the year as two digit number (00-99)</p></td></tr><tr><td><p>yyyy</p></td><td><p>the year as four digit number</p></td></tr><tr><td><p>h</p></td><td><p>the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display)</p></td></tr><tr><td><p>hh</p></td><td><p>the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display)</p></td></tr><tr><td><p>H</p></td><td><p>the hour without a leading zero (0 to 23, even with AM/PM display)</p></td></tr><tr><td><p>HH</p></td><td><p>the hour with a leading zero (00 to 23, even with AM/PM display)</p></td></tr><tr><td><p>m</p></td><td><p>the minute without a leading zero (0 to 59)</p></td></tr><tr><td><p>mm</p></td><td><p>the minute with a leading zero (00 to 59)</p></td></tr><tr><td><p>s</p></td><td><p>the second without a leading zero (0 to 59)</p></td></tr><tr><td><p>ss</p></td><td><p>the second with a leading zero (00 to 59)</p></td></tr><tr><td><p>z</p></td><td><p>the milliseconds without leading zeroes (0 to 999)</p></td></tr><tr><td><p>zzz</p></td><td><p>the milliseconds with leading zeroes (000 to 999)</p></td></tr><tr><td><p>AP or A</p></td><td><p>use AM/PM display. <span style=" font-weight:600;">A/AP</span> will be replaced by either &quot;AM&quot; or &quot;PM&quot;.</p></td></tr><tr><td><p>ap or a</p></td><td><p>use am/pm display. <span style=" font-weight:600;">a/ap</span> will be replaced by either &quot;am&quot; or &quot;pm&quot;.</p></td></tr><tr><td><p>t</p></td><td><p>the timezone (for example &quot;CEST&quot;)</p></td></tr><tr><td><p>T</p></td><td><p>the offset from UTC</p></td></tr><tr><td><p>TT</p></td><td><p>the timezone IANA id</p></td></tr><tr><td><p>TTT</p></td><td><p>the timezone abbreviation</p></td></tr><tr><td><p>TTTT</p></td><td><p>the timezone short display name</p></td></tr><tr><td><p>TTTTT</p></td><td><p>the timezone long display name</p></td></tr></table><p><br/><span style=" font-weight:600;">Note:</span> 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.</p></body></html> - <html><head/><body><p><span style=" font-size:x-large; font-weight:600;">Sintaxe do formato de data/hora personalizado</span></p><p>Um formato de data é uma cadeia de caracteres em que os caracteres são substituidos pelos dados de data e hora de um calendário ou que são utilizados para gerar os dados do calendário.</p><p>A tabela de símbolos para campos de data abaixo contém os caracteres utilizados em padrões para mostrar os devidos formatos de uma região. Os caracteres podem ser utilizados diversas vezes. Por exemplo, se utilizar y para o anor, yy devolve 99 e yyyy devolve 1999. Para a maioria dos campo numéricos, o número de caracteres especifica o tamanho do campo. Por exemplo, se utilizar h para a hora, h devolve 5 mas hh devolve 05. Para alguns caracteres, o número de letras especifica o formato utilizado (pode ser abreviado ou completo), conforme explicado abaixo.</p><p>Duas aspas simples representam uma aspa simples literal, seja dentro ou fora das aspas simples. O texto entre aspas simples não é interpretado de qualquer forma (exceto para duas aspas simples adjacentes). Doutra forma, todas as letras ASCII , de "a" a "z" e "A" a "Z" estão reservadas para caracteres de sintaxe e são necessárias aspas para representarem caracteres literais. Adicionalmente, alguns símbolos de pontuação ASCII podem ser tornados variáveis no futuro (ex: &quot;:&quot; é interpretado como separador de hora e '/' como separador de data e são substituidos pelos separadores normalmente utilizados na região).<br/></p><table border="1" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;" width="100%" cellspacing="0" cellpadding="4"><tr><td width="20%"><p align="center"><span style=" font-weight:600;">Code</span></p></td><td><p align="center"><span style=" font-weight:600;">Significado</span></p></td></tr><tr><td><p>d</p></td><td><p>o dia como número sem o zero inicial (1 a 31)</p></td></tr><tr><td><p>dd</p></td><td><p>o dia como número mas com zero inicial (01 a 31)</p></td></tr><tr><td><p>ddd</p></td><td><p>o nome do dia abreviado (Seg a Dom).</p></td></tr><tr><td><p>dddd</p></td><td><p>o nome do dia completo (Segunda a Domingo</p></td></tr><tr><td><p>M</p></td><td><p>o mês como número sem o zero inicial (1-12)</p></td></tr><tr><td><p>MM</p></td><td><p>o mês como número mas com zero inicial (01-12)</p></td></tr><tr><td><p>MMM</p></td><td><p>o nome abreviado do mês (Jan a Dez).</p></td></tr><tr><td><p>MMMM</p></td><td><p>o nome completo do mês (Janeiro a Dezembro).</p></td></tr><tr><td><p>yy</p></td><td><p>o ano como número de 2 dígitos (00-99)</p></td></tr><tr><td><p>yyyy</p></td><td><p>o ano como número de 4 dígitos</p></td></tr><tr><td><p>h</p></td><td><p>a hora sem o zero inicial (0 a 23 ou 1 a 12 se AM/PM)</p></td></tr><tr><td><p>hh</p></td><td><p>a hora mas com o zero inicial (00 a 23 ou 01 a 12 se AM/PM)</p></td></tr><tr><td><p>H</p></td><td><p>a hora sem o zero inicial (0 a 23, mesmo se AM/PM)</p></td></tr><tr><td><p>HH</p></td><td><p>a hora mas com o zero inicial (00 a 23, mesmo se AM/PM)</p></td></tr><tr><td><p>m</p></td><td><p>os minutos sem o zero inicial (0 a 59)</p></td></tr><tr><td><p>mm</p></td><td><p>os minutos mas com zero inicial (00 a 59)</p></td></tr><tr><td><p>s</p></td><td><p>os segundos sem o zero inicial (0 a 59)</p></td></tr><tr><td><p>ss</p></td><td><p>os segundos mas com zero inicial (00 a 59)</p></td></tr><tr><td><p>z</p></td><td><p>os milissegundos sem o zero inicial (0 a 999)</p></td></tr><tr><td><p>zzz</p></td><td><p>os milissegundos mas com zero inicial (000 a 999)</p></td></tr><tr><td><p>AP ou A</p></td><td><p>para mostrar AM/PM <span style=" font-weight:600;">A/AP</span> será substituido por &quot;AM&quot; ou &quot;PM&quot;.</p></td></tr><tr><td><p>ap ou a</p></td><td><p>para mostrar am/pm <span style=" font-weight:600;">a/ap</span> será substituido por &quot;am&quot; ou &quot;pm&quot;.</p></td></tr><tr><td><p>t</p></td><td><p>o fuso horário (por exemplo: &quot;CEST&quot;)</p></td></tr><tr><td><p>T</p></td><td><p>o desvio da UTC</p></td></tr><tr><td><p>TT</p></td><td><p>a ID IANA do fuso horário</p></td></tr><tr><td><p>TTT</p></td><td><p>a abreviatura do fuso horário</p></td></tr><tr><td><p>TTTT</p></td><td><p>o nome abreviado do fuso horário</p></td></tr><tr><td><p>TTTTT</p></td><td><p>o nome completo do fuso horário</p></td></tr></table><p><br/><span style=" font-weight:600;">Nota:</span> quaisquer caracteres no padrão que não estejam no intervalo [a...z] e [A...Z] serão tratados como texto. Por exemplo, os caracteres ':', '.', ' ', '#' e '@' aparecerão no texto mesmo se não tiverem aspas.As aspas simples são utilizadas para 'escape' de letras. As aspas duplas, dentro ou fora da sequência entre aspas, representa uma aspa simples 'real.</p></body></html> - - - - Time &zones - Fusos &horários - - - - &Add ... - &Adicionar... - - - - &Remove - &Remover - - - - Set as &default - Utilizar como pré-&definido - - - - Move &up - Mover para &cima - - - - Move do&wn - Mover para &baixo - - - - Display &format - &Formato de exibição - - - - &Time - &Hora - - - - F&ormat: - F&ormato: - - - - - - Short - Curto - - - - - - Long - Longo - - - - - Custom - Personalizado - - - - Sho&w seconds - Mo&strar segundos - - - - Pad &hour with zero - Mostrar zero inicial nas &horas - - - - &Use 12-hour format - &Utilizar formato AM/PM - - - - T&ime zone - Fuso horár&io - - - - &Position: - &Posição: - - - - For&mat: - F&ormato: - - - - - Below - Abaixo - - - - - Above - Acima - - - - - Before - Antes - - - - - After - Depois - - - - Offset from UTC - Desvio da UTC - - - - Abbreviation - Abreviatura - - - - Location identifier - Identificador da localização - - - - - - Custom name - Nome personalizado - - - - &Date - &Data - - - - Po&sition: - Pos&ição: - - - - Fo&rmat: - Fo&rmato: - - - - ISO 8601 - ISO 8601 - - - - Show &year - Mostrar &ano - - - - Show day of wee&k - Mostrar dia da se&mana - - - - Pad d&ay with zero - Mostrar zero inicial nos di&as - - - - &Long month and day of week names - Mês &longo e nome do dia da semana - - - - Ad&vanced manual format - Formato a&vançado - - - - &Customise ... - &Personalizar... - - - - IANA id - ID IANA - - - - &Edit custom name ... - &Editar nome personalizado... - - - - &General - &Geral - - - - Auto&rotate when the panel is vertical - &Rodar automaticamente se o painel estiver na vertical - - - - '<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 - Escreva o nome do fuso horário personalizado - - - - LXQtWorldClockConfigurationManualFormat - - - World Clock Time Zones - Fusos horários do 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>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 (for example "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> -<p><br /><b>Note:</b> 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.</p> - - <h1>Sintaxe personalizada para datas e horas</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%">Código</th><th>Significado</th></tr> -<tr><td>d</td><td>o número do dia sem o zero inicial (1 a 31)</td></tr> -<tr><td>dd</td><td>o número do dia com o zero inicial (01 a 31)</td></tr> -<tr><td>ddd</td><td>o nome abrevidado do dia (Seg a Dom).</td></tr> -<tr><td>dddd</td><td>o nome completo do dia (Segunda a Domingo)</td></tr> -<tr><td>M</td><td>o número do mês sem o zero inicial (1 a 12)</td></tr> -<tr><td>MM</td><td>o número do mês com o zero inicial (01 a 12)</td></tr> -<tr><td>MMM</td><td>o nome abreviado do mês (Jan a Dez)</td></tr> -<tr><td>MMMM</td><td>o nome completo do mês (Janeiro a Dezembro)</td></tr> -<tr><td>yy</td><td>o ano na forma de dois dígitos (00 a 99)</td></tr> -<tr><td>yyyy</td><td>o ano na forma de quatro dígitos</td></tr> -<tr><td>h</td><td>a hora sem o zero inicial (0 a 23 ou 1 a 12 com AM/PM)</td></tr> -<tr><td>hh</td><td>a hora com o zero inicial (00 a 23 ou 01 a 12 com AM/PM)</td></tr> -<tr><td>H</td><td>a hora sem o zero inicial (0 a 23 mesmo se com AM/PM)</td></tr> -<tr><td>HH</td><td>a hora sem o zero inicial (00 a 23 mesmo se com AM/PM)</td></tr> -<tr><td>m</td><td>os minutos sem o zero inicial (0 a 59)</td></tr> -<tr><td>mm</td><td>os minutos com o zero inicial (00 a 59)</td></tr> -<tr><td>s</td><td>os segundos sem o zero inicial (0 a 59)</td></tr> -<tr><td>ss</td><td>os segundos com o zero inicial (00 a 59)</td></tr> -<tr><td>z</td><td>os milissegundos sem o zero inicial (0 a 999)</td></tr> -<tr><td>zzz</td><td>os milissegundos com o zero inicial (0 a 999)</td></tr> -<tr><td>AP <i>ou</i> A</td><td>para mostrar AM/PM. <b>A/AP</b> será substituido por "AM" ou "PM"<</td></tr> -<tr><td>ap <i>ou</i> a</td><td>para mostrar am/pm. <b>a/ap</b> será substituido 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 desvio da UTC</td></tr> -<tr><td>TT</td><td>o identificador IANA do fuso horário</td></tr> -<tr><td>TTT</td><td>a abreviatura do fuso horário</td></tr> -<tr><td>TTTT</td><td>o nome abreviado do fuso horário</td></tr> -<tr><td>TTTTT</td><td>o nome completo do fuso horário</td></tr> -<tr><td>TTTTTT</td><td>o nome personalizado do fuso horario. Pode mudar o nome no separador 'Fusos horários' da janela de configurações</td></tr></table> -<p><br /><b>Nota:</b> quaisquer caracteres do padrão que não estejam no intervalo ['a'..'z'] e ['A'..'Z'] serão tratados como texto entre aspas. Por exemplo, os caracteres ':', '.', ' ', '#' e '@' aparecerão na hora resultante do padrão mesmo se não estiverem entre aspas. A plica é utilizada para fazer o 'escape' das letras. Duas plicas seguidas numa linha, dentro ou fora de uma frase entre aspas representa uma plica 'real'.</p - - - - LXQtWorldClockConfigurationTimeZones - - - World Clock Time Zones - Fusos horários do relógio mundial - - - - Time zone - Fuso horário - - - - Name - Nome - - - - Comment - Comentário - - - - Country - País - - - - UTC - UTC - - - - - Other - Outro - - - - Local timezone - - - - diff --git a/plugin-worldclock/translations/worldclock_ru.ts b/plugin-worldclock/translations/worldclock_ru.ts deleted file mode 100644 index a0090a3..0000000 --- a/plugin-worldclock/translations/worldclock_ru.ts +++ /dev/null @@ -1,393 +0,0 @@ - - - - - LXQtWorldClock - - - '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - - - - - LXQtWorldClockConfiguration - - - World Clock Settings - Настройки мирового времени - - - &Short, time only - &Короткий, только время - - - &Long, time only - &Длинный, только время - - - S&hort, date && time - К&ороткий, дата и время - - - L&ong, date && time - Д&линный, дата и время - - - &Custom - &Свой - - - <html><head/><body><p><span style=" font-size:x-large; font-weight:600;">Custom Date/Time Format Syntax</span></p><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 &quot;:&quot; 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" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;" width="100%" cellspacing="0" cellpadding="4"><tr><td width="20%"><p align="center"><span style=" font-weight:600;">Code</span></p></td><td><p align="center"><span style=" font-weight:600;">Meaning</span></p></td></tr><tr><td><p>d</p></td><td><p>the day as number without a leading zero (1 to 31)</p></td></tr><tr><td><p>dd</p></td><td><p>the day as number with a leading zero (01 to 31)</p></td></tr><tr><td><p>ddd</p></td><td><p>the abbreviated localized day name (e.g. 'Mon' to 'Sun').</p></td></tr><tr><td><p>dddd</p></td><td><p>the long localized day name (e.g. 'Monday' to 'Sunday</p></td></tr><tr><td><p>M</p></td><td><p>the month as number without a leading zero (1-12)</p></td></tr><tr><td><p>MM</p></td><td><p>the month as number with a leading zero (01-12)</p></td></tr><tr><td><p>MMM</p></td><td><p>the abbreviated localized month name (e.g. 'Jan' to 'Dec').</p></td></tr><tr><td><p>MMMM</p></td><td><p>the long localized month name (e.g. 'January' to 'December').</p></td></tr><tr><td><p>yy</p></td><td><p>the year as two digit number (00-99)</p></td></tr><tr><td><p>yyyy</p></td><td><p>the year as four digit number</p></td></tr><tr><td><p>h</p></td><td><p>the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display)</p></td></tr><tr><td><p>hh</p></td><td><p>the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display)</p></td></tr><tr><td><p>H</p></td><td><p>the hour without a leading zero (0 to 23, even with AM/PM display)</p></td></tr><tr><td><p>HH</p></td><td><p>the hour with a leading zero (00 to 23, even with AM/PM display)</p></td></tr><tr><td><p>m</p></td><td><p>the minute without a leading zero (0 to 59)</p></td></tr><tr><td><p>mm</p></td><td><p>the minute with a leading zero (00 to 59)</p></td></tr><tr><td><p>s</p></td><td><p>the second without a leading zero (0 to 59)</p></td></tr><tr><td><p>ss</p></td><td><p>the second with a leading zero (00 to 59)</p></td></tr><tr><td><p>z</p></td><td><p>the milliseconds without leading zeroes (0 to 999)</p></td></tr><tr><td><p>zzz</p></td><td><p>the milliseconds with leading zeroes (000 to 999)</p></td></tr><tr><td><p>AP or A</p></td><td><p>use AM/PM display. <span style=" font-weight:600;">A/AP</span> will be replaced by either &quot;AM&quot; or &quot;PM&quot;.</p></td></tr><tr><td><p>ap or a</p></td><td><p>use am/pm display. <span style=" font-weight:600;">a/ap</span> will be replaced by either &quot;am&quot; or &quot;pm&quot;.</p></td></tr><tr><td><p>t</p></td><td><p>the timezone (for example &quot;CEST&quot;)</p></td></tr><tr><td><p>T</p></td><td><p>the offset from UTC</p></td></tr><tr><td><p>TT</p></td><td><p>the timezone IANA id</p></td></tr><tr><td><p>TTT</p></td><td><p>the timezone abbreviation</p></td></tr><tr><td><p>TTTT</p></td><td><p>the timezone short display name</p></td></tr><tr><td><p>TTTTT</p></td><td><p>the timezone long display name</p></td></tr></table><p><br/><span style=" font-weight:600;">Note:</span> 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.</p></body></html> - <html><head/><body><p><span style=" font-size:x-large; font-weight:600;">Синтаксис своего формата даты/времени</span></p><p>Шаблон даты — это строка символов, где специальные группы символов заменяются при форматировании на дату и время из календаря или используются для генерации даты при синтаксическом разборе.</p><p>Таблица символов полей даты ниже содержит символы, используемые в шаблонах для отображения подходящих форматов установленной локали, такой как yyyy для года. Символы могут быть использованы несколько раз. Например, если использован y для года, 'yy' отобразит '99', тогда как 'yyyy' покажет '1999'. Для большинства числовых полей число символов определяет ширину поля. Например, если h это час, 'h' отобразит '5', но 'hh' отобразит '05'. Для некоторых символов, это число определяет должно ли быть использовано сокращение или полная форма, но могут быть и другие варианты, как написано ниже.</p><p>Две одинарные кавычки отобразят одиночную кавычку, независимо от того внутренние они или внешние. Текст внутри одинарных кавычек никак не интерпретируется (за исключением двух смежных одинарных кавычек). Тогда как все символы ASCII от a до z и A до Z зарезервированы под символы синтаксиса, и требуют заключения в кавычки для отображения их как обычных символов. помимо прочего, некоторые знаки препинания ASCII могут стать переменными в будущем (т.е. &quot;:&quot; быть интерпретированы как разделитель компонентов времени и '/' как разделитель компонентов даты, и заменены при отображении соответствующими символами с учётом локали ).<br /></p><table border="1" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;" width="100%" cellspacing="0" cellpadding="4"><tr><td width="20%"><p align="center"><span style=" font-weight:600;">Код</span></p></td><td><p align="center"><span style=" font-weight:600;">Обозначения</span></p></td></tr><tr><td><p>d</p></td><td><p>день как число без первого нуля (от 1 до 31)</p></td></tr><tr><td><p>dd</p></td><td><p>день как число с первым нулём (от 01 до 31)</p></td></tr><tr><td><p>ddd</p></td><td><p>сокращённое локализованное название дня (т.е. от 'Пн' до 'Вс').</p></td></tr><tr><td><p>dddd</p></td><td><p>длинное локализованное название дня (т.е. от 'Понедельник' до 'Воскресенье'</p></td></tr><tr><td><p>M</p></td><td><p>месяц как число без первого нуля (1-12)</p></td></tr><tr><td><p>MM</td><td><p>месяц как число с первым нулём (01-12)</p></td></tr><tr><td><p>MMM</p></td><td><p>сокращённое локализованное название месяца (т.е. от 'Янв' до 'Дек').</p></td></tr><tr><td><p>MMMM</p></td><td><p>длинное локализованное название месяца (т.е. от 'Январь' до 'Декабрь').</p></td></tr><tr><td><p>yy</p></td><td><p>год как двухразрядное число (00-99)</p></td></tr><tr><td><p>yyyy</p></td><td><p>год как четырёхразрядное число</p></td></tr><tr><td><p>h</p></td><td><p>час без нуля впереди (от 0 до 23 или 1 до 12, если отображается AM/PM)</p></td></tr><tr><td><p>hh</p></td><td><p>час с нулём впереди (от 00 до 23 или 01 до 12, если отображается AM/PM)</p></td></tr><tr><td><p>H</p></td><td><p>час без нуля впереди (от 00 до 23, даже с отображением AM/PM)</p></td></tr><tr><td><p>HH</p></td><td><p>час с нулём впереди (от 00 до 23, даже с отображением AM/PM)</p></td></tr><tr><td>m</p></td><td><p>минута без нуля впереди (от 0 до 59)</p></td></tr><tr><td><p>mm</p></td><td><p>минута с нулём впереди (от 00 до 59)</p></td></tr><tr><td><p>s</td><td><p>секунда без нуля впереди (от 0 до 59)</p></td></tr><tr><td><p>ss</p></td><td><p>секунда с нулём впереди (от 00 до 59)</p></td></tr><tr><td><p>z</p></td><td><p>миллисекунда без нуля впереди (от 0 до 999)</p></td></tr><tr><td><p>zzz</p></td><td><p>миллисекунда с нулём впереди (от 000 до 999)</p></td></tr><tr><td><p>AP или A</p></td><td><p>использовать отображение AM/PM. <span style=" font-weight:600;">A/AP</span> будет замещено или &quot;AM&quot; или &quot;PM&quot;.</p></td></tr><tr><td><p>ap или a</p></td><td><p>использовать отображение am/pm. <span style=" font-weight:600;">a/ap</span> будет замещено или &quot;am&quot; или &quot;pm&quot;</p></td></tr><tr><td><p>t</p></td><td><p>часовой пояс (например &quot;CEST&quot;)</p></td></tr><tr><td><p>T</p></td><td><p>сдвиг времени от UTC</p></td></tr><tr><td>TT</p></td><td><p>id часового пояса IANA</p></td></tr><tr><td><p>TTT</p></td><td><p>аббревиатура часового пояса</p></td></tr><tr><td><p>TTTT</p></td><td><p>короткое имя часового пояса</p></td></tr><tr><td><p>TTTTT</p></td><td><p>длинное имя часового пояса</p></td></tr></table><p><br/><span style=" font-weight:600;">Замечание:</span> Любой символ в шаблоне не из диапазона ['a'..'z'] и ['A'..'Z'] будет обработан как цитируемый текст. Например, символы как ':', '.', ' ', '#' и '@' появятся в тексте со временем, даже если они не помещены в одинарные кавычки. Одинарные кавычки используются для управляющих символ. Две одинарные кавычки подряд, независимо от того внутри или снаружи цитируемой последовательности, представляет 'реальные' одинарные кавычки.</p></body></html> - - - - Time &zones - Часовые &пояса - - - - &Add ... - &Добавить… - - - - &Remove - &Удалить - - - - Set as &default - Установить &по-умолчанию - - - - Move &up - &Выше - - - - Move do&wn - &Ниже - - - - 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 - Сдвиг относительно UTC - - - - Abbreviation - Сокращение - - - - IANA id - - - - - - - Custom name - Своё имя - - - - &Use 12-hour format - &Использовать 12 часовой формат - - - - 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 ... - &Настроить ... - - - - &Edit custom name ... - &Изменить своё имя ... - - - - &General - &Общие - - - - Auto&rotate when the panel is vertical - Авто&поворот для вертикальной панели - - - - '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - - - - - Input custom time zone name - Введите своё имя для часового пояса - - - - LXQtWorldClockConfigurationManualFormat - - - World Clock Time Zones - Часовые пояса мирового времени - - - - <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>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 (for example "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> -<p><br /><b>Note:</b> 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.</p> - - <h1>Синтаксис своего формата даты/времени</h1> -<p>Шаблон даты — это строка символов, где специальные группы символов заменяются при форматировании на дату и время из календаря или используются для генерации даты при синтаксическом разборе.</p> -<p>Таблица символов полей даты ниже содержит символы, используемые в шаблонах для отображения подходящих форматов установленной локали, такой как yyyy для года. Символы могут быть использованы несколько раз. Например, если использован y для года, 'yy' отобразит '99', тогда как 'yyyy' покажет '1999'. Для большинства числовых полей число символов определяет ширину поля. Например, если h это час, 'h' отобразит '5', но 'hh' отобразит '05'. Для некоторых символов, это число определяет должно ли быть использовано сокращение или полная форма, но могут быть и другие варианты, как написано ниже.</p> -<p>Две одинарные кавычки отобразят одиночную кавычку, независимо от того внутренние они или внешние. Текст внутри одинарных кавычек никак не интерпретируется (за исключением двух смежных одинарных кавычек). Тогда как все символы ASCII от a до z и A до Z зарезервированы под символы синтаксиса, и требуют заключения в кавычки для отображения их как обычных символов. помимо прочего, некоторые знаки препинания ASCII могут стать переменными в будущем (т.е. &quot;:&quot; быть интерпретированы как разделитель компонентов времени и '/' как разделитель компонентов даты, и заменены при отображении соответствующими символами с учётом локали).<br /></p> -<table border="1" width="100%" cellpadding="4" cellspacing="0"> -<tr><th width="20%">Код</th><th>Обозначения</th></tr> -<tr><td>d</td></td><td>день как число без первого нуля (от 1 до 31)</td></tr> -<tr><td>dd</td><td>день как число с первым нулём (от 01 до 31)</td></tr> -<tr><td>ddd</p></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><p>год как двухразрядное число (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>час без нуля впереди (от 00 до 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> будет замещено на "AM" или "PM".<</td></tr> -<tr><td>ap <i>или</i> a</td><td>использовать отображение am/pm. <b>a/ap</b> будет замещено на "am" или "pm".<</td></tr> -<tr><td>t</td><td>часовой пояс (например "CEST")</td></tr> -<tr><td>T</td><td>сдвиг времени относительно UTC</td></tr> -<tr><td>TT</td><td>id часового пояса IANA</td></tr> -<tr><td>TTT</td><td>аббревиатура часового пояса</td></tr> -<tr><td>TTTT</td><td>короткое имя часового пояса</td></tr> -<tr><td>TTTTT</p></td><td><p>длинное имя часового пояса</td></tr> -<tr><td>TTTTTT</td><td>своё имя часового пояса. Вы можете изменить его во вкладке «Часовые пояса» окна настройки</td></tr></table> -<p><br /><b>Замечание:</b> Любые символы в шаблоне не из диапазона ['a'..'z'] и ['A'..'Z'] будут обработаны как цитируемый текст. Например, символы как ':', '.', ' ', '#' и '@' появятся в тексте со временем, даже если они не помещены в одинарные кавычки. Одинарные кавычки используются для управляющих символ. Две одинарные кавычки подряд, независимо от того внутри или снаружи цитируемой последовательности, представляет 'реальные' одинарные кавычки.</p> - - - - LXQtWorldClockConfigurationTimeZones - - - World Clock Time Zones - Часовые пояса мирового времени - - - - Time zone - Часовой пояс - - - - Name - Название - - - - Comment - Коментарий - - - - Country - Страна - - - - UTC - UTC - - - - - Other - Другое - - - - Local timezone - - - - diff --git a/plugin-worldclock/translations/worldclock_ru_RU.desktop b/plugin-worldclock/translations/worldclock_ru_RU.desktop deleted file mode 100644 index 0e8eaaa..0000000 --- a/plugin-worldclock/translations/worldclock_ru_RU.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name[ru_RU]=Мировое время -Comment[ru_RU]=Плагин мирового времени. - -#TRANSLATIONS_DIR=../translations diff --git a/plugin-worldclock/translations/worldclock_ru_RU.ts b/plugin-worldclock/translations/worldclock_ru_RU.ts deleted file mode 100644 index 6c34f92..0000000 --- a/plugin-worldclock/translations/worldclock_ru_RU.ts +++ /dev/null @@ -1,393 +0,0 @@ - - - - - LXQtWorldClock - - - '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - - - - - LXQtWorldClockConfiguration - - - World Clock Settings - Настройки мирового времени - - - &Short, time only - &Короткий, только время - - - &Long, time only - &Длинный, только время - - - S&hort, date && time - К&ороткий, дата и время - - - L&ong, date && time - Д&линный, дата и время - - - &Custom - &Свой - - - <html><head/><body><p><span style=" font-size:x-large; font-weight:600;">Custom Date/Time Format Syntax</span></p><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 &quot;:&quot; 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" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;" width="100%" cellspacing="0" cellpadding="4"><tr><td width="20%"><p align="center"><span style=" font-weight:600;">Code</span></p></td><td><p align="center"><span style=" font-weight:600;">Meaning</span></p></td></tr><tr><td><p>d</p></td><td><p>the day as number without a leading zero (1 to 31)</p></td></tr><tr><td><p>dd</p></td><td><p>the day as number with a leading zero (01 to 31)</p></td></tr><tr><td><p>ddd</p></td><td><p>the abbreviated localized day name (e.g. 'Mon' to 'Sun').</p></td></tr><tr><td><p>dddd</p></td><td><p>the long localized day name (e.g. 'Monday' to 'Sunday</p></td></tr><tr><td><p>M</p></td><td><p>the month as number without a leading zero (1-12)</p></td></tr><tr><td><p>MM</p></td><td><p>the month as number with a leading zero (01-12)</p></td></tr><tr><td><p>MMM</p></td><td><p>the abbreviated localized month name (e.g. 'Jan' to 'Dec').</p></td></tr><tr><td><p>MMMM</p></td><td><p>the long localized month name (e.g. 'January' to 'December').</p></td></tr><tr><td><p>yy</p></td><td><p>the year as two digit number (00-99)</p></td></tr><tr><td><p>yyyy</p></td><td><p>the year as four digit number</p></td></tr><tr><td><p>h</p></td><td><p>the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display)</p></td></tr><tr><td><p>hh</p></td><td><p>the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display)</p></td></tr><tr><td><p>H</p></td><td><p>the hour without a leading zero (0 to 23, even with AM/PM display)</p></td></tr><tr><td><p>HH</p></td><td><p>the hour with a leading zero (00 to 23, even with AM/PM display)</p></td></tr><tr><td><p>m</p></td><td><p>the minute without a leading zero (0 to 59)</p></td></tr><tr><td><p>mm</p></td><td><p>the minute with a leading zero (00 to 59)</p></td></tr><tr><td><p>s</p></td><td><p>the second without a leading zero (0 to 59)</p></td></tr><tr><td><p>ss</p></td><td><p>the second with a leading zero (00 to 59)</p></td></tr><tr><td><p>z</p></td><td><p>the milliseconds without leading zeroes (0 to 999)</p></td></tr><tr><td><p>zzz</p></td><td><p>the milliseconds with leading zeroes (000 to 999)</p></td></tr><tr><td><p>AP or A</p></td><td><p>use AM/PM display. <span style=" font-weight:600;">A/AP</span> will be replaced by either &quot;AM&quot; or &quot;PM&quot;.</p></td></tr><tr><td><p>ap or a</p></td><td><p>use am/pm display. <span style=" font-weight:600;">a/ap</span> will be replaced by either &quot;am&quot; or &quot;pm&quot;.</p></td></tr><tr><td><p>t</p></td><td><p>the timezone (for example &quot;CEST&quot;)</p></td></tr><tr><td><p>T</p></td><td><p>the offset from UTC</p></td></tr><tr><td><p>TT</p></td><td><p>the timezone IANA id</p></td></tr><tr><td><p>TTT</p></td><td><p>the timezone abbreviation</p></td></tr><tr><td><p>TTTT</p></td><td><p>the timezone short display name</p></td></tr><tr><td><p>TTTTT</p></td><td><p>the timezone long display name</p></td></tr></table><p><br/><span style=" font-weight:600;">Note:</span> 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.</p></body></html> - <html><head/><body><p><span style=" font-size:x-large; font-weight:600;">Синтаксис своего формата даты/времени</span></p><p>Шаблон даты — это строка символов, где специальные группы символов заменяются при форматировании на дату и время из календаря или используются для генерации даты при синтаксическом разборе.</p><p>Таблица символов полей даты ниже содержит символы, используемые в шаблонах для отображения подходящих форматов установленной локали, такой как yyyy для года. Символы могут быть использованы несколько раз. Например, если использован y для года, 'yy' отобразит '99', тогда как 'yyyy' покажет '1999'. Для большинства числовых полей число символов определяет ширину поля. Например, если h это час, 'h' отобразит '5', но 'hh' отобразит '05'. Для некоторых символов, это число определяет должно ли быть использовано сокращение или полная форма, но могут быть и другие варианты, как написано ниже.</p><p>Две одинарные кавычки отобразят одиночную кавычку, независимо от того внутренние они или внешние. Текст внутри одинарных кавычек никак не интерпретируется (за исключением двух смежных одинарных кавычек). Тогда как все символы ASCII от a до z и A до Z зарезервированы под символы синтаксиса, и требуют заключения в кавычки для отображения их как обычных символов. помимо прочего, некоторые знаки препинания ASCII могут стать переменными в будущем (т.е. &quot;:&quot; быть интерпретированы как разделитель компонентов времени и '/' как разделитель компонентов даты, и заменены при отображении соответствующими символами с учётом локали ).<br /></p><table border="1" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;" width="100%" cellspacing="0" cellpadding="4"><tr><td width="20%"><p align="center"><span style=" font-weight:600;">Код</span></p></td><td><p align="center"><span style=" font-weight:600;">Обозначения</span></p></td></tr><tr><td><p>d</p></td><td><p>день как число без первого нуля (от 1 до 31)</p></td></tr><tr><td><p>dd</p></td><td><p>день как число с первым нулём (от 01 до 31)</p></td></tr><tr><td><p>ddd</p></td><td><p>сокращённое локализованное название дня (т.е. от 'Пн' до 'Вс').</p></td></tr><tr><td><p>dddd</p></td><td><p>длинное локализованное название дня (т.е. от 'Понедельник' до 'Воскресенье'</p></td></tr><tr><td><p>M</p></td><td><p>месяц как число без первого нуля (1-12)</p></td></tr><tr><td><p>MM</td><td><p>месяц как число с первым нулём (01-12)</p></td></tr><tr><td><p>MMM</p></td><td><p>сокращённое локализованное название месяца (т.е. от 'Янв' до 'Дек').</p></td></tr><tr><td><p>MMMM</p></td><td><p>длинное локализованное название месяца (т.е. от 'Январь' до 'Декабрь').</p></td></tr><tr><td><p>yy</p></td><td><p>год как двухразрядное число (00-99)</p></td></tr><tr><td><p>yyyy</p></td><td><p>год как четырёхразрядное число</p></td></tr><tr><td><p>h</p></td><td><p>час без нуля впереди (от 0 до 23 или 1 до 12, если отображается AM/PM)</p></td></tr><tr><td><p>hh</p></td><td><p>час с нулём впереди (от 00 до 23 или 01 до 12, если отображается AM/PM)</p></td></tr><tr><td><p>H</p></td><td><p>час без нуля впереди (от 00 до 23, даже с отображением AM/PM)</p></td></tr><tr><td><p>HH</p></td><td><p>час с нулём впереди (от 00 до 23, даже с отображением AM/PM)</p></td></tr><tr><td>m</p></td><td><p>минута без нуля впереди (от 0 до 59)</p></td></tr><tr><td><p>mm</p></td><td><p>минута с нулём впереди (от 00 до 59)</p></td></tr><tr><td><p>s</td><td><p>секунда без нуля впереди (от 0 до 59)</p></td></tr><tr><td><p>ss</p></td><td><p>секунда с нулём впереди (от 00 до 59)</p></td></tr><tr><td><p>z</p></td><td><p>миллисекунда без нуля впереди (от 0 до 999)</p></td></tr><tr><td><p>zzz</p></td><td><p>миллисекунда с нулём впереди (от 000 до 999)</p></td></tr><tr><td><p>AP или A</p></td><td><p>использовать отображение AM/PM. <span style=" font-weight:600;">A/AP</span> будет замещено или &quot;AM&quot; или &quot;PM&quot;.</p></td></tr><tr><td><p>ap или a</p></td><td><p>использовать отображение am/pm. <span style=" font-weight:600;">a/ap</span> будет замещено или &quot;am&quot; или &quot;pm&quot;</p></td></tr><tr><td><p>t</p></td><td><p>часовой пояс (например &quot;CEST&quot;)</p></td></tr><tr><td><p>T</p></td><td><p>сдвиг времени от UTC</p></td></tr><tr><td>TT</p></td><td><p>id часового пояса IANA</p></td></tr><tr><td><p>TTT</p></td><td><p>аббревиатура часового пояса</p></td></tr><tr><td><p>TTTT</p></td><td><p>короткое имя часового пояса</p></td></tr><tr><td><p>TTTTT</p></td><td><p>длинное имя часового пояса</p></td></tr></table><p><br/><span style=" font-weight:600;">Замечание:</span> Любой символ в шаблоне не из диапазона ['a'..'z'] и ['A'..'Z'] будет обработан как цитируемый текст. Например, символы как ':', '.', ' ', '#' и '@' появятся в тексте со временем, даже если они не помещены в одинарные кавычки. Одинарные кавычки используются для управляющих символ. Две одинарные кавычки подряд, независимо от того внутри или снаружи цитируемой последовательности, представляет 'реальные' одинарные кавычки.</p></body></html> - - - - Time &zones - Часовые &пояса - - - - &Add ... - &Добавить… - - - - &Remove - &Удалить - - - - Set as &default - Установить &по-умолчанию - - - - Move &up - &Выше - - - - Move do&wn - &Ниже - - - - 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 - Сдвиг относительно UTC - - - - Abbreviation - Сокращение - - - - IANA id - - - - - - - Custom name - Своё имя - - - - &Use 12-hour format - &Использовать 12 часовой формат - - - - 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 ... - &Настроить ... - - - - &Edit custom name ... - &Изменить своё имя ... - - - - &General - &Общие - - - - Auto&rotate when the panel is vertical - Авто&поворот для вертикальной панели - - - - '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' - - - - - Input custom time zone name - Введите своё имя для часового пояса - - - - LXQtWorldClockConfigurationManualFormat - - - World Clock Time Zones - Часовые пояса мирового времени - - - - <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>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 (for example "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> -<p><br /><b>Note:</b> 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.</p> - - <h1>Синтаксис своего формата даты/времени</h1> -<p>Шаблон даты — это строка символов, где специальные группы символов заменяются при форматировании на дату и время из календаря или используются для генерации даты при синтаксическом разборе.</p> -<p>Таблица символов полей даты ниже содержит символы, используемые в шаблонах для отображения подходящих форматов установленной локали, такой как yyyy для года. Символы могут быть использованы несколько раз. Например, если использован y для года, 'yy' отобразит '99', тогда как 'yyyy' покажет '1999'. Для большинства числовых полей число символов определяет ширину поля. Например, если h это час, 'h' отобразит '5', но 'hh' отобразит '05'. Для некоторых символов, это число определяет должно ли быть использовано сокращение или полная форма, но могут быть и другие варианты, как написано ниже.</p> -<p>Две одинарные кавычки отобразят одиночную кавычку, независимо от того внутренние они или внешние. Текст внутри одинарных кавычек никак не интерпретируется (за исключением двух смежных одинарных кавычек). Тогда как все символы ASCII от a до z и A до Z зарезервированы под символы синтаксиса, и требуют заключения в кавычки для отображения их как обычных символов. помимо прочего, некоторые знаки препинания ASCII могут стать переменными в будущем (т.е. &quot;:&quot; быть интерпретированы как разделитель компонентов времени и '/' как разделитель компонентов даты, и заменены при отображении соответствующими символами с учётом локали).<br /></p> -<table border="1" width="100%" cellpadding="4" cellspacing="0"> -<tr><th width="20%">Код</th><th>Обозначения</th></tr> -<tr><td>d</td></td><td>день как число без первого нуля (от 1 до 31)</td></tr> -<tr><td>dd</td><td>день как число с первым нулём (от 01 до 31)</td></tr> -<tr><td>ddd</p></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><p>год как двухразрядное число (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>час без нуля впереди (от 00 до 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> будет замещено на "AM" или "PM".<</td></tr> -<tr><td>ap <i>или</i> a</td><td>использовать отображение am/pm. <b>a/ap</b> будет замещено на "am" или "pm".<</td></tr> -<tr><td>t</td><td>часовой пояс (например "CEST")</td></tr> -<tr><td>T</td><td>сдвиг времени относительно UTC</td></tr> -<tr><td>TT</td><td>id часового пояса IANA</td></tr> -<tr><td>TTT</td><td>аббревиатура часового пояса</td></tr> -<tr><td>TTTT</td><td>короткое имя часового пояса</td></tr> -<tr><td>TTTTT</p></td><td><p>длинное имя часового пояса</td></tr> -<tr><td>TTTTTT</td><td>своё имя часового пояса. Вы можете изменить его во вкладке «Часовые пояса» окна настройки</td></tr></table> -<p><br /><b>Замечание:</b> Любые символы в шаблоне не из диапазона ['a'..'z'] и ['A'..'Z'] будут обработаны как цитируемый текст. Например, символы как ':', '.', ' ', '#' и '@' появятся в тексте со временем, даже если они не помещены в одинарные кавычки. Одинарные кавычки используются для управляющих символ. Две одинарные кавычки подряд, независимо от того внутри или снаружи цитируемой последовательности, представляет 'реальные' одинарные кавычки.</p> - - - - LXQtWorldClockConfigurationTimeZones - - - World Clock Time Zones - Часовые пояса мирового времени - - - - Time zone - Часовой пояс - - - - Name - Название - - - - Comment - Коментарий - - - - Country - Страна - - - - UTC - UTC - - - - - Other - Другое - - - - Local timezone - - - -