Merge lp:~developersw/ubuntu-terminal-app/CarloSpenguinFix into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

Proposed by Carlo Giordano
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„
Approved revision: 70
Merged at revision: 75
Proposed branch: lp:~developersw/ubuntu-terminal-app/CarloSpenguinFix
Merge into: lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Diff against target: 72 lines (+13/-4)
3 files modified
po/com.ubuntu.terminal.pot (+2/-2)
src/app/main.cpp (+10/-1)
src/app/qml/TerminalComponent.qml (+1/-1)
To merge this branch: bzr merge lp:~developersw/ubuntu-terminal-app/CarloSpenguinFix
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Filippo Scognamiglio Approve
Review via email: mp+253864@code.launchpad.net

Commit message

Home-Dynamic-Folder

Description of the change

Folder-Dynamic-Home

To post a comment you must log in.
Revision history for this message
Filippo Scognamiglio (flscogna) wrote :

Thank you Carlo!

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~developersw/ubuntu-terminal-app/CarloSpenguinFix/+merge/253864/+edit-commit-message

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/com.ubuntu.terminal.pot'
2--- po/com.ubuntu.terminal.pot 2015-02-26 10:57:55 +0000
3+++ po/com.ubuntu.terminal.pot 2015-03-23 17:48:21 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: \n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2015-02-20 14:00+0100\n"
9+"POT-Creation-Date: 2015-03-21 13:11+0100\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -81,7 +81,7 @@
14 msgid "New tab"
15 msgstr ""
16
17-#: ../src/app/qml/TerminalPage.qml:111
18+#: ../src/app/qml/TerminalPage.qml:164
19 msgid "Selection Mode"
20 msgstr ""
21
22
23=== modified file 'src/app/main.cpp'
24--- src/app/main.cpp 2015-02-14 10:33:32 +0000
25+++ src/app/main.cpp 2015-03-23 17:48:21 +0000
26@@ -31,6 +31,11 @@
27
28 #include <QDebug>
29
30+QString getNamedArgument(QStringList args, QString name, QString defaultName)
31+{
32+ int index = args.indexOf(name);
33+ return (index != -1) ? args[index + 1] : QString(defaultName);
34+}
35 QStringList getProfileFromDir(const QString &path) {
36 QDir layoutDir(path);
37 layoutDir.setNameFilters(QStringList("*.json"));
38@@ -78,16 +83,20 @@
39
40 QStringList args = a.arguments();
41 if (args.contains("-h") || args.contains("--help")) {
42- qDebug() << "usage: " + args.at(0) + " [-p|--phone] [-t|--tablet] [-h|--help] [-I <path>]";
43+ qDebug() << "usage: " + args.at(0) + " [-p|--phone] [--workdir <dir>] [-t|--tablet] [-h|--help] [-I <path>]";
44 qDebug() << " -p|--phone If running on Desktop, start in a phone sized window.";
45 qDebug() << " -t|--tablet If running on Desktop, start in a tablet sized window.";
46 qDebug() << " --forceAuth <true|false> Force authentication on or off.";
47 qDebug() << " -h|--help Print this help.";
48 qDebug() << " -I <path> Give a path for an additional QML import directory. May be used multiple times.";
49 qDebug() << " -q <qmlfile> Give an alternative location for the main qml file.";
50+ qDebug() << " --workdir <dir> Change working directory to 'dir'";
51 return 0;
52 }
53
54+ //Dynamic folder home
55+ view.engine()->rootContext()->setContextProperty("workdir", getNamedArgument(args, "--workdir", "$HOME"));
56+
57 // Desktop doesn't have yet Unity8 and so no unity greeter either. Consequently it doesn't
58 // also have any "PIN code" or "Password" extra authentication. Don't require any extra
59 // authentication there by default
60
61=== modified file 'src/app/qml/TerminalComponent.qml'
62--- src/app/qml/TerminalComponent.qml 2014-11-16 22:38:02 +0000
63+++ src/app/qml/TerminalComponent.qml 2015-03-23 17:48:21 +0000
64@@ -15,7 +15,7 @@
65
66 session: QMLTermSession {
67 id: terminalSession
68- initialWorkingDirectory: "$HOME"
69+ initialWorkingDirectory: workdir
70 }
71
72 QMLTermScrollbar {

Subscribers

People subscribed via source and target branches