ubuntu-touch-coreapps-reviewers team mailing list archive
-
ubuntu-touch-coreapps-reviewers team
-
Mailing list archive
-
Message #10356
[Merge] lp:~fboucault/ubuntu-terminal-app/release_0417 into lp:ubuntu-terminal-app
Florian Boucault has proposed merging lp:~fboucault/ubuntu-terminal-app/release_0417 into lp:ubuntu-terminal-app.
Commit message:
Ubuntu Terminal Release:
- Introduced desktop style tabs when enough space is available
- New visual design for overlaid button and keyboard bar
- New application settings dialog
- Contextual menu: new cleaner design
- Multi-window support
- Support for transparent background
- Introduced snap packaging
Requested reviews:
Ubuntu Terminal Developers (ubuntu-terminal-dev)
For more details, see:
https://code.launchpad.net/~fboucault/ubuntu-terminal-app/release_0417/+merge/322010
Ubuntu Terminal Release:
- Introduced desktop style tabs when enough space is available
- New visual design for overlaid button and keyboard bar
- New application settings dialog
- Contextual menu: new cleaner design
- Multi-window support
- Support for transparent background
- Introduced snap packaging
--
Your team Ubuntu Terminal Developers is requested to review the proposed merge of lp:~fboucault/ubuntu-terminal-app/release_0417 into lp:ubuntu-terminal-app.
=== modified file 'debian/control'
--- debian/control 2017-03-10 15:18:06 +0000
+++ debian/control 2017-04-05 14:42:17 +0000
@@ -14,7 +14,8 @@
xvfb,
qml-module-qtquick2,
qml-module-qttest,
- qml-module-ubuntu-components
+ qml-module-ubuntu-components,
+ qtdeclarative5-gsettings1.0
Standards-Version: 3.9.8
Section: misc
Homepage: https://launchpad.net/ubuntu-terminal-app
@@ -32,6 +33,7 @@
qml-module-qt-labs-settings,
qml-module-qtsysteminfo (>= 5.0~),
qtdeclarative5-ubuntu-ui-extras0.2,
+ qtdeclarative5-gsettings1.0,
Description: Terminal application
Core Terminal application
=== modified file 'debian/rules'
--- debian/rules 2017-03-14 13:43:01 +0000
+++ debian/rules 2017-04-05 14:42:17 +0000
@@ -11,7 +11,7 @@
dh_auto_configure -- -DCLICK_MODE=OFF
# Skip tests on the archs they are known to be flaky with current configuration
-testskip_architectures := powerpc
+testskip_architectures := arm64 powerpc
override_dh_auto_test:
ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))
=== 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-05 14:42:17 +0000
@@ -23,7 +23,7 @@
id: settingsWindow
visible: true
- title: "Terminal"
+ title: i18n.tr("Terminal Preferences")
color: settingsPage.windowColor
contentOrientation: Screen.orientation
=== 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-05 14:42:17 +0000
@@ -20,6 +20,7 @@
import Ubuntu.Components.Popups 1.3
import Ubuntu.Components.Extras 0.3
import QMLTermWidget 1.0
+import GSettings 1.0
// For FastBlur
import QtGraphicalEffects 1.0
@@ -180,9 +181,14 @@
visible: terminalPage.narrowLayout
}
+ GSettings {
+ id: unity8Settings
+ schema.id: "com.canonical.Unity8"
+ }
+
Loader {
id: keyboardButton
- active: !QuickUtils.keyboardAttached
+ active: !QuickUtils.keyboardAttached || unity8Settings.alwaysShowOsk
anchors {right: parent.right; margins: units.gu(1)}
y: parent.height - height - units.gu(1) - keyboardBarLoader.height
=== 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-05 14:42:17 +0000
@@ -1,7 +1,7 @@
function createComponentInstance(component, parent, properties, callback) {
var incubator;
if (component.status == Component.Ready) {
- incubator = component.incubateObject(parent, properties, Qt.Asynchronous);
+ incubator = component.incubateObject(parent, properties, Qt.Synchronous);
function objectCreated(status) {
if (status == Component.Ready && callback != null) {
=== 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-05 14:42:17 +0000
@@ -413,9 +413,7 @@
_scrollBar->setVisible(false);
connect(_scrollBar, SIGNAL(valueChanged(int)), this, SIGNAL(scrollbarParamsChanged(int)));
- // TODO Forcing rendering to Framebuffer. We need to determine if this is ok
- // always or if we need to make this customizable.
- setRenderTarget(QQuickPaintedItem::FramebufferObject);
+ setRenderTarget(QQuickPaintedItem::Image);
// Enable drag and drop
// setAcceptDrops(true); // attempt
References