diff --git a/frontend/mainwindow.cpp b/frontend/mainwindow.cpp index cfe7f16..2851519 100644 --- a/frontend/mainwindow.cpp +++ b/frontend/mainwindow.cpp @@ -89,6 +89,12 @@ MainWindow::MainWindow(QWidget *parent) : // } // }); + m_appWidgetPlugin = new AppWidgetPlugin; + + connect(m_appWidgetPlugin, &AppWidgetPlugin::startSearch, this, [ & ] (QString keyword){ + this->bootOptionsFilter("-s"); + this->setText(keyword); + }); //NEW_TODO, register plugins // SearchPluginManager::getInstance()->registerPlugin(\\); // m_stackedWidget->setPlugins(SearchPluginManager::getInstance()->getPluginIds()); diff --git a/frontend/mainwindow.h b/frontend/mainwindow.h index 124ca4d..1a67aeb 100644 --- a/frontend/mainwindow.h +++ b/frontend/mainwindow.h @@ -46,6 +46,7 @@ #include #include +#include "search-app-widget-plugin/search.h" #include "index-generator.h" #include "libsearch.h" #include "create-index-ask-dialog.h" @@ -143,6 +144,7 @@ private: QTimer * m_researchTimer = nullptr; //创建索引后重新执行一次搜索的计时器 bool m_currentSearchAsked = false; //本次搜索是否已经询问过是否创建索引了 QGSettings * m_search_gsettings = nullptr; + AppWidgetPlugin *m_appWidgetPlugin = nullptr; void setSearchMethod(const bool&); double getTransparentData(); diff --git a/libsearch/global-settings.cpp b/libsearch/global-settings.cpp index 03f87a3..20cf3f8 100644 --- a/libsearch/global-settings.cpp +++ b/libsearch/global-settings.cpp @@ -70,6 +70,7 @@ GlobalSettings::GlobalSettings(QObject *parent) : QObject(parent) { m_cache.remove(TRANSPARENCY_KEY); m_cache.insert(TRANSPARENCY_KEY, m_trans_gsettings->get(TRANSPARENCY_KEY).toDouble()); qApp->paletteChanged(qApp->palette()); + Q_EMIT this->transparencyChanged(m_trans_gsettings->get(TRANSPARENCY_KEY).toDouble()); } }); m_cache.remove(TRANSPARENCY_KEY); @@ -86,6 +87,7 @@ GlobalSettings::GlobalSettings(QObject *parent) : QObject(parent) { m_cache.remove(STYLE_NAME_KEY); m_cache.insert(STYLE_NAME_KEY, m_theme_gsettings->get(STYLE_NAME_KEY).toString()); qApp->paletteChanged(qApp->palette()); + Q_EMIT this->styleChanged(m_theme_gsettings->get(STYLE_NAME_KEY).toString()); } else if(key == FONT_SIZE_KEY) { m_cache.remove(FONT_SIZE_KEY); m_cache.insert(FONT_SIZE_KEY, m_theme_gsettings->get(FONT_SIZE_KEY).toDouble()); diff --git a/libsearch/global-settings.h b/libsearch/global-settings.h index fc643b9..be6fb3f 100644 --- a/libsearch/global-settings.h +++ b/libsearch/global-settings.h @@ -68,6 +68,7 @@ public: Q_SIGNALS: void valueChanged(const QString&); void transparencyChanged(const double&); + void styleChanged(const QString&); public Q_SLOTS: void setValue(const QString&, const QVariant&); diff --git a/libsearch/libsearch.pro b/libsearch/libsearch.pro index fe687c5..d9fdb8e 100644 --- a/libsearch/libsearch.pro +++ b/libsearch/libsearch.pro @@ -40,9 +40,11 @@ include(websearch/websearch.pri) include(searchinterface/search-interface.pri) include(dirwatcher/dirwatcher.pri) include(mailsearch/mailsearch.pri) +include(search-app-widget-plugin/search-app-widget-plugin.pri) LIBS += -L$$OUT_PWD/../libchinese-segmentation/ -lchinese-segmentation LIBS += -lxapian -luchardet -lQt5Xdg -lquazip5 -ltesseract #-L/usr/local/lib/libjemalloc -ljemalloc +LIBS += -lukui-appwidget-manager -lukui-appwidget-provider SOURCES += \ file-utils.cpp \ @@ -62,6 +64,7 @@ HEADERS += \ RESOURCES += \ resource1.qrc \ + search-app-widget-plugin/provider/src.qrc TRANSLATIONS += \ ../translations/libukui-search/libukui-search_zh_CN.ts \ @@ -70,7 +73,22 @@ TRANSLATIONS += \ qm_files.path = /usr/share/ukui-search/translations/ qm_files.files = $$OUT_PWD/.qm/*.qm -INSTALLS += qm_files +qml.files += search-app-widget-plugin/provider/data/search.qml +qml.path = /usr/share/appwidget/qml/ + +appwidgetconf.files += search-app-widget-plugin/provider/data/search.conf +appwidgetconf.path = /usr/share/appwidget/config/ + +service.files += search-app-widget-plugin/provider/org.ukui.appwidget.provider.search.service +service.path += /usr/share/dbus-1/services/ + +preview.files += search-app-widget-plugin/provider/data/search.png +preview.path = /usr/share/appwidget/search/ + +svg.files += search-app-widget-plugin/provider/data/ukui-search.svg +svg.path = /usr/share/appwidget/search/ + +INSTALLS += target qml qm_files appwidgetconf service preview svg # Default rules for deployment. @@ -88,7 +106,7 @@ unix { INSTALLS += target header.path = /usr/include/ukui-search - header.files += *.h index/*.h appsearch/*.h settingsearch/*.h plugininterface/*.h websearch/*.h \ + header.files += *.h index/*.h appsearch/*.h settingsearch/*.h plugininterface/*.h websearch/*.h search-app-widget-plugin/*.h \ searchinterface/ukui-search-task.h \ appdata/app-info-table.h \ searchinterface/search-controller.h \ diff --git a/libsearch/search-app-widget-plugin/provider/data/search.conf b/libsearch/search-app-widget-plugin/provider/data/search.conf new file mode 100644 index 0000000..71d85e3 --- /dev/null +++ b/libsearch/search-app-widget-plugin/provider/data/search.conf @@ -0,0 +1,12 @@ +[AppWidget] +name = search +providerName = search +previewPath = /usr/share/appwidget/search/search.png +qmlFile = /usr/share/appwidget/qml/search.qml +zoom = false +rightButton = false +repeatPlacement = false +minWidget = 640 +minHeight = 100 +updatePeriodMillis = 0 +describe = ukui-search app widget diff --git a/libsearch/search-app-widget-plugin/provider/data/search.png b/libsearch/search-app-widget-plugin/provider/data/search.png new file mode 100644 index 0000000..20e90c5 Binary files /dev/null and b/libsearch/search-app-widget-plugin/provider/data/search.png differ diff --git a/libsearch/search-app-widget-plugin/provider/data/search.qml b/libsearch/search-app-widget-plugin/provider/data/search.qml new file mode 100755 index 0000000..17ba20f --- /dev/null +++ b/libsearch/search-app-widget-plugin/provider/data/search.qml @@ -0,0 +1,105 @@ +import QtQuick 2.6 +import QtQuick.Window 2.2 +import QtQuick.Controls 2.5 +import QtQuick.Layouts 1.3 +import QtGraphicalEffects 1.0 +import org.ukui.appwidget 1.0 +import org.ukui.qqc2style.private 1.0 as StylePrivate + +AppWidget { + width: 640 + height: 100 + visible: true + id: window + appname: "search" + username: parent.username + + function parseJson(jsonStr) { + try { + var obj = JSON.parse(jsonStr); + return obj; + } catch(e) { + console.log("json解析失败"); + } + return undefined; + } + + function updateSearchBarColor() { + var data = window.parseJson(window.datevalue); + searchBar.color = Qt.rgba(data.red, data.green, data.blue, data.alpha); + placeholderText.color = data.placeHolderTextColor; + } + + onDatevalueChanged: updateSearchBarColor(); + + Rectangle { + id:searchBar + anchors.centerIn: parent + width:448 + height: 64 + radius: searchBar.height / 2 + + Component.onCompleted: { + window.updateSearchBarColor(); + } + + RowLayout { + id: layout + anchors.fill: parent + spacing: 0 + + Image { + id: image_search + Layout.leftMargin: 16 + Layout.rightMargin: 16 + Layout.preferredWidth: 32; + Layout.preferredHeight: 32; + + Layout.alignment: Qt.AlignVCenter + source: "file:///usr/share/appwidget/search/ukui-search.svg" + } + + Item { + clip: true; + Layout.fillWidth: true + Layout.fillHeight: true; + Layout.rightMargin: 32; + + TextInput { + id: searchtext + anchors.fill: parent; + + Keys.enabled: true + Keys.onEnterPressed: { + window.qmldefineeventchangedsignal("enter", "search", searchtext.text); + searchtext.remove(0, searchtext.length); + } + Keys.onReturnPressed: { + window.qmldefineeventchangedsignal("return", "search", searchtext.text); + searchtext.remove(0, searchtext.length); + } + + focus: true + color: StylePrivate.StyleHelper.windowtextcolorrole + maximumLength: 100 + selectByMouse: true + verticalAlignment: Qt.AlignVCenter + font.pixelSize: 21 + + property string placeholderText: /*qsTr("search")*/"全局搜索" + + Text { + id: placeholderText + text: searchtext.placeholderText + font.pixelSize: 21 + + visible: !searchtext.text + anchors.verticalCenter: parent.verticalCenter + } + } + } + } + } +} + + diff --git a/libsearch/search-app-widget-plugin/provider/data/search.svg b/libsearch/search-app-widget-plugin/provider/data/search.svg new file mode 100644 index 0000000..e931c1d --- /dev/null +++ b/libsearch/search-app-widget-plugin/provider/data/search.svg @@ -0,0 +1,16 @@ + + + ukui-global search-search + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsearch/search-app-widget-plugin/provider/data/ukui-search.svg b/libsearch/search-app-widget-plugin/provider/data/ukui-search.svg new file mode 100644 index 0000000..7a3110a --- /dev/null +++ b/libsearch/search-app-widget-plugin/provider/data/ukui-search.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libsearch/search-app-widget-plugin/provider/org.ukui.appwidget.provider.search.service b/libsearch/search-app-widget-plugin/provider/org.ukui.appwidget.provider.search.service new file mode 100644 index 0000000..9b4866a --- /dev/null +++ b/libsearch/search-app-widget-plugin/provider/org.ukui.appwidget.provider.search.service @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.ukui.appwidget.provider.search +Exec=/usr/bin/ukui-search diff --git a/libsearch/search-app-widget-plugin/provider/src.qrc b/libsearch/search-app-widget-plugin/provider/src.qrc new file mode 100644 index 0000000..52b9d51 --- /dev/null +++ b/libsearch/search-app-widget-plugin/provider/src.qrc @@ -0,0 +1,9 @@ + + + org.ukui.appwidget.provider.search.service + data/search.conf + data/search.qml + data/search.png + data/ukui-search.svg + + diff --git a/libsearch/search-app-widget-plugin/search-app-widget-plugin.pri b/libsearch/search-app-widget-plugin/search-app-widget-plugin.pri new file mode 100644 index 0000000..ebc1685 --- /dev/null +++ b/libsearch/search-app-widget-plugin/search-app-widget-plugin.pri @@ -0,0 +1,6 @@ +INCLUDEPATH += $$PWD + +HEADERS += \ + $$PWD/search.h +SOURCES += \ + $$PWD/search.cpp diff --git a/libsearch/search-app-widget-plugin/search-app-widget-plugin.pro b/libsearch/search-app-widget-plugin/search-app-widget-plugin.pro new file mode 100644 index 0000000..3e1c4f4 --- /dev/null +++ b/libsearch/search-app-widget-plugin/search-app-widget-plugin.pro @@ -0,0 +1,52 @@ +QT += dbus widgets + +TEMPLATE = lib +DEFINES += SEARCHAPPWIDGETPLUGIN_LIBRARY + +CONFIG += c++11 link_pkgconfig + +PKGCONFIG += gsettings-qt + +# The following define makes your compiler emit warnings if you use +# any Qt feature that has been marked deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if it uses deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +TRANSLATIONS += translations/zh_CN.ts + +SOURCES += \ + search.cpp + +HEADERS += \ + search-app-widget-plugin_global.h \ + search.h + +LIBS += -lukui-appwidget-manager -lukui-appwidget-provider + +# Default rules for deployment. + +qml.files += provider/data/search.qml +qml.path = /usr/share/appwidget/qml/ + +qm_files.files = translations/* $$OUT_PWD/.qm/*.qm +qm_files.path = /usr/share/appwidget/search/translations/ + +appwidgetconf.files += provider/data/search.conf +appwidgetconf.path = /usr/share/appwidget/config/ + +service.files += provider/org.ukui.appwidget.provider.search.service +service.path += /usr/share/dbus-1/services/ + +preview.files += provider/data/search.png +preview.path = /usr/share/appwidget/search/ + +svg.files += provider/data/ukui-search.svg +svg.path = /usr/share/appwidget/search/ + +INSTALLS += target qml qm_files appwidgetconf service preview svg diff --git a/libsearch/search-app-widget-plugin/search-app-widget-plugin_global.h b/libsearch/search-app-widget-plugin/search-app-widget-plugin_global.h new file mode 100644 index 0000000..4c83b89 --- /dev/null +++ b/libsearch/search-app-widget-plugin/search-app-widget-plugin_global.h @@ -0,0 +1,12 @@ +#ifndef SEARCHAPPWIDGETPLUGIN_GLOBAL_H +#define SEARCHAPPWIDGETPLUGIN_GLOBAL_H + +#include + +#if defined(SEARCHAPPWIDGETPLUGIN_LIBRARY) +# define SEARCHAPPWIDGETPLUGIN_EXPORT Q_DECL_EXPORT +#else +# define SEARCHAPPWIDGETPLUGIN_EXPORT Q_DECL_IMPORT +#endif + +#endif // SEARCHAPPWIDGETPLUGIN_GLOBAL_H diff --git a/libsearch/search-app-widget-plugin/search.cpp b/libsearch/search-app-widget-plugin/search.cpp new file mode 100644 index 0000000..9d23e48 --- /dev/null +++ b/libsearch/search-app-widget-plugin/search.cpp @@ -0,0 +1,81 @@ +#include "search.h" + +#include +#include +#include +#include +#include +#include +#include + +#define CONTROL_CENTER_PERSONALISE_GSETTINGS_ID "org.ukui.control-center.personalise" +#define TRANSPARENCY_KEY "transparency" +#define THEME_GSETTINGS_ID "org.ukui.style" +#define STYLE_NAME_KEY "styleName" + +using namespace UkuiSearch; + +AppWidgetPlugin::AppWidgetPlugin(QString providername, QObject *parent) : KAppWidgetProvider(providername, parent) +{ + QTranslator* translator = new QTranslator(this); + if(!translator->load("/usr/share/appwidget/search/translations/" + QLocale::system().name()+ ".qm")) { + qWarning() << "/usr/share/appwidget/search/translations/" + QLocale::system().name() << "load failed"; + } + QApplication::installTranslator(translator); + + m_interface = new QDBusInterface("com.ukui.search.service", + "/", + "org.ukui.search.service"); + + m_manager = new AppWidget::KAppWidgetManager(this); + + connect(GlobalSettings::getInstance(), &GlobalSettings::transparencyChanged, [ & ] { + qDebug() << "transparency changed"; + this->appWidgetUpdate(); + }); + + connect(GlobalSettings::getInstance(), &GlobalSettings::styleChanged, [ & ] { + qDebug() << "style changed"; + this->appWidgetUpdate(); + }); +} + +void AppWidgetPlugin::appWidgetRecevie(const QString &eventname, const QString &widgetname, const QDBusVariant &value) +{ + qDebug() << widgetname << value.variant(); + if (eventname == "enter" or eventname == "return") { + QString keyword = value.variant().toString(); + Q_EMIT this->startSearch(keyword); + } else { + qWarning() << "event:" << eventname << "has no trigger now."; + } +} + +void AppWidgetPlugin::appWidgetUpdate() +{ + QString theme = GlobalSettings::getInstance()->getValue(STYLE_NAME_KEY).toString(); + QJsonObject obj; + if (theme == "ukui-dark") { + obj.insert("red", QJsonValue(0)); + obj.insert("green", QJsonValue(0)); + obj.insert("blue", QJsonValue(0)); + obj.insert("placeHolderTextColor", QJsonValue("#72ffffff")); + } else { + obj.insert("red", QJsonValue(255)); + obj.insert("green", QJsonValue(255)); + obj.insert("blue", QJsonValue(255)); + obj.insert("placeHolderTextColor", QJsonValue("#72000000")); + } + + obj.insert("alpha", QJsonValue(GlobalSettings::getInstance()->getValue(TRANSPARENCY_KEY).toDouble())); + QString jsonData = QString(QJsonDocument(obj).toJson()); + + QDBusVariant variant; + variant.setVariant(jsonData); + +// variant.setVariant(QGuiApplication::palette().color(QPalette::Window).name(QColor::HexArgb)); + if(m_manager) { + m_manager->updateAppWidget("search", variant); + qDebug() <<"==========update style and transparency successful."; + } +} diff --git a/libsearch/search-app-widget-plugin/search.h b/libsearch/search-app-widget-plugin/search.h new file mode 100644 index 0000000..c6d0bdd --- /dev/null +++ b/libsearch/search-app-widget-plugin/search.h @@ -0,0 +1,39 @@ +#ifndef SEARCH_H +#define SEARCH_H + +#include "libsearch_global.h" + +#define signals Q_SIGNALS +#define slots Q_SLOTS + +#include "ukui/kappwidgetprovider.h" +#include "ukui/kappwidgetmanager.h" + +#undef signals +#undef slots + +#include "global-settings.h" +#include + +namespace UkuiSearch { +class LIBSEARCH_EXPORT AppWidgetPlugin : public AppWidget::KAppWidgetProvider + +{ + Q_OBJECT +public: + explicit AppWidgetPlugin(QString providername = "search", QObject *parent = nullptr); + void appWidgetRecevie(const QString &eventname, const QString &widgetname, const QDBusVariant &value); + void appWidgetUpdate(); + +Q_SIGNALS: + void startSearch(QString); + +private: + QDBusInterface* m_interface = nullptr; + AppWidget::KAppWidgetManager* m_manager = nullptr; +}; +} + + + +#endif // SEARCH_H diff --git a/search-ukcc-plugin/translations/bo_CN.ts b/search-ukcc-plugin/translations/bo_CN.ts index 83bbaad..426237f 100644 --- a/search-ukcc-plugin/translations/bo_CN.ts +++ b/search-ukcc-plugin/translations/bo_CN.ts @@ -53,75 +53,74 @@ གཤམ་གྱི་ཡིག་སྣོད་འཚོལ་བཤེར་མི་བྱེད། ཡིག་སྣོད་གསར་སྣོན་དང་གསུབ་འཕྲི་བྱས་ཚེ་ཡིག་ཆའི་དཀར་ཆག་སྒྲིག་འགོད་བྱ་ཐུབ། - Choose folder - བསལ་འདེམས་ཀྱི་དཀར་ཆག། + བསལ་འདེམས་ཀྱི་དཀར་ཆག། - + delete བསུབ་པ། - + Directories དཀར་ཆག - + select blocked folder བཀག་སྡོམ་བྱས་པའི་ཡིག་སྣོད་གདམ་གསེས - + Select བདམས་ཐོན་བྱུང་བ། - + Position: གོ་གནས་ནི། - + FileName: ཡིག་ཆའི་མིང་ནི། - + FileType: ཡིག་ཆའི་རིགས་དབྱིབས་ནི། - + Cancel ཕྱིར་འཐེན། - - - - + + + + Warning ཐ་ཚིག་སྒྲོག་པ། - + Add blocked folder failed, choosen path is empty! སྦྱོར་རྟ་ལྐོག་བཀོད་མིང་ཐོ་ཕམ་ཁ་བསལ་འདེམས་ཀྱི་ཐབས་ལམ་སྟོང་བ་རེད། - + Add blocked folder failed, it is not in home path! སྦྱོར་རྟ་ལྐོག་བཀོད་མིང་ཐོ་ཕམ་ཁ་བསལ་འདེམས་ཀྱི་དཀར་ཆག་མི་ཁྱིམ་དཀར་ཆག་འོག། - + Add blocked folder failed, its parent dir is exist! སྦྱོར་རྟ་ལྐོག་བཀོད་མིང་ཐོ་ཕམ་ཁ་བསལ་འདེམས་ཀྱི་དཀར་ཆག་ནི་ལྐོག་བཀོད་མིང་ཐོ་འི་ཁྲོད་ཀྱི་དཀར་ཆག་འོག - + Add blocked folder failed, it has been already blocked! སྦྱོར་རྟ་ལྐོག་བཀོད་མིང་ཐོ་ཕམ་ཁ་བསལ་འདེམས་ཀྱི་དཀར་ཆག་ནི་ལྐོག་བཀོད་མིང་ཐོ་འི་ཁྲོད་ཀྱི་དཀར་ཆག་འོག diff --git a/search-ukcc-plugin/translations/zh_CN.ts b/search-ukcc-plugin/translations/zh_CN.ts index 46235f6..6f66061 100644 --- a/search-ukcc-plugin/translations/zh_CN.ts +++ b/search-ukcc-plugin/translations/zh_CN.ts @@ -53,75 +53,74 @@ 搜索将不查看以下文件夹,通过添加和删除可以设置排除的文件夹位置 - Choose folder - 添加 + 添加 - + delete 删除 - + Directories 文件夹 - + select blocked folder 选择排除的文件夹 - + Select 选择 - + Position: 位置 - + FileName: 文件名 - + FileType: 类型 - + Cancel 取消 - - - - + + + + Warning 警告 - + Add blocked folder failed, choosen path is empty! 添加失败,选择的路径为空! - + Add blocked folder failed, it is not in home path! 添加失败,添加的路径不在家目录下! - + Add blocked folder failed, its parent dir is exist! 添加失败,父目录已被添加! - + Add blocked folder failed, it has been already blocked! 添加失败,这个文件夹已经被添加过了! diff --git a/translations/libukui-search/libukui-search_bo_CN.ts b/translations/libukui-search/libukui-search_bo_CN.ts index 6f2b776..c7664d0 100644 --- a/translations/libukui-search/libukui-search_bo_CN.ts +++ b/translations/libukui-search/libukui-search_bo_CN.ts @@ -9,7 +9,7 @@ ནང་དོན་གྱི་སྟོན་གྲངས་ཆ་མི་ཚང་བ། - + Warning, Can not find home path. ཁྱིམ་གྱི་དཀར་ཆག་རྙེད་ཐབས་མེད། @@ -17,49 +17,66 @@ UkuiSearch::AppMatch - Application Description: - ཉེར་སྤྱོད་གོ་རིམ་གྱི་གསལ་བཤད། + ཉེར་སྤྱོད་གོ་རིམ་གྱི་གསལ་བཤད། UkuiSearch::AppSearchPlugin - + Open སྒོ་ཕྱེ་བ། - + Add Shortcut to Desktop ཅོག་ངོས་སུ་མྱུར་འཐེབ་སྣོན་པ། - + Add Shortcut to Panel ལས་འགན་གྱི་སྒྲོམ་ཐོག་མགྱོགས་མྱུར་གྱི་བྱེད་ཐབས་གསར་སྣོན་བྱ་དགོས - + Install སྒྲིག་སྦྱོར་བྱེད་པ - - + + Application Description: + ཉེར་སྤྱོད་གོ་རིམ་གྱི་གསལ་བཤད། + + + + Applications Search ཉེར་སྤྱོད་གོ་རིམ་འཚོལ་བཤེར། - + Application ཉེར་སྤྱོད་བྱ་རིམ། + + UkuiSearch::AppSearchTask + + + Application + ཉེར་སྤྱོད་བྱ་རིམ། + + + + Application search. + + + UkuiSearch::DirSearchPlugin @@ -338,14 +355,14 @@ UkuiSearch::SearchTaskPluginManager - - + + plugin type: %1, is disabled! ནུས་པ་སྒོ་བརྒྱབ་ཡོད། - - + + plugin type: %1, is not registered! ནུས་པ་ཐོ་འགོད་བྱས་མེད་པ། @@ -374,6 +391,14 @@ སྒྲིག་བཀོད། + + UkuiSearch::UkuiSearchTaskPrivate + + + Current task uuid error or an unregistered plugin is used! + + + UkuiSearch::WebSearchPlugin @@ -389,4 +414,12 @@ དྲ་ངོས། + + search + + + search + + + diff --git a/translations/libukui-search/libukui-search_zh_CN.ts b/translations/libukui-search/libukui-search_zh_CN.ts index 60b1a15..c7ca100 100644 --- a/translations/libukui-search/libukui-search_zh_CN.ts +++ b/translations/libukui-search/libukui-search_zh_CN.ts @@ -9,7 +9,7 @@ - + Warning, Can not find home path. @@ -17,9 +17,8 @@ UkuiSearch::AppMatch - Application Description: - 应用描述: + 应用描述: @@ -33,53 +32,56 @@ UkuiSearch::AppSearchPlugin - + Open 打开 - + Add Shortcut to Desktop 添加到桌面快捷方式 - + Add Shortcut to Panel 添加到任务栏快捷方式 - + Install 安装 - - + + Applications Search 应用 - + Application 应用 + Application Description: - 应用描述: + 应用描述: UkuiSearch::AppSearchTask + Application - 应用 + 应用 + Application search. - 应用搜索 + 应用搜索 @@ -373,14 +375,14 @@ UkuiSearch::SearchTaskPluginManager - - + + plugin type: %1, is disabled! - - + + plugin type: %1, is not registered! @@ -409,6 +411,14 @@ 设置项 + + UkuiSearch::UkuiSearchTaskPrivate + + + Current task uuid error or an unregistered plugin is used! + + + UkuiSearch::WebSearchPlugin @@ -424,4 +434,13 @@ 网页 + + search + + + search + 全局搜索 + 全局搜索 + +