Merge branch '0811-dev' into 'dev-unity'
Update quickly open desktop file names;Fix: Search icon in search lineediter is not visble in dark theme. See merge request kylin-desktop/ukui-search!121
This commit is contained in:
commit
70bb2c43b1
|
@ -39,7 +39,7 @@ ContentWidget::ContentWidget(QWidget * parent): QStackedWidget(parent) {
|
||||||
m_quicklyOpenList.replace(2, "/usr/share/applications/eom.desktop");
|
m_quicklyOpenList.replace(2, "/usr/share/applications/eom.desktop");
|
||||||
}
|
}
|
||||||
if (QString::compare(FileUtils::getAppName(m_quicklyOpenList.at(4)), "Unknown App") == 0) {
|
if (QString::compare(FileUtils::getAppName(m_quicklyOpenList.at(4)), "Unknown App") == 0) {
|
||||||
m_quicklyOpenList.replace(4, "/usr/share/applications/org.gnome.Evolution.desktop");
|
m_quicklyOpenList.replace(4, "/usr/share/applications/evolution.desktop");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -105,20 +105,9 @@ void SearchBarHLayout::initUI() {
|
||||||
queryWidLayout->setSpacing(5);
|
queryWidLayout->setSpacing(5);
|
||||||
m_queryWidget->setLayout(queryWidLayout);
|
m_queryWidget->setLayout(queryWidLayout);
|
||||||
|
|
||||||
|
QPixmap pixmap(QIcon::fromTheme("system-search-symbolic", QIcon(":/res/icons/system-search.symbolic.png")).pixmap(QSize(20, 20)));
|
||||||
if (!QIcon::fromTheme("system-search-symbolic").isNull()) {
|
|
||||||
QPixmap pixmap(QIcon::fromTheme("system-search-symbolic").pixmap(QSize(20, 20)));
|
|
||||||
m_queryIcon = new QLabel;
|
|
||||||
m_queryIcon->setFixedSize(pixmap.size());
|
|
||||||
m_queryIcon->setPixmap(pixmap);
|
|
||||||
} else {
|
|
||||||
QPixmap pixmap(QIcon(":/res/icons/system-search.symbolic.png").pixmap(QSize(20, 20)));
|
|
||||||
m_queryIcon = new QLabel;
|
|
||||||
m_queryIcon->setFixedSize(pixmap.size());
|
|
||||||
m_queryIcon->setPixmap(pixmap);
|
|
||||||
}
|
|
||||||
QPixmap pixmap(QIcon::fromTheme("system-search-symbolic").pixmap(QSize(20, 20)));
|
|
||||||
m_queryIcon = new QLabel;
|
m_queryIcon = new QLabel;
|
||||||
|
m_queryIcon->setProperty("useIconHighlightEffect", 0x10);
|
||||||
m_queryIcon->setFixedSize(pixmap.size());
|
m_queryIcon->setFixedSize(pixmap.size());
|
||||||
m_queryIcon->setPixmap(pixmap);
|
m_queryIcon->setPixmap(pixmap);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue