fix(frontend): Retract button is not reset when get new result.
Description: 修复收起按钮未重置的问题和ukui-search -s拉起不显示主界面的bug Log: 修复收起按钮未重置的问题和ukui-search -s拉起不显示主界面的bug Bug: http://172.17.66.192/biz/bug-view-35227.html http://172.17.66.192/biz/bug-view-33087.html
This commit is contained in:
parent
b1696716bf
commit
f62c5dd289
|
@ -16,6 +16,7 @@ ShowMoreLabel::~ShowMoreLabel()
|
||||||
|
|
||||||
void ShowMoreLabel::resetLabel()
|
void ShowMoreLabel::resetLabel()
|
||||||
{
|
{
|
||||||
|
m_isOpen = false;
|
||||||
m_textLabel->setText(tr("Show More..."));
|
m_textLabel->setText(tr("Show More..."));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -208,6 +208,10 @@ int main(int argc, char *argv[])
|
||||||
XAtomHelper::getInstance()->setWindowMotifHint(w->winId(), hints);
|
XAtomHelper::getInstance()->setWindowMotifHint(w->winId(), hints);
|
||||||
|
|
||||||
app.setActivationWindow(w);
|
app.setActivationWindow(w);
|
||||||
|
|
||||||
|
if (QString::compare(QString("-s"), QString(QLatin1String(argv[1]))) == 0) {
|
||||||
|
w->show();
|
||||||
|
}
|
||||||
// if(arguments.size()>1)
|
// if(arguments.size()>1)
|
||||||
// w->searchContent(arguments.at(1));
|
// w->searchContent(arguments.at(1));
|
||||||
QObject::connect(&app, SIGNAL(messageReceived(const QString&)),w, SLOT(bootOptionsFilter(const QString&)));
|
QObject::connect(&app, SIGNAL(messageReceived(const QString&)),w, SLOT(bootOptionsFilter(const QString&)));
|
||||||
|
|
|
@ -93,15 +93,15 @@ MainWindow::MainWindow(QWidget *parent) :
|
||||||
m_search_result_thread = new SearchResult(this);
|
m_search_result_thread = new SearchResult(this);
|
||||||
// m_search_result_thread->start();
|
// m_search_result_thread->start();
|
||||||
connect(m_search_result_thread, &SearchResult::searchResultFile, this, [ = ](QString path) {
|
connect(m_search_result_thread, &SearchResult::searchResultFile, this, [ = ](QString path) {
|
||||||
// qDebug()<<"Append a file into list: "<<path;
|
qDebug()<<"Append a file into list: "<<path;
|
||||||
m_contentFrame->appendSearchItem(SearchItem::SearchType::Files, path);
|
m_contentFrame->appendSearchItem(SearchItem::SearchType::Files, path);
|
||||||
});
|
});
|
||||||
connect(m_search_result_thread, &SearchResult::searchResultDir, this, [ = ](QString path) {
|
connect(m_search_result_thread, &SearchResult::searchResultDir, this, [ = ](QString path) {
|
||||||
// qDebug()<<"Append a dir into list: "<<path;
|
qDebug()<<"Append a dir into list: "<<path;
|
||||||
m_contentFrame->appendSearchItem(SearchItem::SearchType::Dirs, path);
|
m_contentFrame->appendSearchItem(SearchItem::SearchType::Dirs, path);
|
||||||
});
|
});
|
||||||
connect(m_search_result_thread, &SearchResult::searchResultContent, this, [ = ](QPair<QString, QStringList> pair) {
|
connect(m_search_result_thread, &SearchResult::searchResultContent, this, [ = ](QPair<QString, QStringList> pair) {
|
||||||
// qDebug()<<"Append a file content into list: "<<pair.first;
|
qDebug()<<"Append a file content into list: "<<pair.first;
|
||||||
m_contentFrame->appendSearchItem(SearchItem::SearchType::Contents, pair.first, pair.second);
|
m_contentFrame->appendSearchItem(SearchItem::SearchType::Contents, pair.first, pair.second);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -215,6 +215,9 @@ void MainWindow::initUi()
|
||||||
} else {
|
} else {
|
||||||
m_contentFrame->setCurrentIndex(1);
|
m_contentFrame->setCurrentIndex(1);
|
||||||
QTimer::singleShot(10,this,[=](){
|
QTimer::singleShot(10,this,[=](){
|
||||||
|
m_search_result_file->clear();
|
||||||
|
m_search_result_dir->clear();
|
||||||
|
m_search_result_content->clear();
|
||||||
if (! m_search_result_thread->isRunning()) {
|
if (! m_search_result_thread->isRunning()) {
|
||||||
m_search_result_thread->start();
|
m_search_result_thread->start();
|
||||||
}
|
}
|
||||||
|
@ -282,9 +285,9 @@ void MainWindow::searchContent(QString searchcontent){
|
||||||
m_app_setting_lists.clear();
|
m_app_setting_lists.clear();
|
||||||
m_contentFrame->setKeyword(searchcontent);
|
m_contentFrame->setKeyword(searchcontent);
|
||||||
|
|
||||||
m_search_result_file->clear();
|
// m_search_result_file->clear();
|
||||||
m_search_result_dir->clear();
|
// m_search_result_dir->clear();
|
||||||
m_search_result_content->clear();
|
// m_search_result_content->clear();
|
||||||
|
|
||||||
AppMatch * appMatchor = new AppMatch(this);
|
AppMatch * appMatchor = new AppMatch(this);
|
||||||
SettingsMatch * settingMatchor = new SettingsMatch(this);
|
SettingsMatch * settingMatchor = new SettingsMatch(this);
|
||||||
|
|
Loading…
Reference in New Issue