Compare commits
1 Commits
work/multi
...
work/runne
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
945b27eca8 |
@@ -80,3 +80,4 @@ X-Plasma-DBusRunner-Service=org.kde.neochat
|
|||||||
X-Plasma-DBusRunner-Path=/RoomRunner
|
X-Plasma-DBusRunner-Path=/RoomRunner
|
||||||
X-Plasma-Request-Actions-Once=true
|
X-Plasma-Request-Actions-Once=true
|
||||||
X-Plasma-Runner-Min-Letter-Count=3
|
X-Plasma-Runner-Min-Letter-Count=3
|
||||||
|
X-Plasma-Runner-Has-Activation=true
|
||||||
|
|||||||
@@ -43,18 +43,13 @@ TextEdit {
|
|||||||
*/
|
*/
|
||||||
property bool spoilerRevealed: !hasSpoiler.test(textMessage)
|
property bool spoilerRevealed: !hasSpoiler.test(textMessage)
|
||||||
|
|
||||||
property bool isDelegate: false
|
|
||||||
|
|
||||||
ListView.onReused: Qt.binding(() => !hasSpoiler.test(textMessage))
|
ListView.onReused: Qt.binding(() => !hasSpoiler.test(textMessage))
|
||||||
|
|
||||||
persistentSelection: true
|
persistentSelection: true
|
||||||
|
|
||||||
// Work around QTBUG 93281
|
// Work around QTBUG 93281
|
||||||
Component.onCompleted: {
|
Component.onCompleted: if (text.includes("<img")) {
|
||||||
updateSelection()
|
Controller.forceRefreshTextDocument(root.textDocument, root)
|
||||||
if (text.includes("<img")) {
|
|
||||||
Controller.forceRefreshTextDocument(root.textDocument, root)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
text: "<style>
|
text: "<style>
|
||||||
@@ -121,26 +116,4 @@ a{
|
|||||||
enabled: !parent.hoveredLink && !spoilerRevealed
|
enabled: !parent.hoveredLink && !spoilerRevealed
|
||||||
onTapped: spoilerRevealed = true
|
onTapped: spoilerRevealed = true
|
||||||
}
|
}
|
||||||
|
|
||||||
Connections {
|
|
||||||
target: selectionArea
|
|
||||||
enabled: root.isDelegate
|
|
||||||
function onSelectionChanged() {
|
|
||||||
updateSelection();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function updateSelection() {
|
|
||||||
if (index < selectionArea.lowerIndex || index > selectionArea.upperIndex) {
|
|
||||||
root.select(0, 0);
|
|
||||||
} else if (index > selectionArea.lowerIndex && index < selectionArea.upperIndex) {
|
|
||||||
root.selectAll();
|
|
||||||
} else if (index === selectionArea.selectionStartIndex && index === selectionArea.selectionEndIndex) {
|
|
||||||
root.select(selectionArea.upperPos, selectionArea.lowerPos);
|
|
||||||
} else if (index === selectionArea.upperIndex) {
|
|
||||||
root.select(selectionArea.upperPos, root.length);
|
|
||||||
} else if (index === selectionArea.lowerIndex) {
|
|
||||||
root.select(0, selectionArea.lowerPos);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,14 +17,6 @@ import org.kde.neochat.config
|
|||||||
MessageDelegate {
|
MessageDelegate {
|
||||||
id: root
|
id: root
|
||||||
|
|
||||||
function positionAt(x, y) {
|
|
||||||
let point = label.mapFromItem(root, x, y)
|
|
||||||
return label.positionAt(point.x, point.y)
|
|
||||||
}
|
|
||||||
|
|
||||||
property alias selectedText: label.selectedText
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief The link preview properties.
|
* @brief The link preview properties.
|
||||||
*
|
*
|
||||||
@@ -62,7 +54,6 @@ MessageDelegate {
|
|||||||
acceptedButtons: Qt.LeftButton
|
acceptedButtons: Qt.LeftButton
|
||||||
onLongPressed: root.openContextMenu()
|
onLongPressed: root.openContextMenu()
|
||||||
}
|
}
|
||||||
isDelegate: true
|
|
||||||
}
|
}
|
||||||
Loader {
|
Loader {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|||||||
@@ -341,66 +341,6 @@ QQC2.ScrollView {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function indexAtRelative(x, y) {
|
|
||||||
return indexAt(x + contentX, y + contentY)
|
|
||||||
}
|
|
||||||
|
|
||||||
MouseArea {
|
|
||||||
id: selectionArea
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
|
|
||||||
property int selectionStartIndex
|
|
||||||
property int selectionEndIndex
|
|
||||||
property int selectionStartPos
|
|
||||||
property int selectionEndPos
|
|
||||||
|
|
||||||
property int upperIndex: selectionStartIndex > selectionEndIndex ? selectionStartIndex : selectionEndIndex
|
|
||||||
property int upperPos: selectionStartIndex > selectionEndIndex ? selectionStartPos : (selectionStartIndex == selectionEndIndex ? (selectionStartPos > selectionEndPos ? selectionEndPos : selectionStartPos) : selectionEndPos)
|
|
||||||
property int lowerIndex: selectionStartIndex > selectionEndIndex ? selectionEndIndex : selectionStartIndex
|
|
||||||
property int lowerPos: selectionStartIndex > selectionEndIndex ? selectionEndPos : (selectionStartIndex == selectionEndIndex ? (selectionStartPos > selectionEndPos ? selectionStartPos : selectionEndPos) : selectionStartPos)
|
|
||||||
|
|
||||||
signal selectionChanged
|
|
||||||
|
|
||||||
function indexAndPos(x, y) {
|
|
||||||
const index = messageListView.indexAtRelative(x, y);
|
|
||||||
if (index == -1) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const item = messageListView.itemAtIndex(index);
|
|
||||||
const relItemY = item.y - messageListView.contentY;
|
|
||||||
const pos = item.positionAt(x, y - relItemY);
|
|
||||||
return [index, pos]
|
|
||||||
}
|
|
||||||
|
|
||||||
onPressed: {
|
|
||||||
[selectionArea.selectionEndIndex, selectionArea.selectionEndPos] = selectionArea.indexAndPos(mouse.x, mouse.y);
|
|
||||||
[selectionArea.selectionStartIndex, selectionArea.selectionStartPos] = selectionArea.indexAndPos(mouse.x, mouse.y);
|
|
||||||
selectionChanged();
|
|
||||||
}
|
|
||||||
onPositionChanged: {
|
|
||||||
if (!pressed) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
[selectionEndIndex, selectionEndPos] = selectionArea.indexAndPos(mouse.x, mouse.y);
|
|
||||||
selectionChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Kirigami.Action {
|
|
||||||
onTriggered: {
|
|
||||||
var text = ""
|
|
||||||
for (let i = selectionArea.upperIndex; i >= selectionArea.lowerIndex; i--) {
|
|
||||||
text += messageListView.itemAtIndex(i).selectedText
|
|
||||||
if (i > selectionArea.lowerIndex) {
|
|
||||||
text += " "
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Clipboard.saveText(text)
|
|
||||||
}
|
|
||||||
shortcut: "Ctrl+C"
|
|
||||||
}
|
|
||||||
|
|
||||||
function showMaximizedMedia(index) {
|
function showMaximizedMedia(index) {
|
||||||
var popup = maximizeComponent.createObject(QQC2.ApplicationWindow.overlay, {
|
var popup = maximizeComponent.createObject(QQC2.ApplicationWindow.overlay, {
|
||||||
initialIndex: index
|
initialIndex: index
|
||||||
|
|||||||
@@ -5,6 +5,8 @@
|
|||||||
|
|
||||||
#include <QDBusMetaType>
|
#include <QDBusMetaType>
|
||||||
|
|
||||||
|
#include <KWindowSystem>
|
||||||
|
|
||||||
#include "controller.h"
|
#include "controller.h"
|
||||||
#include "neochatroom.h"
|
#include "neochatroom.h"
|
||||||
#include "roommanager.h"
|
#include "roommanager.h"
|
||||||
@@ -80,10 +82,12 @@ RemoteMatches Runner::Match(const QString &searchTerm)
|
|||||||
return matches;
|
return matches;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Runner::Run(const QString &id, const QString &actionId)
|
void Runner::Run(const QString &id, const QString &actionId, const QString &activationToken)
|
||||||
{
|
{
|
||||||
Q_UNUSED(actionId);
|
Q_UNUSED(actionId);
|
||||||
|
|
||||||
|
KWindowSystem::setCurrentXdgActivationToken(activationToken);
|
||||||
|
|
||||||
NeoChatRoom *room = qobject_cast<NeoChatRoom *>(Controller::instance().activeConnection()->room(id));
|
NeoChatRoom *room = qobject_cast<NeoChatRoom *>(Controller::instance().activeConnection()->room(id));
|
||||||
|
|
||||||
if (!room) {
|
if (!room) {
|
||||||
|
|||||||
@@ -183,7 +183,7 @@ public:
|
|||||||
/**
|
/**
|
||||||
* @brief Handle action calls.
|
* @brief Handle action calls.
|
||||||
*/
|
*/
|
||||||
Q_SCRIPTABLE void Run(const QString &id, const QString &actionId);
|
Q_SCRIPTABLE void Run(const QString &id, const QString &actionId, const QString &activationToken = QString());
|
||||||
|
|
||||||
private:
|
private:
|
||||||
RemoteImage serializeImage(const QImage &image);
|
RemoteImage serializeImage(const QImage &image);
|
||||||
|
|||||||
Reference in New Issue
Block a user