p90463782
/
ukui-search
forked from openkylin/ukui-search
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #219 from mammonsama666/0427-dev 

Start ukui-control-center on settings button clicked.
This commit is contained in:
iaom 2021-05-06 16:15:47 +08:00 committed by GitHub
parent b8c5861ebf 8e445406a0
commit 6a98ff1598
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/mainwindow.cpp
View File

@ -35,7 +35,7 @@
#include "qt-single-application.h"
//#include "inotify-manager.h"
#include "settings-widget.h"
//#include "settings-widget.h"
#include "global-settings.h"
@ -154,10 +154,10 @@ MainWindow::~MainWindow() {
delete m_searchLayout;
m_searchLayout = NULL;
}
if(m_settingsWidget) {
delete m_settingsWidget;
m_settingsWidget = NULL;
}
// if(m_settingsWidget) {
// delete m_settingsWidget;
// m_settingsWidget = NULL;
// }
if(m_askDialog) {
delete m_askDialog;
m_askDialog = NULL;
@ -203,35 +203,38 @@ void MainWindow::initUi() {
m_menuBtn->setProperty("isWindowButton", 0x01);
m_menuBtn->setFlat(true);
connect(m_menuBtn, &QPushButton::clicked, this, [ = ]() {
if(m_settingsWidget) { //当此窗口已存在时，仅需置顶
if(!m_settingsWidget->isVisible()) {
centerToScreen(m_settingsWidget);
}
m_settingsWidget->showWidget();
return;
}
m_settingsWidget = new SettingsWidget();
connect(this, &MainWindow::webEngineChanged, m_settingsWidget, [ = ]() {
m_settingsWidget->resetWebEngine();
});
connect(m_settingsWidget, &SettingsWidget::webEngineChanged, this, [ = ](const QString & engine) {
if(m_search_gsettings && m_search_gsettings->keys().contains(WEB_ENGINE_KEY)) {
m_search_gsettings->set(WEB_ENGINE_KEY, engine);
} else {
GlobalSettings::getInstance()->setValue(WEB_ENGINE, engine);
}
});
centerToScreen(m_settingsWidget);
m_settingsWidget->show();
connect(m_settingsWidget, &SettingsWidget::settingWidgetClosed, this, [ = ]() {
QTimer::singleShot(100, this, [ = ] {
// clearSearchResult(); //现暂定从设置页返回主页面不清空搜索结果
this->setWindowState(this->windowState() & ~Qt::WindowMinimized);
this->raise();
this->showNormal();
this->activateWindow();
});
});
// if(m_settingsWidget) { //当此窗口已存在时，仅需置顶
// if(!m_settingsWidget->isVisible()) {
// centerToScreen(m_settingsWidget);
// }
// m_settingsWidget->showWidget();
// return;
// }
// m_settingsWidget = new SettingsWidget();
// connect(this, &MainWindow::webEngineChanged, m_settingsWidget, [ = ]() {
// m_settingsWidget->resetWebEngine();
// });
// connect(m_settingsWidget, &SettingsWidget::webEngineChanged, this, [ = ](const QString & engine) {
// if(m_search_gsettings && m_search_gsettings->keys().contains(WEB_ENGINE_KEY)) {
// m_search_gsettings->set(WEB_ENGINE_KEY, engine);
// } else {
// GlobalSettings::getInstance()->setValue(WEB_ENGINE, engine);
// }
// });
// centerToScreen(m_settingsWidget);
// m_settingsWidget->show();
// connect(m_settingsWidget, &SettingsWidget::settingWidgetClosed, this, [ = ]() {
// QTimer::singleShot(100, this, [ = ] {
//// clearSearchResult(); //现暂定从设置页返回主页面不清空搜索结果
// this->setWindowState(this->windowState() & ~Qt::WindowMinimized);
// this->raise();
// this->showNormal();
// this->activateWindow();
// });
// });
//打开控制面板的设置页
QProcess process;
process.startDetached("ukui-control-center --search");
});
m_titleLyt->addWidget(m_iconLabel);
m_titleLyt->addWidget(m_titleLabel);

4
src/mainwindow.h
View File

@ -48,7 +48,7 @@
#include "content-widget.h"
#include "input-box.h"
#include "index/index-generator.h"
#include "settings-widget.h"
//#include "settings-widget.h"
#include "libsearch.h"
#include "search-app-thread.h"
#include "xatom-helper.h"
@ -94,7 +94,7 @@ private:
QLabel * m_iconLabel = nullptr; // Icon lable
QLabel * m_titleLabel = nullptr; // Title lable
QPushButton * m_menuBtn = nullptr; // Menu button
SettingsWidget * m_settingsWidget = nullptr; // Settings Widget
// SettingsWidget * m_settingsWidget = nullptr; // Settings Widget
ContentWidget * m_contentFrame = nullptr; // Content frame
SearchBarHLayout * m_searchLayout = nullptr; // Search bar layout
SeachBarWidget * m_searchWidget = nullptr; // Search bar