945dd8e · unity8 · git.iko.soy

CMakeLists.txt+5

compare with xenial

unifiedsplit

@@ -69,6 +69,7 @@ find_package(Qt5Gui 5.6 REQUIRED)

69find_package(Qt5DBus 5.6 REQUIRED)

70find_package(Qt5Concurrent 5.6 REQUIRED)

71find_package(Qt5Sql 5.6 REQUIRED)

72+find_package(Qt5Test 5.6 REQUIRED)

72

73

73pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=27)

74pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=27)

74pkg_check_modules(QTMIRSERVER REQUIRED qtmirserver>=0.6.0)

75pkg_check_modules(QTMIRSERVER REQUIRED qtmirserver>=0.6.0)

@@ -80,6 +81,10 @@ pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)

80pkg_check_modules(GD3 REQUIRED gnome-desktop-3.0)

81pkg_check_modules(GD3 REQUIRED gnome-desktop-3.0)

81pkg_check_modules(UAL REQUIRED ubuntu-app-launch-3)

82pkg_check_modules(UAL REQUIRED ubuntu-app-launch-3)

82pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)

83pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)

84+pkg_check_modules(QTDBUSTEST REQUIRED

85+ libqtdbustest-1

86+ libqtdbusmock-1

87+ )

83pkg_check_modules(MIRAL REQUIRED miral)

88pkg_check_modules(MIRAL REQUIRED miral)

84

89

85### Check UbuntuGestures private headers. No pkg-config (.pc) file is provided for them

90### Check UbuntuGestures private headers. No pkg-config (.pc) file is provided for them

debian/changelog+44

@@ -1,3 +1,47 @@

1+unity8 (8.15+17.04.20170328.3-0ubuntu1) zesty; urgency=medium

2+

3+ [ Albert Astals Cid ]

4+ * mock: Remove empty property and move invokable

5+ * Tune quicklist item selection

6+ * Fix unminimizing going to the wrong position the second time (LP:

7+ #1671458)

8+ * Remove unclickable gaps on the menubar (LP: #1672722)

9+ * indicators client is a tool

10+ * Make sure we destroy the popups when the item goes away (LP:

11+ #1670338)

12+ * UnityApplicationMocks: Initialize m_state and m_requestedState

13+ * Don't use appInfo after checking it if is null

14+ * Initialize m_privateMode

15+ * Hook up aboutToShow for overflow menus (LP: #1676016)

16+

17+ [ Daniel d'Andrada ]

18+ * Give active focus to child surface qml items (LP: #1671072)

19+ * Satellite child windows (LP: #1673415)

20+ * Tell qtmir/miral about the available desktop area

21+

22+ [ Florian Boucault ]

23+ * WindowStateStorage: use a private QThreadPool to ensure that

24+ WindowStateStorage::saveValue always has a thread available to

25+ execute the query in. (LP: #1675424)

26+

27+ [ Lukáš Tinkl ]

28+ * Protect against loading invalid window geometry (LP: #1674262)

29+ * Remove usage of the deprecated (and non-functional) system-image-

30+ dbus service.

31+ * Implement Ctrl+Alt+T to launch the terminal app (LP: #1673500)

32+ * Only take normal and dialog surface types into account for launcher

33+ items (LP: #1669047)

34+ * Fix the shutdown dialog after recent refactoring in

35+ DBusUnitySessionService (LP: #1676426)

36+

37+ [ Michael Zanetti ]

38+ * drop the grey background behind icons in the drawer (LP: #1675688)

39+

40+ [ Pete Woods ]

41+ * Fix Unity/Platform::isPC, and add tests (LP: #1670657)

42+

43+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 28 Mar 2017 21:50:20 +0000

44+

1unity8 (8.15+17.04.20170321-0ubuntu1) zesty; urgency=medium

45unity8 (8.15+17.04.20170321-0ubuntu1) zesty; urgency=medium

2

46

3 [ Albert Astals Cid ]

47 [ Albert Astals Cid ]

debian/control+4

@@ -29,6 +29,8 @@ Build-Depends: cmake,

29 libpam0g-dev,

30 libpulse-dev,

31 libqmenumodel-dev (>= 0.2.12),

32+ libqtdbusmock1-dev (>= 0.7),

33+ libqtdbustest1-dev,

32 libqt5svg5-dev,

34 libqt5svg5-dev,

33 libqt5xmlpatterns5-dev,

35 libqt5xmlpatterns5-dev,

34 libqtmirserver-dev (>= 0.6.0),

36 libqtmirserver-dev (>= 0.6.0),

@@ -50,6 +52,7 @@ Build-Depends: cmake,

50 pkg-config,

52 pkg-config,

51 python3-all:any,

53 python3-all:any,

52 python3-setuptools,

54 python3-setuptools,

55+ qtdbustest-runner,

53 qml-module-qt-labs-folderlistmodel,

56 qml-module-qt-labs-folderlistmodel,

54 qml-module-qt-labs-settings,

57 qml-module-qt-labs-settings,

55 qml-module-qtqml-statemachine,

58 qml-module-qtqml-statemachine,

@@ -211,6 +214,7 @@ Multi-Arch: same

211Pre-Depends: ${misc:Pre-Depends},

214Pre-Depends: ${misc:Pre-Depends},

212Depends: dbus-test-runner,

215Depends: dbus-test-runner,

213 parallel,

216 parallel,

217+ qtdbustest-runner,

214 qt5-default,

218 qt5-default,

215 qtdeclarative5-dev-tools,

219 qtdeclarative5-dev-tools,

216 unity8 (= ${source:Version}),

220 unity8 (= ${source:Version}),

plugins/Ubuntu/CMakeLists.txt−1

@@ -1,3 +1,2 @@

1add_subdirectory(Gestures)

2add_subdirectory(DownloadDaemonListener)

3−add_subdirectory(SystemImage)

plugins/Ubuntu/SystemImage/CMakeLists.txtdeleted−15

@@ -1,15 +0,0 @@

1−include_directories(

2− ${GLIB_INCLUDE_DIRS}

3−)

4−

5−set(SYSTEMIMAGE_SOURCES

6− plugin.cpp

7− SystemImage.cpp

8−)

9−

10−add_library(SystemImage MODULE ${SYSTEMIMAGE_SOURCES})

11−

12−qt5_use_modules(SystemImage Qml DBus Core)

13−target_link_libraries(SystemImage ${GLIB_LIBRARIES})

14−

15−add_unity8_plugin(Ubuntu.SystemImage 0.1 Ubuntu/SystemImage TARGETS SystemImage)

plugins/Ubuntu/SystemImage/SystemImage.cppdeleted−155

@@ -1,155 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#include <QDBusConnection>

18−#include <QDBusPendingCall>

19−#include <QDBusReply>

20−#include <QDebug>

21−

22−#include <glib.h>

23−

24−#include "SystemImage.h"

25−

26−#define SYSTEMIMAGE_SERVICE QStringLiteral("com.canonical.SystemImage")

27−#define SYSTEMIMAGE_PATH QStringLiteral("/Service")

28−#define SYSTEMIMAGE_IFACE QStringLiteral("com.canonical.SystemImage")

29−

30−Q_LOGGING_CATEGORY(SYSTEMIMAGEPLUGIN, "unity8.systemimage", QtWarningMsg)

31−

32−#define DEBUG_MSG qCDebug(SYSTEMIMAGEPLUGIN).nospace().noquote() << Q_FUNC_INFO

33−#define WARNING_MSG qCWarning(SYSTEMIMAGEPLUGIN).nospace().noquote() << Q_FUNC_INFO

34−

35−SystemImage::SystemImage(QObject *parent)

36− : QObject(parent)

37−{

38− QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("UpdateAvailableStatus"),

39− this, SLOT(onUpdateAvailableStatus(bool,bool,QString,int,QString,QString)));

40− QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("UpdateDownloaded"),

41− this, SLOT(onUpdateDownloaded()));

42− QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("UpdateFailed"),

43− this, SLOT(onUpdateFailed(int,QString)));

44− QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("Applied"),

45− this, SLOT(onUpdateApplied(bool)));

46− QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("Rebooting"),

47− this, SLOT(onRebooting(bool)));

48−}

49−

50−void SystemImage::checkForUpdate()

51−{

52− DEBUG_MSG << "Checking for update";

53− const QDBusMessage msg = QDBusMessage::createMethodCall(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE,

54− QStringLiteral("CheckForUpdate"));

55− QDBusConnection::systemBus().asyncCall(msg);

56−}

57−

58−void SystemImage::applyUpdate()

59−{

60− DEBUG_MSG << "Applying update";

61− setUpdateApplying(true);

62−

63− const QDBusMessage msg = QDBusMessage::createMethodCall(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE,

64− QStringLiteral("ApplyUpdate"));

65− QDBusConnection::systemBus().asyncCall(msg);

66−}

67−

68−void SystemImage::factoryReset()

69−{

70− const QDBusMessage msg = QDBusMessage::createMethodCall(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE,

71− QStringLiteral("FactoryReset"));

72− QDBusConnection::systemBus().asyncCall(msg);

73−}

74−

75−void SystemImage::onUpdateAvailableStatus(bool is_available, bool downloading, const QString &available_version, int update_size,

76− const QString &last_update_date, const QString &error_reason)

77−{

78− DEBUG_MSG << "A new update is " << (is_available ? "" : "NOT") << "available";

79−

80− if (is_available == m_updateAvailable) {

81− return;

82− }

83−

84− m_updateAvailable = is_available;

85− m_downloading = downloading;

86− m_availableVersion = available_version;

87− m_updateSize = formatSize(update_size);

88− m_lastUpdateDate = last_update_date;

89− m_errorReason = error_reason;

90− Q_EMIT updateAvailableStatus();

91−

92− DEBUG_MSG << "Downloading: " << downloading << ", version: " << available_version << ", last update: " << last_update_date <<

93− ", size: " << m_updateSize;

94−}

95−

96−void SystemImage::onUpdateDownloaded()

97−{

98− DEBUG_MSG << "Update downloaded";

99−

100− m_downloaded = true;

101− Q_EMIT updateDownloadedChanged();

102−}

103−

104−void SystemImage::onUpdateFailed(int /*consecutive_failure_count*/, const QString &last_reason)

105−{

106− WARNING_MSG << "System Update failed: " << last_reason;

107− setUpdateApplying(false);

108−}

109−

110−void SystemImage::onUpdateApplied(bool applied)

111−{

112− DEBUG_MSG << "System Update applied with status: " << applied;

113− setUpdateApplying(false);

114− if (applied) {

115− resetUpdateStatus();

116− Q_EMIT updateAvailableStatus();

117− }

118−}

119−

120−void SystemImage::onRebooting(bool status)

121−{

122− setUpdateApplying(false);

123− DEBUG_MSG << "Rebooting: " << status;

124−}

125−

126−void SystemImage::setUpdateApplying(bool status)

127−{

128− if (status != m_updateApplying) {

129− m_updateApplying = status;

130− Q_EMIT updateApplyingChanged();

131− }

132−}

133−

134−void SystemImage::resetUpdateStatus()

135−{

136− m_updateAvailable = false;

137− m_updateApplying = false;

138− m_downloading = false;

139− m_downloaded = false;

140− m_availableVersion.clear();

141− m_updateSize.clear();

142− m_lastUpdateDate.clear();

143− m_errorReason.clear();

144−}

145−

146−QString SystemImage::formatSize(quint64 size) const

147−{

148− guint64 g_size = size;

149−

150− gchar * formatted_size = g_format_size(g_size);

151− QString q_formatted_size = QString::fromLocal8Bit(formatted_size);

152− g_free(formatted_size);

153−

154− return q_formatted_size;

155−}

plugins/Ubuntu/SystemImage/SystemImage.hdeleted−84

@@ -1,84 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#ifndef SYSTEMIMAGE_H

18−#define SYSTEMIMAGE_H

19−

20−#include <QObject>

21−#include <QLoggingCategory>

22−

23−Q_DECLARE_LOGGING_CATEGORY(SYSTEMIMAGEPLUGIN)

24−

25−class SystemImage : public QObject

26−{

27− Q_OBJECT

28− Q_DISABLE_COPY(SystemImage)

29−

30− Q_PROPERTY(bool updateAvailable READ updateAvailable NOTIFY updateAvailableStatus)

31− Q_PROPERTY(bool updateDownloading READ updateDownloading NOTIFY updateAvailableStatus)

32− Q_PROPERTY(QString availableVersion READ availableVersion NOTIFY updateAvailableStatus)

33− Q_PROPERTY(QString updateSize READ updateSize NOTIFY updateAvailableStatus)

34− Q_PROPERTY(bool updateApplying READ updateApplying NOTIFY updateApplyingChanged)

35− Q_PROPERTY(bool updateDownloaded READ updateDownloaded NOTIFY updateDownloadedChanged)

36−

37−public:

38− explicit SystemImage(QObject *parent = nullptr);

39− ~SystemImage() = default;

40−

41− bool updateAvailable() const { return m_updateAvailable; }

42− bool updateDownloading() const { return m_downloading; }

43− QString availableVersion() const { return m_availableVersion; }

44− QString updateSize() const { return m_updateSize; }

45− bool updateApplying() const { return m_updateApplying; }

46− bool updateDownloaded() const { return m_downloaded; }

47−

48−public Q_SLOTS:

49− Q_INVOKABLE void checkForUpdate();

50− Q_INVOKABLE void applyUpdate();

51− Q_INVOKABLE void factoryReset();

52−

53−private Q_SLOTS:

54− void onUpdateAvailableStatus(bool is_available, bool updateDownloading, const QString &available_version,

55− int update_size, const QString &last_update_date, const QString &error_reason);

56− void onUpdateDownloaded();

57− void onUpdateFailed(int consecutive_failure_count, const QString & last_reason);

58− void onUpdateApplied(bool applied);

59− void onRebooting(bool status);

60−

61−Q_SIGNALS:

62− void updateAvailableStatus();

63− void updateDownloadedChanged();

64− void updateApplyingChanged();

65−

66−private Q_SLOTS:

67− void setUpdateApplying(bool status);

68−

69−private:

70− void resetUpdateStatus();

71− QString formatSize(quint64 size) const;

72−

73−private:

74− bool m_updateAvailable = false;

75− bool m_updateApplying = false;

76− bool m_downloading = false;

77− bool m_downloaded = false;

78− QString m_availableVersion;

79− QString m_updateSize;

80− QString m_lastUpdateDate;

81− QString m_errorReason;

82−};

83−

84−#endif // SYSTEMIMAGE_H

plugins/Ubuntu/SystemImage/plugin.cppdeleted−28

@@ -1,28 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#include "plugin.h"

18−#include "SystemImage.h"

19−

20−#include <QtQml>

21−

22−void BackendPlugin::registerTypes(const char *uri)

23−{

24− Q_ASSERT(uri == QLatin1String("Ubuntu.SystemImage"));

25−

26− qmlRegisterSingletonType<SystemImage>(uri, 0, 1, "SystemImage",

27− [](QQmlEngine*, QJSEngine*) -> QObject* { return new SystemImage; });

28−}

plugins/Ubuntu/SystemImage/plugin.hdeleted−31

@@ -1,31 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#ifndef SYSTEMIMAGE_PLUGIN_H

18−#define SYSTEMIMAGE_PLUGIN_H

19−

20−#include <QQmlExtensionPlugin>

21−

22−class BackendPlugin : public QQmlExtensionPlugin

23−{

24− Q_OBJECT

25− Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)

26−

27−public:

28− void registerTypes(const char *uri) override;

29−};

30−

31−#endif // SYSTEMIMAGE_PLUGIN_H

plugins/Ubuntu/SystemImage/qmldirdeleted−3

@@ -1,3 +0,0 @@

1−module Ubuntu.SystemImage

2−plugin SystemImage

3−typeinfo SystemImage.qmltypes

plugins/Unity/Launcher/launchermodel.cpp+19−16

@@ -207,16 +207,17 @@ void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex

207 }

208 } else if (actionId.startsWith(QStringLiteral("surface_"))){

209 ApplicationInfoInterface *appInfo = m_appManager->findApplication(appId);

210− if (!appInfo) {

210+ if (appInfo) {

211− qWarning() << "App for" << appId << "not found in launcher. Cannot invoke quicklist action";

212− }

213− for (int i = 0; i < appInfo->surfaceList()->count(); ++i) {

211+ for (int i = 0; i < appInfo->surfaceList()->count(); ++i) {

214− MirSurfaceInterface *iface = appInfo->surfaceList()->get(i);

212+ MirSurfaceInterface *iface = appInfo->surfaceList()->get(i);

215− QString id = actionId;

213+ QString id = actionId;

216− id.remove(QRegExp("^surface_"));

214+ id.remove(QRegExp("^surface_"));

217− if (id == iface->persistentId()) {

215+ if (id == iface->persistentId()) {

218− iface->activate();

216+ iface->activate();

217+ }

219 }

218 }

219+ } else {

220+ qWarning() << "App for" << appId << "not found in launcher. Cannot invoke quicklist action";

220 }

221 }

221 // Nope, we don't know this action, let the backend forward it to the application

222 // Nope, we don't know this action, let the backend forward it to the application

222 } else {

223 } else {

@@ -573,14 +574,16 @@ void LauncherModel::updateSurfaceListForApp(ApplicationInfoInterface* app)

573 QList<QPair<QString, QString> > surfaces;

574 QList<QPair<QString, QString> > surfaces;

574 for (int i = 0; i < app->surfaceList()->count(); ++i) {

575 for (int i = 0; i < app->surfaceList()->count(); ++i) {

575 MirSurfaceInterface* iface = app->surfaceList()->get(i);

576 MirSurfaceInterface* iface = app->surfaceList()->get(i);

577+ if (iface->type() == Mir::NormalType || iface->type() == Mir::DialogType) {

576− // Avoid duplicate connections, so let's just disconnect first to be sure

578+ // Avoid duplicate connections, so let's just disconnect first to be sure

577− disconnect(iface, &MirSurfaceInterface::nameChanged, this, &LauncherModel::updateSurfaceListForSurface);

579+ disconnect(iface, &MirSurfaceInterface::nameChanged, this, &LauncherModel::updateSurfaceListForSurface);

578− connect(iface, &MirSurfaceInterface::nameChanged, this, &LauncherModel::updateSurfaceListForSurface);

580+ connect(iface, &MirSurfaceInterface::nameChanged, this, &LauncherModel::updateSurfaceListForSurface);

579− QString name = iface->name();

581+ QString name = iface->name();

580− if (name.isEmpty()) {

582+ if (name.isEmpty()) {

581− name = app->name();

583+ name = app->name();

584+ }

585+ surfaces.append({iface->persistentId(), name});

582 }

586 }

583− surfaces.append({iface->persistentId(), name});

584 }

587 }

585 item->setSurfaces(surfaces);

588 item->setSurfaces(surfaces);

586 Q_EMIT dataChanged(index(idx), index(idx), {RoleSurfaceCount});

589 Q_EMIT dataChanged(index(idx), index(idx), {RoleSurfaceCount});

plugins/Unity/Platform/platform.cpp+16−2

@@ -17,9 +17,11 @@

17#include "platform.h"

18

19#include <QDBusConnection>

20+#include <QSet>

21+#include <QString>

20

22

21Platform::Platform(QObject *parent)

23Platform::Platform(QObject *parent)

22− : QObject(parent)

24+ : QObject(parent), m_isPC(true), m_isMultiSession(true)

23{

25{

24 QMetaObject::invokeMethod(this, "init");

26 QMetaObject::invokeMethod(this, "init");

25}

27}

@@ -31,8 +33,20 @@ void Platform::init()

31 QDBusInterface seatIface("org.freedesktop.login1", "/org/freedesktop/login1/seat/self", "org.freedesktop.login1.Seat",

33 QDBusInterface seatIface("org.freedesktop.login1", "/org/freedesktop/login1/seat/self", "org.freedesktop.login1.Seat",

32 QDBusConnection::systemBus(), this);

34 QDBusConnection::systemBus(), this);

33

35

36+ // From the source at https://cgit.freedesktop.org/systemd/systemd/tree/src/hostname/hostnamed.c#n130

37+ // "vm\0"

38+ // "container\0"

39+ // "desktop\0"

40+ // "laptop\0"

41+ // "server\0"

42+ // "tablet\0"

43+ // "handset\0"

44+ // "watch\0"

45+ // "embedded\0",

34 m_chassis = iface.property("Chassis").toString();

46 m_chassis = iface.property("Chassis").toString();

35− m_isPC = (m_chassis == "desktop" || m_chassis == "laptop" || m_chassis == "server");

47+

48+ // A PC is not a handset, tablet or watch.

49+ m_isPC = !QSet<QString>{"handset", "tablet", "watch"}.contains(m_chassis);

36 m_isMultiSession = seatIface.property("CanMultiSession").toBool() && seatIface.property("CanGraphical").toBool();

50 m_isMultiSession = seatIface.property("CanMultiSession").toBool() && seatIface.property("CanGraphical").toBool();

37}

51}

38

52

plugins/Unity/Session/plugin.cpp+1

@@ -26,6 +26,7 @@

26

27static QObject *dbusunitysessionservice_provider(QQmlEngine */*engine*/, QJSEngine */*jsEngine*/)

28{

29+ new DBusGnomeSessionManagerDialogWrapper();

29 new DBusGnomeSessionManagerWrapper();

30 new DBusGnomeSessionManagerWrapper();

30 new DBusGnomeScreensaverWrapper();

31 new DBusGnomeScreensaverWrapper();

31 new DBusScreensaverWrapper();

32 new DBusScreensaverWrapper();

plugins/Utils/quicklistproxymodel.h+1−1

@@ -48,5 +48,5 @@ Q_SIGNALS:

48

49private:

50 QAbstractItemModel* m_source = nullptr;

51− bool m_privateMode;

51+ bool m_privateMode = false;

52};

plugins/Utils/windowstatestorage.cpp+10−3

@@ -133,8 +133,15 @@ QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defa

133 if (!query.first()) {

134 return defaultValue;

135 }

136+

136− return QRect(query.value(QStringLiteral("x")).toInt(), query.value(QStringLiteral("y")).toInt(),

137+ const QRect result(query.value(QStringLiteral("x")).toInt(), query.value(QStringLiteral("y")).toInt(),

137− query.value(QStringLiteral("width")).toInt(), query.value(QStringLiteral("height")).toInt());

138+ query.value(QStringLiteral("width")).toInt(), query.value(QStringLiteral("height")).toInt());

139+

140+ if (result.isValid()) {

141+ return result;

142+ }

143+

144+ return defaultValue;

138}

145}

139

146

140void WindowStateStorage::initdb()

147void WindowStateStorage::initdb()

@@ -165,7 +172,7 @@ void WindowStateStorage::saveValue(const QString &queryString)

165{

172{

166 QMutexLocker mutexLocker(&s_mutex);

173 QMutexLocker mutexLocker(&s_mutex);

167

174

168− QFuture<void> future = QtConcurrent::run(executeAsyncQuery, queryString);

175+ QFuture<void> future = QtConcurrent::run(&m_threadPool, executeAsyncQuery, queryString);

169 m_asyncQueries.append(future);

176 m_asyncQueries.append(future);

170

177

171 QFutureWatcher<void> *futureWatcher = new QFutureWatcher<void>();

178 QFutureWatcher<void> *futureWatcher = new QFutureWatcher<void>();

plugins/Utils/windowstatestorage.h+2

@@ -18,6 +18,7 @@

18#include <QSqlDatabase>

19#include <QMutex>

20#include <QFuture>

21+#include <QThreadPool>

21

22

22// unity-api

23// unity-api

23#include <unity/shell/application/Mir.h>

24#include <unity/shell/application/Mir.h>

@@ -72,4 +73,5 @@ private:

72 QSqlDatabase m_db;

73 QSqlDatabase m_db;

73

74

74 QList<QFuture<void>> m_asyncQueries;

75 QList<QFuture<void>> m_asyncQueries;

76+ QThreadPool m_threadPool;

75};

77};

plugins/WindowManager/AvailableDesktopArea.cppnew file+50

@@ -0,0 +1,50 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "AvailableDesktopArea.h"

18+

19+#include <QGuiApplication>

20+#include <QQuickWindow>

21+#include <qpa/qplatformnativeinterface.h>

22+

23+AvailableDesktopArea::AvailableDesktopArea(QQuickItem *parent)

24+ : QQuickItem(parent)

25+{

26+ connect(this, &QQuickItem::xChanged, this, &AvailableDesktopArea::updatePlatformWindowProperty);

27+ connect(this, &QQuickItem::yChanged, this, &AvailableDesktopArea::updatePlatformWindowProperty);

28+ connect(this, &QQuickItem::widthChanged, this, &AvailableDesktopArea::updatePlatformWindowProperty);

29+ connect(this, &QQuickItem::heightChanged, this, &AvailableDesktopArea::updatePlatformWindowProperty);

30+}

31+

32+void AvailableDesktopArea::updatePlatformWindowProperty()

33+{

34+ if (!window()) {

35+ return;

36+ }

37+

38+ QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();

39+

40+ QRect rect(x(), y(), width(), height());

41+

42+ nativeInterface->setWindowProperty(window()->handle(), "availableDesktopArea", QVariant(rect));

43+}

44+

45+void AvailableDesktopArea::itemChange(ItemChange change, const ItemChangeData &)

46+{

47+ if (change == ItemSceneChange) {

48+ updatePlatformWindowProperty();

49+ }

50+}

plugins/WindowManager/AvailableDesktopArea.hnew file+38

@@ -0,0 +1,38 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef AVAILABLEDESKTOPAREA_H

18+#define AVAILABLEDESKTOPAREA_H

19+

20+#include <QQuickItem>

21+

22+/**

23+ @brief Used to inform qtmir/miral about the available desktop area of shell

24+

25+ So that qtmir/miral can take correct window management decisions.

26+ */

27+class AvailableDesktopArea : public QQuickItem

28+{

29+ Q_OBJECT

30+public:

31+ AvailableDesktopArea(QQuickItem *parent = nullptr);

32+protected:

33+ void itemChange(ItemChange change, const ItemChangeData &value) override;

34+private Q_SLOTS:

35+ void updatePlatformWindowProperty();

36+};

37+

38+#endif // AVAILABLEDESKTOPAREA_H

plugins/WindowManager/CMakeLists.txt+3

@@ -1,6 +1,7 @@

1include_directories(

2 SYSTEM

3 ${QTMIRSERVER_INCLUDE_DIRS}

4+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

4)

5)

5

6

6include_directories(

7include_directories(

@@ -9,9 +10,11 @@ include_directories(

9)

10)

10

11

11set(WINDOWMANAGER_SRC

12set(WINDOWMANAGER_SRC

13+ AvailableDesktopArea.cpp

12 TopLevelWindowModel.cpp

14 TopLevelWindowModel.cpp

13 Window.cpp

15 Window.cpp

14 WindowManagerPlugin.cpp

16 WindowManagerPlugin.cpp

17+ WindowMargins.cpp

15 Screen.cpp

18 Screen.cpp

16 ScreenAttached.cpp

19 ScreenAttached.cpp

17 Screens.cpp

20 Screens.cpp

plugins/WindowManager/Screen.cpp+6

@@ -46,6 +46,12 @@ void Screen::connectToScreen(Screen *screen)

46 connect(screen, &Screen::currentWorkspaceChanged, this, &Screen::currentWorkspaceChanged);

47}

48

49+void Screen::setCurrentWorkspace2(Workspace *workspace)

50+{

51+ // Make sure we use the correct concrete class. Don't want to use a Proxy.

52+ workspace->setCurrentOn(this);

53+}

54+

49qtmir::OutputId Screen::outputId() const

55qtmir::OutputId Screen::outputId() const

50{

56{

51 if (!m_wrapped) return qtmir::OutputId(-1);

57 if (!m_wrapped) return qtmir::OutputId(-1);

plugins/WindowManager/Screen.h+4−1

@@ -28,7 +28,7 @@ class Screen: public QObject

28 Q_PROPERTY(QSizeF physicalSize READ physicalSize NOTIFY physicalSizeChanged)

29 Q_PROPERTY(QString outputTypeName READ outputTypeName NOTIFY outputTypeChanged)

30 Q_PROPERTY(WorkspaceModel* workspaces READ workspaces CONSTANT)

31− Q_PROPERTY(Workspace* currentWorkspace READ currentWorkspace WRITE setCurrentWorkspace NOTIFY currentWorkspaceChanged)

31+ Q_PROPERTY(Workspace* currentWorkspace READ currentWorkspace WRITE setCurrentWorkspace2 NOTIFY currentWorkspaceChanged)

32public:

33 // From qtmir::Screen

34 qtmir::OutputId outputId() const;

@@ -84,6 +84,9 @@ protected:

84 void connectToScreen(qtmir::Screen* screen);

85 void connectToScreen(Screen* screen);

86

87+private:

88+ void setCurrentWorkspace2(Workspace* workspace);

89+

87protected:

90protected:

88 QPointer<qtmir::Screen> m_wrapped;

91 QPointer<qtmir::Screen> m_wrapped;

89};

92};

plugins/WindowManager/WindowManagerPlugin.cpp+5−1

@@ -1,5 +1,5 @@

1/*

3 *

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

@@ -16,6 +16,7 @@

16

17#include "WindowManagerPlugin.h"

18

19+#include "AvailableDesktopArea.h"

19#include "Screen.h"

20#include "Screen.h"

20#include "ScreenAttached.h"

21#include "ScreenAttached.h"

21#include "Screens.h"

22#include "Screens.h"

@@ -24,6 +25,7 @@

24#include "TopLevelWindowModel.h"

25#include "TopLevelWindowModel.h"

25#include "Window.h"

26#include "Window.h"

26#include "WindowManagerObjects.h"

27#include "WindowManagerObjects.h"

28+#include "WindowMargins.h"

27#include "WorkspaceManager.h"

29#include "WorkspaceManager.h"

28#include "Workspace.h"

30#include "Workspace.h"

29#include "WorkspaceModel.h"

31#include "WorkspaceModel.h"

@@ -56,6 +58,8 @@ QObject* objectsSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {

56

58

57void WindowManagerPlugin::registerTypes(const char *uri)

59void WindowManagerPlugin::registerTypes(const char *uri)

58{

60{

61+ qmlRegisterType<AvailableDesktopArea>(uri, 1, 0, "AvailableDesktopArea");

62+ qmlRegisterType<WindowMargins>(uri, 1, 0, "WindowMargins");

59 qmlRegisterSingletonType<WorkspaceManager>(uri, 1, 0, "WorkspaceManager", workspace_manager);

63 qmlRegisterSingletonType<WorkspaceManager>(uri, 1, 0, "WorkspaceManager", workspace_manager);

60 qmlRegisterUncreatableType<WorkspaceModel>(uri, 1, 0, "WorkspaceModel", notInstantiatable);

64 qmlRegisterUncreatableType<WorkspaceModel>(uri, 1, 0, "WorkspaceModel", notInstantiatable);

61 qmlRegisterSingletonType<ConcreteScreens>(uri, 1, 0, "Screens", screensSingleton);

65 qmlRegisterSingletonType<ConcreteScreens>(uri, 1, 0, "Screens", screensSingleton);

plugins/WindowManager/WindowMargins.cppnew file+74

@@ -0,0 +1,74 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "WindowMargins.h"

18+

19+#include <QGuiApplication>

20+#include <QQuickWindow>

21+#include <qpa/qplatformnativeinterface.h>

22+

23+void WindowMargins::setNormal(QRectF value)

24+{

25+ if (m_normal == value) {

26+ return;

27+ }

28+

29+ m_normal = value;

30+

31+ if (window()) {

32+ QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();

33+ nativeInterface->setWindowProperty(window()->handle(), "normalWindowMargins", QVariant(m_normal.toRect()));

34+ }

35+

36+ Q_EMIT normalChanged();

37+}

38+

39+QRectF WindowMargins::normal() const

40+{

41+ return m_normal;

42+}

43+

44+void WindowMargins::setDialog(QRectF value)

45+{

46+ if (m_dialog == value) {

47+ return;

48+ }

49+

50+ m_dialog = value;

51+

52+ if (window()) {

53+ QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();

54+ nativeInterface->setWindowProperty(window()->handle(), "dialogWindowMargins", QVariant(m_dialog.toRect()));

55+ }

56+

57+ Q_EMIT dialogChanged();

58+}

59+

60+QRectF WindowMargins::dialog() const

61+{

62+ return m_dialog;

63+}

64+

65+void WindowMargins::itemChange(ItemChange change, const ItemChangeData &data)

66+{

67+ if (change == ItemSceneChange && data.window != nullptr) {

68+ QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();

69+ if (!m_normal.isNull()) {

70+ nativeInterface->setWindowProperty(data.window->handle(), "normalWindowMargins", QVariant(m_normal.toRect()));

71+ nativeInterface->setWindowProperty(data.window->handle(), "dialogWindowMargins", QVariant(m_dialog.toRect()));

72+ }

73+ }

74+}

plugins/WindowManager/WindowMargins.hnew file+59

@@ -0,0 +1,59 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef WINDOWMARGINS_H

18+#define WINDOWMARGINS_H

19+

20+#include <QQuickItem>

21+#include <QRectF>

22+

23+/*

24+ * Specifies window margins for different Mir window types

25+ *

26+ * Used to inform MirAL so that it can take window management decisions that match

27+ * the visuals drawn by Unity.

28+ */

29+class WindowMargins : public QQuickItem

30+{

31+ Q_OBJECT

32+

33+ // Margins for windows of normal type

34+ Q_PROPERTY(QRectF normal READ normal WRITE setNormal NOTIFY normalChanged)

35+

36+ // Margins for windows of dialog type

37+ Q_PROPERTY(QRectF dialog READ dialog WRITE setDialog NOTIFY dialogChanged)

38+

39+ // TODO: Add margins for other window types as needed

40+

41+public:

42+ QRectF normal() const;

43+ void setNormal(QRectF value);

44+

45+ QRectF dialog() const;

46+ void setDialog(QRectF value);

47+

48+protected:

49+ void itemChange(ItemChange change, const ItemChangeData &value) override;

50+

51+Q_SIGNALS:

52+ void normalChanged();

53+ void dialogChanged();

54+private:

55+ QRectF m_normal;

56+ QRectF m_dialog;

57+};

58+

59+#endif // WINDOWMARGINS_H

plugins/WindowManager/Workspace.cpp+21

@@ -18,6 +18,7 @@

18#include "WorkspaceModel.h"

19#include "WorkspaceManager.h"

20#include "TopLevelWindowModel.h"

21+#include "Screen.h"

21

22

22#include "wmpolicyinterface.h"

23#include "wmpolicyinterface.h"

23

24

@@ -86,6 +87,12 @@ bool Workspace::isAssigned() const

86 return m_model != nullptr;

87 return m_model != nullptr;

87}

88}

88

89

90+bool Workspace::isSameAs(Workspace *wks) const

91+{

92+ if (wks == this) return true;

93+ return wks->workspace() == workspace();

94+}

95+

89

96

90ConcreteWorkspace::ConcreteWorkspace(QObject *parent)

97ConcreteWorkspace::ConcreteWorkspace(QObject *parent)

91 : Workspace(parent)

98 : Workspace(parent)

@@ -121,6 +128,13 @@ void ConcreteWorkspace::activate()

121 WorkspaceManager::instance()->setActiveWorkspace(this);

128 WorkspaceManager::instance()->setActiveWorkspace(this);

122}

129}

123

130

131+void ConcreteWorkspace::setCurrentOn(Screen *screen)

132+{

133+ if (screen) {

134+ screen->setCurrentWorkspace(this);

135+ }

136+}

137+

124

138

125ProxyWorkspace::ProxyWorkspace(Workspace * const workspace)

139ProxyWorkspace::ProxyWorkspace(Workspace * const workspace)

126 : Workspace(*workspace)

140 : Workspace(*workspace)

@@ -154,3 +168,10 @@ void ProxyWorkspace::activate()

154 m_original->activate();

168 m_original->activate();

155 }

169 }

156}

170}

171+

172+void ProxyWorkspace::setCurrentOn(Screen *screen)

173+{

174+ if (screen && m_original) {

175+ screen->setCurrentWorkspace(m_original);

176+ }

177+}

plugins/WindowManager/Workspace.h+5

@@ -29,6 +29,7 @@

29

30class WorkspaceModel;

31class TopLevelWindowModel;

32+class Screen;

32

33

33namespace miral { class Workspace; }

34namespace miral { class Workspace; }

34

35

@@ -53,9 +54,11 @@ public:

53

54

54 virtual bool isActive() const = 0;

55 virtual bool isActive() const = 0;

55 virtual TopLevelWindowModel *windowModel() const = 0;

56 virtual TopLevelWindowModel *windowModel() const = 0;

57+ virtual void setCurrentOn(Screen*) = 0;

56

58

57 std::shared_ptr<miral::Workspace> workspace() const { return m_workspace; }

59 std::shared_ptr<miral::Workspace> workspace() const { return m_workspace; }

58 bool isAssigned() const;

60 bool isAssigned() const;

61+ Q_INVOKABLE bool isSameAs(Workspace*) const;

59

62

60public Q_SLOTS:

63public Q_SLOTS:

61 virtual void activate() = 0;

64 virtual void activate() = 0;

@@ -82,6 +85,7 @@ public:

82 bool isActive() const override { return m_active; }

85 bool isActive() const override { return m_active; }

83 TopLevelWindowModel *windowModel() const override;

86 TopLevelWindowModel *windowModel() const override;

84 void activate() override;

87 void activate() override;

88+ void setCurrentOn(Screen*) override;

85

89

86private:

90private:

87 explicit ConcreteWorkspace(QObject *parent = nullptr);

91 explicit ConcreteWorkspace(QObject *parent = nullptr);

@@ -104,6 +108,7 @@ public:

104 bool isActive() const override;

108 bool isActive() const override;

105 TopLevelWindowModel *windowModel() const override;

109 TopLevelWindowModel *windowModel() const override;

106 void activate() override;

110 void activate() override;

111+ void setCurrentOn(Screen*) override;

107

112

108 Workspace* proxyObject() const { return m_original.data(); }

113 Workspace* proxyObject() const { return m_original.data(); }

109

114

po/unity8.pot+54−76

@@ -8,7 +8,7 @@ msgid ""

8msgstr ""

9"Project-Id-Version: unity8\n"

10"Report-Msgid-Bugs-To: \n"

11−"POT-Creation-Date: 2017-03-21 10:58+0000\n"

11+"POT-Creation-Date: 2017-03-28 21:50+0000\n"

12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14"Language-Team: LANGUAGE <LL@li.org>\n"

@@ -83,7 +83,7 @@ msgid "Log Out"

83msgstr ""

84

85#: qml/Components/Dialogs.qml:199 qml/Components/Dialogs.qml:264

86−#: qml/Dash/DashPageHeader.qml:324 qml/Greeter/NarrowView.qml:222

86+#: qml/Dash/DashPageHeader.qml:324 qml/Greeter/NarrowView.qml:208

87#: qml/Wizard/Pages/passcode-confirm.qml:32

88#: qml/Wizard/Pages/passcode-set.qml:32

89msgid "Cancel"

@@ -167,135 +167,143 @@ msgstr ""

167msgid "Switches to previous keyboard layout."

168msgstr ""

169

170−#: qml/Components/KeyboardShortcutsOverlay.qml:118

170+#: qml/Components/KeyboardShortcutsOverlay.qml:114

171+msgid "Ctrl + Alt + T"

172+msgstr ""

173+

174+#: qml/Components/KeyboardShortcutsOverlay.qml:119

175+msgid "Starts the Terminal application."

176+msgstr ""

177+

178+#: qml/Components/KeyboardShortcutsOverlay.qml:131

171msgid "Launcher"

179msgid "Launcher"

172msgstr ""

180msgstr ""

173

181

174−#: qml/Components/KeyboardShortcutsOverlay.qml:125

182+#: qml/Components/KeyboardShortcutsOverlay.qml:138

175msgid "Super (Hold)"

183msgid "Super (Hold)"

176msgstr ""

184msgstr ""

177

185

178−#: qml/Components/KeyboardShortcutsOverlay.qml:130

186+#: qml/Components/KeyboardShortcutsOverlay.qml:143

179msgid "Opens the launcher, displays shortcuts."

187msgid "Opens the launcher, displays shortcuts."

180msgstr ""

188msgstr ""

181

189

182−#: qml/Components/KeyboardShortcutsOverlay.qml:138

190+#: qml/Components/KeyboardShortcutsOverlay.qml:151

183msgid "Alt + F1"

191msgid "Alt + F1"

184msgstr ""

192msgstr ""

185

193

186−#: qml/Components/KeyboardShortcutsOverlay.qml:143

194+#: qml/Components/KeyboardShortcutsOverlay.qml:156

187msgid "Opens launcher keyboard navigation mode."

195msgid "Opens launcher keyboard navigation mode."

188msgstr ""

196msgstr ""

189

197

190−#: qml/Components/KeyboardShortcutsOverlay.qml:151

198+#: qml/Components/KeyboardShortcutsOverlay.qml:164

191msgid "Super + Tab"

199msgid "Super + Tab"

192msgstr ""

200msgstr ""

193

201

194−#: qml/Components/KeyboardShortcutsOverlay.qml:156

202+#: qml/Components/KeyboardShortcutsOverlay.qml:169

195msgid "Switches applications via the launcher."

203msgid "Switches applications via the launcher."

196msgstr ""

204msgstr ""

197

205

198−#: qml/Components/KeyboardShortcutsOverlay.qml:164

206+#: qml/Components/KeyboardShortcutsOverlay.qml:177

199msgid "Super + 1 to 0"

207msgid "Super + 1 to 0"

200msgstr ""

208msgstr ""

201

209

202−#: qml/Components/KeyboardShortcutsOverlay.qml:169

210+#: qml/Components/KeyboardShortcutsOverlay.qml:182

203msgid "Same as clicking on a launcher icon."

211msgid "Same as clicking on a launcher icon."

204msgstr ""

212msgstr ""

205

213

206−#: qml/Components/KeyboardShortcutsOverlay.qml:177

214+#: qml/Components/KeyboardShortcutsOverlay.qml:190

207msgid "Super + A"

215msgid "Super + A"

208msgstr ""

216msgstr ""

209

217

210−#: qml/Components/KeyboardShortcutsOverlay.qml:182

218+#: qml/Components/KeyboardShortcutsOverlay.qml:195

211msgid "Opens the Application Drawer."

219msgid "Opens the Application Drawer."

212msgstr ""

220msgstr ""

213

221

214−#: qml/Components/KeyboardShortcutsOverlay.qml:194

222+#: qml/Components/KeyboardShortcutsOverlay.qml:207

215msgid "Scopes"

223msgid "Scopes"

216msgstr ""

224msgstr ""

217

225

218−#: qml/Components/KeyboardShortcutsOverlay.qml:201

226+#: qml/Components/KeyboardShortcutsOverlay.qml:214

219msgid "Super (Tap)"

227msgid "Super (Tap)"

220msgstr ""

228msgstr ""

221

229

222−#: qml/Components/KeyboardShortcutsOverlay.qml:206

230+#: qml/Components/KeyboardShortcutsOverlay.qml:219

223msgid "Opens the Scopes home."

231msgid "Opens the Scopes home."

224msgstr ""

232msgstr ""

225

233

226−#: qml/Components/KeyboardShortcutsOverlay.qml:222

234+#: qml/Components/KeyboardShortcutsOverlay.qml:235

227msgid "Switching"

235msgid "Switching"

228msgstr ""

236msgstr ""

229

237

230−#: qml/Components/KeyboardShortcutsOverlay.qml:229

238+#: qml/Components/KeyboardShortcutsOverlay.qml:242

231msgid "Alt + Tab"

239msgid "Alt + Tab"

232msgstr ""

240msgstr ""

233

241

234−#: qml/Components/KeyboardShortcutsOverlay.qml:234

242+#: qml/Components/KeyboardShortcutsOverlay.qml:247

235msgid "Switches between applications."

243msgid "Switches between applications."

236msgstr ""

244msgstr ""

237

245

238−#: qml/Components/KeyboardShortcutsOverlay.qml:242

246+#: qml/Components/KeyboardShortcutsOverlay.qml:255

239msgid "Super + W"

247msgid "Super + W"

240msgstr ""

248msgstr ""

241

249

242−#: qml/Components/KeyboardShortcutsOverlay.qml:247

250+#: qml/Components/KeyboardShortcutsOverlay.qml:260

243msgid "Opens the desktop spread."

251msgid "Opens the desktop spread."

244msgstr ""

252msgstr ""

245

253

246−#: qml/Components/KeyboardShortcutsOverlay.qml:255

254+#: qml/Components/KeyboardShortcutsOverlay.qml:268

247msgid "Cursor Left or Right"

255msgid "Cursor Left or Right"

248msgstr ""

256msgstr ""

249

257

250−#: qml/Components/KeyboardShortcutsOverlay.qml:260

258+#: qml/Components/KeyboardShortcutsOverlay.qml:273

251msgid "Moves the focus."

259msgid "Moves the focus."

252msgstr ""

260msgstr ""

253

261

254−#: qml/Components/KeyboardShortcutsOverlay.qml:272

262+#: qml/Components/KeyboardShortcutsOverlay.qml:285

255msgid "Windows"

263msgid "Windows"

256msgstr ""

264msgstr ""

257

265

258−#: qml/Components/KeyboardShortcutsOverlay.qml:279

266+#: qml/Components/KeyboardShortcutsOverlay.qml:292

259msgid "Ctrl + Super + D"

267msgid "Ctrl + Super + D"

260msgstr ""

268msgstr ""

261

269

262−#: qml/Components/KeyboardShortcutsOverlay.qml:284

270+#: qml/Components/KeyboardShortcutsOverlay.qml:297

263msgid "Minimizes all windows."

271msgid "Minimizes all windows."

264msgstr ""

272msgstr ""

265

273

266−#: qml/Components/KeyboardShortcutsOverlay.qml:292

274+#: qml/Components/KeyboardShortcutsOverlay.qml:305

267msgid "Ctrl + Super + Up"

275msgid "Ctrl + Super + Up"

268msgstr ""

276msgstr ""

269

277

270−#: qml/Components/KeyboardShortcutsOverlay.qml:297

278+#: qml/Components/KeyboardShortcutsOverlay.qml:310

271msgid "Maximizes the current window."

279msgid "Maximizes the current window."

272msgstr ""

280msgstr ""

273

281

274−#: qml/Components/KeyboardShortcutsOverlay.qml:305

282+#: qml/Components/KeyboardShortcutsOverlay.qml:318

275msgid "Ctrl + Super + Down"

283msgid "Ctrl + Super + Down"

276msgstr ""

284msgstr ""

277

285

278−#: qml/Components/KeyboardShortcutsOverlay.qml:310

286+#: qml/Components/KeyboardShortcutsOverlay.qml:323

279msgid "Minimizes or restores the current window."

287msgid "Minimizes or restores the current window."

280msgstr ""

288msgstr ""

281

289

282−#: qml/Components/KeyboardShortcutsOverlay.qml:318

290+#: qml/Components/KeyboardShortcutsOverlay.qml:331

283msgid "Ctrl + Super + Left or Right"

291msgid "Ctrl + Super + Left or Right"

284msgstr ""

292msgstr ""

285

293

286−#: qml/Components/KeyboardShortcutsOverlay.qml:323

294+#: qml/Components/KeyboardShortcutsOverlay.qml:336

287msgid "Semi-maximizes the current window."

295msgid "Semi-maximizes the current window."

288msgstr ""

296msgstr ""

289

297

290−#: qml/Components/KeyboardShortcutsOverlay.qml:331

298+#: qml/Components/KeyboardShortcutsOverlay.qml:344

291msgid "Alt + F4"

299msgid "Alt + F4"

292msgstr ""

300msgstr ""

293

301

294−#: qml/Components/KeyboardShortcutsOverlay.qml:336

302+#: qml/Components/KeyboardShortcutsOverlay.qml:349

295msgid "Closes the current window."

303msgid "Closes the current window."

296msgstr ""

304msgstr ""

297

305

298−#: qml/Components/Lockscreen.qml:212 qml/Greeter/NarrowView.qml:242

306+#: qml/Components/Lockscreen.qml:212 qml/Greeter/NarrowView.qml:228

299msgid "Return to Call"

307msgid "Return to Call"

300msgstr ""

308msgstr ""

301

309

@@ -489,19 +497,19 @@ msgid_plural "Please wait %1 minutes and then try again…"

489msgstr[0] ""

497msgstr[0] ""

490msgstr[1] ""

498msgstr[1] ""

491

499

492−#: qml/Greeter/Greeter.qml:561

500+#: qml/Greeter/Greeter.qml:550

493msgid "Try again"

501msgid "Try again"

494msgstr ""

502msgstr ""

495

503

496−#: qml/Greeter/Greeter.qml:562

504+#: qml/Greeter/Greeter.qml:551

497msgid "Enter passphrase to unlock"

505msgid "Enter passphrase to unlock"

498msgstr ""

506msgstr ""

499

507

500−#: qml/Greeter/Greeter.qml:563

508+#: qml/Greeter/Greeter.qml:552

501msgid "Enter passcode to unlock"

509msgid "Enter passcode to unlock"

502msgstr ""

510msgstr ""

503

511

504−#: qml/Greeter/NarrowView.qml:242

512+#: qml/Greeter/NarrowView.qml:228

505msgid "Emergency"

513msgid "Emergency"

506msgstr ""

514msgstr ""

507

515

@@ -655,7 +663,7 @@ msgid "Language"

655msgstr ""

663msgstr ""

656

664

657#: qml/Wizard/Pages/10-welcome.qml:173 qml/Wizard/Pages/20-keyboard.qml:152

665#: qml/Wizard/Pages/10-welcome.qml:173 qml/Wizard/Pages/20-keyboard.qml:152

658−#: qml/Wizard/Pages/30-wifi.qml:207 qml/Wizard/Pages/40-location.qml:271

666+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/40-location.qml:271

659#: qml/Wizard/Pages/50-timezone.qml:271 qml/Wizard/Pages/60-account.qml:65

667#: qml/Wizard/Pages/50-timezone.qml:271 qml/Wizard/Pages/60-account.qml:65

660#: qml/Wizard/Pages/70-passwd-type.qml:145

668#: qml/Wizard/Pages/70-passwd-type.qml:145

661#: qml/Wizard/Pages/75-report-check.qml:84

669#: qml/Wizard/Pages/75-report-check.qml:84

@@ -676,25 +684,24 @@ msgstr ""

676msgid "Keyboard layout"

684msgid "Keyboard layout"

677msgstr ""

685msgstr ""

678

686

679−#: qml/Wizard/Pages/20-keyboard.qml:152 qml/Wizard/Pages/30-wifi.qml:207

687+#: qml/Wizard/Pages/20-keyboard.qml:152 qml/Wizard/Pages/30-wifi.qml:206

680−#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/77-system-update.qml:152

688+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/sim.qml:101

681−#: qml/Wizard/Pages/sim.qml:101

682msgid "Skip"

689msgid "Skip"

683msgstr ""

690msgstr ""

684

691

685−#: qml/Wizard/Pages/30-wifi.qml:31

692+#: qml/Wizard/Pages/30-wifi.qml:30

686msgid "Connect to Wi‑Fi"

693msgid "Connect to Wi‑Fi"

687msgstr ""

694msgstr ""

688

695

689−#: qml/Wizard/Pages/30-wifi.qml:132

696+#: qml/Wizard/Pages/30-wifi.qml:131

690msgid "Connected"

697msgid "Connected"

691msgstr ""

698msgstr ""

692

699

693−#: qml/Wizard/Pages/30-wifi.qml:165

700+#: qml/Wizard/Pages/30-wifi.qml:164

694msgid "Available Wi-Fi networks"

701msgid "Available Wi-Fi networks"

695msgstr ""

702msgstr ""

696

703

697−#: qml/Wizard/Pages/30-wifi.qml:166

704+#: qml/Wizard/Pages/30-wifi.qml:165

698msgid "No available Wi-Fi networks"

705msgid "No available Wi-Fi networks"

699msgstr ""

706msgstr ""

700

707

@@ -781,35 +788,6 @@ msgstr ""

781msgid "Privacy policy"

788msgid "Privacy policy"

782msgstr ""

789msgstr ""

783

790

784−#: qml/Wizard/Pages/77-system-update.qml:28

785−msgid "Update Device"

786−msgstr ""

787−

788−#: qml/Wizard/Pages/77-system-update.qml:55

789−msgid ""

790−"There is a system update available and ready to install. Afterwards, the "

791−"device will automatically restart."

792−msgstr ""

793−

794−#: qml/Wizard/Pages/77-system-update.qml:76

795−msgctxt "string identifying name of the update"

796−msgid "Ubuntu system"

797−msgstr ""

798−

799−#: qml/Wizard/Pages/77-system-update.qml:83

800−#, qt-format

801−msgctxt "version of the system update"

802−msgid "Version %1"

803−msgstr ""

804−

805−#: qml/Wizard/Pages/77-system-update.qml:102

806−msgid "This could take a few minutes..."

807−msgstr ""

808−

809−#: qml/Wizard/Pages/77-system-update.qml:116

810−msgid "Install and restart now"

811−msgstr ""

812−

813#: qml/Wizard/Pages/80-finished.qml:89

791#: qml/Wizard/Pages/80-finished.qml:89

814msgid "Welcome to Ubuntu"

792msgid "Welcome to Ubuntu"

815msgstr ""

793msgstr ""

qml/ApplicationMenus/MenuBar.qml+22−6

@@ -1,5 +1,5 @@

1/*

3 *

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU Lesser General Public License as published by

@@ -92,7 +92,7 @@ Item {

92

93 Row {

94 id: row

95− spacing: units.gu(2)

95+ spacing: 0

96 height: parent.height

97

98 ActionContext {

@@ -129,7 +129,11 @@ Item {

129 readonly property bool shouldDisplay: x + width + ((__ownIndex < rowRepeater.count-1) ? units.gu(2) : 0) <

130 root.overflowWidth - ((__ownIndex < rowRepeater.count-1) ? overflowButton.width : 0)

131

132+ // First item is not centered, it has 0 gu on the left and 1 on the right

133+ // so needs different width and anchors

134+ readonly property bool isFirstItem: __ownIndex == 0

135+

132− implicitWidth: column.implicitWidth

136+ implicitWidth: column.implicitWidth + (isFirstItem ? units.gu(1) : units.gu(2))

133 implicitHeight: row.height

137 implicitHeight: row.height

134 enabled: (model.sensitive === true) && shouldDisplay

138 enabled: (model.sensitive === true) && shouldDisplay

135 opacity: shouldDisplay ? 1 : 0

139 opacity: shouldDisplay ? 1 : 0

@@ -193,7 +197,9 @@ Item {

193 id: column

197 id: column

194 spacing: units.gu(1)

198 spacing: units.gu(1)

195 anchors {

199 anchors {

196− centerIn: parent

200+ verticalCenter: parent.verticalCenter

201+ horizontalCenter: !visualItem.isFirstItem ? parent.horizontalCenter : undefined

202+ left: visualItem.isFirstItem ? parent.left : undefined

197 }

203 }

198

204

199 Icon {

205 Icon {

@@ -228,6 +234,13 @@ Item {

228 }

234 }

229 }

235 }

230 }

236 }

237+

238+ Component.onDestruction: {

239+ if (__popup) {

240+ __popup.destroy();

241+ __popup = null;

242+ }

243+ }

231 } // Item ( delegate )

244 } // Item ( delegate )

232 } // Repeater

245 } // Repeater

233 } // Row

246 } // Row

@@ -374,6 +387,9 @@ Item {

374 function activate(index) {

387 function activate(index) {

375 return sourceModel.activate(mapRowToSource(index));

388 return sourceModel.activate(mapRowToSource(index));

376 }

389 }

390+ function aboutToShow(index) {

391+ return sourceModel.aboutToShow(mapRowToSource(index));

392+ }

377 }

393 }

378

394

379 Connections {

395 Connections {

@@ -389,8 +405,8 @@ Item {

389 anchors {

405 anchors {

390 bottom: row.bottom

406 bottom: row.bottom

391 }

407 }

392− x: d.currentItem ? row.x + d.currentItem.x - units.gu(1) : 0

408+ x: d.currentItem ? row.x + d.currentItem.x : 0

393− width: d.currentItem ? d.currentItem.width + units.gu(2) : 0

409+ width: d.currentItem ? d.currentItem.width : 0

394 height: units.dp(4)

410 height: units.dp(4)

395 color: UbuntuColors.orange

411 color: UbuntuColors.orange

396 visible: d.currentItem

412 visible: d.currentItem

qml/ApplicationMenus/MenuPopup.qml+10−1

@@ -298,6 +298,8 @@ UbuntuShape {

298

299 width: MathUtils.clamp(implicitWidth, d.__minimumWidth, d.__maximumWidth)

300

301+ property Item popup: null

302+

301 action.onTriggered: {

303 action.onTriggered: {

302 submenuHoverTimer.stop();

304 submenuHoverTimer.stop();

303

305

@@ -352,6 +354,13 @@ UbuntuShape {

352 }

354 }

353 }

355 }

354 }

356 }

357+

358+ Component.onDestruction: {

359+ if (popup) {

360+ popup.destroy();

361+ popup = null;

362+ }

363+ }

355 }

364 }

356 }

365 }

357

366

@@ -374,7 +383,7 @@ UbuntuShape {

374 id: loader

383 id: loader

375 objectName: root.objectName + "-item" + __ownIndex

384 objectName: root.objectName + "-item" + __ownIndex

376

385

377− property Item popup: null

386+ readonly property var popup: item ? item.popup : null

378 property var __menuData: model

387 property var __menuData: model

379 property int __ownIndex: index

388 property int __ownIndex: index

380 property bool __isSeparator: model.isSeparator

389 property bool __isSeparator: model.isSeparator

qml/Components/KeyboardShortcutsOverlay.qml+13

@@ -110,6 +110,19 @@ Rectangle {

110 Layout.maximumWidth: maxTextSize

111 }

112

113+ Label {

114+ text: i18n.tr("Ctrl + Alt + T")

115+ fontSize: "small"

116+ font.weight: Font.Medium

117+ }

118+ Label {

119+ text: i18n.tr("Starts the Terminal application.")

120+ fontSize: "small"

121+ font.weight: Font.Light

122+ wrapMode: Text.Wrap

123+ Layout.maximumWidth: maxTextSize

124+ }

125+

113

126

114 // Launcher section

127 // Launcher section

115 Item { Layout.columnSpan: 2; height: units.gu(2) }

128 Item { Layout.columnSpan: 2; height: units.gu(2) }

qml/Greeter/Greeter.qml−11

@@ -20,7 +20,6 @@ import Biometryd 0.0

20import GSettings 1.0

21import Powerd 0.1

22import Ubuntu.Components 1.3

23−import Ubuntu.SystemImage 0.1

24import Unity.Launcher 0.1

23import Unity.Launcher 0.1

25import Unity.Session 0.1

24import Unity.Session 0.1

26

25

@@ -57,7 +56,6 @@ Showable {

57 property bool tabletMode

56 property bool tabletMode

58 property url viewSource // only used for testing

57 property url viewSource // only used for testing

59

58

60− property int maxFailedLogins: -1 // disabled by default for now, will enable via settings in future

61 property int failedLoginsDelayAttempts: 7 // number of failed logins

59 property int failedLoginsDelayAttempts: 7 // number of failed logins

62 property real failedLoginsDelayMinutes: 5 // minutes of forced waiting

60 property real failedLoginsDelayMinutes: 5 // minutes of forced waiting

63 property int failedFingerprintLoginsDisableAttempts: 3 // number of failed fingerprint logins

61 property int failedFingerprintLoginsDisableAttempts: 3 // number of failed fingerprint logins

@@ -470,15 +468,6 @@ Showable {

470 if (!automatic) {

468 if (!automatic) {

471 AccountsService.failedLogins++;

469 AccountsService.failedLogins++;

472

470

473− // Check if we should initiate a factory reset

474− if (maxFailedLogins >= 2) { // require at least a warning

475− if (AccountsService.failedLogins === maxFailedLogins - 1) {

476− loader.item.showLastChance();

477− } else if (AccountsService.failedLogins >= maxFailedLogins) {

478− SystemImage.factoryReset(); // Ouch!

479− }

480− }

481−

482 // Check if we should initiate a forced login delay

471 // Check if we should initiate a forced login delay

483 if (failedLoginsDelayAttempts > 0

472 if (failedLoginsDelayAttempts > 0

484 && AccountsService.failedLogins > 0

473 && AccountsService.failedLogins > 0

qml/Greeter/NarrowView.qml−14

@@ -48,20 +48,6 @@ FocusScope {

48 signal tease()

49 signal emergencyCall()

50

51− function showLastChance() {

52− /* TODO: when we finish support for resetting device after too many

53− failed logins, we should re-add this popup.

54− var title = lockscreen.alphaNumeric ?

55− i18n.tr("Sorry, incorrect passphrase.") :

56− i18n.tr("Sorry, incorrect passcode.");

57− var text = i18n.tr("This will be your last attempt.") + " " +

58− (lockscreen.alphaNumeric ?

59− i18n.tr("If passphrase is entered incorrectly, your phone will conduct a factory reset and all personal data will be deleted.") :

60− i18n.tr("If passcode is entered incorrectly, your phone will conduct a factory reset and all personal data will be deleted."));

61− lockscreen.showInfoPopup(title, text);

62− */

63− }

64−

65 function hide() {

51 function hide() {

66 lockscreen.hide();

52 lockscreen.hide();

67 coverPage.hide();

53 coverPage.hide();

qml/Greeter/WideView.qml−4

@@ -80,10 +80,6 @@ FocusScope {

80 loginList.showFakePassword();

81 }

82

83− function showLastChance() {

84− // TODO

85− }

86−

87 Rectangle {

83 Rectangle {

88 anchors.fill: parent

84 anchors.fill: parent

89 color: "black"

85 color: "black"

qml/Launcher/Drawer.qml−2

@@ -364,8 +364,6 @@ FocusScope {

364 width: units.gu(6)

365 height: 7.5 / 8 * width

366 anchors.horizontalCenter: parent.horizontalCenter

367− backgroundMode: UbuntuShape.SolidColor

368− backgroundColor: UbuntuColors.lightGrey

369 radius: "medium"

367 radius: "medium"

370 borderSource: 'undefined'

368 borderSource: 'undefined'

371 source: Image {

369 source: Image {

qml/Launcher/LauncherPanel.qml+24−6

@@ -751,16 +751,18 @@ Rectangle {

751 Keys.onPressed: {

752 switch (event.key) {

753 case Qt.Key_Down:

754− selectedIndex++;

754+ var prevIndex = selectedIndex;

755− if (selectedIndex >= popoverRepeater.count) {

755+ selectedIndex = (selectedIndex + 1 < popoverRepeater.count) ? selectedIndex + 1 : 0;

756− selectedIndex = 0;

756+ while (!popoverRepeater.itemAt(selectedIndex).clickable && selectedIndex != prevIndex) {

757+ selectedIndex = (selectedIndex + 1 < popoverRepeater.count) ? selectedIndex + 1 : 0;

757 }

758 }

758 event.accepted = true;

759 event.accepted = true;

759 break;

760 break;

760 case Qt.Key_Up:

761 case Qt.Key_Up:

761− selectedIndex--;

762+ var prevIndex = selectedIndex;

762− if (selectedIndex < 0) {

763+ selectedIndex = (selectedIndex > 0) ? selectedIndex - 1 : popoverRepeater.count - 1;

764+ while (!popoverRepeater.itemAt(selectedIndex).clickable && selectedIndex != prevIndex) {

763− selectedIndex = popoverRepeater.count - 1;

765+ selectedIndex = (selectedIndex > 0) ? selectedIndex - 1 : popoverRepeater.count - 1;

764 }

766 }

765 event.accepted = true;

767 event.accepted = true;

766 break;

768 break;

@@ -806,6 +808,19 @@ Rectangle {

806 width: parent.width

808 width: parent.width

807 height: quickListColumn.height

809 height: quickListColumn.height

808

810

811+ MouseArea {

812+ anchors.fill: parent

813+ hoverEnabled: true

814+ onPositionChanged: {

815+ var item = quickListColumn.childAt(mouseX, mouseY);

816+ if (item.clickable) {

817+ quickList.selectedIndex = item.index;

818+ } else {

819+ quickList.selectedIndex = -1;

820+ }

821+ }

822+ }

823+

809 Column {

824 Column {

810 id: quickListColumn

825 id: quickListColumn

811 width: parent.width

826 width: parent.width

@@ -820,6 +835,9 @@ Rectangle {

820 }

835 }

821

836

822 ListItem {

837 ListItem {

838+ readonly property bool clickable: model.clickable

839+ readonly property int index: model.index

840+

823 objectName: "quickListEntry" + index

841 objectName: "quickListEntry" + index

824 selected: index === quickList.selectedIndex

842 selected: index === quickList.selectedIndex

825 height: label.implicitHeight + label.anchors.topMargin + label.anchors.bottomMargin

843 height: label.implicitHeight + label.anchors.topMargin + label.anchors.bottomMargin

qml/Shell.qml+8−1

@@ -263,6 +263,13 @@ StyledItem {

263 }

264 }

265

266+ AvailableDesktopArea {

267+ id: availableDesktopAreaItem

268+ anchors.fill: parent

269+ anchors.topMargin: panel.fullscreenMode ? 0 : panel.minimizedPanelHeight

270+ anchors.leftMargin: launcher.lockedVisible ? launcher.panelWidth : 0

271+ }

272+

266 GSettings {

273 GSettings {

267 id: settings

274 id: settings

268 schema.id: "com.canonical.Unity8"

275 schema.id: "com.canonical.Unity8"

@@ -292,6 +299,7 @@ StyledItem {

292 topLevelSurfaceList: shell.topLevelSurfaceList

299 topLevelSurfaceList: shell.topLevelSurfaceList

293 inputMethodRect: inputMethod.visibleRect

300 inputMethodRect: inputMethod.visibleRect

294 rightEdgePushProgress: rightEdgeBarrier.progress

301 rightEdgePushProgress: rightEdgeBarrier.progress

302+ availableDesktopArea: availableDesktopAreaItem

295

303

296 property string usageScenario: shell.usageScenario === "phone" || greeter.hasLockedApp

304 property string usageScenario: shell.usageScenario === "phone" || greeter.hasLockedApp

297 ? "phone"

305 ? "phone"

@@ -313,7 +321,6 @@ StyledItem {

313

321

314 onInteractiveChanged: { if (interactive) { focus = true; } }

322 onInteractiveChanged: { if (interactive) { focus = true; } }

315

323

316− leftMargin: shell.usageScenario == "desktop" && !settings.autohideLauncher ? launcher.panelWidth: 0

317 suspended: greeter.shown

324 suspended: greeter.shown

318 altTabPressed: physicalKeysMapper.altTabPressed

325 altTabPressed: physicalKeysMapper.altTabPressed

319 oskEnabled: shell.oskEnabled

326 oskEnabled: shell.oskEnabled

qml/Stage/ChildWindow.qml+18−3

@@ -18,8 +18,9 @@ import QtQuick 2.4

18import Ubuntu.Components 1.3

19import Unity.Application 0.1

20

21−Item {

21+FocusScope {

22 id: root

23+ objectName: "childWindow"

23

24

24 // Set from outside.

25 // Set from outside.

25 property var surface

26 property var surface

@@ -27,6 +28,7 @@ Item {

27 property Item target

28 property Item target

28 property alias requestedWidth: surfaceContainer.requestedWidth

29 property alias requestedWidth: surfaceContainer.requestedWidth

29 property alias requestedHeight: surfaceContainer.requestedHeight

30 property alias requestedHeight: surfaceContainer.requestedHeight

31+ property real decorationHeight

30

32

31 width: surface ? surface.size.width : 0

33 width: surface ? surface.size.width : 0

32 height: surface ? surface.size.height : 0

34 height: surface ? surface.size.height : 0

@@ -43,6 +45,7 @@ Item {

43 readonly property bool decorated: surface ? surface.type === Mir.UtilityType

45 readonly property bool decorated: surface ? surface.type === Mir.UtilityType

44 || surface.type === Mir.DialogType

46 || surface.type === Mir.DialogType

45 || surface.type === Mir.NormalType

47 || surface.type === Mir.NormalType

48+ || surface.type === Mir.SatelliteType

46 : false

49 : false

47

50

48 readonly property bool moveable: decorated

51 readonly property bool moveable: decorated

@@ -97,10 +100,14 @@ Item {

97

100

98 sourceComponent: Component {

101 sourceComponent: Component {

99 WindowDecoration {

102 WindowDecoration {

100− height: units.gu(3)

103+ id: windowDecoration

104+ height: root.decorationHeight

101 title: root.surface ? root.surface.name : ""

105 title: root.surface ? root.surface.name : ""

102 active: root.surface ? root.surface.focused : false

106 active: root.surface ? root.surface.focused : false

103− closeButtonVisible: false

107+ closeButtonVisible: root.surface ? root.surface.type === Mir.SatelliteType

108+ || root.surface.type === Mir.NormalType

109+ || root.surface.type === Mir.UtilityType

110+ : false

104 minimizeButtonVisible: false

111 minimizeButtonVisible: false

105 maximizeButtonShown: false

112 maximizeButtonShown: false

106 onPressed: root.surface.activate();

113 onPressed: root.surface.activate();

@@ -109,6 +116,12 @@ Item {

109 d.moveHandler.handlePositionChanged(mouse);

116 d.moveHandler.handlePositionChanged(mouse);

110 }

117 }

111 onReleased: if (d.moveHandler) { d.moveHandler.handleReleased(); }

118 onReleased: if (d.moveHandler) { d.moveHandler.handleReleased(); }

119+ onCloseClicked: root.surface.close();

120+ Binding {

121+ target: root.surface

122+ property: "topMargin"

123+ value: windowDecoration.height

124+ }

112 }

125 }

113 }

126 }

114 }

127 }

@@ -141,6 +154,8 @@ Item {

141 // TODO ChildWindow parent will probably want to control those

154 // TODO ChildWindow parent will probably want to control those

142 interactive: true

155 interactive: true

143 consumesInput: true

156 consumesInput: true

157+

158+ focus: true

144 }

159 }

145

160

146 Loader {

161 Loader {

qml/Stage/ChildWindowRepeater.qml+12−1

@@ -1,5 +1,5 @@

1/*

3 *

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

@@ -21,8 +21,19 @@ Repeater {

21 id: root

22 property Item boundsItem

23 delegate: ChildWindowTree {

24+ id: childWindowTree

24 surface: model.surface

25 surface: model.surface

25 z: root.count - model.index

26 z: root.count - model.index

26 boundsItem: root.boundsItem

27 boundsItem: root.boundsItem

28+ Connections {

29+ target: childWindowTree.surface

30+ onFocusedChanged: {

31+ if (childWindowTree.surface.focused) {

32+ childWindowTree.focus = true;

33+ // focus the Loader

34+ childWindowTree.parent.focus = true;

35+ }

36+ }

37+ }

27 }

38 }

28}

39}

qml/Stage/ChildWindowTree.qml+17−2

@@ -1,5 +1,5 @@

1/*

3 *

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

@@ -18,13 +18,14 @@ import QtQuick 2.4

18import Ubuntu.Components 1.3

19import Unity.Application 0.1

20

21−Item {

21+FocusScope {

22 id: root

23

24 property alias surface: childWindow.surface

25 property real displacementX: 0

26 property real displacementY: 0

27 property alias boundsItem: childWindow.boundsItem

28+ property alias decorationHeight: childWindow.decorationHeight

28

29

29 x: surface ? surface.position.x + displacementX : 0

30 x: surface ? surface.position.x + displacementX : 0

30 y: surface ? surface.position.y + displacementY : 0

31 y: surface ? surface.position.y + displacementY : 0

@@ -100,6 +101,13 @@ Item {

100 onFocusRequested: {

101 onFocusRequested: {

101 root.surface.activate();

102 root.surface.activate();

102 }

103 }

104+ onFocusedChanged: {

105+ if (root.surface.focused) {

106+ childWindow.focus = true;

107+ // Propagate

108+ root.focus = true;

109+ }

110+ }

103 }

111 }

104

112

105 // Using a loader here mainly to circunvent the "ChildWindowTree is instantiated recursively" error from the QML engine

113 // Using a loader here mainly to circunvent the "ChildWindowTree is instantiated recursively" error from the QML engine

@@ -119,5 +127,12 @@ Item {

119 property: "boundsItem"

127 property: "boundsItem"

120 value: root.boundsItem

128 value: root.boundsItem

121 }

129 }

130+ onFocusChanged: {

131+ if (focus) {

132+ // A surface in some ChildWindowTree got focused.

133+ // Propagate

134+ root.focus = true;

135+ }

136+ }

122 }

137 }

123}

138}

qml/Stage/DecoratedWindow.qml+14−7

@@ -44,6 +44,7 @@ FocusScope {

44 property bool hasDecoration: true

45 // This will temporarily show/hide the decoration without actually changing the surface's dimensions

46 property real showDecoration: 1

47+ property alias decorationHeight: decoration.height

47 property bool animateDecoration: false

48 property bool animateDecoration: false

48 property bool showHighlight: false

49 property bool showHighlight: false

49 property int highlightSize: units.gu(1)

50 property int highlightSize: units.gu(1)

@@ -56,11 +57,15 @@ FocusScope {

56 property int scaleToPreviewSize: units.gu(30)

57 property int scaleToPreviewSize: units.gu(30)

57

58

58 property alias surfaceOrientationAngle: applicationWindow.surfaceOrientationAngle

59 property alias surfaceOrientationAngle: applicationWindow.surfaceOrientationAngle

60+

61+ // Height of the decoration that's actually being displayed at this moment. Will match decorationHeight

62+ // when the decoration is being fully displayed

59− readonly property real decorationHeight: Math.min(d.visibleDecorationHeight, d.requestedDecorationHeight)

63+ readonly property real actualDecorationHeight: Math.min(d.visibleDecorationHeight, d.requestedDecorationHeight)

64+

60 readonly property bool counterRotate: surfaceOrientationAngle != 0 && surfaceOrientationAngle != 180

65 readonly property bool counterRotate: surfaceOrientationAngle != 0 && surfaceOrientationAngle != 180

61

66

62 readonly property int minimumWidth: !counterRotate ? applicationWindow.minimumWidth : applicationWindow.minimumHeight

67 readonly property int minimumWidth: !counterRotate ? applicationWindow.minimumWidth : applicationWindow.minimumHeight

63− readonly property int minimumHeight: decorationHeight + (!counterRotate ? applicationWindow.minimumHeight : applicationWindow.minimumWidth)

68+ readonly property int minimumHeight: actualDecorationHeight + (!counterRotate ? applicationWindow.minimumHeight : applicationWindow.minimumWidth)

64 readonly property int maximumWidth: !counterRotate ? applicationWindow.maximumWidth : applicationWindow.maximumHeight

69 readonly property int maximumWidth: !counterRotate ? applicationWindow.maximumWidth : applicationWindow.maximumHeight

65 readonly property int maximumHeight: (root.decorationShown && applicationWindow.maximumHeight > 0 ? decoration.height : 0)

70 readonly property int maximumHeight: (root.decorationShown && applicationWindow.maximumHeight > 0 ? decoration.height : 0)

66 + (!counterRotate ? applicationWindow.maximumHeight : applicationWindow.maximumWidth)

71 + (!counterRotate ? applicationWindow.maximumHeight : applicationWindow.maximumWidth)

@@ -75,6 +80,8 @@ FocusScope {

75

80

76 property alias altDragEnabled: altDragHandler.enabled

81 property alias altDragEnabled: altDragHandler.enabled

77

82

83+ property Item windowMargins

84+

78 signal closeClicked()

85 signal closeClicked()

79 signal maximizeClicked()

86 signal maximizeClicked()

80 signal maximizeHorizontallyClicked()

87 signal maximizeHorizontallyClicked()

@@ -103,7 +110,7 @@ FocusScope {

103 PropertyChanges {

110 PropertyChanges {

104 target: root

111 target: root

105 implicitWidth: counterRotate ? applicationWindow.implicitHeight : applicationWindow.implicitWidth

112 implicitWidth: counterRotate ? applicationWindow.implicitHeight : applicationWindow.implicitWidth

106− implicitHeight: root.decorationHeight + (counterRotate ? applicationWindow.implicitWidth: applicationWindow.implicitHeight)

113+ implicitHeight: root.actualDecorationHeight + (counterRotate ? applicationWindow.implicitWidth: applicationWindow.implicitHeight)

107 }

114 }

108 },

115 },

109 State {

116 State {

@@ -112,7 +119,7 @@ FocusScope {

112 PropertyChanges {

119 PropertyChanges {

113 target: root

120 target: root

114 implicitWidth: counterRotate ? applicationWindow.requestedHeight : applicationWindow.requestedWidth

121 implicitWidth: counterRotate ? applicationWindow.requestedHeight : applicationWindow.requestedWidth

115− implicitHeight: root.decorationHeight + (counterRotate ? applicationWindow.requestedWidth: applicationWindow.requestedHeight)

122+ implicitHeight: root.actualDecorationHeight + (counterRotate ? applicationWindow.requestedWidth: applicationWindow.requestedHeight)

116 }

123 }

117 },

124 },

118 State {

125 State {

@@ -151,7 +158,7 @@ FocusScope {

151 margins: active ? -units.gu(2) : -units.gu(1.5)

158 margins: active ? -units.gu(2) : -units.gu(1.5)

152 }

159 }

153 height: Math.min(applicationWindow.implicitHeight, applicationWindow.height) * applicationWindow.itemScale

160 height: Math.min(applicationWindow.implicitHeight, applicationWindow.height) * applicationWindow.itemScale

154− + root.decorationHeight * Math.min(1, root.showDecoration) + (active ? units.gu(4) : units.gu(3))

161+ + root.actualDecorationHeight * Math.min(1, root.showDecoration) + (active ? units.gu(4) : units.gu(3))

155 source: "../graphics/dropshadow2gu.sci"

162 source: "../graphics/dropshadow2gu.sci"

156 opacity: root.shadowOpacity

163 opacity: root.shadowOpacity

157 }

164 }

@@ -160,7 +167,7 @@ FocusScope {

160 id: applicationWindow

167 id: applicationWindow

161 objectName: "appWindow"

168 objectName: "appWindow"

162 anchors.top: parent.top

169 anchors.top: parent.top

163− anchors.topMargin: root.decorationHeight * Math.min(1, root.showDecoration)

170+ anchors.topMargin: root.actualDecorationHeight * Math.min(1, root.showDecoration)

164 anchors.left: parent.left

171 anchors.left: parent.left

165 width: implicitWidth

172 width: implicitWidth

166 height: implicitHeight

173 height: implicitHeight

@@ -208,7 +215,7 @@ FocusScope {

208 objectName: "appWindowDecoration"

215 objectName: "appWindowDecoration"

209

216

210 anchors { left: parent.left; top: parent.top; right: parent.right }

217 anchors { left: parent.left; top: parent.top; right: parent.right }

211− height: units.gu(3)

218+ height: units.gu(3) // a default value. overwritten by root.decorationHeight

212

219

213 title: applicationWindow.title

220 title: applicationWindow.title

214 windowMoving: moveHandler.moving && !altDragHandler.dragging

221 windowMoving: moveHandler.moving && !altDragHandler.dragging

qml/Stage/Stage.qml+88−49

@@ -1,5 +1,5 @@

1/*

3 *

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

@@ -44,10 +44,10 @@ FocusScope {

44 property int shellOrientationAngle

45 property bool spreadEnabled: true // If false, animations and right edge will be disabled

46 property bool suspended

47− property int leftMargin: 0

48 property bool oskEnabled: false

47 property bool oskEnabled: false

49 property rect inputMethodRect

48 property rect inputMethodRect

50 property real rightEdgePushProgress: 0

49 property real rightEdgePushProgress: 0

50+ property Item availableDesktopArea

51 property PanelState panelState

52

53 readonly property var temporarySelectedWorkspace: state == "spread" ? screensAndWorkspaces.lastClickedWorkspace : null

@@ -124,6 +124,12 @@ FocusScope {

124 }

125 }

126

127+ // For MirAL window management

128+ WindowMargins {

129+ normal: Qt.rect(0, root.mode === "windowed" ? priv.windowDecorationHeight : 0, 0, 0)

130+ dialog: normal

131+ }

132+

127 property Item itemConfiningMouseCursor: !spreadShown && priv.focusedAppDelegate && priv.focusedAppDelegate.window.confinesMousePointer ?

133 property Item itemConfiningMouseCursor: !spreadShown && priv.focusedAppDelegate && priv.focusedAppDelegate.window.confinesMousePointer ?

128 priv.focusedAppDelegate.clientAreaItem : null;

134 priv.focusedAppDelegate.clientAreaItem : null;

129

135

@@ -228,6 +234,18 @@ FocusScope {

228 active: priv.focusedAppDelegate !== null

234 active: priv.focusedAppDelegate !== null

229 }

235 }

230

236

237+ GlobalShortcut {

238+ shortcut: Qt.ControlModifier|Qt.AltModifier|Qt.Key_T

239+ onTriggered: {

240+ // try in this order: snap pkg, new deb name, old deb name

241+ var candidates = ["ubuntu-terminal-app_ubuntu-terminal-app", "ubuntu-terminal-app", "com.ubuntu.terminal"];

242+ for (var i = 0; i < candidates.length; i++) {

243+ if (priv.startApp(candidates[i]))

244+ break;

245+ }

246+ }

247+ }

248+

231 GlobalShortcut {

249 GlobalShortcut {

232 id: showWorkspaceSwitcherShortcutLeft

250 id: showWorkspaceSwitcherShortcutLeft

233 shortcut: Qt.AltModifier|Qt.ControlModifier|Qt.Key_Left

251 shortcut: Qt.AltModifier|Qt.ControlModifier|Qt.Key_Left

@@ -251,6 +269,14 @@ FocusScope {

251 id: priv

269 id: priv

252 objectName: "DesktopStagePrivate"

270 objectName: "DesktopStagePrivate"

253

271

272+ function startApp(appId) {

273+ if (root.applicationManager.findApplication(appId)) {

274+ return root.applicationManager.requestFocusApplication(appId);

275+ } else {

276+ return root.applicationManager.startApplication(appId) !== null;

277+ }

278+ }

279+

254 property var focusedAppDelegate: null

280 property var focusedAppDelegate: null

255 property var foregroundMaximizedAppDelegate: null // for stuff like drop shadow and focusing maximized app by clicking panel

281 property var foregroundMaximizedAppDelegate: null // for stuff like drop shadow and focusing maximized app by clicking panel

256

282

@@ -370,6 +396,8 @@ FocusScope {

370 }

396 }

371

397

372 readonly property real virtualKeyboardHeight: root.inputMethodRect.height

398 readonly property real virtualKeyboardHeight: root.inputMethodRect.height

399+

400+ readonly property real windowDecorationHeight: units.gu(3)

373 }

401 }

374

402

375 Component.onCompleted: priv.updateMainAndSideStageIndexes()

403 Component.onCompleted: priv.updateMainAndSideStageIndexes()

@@ -610,7 +638,7 @@ FocusScope {

610 id: spreadItem

638 id: spreadItem

611 objectName: "spreadItem"

639 objectName: "spreadItem"

612 anchors { left: parent.left; bottom: parent.bottom; right: parent.right; top: screensAndWorkspaces.bottom }

640 anchors { left: parent.left; bottom: parent.bottom; right: parent.right; top: screensAndWorkspaces.bottom }

613− leftMargin: root.leftMargin

641+ leftMargin: root.availableDesktopArea.x

614 model: root.topLevelSurfaceList

642 model: root.topLevelSurfaceList

615 spreadFlickable: floatingFlickable

643 spreadFlickable: floatingFlickable

616 z: 10

644 z: 10

@@ -813,13 +841,6 @@ FocusScope {

813 z: 1000

841 z: 1000

814 }

842 }

815

843

816− Item {

817− id: boundariesForWindowPlacement

818− anchors.fill: parent

819− anchors.topMargin: panelState.panelHeight

820− visible: false

821− }

822−

823 Repeater {

844 Repeater {

824 id: appRepeater

845 id: appRepeater

825 model: topLevelSurfaceList

846 model: topLevelSurfaceList

@@ -920,7 +941,7 @@ FocusScope {

920 target: appDelegate

941 target: appDelegate

921 property: "y"

942 property: "y"

922 value: appDelegate.requestedY -

943 value: appDelegate.requestedY -

923− Math.min(appDelegate.requestedY - panelState.panelHeight,

944+ Math.min(appDelegate.requestedY - root.availableDesktopArea.y,

924 Math.max(0, priv.virtualKeyboardHeight - (appContainer.height - (appDelegate.requestedY + appDelegate.height))))

945 Math.max(0, priv.virtualKeyboardHeight - (appContainer.height - (appDelegate.requestedY + appDelegate.height))))

925 when: root.oskEnabled && appDelegate.focus && (appDelegate.state == "normal" || appDelegate.state == "restored")

946 when: root.oskEnabled && appDelegate.focus && (appDelegate.state == "normal" || appDelegate.state == "restored")

926 && root.inputMethodRect.height > 0

947 && root.inputMethodRect.height > 0

@@ -938,8 +959,8 @@ FocusScope {

938 angleDiff = (360 + angleDiff) % 360;

959 angleDiff = (360 + angleDiff) % 360;

939 if (angleDiff === 90 || angleDiff === 270) {

960 if (angleDiff === 90 || angleDiff === 270) {

940 var aux = decoratedWindow.requestedHeight;

961 var aux = decoratedWindow.requestedHeight;

941− decoratedWindow.requestedHeight = decoratedWindow.requestedWidth + decoratedWindow.decorationHeight;

962+ decoratedWindow.requestedHeight = decoratedWindow.requestedWidth + decoratedWindow.actualDecorationHeight;

942− decoratedWindow.requestedWidth = aux - decoratedWindow.decorationHeight;

963+ decoratedWindow.requestedWidth = aux - decoratedWindow.actualDecorationHeight;

943 }

964 }

944 }

965 }

945 decoratedWindow.surfaceOrientationAngle = shellOrientationAngle;

966 decoratedWindow.surfaceOrientationAngle = shellOrientationAngle;

@@ -1039,12 +1060,13 @@ FocusScope {

1039 priv.updateMainAndSideStageIndexes();

1060 priv.updateMainAndSideStageIndexes();

1040 }

1061 }

1041 appDelegate.focus = true;

1062 appDelegate.focus = true;

1063+ priv.focusedAppDelegate = appDelegate;

1042 }

1064 }

1043

1065

1044 function updateQmlFocusFromMirSurfaceFocus() {

1066 function updateQmlFocusFromMirSurfaceFocus() {

1045 if (model.window.focused) {

1067 if (model.window.focused) {

1046 claimFocus();

1068 claimFocus();

1047− priv.focusedAppDelegate = appDelegate;

1069+ decoratedWindow.focus = true;

1048 }

1070 }

1049 }

1071 }

1050

1072

@@ -1053,8 +1075,8 @@ FocusScope {

1053 target: appDelegate

1075 target: appDelegate

1054 screenWidth: appContainer.width

1076 screenWidth: appContainer.width

1055 screenHeight: appContainer.height

1077 screenHeight: appContainer.height

1056− leftMargin: root.leftMargin

1078+ leftMargin: root.availableDesktopArea.x

1057− minimumY: boundariesForWindowPlacement.y

1079+ minimumY: root.availableDesktopArea.y

1058 }

1080 }

1059

1081

1060 Connections {

1082 Connections {

@@ -1306,7 +1328,7 @@ FocusScope {

1306

1328

1307 StagedRightEdgeMaths {

1329 StagedRightEdgeMaths {

1308 id: stagedRightEdgeMaths

1330 id: stagedRightEdgeMaths

1309− sceneWidth: appContainer.width - root.leftMargin

1331+ sceneWidth: root.availableDesktopArea.width

1310 sceneHeight: appContainer.height

1332 sceneHeight: appContainer.height

1311 isMainStageApp: priv.mainStageDelegate == appDelegate

1333 isMainStageApp: priv.mainStageDelegate == appDelegate

1312 isSideStageApp: priv.sideStageDelegate == appDelegate

1334 isSideStageApp: priv.sideStageDelegate == appDelegate

@@ -1317,7 +1339,7 @@ FocusScope {

1317 progress: 0

1339 progress: 0

1318 targetHeight: spreadItem.stackHeight

1340 targetHeight: spreadItem.stackHeight

1319 targetX: spreadMaths.targetX

1341 targetX: spreadMaths.targetX

1320− startY: appDelegate.fullscreen ? 0 : panelState.panelHeight

1342+ startY: appDelegate.fullscreen ? 0 : root.availableDesktopArea.y

1321 targetY: spreadMaths.targetY

1343 targetY: spreadMaths.targetY

1322 targetAngle: spreadMaths.targetAngle

1344 targetAngle: spreadMaths.targetAngle

1323 targetScale: spreadMaths.targetScale

1345 targetScale: spreadMaths.targetScale

@@ -1432,14 +1454,14 @@ FocusScope {

1432 PropertyChanges {

1454 PropertyChanges {

1433 target: appDelegate

1455 target: appDelegate

1434 x: stageMaths.itemX

1456 x: stageMaths.itemX

1435− y: appDelegate.fullscreen ? 0 : panelState.panelHeight

1457+ y: root.availableDesktopArea.y

1436 visuallyMaximized: true

1458 visuallyMaximized: true

1437 visible: appDelegate.x < root.width

1459 visible: appDelegate.x < root.width

1438 }

1460 }

1439 PropertyChanges {

1461 PropertyChanges {

1440 target: appDelegate

1462 target: appDelegate

1441 requestedWidth: appContainer.width

1463 requestedWidth: appContainer.width

1442− requestedHeight: appDelegate.fullscreen ? appContainer.height : appContainer.height - panelState.panelHeight

1464+ requestedHeight: root.availableDesktopArea.height

1443 restoreEntryValues: false

1465 restoreEntryValues: false

1444 }

1466 }

1445 PropertyChanges {

1467 PropertyChanges {

@@ -1468,7 +1490,7 @@ FocusScope {

1468 PropertyChanges {

1490 PropertyChanges {

1469 target: appDelegate

1491 target: appDelegate

1470 x: stageMaths.itemX

1492 x: stageMaths.itemX

1471− y: appDelegate.fullscreen ? 0 : panelState.panelHeight

1493+ y: root.availableDesktopArea.y

1472 z: stageMaths.itemZ

1494 z: stageMaths.itemZ

1473 visuallyMaximized: true

1495 visuallyMaximized: true

1474 visible: appDelegate.x < root.width

1496 visible: appDelegate.x < root.width

@@ -1476,7 +1498,7 @@ FocusScope {

1476 PropertyChanges {

1498 PropertyChanges {

1477 target: appDelegate

1499 target: appDelegate

1478 requestedWidth: stageMaths.itemWidth

1500 requestedWidth: stageMaths.itemWidth

1479− requestedHeight: appDelegate.fullscreen ? appContainer.height : appContainer.height - panelState.panelHeight

1501+ requestedHeight: root.availableDesktopArea.height

1480 restoreEntryValues: false

1502 restoreEntryValues: false

1481 }

1503 }

1482 PropertyChanges {

1504 PropertyChanges {

@@ -1496,15 +1518,15 @@ FocusScope {

1496 name: "maximized"; when: appDelegate.maximized && !appDelegate.minimized

1518 name: "maximized"; when: appDelegate.maximized && !appDelegate.minimized

1497 PropertyChanges {

1519 PropertyChanges {

1498 target: appDelegate;

1520 target: appDelegate;

1499− requestedX: root.leftMargin;

1521+ requestedX: root.availableDesktopArea.x;

1500 requestedY: 0;

1522 requestedY: 0;

1501 visuallyMinimized: false;

1523 visuallyMinimized: false;

1502 visuallyMaximized: true

1524 visuallyMaximized: true

1503 }

1525 }

1504 PropertyChanges {

1526 PropertyChanges {

1505 target: appDelegate

1527 target: appDelegate

1506− requestedWidth: appContainer.width - root.leftMargin

1528+ requestedWidth: root.availableDesktopArea.width;

1507− requestedHeight: appContainer.height

1529+ requestedHeight: appContainer.height;

1508 restoreEntryValues: false

1530 restoreEntryValues: false

1509 }

1531 }

1510 PropertyChanges { target: touchControls; enabled: true }

1532 PropertyChanges { target: touchControls; enabled: true }

@@ -1547,6 +1569,7 @@ FocusScope {

1547 when: appDelegate.windowState == WindowStateStorage.WindowStateRestored

1569 when: appDelegate.windowState == WindowStateStorage.WindowStateRestored

1548 extend: "normal"

1570 extend: "normal"

1549 PropertyChanges {

1571 PropertyChanges {

1572+ restoreEntryValues: false

1550 target: appDelegate;

1573 target: appDelegate;

1551 windowedX: restoredX;

1574 windowedX: restoredX;

1552 windowedY: restoredY;

1575 windowedY: restoredY;

@@ -1557,10 +1580,10 @@ FocusScope {

1557 extend: "normal"

1580 extend: "normal"

1558 PropertyChanges {

1581 PropertyChanges {

1559 target: appDelegate

1582 target: appDelegate

1560− windowedX: root.leftMargin

1583+ windowedX: root.availableDesktopArea.x

1561− windowedY: panelState.panelHeight

1584+ windowedY: root.availableDesktopArea.y

1562− windowedWidth: (appContainer.width - root.leftMargin)/2

1585+ windowedWidth: root.availableDesktopArea.width / 2

1563− windowedHeight: appContainer.height - panelState.panelHeight

1586+ windowedHeight: root.availableDesktopArea.height

1564 }

1587 }

1565 },

1588 },

1566 State {

1589 State {

@@ -1568,7 +1591,7 @@ FocusScope {

1568 extend: "maximizedLeft"

1591 extend: "maximizedLeft"

1569 PropertyChanges {

1592 PropertyChanges {

1570 target: appDelegate;

1593 target: appDelegate;

1571− windowedX: (appContainer.width + root.leftMargin)/2

1594+ windowedX: root.availableDesktopArea.x + (root.availableDesktopArea.width / 2)

1572 }

1595 }

1573 },

1596 },

1574 State {

1597 State {

@@ -1576,10 +1599,10 @@ FocusScope {

1576 extend: "normal"

1599 extend: "normal"

1577 PropertyChanges {

1600 PropertyChanges {

1578 target: appDelegate

1601 target: appDelegate

1579− windowedX: root.leftMargin

1602+ windowedX: root.availableDesktopArea.x

1580− windowedY: panelState.panelHeight

1603+ windowedY: root.availableDesktopArea.y

1581− windowedWidth: (appContainer.width - root.leftMargin)/2

1604+ windowedWidth: root.availableDesktopArea.width / 2

1582− windowedHeight: (appContainer.height - panelState.panelHeight)/2

1605+ windowedHeight: root.availableDesktopArea.height / 2

1583 }

1606 }

1584 },

1607 },

1585 State {

1608 State {

@@ -1587,7 +1610,7 @@ FocusScope {

1587 extend: "maximizedTopLeft"

1610 extend: "maximizedTopLeft"

1588 PropertyChanges {

1611 PropertyChanges {

1589 target: appDelegate

1612 target: appDelegate

1590− windowedX: (appContainer.width + root.leftMargin)/2

1613+ windowedX: root.availableDesktopArea.x + (root.availableDesktopArea.width / 2)

1591 }

1614 }

1592 },

1615 },

1593 State {

1616 State {

@@ -1595,10 +1618,10 @@ FocusScope {

1595 extend: "normal"

1618 extend: "normal"

1596 PropertyChanges {

1619 PropertyChanges {

1597 target: appDelegate

1620 target: appDelegate

1598− windowedX: root.leftMargin

1621+ windowedX: root.availableDesktopArea.x

1599− windowedY: (appContainer.height + panelState.panelHeight)/2

1622+ windowedY: root.availableDesktopArea.y + (root.availableDesktopArea.height / 2)

1600− windowedWidth: (appContainer.width - root.leftMargin)/2

1623+ windowedWidth: root.availableDesktopArea.width / 2

1601− windowedHeight: appContainer.height/2

1624+ windowedHeight: root.availableDesktopArea.height / 2

1602 }

1625 }

1603 },

1626 },

1604 State {

1627 State {

@@ -1606,20 +1629,26 @@ FocusScope {

1606 extend: "maximizedBottomLeft"

1629 extend: "maximizedBottomLeft"

1607 PropertyChanges {

1630 PropertyChanges {

1608 target: appDelegate

1631 target: appDelegate

1609− windowedX: (appContainer.width + root.leftMargin)/2

1632+ windowedX: root.availableDesktopArea.x + (root.availableDesktopArea.width / 2)

1610 }

1633 }

1611 },

1634 },

1612 State {

1635 State {

1613 name: "maximizedHorizontally"; when: appDelegate.maximizedHorizontally && !appDelegate.minimized

1636 name: "maximizedHorizontally"; when: appDelegate.maximizedHorizontally && !appDelegate.minimized

1614 extend: "normal"

1637 extend: "normal"

1638+ PropertyChanges {

1639+ target: appDelegate

1615− PropertyChanges { target: appDelegate; windowedX: root.leftMargin; windowedY: windowedY;

1640+ windowedX: root.availableDesktopArea.x; windowedY: windowedY

1616− windowedWidth: appContainer.width - root.leftMargin; windowedHeight: windowedHeight }

1641+ windowedWidth: root.availableDesktopArea.width; windowedHeight: windowedHeight

1642+ }

1617 },

1643 },

1618 State {

1644 State {

1619 name: "maximizedVertically"; when: appDelegate.maximizedVertically && !appDelegate.minimized

1645 name: "maximizedVertically"; when: appDelegate.maximizedVertically && !appDelegate.minimized

1620 extend: "normal"

1646 extend: "normal"

1647+ PropertyChanges {

1648+ target: appDelegate

1621− PropertyChanges { target: appDelegate; windowedX: windowedX; windowedY: panelState.panelHeight;

1649+ windowedX: windowedX; windowedY: root.availableDesktopArea.y

1622− windowedWidth: windowedWidth; windowedHeight: appContainer.height - panelState.panelHeight }

1650+ windowedWidth: windowedWidth; windowedHeight: root.availableDesktopArea.height

1651+ }

1623 },

1652 },

1624 State {

1653 State {

1625 name: "minimized"; when: appDelegate.minimized

1654 name: "minimized"; when: appDelegate.minimized

@@ -1752,7 +1781,7 @@ FocusScope {

1752 anchors.margins: touchControls.overlayShown ? borderThickness/2 : -borderThickness

1781 anchors.margins: touchControls.overlayShown ? borderThickness/2 : -borderThickness

1753

1782

1754 target: appDelegate

1783 target: appDelegate

1755− boundsItem: boundariesForWindowPlacement

1784+ boundsItem: root.availableDesktopArea

1756 minWidth: units.gu(10)

1785 minWidth: units.gu(10)

1757 minHeight: units.gu(10)

1786 minHeight: units.gu(10)

1758 borderThickness: units.gu(2)

1787 borderThickness: units.gu(2)

@@ -1776,12 +1805,13 @@ FocusScope {

1776 focus: true

1805 focus: true

1777 interactive: root.interactive

1806 interactive: root.interactive

1778 showDecoration: 1

1807 showDecoration: 1

1808+ decorationHeight: priv.windowDecorationHeight

1779 maximizeButtonShown: appDelegate.canBeMaximized

1809 maximizeButtonShown: appDelegate.canBeMaximized

1780 overlayShown: touchControls.overlayShown

1810 overlayShown: touchControls.overlayShown

1781 width: implicitWidth

1811 width: implicitWidth

1782 height: implicitHeight

1812 height: implicitHeight

1783 highlightSize: windowInfoItem.iconMargin / 2

1813 highlightSize: windowInfoItem.iconMargin / 2

1784− boundsItem: boundariesForWindowPlacement

1814+ boundsItem: root.availableDesktopArea

1785 panelState: root.panelState

1815 panelState: root.panelState

1786 altDragEnabled: root.mode == "windowed"

1816 altDragEnabled: root.mode == "windowed"

1787

1817

@@ -1840,7 +1870,7 @@ FocusScope {

1840 resizeArea: resizeArea

1870 resizeArea: resizeArea

1841 enabled: false

1871 enabled: false

1842 visible: enabled

1872 visible: enabled

1843− boundsItem: boundariesForWindowPlacement

1873+ boundsItem: root.availableDesktopArea

1844

1874

1845 onFakeMaximizeAnimationRequested: if (!appDelegate.maximized) fakeRectangle.maximize(amount, true)

1875 onFakeMaximizeAnimationRequested: if (!appDelegate.maximized) fakeRectangle.maximize(amount, true)

1846 onFakeMaximizeLeftAnimationRequested: if (!appDelegate.maximizedLeft) fakeRectangle.maximizeLeft(amount, true)

1876 onFakeMaximizeLeftAnimationRequested: if (!appDelegate.maximizedLeft) fakeRectangle.maximizeLeft(amount, true)

@@ -1966,9 +1996,18 @@ FocusScope {

1966 displacementX: appDelegate.clientAreaItem.x

1996 displacementX: appDelegate.clientAreaItem.x

1967 displacementY: appDelegate.clientAreaItem.y

1997 displacementY: appDelegate.clientAreaItem.y

1968

1998

1969− boundsItem: boundariesForWindowPlacement

1999+ boundsItem: root.availableDesktopArea

2000+ decorationHeight: priv.windowDecorationHeight

1970

2001

1971 z: childWindowRepeater.count - model.index

2002 z: childWindowRepeater.count - model.index

2003+

2004+ onFocusChanged: {

2005+ if (focus) {

2006+ // some child surface in this tree got focus.

2007+ // Ensure we also have it at the top-level hierarchy

2008+ appDelegate.claimFocus();

2009+ }

2010+ }

1972 }

2011 }

1973 }

2012 }

1974 }

2013 }

@@ -1979,7 +2018,7 @@ FocusScope {

1979 FakeMaximizeDelegate {

2018 FakeMaximizeDelegate {

1980 id: fakeRectangle

2019 id: fakeRectangle

1981 target: priv.focusedAppDelegate

2020 target: priv.focusedAppDelegate

1982− leftMargin: root.leftMargin

2021+ leftMargin: root.availableDesktopArea.x

1983 appContainerWidth: appContainer.width

2022 appContainerWidth: appContainer.width

1984 appContainerHeight: appContainer.height

2023 appContainerHeight: appContainer.height

1985 panelState: root.panelState

2024 panelState: root.panelState

qml/Wizard/Pages/30-wifi.qml−4

@@ -20,7 +20,6 @@ import QMenuModel 0.1 as QMenuModel

20import Ubuntu.Components 1.3

21import Wizard 0.1

22import Ubuntu.Connectivity 1.0

23−import Ubuntu.SystemImage 0.1

24import ".." as LocalComponents

23import ".." as LocalComponents

25import "../../Components"

24import "../../Components"

26

25

@@ -206,9 +205,6 @@ LocalComponents.Page {

206 LocalComponents.StackButton {

205 LocalComponents.StackButton {

207 text: (connected || listview.count === 0) ? i18n.tr("Next") : i18n.tr("Skip")

206 text: (connected || listview.count === 0) ? i18n.tr("Next") : i18n.tr("Skip")

208 onClicked: {

207 onClicked: {

209− if (connected) {

210− SystemImage.checkForUpdate(); // initiate the background check for System Update

211− }

212 pageStack.next();

208 pageStack.next();

213 }

209 }

214 }

210 }

qml/Wizard/Pages/77-system-update.qmldeleted−156

@@ -1,156 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−import QtQuick 2.4

18−import QtQuick.Layouts 1.1

19−import Ubuntu.Components 1.3

20−import Ubuntu.SystemImage 0.1

21−import Wizard 0.1

22−import ".." as LocalComponents

23−

24−LocalComponents.Page {

25− id: systemUpdatePage

26− objectName: "systemUpdatePage"

27−

28− title: i18n.tr("Update Device")

29− forwardButtonSourceComponent: forwardButton

30−

31− skip: !SystemImage.updateDownloaded // skip the page when the system update is not ready to install

32−

33− Column {

34− id: column

35− anchors {

36− fill: content

37− leftMargin: systemUpdatePage.leftMargin

38− rightMargin: systemUpdatePage.rightMargin

39− topMargin: systemUpdatePage.customMargin

40− }

41− spacing: units.gu(3)

42− opacity: spinner.running ? 0.5 : 1

43− Behavior on opacity {

44− UbuntuNumberAnimation {}

45− }

46−

47− Label {

48− anchors.left: parent.left

49− anchors.right: parent.right

50− anchors.leftMargin: column.anchors.leftMargin == 0 ? staticMargin : 0

51− font.weight: Font.Light

52− color: textColor

53− wrapMode: Text.Wrap

54− fontSize: "small"

55− text: i18n.tr("There is a system update available and ready to install. Afterwards, the device will automatically restart.")

56− }

57−

58− GridLayout {

59− rows: 3

60− columns: 2

61− rowSpacing: units.gu(1)

62− columnSpacing: units.gu(2)

63−

64− Image {

65− Layout.rowSpan: 3

66− Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter

67− sourceSize: Qt.size(units.gu(3), units.gu(3))

68− fillMode: Image.PreserveAspectFit

69− source: "image://theme/distributor-logo"

70− }

71−

72− Label {

73− color: textColor

74− font.weight: Font.Normal

75− fontSize: "small"

76− text: i18n.ctr("string identifying name of the update", "Ubuntu system")

77− }

78−

79− Label {

80− font.weight: Font.Light

81− fontSize: "small"

82− color: textColor

83− text: i18n.ctr("version of the system update", "Version %1").arg(SystemImage.availableVersion)

84− }

85−

86− Label {

87− font.weight: Font.Light

88− fontSize: "small"

89− color: textColor

90− text: SystemImage.updateSize

91− }

92− }

93−

94− Label {

95− anchors.left: parent.left

96− anchors.right: parent.right

97− anchors.leftMargin: column.anchors.leftMargin == 0 ? staticMargin : 0

98− font.weight: Font.Light

99− color: textColor

100− wrapMode: Text.Wrap

101− fontSize: "small"

102− text: i18n.tr("This could take a few minutes...")

103− }

104−

105− Rectangle {

106− anchors.left: parent.left

107− anchors.leftMargin: column.anchors.leftMargin == 0 ? staticMargin : 0

108− color: theme.palette.normal.foreground

109− radius: units.dp(4)

110− width: buttonLabel.paintedWidth + units.gu(3)

111− height: buttonLabel.paintedHeight + units.gu(1.8)

112−

113− Label {

114− id: buttonLabel

115− color: textColor

116− text: i18n.tr("Install and restart now")

117− font.weight: Font.Light

118− anchors.centerIn: parent

119− }

120−

121− AbstractButton {

122− id: button

123− objectName: "installButton"

124− anchors.fill: parent

125− onClicked: {

126− System.skipUntilFinishedPage();

127− SystemImage.applyUpdate();

128− }

129− }

130−

131− transformOrigin: Item.Top

132− scale: button.pressed ? 0.98 : 1.0

133− Behavior on scale {

134− ScaleAnimator {

135− duration: UbuntuAnimation.SnapDuration

136− easing.type: Easing.Linear

137− }

138− }

139− }

140− }

141−

142− ActivityIndicator {

143− id: spinner

144− anchors.centerIn: systemUpdatePage

145− running: SystemImage.updateApplying

146− visible: running

147− }

148−

149− Component {

150− id: forwardButton

151− LocalComponents.StackButton {

152− text: i18n.tr("Skip")

153− onClicked: pageStack.next()

154− }

155− }

156−}

src/CMakeLists.txt−1

@@ -67,5 +67,4 @@ install(TARGETS ${SHELL_APP}

67 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

68 )

69

70−add_subdirectory(Panel)

71add_subdirectory(Dash)

70add_subdirectory(Dash)

src/Panel/CMakeLists.txtdeleted−3

@@ -1,3 +0,0 @@

1−add_subdirectory(Indicators)

2−

3−set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")

src/Panel/Indicators/CMakeLists.txtdeleted−1

@@ -1 +0,0 @@

1−add_subdirectory(client)

tests/CMakeLists.txt+1

@@ -20,6 +20,7 @@ add_subdirectory(uqmlscene)

20# Use our custom implementation of qmlscene and import dbus-test-runner

21add_executable(qmlscene ALIAS uqmlscene)

22import_executables(dbus-test-runner)

23+import_executables(qdbus-simple-test-runner)

23

24

24set(UNITY_PLUGINPATH "${CMAKE_BINARY_DIR}/plugins" CACHE PATH "Path to pre-built unity8 plugin dir.")

25set(UNITY_PLUGINPATH "${CMAKE_BINARY_DIR}/plugins" CACHE PATH "Path to pre-built unity8 plugin dir.")

25set(UNITY_MOCKPATH "${CMAKE_BINARY_DIR}/tests/mocks" CACHE PATH "Path to pre-built unity8 mock dir.")

26set(UNITY_MOCKPATH "${CMAKE_BINARY_DIR}/tests/mocks" CACHE PATH "Path to pre-built unity8 mock dir.")

tests/mocks/Ubuntu/CMakeLists.txt−1

@@ -1,6 +1,5 @@

1add_subdirectory(Connectivity)

2add_subdirectory(DownloadDaemonListener)

3−add_subdirectory(SystemImage)

4add_subdirectory(SystemSettings)

3add_subdirectory(SystemSettings)

5add_subdirectory(Telephony)

4add_subdirectory(Telephony)

6add_subdirectory(Thumbnailer)

5add_subdirectory(Thumbnailer)

tests/mocks/Ubuntu/SystemImage/CMakeLists.txtdeleted−10

@@ -1,10 +0,0 @@

1−set(MOCK_SYSTEMIMAGE_SOURCES

2− plugin.cpp

3− MockSystemImage.cpp

4−)

5−

6−add_library(MockSystemImage MODULE ${MOCK_SYSTEMIMAGE_SOURCES})

7−

8−qt5_use_modules(MockSystemImage Qml Quick Core)

9−

10−add_unity8_mock(Ubuntu.SystemImage 0.1 Ubuntu/SystemImage TARGETS MockSystemImage)

tests/mocks/Ubuntu/SystemImage/MockSystemImage.cppdeleted−50

@@ -1,50 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#include <QDebug>

18−#include <QTimer>

19−

20−#include "MockSystemImage.h"

21−

22−MockSystemImage::MockSystemImage(QObject *parent)

23− : QObject(parent)

24−{

25−}

26−

27−void MockSystemImage::checkForUpdate()

28−{

29− qDebug() << "Doing a fake system update check";

30−}

31−

32−void MockSystemImage::applyUpdate()

33−{

34− qDebug() << "Applying a fake system update";

35− setUpdateApplying(true);

36− QTimer::singleShot(3000, [this] {setUpdateApplying(false);});

37−}

38−

39−void MockSystemImage::factoryReset()

40−{

41− Q_EMIT resettingDevice();

42−}

43−

44−void MockSystemImage::setUpdateApplying(bool status)

45−{

46− if (status != m_updateApplying) {

47− m_updateApplying = status;

48− Q_EMIT updateApplyingChanged();

49− }

50−}

tests/mocks/Ubuntu/SystemImage/MockSystemImage.hdeleted−56

@@ -1,56 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#ifndef MOCK_SYSTEMIMAGE_H

18−#define MOCK_SYSTEMIMAGE_H

19−

20−#include <QObject>

21−

22−class MockSystemImage : public QObject

23−{

24− Q_OBJECT

25− Q_DISABLE_COPY(MockSystemImage)

26−

27− Q_PROPERTY(bool updateDownloaded READ updateDownloaded CONSTANT)

28− Q_PROPERTY(QString availableVersion READ availableVersion CONSTANT)

29− Q_PROPERTY(QString updateSize READ updateSize CONSTANT)

30− Q_PROPERTY(bool updateApplying READ updateApplying NOTIFY updateApplyingChanged)

31−

32−public:

33− explicit MockSystemImage(QObject *parent = nullptr);

34−

35− Q_INVOKABLE void checkForUpdate();

36− Q_INVOKABLE void applyUpdate();

37− Q_INVOKABLE void factoryReset();

38−

39− bool updateApplying() const { return m_updateApplying; }

40− // these are const only in mock

41− bool updateDownloaded() const { return true; }

42− QString availableVersion() const { return QStringLiteral("42"); }

43− QString updateSize() const { return QStringLiteral("4.2 MB"); }

44−

45−Q_SIGNALS:

46− void resettingDevice(); // only for mock

47− void updateApplyingChanged();

48−

49−private Q_SLOTS:

50− void setUpdateApplying(bool status);

51−

52−private:

53− bool m_updateApplying = false;

54−};

55−

56−#endif // MOCK_SYSTEMIMAGE_H

tests/mocks/Ubuntu/SystemImage/plugin.cppdeleted−34

@@ -1,34 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#include "plugin.h"

18−#include "MockSystemImage.h"

19−

20−#include <QtQml>

21−

22−static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

23−{

24− Q_UNUSED(engine)

25− Q_UNUSED(scriptEngine)

26− return new MockSystemImage();

27−}

28−

29−void BackendPlugin::registerTypes(const char *uri)

30−{

31− Q_ASSERT(uri == QLatin1String("Ubuntu.SystemImage"));

32−

33− qmlRegisterSingletonType<MockSystemImage>(uri, 0, 1, "SystemImage", service_provider);

34−}

tests/mocks/Ubuntu/SystemImage/plugin.hdeleted−31

@@ -1,31 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#ifndef MOCK_SYSTEMIMAGE_PLUGIN_H

18−#define MOCK_SYSTEMIMAGE_PLUGIN_H

19−

20−#include <QQmlExtensionPlugin>

21−

22−class BackendPlugin : public QQmlExtensionPlugin

23−{

24− Q_OBJECT

25− Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

26−

27−public:

28− void registerTypes(const char *uri) override;

29−};

30−

31−#endif // MOCK_SYSTEMIMAGE_PLUGIN_H

tests/mocks/Ubuntu/SystemImage/qmldirdeleted−3

@@ -1,3 +0,0 @@

1−module Ubuntu.SystemImage

2−plugin MockSystemImage

3−typeinfo SystemImage.qmltypes

tests/mocks/Unity/Application/ApplicationManager.cpp+5−7

@@ -172,7 +172,6 @@ bool ApplicationManager::add(ApplicationInfo *application) {

172

173 endInsertRows();

174 Q_EMIT countChanged();

175− if (count() == 1) Q_EMIT emptyChanged(isEmpty()); // was empty but not anymore

176

175

177 return true;

176 return true;

178}

177}

@@ -189,7 +188,6 @@ void ApplicationManager::remove(ApplicationInfo *application) {

189 endRemoveRows();

188 endRemoveRows();

190 m_modelBusy = false;

189 m_modelBusy = false;

191 Q_EMIT countChanged();

190 Q_EMIT countChanged();

192− if (isEmpty()) Q_EMIT emptyChanged(isEmpty());

193 DEBUG_MSG(application->appId() << " after: " << qPrintable(toString()));

191 DEBUG_MSG(application->appId() << " after: " << qPrintable(toString()));

194 }

192 }

195}

193}

@@ -476,6 +474,11 @@ void ApplicationManager::buildListOfAvailableApplications()

476 application->setIsTouchApp(false);

474 application->setIsTouchApp(false);

477 m_availableApplications.append(application);

475 m_availableApplications.append(application);

478

476

477+ application = new ApplicationInfo(this);

478+ application->setAppId("ubuntu-terminal-app");

479+ application->setName("Terminal");

480+ m_availableApplications.append(application);

481+

479 application = new ApplicationInfo(this);

482 application = new ApplicationInfo(this);

480 application->setAppId("primary-oriented-app");

483 application->setAppId("primary-oriented-app");

481 application->setName("Primary Oriented");

484 application->setName("Primary Oriented");

@@ -502,11 +505,6 @@ QStringList ApplicationManager::availableApplications()

502 return appIds;

505 return appIds;

503}

506}

504

507

505−bool ApplicationManager::isEmpty() const

506−{

507− return m_runningApplications.isEmpty();

508−}

509−

510ApplicationInfo *ApplicationManager::findApplication(MirSurface* surface)

508ApplicationInfo *ApplicationManager::findApplication(MirSurface* surface)

511{

509{

512 for (ApplicationInfo *app : m_runningApplications) {

510 for (ApplicationInfo *app : m_runningApplications) {

tests/mocks/Unity/Application/ApplicationManager.h+1−6

@@ -40,7 +40,6 @@ using namespace unity::shell::application;

40class ApplicationManager : public ApplicationManagerInterface {

41 Q_OBJECT

42

43− Q_PROPERTY(bool empty READ isEmpty NOTIFY emptyChanged)

44 Q_PROPERTY(QStringList availableApplications READ availableApplications NOTIFY availableApplicationsChanged)

43 Q_PROPERTY(QStringList availableApplications READ availableApplications NOTIFY availableApplicationsChanged)

45

44

46 public:

45 public:

@@ -56,8 +55,6 @@ class ApplicationManager : public ApplicationManagerInterface {

56 Q_INVOKABLE ApplicationInfo *findApplication(const QString &appId) const override;

55 Q_INVOKABLE ApplicationInfo *findApplication(const QString &appId) const override;

57 unity::shell::application::ApplicationInfoInterface *findApplicationWithSurface(unity::shell::application::MirSurfaceInterface* surface) const override;

56 unity::shell::application::ApplicationInfoInterface *findApplicationWithSurface(unity::shell::application::MirSurfaceInterface* surface) const override;

58

57

59− Q_INVOKABLE void move(int from, int to);

60−

61 // Application control methods

58 // Application control methods

62 Q_INVOKABLE bool requestFocusApplication(const QString &appId) override;

59 Q_INVOKABLE bool requestFocusApplication(const QString &appId) override;

63 Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;

60 Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;

@@ -71,17 +68,15 @@ class ApplicationManager : public ApplicationManagerInterface {

71

68

72 QModelIndex findIndex(ApplicationInfo* application);

69 QModelIndex findIndex(ApplicationInfo* application);

73

70

74− bool isEmpty() const;

75−

76 Q_SIGNALS:

71 Q_SIGNALS:

77 void focusRequested(const QString &appId);

72 void focusRequested(const QString &appId);

78− void emptyChanged(bool empty);

79 void availableApplicationsChanged(QStringList list);

73 void availableApplicationsChanged(QStringList list);

80

74

81 private Q_SLOTS:

75 private Q_SLOTS:

82 void raiseApp(const QString &appId);

76 void raiseApp(const QString &appId);

83

77

84 private:

78 private:

79+ void move(int from, int to);

85 bool add(ApplicationInfo *application);

80 bool add(ApplicationInfo *application);

86 void remove(ApplicationInfo* application);

81 void remove(ApplicationInfo* application);

87 void buildListOfAvailableApplications();

82 void buildListOfAvailableApplications();

tests/mocks/Unity/Application/MirSurface.cpp+5

@@ -452,6 +452,11 @@ void MirSurface::setHeightIncrement(int value)

452void MirSurface::close()

453{

454 DEBUG_MSG("");

455+

456+ for (int i = 0; i < m_childSurfaceList->count(); ++i) {

457+ m_childSurfaceList->get(i)->close();

458+ }

459+

455 if (!m_zombieTimer.isActive()) {

460 if (!m_zombieTimer.isActive()) {

456 m_zombieTimer.start();

461 m_zombieTimer.start();

457 Q_EMIT closeRequested();

462 Q_EMIT closeRequested();

tests/mocks/WindowManager/CMakeLists.txt+3

@@ -1,6 +1,7 @@

1include_directories(

2 SYSTEM

3 ${QTMIRSERVER_INCLUDE_DIRS}

4+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

4)

5)

5

6

6include_directories(

7include_directories(

@@ -24,12 +25,14 @@ install(TARGETS mockwindowmanagmentpolicy

24 )

25 )

25

26

26set(WINDOWMANAGER_SRC

27set(WINDOWMANAGER_SRC

28+ ${CMAKE_SOURCE_DIR}/plugins/WindowManager/AvailableDesktopArea.cpp

27 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/Screen.cpp

29 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/Screen.cpp

28 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/ScreenAttached.cpp

30 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/ScreenAttached.cpp

29 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/Screens.cpp

31 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/Screens.cpp

30 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/ScreenWindow.cpp

32 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/ScreenWindow.cpp

31 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/TopLevelWindowModel.cpp

33 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/TopLevelWindowModel.cpp

32 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/Window.cpp

34 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/Window.cpp

35+ ${CMAKE_SOURCE_DIR}/plugins/WindowManager/WindowMargins.cpp

33 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/WindowManagerObjects.cpp

36 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/WindowManagerObjects.cpp

34 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/WorkspaceManager.cpp

37 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/WorkspaceManager.cpp

35 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/WorkspaceModel.cpp

38 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/WorkspaceModel.cpp

tests/mocks/WindowManager/WindowManagerPlugin.cpp+8−4

@@ -16,19 +16,21 @@

16

17#include "WindowManagerPlugin.h"

18

19+#include "AvailableDesktopArea.h"

19#include "MockScreens.h"

20#include "MockScreens.h"

20#include "MockScreenWindow.h"

21#include "MockScreenWindow.h"

21#include "Screen.h"

22#include "Screen.h"

22#include "ScreenAttached.h"

23#include "ScreenAttached.h"

23#include "Screens.h"

24#include "Screens.h"

25+#include "ScreensConfiguration.h"

24#include "TopLevelWindowModel.h"

26#include "TopLevelWindowModel.h"

25#include "Window.h"

27#include "Window.h"

28+#include "WindowMargins.h"

29+#include "WindowManagementPolicy.h"

30+#include "WindowManagerObjects.h"

26#include "WorkspaceManager.h"

31#include "WorkspaceManager.h"

27#include "Workspace.h"

32#include "Workspace.h"

28#include "WorkspaceModel.h"

33#include "WorkspaceModel.h"

29−#include "WindowManagementPolicy.h"

30−#include "WindowManagerObjects.h"

31−#include "ScreensConfiguration.h"

32

34

33#include <QtQml>

35#include <QtQml>

34

36

@@ -53,6 +55,8 @@ QObject* objectsSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {

53

55

54void WindowManagerPlugin::registerTypes(const char *uri)

56void WindowManagerPlugin::registerTypes(const char *uri)

55{

57{

58+ qmlRegisterType<AvailableDesktopArea>(uri, 1, 0, "AvailableDesktopArea");

59+ qmlRegisterType<WindowMargins>(uri, 1, 0, "WindowMargins");

56 qmlRegisterSingletonType<WorkspaceManager>(uri, 1, 0, "WorkspaceManager", workspace_manager);

60 qmlRegisterSingletonType<WorkspaceManager>(uri, 1, 0, "WorkspaceManager", workspace_manager);

57 qmlRegisterUncreatableType<WorkspaceModel>(uri, 1, 0, "WorkspaceModel", notInstantiatable);

61 qmlRegisterUncreatableType<WorkspaceModel>(uri, 1, 0, "WorkspaceModel", notInstantiatable);

58 qmlRegisterSingletonType<ConcreteScreens>(uri, 1, 0, "Screens", screensSingleton);

62 qmlRegisterSingletonType<ConcreteScreens>(uri, 1, 0, "Screens", screensSingleton);

@@ -67,7 +71,7 @@ void WindowManagerPlugin::registerTypes(const char *uri)

67 qRegisterMetaType<Window*>("Window*");

71 qRegisterMetaType<Window*>("Window*");

68 qRegisterMetaType<QAbstractListModel*>("QAbstractListModel*");

72 qRegisterMetaType<QAbstractListModel*>("QAbstractListModel*");

69

73

70− qmlRegisterType<MockScreenWindow>(uri, 1, 0, "ScreenWindow");

74+ qmlRegisterType<ScreenWindow>(uri, 1, 0, "ScreenWindow");

71 qmlRegisterRevision<QWindow,1>(uri, 1, 0);

75 qmlRegisterRevision<QWindow,1>(uri, 1, 0);

72

76

73 qmlRegisterUncreatableType<WMScreen>(uri, 1, 0, "WMScreen", notInstantiatable);

77 qmlRegisterUncreatableType<WMScreen>(uri, 1, 0, "WMScreen", notInstantiatable);

tests/plugins/Unity/CMakeLists.txt+1

@@ -1,3 +1,4 @@

1add_subdirectory(Indicators)

2add_subdirectory(Launcher)

3+add_subdirectory(Platform)

3add_subdirectory(Session)

4add_subdirectory(Session)

tests/plugins/Unity/Platform/CMakeLists.txtnew file+30

@@ -0,0 +1,30 @@

1+

2+include_directories(

3+ ${Qt5Core_INCLUDE_DIRS}

4+ ${Qt5DBus_INCLUDE_DIRS}

5+ ${Qt5Test_INCLUDE_DIRS}

6+ ${QTDBUSTEST_INCLUDE_DIRS}

7+ ${CMAKE_CURRENT_BINARY_DIR}

8+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Platform

9+)

10+

11+add_executable(platformtest

12+ platformtest.cpp

13+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Platform/platform.cpp

14+ )

15+

16+target_link_libraries(platformtest

17+ Qt5::Core

18+ Qt5::DBus

19+ Qt5::Test

20+ ${QTDBUSTEST_LDFLAGS}

21+ )

22+

23+

24+install(TARGETS platformtest

25+ DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Unity/Platform"

26+)

27+

28+add_unity8_unittest(Platform qdbus-simple-test-runner

29+ ARGS $<TARGET_FILE:platformtest>

30+ )

tests/plugins/Unity/Platform/platformtest.cppnew file+142

@@ -0,0 +1,142 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Pete Woods <pete.woods@canonical.com>

18+ */

19+

20+#include "platform.h"

21+

22+#include <libqtdbustest/DBusTestRunner.h>

23+#include <libqtdbusmock/DBusMock.h>

24+

25+#include <QtTest>

26+#include <QDebug>

27+

28+using namespace QtDBusTest;

29+using namespace QtDBusMock;

30+

31+class PlatformTest: public QObject

32+{

33+

34+Q_OBJECT

35+

36+private:

37+ struct TestFixture

38+ {

39+ TestFixture() :

40+ mock(dbus)

41+ {

42+ }

43+

44+ DBusTestRunner dbus;

45+ DBusMock mock;

46+ };

47+

48+ QScopedPointer<TestFixture> m_data;

49+

50+ void registerLogin1(bool canMultiSession, bool canGraphical)

51+ {

52+ m_data->mock.registerLogin1({{"DefaultSeat", QVariantMap

53+ {

54+ {"CanMultiSession", canMultiSession},

55+ {"CanGraphical", canGraphical}

56+ }}}

57+ );

58+ }

59+

60+ void registerHostname1(const QString& chassis)

61+ {

62+ m_data->mock.registerHostname1({

63+ {"Chassis", chassis}

64+ });

65+ }

66+

67+ void startServices()

68+ {

69+ m_data->dbus.startServices();

70+ }

71+

72+private Q_SLOTS:

73+

74+ void init()

75+ {

76+ m_data.reset(new TestFixture);

77+ }

78+

79+ void cleanup()

80+ {

81+ m_data.reset();

82+ }

83+

84+ void testIsPC_data()

85+ {

86+ QTest::addColumn<QString>("chassis");

87+ QTest::addColumn<bool>("result");

88+

89+ QTest::newRow("vm") << "vm" << true;

90+ QTest::newRow("container") << "container" << true;

91+ QTest::newRow("desktop") << "desktop" << true;

92+ QTest::newRow("laptop") << "laptop" << true;

93+ QTest::newRow("server") << "server" << true;

94+ QTest::newRow("tablet") << "tablet" << false;

95+ QTest::newRow("handset") << "handset" << false;

96+ QTest::newRow("watch") << "watch" << false;

97+ QTest::newRow("embedded") << "embedded" << true;

98+ }

99+

100+ void testIsPC()

101+ {

102+ QFETCH(QString, chassis);

103+ QFETCH(bool, result);

104+

105+ registerLogin1(true, true);

106+ registerHostname1(chassis);

107+ startServices();

108+

109+ Platform p;

110+ QCOMPARE(p.isPC(), result);

111+ QCOMPARE(p.chassis(), chassis);

112+ }

113+

114+ void testIsMultiSession_data()

115+ {

116+ QTest::addColumn<bool>("canMultiSession");

117+ QTest::addColumn<bool>("canGraphical");

118+ QTest::addColumn<bool>("result");

119+

120+ QTest::newRow("") << true << true << true;

121+ QTest::newRow("") << true << false << false;

122+ QTest::newRow("") << false << true << false;

123+ QTest::newRow("") << false << false << false;

124+ }

125+

126+ void testIsMultiSession()

127+ {

128+ QFETCH(bool, canMultiSession);

129+ QFETCH(bool, canGraphical);

130+ QFETCH(bool, result);

131+

132+ registerLogin1(canMultiSession, canGraphical);

133+ registerHostname1("desktop");

134+ startServices();

135+

136+ Platform p;

137+ QCOMPARE(p.isMultiSession(), result);

138+ }

139+};

140+

141+QTEST_GUILESS_MAIN(PlatformTest)

142+#include "platformtest.moc"

tests/plugins/Utils/WindowStateStorageTest.cpp+9

@@ -56,6 +56,15 @@ private Q_SLOTS:

56 QTRY_COMPARE(storage->getStage(QTest::currentTestFunction(), 0), stage);

57 }

58

59+ void testProtectAgainstInvalidGeometry() {

60+ const QRect geometry{10, 20, 0, 10}; // zero-width (invalid) rectangle

61+ storage->saveGeometry(QTest::currentTestFunction(), geometry);

62+ const QRect defaultGeometry{10, 20, 30, 40};

63+ const QRect loadedGeometry = storage->getGeometry(QTest::currentTestFunction(), defaultGeometry);

64+ // ensure we don't load a broken geometry, instead we fall back to the default one

65+ QCOMPARE(loadedGeometry, defaultGeometry);

66+ }

67+

59private:

68private:

60 WindowStateStorage * storage{nullptr};

69 WindowStateStorage * storage{nullptr};

61};

70};

tests/plugins/WindowManager/UnityApplicationMocks.h+8−1

@@ -104,7 +104,14 @@ class Application : public ApplicationInfoInterface

104{

105 Q_OBJECT

106public:

107+ Application(QString appId)

107− Application(QString appId) : ApplicationInfoInterface(appId, nullptr), m_appId(std::move(appId)) {}

108+ : ApplicationInfoInterface(appId, nullptr)

109+ , m_appId(std::move(appId))

110+ , m_state(Starting)

111+ , m_requestedState(RequestedRunning)

112+ {

113+

114+ }

108

115

109 void close() override {}

116 void close() override {}

110 QString appId() const override { return m_appId;}

117 QString appId() const override { return m_appId;}

tests/qmltests/ApplicationMenus/tst_MenuBar.qml+33

@@ -329,6 +329,14 @@ Item {

329 return false;

330 }, true);

331

332+ mouseClick(overflow);

333+ verify(overflow.__popup);

334+ var menuItem = findChild(menuBar, "overflow-menu-item0-actionItem");

335+ waitForRendering(menuItem);

336+ mouseClick(menuItem);

337+

338+ verify(findChild(menuBar, "overflow-menu-item0-menu-item0-actionItem"));

339+

332 tryCompareFunction(function() {

340 tryCompareFunction(function() {

333 menuBackend.removeRow(0);

341 menuBackend.removeRow(0);

334 wait(1);

342 wait(1);

@@ -339,6 +347,31 @@ Item {

339 }, true);

347 }, true);

340 }

348 }

341

349

350+ function test_stray_submenus() {

351+ menuBackend.modelData = appMenuData.generateTestData(3,4,1,0,"menu");

352+ var priv = findInvisibleChild(menuBar, "d");

353+

354+ var menuItem = findChild(menuBar, "menuBar-item0");

355+ menuItem.show();

356+ compare(priv.currentItem, menuItem, "CurrentItem should be set to item 0");

357+ compare(priv.currentItem.popupVisible, true, "Popup should be visible");

358+

359+ var actionItem = findChild(menuBar, "menuBar-item0-menu-item0-actionItem");

360+ mouseClick(actionItem);

361+

362+ actionItem = findChild(menuBar, "menuBar-item0-menu-item0-menu-item0-actionItem");

363+ mouseClick(actionItem);

364+

365+ actionItem = findChild(menuBar, "menuBar-item0-menu-item0-menu-item0-menu-item0-actionItem");

366+

367+ // There's one popup

368+ tryCompareFunction(function() { return findChildsByType(root, "MenuPopup").length; }, 3);

369+

370+ menuBackend.modelData = null;

371+

372+ tryCompareFunction(function() { return findChildsByType(root, "MenuPopup").length; }, 0);

373+ }

374+

342 function test_firstDisabled() {

375 function test_firstDisabled() {

343 var data = appMenuData.generateTestData(10,5,2,3);

376 var data = appMenuData.generateTestData(10,5,2,3);

344 data[0].submenu[1].submenu[0].rowData.sensitive = false;

377 data[0].submenu[1].submenu[0].rowData.sensitive = false;

tests/qmltests/Greeter/TestView.qml−5

@@ -46,7 +46,6 @@ Item {

46 signal tease()

47 signal emergencyCall()

48

49− signal _showLastChanceCalled()

50 signal _hideCalled()

49 signal _hideCalled()

51 signal _showFakePasswordCalled()

50 signal _showFakePasswordCalled()

52 signal _notifyAuthenticationFailedCalled()

51 signal _notifyAuthenticationFailedCalled()

@@ -54,10 +53,6 @@ Item {

54 signal _forceShowCalled()

53 signal _forceShowCalled()

55 signal _tryToUnlockCalled(bool toTheRight)

54 signal _tryToUnlockCalled(bool toTheRight)

56

55

57− function showLastChance() {

58− _showLastChanceCalled();

59− }

60−

61 function hide() {

56 function hide() {

62 _hideCalled();

57 _hideCalled();

63 _required = false;

58 _required = false;

tests/qmltests/Greeter/tst_Greeter.qml−7

@@ -94,12 +94,6 @@ Item {

94 property Item greeter: loader.status === Loader.Ready ? loader.item : null

95 property Item view

96

97− SignalSpy {

98− id: viewShowLastChanceSpy

99− target: testCase.view

100− signalName: "_showLastChanceCalled"

101− }

102−

103 SignalSpy {

97 SignalSpy {

104 id: viewHideSpy

98 id: viewHideSpy

105 target: testCase.view

99 target: testCase.view

@@ -147,7 +141,6 @@ Item {

147 Biometryd.available = true;

141 Biometryd.available = true;

148 AccountsService.enableFingerprintIdentification = true;

142 AccountsService.enableFingerprintIdentification = true;

149 AccountsService.failedFingerprintLogins = 0;

143 AccountsService.failedFingerprintLogins = 0;

150− viewShowLastChanceSpy.clear();

151 viewHideSpy.clear();

144 viewHideSpy.clear();

152 viewShowFakePasswordSpy.clear();

145 viewShowFakePasswordSpy.clear();

153 viewAuthenticationFailedSpy.clear();

146 viewAuthenticationFailedSpy.clear();

tests/qmltests/Launcher/tst_Launcher.qml+32−6

@@ -1254,14 +1254,14 @@ Rectangle {

1254 tryCompare(quickList, "selectedIndex", 0)

1255

1256 // Down should move down the quicklist

1257+ // Because item 1 is not selectable

1257 keyClick(Qt.Key_Down);

1258 keyClick(Qt.Key_Down);

1258− tryCompare(quickList, "selectedIndex", 1)

1259+ tryCompare(quickList, "selectedIndex", 2)

1259

1260

1260 // The quicklist should wrap around too

1261 // The quicklist should wrap around too

1261 keyClick(Qt.Key_Down);

1262 keyClick(Qt.Key_Down);

1263 keyClick(Qt.Key_Down);

1264 keyClick(Qt.Key_Down);

1264− keyClick(Qt.Key_Down);

1265 tryCompare(quickList, "selectedIndex", 0)

1266

1267 // Left gets us back to the launcher

@@ -1286,14 +1286,14 @@ Rectangle {

1286

1287 keyClick(Qt.Key_Down); // Down to launcher item 0

1288 keyClick(Qt.Key_Down); // Down to launcher item 1

1289− keyClick(Qt.Key_Right); // Into quicklist

1289+ keyClick(Qt.Key_Right); // Into quicklist, item 0 is selected

1290− keyClick(Qt.Key_Down); // Down to quicklist item 1

1291− keyClick(Qt.Key_Down); // Down to quicklist item 2

1290+ keyClick(Qt.Key_Down); // Down to quicklist item 2 (because 1 is not selectable)

1291+ keyClick(Qt.Key_Down); // Down to quicklist item 3

1292 keyClick(Qt.Key_Enter); // Trigger it

1293

1294 compare(signalSpy.count, 1, "Quicklist signal wasn't triggered")

1295 compare(signalSpy.signalArguments[0][0], LauncherModel.get(1).appId)

1296− compare(signalSpy.signalArguments[0][1], 2)

1296+ compare(signalSpy.signalArguments[0][1], 3)

1297 assertFocusOnIndex(-2);

1298 }

1299

@@ -1542,5 +1542,31 @@ Rectangle {

1542 tryCompare(launcher, "maxPanelX", 0);

1543 launcher.panelWidth = oldSize;

1544 }

1545+

1546+ function test_mouseHoverSelectQuickList() {

1547+ dragLauncherIntoView();

1548+ var clickedItem = findChild(launcher, "launcherDelegate5")

1549+ var quickList = findChild(launcher, "quickList")

1550+

1551+ // Initial state

1552+ tryCompare(quickList, "state", "")

1553+

1554+ // Open quickList

1555+ mouseClick(clickedItem, clickedItem.width / 2, clickedItem.height / 2, Qt.RightButton)

1556+ verify(quickList, "state", "open")

1557+ compare(quickList.selectedIndex, -1)

1558+

1559+ var qEntry = findChild(launcher, "quickListEntry0");

1560+ mouseMove(qEntry, qEntry.width / 2 , qEntry.height / 2, 10);

1561+ mouseMove(qEntry, qEntry.width / 2 + 1, qEntry.height / 2, 10);

1562+

1563+ tryCompare(quickList, "selectedIndex", 0)

1564+

1565+ qEntry = findChild(launcher, "quickListEntry1");

1566+ mouseMove(qEntry, qEntry.width / 2 , qEntry.height / 2, 10);

1567+ mouseMove(qEntry, qEntry.width / 2 + 1, qEntry.height / 2, 10);

1568+

1569+ tryCompare(quickList, "selectedIndex", -1)

1570+ }

1545 }

1571 }

1546}

1572}

tests/qmltests/Stage/tst_DesktopStage.qml+17

@@ -94,9 +94,16 @@ Item {

94 orientations: Orientations {}

95 applicationManager: ApplicationManager

96 topLevelSurfaceList: topSurfaceList

97+ availableDesktopArea: availableDesktopAreaItem

97 interactive: true

98 interactive: true

98 mode: "windowed"

99 mode: "windowed"

99 panelState: PanelState {}

100 panelState: PanelState {}

101+

102+ Item {

103+ id: availableDesktopAreaItem

104+ anchors.fill: parent

105+ anchors.topMargin: parent.panelState.panelHeight

106+ }

100 }

107 }

101 }

108 }

102 }

109 }

@@ -1051,5 +1058,15 @@ Item {

1051 tap(maxButton);

1058 tap(maxButton);

1052 tryCompare(appDelegate, "state", "maximized");

1059 tryCompare(appDelegate, "state", "maximized");

1053 }

1060 }

1061+

1062+ function test_childWindowGetsActiveFocus() {

1063+ var appDelegate = startApplication("kate");

1064+ appDelegate.surface.openDialog(units.gu(5), units.gu(5), units.gu(30), units.gu(30));

1065+ var childWindow = findChild(appDelegate, "childWindow");

1066+ verify(childWindow);

1067+ var surfaceItem = findChild(childWindow, "surfaceItem");

1068+ verify(surfaceItem);

1069+ tryCompare(surfaceItem, "activeFocus", true);

1070+ }

1054 }

1071 }

1055}

1072}

tests/qmltests/Stage/tst_PhoneStage.qml+5

@@ -49,6 +49,11 @@ Item {

49 applicationManager: ApplicationManager

50 mode: "staged"

51 topLevelSurfaceList: root.topLevelSurfaceList

52+ availableDesktopArea: availableDesktopAreaItem

53+ Item {

54+ id: availableDesktopAreaItem

55+ anchors.fill: parent

56+ }

52

57

53 Component.onCompleted: {

58 Component.onCompleted: {

54 ApplicationManager.startApplication("unity8-dash");

59 ApplicationManager.startApplication("unity8-dash");

tests/qmltests/Stage/tst_TabletStage.qml+5

@@ -59,6 +59,11 @@ Rectangle {

59 applicationManager: ApplicationManager

60 topLevelSurfaceList: root.topLevelSurfaceList

61 panelState: PanelState {}

62+ availableDesktopArea: availableDesktopAreaItem

63+ Item {

64+ id: availableDesktopAreaItem

65+ anchors.fill: parent

66+ }

62

67

63 Component.onCompleted: {

68 Component.onCompleted: {

64 print("starting dash")

69 print("starting dash")

tests/qmltests/Wizard/tst_Wizard.qml−6

@@ -336,8 +336,6 @@ Item {

336 // now finish up

337 page = waitForPage("reportingPage");

338 tap(findChild(page, "forwardButton"));

339− page = waitForPage("systemUpdatePage");

340− tap(findChild(page, "forwardButton"));

341 page = waitForPage("finishedPage");

339 page = waitForPage("finishedPage");

342 waitUntilTransitionsEnd(page);

340 waitUntilTransitionsEnd(page);

343 tap(findChild(page, "finishButton"));

341 tap(findChild(page, "finishButton"));

@@ -378,8 +376,6 @@ Item {

378 // now finish up

376 // now finish up

379 page = waitForPage("reportingPage");

377 page = waitForPage("reportingPage");

380 tap(findChild(page, "forwardButton"));

378 tap(findChild(page, "forwardButton"));

381− page = waitForPage("systemUpdatePage");

382− tap(findChild(page, "forwardButton"));

383 page = waitForPage("finishedPage");

379 page = waitForPage("finishedPage");

384 waitUntilTransitionsEnd(page);

380 waitUntilTransitionsEnd(page);

385 tap(findChild(page, "finishButton"));

381 tap(findChild(page, "finishButton"));

@@ -398,8 +394,6 @@ Item {

398 tap(findChild(page, "forwardButton"));

394 tap(findChild(page, "forwardButton"));

399 page = waitForPage("reportingPage");

395 page = waitForPage("reportingPage");

400 tap(findChild(page, "forwardButton"));

396 tap(findChild(page, "forwardButton"));

401− page = waitForPage("systemUpdatePage");

402− tap(findChild(page, "forwardButton"));

403 page = waitForPage("finishedPage");

397 page = waitForPage("finishedPage");

404 waitUntilTransitionsEnd(page);

398 waitUntilTransitionsEnd(page);

405 tap(findChild(page, "finishButton"));

399 tap(findChild(page, "finishButton"));

tests/qmltests/tst_Shell.qml+19

@@ -1463,6 +1463,25 @@ Rectangle {

1463 confirmLoggedIn(true);

1464 }

1465

1466+ function test_terminalShortcut() {

1467+ loadShell("desktop");

1468+ shell.usageScenario = "desktop";

1469+ waitForRendering(shell);

1470+ swipeAwayGreeter();

1471+

1472+ // not running, should start

1473+ keyClick(Qt.Key_T, Qt.ControlModifier|Qt.AltModifier);

1474+ tryCompare(ApplicationManager, "focusedApplicationId", "ubuntu-terminal-app");

1475+

1476+ // start something else

1477+ ApplicationManager.startApplication("dialer-app");

1478+ tryCompare(ApplicationManager, "focusedApplicationId", "dialer-app");

1479+

1480+ // terminal running in background, should get focused

1481+ keyClick(Qt.Key_T, Qt.ControlModifier|Qt.AltModifier);

1482+ tryCompare(ApplicationManager, "focusedApplicationId", "ubuntu-terminal-app");

1483+ }

1484+

1466 function test_launcherInverted_data() {

1485 function test_launcherInverted_data() {

1467 return [

1486 return [

1468 {tag: "phone", formFactor: "phone", usageScenario: "phone", launcherInverted: true},

1487 {tag: "phone", formFactor: "phone", usageScenario: "phone", launcherInverted: true},

tests/qmltests/tst_ShellApplication.qml+50

@@ -20,6 +20,7 @@ import LightDM.FullLightDM 0.1 as LightDM

20import LightDMController 0.1

21import Unity.Application 0.1

22import Unity.Test 0.1

23+import Unity.InputInfo 0.1

23

24

24import "../../qml"

25import "../../qml"

25import "../../qml/Components"

26import "../../qml/Components"

@@ -85,6 +86,23 @@ Rectangle {

85 }

86 }

87 }

88 }

89+ Button {

90+ anchors {

91+ left: parent.left

92+ right: parent.right

93+ }

94+ action: addMouseAction

95+ color: addMouseAction.checked ? UbuntuColors.red : UbuntuColors.green

96+ }

97+

98+ Button {

99+ anchors {

100+ left: parent.left

101+ right: parent.right

102+ }

103+ action: addKBAction

104+ color: addKBAction.checked ? UbuntuColors.red : UbuntuColors.green

105+ }

88

106

89 MouseTouchEmulationCheckbox {

107 MouseTouchEmulationCheckbox {

90 id: mouseEmulation

108 id: mouseEmulation

@@ -157,6 +175,38 @@ Rectangle {

157 }

175 }

158 }

176 }

159

177

178+ Action {

179+ id: addMouseAction

180+ text: checked ? "Remove Mouse" : "Add Mouse"

181+ onTriggered: {

182+ if (checked) {

183+ console.log("ADD")

184+ MockInputDeviceBackend.addMockDevice("/mouse0", InputInfo.Mouse);

185+ } else {

186+ console.log("REMOVE")

187+ MockInputDeviceBackend.removeDevice("/mouse0");

188+ }

189+ }

190+ iconName: "input-mouse-symbolic"

191+ checkable: true

192+ checked: false

193+ }

194+

195+ Action {

196+ id: addKBAction

197+ text: checked ? "Remove Keyboard" : "Add Keyboard"

198+ onTriggered: {

199+ if (checked) {

200+ MockInputDeviceBackend.addMockDevice("/kbd0", InputInfo.Keyboard);

201+ } else {

202+ MockInputDeviceBackend.removeDevice("/kbd0");

203+ }

204+ }

205+ iconName: "input-keyboard-symbolic"

206+ checkable: true

207+ checked: false

208+ }

209+

160 ShellApplication {

210 ShellApplication {

161 }

211 }

162

212

tests/qmltests/tst_ShellWithPin.qml−40

@@ -21,7 +21,6 @@ import AccountsService 0.1

21import GSettings 1.0

22import LightDMController 0.1

23import LightDM.FullLightDM 0.1 as LightDM

24−import Ubuntu.SystemImage 0.1

25import Ubuntu.Telephony 0.1 as Telephony

24import Ubuntu.Telephony 0.1 as Telephony

26import Unity.Application 0.1

25import Unity.Application 0.1

27import Unity.Test 0.1 as UT

26import Unity.Test 0.1 as UT

@@ -80,19 +79,6 @@ Item {

80 text: "Show Greeter"

79 text: "Show Greeter"

81 onClicked: LightDM.Greeter.showGreeter()

80 onClicked: LightDM.Greeter.showGreeter()

82 }

81 }

83−

84− Label {

85− text: "Max retries:"

86− color: "black"

87− }

88− TextField {

89− id: maxRetriesTextField

90− text: "-1"

91− onTextChanged: {

92− var greeter = testCase.findChild(shellLoader.item, "greeter");

93− greeter.maxFailedLogins = text;

94− }

95− }

96 }

82 }

97 }

83 }

98 }

84 }

@@ -102,12 +88,6 @@ Item {

102 signalName: "sessionStarted"

88 signalName: "sessionStarted"

103 }

89 }

104

90

105− SignalSpy {

106− id: resetSpy

107− target: SystemImage

108− signalName: "resettingDevice"

109− }

110−

111 Telephony.CallEntry {

91 Telephony.CallEntry {

112 id: phoneCall

92 id: phoneCall

113 phoneNumber: "+447812221111"

93 phoneNumber: "+447812221111"

@@ -141,7 +121,6 @@ Item {

141 sessionSpy.target = greeter;

121 sessionSpy.target = greeter;

142 swipeAwayGreeter(true);

122 swipeAwayGreeter(true);

143 greeter.failedLoginsDelayAttempts = -1;

123 greeter.failedLoginsDelayAttempts = -1;

144− greeter.maxFailedLogins = -1;

145

124

146 var launcher = findChild(shell, "launcher");

125 var launcher = findChild(shell, "launcher");

147 var panel = findChild(launcher, "launcherPanel");

126 var panel = findChild(launcher, "launcherPanel");

@@ -361,25 +340,6 @@ Item {

361 tryCompare(delayedLockscreen, "delayMinutes", greeter.failedLoginsDelayMinutes);

340 tryCompare(delayedLockscreen, "delayMinutes", greeter.failedLoginsDelayMinutes);

362 }

341 }

363

342

364− function test_factoryReset() {

365− skip("Factory reset support is not finished")

366−

367− maxRetriesTextField.text = "3"

368− resetSpy.clear()

369−

370− enterPin("1111")

371− enterPin("1111")

372−

373− var dialog = findChild(root, "infoPopup")

374− var button = findChild(dialog, "infoPopupOkButton")

375− tap(button)

376− tryCompareFunction(function() {return findChild(root, "infoPopup", 0 /* timeout */)}, null)

377−

378− tryCompare(resetSpy, "count", 0)

379− enterPin("1111")

380− tryCompare(resetSpy, "count", 1)

381− }

382−

383 function test_emergencyDialerLockOut() {

343 function test_emergencyDialerLockOut() {

384 // This is a theoretical attack on the lockscreen: Enter emergency

344 // This is a theoretical attack on the lockscreen: Enter emergency

385 // dialer mode on a phone, then plug into a larger screen,

345 // dialer mode on a phone, then plug into a larger screen,

tools/CMakeLists.txt+1

@@ -1,3 +1,4 @@

1+add_subdirectory(indicatorsclient)

1add_subdirectory(menutool)

2add_subdirectory(menutool)

2add_subdirectory(scopetool)

3add_subdirectory(scopetool)

3

4

src/Panel/Indicators/client/CMakeLists.txt → tools/indicatorsclient/CMakeLists.txtrenamed

The content is the same.

src/Panel/Indicators/client/indicatorsclient.cpp → tools/indicatorsclient/indicatorsclient.cpprenamed

The content is the same.

src/Panel/Indicators/client/indicatorsclient.h → tools/indicatorsclient/indicatorsclient.hrenamed

The content is the same.

src/Panel/Indicators/client/main.cpp → tools/indicatorsclient/main.cpprenamed

The content is the same.