aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Kummerlaender2015-12-12 23:31:20 +0100
committerAdrian Kummerlaender2015-12-12 23:31:20 +0100
commite3f7344551a387653c2271ecc24d95051a04a2d1 (patch)
tree7331d80d089d70371d1784fde5153569f9c07ebd
parenteaa6b0b5f43738c0386e99eeba26b44250e6136d (diff)
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
-rw-r--r--src/SettingsHandler.qml19
-rw-r--r--src/list/TerminalItem.qml7
-rw-r--r--src/widget/EmbeddedTerminal.qml10
3 files changed, 17 insertions, 19 deletions
diff --git a/src/SettingsHandler.qml b/src/SettingsHandler.qml
index 1b54251..ca5ea6b 100644
--- a/src/SettingsHandler.qml
+++ b/src/SettingsHandler.qml
@@ -58,15 +58,16 @@ QtObject {
property Settings terminal : Settings {
category: "terminal"
- property int initialLines : 20
- property int frameWidth : 10
- property int fontSize : 8
- property string fontFamily : "Monospace"
- property string colorScheme : "cool-retro-term"
- property string launcherProgram : "sh"
- property string launcherArgument : "-c"
- property string overlayBackground : "black"
- property string overlayFontColor : "white"
+ property int initialLines : 20
+ property string initialWorkingDirectory : "$HOME"
+ property int frameWidth : 10
+ property int fontSize : 8
+ property string fontFamily : "Monospace"
+ property string colorScheme : "cool-retro-term"
+ property string launcherProgram : "sh"
+ property string launcherArgument : "-c"
+ property string overlayBackground : "black"
+ property string overlayFontColor : "white"
}
property Settings command : Settings {
diff --git a/src/list/TerminalItem.qml b/src/list/TerminalItem.qml
index 2eb9dc7..91a9730 100644
--- a/src/list/TerminalItem.qml
+++ b/src/list/TerminalItem.qml
@@ -114,10 +114,9 @@ Item {
}
item.terminal = terminalComponent.createObject(elementList, {
- "settings" : settings,
- "program" : program,
- "workingDirectory" : "$HOME",
- "focus" : true
+ "settings" : settings,
+ "program" : program,
+ "focus" : true
});
item.terminal.onFinished.connect(function() {
createHistoryViewer(item.terminal.history);
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