Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package krunner for openSUSE:Factory checked in at 2022-01-11 21:16:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krunner (Old) and /work/SRC/openSUSE:Factory/.krunner.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krunner" Tue Jan 11 21:16:42 2022 rev:96 rq:945082 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/krunner/krunner.changes 2021-12-13 20:44:43.080487442 +0100 +++ /work/SRC/openSUSE:Factory/.krunner.new.1892/krunner.changes 2022-01-11 21:19:28.072967195 +0100 @@ -1,0 +2,16 @@ +Mon Jan 3 12:47:53 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 5.90.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.90.0 +- Changes since 5.89.0: + * Change the build system to enable building with Qt6 + * Do not require Plasma when building without deprecations + * Improve QRegularExpression usage a bit + * dbusrunner: Reduce unnecessary QMap lookups + * dbusrunner: Set parent for matches to the current runner + * Allow runners to opt-out storage of entry to history + * RunerContext: Allow runners to update the query string + +------------------------------------------------------------------- Old: ---- krunner-5.89.0.tar.xz krunner-5.89.0.tar.xz.sig New: ---- krunner-5.90.0.tar.xz krunner-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krunner.spec ++++++ --- /var/tmp/diff_new_pack.NJ0XJ5/_old 2022-01-11 21:19:28.708967642 +0100 +++ /var/tmp/diff_new_pack.NJ0XJ5/_new 2022-01-11 21:19:28.712967645 +0100 @@ -17,22 +17,22 @@ %define lname libKF5Runner5 -%define _tar_path 5.89 +%define _tar_path 5.90 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} # Only needed for the package signature condition -%bcond_without lang +%bcond_without released Name: krunner -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: KDE Framework for providing different actions given a string query License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org Source: %{name}-%{version}.tar.xz -%if %{with lang} +%if %{with released} Source1: %{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif @@ -104,7 +104,7 @@ %{_kf5_includedir}/KRunner/ %{_kf5_includedir}/*.h %{_kf5_mkspecsdir}/qt_KRunner.pri -%{_kf5_sharedir}/kdevappwizard +%{_kf5_sharedir}/kdevfiletemplates/ %{_kf5_dbusinterfacesdir}/kf5_org.kde.krunner1.xml %changelog ++++++ krunner-5.89.0.tar.xz -> krunner-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.89.0/CMakeLists.txt new/krunner-5.90.0/CMakeLists.txt --- old/krunner-5.89.0/CMakeLists.txt 2021-12-04 18:04:06.000000000 +0100 +++ new/krunner-5.90.0/CMakeLists.txt 2022-01-01 13:19:01.000000000 +0100 @@ -3,13 +3,13 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.89.0") # handled by release scripts -set(KF_DEP_VERSION "5.89.0") # handled by release scripts +set(KF_VERSION "5.90.0") # handled by release scripts +set(KF_DEP_VERSION "5.90.0") # handled by release scripts project(KRunner VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.89.0 NO_MODULE) +find_package(ECM 5.90.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -43,15 +43,18 @@ # Dependencies set(REQUIRED_QT_VERSION 5.15.2) -find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Gui Widgets Quick) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Gui Widgets Quick) find_package(KF5Config ${KF_DEP_VERSION} REQUIRED) find_package(KF5CoreAddons ${KF_DEP_VERSION} REQUIRED) find_package(KF5I18n ${KF_DEP_VERSION} REQUIRED) find_package(KF5KIO ${KF_DEP_VERSION} REQUIRED) find_package(KF5Service ${KF_DEP_VERSION} REQUIRED) -find_package(KF5Plasma ${KF_DEP_VERSION} REQUIRED) find_package(KF5ThreadWeaver ${KF_DEP_VERSION} REQUIRED) +if(NOT EXCLUDE_DEPRECATED_BEFORE_AND_AT STREQUAL "CURRENT" AND + EXCLUDE_DEPRECATED_BEFORE_AND_AT VERSION_LESS 5.65.0) + find_package(KF5Plasma ${KF_DEP_VERSION} REQUIRED) +endif() find_package(KF5Activities ${KF_DEP_VERSION}) set_package_properties(KF5Activities PROPERTIES @@ -117,7 +120,7 @@ NAMESPACE KF5::) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/krunner_version.h" - DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}" + DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF}" COMPONENT Devel) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.89.0/KF5RunnerConfig.cmake.in new/krunner-5.90.0/KF5RunnerConfig.cmake.in --- old/krunner-5.89.0/KF5RunnerConfig.cmake.in 2021-12-04 18:04:06.000000000 +0100 +++ new/krunner-5.90.0/KF5RunnerConfig.cmake.in 2022-01-01 13:19:01.000000000 +0100 @@ -5,7 +5,7 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(Qt5Core "@REQUIRED_QT_VERSION@") +find_dependency(Qt@QT_MAJOR_VERSION@Core "@REQUIRED_QT_VERSION@") find_dependency(KF5Plasma "@KF_DEP_VERSION@") @PACKAGE_SETUP_AUTOMOC_VARIABLES@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.89.0/autotests/CMakeLists.txt new/krunner-5.90.0/autotests/CMakeLists.txt --- old/krunner-5.89.0/autotests/CMakeLists.txt 2021-12-04 18:04:06.000000000 +0100 +++ new/krunner-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:19:01.000000000 +0100 @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2021 Alexander Lohnau <[email protected]> # SPDX-License-Identifier: BSD-2-Clause -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) include(ECMAddTests) @@ -11,35 +11,36 @@ AND NOT WIN32) ecm_add_tests( runnercontexttest.cpp - LINK_LIBRARIES Qt5::Test KF5::KIOCore KF5Runner + LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::KIOCore KF5Runner ) endif() ecm_add_tests( dbusrunnertest.cpp - LINK_LIBRARIES Qt5::Test KF5::KIOCore KF5Runner Qt5::Widgets + LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::KIOCore KF5Runner Qt${QT_MAJOR_VERSION}::Widgets ) ecm_add_tests( runnermatchmethodstest.cpp - LINK_LIBRARIES Qt5::Test KF5::KIOCore KF5Runner Qt5::Widgets + LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::KIOCore KF5Runner Qt${QT_MAJOR_VERSION}::Widgets ) ecm_add_tests( runnermanagerhistorytest.cpp - LINK_LIBRARIES Qt5::Test KF5::KIOCore KF5Runner Qt5::Widgets + LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::KIOCore KF5Runner Qt${QT_MAJOR_VERSION}::Widgets ) ecm_add_tests( runnermanagersinglerunnermodetest.cpp - LINK_LIBRARIES Qt5::Test KF5::KIOCore KF5Runner Qt5::Widgets Qt5::DBus + LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::KIOCore KF5Runner Qt${QT_MAJOR_VERSION}::Widgets Qt${QT_MAJOR_VERSION}::DBus ) add_executable(testremoterunner) qt_add_dbus_adaptor(demoapp_dbus_adaptor_SRCS "../src/data/org.kde.krunner1.xml" testremoterunner.h TestRemoteRunner) target_sources(testremoterunner PRIVATE testremoterunner.cpp ${demoapp_dbus_adaptor_SRCS}) target_link_libraries(testremoterunner - Qt5::DBus + Qt${QT_MAJOR_VERSION}::DBus + Qt${QT_MAJOR_VERSION}::Gui KF5::Runner ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.89.0/src/CMakeLists.txt new/krunner-5.90.0/src/CMakeLists.txt --- old/krunner-5.89.0/src/CMakeLists.txt 2021-12-04 18:04:06.000000000 +0100 +++ new/krunner-5.90.0/src/CMakeLists.txt 2022-01-01 13:19:01.000000000 +0100 @@ -54,18 +54,17 @@ ) set(KRunner_BUILD_INCLUDE_DIRS ${KRunner_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -target_include_directories(KF5Runner INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KRunner>") +target_include_directories(KF5Runner INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KRunner>") target_include_directories(KF5Runner PUBLIC "$<BUILD_INTERFACE:${KRunner_BUILD_INCLUDE_DIRS}>") target_link_libraries(KF5Runner PUBLIC - Qt5::Core - KF5::Plasma # Must be public because abstractrunner.h needs plasma/version.h + Qt${QT_MAJOR_VERSION}::Core PRIVATE - Qt5::DBus - Qt5::Gui - Qt5::Widgets + Qt${QT_MAJOR_VERSION}::DBus + Qt${QT_MAJOR_VERSION}::Gui + Qt${QT_MAJOR_VERSION}::Widgets KF5::ConfigCore KF5::Service KF5::I18n @@ -73,6 +72,13 @@ KF5::CoreAddons #KShell KF5::KIOCore #KProtocolInfo ) +if(NOT EXCLUDE_DEPRECATED_BEFORE_AND_AT STREQUAL "CURRENT" AND + EXCLUDE_DEPRECATED_BEFORE_AND_AT VERSION_LESS 5.65.0) + target_link_libraries(KF5Runner + PUBLIC + KF5::Plasma # Must be public because abstractrunner.h needs plasma/version.h + ) +endif() if(HAVE_KACTIVITIES) target_link_libraries(KF5Runner PRIVATE KF5::Activities) endif() @@ -103,18 +109,18 @@ ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES ${KRunner_CamelCase_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KRunner/KRunner + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KRunner/KRunner COMPONENT Devel) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/krunner_export.h ${KRunner_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KRunner/krunner + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KRunner/krunner COMPONENT Devel) install(FILES data/servicetypes/plasma-runner.desktop - DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR}) + DESTINATION ${KDE_INSTALL_KSERVICETYPESDIR}) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin/data/kservicetypes5) add_custom_command(TARGET KF5Runner PRE_BUILD COMMAND @@ -159,7 +165,7 @@ endif() include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KRunner LIB_NAME KF5Runner DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KRunner) +ecm_generate_pri_file(BASE_NAME KRunner LIB_NAME KF5Runner DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KRunner) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.89.0/src/abstractrunner.cpp new/krunner-5.90.0/src/abstractrunner.cpp --- old/krunner-5.89.0/src/abstractrunner.cpp 2021-12-04 18:04:06.000000000 +0100 +++ new/krunner-5.90.0/src/abstractrunner.cpp 2022-01-01 13:19:01.000000000 +0100 @@ -450,7 +450,6 @@ // If we can reject the query because of the length we don't need the regex setMinLetterCount(minTriggerWordLetters); QRegularExpression regex(constructedRegex); - regex.optimize(); setMatchRegex(regex); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.89.0/src/abstractrunner.h new/krunner-5.90.0/src/abstractrunner.h --- old/krunner-5.89.0/src/abstractrunner.h 2021-12-04 18:04:06.000000000 +0100 +++ new/krunner-5.90.0/src/abstractrunner.h 2022-01-01 13:19:01.000000000 +0100 @@ -16,12 +16,15 @@ #include <KPluginMetaData> #include <KService> +#include "krunner_export.h" + +#if KRUNNER_ENABLE_DEPRECATED_SINCE(5, 65) #include <plasma/plasma_export.h> // for PLASMA_ENABLE_DEPRECATED_SINCE #include <plasma_version.h> +#endif #include <memory> -#include "krunner_export.h" #include "querymatch.h" #include "runnercontext.h" #include "runnersyntax.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.89.0/src/dbusrunner.cpp new/krunner-5.90.0/src/dbusrunner.cpp --- old/krunner-5.89.0/src/dbusrunner.cpp 2021-12-04 18:04:06.000000000 +0100 +++ new/krunner-5.90.0/src/dbusrunner.cpp 2022-01-01 13:19:01.000000000 +0100 @@ -105,17 +105,18 @@ } } -void DBusRunner::createQActionsFromRemoteActions(const QMap<QString, RemoteActions> remoteActions) +void DBusRunner::createQActionsFromRemoteActions(const QMap<QString, RemoteActions> &remoteActions) { for (auto it = remoteActions.begin(), end = remoteActions.end(); it != end; it++) { const QString service = it.key(); const RemoteActions actions = it.value(); - qDeleteAll(m_actions[service]); - m_actions[service].clear(); + auto &serviceActions = m_actions[service]; + qDeleteAll(serviceActions); + serviceActions.clear(); for (const RemoteAction &action : actions) { - auto a = new QAction(QIcon::fromTheme(action.iconName), action.text); + auto a = new QAction(QIcon::fromTheme(action.iconName), action.text, this); a->setData(action.id); - m_actions[service].append(a); + serviceActions.append(a); } } } @@ -178,7 +179,6 @@ for (auto it = config.cbegin(), end = config.cend(); it != end; ++it) { if (it.key() == QLatin1String("MatchRegex")) { QRegularExpression regex(it.value().toString()); - regex.optimize(); setMatchRegex(regex); } else if (it.key() == QLatin1String("MinLetterCount")) { setMinLetterCount(it.value().toInt()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.89.0/src/dbusrunner_p.h new/krunner-5.90.0/src/dbusrunner_p.h --- old/krunner-5.89.0/src/dbusrunner_p.h 2021-12-04 18:04:06.000000000 +0100 +++ new/krunner-5.90.0/src/dbusrunner_p.h 2022-01-01 13:19:01.000000000 +0100 @@ -31,7 +31,7 @@ public Q_SLOTS: void teardown(); // This method should only be called from the main thread! - void createQActionsFromRemoteActions(const QMap<QString, RemoteActions> remoteActions); + void createQActionsFromRemoteActions(const QMap<QString, RemoteActions> &remoteActions); private: // Returns RemoteActions with service name as key diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.89.0/src/declarative/CMakeLists.txt new/krunner-5.90.0/src/declarative/CMakeLists.txt --- old/krunner-5.89.0/src/declarative/CMakeLists.txt 2021-12-04 18:04:06.000000000 +0100 +++ new/krunner-5.90.0/src/declarative/CMakeLists.txt 2022-01-01 13:19:01.000000000 +0100 @@ -18,9 +18,9 @@ ) target_link_libraries(runnermodelplugin - Qt5::Quick - Qt5::Qml - Qt5::Widgets # QAction + Qt${QT_MAJOR_VERSION}::Quick + Qt${QT_MAJOR_VERSION}::Qml + Qt${QT_MAJOR_VERSION}::Widgets # QAction KF5::I18n KF5::Service KF5Runner diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.89.0/src/runnercontext.cpp new/krunner-5.90.0/src/runnercontext.cpp --- old/krunner-5.89.0/src/runnercontext.cpp 2021-12-04 18:04:06.000000000 +0100 +++ new/krunner-5.90.0/src/runnercontext.cpp 2022-01-01 13:19:01.000000000 +0100 @@ -171,7 +171,10 @@ RunnerContext *q; static RunnerContext s_dummyContext; bool singleRunnerQueryMode = false; + bool shouldIgnoreCurrentMatchForHistory = false; QMap<QString, QueryMatch> uniqueIds; + QString requestedText; + int requestedCursorPosition = 0; }; RunnerContext RunnerContextPrivate::s_dummyContext; @@ -241,6 +244,7 @@ d->uniqueIds.clear(); d->type = UnknownType; d->singleRunnerQueryMode = false; + d->shouldIgnoreCurrentMatchForHistory = false; } void RunnerContext::setQuery(const QString &term) @@ -251,6 +255,7 @@ return; } + d->requestedText.clear(); // Invalidate this field whenever the query changes d->term = term; #if KRUNNER_BUILD_DEPRECATED_SINCE(5, 76) d->determineType(); @@ -433,6 +438,12 @@ } #endif +void RunnerContext::requestQueryStringUpdate(const QString &text, int cursorPosition) const +{ + d->requestedText = text; + d->requestedCursorPosition = cursorPosition; +} + void RunnerContext::setSingleRunnerQueryMode(bool enabled) { d->singleRunnerQueryMode = enabled; @@ -443,11 +454,21 @@ return d->singleRunnerQueryMode; } +void RunnerContext::ignoreCurrentMatchForHistory() const +{ + d->shouldIgnoreCurrentMatchForHistory = true; +} + +bool RunnerContext::shouldIgnoreCurrentMatchForHistory() const +{ + return d->shouldIgnoreCurrentMatchForHistory; +} + void RunnerContext::restore(const KConfigGroup &config) { const QStringList cfgList = config.readEntry("LaunchCounts", QStringList()); - const QRegularExpression re(QStringLiteral("(\\d*) (.+)")); + static const QRegularExpression re(QStringLiteral("(\\d*) (.+)")); for (const QString &entry : cfgList) { const QRegularExpressionMatch match = re.match(entry); if (!match.hasMatch()) { @@ -479,6 +500,15 @@ match.run(*this); } +QString RunnerContext::requestedQueryString() const +{ + return d->requestedText; +} +int RunnerContext::requestedCursorPosition() const +{ + return d->requestedCursorPosition; +} + } // Plasma namespace #include "moc_runnercontext.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.89.0/src/runnercontext.h new/krunner-5.90.0/src/runnercontext.h --- old/krunner-5.89.0/src/runnercontext.h 2021-12-04 18:04:06.000000000 +0100 +++ new/krunner-5.90.0/src/runnercontext.h 2022-01-01 13:19:01.000000000 +0100 @@ -232,6 +232,18 @@ #endif /** + * Request that KRunner updates the query string and stasy open, even after running a match. + * This method is const so it can be called in a const context. + * + * @param text Text that will be displayed in the search field + * @param cursorPosition Position of the cursor, if this is different than the length of the text, + * the characters between the position and text will be selected + * + * @since 5.90 + */ + void requestQueryStringUpdate(const QString &text, int cursorPosition) const; + + /** * Sets single runner query mode. Note that a call to reset() will * turn off single runner query mode. * TODO KF6 Make private @@ -249,6 +261,13 @@ bool singleRunnerQueryMode() const; /** + * Set this to true in the AbstractRunner::run method to prevent the entry + * from being saved to the history. + * @since 5.90 + */ + void ignoreCurrentMatchForHistory() const; + + /** * Sets the launch counts for the associated match ids * * If a runner adds a match to this context, the context will check if the @@ -279,6 +298,10 @@ void matchesChanged(); private: + QString requestedQueryString() const; + int requestedCursorPosition() const; + bool shouldIgnoreCurrentMatchForHistory() const; + friend class RunnerManager; QExplicitlySharedDataPointer<RunnerContextPrivate> d; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.89.0/src/runnermanager.cpp new/krunner-5.90.0/src/runnermanager.cpp --- old/krunner-5.89.0/src/runnermanager.cpp 2021-12-04 18:04:06.000000000 +0100 +++ new/krunner-5.90.0/src/runnermanager.cpp 2022-01-01 13:19:01.000000000 +0100 @@ -30,7 +30,9 @@ #include <ThreadWeaver/Queue> #include <ThreadWeaver/Thread> +#if KRUNNER_ENABLE_DEPRECATED_SINCE(5, 65) #include <plasma/version.h> +#endif #include "dbusrunner_p.h" #include "krunner_debug.h" @@ -731,8 +733,8 @@ bool RunnerManager::runMatch(const QueryMatch &match) { - d->addToHistory(); if (match.type() == Plasma::QueryMatch::InformationalMatch && !match.selectedAction()) { + d->addToHistory(); const QString info = match.data().toString(); if (!info.isEmpty()) { Q_EMIT setSearchTerm(info, info.length()); @@ -740,7 +742,15 @@ } } d->context.run(match); - return true; + if (!d->context.shouldIgnoreCurrentMatchForHistory()) { + d->addToHistory(); + } + if (d->context.requestedQueryString().isEmpty()) { + return true; + } else { + Q_EMIT setSearchTerm(d->context.requestedQueryString(), d->context.requestedCursorPosition()); + return false; + } } QList<QAction *> RunnerManager::actionsForMatch(const QueryMatch &match) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.89.0/templates/CMakeLists.txt new/krunner-5.90.0/templates/CMakeLists.txt --- old/krunner-5.89.0/templates/CMakeLists.txt 2021-12-04 18:04:06.000000000 +0100 +++ new/krunner-5.90.0/templates/CMakeLists.txt 2022-01-01 13:19:01.000000000 +0100 @@ -6,4 +6,4 @@ runnerpython ) -kde_package_app_templates(TEMPLATES ${apptemplate_DIRS} INSTALL_DIR ${KDE_INSTALL_KTEMPLATESDIR}) +kde_package_app_templates(TEMPLATES ${apptemplate_DIRS} INSTALL_DIR ${KDE_INSTALL_KFILETEMPLATESDIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.89.0/templates/runner/CMakeLists.txt new/krunner-5.90.0/templates/runner/CMakeLists.txt --- old/krunner-5.89.0/templates/runner/CMakeLists.txt 2021-12-04 18:04:06.000000000 +0100 +++ new/krunner-5.90.0/templates/runner/CMakeLists.txt 2022-01-01 13:19:01.000000000 +0100 @@ -7,7 +7,7 @@ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets) +find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Runner I18n) include(KDEInstallDirs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.89.0/templates/runner/runner.kdevtemplate new/krunner-5.90.0/templates/runner/runner.kdevtemplate --- old/krunner-5.89.0/templates/runner/runner.kdevtemplate 2021-12-04 18:04:06.000000000 +0100 +++ new/krunner-5.90.0/templates/runner/runner.kdevtemplate 2022-01-01 13:19:01.000000000 +0100 @@ -49,7 +49,7 @@ Comment[ar]=???????? ???????????? ??????????????. ???????? ??????????????????? ?????????????? Comment[az]=Plasma ba??latma s??tri ??????n uzant??lar??n ??ablonu Comment[ca]=Plantilla de Runner del Plasma. Una plantilla de ??Runner?? per al Plasma -Comment[ca@valencia]=Plantilla de Runner del Plasma. Una plantilla de ??Runner?? pel Plasma +Comment[ca@valencia]=Plantilla de Runner del Plasma. Una plantilla de ??Runner?? per al Plasma Comment[da]=Skabelon til Plasma-runner. En skabelon til en Plasma-runner Comment[de]=Eine Vorlage f??r einen Plasma-Runner Comment[el]=Plasma Runner Template. ?????? ?????????????? ?????????????????? plasma diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.89.0/templates/runner/src/CMakeLists.txt new/krunner-5.90.0/templates/runner/src/CMakeLists.txt --- old/krunner-5.89.0/templates/runner/src/CMakeLists.txt 2021-12-04 18:04:06.000000000 +0100 +++ new/krunner-5.90.0/templates/runner/src/CMakeLists.txt 2022-01-01 13:19:01.000000000 +0100 @@ -11,4 +11,4 @@ install(TARGETS %{APPNAMELC} DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/krunner) -install(FILES plasma-runner-%{APPNAMELC}.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) +install(FILES plasma-runner-%{APPNAMELC}.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.89.0/templates/runnerpython/runnerpy.kdevtemplate new/krunner-5.90.0/templates/runnerpython/runnerpy.kdevtemplate --- old/krunner-5.89.0/templates/runnerpython/runnerpy.kdevtemplate 2021-12-04 18:04:06.000000000 +0100 +++ new/krunner-5.90.0/templates/runnerpython/runnerpy.kdevtemplate 2022-01-01 13:19:01.000000000 +0100 @@ -3,6 +3,7 @@ Name[ar]=?????????? ???????????? ?????????????? Name[az]=Python KRunner qo??mas?? Name[ca]=Connector Python del KRunner +Name[ca@valencia]=Connector Python del KRunner Name[cs]=Modul KRunneru pr Python Name[da]=Python-plugin til KRunner Name[de]=KRunner-Modul f??r Python @@ -38,6 +39,7 @@ Comment[ar]=???????? ?????????? ???????????? ???????????? ???????????????? D-Bus Comment[az]=D-Bus il?? istifad?? olunan KRunner Python Qo??mas?? ??????n n??mun?? Comment[ca]=Plantilla per a un connector Python del KRunner usant D-Bus +Comment[ca@valencia]=Plantilla per a un connector Python del KRunner usant D-Bus Comment[da]=Skabelon til et KRunner Python-plugin med brug af D-Bus Comment[de]=Vorlage f??r ein KRunner-Modul f??r Python, das D-Bus verwendet Comment[el]=?????????????? ?????? ?????? Python ???????????????? ?????? KRunner ???? ?????????? D-Bus
