Merge lp:ubuntu-terminal-app/staging into lp:ubuntu-terminal-app

Proposed by Florian Boucault
Status: Rejected
Rejected by: Florian Boucault
Proposed branch: lp:ubuntu-terminal-app/staging
Merge into: lp:ubuntu-terminal-app
Diff against target: 129 lines (+20/-9)
7 files modified
debian/control (+3/-1)
debian/rules (+1/-1)
snapcraft.yaml (+6/-1)
src/app/qml/Settings/SettingsWindow.qml (+1/-1)
src/app/qml/TerminalPage.qml (+7/-1)
src/app/qml/helpers.js (+1/-1)
src/plugin/qmltermwidget/lib/TerminalDisplay.cpp (+1/-3)
To merge this branch: bzr merge lp:ubuntu-terminal-app/staging
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Ubuntu Terminal Developers Pending
Review via email: mp+319832@code.launchpad.net

Commit message

Ubuntu Terminal Release:
- entire UX revamped
- snap packaging introduced

Description of the change

Ubuntu Terminal Release:
- entire UX revamped
- snap packaging introduced

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)

Unmerged revisions

375. By Florian Boucault

Multiplied default history size by 10

374. By Florian Boucault

Increased minimum window size

373. By Renato Araujo Oliveira Filho

[snap] Added mir-libs content interface as snap dep.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2017-03-10 15:18:06 +0000
+++ debian/control 2017-04-04 13:48:37 +0000
@@ -14,7 +14,8 @@
14 xvfb,14 xvfb,
15 qml-module-qtquick2,15 qml-module-qtquick2,
16 qml-module-qttest,16 qml-module-qttest,
17 qml-module-ubuntu-components17 qml-module-ubuntu-components,
18 qtdeclarative5-gsettings1.0
18Standards-Version: 3.9.819Standards-Version: 3.9.8
19Section: misc20Section: misc
20Homepage: https://launchpad.net/ubuntu-terminal-app21Homepage: https://launchpad.net/ubuntu-terminal-app
@@ -32,6 +33,7 @@
32 qml-module-qt-labs-settings,33 qml-module-qt-labs-settings,
33 qml-module-qtsysteminfo (>= 5.0~),34 qml-module-qtsysteminfo (>= 5.0~),
34 qtdeclarative5-ubuntu-ui-extras0.2,35 qtdeclarative5-ubuntu-ui-extras0.2,
36 qtdeclarative5-gsettings1.0,
35Description: Terminal application37Description: Terminal application
36 Core Terminal application38 Core Terminal application
3739
3840
=== modified file 'debian/rules'
--- debian/rules 2017-03-14 13:43:01 +0000
+++ debian/rules 2017-04-04 13:48:37 +0000
@@ -11,7 +11,7 @@
11 dh_auto_configure -- -DCLICK_MODE=OFF11 dh_auto_configure -- -DCLICK_MODE=OFF
1212
13# Skip tests on the archs they are known to be flaky with current configuration13# Skip tests on the archs they are known to be flaky with current configuration
14testskip_architectures := powerpc14testskip_architectures := arm64 powerpc
1515
16override_dh_auto_test:16override_dh_auto_test:
17ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))17ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))
1818
=== added directory 'snap/mir-libs'
=== modified file 'snapcraft.yaml'
--- snapcraft.yaml 2017-03-03 09:05:23 +0000
+++ snapcraft.yaml 2017-04-04 13:48:37 +0000
@@ -9,7 +9,7 @@
9 ubuntu-terminal-app:9 ubuntu-terminal-app:
10 command: desktop-launch $SNAP/bin/terminal.wrapper10 command: desktop-launch $SNAP/bin/terminal.wrapper
11 desktop: usr/share/applications/ubuntu-terminal-app.desktop11 desktop: usr/share/applications/ubuntu-terminal-app.desktop
12 plugs: [unity7, unity8, opengl, network, network-bind, home, platform, mir]12 plugs: [unity7, unity8, opengl, network, network-bind, home, platform, mir, mir-libs]
1313
14plugs:14plugs:
15 platform:15 platform:
@@ -17,6 +17,11 @@
17 content: ubuntu-app-platform117 content: ubuntu-app-platform1
18 target: ubuntu-app-platform18 target: ubuntu-app-platform
19 default-provider: ubuntu-app-platform19 default-provider: ubuntu-app-platform
20 mir-libs:
21 interface: content
22 content: mir0
23 target: mir-libs
24 default-provider: mir-libs
2025
21parts:26parts:
22 wrapper:27 wrapper:
2328
=== modified file 'src/app/qml/Settings/SettingsWindow.qml'
--- src/app/qml/Settings/SettingsWindow.qml 2016-11-29 11:54:38 +0000
+++ src/app/qml/Settings/SettingsWindow.qml 2017-04-04 13:48:37 +0000
@@ -23,7 +23,7 @@
23 id: settingsWindow23 id: settingsWindow
2424
25 visible: true25 visible: true
26 title: "Terminal"26 title: i18n.tr("Terminal Preferences")
27 color: settingsPage.windowColor27 color: settingsPage.windowColor
28 contentOrientation: Screen.orientation28 contentOrientation: Screen.orientation
2929
3030
=== modified file 'src/app/qml/TerminalPage.qml'
--- src/app/qml/TerminalPage.qml 2017-01-09 14:56:06 +0000
+++ src/app/qml/TerminalPage.qml 2017-04-04 13:48:37 +0000
@@ -20,6 +20,7 @@
20import Ubuntu.Components.Popups 1.320import Ubuntu.Components.Popups 1.3
21import Ubuntu.Components.Extras 0.321import Ubuntu.Components.Extras 0.3
22import QMLTermWidget 1.022import QMLTermWidget 1.0
23import GSettings 1.0
2324
24// For FastBlur25// For FastBlur
25import QtGraphicalEffects 1.026import QtGraphicalEffects 1.0
@@ -180,9 +181,14 @@
180 visible: terminalPage.narrowLayout181 visible: terminalPage.narrowLayout
181 }182 }
182183
184 GSettings {
185 id: unity8Settings
186 schema.id: "com.canonical.Unity8"
187 }
188
183 Loader {189 Loader {
184 id: keyboardButton190 id: keyboardButton
185 active: !QuickUtils.keyboardAttached191 active: !QuickUtils.keyboardAttached || unity8Settings.alwaysShowOsk
186 anchors {right: parent.right; margins: units.gu(1)}192 anchors {right: parent.right; margins: units.gu(1)}
187193
188 y: parent.height - height - units.gu(1) - keyboardBarLoader.height194 y: parent.height - height - units.gu(1) - keyboardBarLoader.height
189195
=== modified file 'src/app/qml/helpers.js'
--- src/app/qml/helpers.js 2016-12-08 11:13:34 +0000
+++ src/app/qml/helpers.js 2017-04-04 13:48:37 +0000
@@ -1,7 +1,7 @@
1function createComponentInstance(component, parent, properties, callback) {1function createComponentInstance(component, parent, properties, callback) {
2 var incubator;2 var incubator;
3 if (component.status == Component.Ready) {3 if (component.status == Component.Ready) {
4 incubator = component.incubateObject(parent, properties, Qt.Asynchronous);4 incubator = component.incubateObject(parent, properties, Qt.Synchronous);
55
6 function objectCreated(status) {6 function objectCreated(status) {
7 if (status == Component.Ready && callback != null) {7 if (status == Component.Ready && callback != null) {
88
=== modified file 'src/plugin/qmltermwidget/lib/TerminalDisplay.cpp'
--- src/plugin/qmltermwidget/lib/TerminalDisplay.cpp 2017-01-16 16:00:10 +0000
+++ src/plugin/qmltermwidget/lib/TerminalDisplay.cpp 2017-04-04 13:48:37 +0000
@@ -413,9 +413,7 @@
413 _scrollBar->setVisible(false);413 _scrollBar->setVisible(false);
414 connect(_scrollBar, SIGNAL(valueChanged(int)), this, SIGNAL(scrollbarParamsChanged(int)));414 connect(_scrollBar, SIGNAL(valueChanged(int)), this, SIGNAL(scrollbarParamsChanged(int)));
415415
416 // TODO Forcing rendering to Framebuffer. We need to determine if this is ok416 setRenderTarget(QQuickPaintedItem::Image);
417 // always or if we need to make this customizable.
418 setRenderTarget(QQuickPaintedItem::FramebufferObject);
419417
420 // Enable drag and drop 418 // Enable drag and drop
421// setAcceptDrops(true); // attempt419// setAcceptDrops(true); // attempt

Subscribers

People subscribed via source and target branches