diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt
index c4f1e83c6..aff535bb3 100644
--- a/krunner/CMakeLists.txt
+++ b/krunner/CMakeLists.txt
@@ -1,6 +1,7 @@
set(krunner_SRCS
main.cpp
view.cpp
+ qml/krunner.qrc
)
set(krunner_dbusAppXML dbus/org.kde.krunner.App.xml)
diff --git a/krunner/Messages.sh b/krunner/Messages.sh
index ce1f08153..25bad85c5 100644
--- a/krunner/Messages.sh
+++ b/krunner/Messages.sh
@@ -1,2 +1,2 @@
#! /usr/bin/env bash
-$XGETTEXT *.cpp -o $podir/krunner.pot
+$XGETTEXT *.cpp qml/*.qml -o $podir/krunner.pot
diff --git a/lookandfeel/org.kde.breeze/contents/runcommand/RunCommand.qml b/krunner/qml/RunCommand.qml
similarity index 90%
rename from lookandfeel/org.kde.breeze/contents/runcommand/RunCommand.qml
rename to krunner/qml/RunCommand.qml
index c42e27113..79e8a0b7a 100644
--- a/lookandfeel/org.kde.breeze/contents/runcommand/RunCommand.qml
+++ b/krunner/qml/RunCommand.qml
@@ -72,11 +72,11 @@ ColumnLayout {
runnerWindow.visible = false
runnerWindow.displayConfiguration()
}
- Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Configure")
- Accessible.description: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Configure KRunner Behavior")
+ Accessible.name: i18n("Configure")
+ Accessible.description: i18n("Configure KRunner Behavior")
visible: KCMShell.authorize("kcm_krunnersettings.desktop").length > 0
PlasmaComponents3.ToolTip {
- text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Configure KRunner…")
+ text: i18n("Configure KRunner…")
}
}
PlasmaExtras.SearchField {
@@ -87,11 +87,9 @@ ColumnLayout {
Layout.maximumWidth: PlasmaCore.Units.gridUnit * 25
activeFocusOnPress: true
- placeholderText: results.runnerName ? i18ndc("plasma_lookandfeel_org.kde.lookandfeel",
- "Textfield placeholder text, query specific KRunner",
+ placeholderText: results.runnerName ? i18nc("Textfield placeholder text, query specific KRunner",
"Search '%1'…", results.runnerName)
- : i18ndc("plasma_lookandfeel_org.kde.lookandfeel",
- "Textfield placeholder text", "Search…")
+ : i18nc("Textfield placeholder text", "Search…")
PlasmaComponents3.BusyIndicator {
anchors {
@@ -227,10 +225,10 @@ ColumnLayout {
// Reset if out quers starts with "?", otherwise set it to "?"
onClicked: root.query = root.query.startsWith("?") ? "" : "?"
icon.name: "question"
- Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Show Usage Help")
- Accessible.description: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Show Usage Help")
+ Accessible.name: i18n("Show Usage Help")
+ Accessible.description: i18n("Show Usage Help")
PlasmaComponents3.ToolTip {
- text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Show Usage Help")
+ text: i18n("Show Usage Help")
}
}
PlasmaComponents3.ToolButton {
@@ -238,10 +236,10 @@ ColumnLayout {
checked: runnerWindow.pinned
onToggled: runnerWindow.pinned = checked
icon.name: "window-pin"
- Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Pin")
- Accessible.description: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Pin Search")
+ Accessible.name: i18n("Pin")
+ Accessible.description: i18n("Pin Search")
PlasmaComponents3.ToolTip {
- text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keep Open")
+ text: i18n("Keep Open")
}
}
}
@@ -319,10 +317,10 @@ ColumnLayout {
delegate: Milou.ResultDelegate {
id: resultDelegate
width: listView.width
- typeText: index === 0 ? i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Recent Queries") : ""
+ typeText: index === 0 ? i18n("Recent Queries") : ""
additionalActions: [{
icon: "list-remove",
- text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Remove")
+ text: i18n("Remove")
}]
Accessible.description: i18n("in category recent queries")
}
diff --git a/krunner/qml/krunner.qrc b/krunner/qml/krunner.qrc
new file mode 100644
index 000000000..321f7a247
--- /dev/null
+++ b/krunner/qml/krunner.qrc
@@ -0,0 +1,10 @@
+
+
+
+
+ RunCommand.qml
+
+
diff --git a/krunner/view.cpp b/krunner/view.cpp
index 24daa6700..0cc05bb5a 100644
--- a/krunner/view.cpp
+++ b/krunner/view.cpp
@@ -26,9 +26,6 @@
#include
-#include
-#include
-
#include
#include
#include
@@ -72,15 +69,8 @@ View::View(QWindow *)
m_qmlObj->setInitializationDelayed(true);
connect(m_qmlObj, &KDeclarative::QmlObject::finished, this, &View::objectIncubated);
- KPackage::Package package = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel"));
- KConfigGroup cg(KSharedConfig::openConfig(), "KDE");
- const QString packageName = cg.readEntry("LookAndFeelPackage", QString());
- if (!packageName.isEmpty()) {
- package.setPath(packageName);
- }
-
m_qmlObj->engine()->rootContext()->setContextProperty(QStringLiteral("runnerWindow"), this);
- m_qmlObj->setSource(package.fileUrl("runcommandmainscript"));
+ m_qmlObj->setSource(QUrl(QStringLiteral("qrc:/krunner/RunCommand.qml")));
m_qmlObj->completeInitialization();
auto screenRemoved = [this](QScreen *screen) {
@@ -363,16 +353,3 @@ void View::setPinned(bool pinned)
Q_EMIT pinnedChanged();
}
}
-
-void View::removeFromHistory(int index)
-{
- if (m_manager) {
- m_manager->removeFromHistory(index);
- Q_EMIT historyChanged();
- }
-}
-
-QStringList View::history() const
-{
- return m_manager ? m_manager->history() : QStringList();
-}
diff --git a/krunner/view.h b/krunner/view.h
index 4cf7ebb42..076897593 100644
--- a/krunner/view.h
+++ b/krunner/view.h
@@ -40,9 +40,6 @@ class View : public PlasmaQuick::Dialog
Q_CLASSINFO("D-Bus Interface", "org.kde.krunner.App")
Q_PROPERTY(bool pinned READ pinned WRITE setPinned NOTIFY pinnedChanged)
- Q_PROPERTY(QStringList history READ history NOTIFY historyChanged)
- // TODO KF6 This is kept for compatibility with third party themes which override the RunCommand.qml file
- Q_PROPERTY(Plasma::RunnerManager *runnerManager WRITE setRunnerManager)
Q_PROPERTY(bool helpEnabled READ helpEnabled NOTIFY helpEnabledChanged)
public:
@@ -54,23 +51,9 @@ public:
bool freeFloating() const;
void setFreeFloating(bool floating);
- QStringList history() const;
-
bool pinned() const;
void setPinned(bool pinned);
- // TODO KF6 This is kept for compatibility with third party themes which override the RunCommand.qml file
- Q_SIGNAL void historyChanged();
- Q_INVOKABLE void addToHistory(const QString &)
- {
- // Kept for compatibility, since milou f442b33af3c292c49743083493423275a51c118a the KRunner framework logic is used for handling this
- }
- Q_INVOKABLE void removeFromHistory(int index);
- void setRunnerManager(Plasma::RunnerManager *manager)
- {
- m_manager = manager;
- }
-
bool helpEnabled()
{
const static auto metaData = KPluginMetaData(QStringLiteral("kf5/krunner/helprunner"));