From 612ee246bf278cc6082ccb98763728a9358fd174 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Mon, 2 Jan 2017 18:13:24 +0100 Subject: [PATCH] Cherry-picking upstream release 0.11.0 (Closes: #821382). * Removed some build dependencies: - cmake - libqt5xdg-dev - libqt5xdgiconloader-dev - pkg-config - qttools5-dev - qttools5-dev-tools * Bumped some build dependencies: - liblxqt0-dev (>= 0.11.1) - liblxqt-globalkeys0-dev (>= 0.11.1) - liblxqt-globalkeys-ui0-dev (>= 0.11.1) - libsysstat-qt5-0-dev (>= 0.3.3) * Fixed VCS-Git, pointing to the right branch * Bumped years in d/copyright --- .gitignore | 4 - CHANGELOG | 23 ++- CMakeLists.txt | 10 - README.md | 2 +- debian/changelog | 20 ++ debian/control | 18 +- debian/copyright | 4 +- debian/rules | 8 +- panel/config/configpanelwidget.cpp | 4 + panel/config/configpanelwidget.h | 1 + panel/config/configpanelwidget.ui | 193 +++++++++--------- panel/lxqtpanel.cpp | 25 ++- panel/lxqtpanel.h | 8 + panel/lxqtpanellimits.h | 2 + panel/plugin.cpp | 2 +- panel/translations/.gitignore | 0 plugin-clock/translations/clock_da.desktop | 6 +- plugin-clock/translations/clock_da_DK.desktop | 12 -- plugin-clock/translations/clock_fr.desktop | 3 + plugin-clock/translations/clock_fr_FR.desktop | 12 -- .../translations/colorpicker_da.desktop | 4 +- .../translations/colorpicker_da_DK.desktop | 10 - .../translations/colorpicker_fr.desktop | 2 + .../translations/cpuload_da.desktop | 9 +- .../translations/cpuload_da_DK.desktop | 14 -- .../translations/cpuload_fr.desktop | 2 + plugin-desktopswitch/desktopswitchbutton.cpp | 6 + plugin-desktopswitch/desktopswitchbutton.h | 3 +- .../desktopswitchconfiguration.ui | 5 + .../translations/desktopswitch_da.desktop | 4 +- .../translations/desktopswitch_da_DK.desktop | 12 -- .../translations/desktopswitch_fr.desktop | 3 + .../translations/desktopswitch_fr_FR.desktop | 12 -- .../translations/directorymenu_da.desktop | 12 ++ .../translations/directorymenu_fr.desktop | 2 + .../translations/directorymenu_pt.desktop | 3 + plugin-dom/translations/dom_da.desktop | 12 ++ plugin-dom/translations/dom_fr.desktop | 2 + plugin-kbindicator/CMakeLists.txt | 45 ++-- plugin-kbindicator/kbindicator-plugin.cpp | 11 +- .../translations/kbindicator_da.desktop | 12 ++ .../translations/kbindicator_fr.desktop | 2 + plugin-mainmenu/CMakeLists.txt | 24 +-- .../translations/mainmenu_da.desktop | 4 +- .../translations/mainmenu_da_DK.desktop | 12 -- .../translations/mainmenu_fr.desktop | 3 + .../translations/mainmenu_fr_FR.desktop | 12 -- plugin-mount/translations/mount_da.desktop | 6 +- plugin-mount/translations/mount_da_DK.desktop | 12 -- plugin-mount/translations/mount_fr.desktop | 3 + plugin-mount/translations/mount_fr_FR.desktop | 12 -- .../translations/networkmonitor_da.desktop | 8 +- .../translations/networkmonitor_fr.desktop | 4 +- .../translations/quicklaunch_da.desktop | 6 +- .../translations/quicklaunch_da_DK.desktop | 12 -- .../translations/quicklaunch_fr.desktop | 3 + .../translations/quicklaunch_fr_FR.desktop | 12 -- .../translations/sensors_da.desktop | 4 +- .../translations/sensors_da_DK.desktop | 10 - .../translations/sensors_fr.desktop | 3 + .../translations/sensors_fr_FR.desktop | 10 - plugin-showdesktop/CMakeLists.txt | 1 - plugin-showdesktop/showdesktop.cpp | 4 - .../translations/showdesktop_da.desktop | 6 +- .../translations/showdesktop_da_DK.desktop | 12 -- .../translations/showdesktop_fr.desktop | 3 + .../translations/showdesktop_fr_FR.desktop | 12 -- plugin-spacer/translations/spacer_da.desktop | 12 ++ plugin-spacer/translations/spacer_fr.desktop | 2 + plugin-spacer/translations/spacer_pt.desktop | 3 + .../translations/statusnotifier_da.desktop | 10 + .../translations/statusnotifier_fr.desktop | 2 + .../translations/statusnotifier_pt.desktop | 3 + .../translations/sysstat_da.desktop | 12 ++ .../translations/sysstat_fr.desktop | 2 + plugin-taskbar/lxqttaskbar.cpp | 10 +- plugin-taskbar/lxqttaskbar.h | 1 + plugin-taskbar/lxqttaskbarconfiguration.cpp | 3 + plugin-taskbar/lxqttaskbarconfiguration.ui | 24 ++- plugin-taskbar/lxqttaskgroup.cpp | 19 +- plugin-taskbar/lxqttaskgroup.h | 1 + .../translations/taskbar_da.desktop | 6 +- .../translations/taskbar_da_DK.desktop | 12 -- .../translations/taskbar_fr.desktop | 3 + .../translations/taskbar_fr_FR.desktop | 12 -- plugin-tray/CMakeLists.txt | 5 +- plugin-tray/lxqttrayplugin.h | 7 + plugin-tray/translations/tray_da.desktop | 4 +- plugin-tray/translations/tray_da_DK.desktop | 12 -- plugin-tray/translations/tray_fr.desktop | 3 + plugin-tray/translations/tray_fr_FR.desktop | 12 -- plugin-volume/translations/volume_da.desktop | 4 +- .../translations/volume_da_DK.desktop | 12 -- plugin-volume/translations/volume_fr.desktop | 2 + plugin-volume/translations/volume_pt.desktop | 8 - .../translations/worldclock_da.desktop | 12 ++ .../translations/worldclock_fr.desktop | 2 + 97 files changed, 470 insertions(+), 492 deletions(-) delete mode 100644 .gitignore delete mode 100644 panel/translations/.gitignore delete mode 100644 plugin-clock/translations/clock_da_DK.desktop create mode 100644 plugin-clock/translations/clock_fr.desktop delete mode 100644 plugin-clock/translations/clock_fr_FR.desktop delete mode 100644 plugin-colorpicker/translations/colorpicker_da_DK.desktop create mode 100644 plugin-colorpicker/translations/colorpicker_fr.desktop delete mode 100644 plugin-cpuload/translations/cpuload_da_DK.desktop create mode 100644 plugin-cpuload/translations/cpuload_fr.desktop delete mode 100644 plugin-desktopswitch/translations/desktopswitch_da_DK.desktop create mode 100644 plugin-desktopswitch/translations/desktopswitch_fr.desktop delete mode 100644 plugin-desktopswitch/translations/desktopswitch_fr_FR.desktop create mode 100644 plugin-directorymenu/translations/directorymenu_da.desktop create mode 100644 plugin-directorymenu/translations/directorymenu_fr.desktop create mode 100644 plugin-directorymenu/translations/directorymenu_pt.desktop create mode 100644 plugin-dom/translations/dom_da.desktop create mode 100644 plugin-dom/translations/dom_fr.desktop create mode 100644 plugin-kbindicator/translations/kbindicator_da.desktop create mode 100644 plugin-kbindicator/translations/kbindicator_fr.desktop delete mode 100644 plugin-mainmenu/translations/mainmenu_da_DK.desktop create mode 100644 plugin-mainmenu/translations/mainmenu_fr.desktop delete mode 100644 plugin-mainmenu/translations/mainmenu_fr_FR.desktop delete mode 100644 plugin-mount/translations/mount_da_DK.desktop create mode 100644 plugin-mount/translations/mount_fr.desktop delete mode 100644 plugin-mount/translations/mount_fr_FR.desktop delete mode 100644 plugin-quicklaunch/translations/quicklaunch_da_DK.desktop create mode 100644 plugin-quicklaunch/translations/quicklaunch_fr.desktop delete mode 100644 plugin-quicklaunch/translations/quicklaunch_fr_FR.desktop delete mode 100644 plugin-sensors/translations/sensors_da_DK.desktop create mode 100644 plugin-sensors/translations/sensors_fr.desktop delete mode 100644 plugin-sensors/translations/sensors_fr_FR.desktop delete mode 100644 plugin-showdesktop/translations/showdesktop_da_DK.desktop create mode 100644 plugin-showdesktop/translations/showdesktop_fr.desktop delete mode 100644 plugin-showdesktop/translations/showdesktop_fr_FR.desktop create mode 100644 plugin-spacer/translations/spacer_da.desktop create mode 100644 plugin-spacer/translations/spacer_fr.desktop create mode 100644 plugin-spacer/translations/spacer_pt.desktop create mode 100644 plugin-statusnotifier/translations/statusnotifier_da.desktop create mode 100644 plugin-statusnotifier/translations/statusnotifier_fr.desktop create mode 100644 plugin-statusnotifier/translations/statusnotifier_pt.desktop create mode 100644 plugin-sysstat/translations/sysstat_da.desktop create mode 100644 plugin-sysstat/translations/sysstat_fr.desktop delete mode 100644 plugin-taskbar/translations/taskbar_da_DK.desktop create mode 100644 plugin-taskbar/translations/taskbar_fr.desktop delete mode 100644 plugin-taskbar/translations/taskbar_fr_FR.desktop delete mode 100644 plugin-tray/translations/tray_da_DK.desktop create mode 100644 plugin-tray/translations/tray_fr.desktop delete mode 100644 plugin-tray/translations/tray_fr_FR.desktop delete mode 100644 plugin-volume/translations/volume_da_DK.desktop create mode 100644 plugin-volume/translations/volume_fr.desktop create mode 100644 plugin-worldclock/translations/worldclock_da.desktop create mode 100644 plugin-worldclock/translations/worldclock_fr.desktop diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 26e08cf..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -build -*.kdev4 -CMakeLists.txt.user -*/translations/lxqt-panel diff --git a/CHANGELOG b/CHANGELOG index b7adcde..385a068 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,28 @@ -lxqt-panel-0.11.0 / 2016-09-24 +lxqt-panel-0.11.1 / 2017-01-01 ============================== + * Show Auto-Hiding Panels with Delay (#387) + * Enabling testing on weston (#380) + * Update *da.desktop files + * plugin-showdesktop: Cleanup left behind XCB artifacts + * plugin-kbindicator: Use FindXCB CMake module + * plugin-tray: Use the FindXCB CMake module + * Use the new lxqt-build-tools CMake modules (FindMenuCache) + * plugin-desktopswitch: Add LABEL_TYPE_NONE + * Add/Update Portugese translations + * taskbar: Add "cycle on wheel" configuration + * taskbar: Forward wheelEvent + * Add/Update french desktop entries + * taskbar: Set toolButtonStyle for popup correctly + * Fix faulty link in README.md + * Remove arbitrary limit of taskbar button width + * Remove cpack (#371) + +0.11.0 / 2016-09-24 +=================== + + * Release 0.11.0: Add changelog * Update README.md: Reflect changes introduced in 1c22479 * CMakeLists: Fail for unmet dependencies * mainmenu: Remove setting base style in StyleChange diff --git a/CMakeLists.txt b/CMakeLists.txt index f693f58..55e10f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -266,13 +266,3 @@ endforeach() message(STATUS "*********************************************************************") add_subdirectory(panel) - -# building tarball with CPack ------------------------------------------------- -include(InstallRequiredSystemLibraries) -set(CPACK_PACKAGE_VERSION_MAJOR ${LXQT_MAJOR_VERSION}) -set(CPACK_PACKAGE_VERSION_MINOR ${LXQT_MINOR_VERSION}) -set(CPACK_PACKAGE_VERSION_PATCH ${LXQT_PATCH_VERSION}) -set(CPACK_GENERATOR TBZ2) -set(CPACK_SOURCE_GENERATOR TBZ2) -set(CPACK_SOURCE_IGNORE_FILES /build/;.gitignore;.*~;.git;.kdev4;temp) -include(CPack) diff --git a/README.md b/README.md index 88d2626..9b2d156 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ `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. +Configuration dialogue "Add Plugins", see [below](https://github.com/lxde/lxqt-panel#customizing), is listing all available plugins plus a short description and hence provides an overview of the available ones. Notes on some of the plugins, sorted by terms used within the GUI in alphabetical order, technical term in parenthesis: #### Date & time (plugin-clock) / World clock (plugin-worldclock) diff --git a/debian/changelog b/debian/changelog index e18fd69..7690a85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +lxqt-panel (0.11.1-1) unstable; urgency=medium + + * Cherry-picking upstream release 0.11.0 (Closes: #821382). + * Removed some build dependencies: + - cmake + - libqt5xdg-dev + - libqt5xdgiconloader-dev + - pkg-config + - qttools5-dev + - qttools5-dev-tools + * Bumped some build dependencies: + - liblxqt0-dev (>= 0.11.1) + - liblxqt-globalkeys0-dev (>= 0.11.1) + - liblxqt-globalkeys-ui0-dev (>= 0.11.1) + - libsysstat-qt5-0-dev (>= 0.3.3) + * Fixed VCS-Git, pointing to the right branch + * Bumped years in d/copyright + + -- Alf Gaida Mon, 02 Jan 2017 18:12:54 +0100 + lxqt-panel (0.11.0-2) unstable; urgency=medium * Cherry-picking upstream release 0.11.0. diff --git a/debian/control b/debian/control index 22692f9..92e438c 100644 --- a/debian/control +++ b/debian/control @@ -6,25 +6,22 @@ Uploaders: Alf Gaida , Section: x11 Priority: optional Build-Depends: debhelper (>= 10), - cmake (>= 3.0.2), libasound2-dev, libdbusmenu-qt5-dev, libglib2.0-dev, libicu-dev, libkf5windowsystem-dev, libkf5solid-dev, - liblxqt0-dev (>= 0.11.0), - liblxqt-globalkeys0-dev (>= 0.11.0), - liblxqt-globalkeys-ui0-dev (>= 0.11.0), + liblxqt0-dev (>= 0.11.1), + liblxqt-globalkeys0-dev (>= 0.11.1), + liblxqt-globalkeys-ui0-dev (>= 0.11.1), libmenu-cache-dev, libpulse-dev, libqt5svg5-dev, libqt5x11extras5-dev, - libqt5xdg-dev (>= 2.0.0), - libqt5xdgiconloader-dev (>= 2.0.0), libsensors4-dev [!hurd-any], libstatgrab-dev [linux-any], - libsysstat-qt5-0-dev (>= 0.3.2), + libsysstat-qt5-0-dev (>= 0.3.3), libx11-dev, libxcomposite-dev, libxcb-util0-dev, @@ -33,13 +30,10 @@ Build-Depends: debhelper (>= 10), libxdamage-dev, libxkbcommon-dev, libxkbcommon-x11-dev, - libxrender-dev, - pkg-config, - qttools5-dev, - qttools5-dev-tools + libxrender-dev 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 +Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-panel.git -b debian/sid Homepage: https://github.com/lxde/lxqt-panel Package: lxqt-panel diff --git a/debian/copyright b/debian/copyright index ef5bb1b..54edd8a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,12 +3,12 @@ Upstream-Name: lxqt-panel Source: https://github.com/lxde/lxqt-panel Files: * -Copyright: 2012-2016 LXQt team +Copyright: 2012-2017 LXQt team 2010-2012 Razor team License: LGPL-2.1+ Files: debian/* -Copyright: 2014-2016 Alf Gaida +Copyright: 2014-2017 Alf Gaida 2015 Andrew Lee (李健秋) License: LGPL-2.1+ diff --git a/debian/rules b/debian/rules index 3371b17..e111589 100755 --- a/debian/rules +++ b/debian/rules @@ -20,8 +20,8 @@ endif override_dh_auto_configure: dh_auto_configure --\ - -DPULL_TRANSLATIONS=OFF\ - -DUPDATE_TRANSLATIONS=OFF\ - -DDOM_PLUGIN=YES\ - -DCMAKE_BUILD_TYPE=RelWithDebInfo\ + -DPULL_TRANSLATIONS=OFF \ + -DUPDATE_TRANSLATIONS=OFF \ + -DDOM_PLUGIN=YES \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ $(NOT_LINUX) diff --git a/panel/config/configpanelwidget.cpp b/panel/config/configpanelwidget.cpp index 4b67dfe..e41425c 100644 --- a/panel/config/configpanelwidget.cpp +++ b/panel/config/configpanelwidget.cpp @@ -76,6 +76,7 @@ ConfigPanelWidget::ConfigPanelWidget(LXQtPanel *panel, QWidget *parent) : mOldHidable = mPanel->hidable(); mOldAnimation = mPanel->animationTime(); + mOldShowDelay = mPanel->showDelay(); ui->spinBox_panelSize->setMinimum(PANEL_MINIMUM_SIZE); ui->spinBox_panelSize->setMaximum(PANEL_MAXIMUM_SIZE); @@ -101,6 +102,7 @@ ConfigPanelWidget::ConfigPanelWidget(LXQtPanel *panel, QWidget *parent) : connect(ui->comboBox_position, SIGNAL(activated(int)), this, SLOT(positionChanged())); connect(ui->checkBox_hidable, SIGNAL(toggled(bool)), this, SLOT(editChanged())); connect(ui->spinBox_animation, SIGNAL(valueChanged(int)), this, SLOT(editChanged())); + connect(ui->spinBox_delay, SIGNAL(valueChanged(int)), this, SLOT(editChanged())); connect(ui->checkBox_customFontColor, SIGNAL(toggled(bool)), this, SLOT(editChanged())); connect(ui->pushButton_customFontColor, SIGNAL(clicked(bool)), this, SLOT(pickFontColor())); @@ -127,6 +129,7 @@ void ConfigPanelWidget::reset() ui->checkBox_hidable->setChecked(mOldHidable); ui->spinBox_animation->setValue(mOldAnimation); + ui->spinBox_delay->setValue(mOldShowDelay); fillComboBox_alignment(); ui->comboBox_alignment->setCurrentIndex(mOldAlignment + 1); @@ -261,6 +264,7 @@ void ConfigPanelWidget::editChanged() mPanel->setPosition(mScreenNum, mPosition, true); mPanel->setHidable(ui->checkBox_hidable->isChecked(), true); mPanel->setAnimationTime(ui->spinBox_animation->value(), true); + mPanel->setShowDelay(ui->spinBox_delay->value(), true); mPanel->setFontColor(ui->checkBox_customFontColor->isChecked() ? mFontColor : QColor(), true); if (ui->checkBox_customBgColor->isChecked()) diff --git a/panel/config/configpanelwidget.h b/panel/config/configpanelwidget.h index 1034827..c2a576b 100644 --- a/panel/config/configpanelwidget.h +++ b/panel/config/configpanelwidget.h @@ -90,6 +90,7 @@ private: ILXQtPanel::Position mOldPosition; bool mOldHidable; int mOldAnimation; + int mOldShowDelay; int mOldScreenNum; QColor mOldFontColor; QColor mOldBackgroundColor; diff --git a/panel/config/configpanelwidget.ui b/panel/config/configpanelwidget.ui index 1816287..f0517a9 100644 --- a/panel/config/configpanelwidget.ui +++ b/panel/config/configpanelwidget.ui @@ -201,59 +201,7 @@ Alignment && position - - - - - - 0 - 0 - - - - Auto-hide - - - - - - - false - - - Zero means no animation - - - ms - - - 500 - - - 50 - - - - - - - Position: - - - - - - - false - - - Zero means no animation - - - Animation duration: - - - + @@ -261,20 +209,7 @@ - - - - Qt::Horizontal - - - - 5 - 5 - - - - - + 1 @@ -296,9 +231,99 @@ - + + + + Position: + + + + + + + + true + + + A&uto-hide + + + true + + + false + + + + + + Zero means no animation + + + Animation duration: + + + + + + + Qt::Horizontal + + + + 102 + 5 + + + + + + + + Zero means no animation + + + ms + + + 500 + + + 50 + + + + + + + Zero means no delay + + + Show with delay: + + + + + + + Zero means no delay + + + ms + + + 2000 + + + 50 + + + + + + @@ -636,37 +661,5 @@ - - 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/lxqtpanel.cpp b/panel/lxqtpanel.cpp index a9d6fb1..6edfe6c 100644 --- a/panel/lxqtpanel.cpp +++ b/panel/lxqtpanel.cpp @@ -46,6 +46,7 @@ #include #include #include +#include #include #include @@ -74,6 +75,7 @@ #define CFG_KEY_PLUGINS "plugins" #define CFG_KEY_HIDABLE "hidable" #define CFG_KEY_ANIMATION "animation-duration" +#define CFG_KEY_SHOW_DELAY "show-delay" #define CFG_KEY_LOCKPANEL "lockPanel" /************************************************ @@ -189,6 +191,10 @@ LXQtPanel::LXQtPanel(const QString &configGroup, LXQt::Settings *settings, QWidg mHideTimer.setInterval(PANEL_HIDE_DELAY); connect(&mHideTimer, SIGNAL(timeout()), this, SLOT(hidePanelWork())); + mShowDelayTimer.setSingleShot(true); + mShowDelayTimer.setInterval(PANEL_SHOW_DELAY); + connect(&mShowDelayTimer, &QTimer::timeout, [this] { showPanel(mAnimationTime > 0); }); + connect(QApplication::desktop(), &QDesktopWidget::resized, this, &LXQtPanel::ensureVisible); connect(QApplication::desktop(), &QDesktopWidget::screenCountChanged, this, &LXQtPanel::ensureVisible); @@ -234,6 +240,7 @@ void LXQtPanel::readSettings() mHidden = mHidable; mAnimationTime = mSettings->value(CFG_KEY_ANIMATION, mAnimationTime).toInt(); + mShowDelayTimer.setInterval(mSettings->value(CFG_KEY_SHOW_DELAY, mShowDelayTimer.interval()).toInt()); // By default we are using size & count from theme. setPanelSize(mSettings->value(CFG_KEY_PANELSIZE, PANEL_DEFAULT_SIZE).toInt(), false); @@ -306,6 +313,7 @@ void LXQtPanel::saveSettings(bool later) mSettings->setValue(CFG_KEY_HIDABLE, mHidable); mSettings->setValue(CFG_KEY_ANIMATION, mAnimationTime); + mSettings->setValue(CFG_KEY_SHOW_DELAY, mShowDelayTimer.interval()); mSettings->setValue(CFG_KEY_LOCKPANEL, mLockPanel); @@ -984,14 +992,16 @@ bool LXQtPanel::event(QEvent *event) break; } case QEvent::DragEnter: - event->ignore(); + dynamic_cast(event)->setDropAction(Qt::IgnoreAction); + event->accept(); //no break intentionally case QEvent::Enter: - showPanel(mAnimationTime > 0); + mShowDelayTimer.start(); break; case QEvent::Leave: case QEvent::DragLeave: + mShowDelayTimer.stop(); hidePanel(); break; @@ -1286,6 +1296,17 @@ void LXQtPanel::setAnimationTime(int animationTime, bool save) saveSettings(true); } +void LXQtPanel::setShowDelay(int showDelay, bool save) +{ + if (mShowDelayTimer.interval() == showDelay) + return; + + mShowDelayTimer.setInterval(showDelay); + + 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 d086ad2..f944622 100644 --- a/panel/lxqtpanel.h +++ b/panel/lxqtpanel.h @@ -220,6 +220,7 @@ public: int opacity() const { return mOpacity; } bool hidable() const { return mHidable; } int animationTime() const { return mAnimationTime; } + int showDelay() const { return mShowDelayTimer.interval(); } /*! * \brief Checks if a given Plugin is running and has the @@ -295,6 +296,7 @@ public slots: void setOpacity(int opacity, bool save); //!< \sa setPanelSize() void setHidable(bool hidable, bool save); //!< \sa setPanelSize() void setAnimationTime(int animationTime, bool save); //!< \sa setPanelSize() + void setShowDelay(int showDelay, bool save); //!< \sa setPanelSize() /** * @brief Saves the current configuration, i.e. writes the current @@ -619,6 +621,12 @@ private: * \sa mHidden, mHideTimer, showPanel(), hidePanel(), hidePanelWork() */ int mAnimationTime; + /** + * @brief The timer used for showing an auto-hiding panel wih delay. + * + * \sa showPanel() + */ + QTimer mShowDelayTimer; QColor mFontColor; //!< Font color that is used in the style sheet. QColor mBackgroundColor; //!< Background color that is used in the style sheet. diff --git a/panel/lxqtpanellimits.h b/panel/lxqtpanellimits.h index e819138..b0ab3a5 100644 --- a/panel/lxqtpanellimits.h +++ b/panel/lxqtpanellimits.h @@ -41,5 +41,7 @@ #define PANEL_HIDE_DELAY 500 #define PANEL_HIDE_FIRST_TIME (5000 - PANEL_HIDE_DELAY) +#define PANEL_SHOW_DELAY 0 + #define SETTINGS_SAVE_DELAY 3000 #endif // LXQTPANELLIMITS_H diff --git a/panel/plugin.cpp b/panel/plugin.cpp index b606b7c..e98d330 100644 --- a/panel/plugin.cpp +++ b/panel/plugin.cpp @@ -259,7 +259,7 @@ bool Plugin::loadLib(ILXQtPanelPluginLibrary const * pluginLib) mPlugin = pluginLib->instance(startupInfo); if (!mPlugin) { - qWarning() << QString("Can't load plugin \"%1\". Plugin can't build ILXQtPanelPlugin.").arg(mPluginLoader->fileName()); + qWarning() << QString("Can't load plugin \"%1\". Plugin can't build ILXQtPanelPlugin.").arg(mDesktopFile.id()); return false; } diff --git a/panel/translations/.gitignore b/panel/translations/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/plugin-clock/translations/clock_da.desktop b/plugin-clock/translations/clock_da.desktop index 79b90c0..4aa5ecd 100644 --- a/plugin-clock/translations/clock_da.desktop +++ b/plugin-clock/translations/clock_da.desktop @@ -3,10 +3,10 @@ Type=Service ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. +Icon=preferences-system-time #TRANSLATIONS_DIR=../translations - # Translations -Comment[da]=Ur og kalender -Name[da]=Ur +Name[da]=Dato og klokkeslæt +Comment[da]=Viser den aktuelle tid. Der følger en kalender med. diff --git a/plugin-clock/translations/clock_da_DK.desktop b/plugin-clock/translations/clock_da_DK.desktop deleted file mode 100644 index a19c078..0000000 --- a/plugin-clock/translations/clock_da_DK.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[da_DK]=Ur og kalender -Name[da_DK]=Ur diff --git a/plugin-clock/translations/clock_fr.desktop b/plugin-clock/translations/clock_fr.desktop new file mode 100644 index 0000000..1035f7b --- /dev/null +++ b/plugin-clock/translations/clock_fr.desktop @@ -0,0 +1,3 @@ +# Translations +Comment[fr]=Horloge et calendrier +Name[fr]=Horloge diff --git a/plugin-clock/translations/clock_fr_FR.desktop b/plugin-clock/translations/clock_fr_FR.desktop deleted file mode 100644 index 7b81418..0000000 --- a/plugin-clock/translations/clock_fr_FR.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[fr_FR]=Horloge et calendrier -Name[fr_FR]=Horloge diff --git a/plugin-colorpicker/translations/colorpicker_da.desktop b/plugin-colorpicker/translations/colorpicker_da.desktop index 6519984..ba55070 100644 --- a/plugin-colorpicker/translations/colorpicker_da.desktop +++ b/plugin-colorpicker/translations/colorpicker_da.desktop @@ -3,8 +3,10 @@ Type=Service ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. +Icon=color-picker +#TRANSLATIONS_DIR=../translations # Translations -Comment[da]=Find farven under musemarkøren. For webudviklere. Name[da]=Farvevælger +Comment[da]=Få farven under markøren. Til webudviklere. diff --git a/plugin-colorpicker/translations/colorpicker_da_DK.desktop b/plugin-colorpicker/translations/colorpicker_da_DK.desktop deleted file mode 100644 index dc9efbb..0000000 --- a/plugin-colorpicker/translations/colorpicker_da_DK.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[da_DK]=Find farven under musemarkøren. For webudviklere. -Name[da_DK]=Farvevælger diff --git a/plugin-colorpicker/translations/colorpicker_fr.desktop b/plugin-colorpicker/translations/colorpicker_fr.desktop new file mode 100644 index 0000000..02e53b3 --- /dev/null +++ b/plugin-colorpicker/translations/colorpicker_fr.desktop @@ -0,0 +1,2 @@ +Name[fr]=Sélecteur de couleur +Comment[fr]=Sélectionne la couleur existant sous le curseur. diff --git a/plugin-cpuload/translations/cpuload_da.desktop b/plugin-cpuload/translations/cpuload_da.desktop index 6ed5159..6c0f7e7 100644 --- a/plugin-cpuload/translations/cpuload_da.desktop +++ b/plugin-cpuload/translations/cpuload_da.desktop @@ -1,13 +1,12 @@ [Desktop Entry] Type=Service ServiceTypes=LXQtPanel/Plugin - Name=Cpu monitor Comment=Displays the current CPU load. +Icon=cpu - - +#TRANSLATIONS_DIR=../translations # Translations -Comment[da]=CPU Overvågning -Name[da]=CPU-belastning +Name[da]=CPU-overvågning +Comment[da]=Viser det aktuelle CPU-forbrug. diff --git a/plugin-cpuload/translations/cpuload_da_DK.desktop b/plugin-cpuload/translations/cpuload_da_DK.desktop deleted file mode 100644 index 7e5645e..0000000 --- a/plugin-cpuload/translations/cpuload_da_DK.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin - -Name=Cpu monitor -Comment=Displays the current CPU load. - - - - -# Translations -Comment[da_DK]=CPU Overvågning -Name[da_DK]=CPU Belastning - diff --git a/plugin-cpuload/translations/cpuload_fr.desktop b/plugin-cpuload/translations/cpuload_fr.desktop new file mode 100644 index 0000000..27d7912 --- /dev/null +++ b/plugin-cpuload/translations/cpuload_fr.desktop @@ -0,0 +1,2 @@ +Name[fr]=Charge du processeur +Comment[fr]=Affichage de la charge du processeur diff --git a/plugin-desktopswitch/desktopswitchbutton.cpp b/plugin-desktopswitch/desktopswitchbutton.cpp index b458780..19258ff 100644 --- a/plugin-desktopswitch/desktopswitchbutton.cpp +++ b/plugin-desktopswitch/desktopswitchbutton.cpp @@ -51,6 +51,12 @@ void DesktopSwitchButton::update(int index, LabelType labelType, const QString & setText(title); break; + // A blank space was used in NONE Label Type as it uses less space + // for each desktop button at the panel + case LABEL_TYPE_NONE: + setText(QStringLiteral(" ")); + break; + default: // LABEL_TYPE_NUMBER setText(QString::number(index + 1)); } diff --git a/plugin-desktopswitch/desktopswitchbutton.h b/plugin-desktopswitch/desktopswitchbutton.h index 18bebcc..6d8ba26 100644 --- a/plugin-desktopswitch/desktopswitchbutton.h +++ b/plugin-desktopswitch/desktopswitchbutton.h @@ -44,7 +44,8 @@ class DesktopSwitchButton : public QToolButton public: enum LabelType { // Must match with combobox indexes LABEL_TYPE_NUMBER = 0, - LABEL_TYPE_NAME = 1 + LABEL_TYPE_NAME = 1, + LABEL_TYPE_NONE = 2 }; DesktopSwitchButton(QWidget * parent, int index, LabelType labelType, const QString &title=QString()); diff --git a/plugin-desktopswitch/desktopswitchconfiguration.ui b/plugin-desktopswitch/desktopswitchconfiguration.ui index cb7b2dc..a1751c1 100644 --- a/plugin-desktopswitch/desktopswitchconfiguration.ui +++ b/plugin-desktopswitch/desktopswitchconfiguration.ui @@ -59,6 +59,11 @@ Names + + + None + + diff --git a/plugin-desktopswitch/translations/desktopswitch_da.desktop b/plugin-desktopswitch/translations/desktopswitch_da.desktop index 120f6c1..67e6bd6 100644 --- a/plugin-desktopswitch/translations/desktopswitch_da.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_da.desktop @@ -3,10 +3,10 @@ Type=Service ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. +Icon=user-desktop #TRANSLATIONS_DIR=../translations - # Translations -Comment[da]=Tillader skift imellem virtuelle skriveborde Name[da]=Skrivebordsskifter +Comment[da]=Giver mulighed for nemt at skifte imellem virtuelle skriveborde. diff --git a/plugin-desktopswitch/translations/desktopswitch_da_DK.desktop b/plugin-desktopswitch/translations/desktopswitch_da_DK.desktop deleted file mode 100644 index 0f4e7f0..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_da_DK.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[da_DK]=Skift imellem virtuelle skriveborde -Name[da_DK]=Skrivebords Skifter diff --git a/plugin-desktopswitch/translations/desktopswitch_fr.desktop b/plugin-desktopswitch/translations/desktopswitch_fr.desktop new file mode 100644 index 0000000..3484d40 --- /dev/null +++ b/plugin-desktopswitch/translations/desktopswitch_fr.desktop @@ -0,0 +1,3 @@ +# Translations +Comment[fr]=permettre un basculement aisé entre les bureaux virtuels +Name[fr]=Changeur de bureau diff --git a/plugin-desktopswitch/translations/desktopswitch_fr_FR.desktop b/plugin-desktopswitch/translations/desktopswitch_fr_FR.desktop deleted file mode 100644 index 87d1a71..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_fr_FR.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[fr_FR]=Autoriser à basculer entre les bureaux virtuels -Name[fr_FR]=Changeur de bureau diff --git a/plugin-directorymenu/translations/directorymenu_da.desktop b/plugin-directorymenu/translations/directorymenu_da.desktop new file mode 100644 index 0000000..92d8abb --- /dev/null +++ b/plugin-directorymenu/translations/directorymenu_da.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Service +ServiceTypes=LXQtPanel/Plugin +Name=Directory Menu +Comment=Displays a menu showing the contents of a directory +Icon=folder + +#TRANSLATIONS_DIR=../translations + +# Translations +Name[da]=Mappemenu +Comment[da]=Viser en menu med indholdet af en mappe \ No newline at end of file diff --git a/plugin-directorymenu/translations/directorymenu_fr.desktop b/plugin-directorymenu/translations/directorymenu_fr.desktop new file mode 100644 index 0000000..5e6ae8b --- /dev/null +++ b/plugin-directorymenu/translations/directorymenu_fr.desktop @@ -0,0 +1,2 @@ +Name[fr]=Menu de répertoire +Comment[fr]=Affiche un menu avec le contenu d'un répertoire diff --git a/plugin-directorymenu/translations/directorymenu_pt.desktop b/plugin-directorymenu/translations/directorymenu_pt.desktop new file mode 100644 index 0000000..9055055 --- /dev/null +++ b/plugin-directorymenu/translations/directorymenu_pt.desktop @@ -0,0 +1,3 @@ +[Desktop Entry] +Name[pt]=Menu de diretórios +Comment[pt]=Mostra um menu com o conteúdo do diretório diff --git a/plugin-dom/translations/dom_da.desktop b/plugin-dom/translations/dom_da.desktop new file mode 100644 index 0000000..69df085 --- /dev/null +++ b/plugin-dom/translations/dom_da.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Service +ServiceTypes=LXQtPanel/Plugin +Name=Panel DOM tree +Comment=Show a DOM tree of the LXQt panel. +Icon=view-web-browser-dom-tree + +#TRANSLATIONS_DIR=../translations + +# Translations +Name[da]=Panel DOM-træ +Comment[da]=Vis et DOM-træ af LXQt-panelet. \ No newline at end of file diff --git a/plugin-dom/translations/dom_fr.desktop b/plugin-dom/translations/dom_fr.desktop new file mode 100644 index 0000000..577eeb4 --- /dev/null +++ b/plugin-dom/translations/dom_fr.desktop @@ -0,0 +1,2 @@ +Name[fr]=Arborescence DOM dans le tableau de bord +Comment[fr]=Affiche une arborescence DOM dans le tableau de bord. diff --git a/plugin-kbindicator/CMakeLists.txt b/plugin-kbindicator/CMakeLists.txt index 82b06af..e5a27e8 100644 --- a/plugin-kbindicator/CMakeLists.txt +++ b/plugin-kbindicator/CMakeLists.txt @@ -29,38 +29,27 @@ set(UIS set(LIBRARIES ) -find_package(PkgConfig REQUIRED) -pkg_check_modules(XKB_COMMON REQUIRED xkbcommon) -pkg_check_modules(XKB_COMMON_X11 QUIET xkbcommon-x11) +find_package(XCB REQUIRED COMPONENTS xkbcommon-x11 xkbcommon xcb xcb-xkb) +find_package(Qt5 REQUIRED COMPONENTS X11Extras Xml) -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) - pkg_check_modules(XCB_XKB xcb-xkb) +include_directories(${XCB_INCLUDE_DIRS}) - set(HEADERS - ${HEADERS} - src/x11/kbdlayout.h - ) +set(HEADERS + ${HEADERS} + src/x11/kbdlayout.h +) - set(SOURCES - ${SOURCES} - src/x11/kbdlayout.cpp - ) +set(SOURCES + ${SOURCES} + src/x11/kbdlayout.cpp +) - set(LIBRARIES - ${LIBRARIES} - ${XKB_COMMON_X11_LIBRARIES} - ${XCB_LIBRARIES} - ${XCB_XKB_LIBRARIES} - Qt5::Xml - ) +set(LIBRARIES + ${LIBRARIES} + ${XCB_LIBRARIES} + Qt5::Xml +) - add_definitions(-DX11_ENABLED) -else() - message(FATAL_ERROR "No XkbCommon backend(X11) found!") -endif() +add_definitions(-DX11_ENABLED) BUILD_LXQT_PLUGIN(${PLUGIN}) diff --git a/plugin-kbindicator/kbindicator-plugin.cpp b/plugin-kbindicator/kbindicator-plugin.cpp index f70b56f..b4a4038 100644 --- a/plugin-kbindicator/kbindicator-plugin.cpp +++ b/plugin-kbindicator/kbindicator-plugin.cpp @@ -24,7 +24,9 @@ * * END_COMMON_COPYRIGHT_HEADER */ +#include #include +#include #include "src/kbdstate.h" #include "../panel/ilxqtpanelplugin.h" @@ -38,7 +40,14 @@ public: {} virtual ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const - { return new KbdState(startupInfo); } + { + // Currently only X11 supported + if (!QX11Info::connection()) { + qWarning() << "Currently kbindicator plugin supports X11 only. Skipping."; + return nullptr; + } + return new KbdState(startupInfo); + } }; #include "kbindicator-plugin.moc" diff --git a/plugin-kbindicator/translations/kbindicator_da.desktop b/plugin-kbindicator/translations/kbindicator_da.desktop new file mode 100644 index 0000000..3b93c3b --- /dev/null +++ b/plugin-kbindicator/translations/kbindicator_da.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Service +ServiceTypes=LXQtPanel/Plugin +Name=Keyboard state indicator +Comment=Keyboard state indicator and switcher plugin. +Icon=input-keyboard + +#TRANSLATIONS_DIR=../translations + +# Translations +Name[da]=Tastaturtilstand-indikator +Comment[da]=Tastaturtilstand-indikator og -skifter-plugin. \ No newline at end of file diff --git a/plugin-kbindicator/translations/kbindicator_fr.desktop b/plugin-kbindicator/translations/kbindicator_fr.desktop new file mode 100644 index 0000000..2938081 --- /dev/null +++ b/plugin-kbindicator/translations/kbindicator_fr.desktop @@ -0,0 +1,2 @@ +Name[fr]=Indicateurs de l'état du clavier +Comment[fr]=Greffon pour l'affichage de l'état du clavier et pour le basculement entre les dispositions. diff --git a/plugin-mainmenu/CMakeLists.txt b/plugin-mainmenu/CMakeLists.txt index 9db76ec..7219fd6 100644 --- a/plugin-mainmenu/CMakeLists.txt +++ b/plugin-mainmenu/CMakeLists.txt @@ -18,28 +18,28 @@ set(UIS lxqtmainmenuconfiguration.ui ) + # optionally use libmenu-cache to generate the application menu -find_package(PkgConfig) if(NOT WITHOUT_MENU_CACHE) - pkg_check_modules(MENU_CACHE - libmenu-cache>=0.3.3 - ) + find_package(MenuCache "0.3.3") endif() -if(MENU_CACHE_FOUND) +set(LIBRARIES + lxqt + lxqt-globalkeys + lxqt-globalkeys-ui +) + +if(MENUCACHE_FOUND) list(APPEND SOURCES xdgcachedmenu.cpp) list(APPEND MOCS xdgcachedmenu.h) - include_directories(${MENU_CACHE_INCLUDE_DIRS}) + include_directories(${MENUCACHE_INCLUDE_DIRS}) + list(APPEND LIBRARIES ${MENUCACHE_LIBRARIES}) add_definitions(-DHAVE_MENU_CACHE=1) + endif() -set(LIBRARIES - lxqt - lxqt-globalkeys - lxqt-globalkeys-ui - ${MENU_CACHE_LIBRARIES} -) set(QT_USE_QTXML 1) set(QT_USE_QTDBUS 1) diff --git a/plugin-mainmenu/translations/mainmenu_da.desktop b/plugin-mainmenu/translations/mainmenu_da.desktop index 8c99bb5..cc265a5 100644 --- a/plugin-mainmenu/translations/mainmenu_da.desktop +++ b/plugin-mainmenu/translations/mainmenu_da.desktop @@ -3,10 +3,10 @@ Type=Service ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. +Icon=start-here-lxqt #TRANSLATIONS_DIR=../translations - # Translations -Comment[da]=Menubaseret programstarter Name[da]=Programmenu +Comment[da]=En menu med alle dine programmer. diff --git a/plugin-mainmenu/translations/mainmenu_da_DK.desktop b/plugin-mainmenu/translations/mainmenu_da_DK.desktop deleted file mode 100644 index 462ef43..0000000 --- a/plugin-mainmenu/translations/mainmenu_da_DK.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[da_DK]=Menubaseret programstarter -Name[da_DK]=Program menu diff --git a/plugin-mainmenu/translations/mainmenu_fr.desktop b/plugin-mainmenu/translations/mainmenu_fr.desktop new file mode 100644 index 0000000..a85376e --- /dev/null +++ b/plugin-mainmenu/translations/mainmenu_fr.desktop @@ -0,0 +1,3 @@ +# Translations +Comment[fr]=Lanceur d'application sous forme de menu +Name[fr]=Menu d'application diff --git a/plugin-mainmenu/translations/mainmenu_fr_FR.desktop b/plugin-mainmenu/translations/mainmenu_fr_FR.desktop deleted file mode 100644 index 530d473..0000000 --- a/plugin-mainmenu/translations/mainmenu_fr_FR.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[fr_FR]=Lanceur d'application sous forme de menu -Name[fr_FR]=Menu d'application diff --git a/plugin-mount/translations/mount_da.desktop b/plugin-mount/translations/mount_da.desktop index d08b8b3..4837f7a 100644 --- a/plugin-mount/translations/mount_da.desktop +++ b/plugin-mount/translations/mount_da.desktop @@ -3,10 +3,10 @@ Type=Service ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. +Icon=drive-removable-media #TRANSLATIONS_DIR=../translations - # Translations -Comment[da]=Håndtering af flytbare enheder og medier (USB, CD, DVD, ...) -Name[da]=Flytbare enheder +Name[da]=Flytbare medier +Comment[da]=Nem montering og afmontering af USB og optiske drev. diff --git a/plugin-mount/translations/mount_da_DK.desktop b/plugin-mount/translations/mount_da_DK.desktop deleted file mode 100644 index 843ffbd..0000000 --- a/plugin-mount/translations/mount_da_DK.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[da_DK]=Håndtering af flytbare enheder (USB, CD, DVD, ...) -Name[da_DK]=Flytbare enheder diff --git a/plugin-mount/translations/mount_fr.desktop b/plugin-mount/translations/mount_fr.desktop new file mode 100644 index 0000000..e0bd9cb --- /dev/null +++ b/plugin-mount/translations/mount_fr.desktop @@ -0,0 +1,3 @@ +# Translations +Comment[fr]=Gestionnaire de médias amovibles (USB, CD, DVD, ...) +Name[fr]=Média amovible diff --git a/plugin-mount/translations/mount_fr_FR.desktop b/plugin-mount/translations/mount_fr_FR.desktop deleted file mode 100644 index 59d245e..0000000 --- a/plugin-mount/translations/mount_fr_FR.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[fr_FR]=Gestionnaire de médias amovibles (USB, CD, DVD, ...) -Name[fr_FR]=Média amovible diff --git a/plugin-networkmonitor/translations/networkmonitor_da.desktop b/plugin-networkmonitor/translations/networkmonitor_da.desktop index fe04734..cf8eb2f 100644 --- a/plugin-networkmonitor/translations/networkmonitor_da.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_da.desktop @@ -1,13 +1,13 @@ [Desktop Entry] Type=Service ServiceTypes=LXQtPanel/Plugin - Name=Network monitor Comment=Displays network status and activity. +#Icon=network-transmit-receive +Icon=network-wired - - +#TRANSLATIONS_DIR=../translations # Translations -Comment[da]=Netværksovervågning Name[da]=Netværksovervågning +Comment[da]=Netværksovervågning diff --git a/plugin-networkmonitor/translations/networkmonitor_fr.desktop b/plugin-networkmonitor/translations/networkmonitor_fr.desktop index 5d2d242..f5c957c 100644 --- a/plugin-networkmonitor/translations/networkmonitor_fr.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_fr.desktop @@ -1,3 +1,3 @@ # Translations -Name[fr_FR]=Moniteur Réseau -Comment[fr_FR]=Affiche le statut et l'activité du réseau +Name[fr]=Moniteur Réseau +Comment[fr]=Affiche le statut et l'activité du réseau diff --git a/plugin-quicklaunch/translations/quicklaunch_da.desktop b/plugin-quicklaunch/translations/quicklaunch_da.desktop index ded5bfc..b2ce385 100644 --- a/plugin-quicklaunch/translations/quicklaunch_da.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_da.desktop @@ -3,10 +3,10 @@ Type=Service ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. +Icon=quickopen #TRANSLATIONS_DIR=../translations - # Translations -Comment[da]=Start dine favoritprogrammer -Name[da]=Quicklaunch +Name[da]=Hurtigstart +Comment[da]=Nem adgang til dine favoritprogrammer. diff --git a/plugin-quicklaunch/translations/quicklaunch_da_DK.desktop b/plugin-quicklaunch/translations/quicklaunch_da_DK.desktop deleted file mode 100644 index 5fca64d..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_da_DK.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[da_DK]=Start dine ynglingsprogrammer -Name[da_DK]=Hurtigstart diff --git a/plugin-quicklaunch/translations/quicklaunch_fr.desktop b/plugin-quicklaunch/translations/quicklaunch_fr.desktop new file mode 100644 index 0000000..1ca1fcf --- /dev/null +++ b/plugin-quicklaunch/translations/quicklaunch_fr.desktop @@ -0,0 +1,3 @@ +# Translations +Comment[fr]=Lancer votre application favorite +Name[fr]=Lancement rapide diff --git a/plugin-quicklaunch/translations/quicklaunch_fr_FR.desktop b/plugin-quicklaunch/translations/quicklaunch_fr_FR.desktop deleted file mode 100644 index 86e4f38..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_fr_FR.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[fr_FR]=Lancer votre application favorite -Name[fr_FR]=Lancement rapide diff --git a/plugin-sensors/translations/sensors_da.desktop b/plugin-sensors/translations/sensors_da.desktop index 0f768e1..5470af6 100644 --- a/plugin-sensors/translations/sensors_da.desktop +++ b/plugin-sensors/translations/sensors_da.desktop @@ -5,6 +5,8 @@ Name=Sensors Comment=View readings from hardware sensors. +#TRANSLATIONS_DIR=../translations + # Translations Name[da]=Sensorer -Comment[da]=Vis målinger fra hardware-sensorer (I øjeblikket lm_sensors) +Comment[da]=Vis målinger fra hardware-sensorer diff --git a/plugin-sensors/translations/sensors_da_DK.desktop b/plugin-sensors/translations/sensors_da_DK.desktop deleted file mode 100644 index e0f78c4..0000000 --- a/plugin-sensors/translations/sensors_da_DK.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Sensors -Comment=View readings from hardware sensors. - - -# Translations -Name[da_DK]=Sensorer -Comment[da_DK]=Vis målinger fra hardware-sensorer (I øjeblikket lm_sensors) diff --git a/plugin-sensors/translations/sensors_fr.desktop b/plugin-sensors/translations/sensors_fr.desktop new file mode 100644 index 0000000..74b1d71 --- /dev/null +++ b/plugin-sensors/translations/sensors_fr.desktop @@ -0,0 +1,3 @@ +# Translations +Name[fr]=Capteurs +Comment[fr]=Voir les mesures effectuées par les capteurs diff --git a/plugin-sensors/translations/sensors_fr_FR.desktop b/plugin-sensors/translations/sensors_fr_FR.desktop deleted file mode 100644 index 0763738..0000000 --- a/plugin-sensors/translations/sensors_fr_FR.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Sensors -Comment=View readings from hardware sensors. - - -# Translations -Name[fr_FR]=Capteurs -Comment[fr_FR]=Voir les mesures effectuées par les capteurs (actuellement lm_sensors) diff --git a/plugin-showdesktop/CMakeLists.txt b/plugin-showdesktop/CMakeLists.txt index 8913718..bf69d2b 100644 --- a/plugin-showdesktop/CMakeLists.txt +++ b/plugin-showdesktop/CMakeLists.txt @@ -12,7 +12,6 @@ set(LIBRARIES ${LIBRARIES} lxqt-globalkeys Qt5Xdg - ${XCB_LIBRARIES} ) BUILD_LXQT_PLUGIN(${PLUGIN}) diff --git a/plugin-showdesktop/showdesktop.cpp b/plugin-showdesktop/showdesktop.cpp index f30f9f7..7eb816c 100644 --- a/plugin-showdesktop/showdesktop.cpp +++ b/plugin-showdesktop/showdesktop.cpp @@ -35,10 +35,6 @@ #include "showdesktop.h" #include "../panel/pluginsettings.h" -// Still needed for lxde/lxqt#338 -#include -#include - #define DEFAULT_SHORTCUT "Control+Alt+D" ShowDesktop::ShowDesktop(const ILXQtPanelPluginStartupInfo &startupInfo) : diff --git a/plugin-showdesktop/translations/showdesktop_da.desktop b/plugin-showdesktop/translations/showdesktop_da.desktop index 703165d..1140883 100644 --- a/plugin-showdesktop/translations/showdesktop_da.desktop +++ b/plugin-showdesktop/translations/showdesktop_da.desktop @@ -3,10 +3,10 @@ Type=Service ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop +Icon=user-desktop #TRANSLATIONS_DIR=../translations - # Translations -Comment[da]=Minimerer alle programmer og viser skrivebord -Name[da]=Vis Skrivebord +Name[da]=Vis skrivebord +Comment[da]=Minimer alle vinduer og vis skrivebordet diff --git a/plugin-showdesktop/translations/showdesktop_da_DK.desktop b/plugin-showdesktop/translations/showdesktop_da_DK.desktop deleted file mode 100644 index e1314c8..0000000 --- a/plugin-showdesktop/translations/showdesktop_da_DK.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[da_DK]=Minimer alle vinduer og vis skrivebord -Name[da_DK]=Vis Skrivebord diff --git a/plugin-showdesktop/translations/showdesktop_fr.desktop b/plugin-showdesktop/translations/showdesktop_fr.desktop new file mode 100644 index 0000000..4f48d7b --- /dev/null +++ b/plugin-showdesktop/translations/showdesktop_fr.desktop @@ -0,0 +1,3 @@ +# Translations +Comment[fr]=Minimiser toutes les fenêtres et montrer le bureau +Name[fr]=Montrer le bureau diff --git a/plugin-showdesktop/translations/showdesktop_fr_FR.desktop b/plugin-showdesktop/translations/showdesktop_fr_FR.desktop deleted file mode 100644 index b613cb5..0000000 --- a/plugin-showdesktop/translations/showdesktop_fr_FR.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[fr_FR]=Minimiser toutes les fenêtres et montrer le bureau -Name[fr_FR]=Montrer le bureau diff --git a/plugin-spacer/translations/spacer_da.desktop b/plugin-spacer/translations/spacer_da.desktop new file mode 100644 index 0000000..18fe603 --- /dev/null +++ b/plugin-spacer/translations/spacer_da.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Service +ServiceTypes=LXQtPanel/Plugin +Name=Spacer +Comment=Space between widgets +Icon=bookmark-new + +#TRANSLATIONS_DIR=../translations + +# Translations +Name[da]=Mellemrum +Comment[da]=Mellemrum imellem widgets \ No newline at end of file diff --git a/plugin-spacer/translations/spacer_fr.desktop b/plugin-spacer/translations/spacer_fr.desktop new file mode 100644 index 0000000..0998119 --- /dev/null +++ b/plugin-spacer/translations/spacer_fr.desktop @@ -0,0 +1,2 @@ +Name[fr]=Espaceur +Comment[fr]=Fixe un espacement entre les widgets diff --git a/plugin-spacer/translations/spacer_pt.desktop b/plugin-spacer/translations/spacer_pt.desktop new file mode 100644 index 0000000..599947a --- /dev/null +++ b/plugin-spacer/translations/spacer_pt.desktop @@ -0,0 +1,3 @@ +[Desktop Entry] +Name[pt]=Espaçamento +Comment[pt]=Espaço entre os widgets diff --git a/plugin-statusnotifier/translations/statusnotifier_da.desktop b/plugin-statusnotifier/translations/statusnotifier_da.desktop new file mode 100644 index 0000000..4bbb474 --- /dev/null +++ b/plugin-statusnotifier/translations/statusnotifier_da.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Service +ServiceTypes=LXQtPanel/Plugin +Name=Status Notifier Plugin +Comment=Status Notifier Plugin +Icon=go-bottom + +# Translations +Name[da]=Statusnotifikator-plugin +Comment[da]=Statusnotifikator-plugin \ No newline at end of file diff --git a/plugin-statusnotifier/translations/statusnotifier_fr.desktop b/plugin-statusnotifier/translations/statusnotifier_fr.desktop new file mode 100644 index 0000000..e256bcd --- /dev/null +++ b/plugin-statusnotifier/translations/statusnotifier_fr.desktop @@ -0,0 +1,2 @@ +Name[fr]=Information du statut +Comment[fr]=Greffon d'information du statut diff --git a/plugin-statusnotifier/translations/statusnotifier_pt.desktop b/plugin-statusnotifier/translations/statusnotifier_pt.desktop new file mode 100644 index 0000000..9e65b1e --- /dev/null +++ b/plugin-statusnotifier/translations/statusnotifier_pt.desktop @@ -0,0 +1,3 @@ +[Desktop Entry] +Name[pt]=Plugin Status Notifier +Comment[pt]=Um plugin para notificar sobre o estado diff --git a/plugin-sysstat/translations/sysstat_da.desktop b/plugin-sysstat/translations/sysstat_da.desktop new file mode 100644 index 0000000..afd6b53 --- /dev/null +++ b/plugin-sysstat/translations/sysstat_da.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Service +ServiceTypes=LXQtPanel/Plugin +Name=System Statistics +Comment=System Statistics plugin. +Icon=utilities-system-monitor + +#TRANSLATIONS_DIR=../translations + +# Translations +Name[da]=Systemstatistik +Comment[da]=Systemstatistik-plugin. \ No newline at end of file diff --git a/plugin-sysstat/translations/sysstat_fr.desktop b/plugin-sysstat/translations/sysstat_fr.desktop new file mode 100644 index 0000000..817502e --- /dev/null +++ b/plugin-sysstat/translations/sysstat_fr.desktop @@ -0,0 +1,2 @@ +Name[fr]=Statistiques du système +Comment[fr]=Greffon d'affichage des statistiques du système diff --git a/plugin-taskbar/lxqttaskbar.cpp b/plugin-taskbar/lxqttaskbar.cpp index 92c1df4..eb880ed 100644 --- a/plugin-taskbar/lxqttaskbar.cpp +++ b/plugin-taskbar/lxqttaskbar.cpp @@ -64,6 +64,7 @@ LXQtTaskBar::LXQtTaskBar(ILXQtPanelPlugin *plugin, QWidget *parent) : mAutoRotate(true), mShowGroupOnHover(true), mIconByClass(false), + mCycleOnWheelScroll(true), mPlugin(plugin), mPlaceHolder(new QWidget(this)), mStyle(new LeftAlignedTextStyle()) @@ -456,6 +457,7 @@ void LXQtTaskBar::settingsChanged() mGroupingEnabled = mPlugin->settings()->value("groupingEnabled",true).toBool(); mShowGroupOnHover = mPlugin->settings()->value("showGroupOnHover",true).toBool(); mIconByClass = mPlugin->settings()->value("iconByClass", false).toBool(); + mCycleOnWheelScroll = mPlugin->settings()->value("cycleOnWheelScroll", true).toBool(); // Delete all groups if grouping feature toggled and start over if (groupingEnabledOld != mGroupingEnabled) @@ -546,10 +548,13 @@ void LXQtTaskBar::realign() ************************************************/ void LXQtTaskBar::wheelEvent(QWheelEvent* event) { + if (!mCycleOnWheelScroll) + return QFrame::wheelEvent(event); + static int threshold = 0; threshold += abs(event->delta()); if (threshold < 300) - return; + return QFrame::wheelEvent(event); else threshold = 0; @@ -572,7 +577,7 @@ void LXQtTaskBar::wheelEvent(QWheelEvent* event) } if (list.isEmpty()) - return; + return QFrame::wheelEvent(event); if (!group) group = list.at(0); @@ -588,6 +593,7 @@ void LXQtTaskBar::wheelEvent(QWheelEvent* event) int idx = (list.indexOf(group) + delta + list.count()) % list.count(); group = list.at(idx); } + QFrame::wheelEvent(event); } /************************************************ diff --git a/plugin-taskbar/lxqttaskbar.h b/plugin-taskbar/lxqttaskbar.h index 2cfa62c..98fd4a8 100644 --- a/plugin-taskbar/lxqttaskbar.h +++ b/plugin-taskbar/lxqttaskbar.h @@ -129,6 +129,7 @@ private: bool mGroupingEnabled; bool mShowGroupOnHover; bool mIconByClass; + bool mCycleOnWheelScroll; //!< flag for processing the wheelEvent bool acceptWindow(WId window) const; void setButtonStyle(Qt::ToolButtonStyle buttonStyle); diff --git a/plugin-taskbar/lxqttaskbarconfiguration.cpp b/plugin-taskbar/lxqttaskbarconfiguration.cpp index 7999709..b0dcde3 100644 --- a/plugin-taskbar/lxqttaskbarconfiguration.cpp +++ b/plugin-taskbar/lxqttaskbarconfiguration.cpp @@ -70,6 +70,7 @@ LXQtTaskbarConfiguration::LXQtTaskbarConfiguration(PluginSettings *settings, QWi connect(ui->groupingGB, SIGNAL(clicked()), this, SLOT(saveSettings())); connect(ui->showGroupOnHoverCB, SIGNAL(clicked()), this, SLOT(saveSettings())); connect(ui->iconByClassCB, &QCheckBox::clicked, this, &LXQtTaskbarConfiguration::saveSettings); + connect(ui->cycleOnWheelScroll, &QCheckBox::clicked, this, &LXQtTaskbarConfiguration::saveSettings); } LXQtTaskbarConfiguration::~LXQtTaskbarConfiguration() @@ -95,6 +96,7 @@ void LXQtTaskbarConfiguration::loadSettings() ui->groupingGB->setChecked(settings().value("groupingEnabled",true).toBool()); ui->showGroupOnHoverCB->setChecked(settings().value("showGroupOnHover",true).toBool()); ui->iconByClassCB->setChecked(settings().value("iconByClass", false).toBool()); + ui->cycleOnWheelScroll->setChecked(settings().value("cycleOnWheelScroll", true).toBool()); } void LXQtTaskbarConfiguration::saveSettings() @@ -112,4 +114,5 @@ void LXQtTaskbarConfiguration::saveSettings() settings().setValue("groupingEnabled",ui->groupingGB->isChecked()); settings().setValue("showGroupOnHover",ui->showGroupOnHoverCB->isChecked()); settings().setValue("iconByClass",ui->iconByClassCB->isChecked()); + settings().setValue("cycleOnWheelScroll",ui->cycleOnWheelScroll->isChecked()); } diff --git a/plugin-taskbar/lxqttaskbarconfiguration.ui b/plugin-taskbar/lxqttaskbarconfiguration.ui index 2a9ecee..13b4687 100644 --- a/plugin-taskbar/lxqttaskbarconfiguration.ui +++ b/plugin-taskbar/lxqttaskbarconfiguration.ui @@ -7,7 +7,7 @@ 0 0 401 - 484 + 512 @@ -22,10 +22,19 @@ - + 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -68,6 +77,13 @@ + + + + Cycle windows on wheel scrolling + + + @@ -131,7 +147,7 @@ 1 - 500 + 2147483647 diff --git a/plugin-taskbar/lxqttaskgroup.cpp b/plugin-taskbar/lxqttaskgroup.cpp index 20a6cc7..f1cba5b 100644 --- a/plugin-taskbar/lxqttaskgroup.cpp +++ b/plugin-taskbar/lxqttaskgroup.cpp @@ -111,7 +111,7 @@ LXQtTaskButton * LXQtTaskGroup::addWindow(WId id) return mButtonHash.value(id); LXQtTaskButton *btn = new LXQtTaskButton(id, parentTaskBar(), mPopup); - btn->setToolButtonStyle(toolButtonStyle()); + btn->setToolButtonStyle(popupButtonStyle()); if (btn->isApplicationActive()) { @@ -245,6 +245,17 @@ void LXQtTaskGroup::onChildButtonClicked() setPopupVisible(false, true); } +/************************************************ + + ************************************************/ +Qt::ToolButtonStyle LXQtTaskGroup::popupButtonStyle() const +{ + // do not set icons-only style in the buttons in the group, + // as they'll be indistinguishable + const Qt::ToolButtonStyle style = toolButtonStyle(); + return style == Qt::ToolButtonIconOnly ? Qt::ToolButtonTextBesideIcon : style; +} + /************************************************ ************************************************/ @@ -252,11 +263,7 @@ 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; + const Qt::ToolButtonStyle styleInPopup = popupButtonStyle(); for (auto & button : mButtonHash) { button->setToolButtonStyle(styleInPopup); diff --git a/plugin-taskbar/lxqttaskgroup.h b/plugin-taskbar/lxqttaskgroup.h index 93b7ea8..2609a9e 100644 --- a/plugin-taskbar/lxqttaskgroup.h +++ b/plugin-taskbar/lxqttaskgroup.h @@ -66,6 +66,7 @@ public: bool onWindowChanged(WId window, NET::Properties prop, NET::Properties2 prop2); void setAutoRotation(bool value, ILXQtPanel::Position position); + Qt::ToolButtonStyle popupButtonStyle() const; void setToolButtonsStyle(Qt::ToolButtonStyle style); void setPopupVisible(bool visible = true, bool fast = false); diff --git a/plugin-taskbar/translations/taskbar_da.desktop b/plugin-taskbar/translations/taskbar_da.desktop index 9489fe0..92f62ac 100644 --- a/plugin-taskbar/translations/taskbar_da.desktop +++ b/plugin-taskbar/translations/taskbar_da.desktop @@ -3,10 +3,10 @@ Type=Service ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications +Icon=window-duplicate #TRANSLATIONS_DIR=../translations - # Translations -Comment[da]=Skifter imellem kørende programmer -Name[da]=Programadministrator +Name[da]=Opgavehåndtering +Comment[da]=Skift imellem kørende programmer diff --git a/plugin-taskbar/translations/taskbar_da_DK.desktop b/plugin-taskbar/translations/taskbar_da_DK.desktop deleted file mode 100644 index f6c0b1d..0000000 --- a/plugin-taskbar/translations/taskbar_da_DK.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[da_DK]=Skift imellem kørende programmer -Name[da_DK]=Jobliste diff --git a/plugin-taskbar/translations/taskbar_fr.desktop b/plugin-taskbar/translations/taskbar_fr.desktop new file mode 100644 index 0000000..73527ee --- /dev/null +++ b/plugin-taskbar/translations/taskbar_fr.desktop @@ -0,0 +1,3 @@ +# Translations +Comment[fr]=Basculer entre des applications actives +Name[fr]=Gestionnaire des tâches diff --git a/plugin-taskbar/translations/taskbar_fr_FR.desktop b/plugin-taskbar/translations/taskbar_fr_FR.desktop deleted file mode 100644 index 77c1c4c..0000000 --- a/plugin-taskbar/translations/taskbar_fr_FR.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[fr_FR]=Basculer entre des applications actives -Name[fr_FR]=Gestionnaire des tâches diff --git a/plugin-tray/CMakeLists.txt b/plugin-tray/CMakeLists.txt index 184c92a..f914f01 100644 --- a/plugin-tray/CMakeLists.txt +++ b/plugin-tray/CMakeLists.txt @@ -2,10 +2,8 @@ set(PLUGIN "tray") include(CheckLibraryExists) +find_package(XCB REQUIRED COMPONENTS xcb xcb-util xcb-damage) find_package(PkgConfig) -pkg_check_modules(XCB REQUIRED xcb) -pkg_check_modules(XCB_UTIL REQUIRED xcb-util) -pkg_check_modules(XCB_DAMAGE REQUIRED xcb-damage) find_package(X11 REQUIRED) pkg_check_modules(XCOMPOSITE REQUIRED xcomposite) @@ -32,7 +30,6 @@ set(LIBRARIES ${XDAMAGE_LIBRARIES} ${XRENDER_LIBRARIES} ${XCB_LIBRARIES} - ${XCB_DAMAGE_LIBRARIES} ) BUILD_LXQT_PLUGIN(${PLUGIN}) diff --git a/plugin-tray/lxqttrayplugin.h b/plugin-tray/lxqttrayplugin.h index 10a57b9..19a5008 100644 --- a/plugin-tray/lxqttrayplugin.h +++ b/plugin-tray/lxqttrayplugin.h @@ -30,7 +30,9 @@ #define LXQTTRAYPLUGIN_H #include "../panel/ilxqtpanelplugin.h" +#include #include +#include class LXQtTray; class LXQtTrayPlugin : public QObject, public ILXQtPanelPlugin @@ -60,6 +62,11 @@ class LXQtTrayPluginLibrary: public QObject, public ILXQtPanelPluginLibrary public: ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { + // Currently only X11 supported + if (!QX11Info::connection()) { + qWarning() << "Currently tray plugin supports X11 only. Skipping."; + return nullptr; + } return new LXQtTrayPlugin(startupInfo); } }; diff --git a/plugin-tray/translations/tray_da.desktop b/plugin-tray/translations/tray_da.desktop index 4f3acf8..9716828 100644 --- a/plugin-tray/translations/tray_da.desktop +++ b/plugin-tray/translations/tray_da.desktop @@ -3,10 +3,10 @@ Type=Service ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. +Icon=go-bottom #TRANSLATIONS_DIR=../translations - # Translations -Comment[da]=Adgang til skjulte programmer der er minimeret til systembakken Name[da]=Systembakke +Comment[da]=Vis programmer minimeret til systembakken. diff --git a/plugin-tray/translations/tray_da_DK.desktop b/plugin-tray/translations/tray_da_DK.desktop deleted file mode 100644 index 6496a97..0000000 --- a/plugin-tray/translations/tray_da_DK.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[da_DK]=Giver adgang til skjulte programmer, minimeret til systembakken -Name[da_DK]=Systembakke diff --git a/plugin-tray/translations/tray_fr.desktop b/plugin-tray/translations/tray_fr.desktop new file mode 100644 index 0000000..dfb642c --- /dev/null +++ b/plugin-tray/translations/tray_fr.desktop @@ -0,0 +1,3 @@ +# Translations +Comment[fr]=Accéder aux applications cachées minimisées dans la zone de notification +Name[fr]=Zone de notification diff --git a/plugin-tray/translations/tray_fr_FR.desktop b/plugin-tray/translations/tray_fr_FR.desktop deleted file mode 100644 index 05afaa3..0000000 --- a/plugin-tray/translations/tray_fr_FR.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[fr_FR]=Accéder aux applications cachées minimisées dans la zone de notification -Name[fr_FR]=Zone de notification diff --git a/plugin-volume/translations/volume_da.desktop b/plugin-volume/translations/volume_da.desktop index 5a457af..c82bb76 100644 --- a/plugin-volume/translations/volume_da.desktop +++ b/plugin-volume/translations/volume_da.desktop @@ -3,10 +3,10 @@ Type=Service ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. +Icon=multimedia-volume-control #TRANSLATIONS_DIR=../translations - # Translations -Comment[da]=Kontroller systemets lydstyrke og start din foretrukne mixer. Name[da]=Lydstyrkekontrol +Comment[da]=Juster systemets lydstyrke og start din foretrukne mikser. diff --git a/plugin-volume/translations/volume_da_DK.desktop b/plugin-volume/translations/volume_da_DK.desktop deleted file mode 100644 index 8026bb8..0000000 --- a/plugin-volume/translations/volume_da_DK.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[da_DK]=Kontroller systemets lydstyrke og start din foretrukne mixer. -Name[da_DK]=Lydstyrkekontrol diff --git a/plugin-volume/translations/volume_fr.desktop b/plugin-volume/translations/volume_fr.desktop new file mode 100644 index 0000000..38e74b2 --- /dev/null +++ b/plugin-volume/translations/volume_fr.desktop @@ -0,0 +1,2 @@ +Name[fr]=Volume audio +Comment[fr]=Réglage du volume audio du système et démarrage du mixeur. diff --git a/plugin-volume/translations/volume_pt.desktop b/plugin-volume/translations/volume_pt.desktop index c609f7f..d6b6497 100644 --- a/plugin-volume/translations/volume_pt.desktop +++ b/plugin-volume/translations/volume_pt.desktop @@ -1,11 +1,3 @@ [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 Name[pt]=Controlo de volume Comment[pt]=Controlar o volume do sistema e abrir o gestor de som diff --git a/plugin-worldclock/translations/worldclock_da.desktop b/plugin-worldclock/translations/worldclock_da.desktop new file mode 100644 index 0000000..80b6c81 --- /dev/null +++ b/plugin-worldclock/translations/worldclock_da.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Service +ServiceTypes=LXQtPanel/Plugin +Name=World clock +Comment=World clock plugin. +Icon=clock + +#TRANSLATIONS_DIR=../translations + +# Translations +Name[da]=Verdensur +Comment[da]=Verdensur-plugin. \ No newline at end of file diff --git a/plugin-worldclock/translations/worldclock_fr.desktop b/plugin-worldclock/translations/worldclock_fr.desktop new file mode 100644 index 0000000..a01b50e --- /dev/null +++ b/plugin-worldclock/translations/worldclock_fr.desktop @@ -0,0 +1,2 @@ +Name[fr]=Horloge universelle +Comment[fr]=Horloge universelle