[Krunner] Remove the ginormous clear button in Krunner

Fix moc include

CMakeLists.txt

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

applets/kicker/plugin/appentry.cpp

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

applets/notifications/package/contents/ui/global/Globals.qml

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

klipper/clipboardjob.cpp

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

klipper/klipper.cpp

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

krunner/qml/RunCommand.qml

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

libtaskmanager/declarative/CMakeLists.txt

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

menu/desktop/kf5-utilities-accessibility.directory

@@ -44,7 +44,7 @@ Name[id]=Aksesibilitas
 Name[is]=Auðveldað aðgengi
 Name[it]=Accessibilità
 Name[ja]=アクセシビリティ
-Name[ka]=_დამხმარე საშუალებები
+Name[ka]=წვდომადობა
 Name[kk]=Арнайы мүмкіндіктер
 Name[km]=មធ្យោបាយ​ងាយស្រួល
 Name[kn]=ನಿಲುಕಣೆ (ಆಕ್ಸೆಸಿಬಿಲಿಟಿ)
@@ -139,7 +139,7 @@ Comment[id]=Aksesibilitas
 Comment[is]=Auðveldað aðgengi
 Comment[it]=Accessibilità
 Comment[ja]=アクセシビリティ
-Comment[ka]=_დამხმარე საშუალებები
+Comment[ka]=წვდომადობა
 Comment[kk]=Арнайы мүмкіндіктер
 Comment[km]=មធ្យោបាយ​ងាយស្រួល
 Comment[kn]=ನಿಲುಕಣೆ (ಆಕ್ಸೆಸಿಬಿಲಿಟಿ)

shell/panelview.cpp

@@ -859,6 +859,9 @@ void PanelView::moveEvent(QMoveEvent *ev)
     updateEnabledBorders();
     m_strutsTimer.start(STRUTSTIMERDELAY);
     PlasmaQuick::ContainmentView::moveEvent(ev);
+    if (m_screenToFollow && !m_screenToFollow->geometry().contains(geometry())) {
+        positionPanel();
+    }
 }
 
 void PanelView::keyPressEvent(QKeyEvent *event)

shell/shellcorona.cpp

@@ -165,6 +165,8 @@ void ShellCorona::init()
 
     connect(this, &ShellCorona::containmentAdded, this, &ShellCorona::handleContainmentAdded);
 
+
+
     QAction *dashboardAction = actions()->addAction(QStringLiteral("show dashboard"));
     QObject::connect(dashboardAction, &QAction::triggered, this, &ShellCorona::setDashboardShown);
     dashboardAction->setText(i18n("Show Desktop"));
@@ -179,6 +181,21 @@ void ShellCorona::init()
     dashboardAction->setData(Plasma::Types::ControlAction);
     KGlobalAccel::self()->setGlobalShortcut(dashboardAction, Qt::CTRL | Qt::Key_F12);
 
+    QAction *panelAction = actions()->addAction(QStringLiteral("show panel"));
+    QObject::connect(panelAction, &QAction::triggered,
+                     this, &ShellCorona::togglePanelVisibility);
+    panelAction->setText(i18n("Toggle Panel"));
+    // connect(KWindowSystem::self(), &KWindowSystem::showingDesktopChanged, [panelAction](bool showing) {
+    //     panelAction->setText(showing ? i18n("Hide Desktop") : i18n("Show Desktop"));
+    //     panelAction->setChecked(showing);
+    // });
+
+    // panelAction->setAutoRepeat(true);
+    // panelAction->setCheckable(true);
+    // panelAction->setIcon(QIcon::fromTheme(QStringLiteral("panel-show")));
+    // panelAction->setData(Plasma::Types::ControlAction);
+    KGlobalAccel::self()->setGlobalShortcut(panelAction, Qt::CTRL + Qt::Key_F11);
+
     checkAddPanelAction();
     connect(KSycoca::self(), &KSycoca::databaseChanged, this, &ShellCorona::checkAddPanelAction);
 
@@ -1220,6 +1237,16 @@ QList<PanelView *> ShellCorona::panelsForScreen(QScreen *screen) const
     return ret;
 }
 
+void ShellCorona::togglePanelVisibility()
+{
+    for (auto it = m_panelViews.constBegin(), end = m_panelViews.constEnd(); it != end; ++it) {
+        if (it.value()->screen() != qGuiApp->primaryScreen()) {
+            continue;
+        }
+        it.value()->setVisible(!it.value()->isVisible());
+    }
+}
+
 DesktopView *ShellCorona::desktopForScreen(QScreen* screen) const
 {
     DesktopView *view = m_desktopViewForScreen.value(screen);
@@ -2431,5 +2458,4 @@ void ShellCorona::refreshCurrentShell()
 
 // Desktop corona handler
 
-#include "moc_shellcorona.cpp"
 #include "shellcorona.moc"

shell/shellcorona.h

@@ -224,6 +224,7 @@ protected Q_SLOTS:
 
     void showAlternativesForApplet(Plasma::Applet *applet);
 
+    void togglePanelVisibility();
 private Q_SLOTS:
     void createWaitingPanels();
     void handleContainmentAdded(Plasma::Containment *c);

wallpapers/image/plugin/utils/maximizedwindowmonitor.cpp

@@ -50,16 +50,14 @@ void MaximizedWindowMonitor::Private::init()
     q->setGroupMode(GroupMode::GroupDisabled);
 
     q->setActivity(m_activityInfo->currentActivity());
-    q->connect(m_activityInfo,
-               &TaskManager::ActivityInfo::currentActivityChanged,
-               q,
-               std::bind(&MaximizedWindowMonitor::setActivity, q, m_activityInfo->currentActivity()));
+    q->connect(m_activityInfo, &TaskManager::ActivityInfo::currentActivityChanged, q, [this] {
+        q->setActivity(m_activityInfo->currentActivity());
+    });
 
     q->setVirtualDesktop(m_virtualDesktopInfo->currentDesktop());
-    q->connect(m_virtualDesktopInfo,
-               &TaskManager::VirtualDesktopInfo::currentDesktopChanged,
-               q,
-               std::bind(&MaximizedWindowMonitor::setVirtualDesktop, q, m_virtualDesktopInfo->currentDesktop()));
+    q->connect(m_virtualDesktopInfo, &TaskManager::VirtualDesktopInfo::currentDesktopChanged, q, [this]() {
+        q->setVirtualDesktop(m_virtualDesktopInfo->currentDesktop());
+    });
 
     q->setFilterByActivity(true);
     q->setFilterByVirtualDesktop(true);