Paste P560

patch for for plasma-desktop
ActivePublic
Actions

Authored by ngraham on Mar 25 2020, 2:49 AM.
diff --git kcms/baloo/filteredfoldermodel.cpp kcms/baloo/filteredfoldermodel.cpp
index 0b28e4640..528961021 100644
--- kcms/baloo/filteredfoldermodel.cpp
+++ kcms/baloo/filteredfoldermodel.cpp
@@ -162,7 +162,7 @@ int FilteredFolderModel::rowCount(const QModelIndex& parent) const
return m_folderList.count();
}
-void FilteredFolderModel::addFolder(const QString& url)
+void FilteredFolderModel::addFolder(const QString& url, const bool included = false)
{
QString nUrl = normalizeTrailingSlashes(QUrl(url).toLocalFile());
@@ -173,10 +173,17 @@ void FilteredFolderModel::addFolder(const QString& url)
if (it != m_folderList.end() && (*it).isFromConfig) {
return;
}
- auto excluded = m_settings->excludedFolders();
- excluded.append(nUrl);
- std::sort(std::begin(excluded), std::end(excluded));
- m_settings->setExcludedFolders(excluded);
+ if (included) {
+ auto included = addTrailingSlashes(m_settings->folders());
+ included.append(nUrl);
+ std::sort(std::begin(included), std::end(included));
+ m_settings->setFolders(included);
+ } else {
+ auto excluded = addTrailingSlashes(m_settings->excludedFolders());
+ excluded.append(nUrl);
+ std::sort(std::begin(excluded), std::end(excluded));
+ m_settings->setExcludedFolders(excluded);
+ }
m_deletedSettings.removeAll(nUrl);
}
diff --git kcms/baloo/filteredfoldermodel.h kcms/baloo/filteredfoldermodel.h
index e0eb18c6f..a4a60ea1a 100644
--- kcms/baloo/filteredfoldermodel.h
+++ kcms/baloo/filteredfoldermodel.h
@@ -44,7 +44,7 @@ public:
bool setData(const QModelIndex& idx, const QVariant& value, int role) override;
int rowCount(const QModelIndex& parent) const override;
- Q_INVOKABLE void addFolder(const QString& folder);
+ Q_INVOKABLE void addFolder(const QString& folder, const bool included);
Q_INVOKABLE void removeFolder(int row);
QHash<int, QByteArray> roleNames() const override;
diff --git kcms/baloo/package/contents/ui/main.qml kcms/baloo/package/contents/ui/main.qml
index b252339dc..e791a2dfc 100644
--- kcms/baloo/package/contents/ui/main.qml
+++ kcms/baloo/package/contents/ui/main.qml
@@ -28,7 +28,8 @@ import org.kde.kcm 1.1 as KCM
KCM.SimpleKCM {
id: root
- implicitHeight: Kirigami.Units.gridUnit * 22
+ implicitWidth: Kirigami.Units.gridUnit * 42
+ implicitHeight: Kirigami.Units.gridUnit * 25
KCM.ConfigModule.quickHelp: i18n("This module lets you configure the file indexer and search functionality.")
ColumnLayout {
@@ -98,93 +99,146 @@ KCM.SimpleKCM {
}
QQC2.Button {
+ id: menuButton
+
Layout.alignment: Qt.AlignRight
- id: addFolder
+
icon.name: "folder-add"
text: i18n("Add folder configuration...")
- onClicked: fileDialogLoader.active = true
+
+ checkable: true
+ checked: menu.opened
+
+ onClicked: {
+ // Appear above the button, not below it, since the button is at
+ // the bottom of the window and QQC2 items can't leave the window
+
+ // HACK: since we want to position the menu above the button,
+ // we need to know the menu's height, but it only has a height
+ // after the first time it's been shown, so until then, we need
+ // to provide an artificially-synthesized-and-hopefully-good-enough
+ // height value
+ var menuHeight = menu.height && menu.height > 0 ? menu.height : Kirigami.Units.gridUnit * 3
+ menu.popup(menuButton, 0, -menuHeight)
+ }
+ }
+
+ QQC2.Menu {
+ id: menu
+
+ modal: true
+
+ QQC2.MenuItem {
+ text: i18n("Start indexing a folder...")
+ icon.name: "list-add"
+
+ onClicked: {
+ fileDialogLoader.included = true
+ fileDialogLoader.active = true
+ }
+ }
+ QQC2.MenuItem {
+ text: i18n("Stop indexing a folder...")
+ icon.name: "list-remove"
+
+ onClicked: {
+ fileDialogLoader.included = false
+ fileDialogLoader.active = true
+ }
+ }
}
}
Component {
id: directoryConfigDelegate
- Kirigami.SwipeListItem {
+ Kirigami.AbstractListItem {
id: listItem
- onClicked: {
- directoryConfigList.currentIndex = index
- }
- property int iconSize: Kirigami.Units.iconSizes.smallMedium
- property bool selected: directoryConfigList.currentIndex === index
- RowLayout {
+ // There's no need for a list item to ever be selected
+ highlighted: false
+ hoverEnabled: false
+
+ contentItem: RowLayout {
spacing: units.smallSpacing
+ // The folder's icon
Kirigami.Icon {
- source: model.enableIndex ? "search" : "list-remove"
- height: listItem.iconSize
- width: listItem.iconSize
+ source: model.decoration
+
+ Layout.preferredHeight: Kirigami.Units.iconSizes.smallMedium
+ Layout.preferredWidth: Layout.preferredHeight
}
- ColumnLayout {
- RowLayout {
- spacing: units.smallSpacing
+ // The folder's path
+ QQC2.Label {
+ text: model.folder
+ elide: Text.ElideRight
- Kirigami.Icon {
- source: model.decoration
- height: listItem.iconSize
- width: listItem.iconSize
- }
- QQC2.Label {
- text: model.folder
- elide: Text.ElideRight
- Layout.fillWidth: true
- }
- }
- QQC2.Label {
- text: (model.enableIndex ? i18n("%1 is included.", model.url)
- : i18n("%1 is excluded.", model.url))
- elide: Text.ElideRight
- Layout.fillWidth: true
- opacity: listItem.hovered ? 0.8 : 0.6
- visible: listItem.selected
- }
+ Layout.fillWidth: true
}
- QQC2.ToolButton {
- visible: listItem.hovered && listItem.actionsVisible
- height: listItem.iconSize
- icon.name: "search"
- text: model.enableIndex ? i18n("Disable indexing") : i18n("Enable indexing")
- onClicked: {
- model.enableIndex = !model.enableIndex
+ // What kind of indexing to do for the folder
+ // FIXME: accessing the model using `model.[thing]` from within
+ // this combobox isn't working
+ QQC2.ComboBox {
+ id: indexingOptionsCombobox
+
+ property bool indexingDisabled: !model.enableIndex
+ property bool fullContentIndexing: model.enableIndex
+
+ model: [
+ i18n("Not indexed"),
+ i18n("Full content indexing")
+ ]
+
+ // Intentionally not a simple ternany to facilitate adding
+ // more conditions in the future
+ currentIndex: {
+ if (indexingDisabled) return 0
+ if (fullContentIndexing) return 1
+ }
+
+ onCurrentIndexChanged: {
+ // New value is "Not indexed"
+ if (indexingOptionsCombobox.currentIndex === 0 && fullContentIndexing) {
+ model.enableIndex = false
+ // New value is "Full content indexing"
+ } else if (indexingOptionsCombobox.currentIndex === 1 && indexingDisabled) {
+ model.enableIndex = true
+ }
}
}
- }
- actions: [
- Kirigami.Action {
- id: removeFolder
+ // Delete button to remove this folder entry
+ QQC2.Button {
enabled: model.deletable
- icon.name: "user-trash"
- tooltip: i18n("Delete entry")
- onTriggered: {
- kcm.filteredModel.removeFolder(index)
+
+ icon.name: "edit-delete"
+
+ onClicked: kcm.filteredModel.removeFolder(index)
+
+ QQC2.ToolTip {
+ text: i18n("Delete entry")
}
}
- ]
+ }
}
}
Loader {
id: fileDialogLoader
+
+ property bool included: false
+
active: false
+
sourceComponent: QtDialogs.FileDialog {
title: i18n("Select a folder to filter")
folder: shortcuts.home
selectFolder: true
onAccepted: {
- kcm.filteredModel.addFolder(fileUrls[0])
+ kcm.filteredModel.addFolder(fileUrls[0], included)
fileDialogLoader.active = false
}
ngraham created this paste.Mar 25 2020, 2:49 AM
ngraham created this object in space S1 KDE Community.