openkylin
/
ukui-search
mirror of https://gitee.com/openkylin/ukui-search.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge pull request #88 from mammonsama666/0116-fix 

fix(frontend): There is not enough items in homepage.
This commit is contained in:
iaom 2021-01-16 09:06:08 +08:00 committed by GitHub
parent d2a93025ee 8285da4a35
commit bf1467226d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/content-widget.cpp
View File

@ -253,9 +253,9 @@ void ContentWidget::initHomePage() {
HomePageItem * item = new HomePageItem(itemWidget, i, path);
layout->addWidget(item);
}
for (int j = 0; j < 4 - lists.at(i).length(); j++) {
for (int j = 0; j < 5 - lists.at(i).length(); j++) {
QWidget * emptyItem = new QWidget(itemWidget);
emptyItem->setFixedSize(136, 136); //占位用widget,少于4项会补全后方占位
emptyItem->setFixedSize(108, 108); //占位用widget,少于4项会补全后方占位
layout->addWidget(emptyItem);
}
if (i) titleLabel->setText(tr("Open Quickly"));

2
src/control/config-file.cpp
View File

@ -43,7 +43,7 @@ QStringList ConfigFile::readCommonly(){
}
if(m_qSettings)
delete m_qSettings;
return returnlist.mid(0, 4);
return returnlist.mid(0, 5);
}
bool ConfigFile::writeRecently(QString message){

36
src/control/home-page-item.cpp
View File

@ -36,12 +36,18 @@ void HomePageItem::setupUi(const int& type, const QString& path) {
case SearchListView::ResType::File: {
QProcess process;
process.start(QString("xdg-open %1").arg(path));
process.waitForFinished();
break;
}
case SearchListView::ResType::Setting: {
//打开控制面板对应页面
QProcess process;
process.start(QString("ukui-control-center --%1").arg(path.left(path.indexOf("/")).toLower()));
QProcess * process = new QProcess;
connect(process, static_cast<void(QProcess::*)(int,QProcess::ExitStatus)>(&QProcess::finished), this, [ = ]() {
if (process) {
delete process;
}
});
process->start(QString("ukui-control-center --%1").arg(path.left(path.indexOf("/")).toLower()));
break;
}
default:
@ -58,18 +64,30 @@ void HomePageItem::setupUi(const int& type, const QString& path) {
case SearchListView::ResType::App : {
icon = FileUtils::getAppIcon(path);
m_namelabel->setText(FileUtils::getAppName(path));
QFontMetrics fontMetrics = m_namelabel->fontMetrics();
QString name = FileUtils::getAppName(path);
m_namelabel->setText(fontMetrics.elidedText(name, Qt::ElideRight, 220));
this->setToolTip(name);
break;
}
case SearchListView::ResType::Content:
case SearchListView::ResType::Dir :
case SearchListView::ResType::File : {
icon = FileUtils::getFileIcon(QString("file://%1").arg(path));
m_namelabel->setText(FileUtils::getFileName(path));
// m_namelabel->setText(FileUtils::getFileName(path));
QFontMetrics fontMetrics = m_namelabel->fontMetrics();
QString name = FileUtils::getFileName(path);
m_namelabel->setText(fontMetrics.elidedText(name, Qt::ElideRight, 220));
this->setToolTip(name);
break;
}
case SearchListView::ResType::Setting : {
icon = FileUtils::getSettingIcon(path, true);
m_namelabel->setText(FileUtils::getSettingName(path));
// m_namelabel->setText(FileUtils::getSettingName(path));
QFontMetrics fontMetrics = m_namelabel->fontMetrics();
QString name = FileUtils::getSettingName(path);
m_namelabel->setText(fontMetrics.elidedText(name, Qt::ElideRight, 220));
this->setToolTip(name);
break;
}
default :
@ -88,17 +106,23 @@ void HomePageItem::setupUi(const int& type, const QString& path) {
QIcon icon = FileUtils::getSettingIcon(path, true);
m_iconlabel->setPixmap(icon.pixmap(icon.actualSize(QSize(48, 48))));
m_namelabel->setText(FileUtils::getSettingName(path));
this->setToolTip(FileUtils::getSettingName(path));
} else {
QIcon icon = FileUtils::getAppIcon(path);
m_iconlabel->setPixmap(icon.pixmap(icon.actualSize(QSize(48, 48))));
m_namelabel->setText(FileUtils::getAppName(path));
this->setToolTip(FileUtils::getAppName(path));
}
} else {
QIcon icon = FileUtils::getAppIcon(path);
m_iconlabel->setPixmap(icon.pixmap(icon.actualSize(QSize(48, 48))));
m_namelabel->setText(FileUtils::getAppName(path));
// m_namelabel->setText(FileUtils::getAppName(path));
QFontMetrics fontMetrics = m_namelabel->fontMetrics();
QString name = FileUtils::getAppName(path);
m_namelabel->setText(fontMetrics.elidedText(name, Qt::ElideRight, 96));
this->setToolTip(name);
}
m_widget->setFixedSize(120, 120);
m_widget->setFixedSize(100, 100);
m_vlayout = new QVBoxLayout(m_widget);
m_vlayout->setContentsMargins(0,16,0,12);
m_iconlabel->setAlignment(Qt::AlignCenter);

10
src/control/search-detail-view.cpp
View File

@ -241,9 +241,13 @@ bool SearchDetailView::openAction(const int& type, const QString& path) {
}
case SearchListView::ResType::Setting: {
//打开控制面板对应页面
QProcess process;
process.start(QString("ukui-control-center --%1").arg(path.left(path.indexOf("/")).toLower()));
process.waitForFinished();
QProcess * process = new QProcess;
connect(process, static_cast<void(QProcess::*)(int,QProcess::ExitStatus)>(&QProcess::finished), this, [ = ]() {
if (process) {
delete process;
}
});
process->start(QString("ukui-control-center --%1").arg(path.left(path.indexOf("/")).toLower()));
return true;
break;
}