Merge branch '1213-ukss' into 'ukss-dev'

Change namespace.

See merge request kylin-desktop/ukui-search!219
This commit is contained in:
纪笑旭 2021-12-14 06:47:13 +00:00
commit 84d9023882
95 changed files with 158 additions and 158 deletions

View File

@ -34,7 +34,7 @@
#define BTN_FRAME_MARGINS 0,0,0,0
#define CONTENT_MARGINS 32,0,32,24
using namespace Zeeker;
using namespace UkuiSearch;
CreateIndexAskDialog::CreateIndexAskDialog(QWidget *parent) : QDialog(parent) {
// this->setWindowIcon(QIcon::fromTheme("kylin-search"));
this->setWindowTitle(tr("ukui-search"));

View File

@ -33,7 +33,7 @@
#include <QApplication>
#include <QPainter>
namespace Zeeker {
namespace UkuiSearch {
class CreateIndexAskDialog : public QDialog {
Q_OBJECT
public:

View File

@ -22,7 +22,7 @@
#include <QEvent>
#include <QDebug>
#include <QIcon>
using namespace Zeeker;
using namespace UkuiSearch;
ShowMoreLabel::ShowMoreLabel(QWidget *parent) : QWidget(parent) {
initUi();
m_timer = new QTimer;

View File

@ -26,7 +26,7 @@
#include <QHBoxLayout>
#include <QTimer>
namespace Zeeker {
namespace UkuiSearch {
class ShowMoreLabel : public QWidget {
Q_OBJECT
public:

View File

@ -23,7 +23,7 @@
#include <QStyleOption>
#define UNFOLD_LABEL_HEIGHT 30
#define NUM_LIMIT_SHOWN_DEFAULT 5
using namespace Zeeker;
using namespace UkuiSearch;
TitleLabel::TitleLabel(QWidget * parent) : QLabel(parent) {
initUi();
initConnections();

View File

@ -25,7 +25,7 @@
#include "show-more-label.h"
#include <QHBoxLayout>
namespace Zeeker {
namespace UkuiSearch {
class TitleLabel : public QLabel {
Q_OBJECT
public:

View File

@ -24,7 +24,7 @@
QT_BEGIN_NAMESPACE
extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed);
QT_END_NAMESPACE
using namespace Zeeker;
using namespace UkuiSearch;
/**
* @brief UKuiSearchLineEdit
*/

View File

@ -36,7 +36,7 @@
#include <QProxyStyle>
#include "global-settings.h"
namespace Zeeker {
namespace UkuiSearch {
class SearchLineEdit : public QLineEdit {
Q_OBJECT

View File

@ -28,7 +28,7 @@
#include "global-settings.h"
#include "file-utils.h"
using namespace Zeeker;
using namespace UkuiSearch;
extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed);
SettingsWidget::SettingsWidget(QWidget *parent) : QWidget(parent) {
// this->setWindowIcon(QIcon::fromTheme("kylin-search"));

View File

@ -37,7 +37,7 @@
#include "xatom-helper.h"
#endif
namespace Zeeker {
namespace UkuiSearch {
class FolderListItem : public QWidget {
Q_OBJECT
public:

View File

@ -21,7 +21,7 @@
#include "search-page-section.h"
#include <QDebug>
#include <QScrollBar>
using namespace Zeeker;
using namespace UkuiSearch;
#define RESULT_LAYOUT_MARGINS 0,0,0,0
#define RESULT_BACKGROUND_COLOR QColor(0, 0, 0, 0)

View File

@ -29,7 +29,7 @@
#include "best-list-view.h"
#include "web-search-view.h"
namespace Zeeker {
namespace UkuiSearch {
class ResultArea : public QScrollArea
{
Q_OBJECT

View File

@ -22,7 +22,7 @@
QT_BEGIN_NAMESPACE
extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed);
QT_END_NAMESPACE
using namespace Zeeker;
using namespace UkuiSearch;
#define RESULT_WIDTH 266
#define DETAIL_WIDTH 374

View File

@ -24,7 +24,7 @@
#include <QSplitter>
#include "search-page-section.h"
namespace Zeeker {
namespace UkuiSearch {
class SearchResultPage : public QWidget
{
Q_OBJECT

View File

@ -41,7 +41,7 @@
#include "plugin-manager.h"
#include <X11/Xlib.h>
using namespace Zeeker;
using namespace UkuiSearch;
void messageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)
{

View File

@ -51,7 +51,7 @@
#define ASK_INDEX_TIME 5*1000
#define RESEARCH_TIME 10*1000
using namespace Zeeker;
using namespace UkuiSearch;
extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed);
/**
* @brief MainWindow

View File

@ -58,7 +58,7 @@
#include "settings-widget.h"
#endif
namespace Zeeker {
namespace UkuiSearch {
class SearchResult;
class MainWindow : public QMainWindow {
friend class SearchResult;

View File

@ -20,7 +20,7 @@
*/
#include "best-list-model.h"
#include "search-plugin-manager.h"
using namespace Zeeker;
using namespace UkuiSearch;
BestListModel::BestListModel(QObject *parent)
: QAbstractItemModel(parent)

View File

@ -6,7 +6,7 @@
#define NUM_LIMIT_SHOWN_DEFAULT 5
namespace Zeeker {
namespace UkuiSearch {
class BestListModel : public QAbstractItemModel
{
Q_OBJECT

View File

@ -20,7 +20,7 @@
*/
#include "search-result-manager.h"
using namespace Zeeker;
using namespace UkuiSearch;
SearchResultManager::SearchResultManager(const QString& plugin_id, QObject *parent) : QObject(parent)
{
m_plugin_id = plugin_id;

View File

@ -27,7 +27,7 @@
#include <QDebug>
#include "pluginmanage/search-plugin-manager.h"
namespace Zeeker {
namespace UkuiSearch {
class ReceiveResultThread : public QThread {
Q_OBJECT

View File

@ -19,7 +19,7 @@
*
*/
#include "search-result-model.h"
using namespace Zeeker;
using namespace UkuiSearch;
SearchResultModel::SearchResultModel(const QString &plugin_id)
{

View File

@ -25,7 +25,7 @@
#define NUM_LIMIT_SHOWN_DEFAULT 5
namespace Zeeker {
namespace UkuiSearch {
class SearchResultItem : public QObject {
friend class SearchResultModel;

View File

@ -21,7 +21,7 @@
#include "web-search-model.h"
#include <QDebug>
using namespace Zeeker;
using namespace UkuiSearch;
WebSearchModel::WebSearchModel(QObject *parent)
: QAbstractItemModel(parent)
{

View File

@ -6,7 +6,7 @@
#include <QLabel>
#include "search-result-model.h"
namespace Zeeker {
namespace UkuiSearch {
class WebSearchModel : public QAbstractItemModel
{
Q_OBJECT

View File

@ -1,6 +1,6 @@
#include "ukui-search-dbus-service.h"
using namespace Zeeker;
using namespace UkuiSearch;
void UkuiSearchDbusServices::showWindow(){
qDebug() << "showWindow called";
m_mainWindow->bootOptionsFilter("-s");

View File

@ -6,7 +6,7 @@
#include "mainwindow.h"
namespace Zeeker {
namespace UkuiSearch {
class UkuiSearchDbusServices: public QObject{
Q_OBJECT

View File

@ -5,7 +5,7 @@
#define UNFOLD_LABEL_HEIGHT 30
#define VIEW_ICON_SIZE 24
using namespace Zeeker;
using namespace UkuiSearch;
BestListView::BestListView(QWidget *parent) : QTreeView(parent)
{
this->setFrameShape(QFrame::NoFrame);

View File

@ -10,7 +10,7 @@
#include "title-label.h"
#include "result-view-delegate.h"
namespace Zeeker {
namespace UkuiSearch {
class BestListView : public QTreeView
{

View File

@ -1,5 +1,5 @@
#include "result-view-delegate.h"
using namespace Zeeker;
using namespace UkuiSearch;
ResultViewDelegate::ResultViewDelegate(QObject *parent) : QStyledItemDelegate(parent)
{

View File

@ -28,7 +28,7 @@
#include <QAbstractTextDocumentLayout>
#include "global-settings.h"
namespace Zeeker {
namespace UkuiSearch {
class ResultViewDelegate : public QStyledItemDelegate {
Q_OBJECT
public:

View File

@ -5,7 +5,7 @@
#define UNFOLD_LABEL_HEIGHT 30
#define VIEW_ICON_SIZE 24
using namespace Zeeker;
using namespace UkuiSearch;
ResultWidget::ResultWidget(const QString &plugin_id, QWidget *parent) : QWidget(parent)
{
m_plugin_id = plugin_id;

View File

@ -10,7 +10,7 @@
#include "title-label.h"
#include "result-view-delegate.h"
namespace Zeeker {
namespace UkuiSearch {
class ResultView : public QTreeView
{

View File

@ -24,7 +24,7 @@
#define TITLE_HEIGHT 30
#define VIEW_ICON_SIZE 24
using namespace Zeeker;
using namespace UkuiSearch;
WebSearchView::WebSearchView(QWidget *parent) : QTreeView(parent)
{
this->setFrameShape(QFrame::NoFrame);

View File

@ -7,7 +7,7 @@
#include "result-view-delegate.h"
#include "title-label.h"
namespace Zeeker {
namespace UkuiSearch {
class WebSearchView : public QTreeView
{
Q_OBJECT

View File

@ -24,7 +24,7 @@
#include "file-utils.h"
#include "app-search-plugin.h"
#define ANDROID_APP_DESKTOP_PATH QDir::homePath() + "/.local/share/applications/"
using namespace Zeeker;
using namespace UkuiSearch;
static AppMatch *app_match_Class = nullptr;
AppMatch *AppMatch::getAppMatch() {

View File

@ -29,7 +29,7 @@
#include <QtDBus>
#include <QThread>
#include "search-plugin-iface.h"
namespace Zeeker {
namespace UkuiSearch {
class NameString {
public:
explicit NameString(const QString &str_) : app_name(str_) {}

View File

@ -3,7 +3,7 @@
#include <QWidget>
#include <QLabel>
#include "file-utils.h"
using namespace Zeeker;
using namespace UkuiSearch;
size_t AppSearchPlugin::uniqueSymbol = 0;
QMutex AppSearchPlugin::m_mutex;
AppSearchPlugin::AppSearchPlugin(QObject *parent) : QObject(parent)

View File

@ -12,7 +12,7 @@
#include "app-match.h"
#include "action-label.h"
#include "libsearch_global.h"
namespace Zeeker {
namespace UkuiSearch {
class LIBSEARCH_EXPORT AppSearchPlugin : public QObject, public SearchPluginIface
{
friend class AppSearch;

View File

@ -28,7 +28,7 @@
#include <QDomDocument>
#include "gobject-template.h"
using namespace Zeeker;
using namespace UkuiSearch;
size_t FileUtils::_max_index_count = 0;
size_t FileUtils::_current_index_count = 0;
unsigned short FileUtils::indexStatus = 0;

View File

@ -59,7 +59,7 @@
//#define CREATING_INDEX 1
//#define FINISH_CREATING_INDEX 2
#define MAX_CONTENT_LENGTH 20480000
namespace Zeeker {
namespace UkuiSearch {
class LIBSEARCH_EXPORT FileUtils {
public:
static QString getHtmlText(const QString & text, const QString & keyword);

View File

@ -22,7 +22,7 @@
#include <QPalette>
#include "global-settings.h"
using namespace Zeeker;
using namespace UkuiSearch;
static GlobalSettings *global_instance_of_global_settings = nullptr;
GlobalSettings *GlobalSettings::getInstance() {

View File

@ -57,7 +57,7 @@
//#define CLOUD_HISTORY "history"
//#define CLOUD_APPLICATIONS "applications"
namespace Zeeker {
namespace UkuiSearch {
class LIBSEARCH_EXPORT GlobalSettings : public QObject {
Q_OBJECT
public:

View File

@ -26,7 +26,7 @@
//extern QList<Document> *g_docListForPath;
//extern QMutex g_mutexDocListForPath;
using namespace Zeeker;
using namespace UkuiSearch;
ConstructDocumentForPath::ConstructDocumentForPath(QVector<QString> list) {
this->setAutoDelete(true);
m_list = std::move(list);
@ -34,8 +34,8 @@ ConstructDocumentForPath::ConstructDocumentForPath(QVector<QString> list) {
void ConstructDocumentForPath::run() {
// qDebug()<<"ConstructDocumentForPath";
// if(!Zeeker::g_docListForPath)
// Zeeker::g_docListForPath = new QVector<Document>;
// if(!UkuiSearch::g_docListForPath)
// UkuiSearch::g_docListForPath = new QVector<Document>;
// qDebug()<<g_docListForPath->size();
QString index_text = m_list.at(0).toLower();
QString sourcePath = m_list.at(1);

View File

@ -26,7 +26,7 @@
#include "document.h"
#include "index-generator.h"
namespace Zeeker {
namespace UkuiSearch {
class IndexGenerator;
class ConstructDocumentForPath : public QRunnable {

View File

@ -19,7 +19,7 @@
*/
#include "document.h"
#include <QDebug>
using namespace Zeeker;
using namespace UkuiSearch;
void Document::setData(QString &data) {
if(data.isEmpty())
return;

View File

@ -24,7 +24,7 @@
#include <QString>
#include <QStringList>
#include <QVector>
namespace Zeeker {
namespace UkuiSearch {
class Document {
public:
Document() = default;

View File

@ -20,7 +20,7 @@
#include "file-reader.h"
#include "file-utils.h"
#include "binary-parser.h"
using namespace Zeeker;
using namespace UkuiSearch;
FileReader::FileReader(QObject *parent) : QObject(parent) {
}

View File

@ -22,7 +22,7 @@
#include <QObject>
#include <QFileInfo>
namespace Zeeker {
namespace UkuiSearch {
class FileReader : public QObject {
Q_OBJECT
public:

View File

@ -4,7 +4,7 @@
#include <QLabel>
#include <QHBoxLayout>
#include <QMessageBox>
using namespace Zeeker;
using namespace UkuiSearch;
FileSearchPlugin::FileSearchPlugin(QObject *parent) : QObject(parent)
{
@ -32,7 +32,7 @@ QString FileSearchPlugin::getPluginName()
return tr("File Search");
}
void Zeeker::FileSearchPlugin::KeywordSearch(QString keyword, DataQueue<ResultInfo> *searchResult)
void UkuiSearch::FileSearchPlugin::KeywordSearch(QString keyword, DataQueue<ResultInfo> *searchResult)
{
SearchManager::m_mutexFile.lock();
++SearchManager::uniqueSymbolFile;
@ -239,7 +239,7 @@ QString DirSearchPlugin::getPluginName()
return tr("Dir Search");
}
void Zeeker::DirSearchPlugin::KeywordSearch(QString keyword, DataQueue<ResultInfo> *searchResult)
void UkuiSearch::DirSearchPlugin::KeywordSearch(QString keyword, DataQueue<ResultInfo> *searchResult)
{
SearchManager::m_mutexDir.lock();
++SearchManager::uniqueSymbolDir;
@ -419,7 +419,7 @@ QString FileContengSearchPlugin::getPluginName()
return tr("File content search");
}
void Zeeker::FileContengSearchPlugin::KeywordSearch(QString keyword, DataQueue<ResultInfo> *searchResult)
void UkuiSearch::FileContengSearchPlugin::KeywordSearch(QString keyword, DataQueue<ResultInfo> *searchResult)
{
SearchManager::m_mutexContent.lock();
++SearchManager::uniqueSymbolContent;

View File

@ -14,7 +14,7 @@
#include "search-plugin-iface.h"
#include "common.h"
#include "action-label.h"
namespace Zeeker {
namespace UkuiSearch {
//internal plugin
class LIBSEARCH_EXPORT FileSearchPlugin : public QObject, public SearchPluginIface
{

View File

@ -24,7 +24,7 @@
#define NEW_QUEUE(a) a = new QQueue<QString>(); qDebug("---------------------------%s %s %s new at %d..",__FILE__,__FUNCTION__,#a,__LINE__);
//#define DELETE_QUEUE(a )
using namespace Zeeker;
using namespace UkuiSearch;
FirstIndex::FirstIndex() {
m_pool.setMaxThreadCount(2);
m_pool.setExpiryTimeout(100);

View File

@ -40,7 +40,7 @@
#include "index-generator.h"
#include "file-utils.h"
#include "common.h"
namespace Zeeker {
namespace UkuiSearch {
class FirstIndex : public QThread, public Traverse_BFS {
public:
FirstIndex();

View File

@ -34,14 +34,14 @@
#define INDEX_PATH (QStandardPaths::writableLocation(QStandardPaths::HomeLocation)+"/.config/org.ukui/ukui-search/index_data").toStdString()
#define CONTENT_INDEX_PATH (QStandardPaths::writableLocation(QStandardPaths::HomeLocation)+"/.config/org.ukui/ukui-search/content_index_data").toStdString()
using namespace Zeeker;
using namespace UkuiSearch;
static IndexGenerator *global_instance = nullptr;
QMutex IndexGenerator::m_mutex;
//QVector<Document> *Zeeker::g_docListForPath;
//QMutex Zeeker::g_mutexDocListForPath;
//QVector<Document> *Zeeker::g_docListForContent;
//QMutex Zeeker::g_mutexDocListForContent;
//QVector<Document> *UkuiSearch::g_docListForPath;
//QMutex UkuiSearch::g_mutexDocListForPath;
//QVector<Document> *UkuiSearch::g_docListForContent;
//QMutex UkuiSearch::g_mutexDocListForContent;
QMutex IndexGenerator::g_mutexDocListForPath;
QMutex IndexGenerator::g_mutexDocListForContent;
QVector<Document> IndexGenerator::g_docListForPath = QVector<Document>();

View File

@ -36,7 +36,7 @@
#include "common.h"
#include "pending-file.h"
namespace Zeeker {
namespace UkuiSearch {
//extern QVector<Document> *_doc_list_path;
//extern QMutex _mutex_doc_list_path;
//extern QVector<Document> *_doc_list_content;

View File

@ -1,6 +1,6 @@
#include "index-status-recorder.h"
using namespace Zeeker;
using namespace UkuiSearch;
static IndexStatusRecorder *global_instance_indexStatusRecorder = nullptr;
IndexStatusRecorder *IndexStatusRecorder::getInstance()

View File

@ -10,7 +10,7 @@
#define INOTIFY_NORMAL_EXIT "inotify_normal_exit"
#define PENDING_FILE_QUEUE_FINISH "pending_file_queue_finish"
#define INDEX_STATUS QDir::homePath() + "/.config/org.ukui/ukui-search/ukui-search-index-status.conf"
namespace Zeeker {
namespace UkuiSearch {
//fixme: we need a better way to record index status.
class IndexStatusRecorder : public QObject
{

View File

@ -2,10 +2,10 @@
#include <sys/ioctl.h>
#include <malloc.h>
#include <errno.h>
using namespace Zeeker;
using namespace UkuiSearch;
static InotifyWatch* global_instance_InotifyWatch = nullptr;
Zeeker::InotifyWatch *Zeeker::InotifyWatch::getInstance(const QString &path)
UkuiSearch::InotifyWatch *UkuiSearch::InotifyWatch::getInstance(const QString &path)
{
if(!global_instance_InotifyWatch) {
global_instance_InotifyWatch = new InotifyWatch(path);
@ -13,7 +13,7 @@ Zeeker::InotifyWatch *Zeeker::InotifyWatch::getInstance(const QString &path)
return global_instance_InotifyWatch;
}
Zeeker::InotifyWatch::InotifyWatch(const QString &path): Traverse_BFS(path)
UkuiSearch::InotifyWatch::InotifyWatch(const QString &path): Traverse_BFS(path)
{
qDebug() << "setInotifyMaxUserWatches start";
UkuiSearchQDBus usQDBus;

View File

@ -15,7 +15,7 @@
#include "first-index.h"
#include "pending-file-queue.h"
#include "common.h"
namespace Zeeker {
namespace UkuiSearch {
class InotifyWatch : public QThread, public Traverse_BFS
{
Q_OBJECT

View File

@ -20,7 +20,7 @@
#include "pending-file-queue.h"
#include "file-utils.h"
#include <malloc.h>
using namespace Zeeker;
using namespace UkuiSearch;
static PendingFileQueue *global_instance_pending_file_queue = nullptr;
PendingFileQueue::PendingFileQueue(QObject *parent) : QThread(parent)
{

View File

@ -28,7 +28,7 @@
#include "pending-file.h"
#include "index-generator.h"
namespace Zeeker {
namespace UkuiSearch {
class PendingFileQueue : public QThread
{
Q_OBJECT

View File

@ -18,7 +18,7 @@
*
*/
#include "pending-file.h"
using namespace Zeeker;
using namespace UkuiSearch;
PendingFile::PendingFile(const QString &path)
: m_path(path)
, m_deleted(false)

View File

@ -22,7 +22,7 @@
#include <QString>
#include <QDebug>
namespace Zeeker {
namespace UkuiSearch {
/**
* Represents a file/folder which needs to be indexed.
*/

View File

@ -18,7 +18,7 @@
*
*/
#include "search-manager.h"
using namespace Zeeker;
using namespace UkuiSearch;
size_t SearchManager::uniqueSymbolFile = 0;
size_t SearchManager::uniqueSymbolDir = 0;
size_t SearchManager::uniqueSymbolContent = 0;

View File

@ -45,7 +45,7 @@
#define INDEX_PATH (QStandardPaths::writableLocation(QStandardPaths::HomeLocation)+"/.config/org.ukui/ukui-search/index_data").toStdString()
#define CONTENT_INDEX_PATH (QStandardPaths::writableLocation(QStandardPaths::HomeLocation)+"/.config/org.ukui/ukui-search/content_index_data").toStdString()
namespace Zeeker {
namespace UkuiSearch {
class FileMatchDecider;
class FileContentMatchDecider;
class LIBSEARCH_EXPORT SearchManager : public QObject {
@ -77,7 +77,7 @@ Q_SIGNALS:
void resultContent(QQueue<QPair<QString, QStringList>> *);
private:
static bool isBlocked(QString &path);
static bool creatResultInfo(Zeeker::SearchPluginIface::ResultInfo &ri, QString path);
static bool creatResultInfo(UkuiSearch::SearchPluginIface::ResultInfo &ri, QString path);
QThreadPool m_pool;
};

View File

@ -1,5 +1,5 @@
#include "search-method-manager.h"
using namespace Zeeker;
using namespace UkuiSearch;
static SearchMethodManager* global_instance = nullptr;
SearchMethodManager::SearchMethodManager()

View File

@ -4,7 +4,7 @@
#include "first-index.h"
//#include "inotify-index.h"
#include "inotify-watch.h"
namespace Zeeker {
namespace UkuiSearch {
class SearchMethodManager {
public:
static SearchMethodManager *getInstance();

View File

@ -18,7 +18,7 @@
*
*/
#include "traverse_bfs.h"
using namespace Zeeker;
using namespace UkuiSearch;
Traverse_BFS::Traverse_BFS(const QString& path) {
Q_ASSERT('/' == path.at(0));
this->path = path;

View File

@ -24,7 +24,7 @@
#include <QDebug>
#include <QDir>
#include <QQueue>
namespace Zeeker {
namespace UkuiSearch {
class Traverse_BFS {
public:
Traverse_BFS() = default;

View File

@ -19,7 +19,7 @@
*/
#include "ukui-search-qdbus.h"
#include <QDebug>
using namespace Zeeker;
using namespace UkuiSearch;
UkuiSearchQDBus::UkuiSearchQDBus() {
this->tmpSystemQDBusInterface = new QDBusInterface("com.ukui.search.qt.systemdbus",
"/",

View File

@ -22,7 +22,7 @@
#include <QDBusInterface>
#include <QDBusReply>
namespace Zeeker {
namespace UkuiSearch {
class UkuiSearchQDBus {
public:
UkuiSearchQDBus();

View File

@ -18,6 +18,6 @@
*
*/
#include "libsearch.h"
using namespace Zeeker;
using namespace UkuiSearch;
// Encapsulate advanced interfaces here.

View File

@ -33,7 +33,7 @@
#include "index/search-manager.h"
namespace Zeeker {
namespace UkuiSearch {
//class LIBSEARCH_EXPORT GlobalSearch {
//public:

View File

@ -4,7 +4,7 @@
#include <qt5xdg/xdgicon.h>
#include "file-utils.h"
#include "chinese-segmentation.h"
using namespace Zeeker;
using namespace UkuiSearch;
NoteSearchPlugin::NoteSearchPlugin(QObject *parent)
{

View File

@ -16,7 +16,7 @@
#include "search-plugin-iface.h"
#include "action-label.h"
#include "libsearch_global.h"
namespace Zeeker {
namespace UkuiSearch {
static size_t g_uniqueSymbol;
static QMutex g_mutex;

View File

@ -21,7 +21,7 @@
#define ACTION_NORMAL_COLOR QColor(55, 144, 250, 255)
#define ACTION_HOVER_COLOR QColor(64, 169, 251, 255)
#define ACTION_PRESS_COLOR QColor(41, 108, 217, 255)
using namespace Zeeker;
using namespace UkuiSearch;
ActionLabel::ActionLabel(const QString &action, const QString &key, QWidget *parent) : QLabel(parent)
{
m_action = action;

View File

@ -23,7 +23,7 @@
#include <QObject>
#include <QLabel>
#include <QEvent>
namespace Zeeker {
namespace UkuiSearch {
class ActionLabel : public QLabel
{
Q_OBJECT

View File

@ -4,7 +4,7 @@
#include <QMutexLocker>
#include <QList>
#include "libsearch_global.h"
namespace Zeeker {
namespace UkuiSearch {
// TODO I want a unlocked queue
template <typename T>
class LIBSEARCH_EXPORT DataQueue : public QList<T>

View File

@ -1,7 +1,7 @@
#ifndef PLUGININTERFACE_H
#define PLUGININTERFACE_H
namespace Zeeker {
namespace UkuiSearch {
class PluginInterface
{

View File

@ -10,7 +10,7 @@
#include "plugin-iface.h"
#include "data-queue.h"
namespace Zeeker {
namespace UkuiSearch {
class SearchPluginIface : public PluginInterface
{
public:
@ -47,6 +47,6 @@ public:
};
}
Q_DECLARE_INTERFACE(Zeeker::SearchPluginIface, SearchPluginIface_iid)
Q_DECLARE_INTERFACE(UkuiSearch::SearchPluginIface, SearchPluginIface_iid)
#endif // SEARCHPLUGINIFACE_H

View File

@ -1,7 +1,7 @@
#include "plugin-manager.h"
#include "search-plugin-manager.h"
using namespace Zeeker;
using namespace UkuiSearch;
static PluginManager *global_instance = nullptr;
void PluginManager::init()

View File

@ -10,7 +10,7 @@
#include "plugininterface/plugin-iface.h"
#include "plugininterface/search-plugin-iface.h"
namespace Zeeker {
namespace UkuiSearch {
class LIBSEARCH_EXPORT PluginManager : public QObject
{
Q_OBJECT

View File

@ -6,7 +6,7 @@
#include "note-search-plugin.h"
#include "web-search-plugin.h"
using namespace Zeeker;
using namespace UkuiSearch;
static SearchPluginManager *global_instance = nullptr;
SearchPluginManager::SearchPluginManager(QObject *parent)
@ -20,7 +20,7 @@ SearchPluginManager::SearchPluginManager(QObject *parent)
registerPlugin(new WebSearchPlugin(this));
}
bool SearchPluginManager::registerPlugin(Zeeker::SearchPluginIface *plugin)
bool SearchPluginManager::registerPlugin(UkuiSearch::SearchPluginIface *plugin)
{
if (m_map.end() != m_map.find(plugin->name())){
return false;

View File

@ -4,7 +4,7 @@
#include <QObject>
#include "search-plugin-iface.h"
namespace Zeeker {
namespace UkuiSearch {
class SearchPluginManager : public QObject
{

View File

@ -5,7 +5,7 @@
#include "settings-search-plugin.h"
#include "file-utils.h"
using namespace Zeeker;
using namespace UkuiSearch;
static SettingsMatch * settingMatchClass = nullptr;
size_t SettingsSearchPlugin::m_uniqueSymbolForSettings = 0;
QMutex SettingsSearchPlugin::m_mutex;
@ -35,7 +35,7 @@ QString SettingsSearchPlugin::getPluginName()
return tr("Settings Search");
}
void Zeeker::SettingsSearchPlugin::KeywordSearch(QString keyword, DataQueue<ResultInfo> *searchResult)
void UkuiSearch::SettingsSearchPlugin::KeywordSearch(QString keyword, DataQueue<ResultInfo> *searchResult)
{
m_mutex.lock();
++m_uniqueSymbolForSettings;

View File

@ -13,7 +13,7 @@
#include "action-label.h"
#include "search-plugin-iface.h"
namespace Zeeker {
namespace UkuiSearch {
class LIBSEARCH_EXPORT SettingsSearchPlugin : public QObject, public SearchPluginIface
{
Q_OBJECT

View File

@ -1,7 +1,7 @@
#include "web-search-plugin.h"
#include "global-settings.h"
using namespace Zeeker;
using namespace UkuiSearch;
WebSearchPlugin::WebSearchPlugin(QObject *parent) : QObject(parent)
{
SearchPluginIface::Actioninfo open { 0, tr("Start browser search")};
@ -9,22 +9,22 @@ WebSearchPlugin::WebSearchPlugin(QObject *parent) : QObject(parent)
initDetailPage();
}
const QString Zeeker::WebSearchPlugin::name()
const QString UkuiSearch::WebSearchPlugin::name()
{
return "Web Page";
}
const QString Zeeker::WebSearchPlugin::description()
const QString UkuiSearch::WebSearchPlugin::description()
{
return tr("Web Page");
}
QString Zeeker::WebSearchPlugin::getPluginName()
QString UkuiSearch::WebSearchPlugin::getPluginName()
{
return tr("Web Page");
}
void Zeeker::WebSearchPlugin::KeywordSearch(QString keyword, DataQueue<Zeeker::SearchPluginIface::ResultInfo> *searchResult)
void UkuiSearch::WebSearchPlugin::KeywordSearch(QString keyword, DataQueue<UkuiSearch::SearchPluginIface::ResultInfo> *searchResult)
{
m_keyWord = keyword;
ResultInfo resultInfo;
@ -35,12 +35,12 @@ void Zeeker::WebSearchPlugin::KeywordSearch(QString keyword, DataQueue<Zeeker::S
searchResult->enqueue(resultInfo);
}
QList<Zeeker::SearchPluginIface::Actioninfo> Zeeker::WebSearchPlugin::getActioninfo(int type)
QList<UkuiSearch::SearchPluginIface::Actioninfo> UkuiSearch::WebSearchPlugin::getActioninfo(int type)
{
return m_actionInfo;
}
void Zeeker::WebSearchPlugin::openAction(int actionkey, QString key, int type)
void UkuiSearch::WebSearchPlugin::openAction(int actionkey, QString key, int type)
{
QString address;
QString engine = GlobalSettings::getInstance()->getValue("web_engine").toString();
@ -58,12 +58,12 @@ void Zeeker::WebSearchPlugin::openAction(int actionkey, QString key, int type)
QDesktopServices::openUrl(address);
}
QWidget *Zeeker::WebSearchPlugin::detailPage(const Zeeker::SearchPluginIface::ResultInfo &ri)
QWidget *UkuiSearch::WebSearchPlugin::detailPage(const UkuiSearch::SearchPluginIface::ResultInfo &ri)
{
return m_detailPage;
}
void Zeeker::WebSearchPlugin::initDetailPage()
void UkuiSearch::WebSearchPlugin::initDetailPage()
{
m_detailPage = new QWidget();
m_detailPage->setFixedWidth(360);

View File

@ -13,7 +13,7 @@
#include "action-label.h"
#include "search-plugin-iface.h"
namespace Zeeker {
namespace UkuiSearch {
class LIBSEARCH_EXPORT WebSearchPlugin : public QObject, public SearchPluginIface
{
Q_OBJECT

View File

@ -2,7 +2,7 @@
<!DOCTYPE TS>
<TS version="2.1" language="zh_CN">
<context>
<name>Zeeker::AppMatch</name>
<name>UkuiSearch::AppMatch</name>
<message>
<location filename="../../libsearch/appsearch/app-match.cpp" line="262"/>
<source>Application Description:</source>
@ -10,14 +10,14 @@
</message>
</context>
<context>
<name>Zeeker::AppSearch</name>
<name>UkuiSearch::AppSearch</name>
<message>
<source>Application Description:</source>
<translation type="vanished"></translation>
</message>
</context>
<context>
<name>Zeeker::AppSearchPlugin</name>
<name>UkuiSearch::AppSearchPlugin</name>
<message>
<location filename="../../libsearch/appsearch/app-search-plugin.cpp" line="11"/>
<location filename="../../libsearch/appsearch/app-search-plugin.cpp" line="171"/>
@ -59,7 +59,7 @@
</message>
</context>
<context>
<name>Zeeker::DirSearchPlugin</name>
<name>UkuiSearch::DirSearchPlugin</name>
<message>
<location filename="../../libsearch/index/file-search-plugin.cpp" line="218"/>
<location filename="../../libsearch/index/file-search-plugin.cpp" line="355"/>
@ -109,7 +109,7 @@
</message>
</context>
<context>
<name>Zeeker::FileContengSearchPlugin</name>
<name>UkuiSearch::FileContengSearchPlugin</name>
<message>
<location filename="../../libsearch/index/file-search-plugin.cpp" line="398"/>
<location filename="../../libsearch/index/file-search-plugin.cpp" line="596"/>
@ -163,7 +163,7 @@
</message>
</context>
<context>
<name>Zeeker::FileSearchPlugin</name>
<name>UkuiSearch::FileSearchPlugin</name>
<message>
<location filename="../../libsearch/index/file-search-plugin.cpp" line="11"/>
<location filename="../../libsearch/index/file-search-plugin.cpp" line="158"/>
@ -225,7 +225,7 @@
</message>
</context>
<context>
<name>Zeeker::NoteSearch</name>
<name>UkuiSearch::NoteSearch</name>
<message>
<location filename="../../libsearch/notesearch/note-search-plugin.cpp" line="190"/>
<source>Note Description:</source>
@ -234,7 +234,7 @@
</message>
</context>
<context>
<name>Zeeker::NoteSearchPlugin</name>
<name>UkuiSearch::NoteSearchPlugin</name>
<message>
<location filename="../../libsearch/notesearch/note-search-plugin.cpp" line="12"/>
<location filename="../../libsearch/notesearch/note-search-plugin.cpp" line="128"/>
@ -263,7 +263,7 @@
</message>
</context>
<context>
<name>Zeeker::SearchManager</name>
<name>UkuiSearch::SearchManager</name>
<message>
<location filename="../../libsearch/index/search-manager.cpp" line="98"/>
<source>Path:</source>
@ -276,7 +276,7 @@
</message>
</context>
<context>
<name>Zeeker::SettingsSearchPlugin</name>
<name>UkuiSearch::SettingsSearchPlugin</name>
<message>
<location filename="../../libsearch/settingsearch/settings-search-plugin.cpp" line="11"/>
<location filename="../../libsearch/settingsearch/settings-search-plugin.cpp" line="405"/>
@ -300,7 +300,7 @@
</message>
</context>
<context>
<name>Zeeker::WebSearchPlugin</name>
<name>UkuiSearch::WebSearchPlugin</name>
<message>
<location filename="../../libsearch/websearch/web-search-plugin.cpp" line="7"/>
<location filename="../../libsearch/websearch/web-search-plugin.cpp" line="94"/>

View File

@ -10,7 +10,7 @@
</message>
</context>
<context>
<name>Zeeker::BestListWidget</name>
<name>UkuiSearch::BestListWidget</name>
<message>
<location filename="../../frontend/view/best-list-view.cpp" line="309"/>
<source>Best Matches</source>
@ -18,7 +18,7 @@
</message>
</context>
<context>
<name>Zeeker::CreateIndexAskDialog</name>
<name>UkuiSearch::CreateIndexAskDialog</name>
<message>
<location filename="../../frontend/control/create-index-ask-dialog.cpp" line="40"/>
<source>ukui-search</source>
@ -51,7 +51,7 @@
</message>
</context>
<context>
<name>Zeeker::FolderListItem</name>
<name>UkuiSearch::FolderListItem</name>
<message>
<location filename="../../frontend/control/settings-widget.cpp" line="538"/>
<source>Delete the folder out of blacklist</source>
@ -59,7 +59,7 @@
</message>
</context>
<context>
<name>Zeeker::MainWindow</name>
<name>UkuiSearch::MainWindow</name>
<message>
<location filename="../../frontend/mainwindow.cpp" line="70"/>
<source>ukui-search</source>
@ -72,7 +72,7 @@
</message>
</context>
<context>
<name>Zeeker::SearchLineEdit</name>
<name>UkuiSearch::SearchLineEdit</name>
<message>
<location filename="../../frontend/control/search-line-edit.cpp" line="55"/>
<source>Search</source>
@ -80,7 +80,7 @@
</message>
</context>
<context>
<name>Zeeker::SettingsWidget</name>
<name>UkuiSearch::SettingsWidget</name>
<message>
<location filename="../../frontend/control/settings-widget.cpp" line="35"/>
<source>ukui-search-settings</source>
@ -241,7 +241,7 @@
</message>
</context>
<context>
<name>Zeeker::WebSearchWidget</name>
<name>UkuiSearch::WebSearchWidget</name>
<message>
<location filename="../../frontend/view/web-search-view.cpp" line="150"/>
<source>Web Page</source>

View File

@ -245,7 +245,7 @@
</message>
</context>
<context>
<name>Zeeker::BestListWidget</name>
<name>UkuiSearch::BestListWidget</name>
<message>
<location filename="../../frontend/view/best-list-view.cpp" line="309"/>
<source>Best Matches</source>
@ -253,7 +253,7 @@
</message>
</context>
<context>
<name>Zeeker::ContentWidget</name>
<name>UkuiSearch::ContentWidget</name>
<message>
<source>Recently Opened</source>
<translation type="obsolete">Yeni ılan</translation>
@ -296,7 +296,7 @@
</message>
</context>
<context>
<name>Zeeker::CreateIndexAskDialog</name>
<name>UkuiSearch::CreateIndexAskDialog</name>
<message>
<location filename="../../frontend/control/create-index-ask-dialog.cpp" line="40"/>
<source>ukui-search</source>
@ -329,7 +329,7 @@
</message>
</context>
<context>
<name>Zeeker::FolderListItem</name>
<name>UkuiSearch::FolderListItem</name>
<message>
<location filename="../../frontend/control/settings-widget.cpp" line="538"/>
<source>Delete the folder out of blacklist</source>
@ -337,7 +337,7 @@
</message>
</context>
<context>
<name>Zeeker::HomePage</name>
<name>UkuiSearch::HomePage</name>
<message>
<source>Open Quickly</source>
<translation type="obsolete">Hızlı </translation>
@ -352,7 +352,7 @@
</message>
</context>
<context>
<name>Zeeker::MainWindow</name>
<name>UkuiSearch::MainWindow</name>
<message>
<location filename="../../frontend/mainwindow.cpp" line="70"/>
<source>ukui-search</source>
@ -369,7 +369,7 @@
</message>
</context>
<context>
<name>Zeeker::OptionView</name>
<name>UkuiSearch::OptionView</name>
<message>
<source>Open</source>
<translation type="obsolete"></translation>
@ -392,14 +392,14 @@
</message>
</context>
<context>
<name>Zeeker::SearchBarHLayout</name>
<name>UkuiSearch::SearchBarHLayout</name>
<message>
<source>Search</source>
<translation type="obsolete">Ara</translation>
</message>
</context>
<context>
<name>Zeeker::SearchDetailView</name>
<name>UkuiSearch::SearchDetailView</name>
<message>
<source>Application</source>
<translation type="obsolete">Uygulama</translation>
@ -418,7 +418,7 @@
</message>
</context>
<context>
<name>Zeeker::SearchLineEdit</name>
<name>UkuiSearch::SearchLineEdit</name>
<message>
<location filename="../../frontend/control/search-line-edit.cpp" line="55"/>
<source>Search</source>
@ -426,7 +426,7 @@
</message>
</context>
<context>
<name>Zeeker::SettingsWidget</name>
<name>UkuiSearch::SettingsWidget</name>
<message>
<location filename="../../frontend/control/settings-widget.cpp" line="35"/>
<source>ukui-search-settings</source>
@ -587,7 +587,7 @@
</message>
</context>
<context>
<name>Zeeker::ShowMoreLabel</name>
<name>UkuiSearch::ShowMoreLabel</name>
<message>
<source>Show More...</source>
<translation type="obsolete">Daha Fazla Göster...</translation>
@ -614,7 +614,7 @@
</message>
</context>
<context>
<name>Zeeker::WebSearchWidget</name>
<name>UkuiSearch::WebSearchWidget</name>
<message>
<location filename="../../frontend/view/web-search-view.cpp" line="150"/>
<source>Web Page</source>

View File

@ -10,7 +10,7 @@
</message>
</context>
<context>
<name>Zeeker::BestListWidget</name>
<name>UkuiSearch::BestListWidget</name>
<message>
<location filename="../../frontend/view/best-list-view.cpp" line="309"/>
<source>Best Matches</source>
@ -18,7 +18,7 @@
</message>
</context>
<context>
<name>Zeeker::ContentWidget</name>
<name>UkuiSearch::ContentWidget</name>
<message>
<source>Recently Opened</source>
<translation type="vanished"></translation>
@ -65,7 +65,7 @@
</message>
</context>
<context>
<name>Zeeker::CreateIndexAskDialog</name>
<name>UkuiSearch::CreateIndexAskDialog</name>
<message>
<location filename="../../frontend/control/create-index-ask-dialog.cpp" line="40"/>
<source>ukui-search</source>
@ -98,7 +98,7 @@
</message>
</context>
<context>
<name>Zeeker::FolderListItem</name>
<name>UkuiSearch::FolderListItem</name>
<message>
<location filename="../../frontend/control/settings-widget.cpp" line="538"/>
<source>Delete the folder out of blacklist</source>
@ -106,7 +106,7 @@
</message>
</context>
<context>
<name>Zeeker::HomePage</name>
<name>UkuiSearch::HomePage</name>
<message>
<source>Open Quickly</source>
<translation type="vanished"></translation>
@ -121,7 +121,7 @@
</message>
</context>
<context>
<name>Zeeker::MainWindow</name>
<name>UkuiSearch::MainWindow</name>
<message>
<location filename="../../frontend/mainwindow.cpp" line="70"/>
<source>ukui-search</source>
@ -138,7 +138,7 @@
</message>
</context>
<context>
<name>Zeeker::OptionView</name>
<name>UkuiSearch::OptionView</name>
<message>
<source>Open</source>
<translation type="vanished"></translation>
@ -165,14 +165,14 @@
</message>
</context>
<context>
<name>Zeeker::SearchBarHLayout</name>
<name>UkuiSearch::SearchBarHLayout</name>
<message>
<source>Search</source>
<translation type="vanished"></translation>
</message>
</context>
<context>
<name>Zeeker::SearchDetailView</name>
<name>UkuiSearch::SearchDetailView</name>
<message>
<source>Introduction: %1</source>
<translation type="vanished">: %1</translation>
@ -199,7 +199,7 @@
</message>
</context>
<context>
<name>Zeeker::SearchLineEdit</name>
<name>UkuiSearch::SearchLineEdit</name>
<message>
<location filename="../../frontend/control/search-line-edit.cpp" line="55"/>
<source>Search</source>
@ -207,7 +207,7 @@
</message>
</context>
<context>
<name>Zeeker::SettingsWidget</name>
<name>UkuiSearch::SettingsWidget</name>
<message>
<location filename="../../frontend/control/settings-widget.cpp" line="35"/>
<source>ukui-search-settings</source>
@ -368,7 +368,7 @@
</message>
</context>
<context>
<name>Zeeker::ShowMoreLabel</name>
<name>UkuiSearch::ShowMoreLabel</name>
<message>
<source>Show More...</source>
<translation type="vanished">...</translation>
@ -395,7 +395,7 @@
</message>
</context>
<context>
<name>Zeeker::WebSearchWidget</name>
<name>UkuiSearch::WebSearchWidget</name>
<message>
<location filename="../../frontend/view/web-search-view.cpp" line="150"/>
<source>Web Page</source>

View File

@ -7,7 +7,7 @@
#include <unistd.h>
#include <QDebug>
#include "ukui-search-service.h"
using namespace Zeeker;
using namespace UkuiSearch;
void messageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)
{
QByteArray localMsg = msg.toLocal8Bit();

View File

@ -2,7 +2,7 @@
#include "ukui-search-service.h"
#define UKUI_SEARCH_SCHEMAS "org.ukui.search.settings"
#define SEARCH_METHOD_KEY "indexSearch"
using namespace Zeeker;
using namespace UkuiSearch;
UkuiSearchService::UkuiSearchService(int &argc, char *argv[], const QString &applicationName): QtSingleApplication (applicationName, argc, argv)
{
qDebug()<<"ukui search service constructor start";

View File

@ -8,7 +8,7 @@
#include "search-method-manager.h"
#include "common.h"
#include "file-utils.h"
namespace Zeeker {
namespace UkuiSearch {
class UkuiSearchService : public QtSingleApplication
{