feat: Save Pinned Clipboard entries

2026-01-24 21:42:51 -05:00 · 2026-01-17 00:52:47 -05:00
parent 7036362b9b
commit 35cbfeb008
8 changed files with 518 additions and 30 deletions
--- a/quickshell/Modals/Clipboard/ClipboardContent.qml
+++ b/quickshell/Modals/Clipboard/ClipboardContent.qml
@@ -25,7 +25,10 @@ Item {
            width: parent.width
            totalCount: modal.totalCount
            showKeyboardHints: modal.showKeyboardHints
+            activeTab: modal.activeTab
+            pinnedCount: modal.pinnedCount
            onKeyboardHintsToggled: modal.showKeyboardHints = !modal.showKeyboardHints
+            onTabChanged: tabName => modal.activeTab = tabName
            onClearAllClicked: {
                clearConfirmDialog.show(I18n.tr("Clear All History?"), I18n.tr("This will permanently delete all clipboard history."), function () {
                    modal.clearAll();
@@ -70,18 +73,20 @@ Item {

        Rectangle {
            width: parent.width
-            height: parent.height - ClipboardConstants.headerHeight - 70
+            height: parent.height - y - keyboardHintsContainer.height - Theme.spacingL
            radius: Theme.cornerRadius
            color: "transparent"
            clip: true

+            // Recents Tab
            DankListView {
                id: clipboardListView
                anchors.fill: parent
                model: ScriptModel {
-                    values: clipboardContent.modal.clipboardEntries
+                    values: clipboardContent.modal.unpinnedEntries
                    objectProp: "id"
                }
+                visible: modal.activeTab === "recents"

                currentIndex: clipboardContent.modal ? clipboardContent.modal.selectedIndex : 0
                spacing: Theme.spacingXS
@@ -114,11 +119,11 @@ Item {
                }

                StyledText {
-                    text: I18n.tr("No clipboard entries found")
+                    text: I18n.tr("No recent clipboard entries found")
                    anchors.centerIn: parent
                    font.pixelSize: Theme.fontSizeMedium
                    color: Theme.surfaceVariantText
-                    visible: clipboardContent.modal.clipboardEntries.length === 0
+                    visible: clipboardContent.modal.unpinnedEntries.length === 0
                }

                delegate: ClipboardEntry {
@@ -135,11 +140,60 @@ Item {
                    listView: clipboardListView
                    onCopyRequested: clipboardContent.modal.copyEntry(modelData)
                    onDeleteRequested: clipboardContent.modal.deleteEntry(modelData)
+                    onPinRequested: clipboardContent.modal.pinEntry(modelData)
+                    onUnpinRequested: clipboardContent.modal.unpinEntry(modelData)
+                }
+            }
+
+            // Saved Tab
+            DankListView {
+                id: savedListView
+                anchors.fill: parent
+                model: ScriptModel {
+                    values: clipboardContent.modal.pinnedEntries
+                    objectProp: "id"
+                }
+                visible: modal.activeTab === "saved"
+
+                spacing: Theme.spacingXS
+                interactive: true
+                flickDeceleration: 1500
+                maximumFlickVelocity: 2000
+                boundsBehavior: Flickable.DragAndOvershootBounds
+                boundsMovement: Flickable.FollowBoundsBehavior
+                pressDelay: 0
+                flickableDirection: Flickable.VerticalFlick
+
+                StyledText {
+                    text: I18n.tr("No saved clipboard entries")
+                    anchors.centerIn: parent
+                    font.pixelSize: Theme.fontSizeMedium
+                    color: Theme.surfaceVariantText
+                    visible: clipboardContent.modal.pinnedEntries.length === 0
+                }
+
+                delegate: ClipboardEntry {
+                    required property int index
+                    required property var modelData
+
+                    width: savedListView.width
+                    height: ClipboardConstants.itemHeight
+                    entry: modelData
+                    entryIndex: index + 1
+                    itemIndex: index
+                    isSelected: false
+                    modal: clipboardContent.modal
+                    listView: savedListView
+                    onCopyRequested: clipboardContent.modal.copyEntry(modelData)
+                    onDeleteRequested: clipboardContent.modal.deletePinnedEntry(modelData)
+                    onPinRequested: clipboardContent.modal.pinEntry(modelData)
+                    onUnpinRequested: clipboardContent.modal.unpinEntry(modelData)
                }
            }
        }

        Item {
+            id: keyboardHintsContainer
            width: parent.width
            height: modal.showKeyboardHints ? ClipboardConstants.keyboardHintsHeight + Theme.spacingL : 0

--- a/quickshell/Modals/Clipboard/ClipboardEntry.qml
+++ b/quickshell/Modals/Clipboard/ClipboardEntry.qml
@@ -14,6 +14,8 @@ Rectangle {

    signal copyRequested
    signal deleteRequested
+    signal pinRequested
+    signal unpinRequested

    readonly property string entryType: modal ? modal.getEntryType(entry) : "text"
    readonly property string entryPreview: modal ? modal.getEntryPreview(entry) : ""
@@ -50,7 +52,7 @@ Rectangle {

        Row {
            anchors.verticalCenter: parent.verticalCenter
-            width: parent.width - 68
+            width: parent.width - 110
            spacing: Theme.spacingM

            ClipboardThumbnail {
@@ -100,20 +102,32 @@ Rectangle {
        }
    }

-    DankActionButton {
+    Row {
        anchors.right: parent.right
        anchors.rightMargin: Theme.spacingM
        anchors.verticalCenter: parent.verticalCenter
-        iconName: "close"
-        iconSize: Theme.iconSize - 6
-        iconColor: Theme.surfaceText
-        onClicked: deleteRequested()
+        spacing: Theme.spacingXS
+
+        DankActionButton {
+            iconName: "push_pin"
+            iconSize: Theme.iconSize - 6
+            iconColor: entry.pinned ? Theme.primary : Theme.surfaceText
+            backgroundColor: entry.pinned ? Theme.primarySelected : "transparent"
+            onClicked: entry.pinned ? unpinRequested() : pinRequested()
+        }
+
+        DankActionButton {
+            iconName: "close"
+            iconSize: Theme.iconSize - 6
+            iconColor: Theme.surfaceText
+            onClicked: deleteRequested()
+        }
    }

    MouseArea {
        id: mouseArea
        anchors.fill: parent
-        anchors.rightMargin: 40
+        anchors.rightMargin: 80
        hoverEnabled: true
        cursorShape: Qt.PointingHandCursor
        onClicked: copyRequested()
--- a/quickshell/Modals/Clipboard/ClipboardHeader.qml
+++ b/quickshell/Modals/Clipboard/ClipboardHeader.qml
@@ -8,10 +8,13 @@ Item {

    property int totalCount: 0
    property bool showKeyboardHints: false
+    property string activeTab: "recents"
+    property int pinnedCount: 0

    signal keyboardHintsToggled
    signal clearAllClicked
    signal closeClicked
+    signal tabChanged(string tabName)

    height: ClipboardConstants.headerHeight

@@ -41,6 +44,22 @@ Item {
        anchors.verticalCenter: parent.verticalCenter
        spacing: Theme.spacingS

+        DankActionButton {
+            iconName: "history"
+            iconSize: Theme.iconSize - 4
+            iconColor: header.activeTab === "recents" ? Theme.primary : Theme.surfaceText
+            onClicked: tabChanged("recents")
+        }
+
+        DankActionButton {
+            iconName: "push_pin"
+            iconSize: Theme.iconSize - 4
+            iconColor: header.activeTab === "saved" ? Theme.primary : Theme.surfaceText
+            opacity: header.pinnedCount > 0 ? 1 : 0
+            enabled: header.pinnedCount > 0
+            onClicked: tabChanged("saved")
+        }
+
        DankActionButton {
            iconName: "info"
            iconSize: Theme.iconSize - 4
--- a/quickshell/Modals/Clipboard/ClipboardHistoryModal.qml
+++ b/quickshell/Modals/Clipboard/ClipboardHistoryModal.qml
@@ -19,6 +19,8 @@ DankModal {

    property int totalCount: 0
    property var clipboardEntries: []
+    property var pinnedEntries: []
+    property int pinnedCount: 0
    property string searchText: ""
    property int selectedIndex: 0
    property bool keyboardNavigationActive: false
@@ -74,22 +76,37 @@ DankModal {

    function updateFilteredModel() {
        const query = searchText.trim();
+        let filtered = [];
+
        if (query.length === 0) {
-            clipboardEntries = internalEntries;
+            filtered = internalEntries;
        } else {
            const lowerQuery = query.toLowerCase();
-            clipboardEntries = internalEntries.filter(entry => entry.preview.toLowerCase().includes(lowerQuery));
+            filtered = internalEntries.filter(entry =>
+                entry.preview.toLowerCase().includes(lowerQuery)
+            );
        }
+
+        // Sort: pinned first, then by ID descending
+        filtered.sort((a, b) => {
+            if (a.pinned !== b.pinned) return b.pinned ? 1 : -1;
+            return b.id - a.id;
+        });
+
+        clipboardEntries = filtered;
+        unpinnedEntries = filtered.filter(e => !e.pinned);
        totalCount = clipboardEntries.length;
-        if (clipboardEntries.length === 0) {
+        if (unpinnedEntries.length === 0) {
            keyboardNavigationActive = false;
            selectedIndex = 0;
-        } else if (selectedIndex >= clipboardEntries.length) {
-            selectedIndex = clipboardEntries.length - 1;
+        } else if (selectedIndex >= unpinnedEntries.length) {
+            selectedIndex = unpinnedEntries.length - 1;
        }
    }

    property var internalEntries: []
+    property var unpinnedEntries: []
+    property string activeTab: "recents"

    function toggle() {
        if (shouldBeVisible) {
@@ -135,6 +152,10 @@ DankModal {
                return;
            }
            internalEntries = response.result || [];
+
+            pinnedEntries = internalEntries.filter(e => e.pinned);
+            pinnedCount = pinnedEntries.length;
+
            updateFilteredModel();
        });
    }
@@ -171,18 +192,87 @@ DankModal {
        });
    }

-    function clearAll() {
-        DMSService.sendRequest("clipboard.clearHistory", null, function (response) {
-            if (response.error) {
-                console.warn("ClipboardHistoryModal: Failed to clear history:", response.error);
+    function deletePinnedEntry(entry) {
+        clearConfirmDialog.show(
+            I18n.tr("Delete Saved Item?"),
+            I18n.tr("This will permanently remove this saved clipboard item. This action cannot be undone."),
+            function () {
+                DMSService.sendRequest("clipboard.deleteEntry", {
+                    "id": entry.id
+                }, function (response) {
+                    if (response.error) {
+                        console.warn("ClipboardHistoryModal: Failed to delete entry:", response.error);
+                        return;
+                    }
+                    internalEntries = internalEntries.filter(e => e.id !== entry.id);
+                    updateFilteredModel();
+                    ToastService.showInfo(I18n.tr("Saved item deleted"));
+                });
+            },
+            function () {}
+        );
+    }
+
+    function pinEntry(entry) {
+        DMSService.sendRequest("clipboard.getPinnedCount", null, function (countResponse) {
+            if (countResponse.error) {
+                ToastService.showError(I18n.tr("Failed to check pin limit"));
                return;
            }
-            internalEntries = [];
-            clipboardEntries = [];
-            totalCount = 0;
+
+            const maxPinned = 25; // TODO: Get from config
+            if (countResponse.result.count >= maxPinned) {
+                ToastService.showError(I18n.tr("Maximum pinned entries reached") + " (" + maxPinned + ")");
+                return;
+            }
+
+            DMSService.sendRequest("clipboard.pinEntry", { "id": entry.id }, function (response) {
+                if (response.error) {
+                    ToastService.showError(I18n.tr("Failed to pin entry"));
+                    return;
+                }
+                ToastService.showInfo(I18n.tr("Entry pinned"));
+                refreshClipboard();
+            });
        });
    }

+    function unpinEntry(entry) {
+        DMSService.sendRequest("clipboard.unpinEntry", { "id": entry.id }, function (response) {
+            if (response.error) {
+                ToastService.showError(I18n.tr("Failed to unpin entry"));
+                return;
+            }
+            ToastService.showInfo(I18n.tr("Entry unpinned"));
+            refreshClipboard();
+        });
+    }
+
+    function clearAll() {
+        const hasPinned = pinnedCount > 0;
+        const message = hasPinned
+            ? I18n.tr("This will delete all unpinned entries. %1 pinned entries will be kept.").arg(pinnedCount)
+            : I18n.tr("This will permanently delete all clipboard history.");
+
+        clearConfirmDialog.show(
+            I18n.tr("Clear History?"),
+            message,
+            function () {
+                DMSService.sendRequest("clipboard.clearHistory", null, function (response) {
+                    if (response.error) {
+                        console.warn("ClipboardHistoryModal: Failed to clear history:", response.error);
+                        return;
+                    }
+                    refreshClipboard();
+                    if (hasPinned) {
+                        ToastService.showInfo(I18n.tr("History cleared. %1 pinned entries kept.").arg(pinnedCount));
+                    }
+                });
+            },
+            function () {}
+        );
+    }
+
    function getEntryPreview(entry) {
        return entry.preview || "";
    }