Compare commits

..

5 Commits

Author SHA1 Message Date
Jacopo De Simoi fe5ae9c685 Add shortcut to hide panel 3 years ago
Fushan Wen 8a35e3418b
kcms/colors: update accent color reply type 4 years ago
Fushan Wen 2eb8978517 wallpapers/image: fix wrong usage of `std::bind` 4 years ago
Fushan Wen df793b9bbd Revert "Revert "Prevent panel going out of screen boundaries"" 4 years ago
l10n daemon script 8766314279 SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
  1. 2
      CMakeLists.txt
  2. 12
      applets/kicker/plugin/appentry.cpp
  3. 2
      applets/notifications/package/contents/ui/global/Globals.qml
  4. 4
      kcms/colors/colors.cpp
  5. 2
      klipper/clipboardjob.cpp
  6. 4
      klipper/klipper.cpp
  7. 17
      krunner/qml/RunCommand.qml
  8. 16
      libtaskmanager/declarative/CMakeLists.txt

@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
project(plasma-workspace) project(plasma-workspace)
set(PROJECT_VERSION "5.26.80") set(PROJECT_VERSION "5.25.90")
set(PROJECT_VERSION_MAJOR 5) set(PROJECT_VERSION_MAJOR 5)
set(QT_MIN_VERSION "5.15.2") set(QT_MIN_VERSION "5.15.2")

@ -133,8 +133,9 @@ AppEntry::AppEntry(AbstractModel *owner, KService::Ptr service, NameFormat nameF
: AbstractEntry(owner) : AbstractEntry(owner)
, m_service(service) , m_service(service)
{ {
Q_ASSERT(service); if (m_service) {
init(nameFormat); init(nameFormat);
}
} }
AppEntry::AppEntry(AbstractModel *owner, const QString &id) AppEntry::AppEntry(AbstractModel *owner, const QString &id)
@ -157,11 +158,8 @@ AppEntry::AppEntry(AbstractModel *owner, const QString &id)
} else { } else {
m_service = KService::serviceByStorageId(id); m_service = KService::serviceByStorageId(id);
} }
if (!m_service) {
m_service = new KService(QString());
}
if (m_service->isValid()) { if (m_service) {
init((NameFormat)owner->rootModel()->property("appNameFormat").toInt()); init((NameFormat)owner->rootModel()->property("appNameFormat").toInt());
} }
} }
@ -179,7 +177,7 @@ void AppEntry::init(NameFormat nameFormat)
bool AppEntry::isValid() const bool AppEntry::isValid() const
{ {
return m_service->isValid(); return m_service;
} }
QIcon AppEntry::icon() const QIcon AppEntry::icon() const

@ -169,7 +169,7 @@ QtObject {
// Make it wider when on the top or the bottom center, since there's more horizontal // Make it wider when on the top or the bottom center, since there's more horizontal
// space available without looking weird // space available without looking weird
// On mobile however we don't really want to have larger notifications // On mobile however we don't really want to have larger notifications
property int popupWidth:818 // (popupLocation & Qt.AlignHCenter) && !Kirigami.Settings.isMobile ? PlasmaCore.Units.gridUnit * 22 : PlasmaCore.Units.gridUnit * 18 property int popupWidth: (popupLocation & Qt.AlignHCenter) && !Kirigami.Settings.isMobile ? PlasmaCore.Units.gridUnit * 22 : PlasmaCore.Units.gridUnit * 18
property int popupEdgeDistance: PlasmaCore.Units.largeSpacing * 2 property int popupEdgeDistance: PlasmaCore.Units.largeSpacing * 2
// Reduce spacing between popups when centered so the stack doesn't intrude into the // Reduce spacing between popups when centered so the stack doesn't intrude into the
// view as much // view as much

@ -445,9 +445,9 @@ void KCMColors::applyWallpaperAccentColor()
void KCMColors::wallpaperAccentColorArrivedSlot(QDBusPendingCallWatcher *call) void KCMColors::wallpaperAccentColorArrivedSlot(QDBusPendingCallWatcher *call)
{ {
QDBusPendingReply<QString> reply = *call; QDBusPendingReply<uint> reply = *call;
if (!reply.isError()) { if (!reply.isError()) {
setAccentColor(QColor(reply.value())); setAccentColor(QColor::fromRgba(reply.value()));
} }
call->deleteLater(); call->deleteLater();
} }

@ -16,7 +16,7 @@
#include <QIcon> #include <QIcon>
#include <QtConcurrent> #include <QtConcurrent>
#include <Prison/Prison> #include <prison/Prison>
const static QString s_iconKey = QStringLiteral("icon"); const static QString s_iconKey = QStringLiteral("icon");
const static QString s_previewKey = QStringLiteral("preview"); const static QString s_previewKey = QStringLiteral("preview");

@ -47,7 +47,11 @@
#include "klipperpopup.h" #include "klipperpopup.h"
#include "klippersettings.h" #include "klippersettings.h"
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
#include <Prison/Prison> #include <Prison/Prison>
#else
#include <prison/Prison>
#endif
#include <config-X11.h> #include <config-X11.h>
#if HAVE_X11 #if HAVE_X11

@ -68,14 +68,13 @@ ColumnLayout {
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
PlasmaComponents3.ToolButton { PlasmaComponents3.ToolButton {
icon.name: "configure" icon.name: "configure"
visible:false
onClicked: { onClicked: {
runnerWindow.visible = false runnerWindow.visible = false
runnerWindow.displayConfiguration() runnerWindow.displayConfiguration()
} }
Accessible.name: i18n("Configure") Accessible.name: i18n("Configure")
Accessible.description: i18n("Configure KRunner Behavior") Accessible.description: i18n("Configure KRunner Behavior")
visible: KCMShell.authorize("kcm_krunnersettings.desktop").length > 0
PlasmaComponents3.ToolTip { PlasmaComponents3.ToolTip {
text: i18n("Configure KRunner…") text: i18n("Configure KRunner…")
} }
@ -84,8 +83,8 @@ ColumnLayout {
id: queryField id: queryField
property bool allowCompletion: false property bool allowCompletion: false
clearButtonShown: false Layout.minimumWidth: PlasmaCore.Units.gridUnit * 25
Layout.minimumWidth: 818 Layout.maximumWidth: PlasmaCore.Units.gridUnit * 25
activeFocusOnPress: true activeFocusOnPress: true
placeholderText: results.runnerName ? i18nc("Textfield placeholder text, query specific KRunner plugin", placeholderText: results.runnerName ? i18nc("Textfield placeholder text, query specific KRunner plugin",
@ -220,7 +219,7 @@ ColumnLayout {
} }
} }
PlasmaComponents3.ToolButton { PlasmaComponents3.ToolButton {
visible: false visible: runnerWindow.helpEnabled
checkable: true checkable: true
checked: root.query.startsWith("?") checked: root.query.startsWith("?")
// Reset if out quers starts with "?", otherwise set it to "?" // Reset if out quers starts with "?", otherwise set it to "?"
@ -331,9 +330,9 @@ ColumnLayout {
currentIndex = 0; currentIndex = 0;
} }
} }
Keys.onReturnPressed: runCurrentIndex() Keys.onReturnPressed: runCurrentIndex(event)
Keys.onEnterPressed: runCurrentIndex() Keys.onEnterPressed: runCurrentIndex(event)
Keys.onTabPressed: { Keys.onTabPressed: {
if (currentIndex == listView.count-1) { if (currentIndex == listView.count-1) {
listView.nextItemInFocusChain(true).forceActiveFocus(); listView.nextItemInFocusChain(true).forceActiveFocus();
@ -368,7 +367,7 @@ ColumnLayout {
queryField.focus = true; queryField.focus = true;
} }
} }
Keys.onUpPressed: decrementCurrentIndex() Keys.onUpPressed: decrementCurrentIndex()
Keys.onDownPressed: incrementCurrentIndex() Keys.onDownPressed: incrementCurrentIndex()

@ -35,15 +35,13 @@ target_link_libraries(taskmanagerplugin Qt::Qml Qt::GuiPrivate
KF5::I18n KF5::I18n
Qt::WaylandClient Qt::WaylandClient
Wayland::Client) Wayland::Client)
if (QT_MAJOR_VERSION EQUAL "5") if (${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL "GLESv2")
if (${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL "GLESv2") target_link_libraries(taskmanagerplugin Qt5::Gui_GLESv2)
target_link_libraries(taskmanagerplugin Qt5::Gui_GLESv2) elseif(TARGET Qt5::Gui_GL)
elseif(TARGET Qt5::Gui_GL) target_link_libraries(taskmanagerplugin Qt5::Gui_GL)
target_link_libraries(taskmanagerplugin Qt5::Gui_GL) endif()
endif() if (TARGET Qt5::Gui_EGL)
if (TARGET Qt5::Gui_EGL) target_link_libraries(taskmanagerplugin Qt5::Gui_EGL)
target_link_libraries(taskmanagerplugin Qt5::Gui_EGL)
endif()
endif() endif()
if(TARGET K::KPipeWire) if(TARGET K::KPipeWire)

Loading…
Cancel
Save