marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

homescreens/folio: Add applications drawer search bar

Browse source 
Add a search bar to the applications drawer, to allow for quickly filtering apps.
This commit is contained in:
Devin Lin 2024-07-01 16:04:32 +00:00
parent 49e7102f7b
commit c2791f3975
8 changed files with 85 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
containments/homescreens/folio/applicationlistmodel.cpp
View file

@ -96,10 +96,17 @@ QVariant ApplicationListModel::data(const QModelIndex &index, int role) const
return QVariant();
}
FolioDelegate *delegate = m_delegates.at(index.row());
switch (role) {
case Qt::DisplayRole:
case DelegateRole:
return QVariant::fromValue(m_delegates.at(index.row()));
return QVariant::fromValue(delegate);
case NameRole:
if (!delegate->application()) {
return QVariant();
}
return m_delegates.at(index.row())->application()->name();
default:
return QVariant();
}
@ -113,3 +120,11 @@ int ApplicationListModel::rowCount(const QModelIndex &parent) const
return m_delegates.count();
}
ApplicationListSearchModel::ApplicationListSearchModel(HomeScreen *parent, ApplicationListModel *model)
: QSortFilterProxyModel(parent)
{
setFilterCaseSensitivity(Qt::CaseInsensitive);
setSourceModel(model);
setFilterRole(ApplicationListModel::NameRole);
}

9
containments/homescreens/folio/applicationlistmodel.h
View file

@ -26,6 +26,7 @@ class ApplicationListModel : public QAbstractListModel
public:
enum Roles {
DelegateRole = Qt::UserRole + 1,
NameRole,
};
ApplicationListModel(HomeScreen *parent = nullptr);
@ -47,3 +48,11 @@ protected:
HomeScreen *m_homeScreen{nullptr};
QList<FolioDelegate *> m_delegates;
};
class ApplicationListSearchModel : public QSortFilterProxyModel
{
Q_OBJECT
public:
ApplicationListSearchModel(HomeScreen *parent = nullptr, ApplicationListModel *model = nullptr);
};

7
containments/homescreens/folio/homescreen.cpp
View file

@ -17,6 +17,7 @@ HomeScreen::HomeScreen(QObject *parent, const KPluginMetaData &data, const QVari
, m_homeScreenState{new HomeScreenState{this}}
, m_widgetsManager{new WidgetsManager{this}}
, m_applicationListModel{new ApplicationListModel{this}}
, m_applicationListSearchModel{new ApplicationListSearchModel{this, m_applicationListModel}}
, m_favouritesModel{new FavouritesModel{this}}
, m_pageListModel{new PageListModel{this}}
{
@ -26,6 +27,7 @@ HomeScreen::HomeScreen(QObject *parent, const KPluginMetaData &data, const QVari
const char *uri = "org.kde.private.mobile.homescreen.folio";
qmlRegisterUncreatableType<HomeScreen>(uri, 1, 0, "HomeScreen", "");
qmlRegisterUncreatableType<ApplicationListModel>(uri, 1, 0, "ApplicationListModel", "");
qmlRegisterUncreatableType<ApplicationListSearchModel>(uri, 1, 0, "ApplicationListSearchModel", "");
qmlRegisterUncreatableType<FavouritesModel>(uri, 1, 0, "FavouritesModel", "");
qmlRegisterUncreatableType<PageListModel>(uri, 1, 0, "PageListModel", "");
qmlRegisterUncreatableType<FolioSettings>(uri, 1, 0, "FolioSettings", "");
@ -86,6 +88,11 @@ ApplicationListModel *HomeScreen::applicationListModel()
return m_applicationListModel;
}
ApplicationListSearchModel *HomeScreen::applicationListSearchModel()
{
return m_applicationListSearchModel;
}
FavouritesModel *HomeScreen::favouritesModel()
{
return m_favouritesModel;

4
containments/homescreens/folio/homescreen.h
View file

@ -27,6 +27,7 @@ class WidgetsManager;
class HomeScreenState;
class FavouritesModel;
class ApplicationListModel;
class ApplicationListSearchModel;
class HomeScreen : public Plasma::Containment
{
@ -35,6 +36,7 @@ class HomeScreen : public Plasma::Containment
Q_PROPERTY(HomeScreenState *HomeScreenState READ homeScreenState CONSTANT)
Q_PROPERTY(WidgetsManager *WidgetsManager READ widgetsManager CONSTANT)
Q_PROPERTY(ApplicationListModel *ApplicationListModel READ applicationListModel CONSTANT)
Q_PROPERTY(ApplicationListSearchModel *ApplicationListSearchModel READ applicationListSearchModel CONSTANT)
Q_PROPERTY(FavouritesModel *FavouritesModel READ favouritesModel CONSTANT)
Q_PROPERTY(PageListModel *PageListModel READ pageListModel CONSTANT)
@ -48,6 +50,7 @@ public:
HomeScreenState *homeScreenState();
WidgetsManager *widgetsManager();
ApplicationListModel *applicationListModel();
ApplicationListSearchModel *applicationListSearchModel();
FavouritesModel *favouritesModel();
PageListModel *pageListModel();
@ -63,6 +66,7 @@ private:
HomeScreenState *m_homeScreenState{nullptr};
WidgetsManager *m_widgetsManager{nullptr};
ApplicationListModel *m_applicationListModel{nullptr};
ApplicationListSearchModel *m_applicationListSearchModel{nullptr};
FavouritesModel *m_favouritesModel{nullptr};
PageListModel *m_pageListModel{nullptr};
};

3
containments/homescreens/folio/package/contents/ui/AppDrawer.qml
View file

@ -44,6 +44,7 @@ Item {
// drawer header
MobileShell.BaseItem {
id: drawerHeader
z: 1
height: root.headerHeight
anchors.top: parent.top
@ -72,5 +73,3 @@ Item {
}
}
}

2
containments/homescreens/folio/package/contents/ui/AppDrawerGrid.qml
View file

@ -78,7 +78,7 @@ MobileShell.GridView {
id: velocityCalculator
}
model: folio.ApplicationListModel
model: folio.ApplicationListSearchModel
delegate: AppDelegate {
id: appDelegate

51
containments/homescreens/folio/package/contents/ui/AppDrawerHeader.qml
View file

@ -8,25 +8,64 @@ import QtQuick.Layouts
import org.kde.kirigami as Kirigami
import org.kde.plasma.components 3.0 as PlasmaComponents
import org.kde.private.mobile.homescreen.folio 1.0 as Folio
import './delegate'
Item {
id: root
property Folio.HomeScreen folio
Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
Kirigami.Theme.inherit: false
function clearSearchText(): void {
searchField.text = '';
}
RowLayout {
anchors.topMargin: Kirigami.Units.smallSpacing
anchors.topMargin: Kirigami.Units.largeSpacing
anchors.leftMargin: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing
anchors.rightMargin: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing
anchors.fill: parent
spacing: Kirigami.Units.smallSpacing
QQC2.Label {
color: "white"
text: i18n("Applications")
Kirigami.SearchField {
id: searchField
onTextChanged: folio.ApplicationListSearchModel.setFilterFixedString(text)
Layout.maximumWidth: Kirigami.Units.gridUnit * 30
Layout.alignment: Qt.AlignHCenter
background: Rectangle {
radius: Kirigami.Units.cornerRadius
color: Qt.rgba(255, 255, 255, (searchField.hovered || searchField.focus) ? 0.2 : 0.1)
Behavior on color { ColorAnimation {} }
}
Kirigami.Theme.inherit: false
Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
topPadding: Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing
bottomPadding: Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing
Layout.fillWidth: true
horizontalAlignment: QQC2.TextField.AlignHCenter
placeholderText: i18nc("@info:placeholder", "Search applications…")
placeholderTextColor: Qt.rgba(255, 255, 255, 0.8)
color: 'white'
font.weight: Font.Bold
font.pointSize: Kirigami.Theme.defaultFont.pointSize * 1.5
Connections {
target: folio.HomeScreenState
function onViewStateChanged(): void {
if (folio.HomeScreenState.viewState !== Folio.HomeScreenState.AppDrawerView) {
// Reset search field if the app drawer is not shown
if (searchField.text !== '') {
searchField.text = '';
}
}
}
}
}
}
}

4
containments/homescreens/folio/package/contents/ui/HomeScreen.qml
View file

@ -413,8 +413,8 @@ Item {
// it doesn't mess with app drag and drop from the app drawer
y: (opacity > 0) ? animationY : parent.height
headerHeight: Math.round(Kirigami.Units.gridUnit * 5)
headerItem: AppDrawerHeader {}
headerHeight: Math.round(Kirigami.Units.gridUnit * 4)
headerItem: AppDrawerHeader { folio: root.folio }
// account for panels
topPadding: root.topMargin