From e3f7344551a387653c2271ecc24d95051a04a2d1 Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Sat, 12 Dec 2015 23:31:20 +0100 Subject: Add initial working directory to settings handler In addition to increasing customizability this change makes it clear that the _working directory_ property only concerns the intial working directory and is not updated if the contained process changes its directory. Note that setting the intial working directory is broken in upstream _QMLTermWidget_ and the appropriate patch [1] is not merged at the time of this commit. [1]: https://github.com/KnairdA/qmltermwidget/tree/initial_working_directory_fix --- src/widget/EmbeddedTerminal.qml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/widget') diff --git a/src/widget/EmbeddedTerminal.qml b/src/widget/EmbeddedTerminal.qml index 4d48f92..8a326ef 100644 --- a/src/widget/EmbeddedTerminal.qml +++ b/src/widget/EmbeddedTerminal.qml @@ -8,10 +8,8 @@ Item { signal finished property string program - property string workingDirectory - - property int lines : settings.terminal.initialLines + property int lines : settings.terminal.initialLines property alias history : session.history function select() { highlighter.select() } @@ -56,7 +54,7 @@ Item { session: QMLTermSession { id: session - initialWorkingDirectory: item.workingDirectory + initialWorkingDirectory: settings.terminal.initialWorkingDirectory shellProgram: settings.terminal.launcherProgram shellProgramArgs: [ settings.terminal.launcherArgument, program ] @@ -76,8 +74,8 @@ Item { onTermGetFocus: highlighter.focus() onTermLostFocus: highlighter.unfocus() - onHeightChanged: overlay.displayBriefly(); - onWidthChanged: overlay.displayBriefly(); + onHeightChanged: overlay.displayBriefly() + onWidthChanged: overlay.displayBriefly() Rectangle { id: overlay -- cgit v1.2.3