diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,11 @@ cmake_minimum_required(VERSION 3.0) project(plasma-workspace) +<<<<<<< HEAD set(PROJECT_VERSION "5.15.80") +======= +set(PROJECT_VERSION "5.15.2") +>>>>>>> Update version number for 5.15.2 set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.12.0") diff --git a/libtaskmanager/virtualdesktopinfo.cpp b/libtaskmanager/virtualdesktopinfo.cpp --- a/libtaskmanager/virtualdesktopinfo.cpp +++ b/libtaskmanager/virtualdesktopinfo.cpp @@ -336,6 +336,9 @@ QStringList VirtualDesktopInfo::WaylandPrivate::desktopNames() const { + if (!virtualDesktopManagement) { + return QStringList(); + } QStringList names; foreach(const QString &id, virtualDesktops) { @@ -351,11 +354,18 @@ int VirtualDesktopInfo::WaylandPrivate::desktopLayoutRows() const { + if (!virtualDesktopManagement) { + return 0; + } + return virtualDesktopManagement->rows(); } void VirtualDesktopInfo::WaylandPrivate::requestActivate(const QVariant &desktop) { + if (!virtualDesktopManagement) { + return; + } KWayland::Client::PlasmaVirtualDesktop *desktopObj = virtualDesktopManagement->getVirtualDesktop(desktop.toString()); if (desktopObj) { @@ -365,11 +375,17 @@ void VirtualDesktopInfo::WaylandPrivate::requestCreateDesktop(quint32 position) { + if (!virtualDesktopManagement) { + return; + } virtualDesktopManagement->requestCreateVirtualDesktop(i18n("New Desktop"), position); } void VirtualDesktopInfo::WaylandPrivate::requestRemoveDesktop(quint32 position) { + if (!virtualDesktopManagement) { + return; + } if (virtualDesktops.count() == 1) { return; } diff --git a/lookandfeel/contents/components/Clock.qml b/lookandfeel/contents/components/Clock.qml --- a/lookandfeel/contents/components/Clock.qml +++ b/lookandfeel/contents/components/Clock.qml @@ -32,6 +32,19 @@ width: clock.implicitWidth height: clock.implicitHeight + DropShadow { + id: clockShadow + visible: !softwareRendering + anchors.fill: clock + source: clock + horizontalOffset: 0 + verticalOffset: 2 + radius: 14 + samples: 32 + spread: 0.3 + color: ColorScope.backgroundColor + } + ColumnLayout { id: clock Label { @@ -55,14 +68,4 @@ interval: 1000 } } - - layer.enabled: !softwareRendering - layer.effect: DropShadow { - horizontalOffset: 0 - verticalOffset: 2 - radius: 14 - samples: 32 - spread: 0.3 - color: ColorScope.backgroundColor - } } diff --git a/lookandfeel/contents/components/UserDelegate.qml b/lookandfeel/contents/components/UserDelegate.qml --- a/lookandfeel/contents/components/UserDelegate.qml +++ b/lookandfeel/contents/components/UserDelegate.qml @@ -147,6 +147,19 @@ " } + DropShadow { + id: usernameShadow + visible: !softwareRendering + anchors.fill: usernameDelegate + source: usernameDelegate + horizontalOffset: 0 + verticalOffset: 1 + radius: 12 + samples: 32 + spread: 0.35 + color: ColorScope.backgroundColor + } + PlasmaComponents.Label { id: usernameDelegate anchors { @@ -162,16 +175,6 @@ horizontalAlignment: Text.AlignHCenter //make an indication that this has active focus, this only happens when reached with keyboard navigation font.underline: wrapper.activeFocus - - layer.enabled: !softwareRendering - layer.effect: DropShadow { - horizontalOffset: 0 - verticalOffset: 1 - radius: 12 - samples: 32 - spread: 0.35 - color: ColorScope.backgroundColor - } } MouseArea { diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop --- a/lookandfeel/metadata.desktop +++ b/lookandfeel/metadata.desktop @@ -1,4 +1,5 @@ [Desktop Entry] +<<<<<<< HEAD Comment=Breeze by the KDE VDG Comment[ca]=Brisa pel VDG del KDE Comment[ca@valencia]=Brisa pel VDG del KDE @@ -15,6 +16,50 @@ Comment[x-test]=xxBreeze by the KDE VDGxx Comment[zh_CN]=微风，由 KDE VDG 创作 Comment[zh_TW]=由 KDE VDG 設計的 Breeze +======= +Comment=Breeze Desktop Design Language by the KDE VDG +Comment[bs]=Breeze jezik dizajna radne površine od strane KDE VDG +Comment[ca]=Llenguatge de disseny d'escriptori Brisa pel VDG del KDE +Comment[ca@valencia]=Llenguatge de disseny d'escriptori Brisa pel VDG del KDE +Comment[cs]=Jazyk pro návrh pracovní plochy Breeze od KDE VDG +Comment[da]=Breeze sprog til skrivebordsdesign af KDE VDG +Comment[de]=Breeze-Arbeitsflächendesign der KDE VG +Comment[el]=Γλώσσα σχεδιασμού επιφάνειας εργασίας Breeze από το KDE VDG +Comment[en_GB]=Breeze Desktop Design Language by the KDE VDG +Comment[es]=Lenguaje de diseño del escritorio Breeze, por el VDG de KDE +Comment[et]=Breeze töölauakujunduse keel KDE VDG-lt +Comment[eu]=Breeze mahaigain diseinurako lengoaia KDEren VDGk egina +Comment[fi]=Työpöydän design-kieli Breeze KDE VDG:ltä +Comment[fr]=Langue de conception de bureau Breeze par KDE VDG +Comment[gl]=Linguaxe de deseño do escritorio para Breeze de KDE VDG +Comment[hu]=Breeze asztali designnyelv a KDE VDG-től +Comment[id]=Bahasa Desain Desktop Breeze oleh KDE VDG +Comment[is]=Breeze skjáborðshönnunarmálið frá KDE VDG +Comment[it]=Linguaggio di progettazione del desktop Brezza a cura del VDG di KDE +Comment[ko]=KDE 시각 디자인 그룹의 Breeze 데스크톱 디자인 언어 +Comment[lt]=Breeze darbalaukio dizaino kalba, kurią sukūrė KDE VDG +Comment[nb]=Breeze-språk for skrivebordsutforming fra KDE-gruppa for visuell design +Comment[nds]=De Schriefdisch-Utleggspraak Breeze vun de KDE-VDG +Comment[nl]=Breeze ontwerptaal van het bureaublad door KDE VDG +Comment[nn]=Breeze-designspråk av KDE VDG +Comment[pa]=ਕੇਡੀਈ ਵੀਡੀਜੀ ਵਲੋਂ ਬਰੀਜ਼ ਡੈਸਕਟਾਪ ਡਿਜ਼ਾਇਨ ਭਾਸ਼ਾ +Comment[pl]=Język projektowania pulpitu Bryza stworzony przez KDE VDG +Comment[pt]=Linguagem de Desenho do Ecrã Brisa da VDG do KDE +Comment[pt_BR]=Linguagem de desenho da área de trabalho Breeze por KDE VDG +Comment[ru]=Оформление рабочей среды Breeze от KDE VDG +Comment[sk]=Jazyk dizajnu plochy vánok od KDE VDG +Comment[sl]=Sapica, oblikovalni jezik namizja avtorjev KDE VDG +Comment[sr]=Језик дизајна површи Поветарац од КДЕ‑ВДГ‑а +Comment[sr@ijekavian]=Језик дизајна површи Поветарац од КДЕ‑ВДГ‑а +Comment[sr@ijekavianlatin]=Jezik dizajna površi Povetarac od KDE VDG‑a +Comment[sr@latin]=Jezik dizajna površi Povetarac od KDE VDG‑a +Comment[sv]=Breeze-konstruktionsspråk för skrivbord av KDE VDG +Comment[tr]=KDE VDG tarafından hazırlanan Breeze Masaüstü Tasarım Dili +Comment[uk]=Мова компонування стільниці Breeze, створена KDE VDG +Comment[x-test]=xxBreeze Desktop Design Language by the KDE VDGxx +Comment[zh_CN]=KDE 视觉设计组设计的微风桌面设计语言 +Comment[zh_TW]=KDE VDG 設計的微風桌面設計語言 +>>>>>>> SVN_SILENT made messages (.desktop file) - always resolve ours Keywords=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate; Keywords[ca]=Escriptori;Espai de treball;Aparença;Aspecte i comportament;Sortida;Bloqueig;Suspensió;Aturada;Hibernació; Keywords[ca@valencia]=Escriptori;Espai de treball;Aparença;Aspecte i comportament;Eixida;Bloqueig;Suspensió;Aturada;Hibernació; diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp --- a/shell/shellcorona.cpp +++ b/shell/shellcorona.cpp @@ -643,10 +643,13 @@ return; } - if (m_activityController->serviceStatus() != KActivities::Controller::Running && + auto activityStatus = m_activityController->serviceStatus(); + if (activityStatus != KActivities::Controller::Running && !qApp->property("org.kde.KActivities.core.disableAutostart").toBool()) { - qWarning("Aborting shell load: The activity manager daemon (kactivitymanagerd) is not running."); - qWarning("If this Plasma has been installed into a custom prefix, verify that its D-Bus services dir is known to the system for the daemon to be activatable."); + if (activityStatus == KActivities::Controller::NotRunning) { + qWarning("Aborting shell load: The activity manager daemon (kactivitymanagerd) is not running."); + qWarning("If this Plasma has been installed into a custom prefix, verify that its D-Bus services dir is known to the system for the daemon to be activatable."); + } return; }