yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kcms/tabbox: Improve model initialization

Browse source 
- Add the switchers to the model directly, instead of using
  temporal lists and a second loop over them
- Use the same model for main and alternative forms

This makes this code a little more clear and efficient
This commit is contained in:
Ismael Asensio 2023-01-16 20:25:12 +01:00
parent 8b8bfe515e
commit a648553be0
1 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/kcms/tabbox/main.cpp
View file

@ -139,20 +139,26 @@ static QList<KPackage::Package> availableLnFPackages()
void KWinTabBoxConfig::initLayoutLists()
{
QList<KPluginMetaData> offers = KPackage::PackageLoader::self()->listPackages("KWin/WindowSwitcher");
QStringList layoutNames, layoutPlugins, layoutPaths;
QStandardItemModel *model = new QStandardItemModel;
auto addToModel = [model](const QString &name, const QString &pluginId, const QString &path) {
QStandardItem *item = new QStandardItem(name);
item->setData(pluginId, Qt::UserRole);
item->setData(path, KWinTabBoxConfigForm::LayoutPath);
item->setData(true, KWinTabBoxConfigForm::AddonEffect);
model->appendRow(item);
};
const auto lnfPackages = availableLnFPackages();
for (const auto &package : lnfPackages) {
const auto &metaData = package.metadata();
const QString switcherFile = package.filePath("windowswitcher", QStringLiteral("WindowSwitcher.qml"));
if (switcherFile.isEmpty()) {
// Skip lnfs that don't actually ship a switcher
continue;
}
layoutNames << metaData.name();
layoutPlugins << metaData.pluginId();
layoutPaths << switcherFile;
addToModel(metaData.name(), metaData.pluginId(), switcherFile);
}
for (const auto &offer : offers) {
@ -172,25 +178,13 @@ void KWinTabBoxConfig::initLayoutLists()
continue;
}
layoutNames << offer.name();
layoutPlugins << pluginName;
layoutPaths << scriptFile;
addToModel(offer.name(), pluginName, scriptFile);
}
KWinTabBoxConfigForm *ui[2] = {m_primaryTabBoxUi, m_alternativeTabBoxUi};
for (int i = 0; i < 2; ++i) {
QStandardItemModel *model = new QStandardItemModel;
model->sort(0);
for (int j = 0; j < layoutNames.count(); ++j) {
QStandardItem *item = new QStandardItem(layoutNames[j]);
item->setData(layoutPlugins[j], Qt::UserRole);
item->setData(layoutPaths[j], KWinTabBoxConfigForm::LayoutPath);
item->setData(true, KWinTabBoxConfigForm::AddonEffect);
model->appendRow(item);
}
model->sort(0);
ui[i]->setEffectComboModel(model);
}
m_primaryTabBoxUi->setEffectComboModel(model);
m_alternativeTabBoxUi->setEffectComboModel(model);
}
void KWinTabBoxConfig::setEnabledUi(KWinTabBoxConfigForm *form, const TabBoxSettings *config)