diff --git a/components/shellprivate/widgetexplorer/kcategorizeditemsviewmodels_p.h b/components/shellprivate/widgetexplorer/kcategorizeditemsviewmodels_p.h index 03d8b8062..7f1396558 100644 --- a/components/shellprivate/widgetexplorer/kcategorizeditemsviewmodels_p.h +++ b/components/shellprivate/widgetexplorer/kcategorizeditemsviewmodels_p.h @@ -1,179 +1,175 @@ /* * Copyright (C) 2007 Ivan Cukic * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Library/Lesser General Public License * version 2, or (at your option) any later version, as published by the * Free Software Foundation * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details * * You should have received a copy of the GNU Library/Lesser General Public * License along with this program; if not, write to the * Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef PLASMA_KCATEGORIZEDITEMSVIEWMODELS_P_H #define PLASMA_KCATEGORIZEDITEMSVIEWMODELS_P_H #include #include #include namespace KCategorizedItemsViewModels { typedef QPair Filter; /** * Abstract class that needs to be implemented and used with the ItemModel */ class AbstractItem : public QStandardItem { public: /** * Returns a localized string - name of the item */ virtual QString name() const; /** * Returns a unique id related to this item */ virtual QString id() const; /** * Returns a localized string - description of the item */ virtual QString description() const; /** * Returns if the item is flagged as favorite * Default implementation checks if the item passes the Filter("favorite", "1") filter */ virtual bool isFavorite() const; /** * Returns the item's number of running applets * Default implementation just returns 0 */ virtual int running() const; /** * Returns if the item contains string specified by pattern. * Default implementation checks whether name or description contain the * string (not needed to be exactly that string) */ virtual bool matches(const QString &pattern) const; - /** - * sets the favorite flag for the item - */ - virtual void setFavorite(bool favorite) = 0; /** * sets the number of running applets for the item */ virtual void setRunning(int count) = 0; /** * Returns if the item passes the filter specified */ virtual bool passesFiltering(const Filter &filter) const = 0; private: }; /** * The default implementation of the model containing filters */ class DefaultFilterModel : public QStandardItemModel { Q_OBJECT Q_PROPERTY(int count READ count NOTIFY countChanged) public: enum Roles { FilterTypeRole = Qt::UserRole+1, FilterDataRole = Qt::UserRole+2, SeparatorRole = Qt::UserRole+3 }; DefaultFilterModel(QObject *parent = 0); QHash roleNames() const override; /** * Adds a filter to the model * @param caption The localized string to be displayed as a name of the filter * @param filter The filter structure */ void addFilter(const QString &caption, const Filter &filter, const QIcon &icon = QIcon()); /** * Adds a separator to the model * @param caption The localized string to be displayed as a name of the separator */ void addSeparator(const QString &caption); int count() {return rowCount(QModelIndex());} Q_INVOKABLE QVariantHash get(int i) const; Q_SIGNALS: void countChanged(); }; /** * Default filter proxy model. */ class DefaultItemFilterProxyModel : public QSortFilterProxyModel { Q_OBJECT Q_PROPERTY(QString searchTerm READ searchTerm WRITE setSearchTerm NOTIFY searchTermChanged) Q_PROPERTY(QString filterType READ filterType WRITE setFilterType NOTIFY filterChanged) Q_PROPERTY(QVariant filterQuery READ filterQuery WRITE setFilterQuery NOTIFY filterChanged) Q_PROPERTY(int count READ count NOTIFY countChanged) public: DefaultItemFilterProxyModel(QObject *parent = 0); bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; bool lessThan(const QModelIndex &left, const QModelIndex &right) const override; void setSearchTerm(const QString &pattern); QString searchTerm() const; void setFilterType(const QString type); QString filterType() const; void setFilterQuery(const QVariant query); QVariant filterQuery() const; void setFilter(const Filter &filter); void setSourceModel(QAbstractItemModel *sourceModel) override; QAbstractItemModel *sourceModel() const; int columnCount(const QModelIndex &index) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; int count() {return rowCount(QModelIndex());} Q_INVOKABLE QVariantHash get(int i) const; Q_SIGNALS: void searchTermChanged(const QString &term); void filterChanged(); void countChanged(); private: Filter m_filter; QString m_searchPattern; }; } //end of namespace Q_DECLARE_METATYPE(KCategorizedItemsViewModels::Filter) #endif /*KCATEGORIZEDITEMSVIEWMODELS_H_*/ diff --git a/components/shellprivate/widgetexplorer/plasmaappletitemmodel.cpp b/components/shellprivate/widgetexplorer/plasmaappletitemmodel.cpp index 1ae2984b9..0c05a8ad3 100644 --- a/components/shellprivate/widgetexplorer/plasmaappletitemmodel.cpp +++ b/components/shellprivate/widgetexplorer/plasmaappletitemmodel.cpp @@ -1,472 +1,435 @@ /* * Copyright (C) 2007 Ivan Cukic * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Library/Lesser General Public License * version 2, or (at your option) any later version, as published by the * Free Software Foundation * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details * * You should have received a copy of the GNU Library/Lesser General Public * License along with this program; if not, write to the * Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "plasmaappletitemmodel_p.h" #include #include #include #include #include #include #include "config-workspace.h" #include #include #include PlasmaAppletItem::PlasmaAppletItem(PlasmaAppletItemModel *model, - const KPluginInfo& info, - FilterFlags flags) + const KPluginInfo& info) : QObject(model), m_model(model), m_info(info), m_runningCount(0), - m_favorite(flags & Favorite), m_local(false) { const QString api(m_info.property(QStringLiteral("X-Plasma-API")).toString()); if (!api.isEmpty()) { const QString _f = PLASMA_RELATIVE_DATA_INSTALL_DIR "/plasmoids/" + info.pluginName() + '/'; QFileInfo dir(QStandardPaths::locate(QStandardPaths::QStandardPaths::GenericDataLocation, _f, QStandardPaths::LocateDirectory)); m_local = dir.exists() && dir.isWritable(); } //attrs.insert("recommended", flags & Recommended ? true : false); setText(m_info.name() + " - "+ m_info.category().toLower()); if (QIcon::hasThemeIcon(info.pluginName())) { setIcon(QIcon::fromTheme(info.pluginName())); } else if (!m_info.icon().isEmpty()) { setIcon(QIcon::fromTheme(info.icon())); } else { setIcon(QIcon::fromTheme(QStringLiteral("application-x-plasma"))); } //set plugininfo parts as roles in the model, only way qml can understand it setData(info.name(), PlasmaAppletItemModel::NameRole); setData(info.pluginName(), PlasmaAppletItemModel::PluginNameRole); setData(info.comment(), PlasmaAppletItemModel::DescriptionRole); setData(info.category().toLower(), PlasmaAppletItemModel::CategoryRole); setData(info.license(), PlasmaAppletItemModel::LicenseRole); setData(info.website(), PlasmaAppletItemModel::WebsiteRole); setData(info.version(), PlasmaAppletItemModel::VersionRole); setData(info.author(), PlasmaAppletItemModel::AuthorRole); setData(info.email(), PlasmaAppletItemModel::EmailRole); setData(0, PlasmaAppletItemModel::RunningRole); setData(m_local, PlasmaAppletItemModel::LocalRole); } QString PlasmaAppletItem::pluginName() const { return m_info.pluginName(); } QString PlasmaAppletItem::name() const { return m_info.name(); } QString PlasmaAppletItem::description() const { return m_info.comment(); } QString PlasmaAppletItem::license() const { return m_info.license(); } QString PlasmaAppletItem::category() const { return m_info.category(); } QString PlasmaAppletItem::website() const { return m_info.website(); } QString PlasmaAppletItem::version() const { return m_info.version(); } QString PlasmaAppletItem::author() const { return m_info.author(); } QString PlasmaAppletItem::email() const { return m_info.email(); } int PlasmaAppletItem::running() const { return m_runningCount; } void PlasmaAppletItem::setRunning(int count) { m_runningCount = count; setData(count, PlasmaAppletItemModel::RunningRole); emitDataChanged(); } bool PlasmaAppletItem::matches(const QString &pattern) const { if (m_info.service()) { const QStringList keywords = m_info.property(QStringLiteral("Keywords")).toStringList(); foreach (const QString &keyword, keywords) { if (keyword.startsWith(pattern, Qt::CaseInsensitive)) { return true; } } } return AbstractItem::matches(pattern); } -bool PlasmaAppletItem::isFavorite() const -{ - return m_favorite; -} - -void PlasmaAppletItem::setFavorite(bool favorite) -{ - if (m_favorite != favorite) { - m_favorite = favorite; - m_model->setFavorite(m_info.pluginName(), favorite); - emitDataChanged(); - } -} bool PlasmaAppletItem::isLocal() const { return m_local; } bool PlasmaAppletItem::passesFiltering(const KCategorizedItemsViewModels::Filter &filter) const { if (filter.first == QLatin1String("running")) { return running(); } else if (filter.first == QLatin1String("local")) { return isLocal(); } else if (filter.first == QLatin1String("category")) { return m_info.category().toLower() == filter.second; } else { return false; } } QMimeData *PlasmaAppletItem::mimeData() const { QMimeData *data = new QMimeData(); QByteArray appletName; appletName += pluginName().toUtf8(); data->setData(mimeTypes().at(0), appletName); return data; } QStringList PlasmaAppletItem::mimeTypes() const { QStringList types; types << QStringLiteral("text/x-plasmoidservicename"); return types; } PlasmaAppletItemModel* PlasmaAppletItem::appletItemModel() { return m_model; } QVariant PlasmaAppletItem::data(int role) const { switch (role) { case PlasmaAppletItemModel::ScreenshotRole: //null = not yet done, empty = tried and failed if (m_screenshot.isNull()) { KPackage::Package pkg = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/Applet")); pkg.setDefaultPackageRoot(QStringLiteral("plasma/plasmoids")); pkg.setPath(m_info.pluginName()); if (pkg.isValid()) { const_cast(this)->m_screenshot = pkg.filePath("screenshot"); } else { const_cast(this)->m_screenshot = QString(); } } else if (m_screenshot.isEmpty()) { return QVariant(); } return m_screenshot; case Qt::DecorationRole: { //null = not yet done, empty = tried and failed if (m_icon.isNull()) { KPackage::Package pkg = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/Applet")); pkg.setDefaultPackageRoot(QStringLiteral("plasma/plasmoids")); pkg.setPath(m_info.pluginName()); if (pkg.isValid() && pkg.metadata().iconName().startsWith(QLatin1String("/"))) { const_cast(this)->m_icon = pkg.filePath("", pkg.metadata().iconName().toUtf8()); } else { const_cast(this)->m_icon = QString(); return AbstractItem::data(role); } } if (m_icon.isEmpty()) { return AbstractItem::data(role); } return QIcon(m_icon); } default: return AbstractItem::data(role); } } //PlasmaAppletItemModel PlasmaAppletItemModel::PlasmaAppletItemModel(QObject * parent) : QStandardItemModel(parent), m_startupCompleted(false) { - KConfig config(QStringLiteral("plasmarc")); - m_configGroup = KConfigGroup(&config, "Applet Browser"); - m_favorites = m_configGroup.readEntry("favorites").split(','); connect(KSycoca::self(), SIGNAL(databaseChanged(QStringList)), this, SLOT(populateModel(QStringList))); setSortRole(Qt::DisplayRole); } QHash PlasmaAppletItemModel::roleNames() const { QHash newRoleNames = QAbstractItemModel::roleNames(); newRoleNames[NameRole] = "name"; newRoleNames[PluginNameRole] = "pluginName"; newRoleNames[DescriptionRole] = "description"; newRoleNames[CategoryRole] = "category"; newRoleNames[LicenseRole] = "license"; newRoleNames[WebsiteRole] = "website"; newRoleNames[VersionRole] = "version"; newRoleNames[AuthorRole] = "author"; newRoleNames[EmailRole] = "email"; newRoleNames[RunningRole] = "running"; newRoleNames[LocalRole] = "local"; newRoleNames[ScreenshotRole] = "screenshot"; return newRoleNames; } void PlasmaAppletItemModel::populateModel(const QStringList &whatChanged) { if (!whatChanged.isEmpty() && !whatChanged.contains(QStringLiteral("services"))) { return; } clear(); //qDebug() << "populating model, our application is" << m_application; //qDebug() << "number of applets is" // << Plasma::Applet::listAppletInfo(QString(), m_application).count(); QString constraint; bool first = true; foreach (const QString prov, m_provides) { if (!first) { constraint += QLatin1String(" or "); } first = false; constraint += "'" + prov + "' in [X-Plasma-Provides]"; } KPluginInfo::List list = KPluginInfo::fromMetaData(KPackage::PackageLoader::self()->listPackages(QStringLiteral("Plasma/Applet"), QStringLiteral("plasma/plasmoids")).toVector()); KPluginTrader::applyConstraints(list, constraint); for (auto info : list) { //qDebug() << info.pluginName() << "NoDisplay" << info.property("NoDisplay").toBool(); if (!info.isValid() || info.property(QStringLiteral("NoDisplay")).toBool() || info.category() == QLatin1String("Containments")) { // we don't want to show the hidden category continue; } bool inFormFactor = true; foreach (const QString &formFactor, KDeclarative::KDeclarative::runtimePlatform()) { if (!info.formFactors().isEmpty() && !info.formFactors().contains(formFactor)) { inFormFactor = false; } } if (!inFormFactor) { continue; } //qDebug() << info.pluginName() << " is the name of the plugin at" << info.entryPath(); //qDebug() << info.name() << info.property("X-Plasma-Thumbnail"); - PlasmaAppletItem::FilterFlags flags(PlasmaAppletItem::NoFilter); - if (m_favorites.contains(info.pluginName())) { - flags |= PlasmaAppletItem::Favorite; - } - - appendRow(new PlasmaAppletItem(this, info, flags)); + appendRow(new PlasmaAppletItem(this, info)); } emit modelPopulated(); } void PlasmaAppletItemModel::setRunningApplets(const QHash &apps) { //foreach item, find that string and set the count for (int r = 0; r < rowCount(); ++r) { QStandardItem *i = item(r); PlasmaAppletItem *p = dynamic_cast(i); if (p) { const int running = apps.value(p->pluginName()); p->setRunning(running); } } } void PlasmaAppletItemModel::setRunningApplets(const QString &name, int count) { for (int r=0; r(i); if (p && p->pluginName() == name) { p->setRunning(count); } } } QStringList PlasmaAppletItemModel::mimeTypes() const { QStringList types; types << QStringLiteral("text/x-plasmoidservicename"); return types; } QSet PlasmaAppletItemModel::categories() const { QSet cats; for (int r = 0; r < rowCount(); ++r) { QStandardItem *i = item(r); PlasmaAppletItem *p = dynamic_cast(i); if (p) { cats.insert(p->category().toLower()); } } return cats; } QMimeData *PlasmaAppletItemModel::mimeData(const QModelIndexList &indexes) const { //qDebug() << "GETTING MIME DATA\n"; if (indexes.count() <= 0) { return 0; } QStringList types = mimeTypes(); if (types.isEmpty()) { return 0; } QMimeData *data = new QMimeData(); QString format = types.at(0); QByteArray appletNames; int lastRow = -1; foreach (const QModelIndex &index, indexes) { if (index.row() == lastRow) { continue; } lastRow = index.row(); PlasmaAppletItem *selectedItem = (PlasmaAppletItem *) itemFromIndex(index); appletNames += '\n' + selectedItem->pluginName().toUtf8(); //qDebug() << selectedItem->pluginName() << index.column() << index.row(); } data->setData(format, appletNames); return data; } -void PlasmaAppletItemModel::setFavorite(const QString &plugin, bool favorite) -{ - if (favorite) { - if (!m_favorites.contains(plugin)) { - m_favorites.append(plugin); - } - } else { - m_favorites.removeAll(plugin); - } - - m_configGroup.writeEntry("favorites", m_favorites.join(QStringLiteral(","))); - m_configGroup.sync(); -} - QStringList PlasmaAppletItemModel::provides() const { return m_provides; } void PlasmaAppletItemModel::setProvides(const QStringList &provides) { if (m_provides == provides) { return; } m_provides = provides; if (m_startupCompleted) { populateModel(); } } void PlasmaAppletItemModel::setApplication(const QString &app) { m_application = app; if (m_startupCompleted) { populateModel(); } } bool PlasmaAppletItemModel::startupCompleted() const { return m_startupCompleted; } void PlasmaAppletItemModel::setStartupCompleted(bool complete) { m_startupCompleted = complete; } QString &PlasmaAppletItemModel::Application() { return m_application; } //#include diff --git a/components/shellprivate/widgetexplorer/plasmaappletitemmodel_p.h b/components/shellprivate/widgetexplorer/plasmaappletitemmodel_p.h index 8919fbd47..2c649c8b9 100644 --- a/components/shellprivate/widgetexplorer/plasmaappletitemmodel_p.h +++ b/components/shellprivate/widgetexplorer/plasmaappletitemmodel_p.h @@ -1,138 +1,124 @@ /* * Copyright (C) 2007 Ivan Cukic * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Library/Lesser General Public License * version 2, or (at your option) any later version, as published by the * Free Software Foundation * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details * * You should have received a copy of the GNU Library/Lesser General Public * License along with this program; if not, write to the * Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef PLASMA_PLASMAAPPLETITEMMODEL_P_H #define PLASMA_PLASMAAPPLETITEMMODEL_P_H #include #include #include "kcategorizeditemsviewmodels_p.h" class PlasmaAppletItemModel; /** * Implementation of the KCategorizedItemsViewModels::AbstractItem */ class PlasmaAppletItem : public QObject, public KCategorizedItemsViewModels::AbstractItem { Q_OBJECT public: - enum FilterFlag { - NoFilter = 0, - Favorite = 1 - }; - - Q_DECLARE_FLAGS(FilterFlags, FilterFlag) - - PlasmaAppletItem(PlasmaAppletItemModel *model, const KPluginInfo& info, FilterFlags flags = NoFilter); + PlasmaAppletItem(PlasmaAppletItemModel *model, const KPluginInfo& info); QString pluginName() const; QString name() const override; QString category() const; QString description() const override; QString license() const; QString website() const; QString version() const; QString author() const; QString email() const; QVariant data(int role = Qt::UserRole + 1) const override; int running() const override; bool isLocal() const; - bool isFavorite() const override; - void setFavorite(bool favorite) override; PlasmaAppletItemModel* appletItemModel(); bool matches(const QString &pattern) const override; //set how many instances of this applet are running void setRunning(int count) override; bool passesFiltering(const KCategorizedItemsViewModels::Filter & filter) const override; QMimeData *mimeData() const; QStringList mimeTypes() const; private: PlasmaAppletItemModel * m_model; KPluginInfo m_info; QString m_screenshot; QString m_icon; int m_runningCount; - bool m_favorite; bool m_local; }; class PlasmaAppletItemModel : public QStandardItemModel { Q_OBJECT public: enum Roles { NameRole = Qt::UserRole+1, PluginNameRole = Qt::UserRole+2, DescriptionRole = Qt::UserRole+3, CategoryRole = Qt::UserRole+4, LicenseRole = Qt::UserRole+5, WebsiteRole = Qt::UserRole+6, VersionRole = Qt::UserRole+7, AuthorRole = Qt::UserRole+8, EmailRole = Qt::UserRole+9, RunningRole = Qt::UserRole+10, LocalRole = Qt::UserRole+11, ScreenshotRole = Qt::UserRole+12 }; explicit PlasmaAppletItemModel(QObject * parent = 0); QStringList mimeTypes() const override; QSet categories() const; QMimeData *mimeData(const QModelIndexList &indexes) const override; - void setFavorite(const QString &plugin, bool favorite); void setApplication(const QString &app); void setRunningApplets(const QHash &apps); void setRunningApplets(const QString &name, int count); QString &Application(); QStringList provides() const; void setProvides(const QStringList &provides); QHash roleNames() const override; bool startupCompleted() const; void setStartupCompleted(bool complete); Q_SIGNALS: void modelPopulated(); private: QString m_application; - QStringList m_favorites; QStringList m_provides; KConfigGroup m_configGroup; bool m_startupCompleted : 1; private Q_SLOTS: void populateModel(const QStringList &whatChanged = QStringList()); }; -Q_DECLARE_OPERATORS_FOR_FLAGS(PlasmaAppletItem::FilterFlags) - #endif /*PLASMAAPPLETSMODEL_H_*/