diff --git a/autostart/CMakeLists.txt b/autostart/CMakeLists.txt index 2c9279a93..6d044738b 100644 --- a/autostart/CMakeLists.txt +++ b/autostart/CMakeLists.txt @@ -1,4 +1,4 @@ -file(GLOB DESKTOP_FILES_IN *.desktop.in) +set(DESKTOP_FILES lxqt-panel.desktop.in) # Translations ********************************** lxqt_translate_desktop(DESKTOP_FILES @@ -15,8 +15,10 @@ install(FILES COMPONENT Runtime ) +configure_file(lxqt-panel_wayland.desktop.in lxqt-panel_wayland.desktop @ONLY) + install(FILES - lxqt-panel_wayland.desktop + "${CMAKE_CURRENT_BINARY_DIR}/lxqt-panel_wayland.desktop" DESTINATION "/usr/share/applications" RENAME "lxqt-panel.desktop" COMPONENT Runtime diff --git a/autostart/lxqt-panel_wayland.desktop.in b/autostart/lxqt-panel_wayland.desktop.in new file mode 100644 index 000000000..540955e18 --- /dev/null +++ b/autostart/lxqt-panel_wayland.desktop.in @@ -0,0 +1,14 @@ +[Desktop Entry] +Type=Application +TryExec=lxqt-panel +NoDisplay=true + +# NOTE: KWin wants absolute path here, get it from CMake install path +Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/lxqt-panel + +# NOTE: adding KDE to make it work under Plasma Wayland session +OnlyShowIn=LXQt;KDE +X-LXQt-Module=true + +# Make KWin recognize us as priviledged client +X-KDE-Wayland-Interfaces=org_kde_plasma_window_management diff --git a/panel/backends/wayland/plasma/lxqttaskbarbackendplasma.cpp b/panel/backends/wayland/plasma/lxqttaskbarbackendplasma.cpp index ad8b2332f..4631c03d3 100644 --- a/panel/backends/wayland/plasma/lxqttaskbarbackendplasma.cpp +++ b/panel/backends/wayland/plasma/lxqttaskbarbackendplasma.cpp @@ -450,11 +450,14 @@ bool LXQtTaskbarPlasmaBackend::isAreaOverlapped(const QRect &area) const bool LXQtTaskbarPlasmaBackend::isShowingDesktop() const { - return m_managment->isShowingDesktop(); + return m_managment->isActive() ? m_managment->isShowingDesktop() : false; } bool LXQtTaskbarPlasmaBackend::showDesktop(bool value) { + if(!m_managment->isActive()) + return false; + enum LXQtTaskBarPlasmaWindowManagment::show_desktop flag_; if(value) flag_ = LXQtTaskBarPlasmaWindowManagment::show_desktop::show_desktop_enabled; diff --git a/panel/lxqtpanel.cpp b/panel/lxqtpanel.cpp index a7a4508ab..0c676eb4b 100644 --- a/panel/lxqtpanel.cpp +++ b/panel/lxqtpanel.cpp @@ -239,23 +239,30 @@ LXQtPanel::LXQtPanel(const QString &configGroup, LXQt::Settings *settings, QWidg // Create backing QWindow for LayerShellQt integration create(); - // Init Layer Shell (Must be done before showing widget) - mLayerWindow = LayerShellQt::Window::get(windowHandle()); - mLayerWindow->setLayer(LayerShellQt::Window::LayerTop); + if(!windowHandle()) + { + qWarning() << "LXQtPanel: could not create QWindow for LayerShellQt integration."; + } + else + { + // Init Layer Shell (Must be done before showing widget) + mLayerWindow = LayerShellQt::Window::get(windowHandle()); + mLayerWindow->setLayer(LayerShellQt::Window::LayerTop); - mLayerWindow->setScope(QStringLiteral("dock")); + mLayerWindow->setScope(QStringLiteral("dock")); - LayerShellQt::Window::Anchors anchors; - anchors.setFlag(LayerShellQt::Window::AnchorLeft); - anchors.setFlag(LayerShellQt::Window::AnchorBottom); - anchors.setFlag(LayerShellQt::Window::AnchorRight); - mLayerWindow->setAnchors(anchors); + LayerShellQt::Window::Anchors anchors; + anchors.setFlag(LayerShellQt::Window::AnchorLeft); + anchors.setFlag(LayerShellQt::Window::AnchorBottom); + anchors.setFlag(LayerShellQt::Window::AnchorRight); + mLayerWindow->setAnchors(anchors); - mLayerWindow->setKeyboardInteractivity(LayerShellQt::Window::KeyboardInteractivityOnDemand); - mLayerWindow->setCloseOnDismissed(false); + mLayerWindow->setKeyboardInteractivity(LayerShellQt::Window::KeyboardInteractivityOnDemand); + mLayerWindow->setCloseOnDismissed(false); - mLayerWindow->setExclusiveEdge(LayerShellQt::Window::AnchorBottom); - mLayerWindow->setExclusiveZone(height()); + mLayerWindow->setExclusiveEdge(LayerShellQt::Window::AnchorBottom); + mLayerWindow->setExclusiveZone(height()); + } } // NOTE: Some (X11) WMs may need the geometry to be set before QWidget::show(). @@ -512,7 +519,7 @@ void LXQtPanel::setPanelGeometry(bool animate) QRect rect; LayerShellQt::Window::Anchors anchors; - LayerShellQt::Window::Anchor edge; + LayerShellQt::Window::Anchor edge = LayerShellQt::Window::AnchorBottom; if (isHorizontal()) { @@ -829,13 +836,13 @@ void LXQtPanel::updateWmStrut() ); } } - else if(qGuiApp->nativeInterface()) + else if(mLayerWindow && qGuiApp->nativeInterface()) { //TODO: duplicated code, also set in setPanelGeometry() if (mReserveSpace) { - LayerShellQt::Window::Anchor edge; + LayerShellQt::Window::Anchor edge = LayerShellQt::Window::AnchorBottom; switch (mPosition) { @@ -865,7 +872,7 @@ void LXQtPanel::updateWmStrut() mLayerWindow->setExclusiveZone(0); } - // Make LayerShell apply changes immediatly + // Make LayerShellQt apply changes immediatly windowHandle()->requestUpdate(); } } diff --git a/plugin-colorpicker/translations/colorpicker_pt_BR.desktop.yaml b/plugin-colorpicker/translations/colorpicker_pt_BR.desktop.yaml index ef623ba44..b924ecb7e 100644 --- a/plugin-colorpicker/translations/colorpicker_pt_BR.desktop.yaml +++ b/plugin-colorpicker/translations/colorpicker_pt_BR.desktop.yaml @@ -1,2 +1,2 @@ Desktop Entry/Name: "Seletor de cores" -Desktop Entry/Comment: "Obter a cor sob o cursor. Para desenvolvedores web" +Desktop Entry/Comment: "Obtém a cor sob o cursor e mantém uma lista de cores recentemente selecionadas" diff --git a/plugin-fancymenu/translations/fancymenu_de.ts b/plugin-fancymenu/translations/fancymenu_de.ts index 7c36f4488..3fa2b9833 100644 --- a/plugin-fancymenu/translations/fancymenu_de.ts +++ b/plugin-fancymenu/translations/fancymenu_de.ts @@ -14,12 +14,12 @@ Favorites - + Favoriten All Applications - + Alle Anwendungen @@ -57,12 +57,12 @@ Auto-select after: - + Automatische Auswahl nach: ms - + ms @@ -97,17 +97,17 @@ Layout - + Layout Buttons row position - + Position der Schaltflächenreihe Categories position - + Position der Kategorien @@ -117,22 +117,22 @@ Bottom - + Unten Top - + Oben Left - + Links Right - + Rechts @@ -165,22 +165,22 @@ LXQt Configuration Center - + LXQt-Konfigurationszentrum Leave - + Verlassen About LXQt - + Über LXQt Add your favorites by right clicking items from categories. - + Fügen Sie Ihre Favoriten hinzu, indem Sie einen Rechtsklick auf Elemente aus den Kategorien machen. @@ -217,22 +217,22 @@ Möchten Sie diese überschreiben? Remove from Favorites - + Aus den Favoriten entfernen Add to Favorites - + Zu den Favoriten hinzufügen No Executable - + Keine ausführbare Datei Cannot find <b>%1</b> executable. - + Kann ausführbare Datei <b>%1</b> nicht finden. diff --git a/plugin-fancymenu/translations/fancymenu_ja.ts b/plugin-fancymenu/translations/fancymenu_ja.ts index 429e6d282..6fa1979e1 100644 --- a/plugin-fancymenu/translations/fancymenu_ja.ts +++ b/plugin-fancymenu/translations/fancymenu_ja.ts @@ -14,12 +14,12 @@ Favorites - + お気に入り All Applications - + すべてのアプリケーション @@ -62,7 +62,7 @@ ms - + ミリ秒 @@ -97,7 +97,7 @@ Layout - + レイアウト @@ -107,7 +107,7 @@ Categories position - + カテゴリの位置 @@ -117,7 +117,7 @@ Bottom - + @@ -127,7 +127,7 @@ Left - + @@ -175,7 +175,7 @@ About LXQt - + LXQt について @@ -222,17 +222,17 @@ Do you want to overwrite it? Add to Favorites - + お気に入りに追加 No Executable - + 実行可能ファイルがありません Cannot find <b>%1</b> executable. - + 実行ファイル <b>%1</b> が見つかりません。 diff --git a/plugin-fancymenu/translations/fancymenu_ru.ts b/plugin-fancymenu/translations/fancymenu_ru.ts index a51fcb945..24458eb40 100644 --- a/plugin-fancymenu/translations/fancymenu_ru.ts +++ b/plugin-fancymenu/translations/fancymenu_ru.ts @@ -27,7 +27,7 @@ Fancy Menu settings - + Настройки модного меню @@ -57,7 +57,7 @@ Auto-select after: - Автоматический выбор: + Автовыбор после: @@ -97,17 +97,17 @@ Layout - Компоновка + Разметка Buttons row position - Расположение кнопок в ряд + Расположение кнопок в ряду Categories position - Расположение категорий + Расположение категорий @@ -117,22 +117,22 @@ Bottom - + Снизу Top - + Сверху Left - + Слева Right - + Справа @@ -165,12 +165,12 @@ LXQt Configuration Center - Центр Настройки LXQt + Центр настройки LXQt Leave - Выйти + Выйти @@ -180,7 +180,7 @@ Add your favorites by right clicking items from categories. - Нажатие правой кнопкой мыши по категории, добавляет её в избранное. + Нажатие правой кнопкой мыши по категории добавляет её в избранное. @@ -190,7 +190,7 @@ Question - Вопрос + Вопрос @@ -227,7 +227,7 @@ Do you want to overwrite it? No Executable - Не исполняемый + Не исполняемый diff --git a/plugin-fancymenu/translations/fancymenu_sk_SK.ts b/plugin-fancymenu/translations/fancymenu_sk_SK.ts index 1929f80b2..17dd79eb8 100644 --- a/plugin-fancymenu/translations/fancymenu_sk_SK.ts +++ b/plugin-fancymenu/translations/fancymenu_sk_SK.ts @@ -14,7 +14,7 @@ Favorites - Obľubené + Obľúbene @@ -37,7 +37,7 @@ Icon: - Ikonka: + Ikona: @@ -137,7 +137,7 @@ Choose icon file - Vybrať ikonu súboru + Vybrať súbor s ikonami @@ -165,7 +165,7 @@ LXQt Configuration Center - LXQt Konfiguračné centrum + Centrum nastavení LXQt diff --git a/plugin-fancymenu/translations/fancymenu_sl.ts b/plugin-fancymenu/translations/fancymenu_sl.ts index 410ccc9fa..a07515551 100644 --- a/plugin-fancymenu/translations/fancymenu_sl.ts +++ b/plugin-fancymenu/translations/fancymenu_sl.ts @@ -14,12 +14,12 @@ Favorites - + Obľúbené All Applications - + Všetky aplikácie @@ -27,7 +27,7 @@ Fancy Menu settings - + Nastavenia Fancy Menu @@ -57,12 +57,12 @@ Auto-select after: - + Automatický výber po: ms - + ms @@ -97,17 +97,17 @@ Layout - + Rozloženie Buttons row position - + Pozícia riadka tlačidiel Categories position - + Pozícia kategórií @@ -117,22 +117,22 @@ Bottom - + Dole Top - + Hore Left - + Vľavo Right - + Vpravo @@ -165,22 +165,22 @@ LXQt Configuration Center - + Centrum nastavení LXQt Leave - + Opustiť About LXQt - + O prostredí LXQt Add your favorites by right clicking items from categories. - + Pridajte svoje obľúbené položky kliknutím pravým tlačidlom myši na položky z kategórií. @@ -196,17 +196,18 @@ A file with the same name already exists. Do you want to overwrite it? - + Súbor s rovnakým názvom už existuje. +Chcete ho prepísať? Warning - + Upozornenie The file cannot be overwritten. - + Súbor nemôže byť prepísaný. @@ -216,22 +217,22 @@ Do you want to overwrite it? Remove from Favorites - + Odstrániť z obľúbených Add to Favorites - + Pridať k obľúbeným No Executable - + Nespustiteľné Cannot find <b>%1</b> executable. - + Nie je možné nájsť <b>%1</b> spustiteľné.