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
1=== modified file 'debian/control'
2--- debian/control 2017-03-10 15:18:06 +0000
3+++ debian/control 2017-04-04 13:48:37 +0000
4@@ -14,7 +14,8 @@
5 xvfb,
6 qml-module-qtquick2,
7 qml-module-qttest,
8- qml-module-ubuntu-components
9+ qml-module-ubuntu-components,
10+ qtdeclarative5-gsettings1.0
11 Standards-Version: 3.9.8
12 Section: misc
13 Homepage: https://launchpad.net/ubuntu-terminal-app
14@@ -32,6 +33,7 @@
15 qml-module-qt-labs-settings,
16 qml-module-qtsysteminfo (>= 5.0~),
17 qtdeclarative5-ubuntu-ui-extras0.2,
18+ qtdeclarative5-gsettings1.0,
19 Description: Terminal application
20 Core Terminal application
21
22
23=== modified file 'debian/rules'
24--- debian/rules 2017-03-14 13:43:01 +0000
25+++ debian/rules 2017-04-04 13:48:37 +0000
26@@ -11,7 +11,7 @@
27 dh_auto_configure -- -DCLICK_MODE=OFF
28
29 # Skip tests on the archs they are known to be flaky with current configuration
30-testskip_architectures := powerpc
31+testskip_architectures := arm64 powerpc
32
33 override_dh_auto_test:
34 ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))
35
36=== added directory 'snap/mir-libs'
37=== modified file 'snapcraft.yaml'
38--- snapcraft.yaml 2017-03-03 09:05:23 +0000
39+++ snapcraft.yaml 2017-04-04 13:48:37 +0000
40@@ -9,7 +9,7 @@
41 ubuntu-terminal-app:
42 command: desktop-launch $SNAP/bin/terminal.wrapper
43 desktop: usr/share/applications/ubuntu-terminal-app.desktop
44- plugs: [unity7, unity8, opengl, network, network-bind, home, platform, mir]
45+ plugs: [unity7, unity8, opengl, network, network-bind, home, platform, mir, mir-libs]
46
47 plugs:
48 platform:
49@@ -17,6 +17,11 @@
50 content: ubuntu-app-platform1
51 target: ubuntu-app-platform
52 default-provider: ubuntu-app-platform
53+ mir-libs:
54+ interface: content
55+ content: mir0
56+ target: mir-libs
57+ default-provider: mir-libs
58
59 parts:
60 wrapper:
61
62=== modified file 'src/app/qml/Settings/SettingsWindow.qml'
63--- src/app/qml/Settings/SettingsWindow.qml 2016-11-29 11:54:38 +0000
64+++ src/app/qml/Settings/SettingsWindow.qml 2017-04-04 13:48:37 +0000
65@@ -23,7 +23,7 @@
66 id: settingsWindow
67
68 visible: true
69- title: "Terminal"
70+ title: i18n.tr("Terminal Preferences")
71 color: settingsPage.windowColor
72 contentOrientation: Screen.orientation
73
74
75=== modified file 'src/app/qml/TerminalPage.qml'
76--- src/app/qml/TerminalPage.qml 2017-01-09 14:56:06 +0000
77+++ src/app/qml/TerminalPage.qml 2017-04-04 13:48:37 +0000
78@@ -20,6 +20,7 @@
79 import Ubuntu.Components.Popups 1.3
80 import Ubuntu.Components.Extras 0.3
81 import QMLTermWidget 1.0
82+import GSettings 1.0
83
84 // For FastBlur
85 import QtGraphicalEffects 1.0
86@@ -180,9 +181,14 @@
87 visible: terminalPage.narrowLayout
88 }
89
90+ GSettings {
91+ id: unity8Settings
92+ schema.id: "com.canonical.Unity8"
93+ }
94+
95 Loader {
96 id: keyboardButton
97- active: !QuickUtils.keyboardAttached
98+ active: !QuickUtils.keyboardAttached || unity8Settings.alwaysShowOsk
99 anchors {right: parent.right; margins: units.gu(1)}
100
101 y: parent.height - height - units.gu(1) - keyboardBarLoader.height
102
103=== modified file 'src/app/qml/helpers.js'
104--- src/app/qml/helpers.js 2016-12-08 11:13:34 +0000
105+++ src/app/qml/helpers.js 2017-04-04 13:48:37 +0000
106@@ -1,7 +1,7 @@
107 function createComponentInstance(component, parent, properties, callback) {
108 var incubator;
109 if (component.status == Component.Ready) {
110- incubator = component.incubateObject(parent, properties, Qt.Asynchronous);
111+ incubator = component.incubateObject(parent, properties, Qt.Synchronous);
112
113 function objectCreated(status) {
114 if (status == Component.Ready && callback != null) {
115
116=== modified file 'src/plugin/qmltermwidget/lib/TerminalDisplay.cpp'
117--- src/plugin/qmltermwidget/lib/TerminalDisplay.cpp 2017-01-16 16:00:10 +0000
118+++ src/plugin/qmltermwidget/lib/TerminalDisplay.cpp 2017-04-04 13:48:37 +0000
119@@ -413,9 +413,7 @@
120 _scrollBar->setVisible(false);
121 connect(_scrollBar, SIGNAL(valueChanged(int)), this, SIGNAL(scrollbarParamsChanged(int)));
122
123- // TODO Forcing rendering to Framebuffer. We need to determine if this is ok
124- // always or if we need to make this customizable.
125- setRenderTarget(QQuickPaintedItem::FramebufferObject);
126+ setRenderTarget(QQuickPaintedItem::Image);
127
128 // Enable drag and drop
129 // setAcceptDrops(true); // attempt

Subscribers

People subscribed via source and target branches