Differential D14856 Diff 39777 src/search/katesearchbar.cpp

Changeset View

Standalone View

View Options

src/search/katesearchbar.cpp

Show First 20 Lines • Show All 1322 Lines • ▼ Show 20 Line(s)1296 if (create) {
1323 m_powerUi->replacement->setDuplicatesEnabled(false); 1323​ m_powerUi->replacement->setDuplicatesEnabled(false);
1324 m_powerUi->replacement->setInsertPolicy(QComboBox::InsertAtTop); 1324​ m_powerUi->replacement->setInsertPolicy(QComboBox::InsertAtTop);
1325 m_powerUi->replacement->setMaxCount(m_config->maxHistorySize()); 1325​ m_powerUi->replacement->setMaxCount(m_config->maxHistorySize());
1326 m_powerUi->replacement->setModel(KTextEditor::EditorPrivate::self()->replaceHistoryModel()); 1326​ m_powerUi->replacement->setModel(KTextEditor::EditorPrivate::self()->replaceHistoryModel());
1327 m_powerUi->replacement->lineEdit()->setClearButtonEnabled(true); 1327​ m_powerUi->replacement->lineEdit()->setClearButtonEnabled(true);
1328 m_powerUi->replacement->setCompleter(nullptr); 1328​ m_powerUi->replacement->setCompleter(nullptr);
1329 1329​
1330 // Icons 1330​ // Icons
1331 m_powerUi->mutate->setIcon(QIcon::fromTheme(QStringLiteral("games-config-options"))); 1331​ // Gnome does not seem to have all icons we want, so we use fall-back icons for those that are missing.
1332​ QIcon mutateIcon = QIcon::fromTheme(QStringLiteral("games-config-options"), QIcon::fromTheme(QStringLiteral("preferences-system")));
broulikUnsubmitted
Not Done

hasThemeIcon)foo) just does !QIcon::fromTheme(foo).isNull() so you might as well just do the same and safe a lookup

broulik: `hasThemeIcon)foo)` just does `!QIcon::fromTheme(foo).isNull()` so you might as well just do…
dhaumannUnsubmitted
Done

What would also be possible:

QIcon mutateIcon = QIcon::fromTheme(QStringLiteral("games-config-options"), QIcon::fromTheme(QStringLiteral("preferences-system")));

The 2nd parameter is the fallback Icon. This would be much shorter.

dhaumann: What would also be possible: QIcon mutateIcon = QIcon::fromTheme(QStringLiteral("games-config…
brunsUnsubmitted
Not Done

Doesn't this evaluate the fallback always, even if not needed?
IIRC QIcon::fromTheme is not really lightweight ...

bruns: Doesn't this evaluate the fallback always, even if not needed? IIRC QIcon::fromTheme is not…
1333​ QIcon matchCaseIcon = QIcon::fromTheme(QStringLiteral("format-text-superscript"), QIcon::fromTheme(QStringLiteral("format-text-bold")));
1334​ m_powerUi->mutate->setIcon(mutateIcon);
1332 m_powerUi->mutate->setChecked(true); 1335​ m_powerUi->mutate->setChecked(true);
1333 m_powerUi->findNext->setIcon(QIcon::fromTheme(QStringLiteral("go-down-search"))); 1336​ m_powerUi->findNext->setIcon(QIcon::fromTheme(QStringLiteral("go-down-search")));
1334 m_powerUi->findPrev->setIcon(QIcon::fromTheme(QStringLiteral("go-up-search"))); 1337​ m_powerUi->findPrev->setIcon(QIcon::fromTheme(QStringLiteral("go-up-search")));
1335 m_powerUi->findAll->setIcon(QIcon::fromTheme(QStringLiteral("edit-find"))); 1338​ m_powerUi->findAll->setIcon(QIcon::fromTheme(QStringLiteral("edit-find")));
1336 m_powerUi->matchCase->setIcon(QIcon::fromTheme(QStringLiteral("format-text-superscript"))); 1339​ m_powerUi->matchCase->setIcon(matchCaseIcon);
1337 m_powerUi->selectionOnly->setIcon(QIcon::fromTheme(QStringLiteral("edit-select-all"))); 1340​ m_powerUi->selectionOnly->setIcon(QIcon::fromTheme(QStringLiteral("edit-select-all")));
1338 1341​
1339 // Focus proxy 1342​ // Focus proxy
1340 centralWidget()->setFocusProxy(m_powerUi->pattern); 1343​ centralWidget()->setFocusProxy(m_powerUi->pattern);
1341 } 1344​ }
1342 1345​
1343 m_powerUi->selectionOnly->setChecked(selectionOnly); 1346​ m_powerUi->selectionOnly->setChecked(selectionOnly);
1344 1347​
▲ Show 20 Lines • Show All 112 Lines • ▼ Show 20 Line(s)1443 if (create) {
1457 m_incUi->setupUi(m_widget); 1460​ m_incUi->setupUi(m_widget);
1458 m_layout->addWidget(m_widget); 1461​ m_layout->addWidget(m_widget);
1459 1462​
1460// new QShortcut(KStandardShortcut::paste().primary(), m_incUi->pattern, SLOT(paste()), 0, Qt::WidgetWithChildrenShortcut); 1463​// new QShortcut(KStandardShortcut::paste().primary(), m_incUi->pattern, SLOT(paste()), 0, Qt::WidgetWithChildrenShortcut);
1461// if (!KStandardShortcut::paste().alternate().isEmpty()) 1464​// if (!KStandardShortcut::paste().alternate().isEmpty())
1462// new QShortcut(KStandardShortcut::paste().alternate(), m_incUi->pattern, SLOT(paste()), 0, Qt::WidgetWithChildrenShortcut); 1465​// new QShortcut(KStandardShortcut::paste().alternate(), m_incUi->pattern, SLOT(paste()), 0, Qt::WidgetWithChildrenShortcut);
1463 1466​
1464 // Icons 1467​ // Icons
1465 m_incUi->mutate->setIcon(QIcon::fromTheme(QStringLiteral("games-config-options"))); 1468​ // Gnome does not seem to have all icons we want, so we use fall-back icons for those that are missing.
1469​ QIcon mutateIcon = QIcon::fromTheme(QStringLiteral("games-config-options"), QIcon::fromTheme(QStringLiteral("preferences-system")));
1470​ QIcon matchCaseIcon = QIcon::fromTheme(QStringLiteral("format-text-superscript"), QIcon::fromTheme(QStringLiteral("format-text-bold")));
1471​ m_incUi->mutate->setIcon(mutateIcon);
1466 m_incUi->next->setIcon(QIcon::fromTheme(QStringLiteral("go-down-search"))); 1472​ m_incUi->next->setIcon(QIcon::fromTheme(QStringLiteral("go-down-search")));
1467 m_incUi->prev->setIcon(QIcon::fromTheme(QStringLiteral("go-up-search"))); 1473​ m_incUi->prev->setIcon(QIcon::fromTheme(QStringLiteral("go-up-search")));
1468 m_incUi->matchCase->setIcon(QIcon::fromTheme(QStringLiteral("format-text-superscript"))); 1474​ m_incUi->matchCase->setIcon(matchCaseIcon);
1469 1475​
1470 // Ensure minimum size 1476​ // Ensure minimum size
1471 m_incUi->pattern->setMinimumWidth(12 * m_incUi->pattern->fontMetrics().height()); 1477​ m_incUi->pattern->setMinimumWidth(12 * m_incUi->pattern->fontMetrics().height());
1472 1478​
1473 // Customize status area 1479​ // Customize status area
1474 m_incUi->status->setTextElideMode(Qt::ElideLeft); 1480​ m_incUi->status->setTextElideMode(Qt::ElideLeft);
1475 1481​
1476 // Focus proxy 1482​ // Focus proxy
▲ Show 20 Lines • Show All 172 Lines • Show Last 20 Lines