Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor global shortcuts, simplify debug consoles

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

80
src/gui/DebugConsole.qml
View File

@@ -17,41 +17,7 @@ HDrawer {
z: 9999
position: 0
property Item previouslyFocused: null
property QtObject target: null
property alias t: debugConsole.target
property var history: window.history.console
property alias his: debugConsole.history
property int historyEntry: -1
property int maxHistoryLength: 4096
property string help: qsTr(
`Javascript debugging console
Useful variables:
window, theme, settings, shortcuts, utils, mainUI, pageLoader
py Python interpreter
this The console itself
t Target item to debug for which this console was opened
his History, list of commands entered
Special commands:
.j OBJECT, .json OBJECT Print OBJECT as human-readable JSON
.t, .top Attach the console to the parent window's top
.b, .bottom Attach the console to the parent window's bottom
.l, .left Attach the console to the parent window's left
.r, .right Attach the console to the parent window's right
.h, .help Show this help`.replace(/^ {8}/gm, "")
)
readonly property alias commandsView: commandsView
Component.onCompleted: {
position = 1
onTargetChanged: {
commandsView.model.insert(0, {
input: "t = " + String(target),
output: "",
@@ -73,8 +39,41 @@ HDrawer {
historyEntry === -1 ? "" : history.slice(-historyEntry - 1)[0]
function runJS(input) {
if (history.slice(-1)[0] !== input) {
property Item previouslyFocused: null
property QtObject target: null
property alias t: debugConsole.target
property var history: window.history.console
property alias his: debugConsole.history
property int historyEntry: -1
property int maxHistoryLength: 4096
property string help: qsTr(
`Javascript debugging console
Useful variables:
window, theme, settings, utils, mainUI, pageLoader
py Python interpreter
this The console itself
t Target item to debug for which this console was opened
his History, list of commands entered
Special commands:
.j OBJECT, .json OBJECT Print OBJECT as human-readable JSON
.t, .top Attach the console to the parent window's top
.b, .bottom Attach the console to the parent window's bottom
.l, .left Attach the console to the parent window's left
.r, .right Attach the console to the parent window's right
.h, .help Show this help`.replace(/^ {8}/gm, "")
)
readonly property alias commandsView: commandsView
function runJS(input, addToHistory=true) {
if (addToHistory && history.slice(-1)[0] !== input) {
history.push(input)
while (history.length > maxHistoryLength) history.shift()
window.historyChanged()
@@ -117,11 +116,14 @@ HDrawer {
}
HShortcut {
sequences: settings.keys.toggleDebugConsole
onActivated: debugConsole.visible = ! debugConsole.visible
}
HColumnLayout {
anchors.fill: parent
Keys.onEscapePressed: debugConsole.visible = false
HListView {
id: commandsView
spacing: theme.spacing