Refactor global shortcuts, simplify debug consoles

- Move out all shortcuts from their central file to the component they
  actually belong to

- Get rid of DebugConsoleLoader and the multiple consoles handling mess,
  have only one global console
This commit is contained in:
miruka
2020-03-28 07:18:00 -04:00
parent af2d5f8cba
commit 1038678a2f
24 changed files with 268 additions and 401 deletions

View File

@@ -65,17 +65,9 @@ HRowLayout {
// ~600px max with a 16px font
readonly property int maxMessageWidth: theme.fontSize.normal * 0.5 * 75
readonly property alias debugConsoleLoader: debugConsoleLoader
readonly property alias selectedText: contentLabel.selectedText
DebugConsoleLoader {
id: debugConsoleLoader
active: false
onLoaded: item.runJS("json()")
}
Item {
id: avatarWrapper
opacity: collapseAvatar ? 0 : 1

View File

@@ -221,7 +221,11 @@ HColumnLayout {
HMenuItem {
icon.name: "debug"
text: qsTr("Debug this event")
onTriggered: eventContent.debugConsoleLoader.toggle()
onTriggered: {
mainUI.debugConsole.visible = true
mainUI.debugConsole.target = eventContent
mainUI.debugConsole.runJS("t.parent.json()", false)
}
}
HMenuItemPopupSpawner {

View File

@@ -6,6 +6,7 @@ import QtQuick.Window 2.12
import Clipboard 0.1
import "../../.."
import "../../../Base"
import "../../../ShortcutBundles"
Rectangle {
color: theme.chat.eventList.background
@@ -56,6 +57,23 @@ Rectangle {
eventList.currentItem.eventContent.debugConsoleLoader.toggle()
}
HShortcut {
sequences: window.settings.keys.clearRoomMessages
onActivated: utils.makePopup(
"Popups/ClearMessagesPopup.qml",
mainUI,
{
userId: window.uiState.pageProperties.userId,
roomId: window.uiState.pageProperties.roomId,
}
)
}
FlickShortcuts {
flickable: eventList
}
HListView {
id: eventList
clip: true
@@ -109,8 +127,6 @@ Rectangle {
// fetch past events.
onInviterChanged: canLoad = true
Component.onCompleted: shortcuts.flickTarget = eventList
property string inviter: chat.roomInfo.inviter || ""
property real yPos: visibleArea.yPosition