1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-04-04 04:42:05 -04:00

clipboard: option to paste on enter

fixes #1686
This commit is contained in:
bbedward
2026-02-15 13:36:19 -05:00
parent 13ef1efa7b
commit e5cdbf4cf5
6 changed files with 41 additions and 6 deletions

View File

@@ -268,6 +268,7 @@ Item {
sourceComponent: ClipboardKeyboardHints {
wtypeAvailable: modal.wtypeAvailable
enterToPaste: SettingsData.clipboardEnterToPaste
}
}
}

View File

@@ -1,4 +1,5 @@
import QtQuick
import qs.Common
import qs.Services
QtObject {
@@ -133,7 +134,11 @@ QtObject {
case Qt.Key_Return:
case Qt.Key_Enter:
if (ClipboardService.keyboardNavigationActive) {
modal.pasteSelected();
if (SettingsData.clipboardEnterToPaste) {
copySelected();
} else {
modal.pasteSelected();
}
event.accepted = true;
}
return;
@@ -144,7 +149,11 @@ QtObject {
switch (event.key) {
case Qt.Key_Return:
case Qt.Key_Enter:
copySelected();
if (SettingsData.clipboardEnterToPaste) {
modal.pasteSelected();
} else {
copySelected();
}
event.accepted = true;
return;
case Qt.Key_Delete:

View File

@@ -6,7 +6,12 @@ Rectangle {
id: keyboardHints
property bool wtypeAvailable: false
readonly property string hintsText: wtypeAvailable ? I18n.tr("Shift+Enter: Paste • Shift+Del: Clear All • Esc: Close") : I18n.tr("Shift+Del: Clear All • Esc: Close")
property bool enterToPaste: false
readonly property string hintsText: {
if (!wtypeAvailable)
return I18n.tr("Shift+Del: Clear All • Esc: Close");
return enterToPaste ? I18n.tr("Shift+Enter: Copy • Shift+Del: Clear All • Esc: Close", "Keyboard hints when enter-to-paste is enabled") : I18n.tr("Shift+Enter: Paste • Shift+Del: Clear All • Esc: Close");
}
height: ClipboardConstants.keyboardHintsHeight
radius: Theme.cornerRadius
@@ -21,7 +26,7 @@ Rectangle {
spacing: 2
StyledText {
text: "↑/↓: Navigate • Enter/Ctrl+C: Copy • Del: Delete • F10: Help"
text: keyboardHints.enterToPaste ? I18n.tr("↑/↓: Navigate • Enter: Paste • Del: Delete • F10: Help", "Keyboard hints when enter-to-paste is enabled") : "↑/↓: Navigate • Enter/Ctrl+C: Copy • Del: Delete • F10: Help"
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceText
anchors.horizontalCenter: parent.horizontalCenter