1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2016-10-24 11:34:08 +0000
3
+++ CMakeLists.txt	2016-12-12 16:49:02 +0000
4
@@ -40,6 +40,19 @@
5
40
  ENABLE_COVERAGE_REPORT(TARGETS ${SHELL_APP} FILTER /usr/include ${CMAKE_SOURCE_DIR}/tests/* ${CMAKE_BINARY_DIR}/*)
40
  ENABLE_COVERAGE_REPORT(TARGETS ${SHELL_APP} FILTER /usr/include ${CMAKE_SOURCE_DIR}/tests/* ${CMAKE_BINARY_DIR}/*)
6
41
endif()
41
endif()
7
42
42
8
43
find_package (ECM 1.7.0 QUIET NO_MODULE)
9
44
if (ECM_FOUND)
10
45
    # Provides us with -DECM_ENABLE_SANITIZERS='X'
11
46
    # Where X can be address, thread, memory, leak, undefined
12
47
    include("${ECM_MODULE_DIR}/ECMEnableSanitizers.cmake")
13
48
endif()
14
49
15
50
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
16
51
  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")
17
52
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override" )
18
53
  endif()
19
54
endif()
20
55
21
43
# Make sure we have all the needed symbols
56
# Make sure we have all the needed symbols
22
44
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
57
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
23
45
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,defs")
58
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,defs")
24
@@ -57,7 +70,7 @@
25
57
find_package(Qt5Concurrent 5.4 REQUIRED)
70
find_package(Qt5Concurrent 5.4 REQUIRED)
26
58
find_package(Qt5Sql 5.4 REQUIRED)
71
find_package(Qt5Sql 5.4 REQUIRED)
27
59
72
29
60
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=22)
73
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=23)
30
61
pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
74
pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
31
62
pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
75
pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
32
63
pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
76
pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
33
64
77
34
=== modified file 'data/com.canonical.Unity8.gschema.xml'
35
--- data/com.canonical.Unity8.gschema.xml	2016-11-16 05:54:50 +0000
36
+++ data/com.canonical.Unity8.gschema.xml	2016-12-12 16:49:02 +0000
37
@@ -12,7 +12,7 @@
38
12
      <description>The usage mode chosen will affect the Window Management behaviour.</description>
12
      <description>The usage mode chosen will affect the Window Management behaviour.</description>
39
13
    </key>
13
    </key>
40
14
    <key type="y" name="edge-barrier-sensitivity">
14
    <key type="y" name="edge-barrier-sensitivity">
42
15
      <default>35</default>
15
      <default>50</default>
43
16
      <range min="1" max="100"/>
16
      <range min="1" max="100"/>
44
17
      <summary>Sensitivity of screen edge barriers for the mouse pointer.</summary>
17
      <summary>Sensitivity of screen edge barriers for the mouse pointer.</summary>
45
18
      <description>Some UI actions like revealing the launcher or the applications spread are triggered by pushing the mouse pointer against a screen edge. This key defines how much you have to push in order to trigger the associated action.</description>
18
      <description>Some UI actions like revealing the launcher or the applications spread are triggered by pushing the mouse pointer against a screen edge. This key defines how much you have to push in order to trigger the associated action.</description>
46
@@ -23,7 +23,7 @@
47
23
      <description>How much you have to push  (in grid units)the mouse against an edge barrier when sensibility is 100.</description>
23
      <description>How much you have to push  (in grid units)the mouse against an edge barrier when sensibility is 100.</description>
48
24
    </key>
24
    </key>
49
25
    <key type="u" name="edge-barrier-max-push">
25
    <key type="u" name="edge-barrier-max-push">
51
26
      <default>60</default>
26
      <default>120</default>
52
27
      <summary>Maximum push needed to overcome edge barrier</summary>
27
      <summary>Maximum push needed to overcome edge barrier</summary>
53
28
      <description>How much you have to push (in grid units) the mouse against an edge barrier when sensibility is 1.</description>
28
      <description>How much you have to push (in grid units) the mouse against an edge barrier when sensibility is 1.</description>
54
29
    </key>
29
    </key>
55
30
30
56
=== modified file 'debian/changelog'
57
--- debian/changelog	2016-11-29 09:43:33 +0000
58
+++ debian/changelog	2016-12-12 16:49:02 +0000
59
@@ -1,3 +1,36 @@
60
1
unity8 (8.15+17.04.20161207.1-0ubuntu1) zesty; urgency=medium
61
2
62
3
  [ Albert Astals Cid ]
63
4
  * Add the Wsuggest-override flag to gcc
64
5
  * Add support for compiler sanitizers via ECM
65
6
  * Use timeStep as delay time (LP: #1642919)
66
7
  * Bring back fix for 1517830 (LP: #1517830)
67
8
  * Fix compile warnings in mocks
68
9
  * Do not hide panel when launching an application if the mouse is on
69
10
    the panel (LP: #1591311)
70
11
71
12
  [ Daniel d'Andrada ]
72
13
  * Fix "make tryApplicationWindow"
73
14
  * Take save/restore functions out of WindowResizeArea
74
15
75
16
  [ Josh Arenson ]
76
17
  * Enable the greeter to remember which session the user last logged
77
18
    into (LP: #1631365)
78
19
79
20
  [ Lukáš Tinkl ]
80
21
  * Fix the Super key not invoking the dash scope home (LP: #1607427)
81
22
82
23
  [ Michael Zanetti ]
83
24
  * Add the ApplicationDrawer
84
25
  * tune right edge push (LP: #1646094)
85
26
  * improve close button visiblity when hovering with the mouse
86
27
  * Update virtual touchpad visuals and add a tutorial. (LP: #1585220)
87
28
88
29
  [ Pete Woods ]
89
30
  * MenuItemFactory: Add subtitle support to SwitchItem widget
90
31
91
32
 -- Michał Sawicz <michal.sawicz@canonical.com>  Wed, 07 Dec 2016 13:49:24 +0000
92
33
93
1
unity8 (8.15+17.04.20161129-0ubuntu1) zesty; urgency=medium
34
unity8 (8.15+17.04.20161129-0ubuntu1) zesty; urgency=medium
94
2
35
95
3
  [ Albert Astals Cid ]
36
  [ Albert Astals Cid ]
96
4
37
97
=== modified file 'debian/control'
98
--- debian/control	2016-11-29 09:40:16 +0000
99
+++ debian/control	2016-12-12 16:49:02 +0000
100
@@ -38,7 +38,7 @@
101
38
               libubuntugestures5-private-dev (>= 1.3.2030),
38
               libubuntugestures5-private-dev (>= 1.3.2030),
102
39
               libudev-dev,
39
               libudev-dev,
103
40
               libudm-common-dev,
40
               libudm-common-dev,
105
41
               libunity-api-dev (>= 7.120),
41
               libunity-api-dev (>= 8.0),
106
42
               libusermetricsoutput1-dev,
42
               libusermetricsoutput1-dev,
107
43
# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
43
# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
108
44
               libx11-dev[!arm64 !armhf],
44
               libx11-dev[!arm64 !armhf],
109
@@ -49,6 +49,7 @@
110
49
               python3-all:any,
49
               python3-all:any,
111
50
               python3-setuptools,
50
               python3-setuptools,
112
51
               qml-module-qt-labs-folderlistmodel,
51
               qml-module-qt-labs-folderlistmodel,
113
52
               qml-module-qt-labs-settings,
114
52
               qml-module-qtqml-statemachine,
53
               qml-module-qtqml-statemachine,
115
53
               qml-module-qtmultimedia (>= 5.4.1-1ubuntu19~overlay2),
54
               qml-module-qtmultimedia (>= 5.4.1-1ubuntu19~overlay2),
116
54
               qml-module-qtquick-layouts,
55
               qml-module-qtquick-layouts,
117
@@ -122,6 +123,7 @@
118
122
         qmenumodel-qml (>= 0.2.10),
123
         qmenumodel-qml (>= 0.2.10),
119
123
         qml-module-biometryd,
124
         qml-module-biometryd,
120
124
         qml-module-qt-labs-folderlistmodel,
125
         qml-module-qt-labs-folderlistmodel,
121
126
         qml-module-qt-labs-settings,
122
125
         qml-module-qtqml-statemachine,
127
         qml-module-qtqml-statemachine,
123
126
         qml-module-qtquick-xmllistmodel,
128
         qml-module-qtquick-xmllistmodel,
124
127
         qml-module-qtsysteminfo,
129
         qml-module-qtsysteminfo,
125
@@ -160,7 +162,7 @@
126
160
         qttranslations5-l10n,
162
         qttranslations5-l10n,
127
161
         ubuntu-thumbnailer-impl-0,
163
         ubuntu-thumbnailer-impl-0,
128
162
         ubuntu-wallpapers,
164
         ubuntu-wallpapers,
130
163
         unity-application-impl-22,
165
         unity-application-impl-23,
131
164
         unity-notifications-impl-3,
166
         unity-notifications-impl-3,
132
165
         unity-plugin-scopes | unity-scopes-impl,
167
         unity-plugin-scopes | unity-scopes-impl,
133
166
         unity-scopes-impl-12,
168
         unity-scopes-impl-12,
134
@@ -206,7 +208,7 @@
135
206
Depends: ${misc:Depends},
208
Depends: ${misc:Depends},
136
207
         ${shlibs:Depends},
209
         ${shlibs:Depends},
137
208
Provides: unity-application-impl,
210
Provides: unity-application-impl,
139
209
          unity-application-impl-22,
211
          unity-application-impl-23,
140
210
Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
212
Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
141
211
Description: Fake environment for running Unity 8 shell
213
Description: Fake environment for running Unity 8 shell
142
212
 Provides fake implementations of some QML modules used by Unity 8 shell
214
 Provides fake implementations of some QML modules used by Unity 8 shell
143
213
215
144
=== modified file 'plugins/Greeter/Unity/Launcher/CMakeLists.txt'
145
--- plugins/Greeter/Unity/Launcher/CMakeLists.txt	2016-10-28 12:08:59 +0000
146
+++ plugins/Greeter/Unity/Launcher/CMakeLists.txt	2016-12-12 16:49:02 +0000
147
@@ -1,4 +1,4 @@
149
1
pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=10)
1
pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=11)
150
2
pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
2
pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
151
3
3
152
4
add_definitions(-DSM_BUSNAME=systemBus)
4
add_definitions(-DSM_BUSNAME=systemBus)
153
5
5
154
=== modified file 'plugins/Greeter/Unity/Launcher/launcheritem.cpp'
155
--- plugins/Greeter/Unity/Launcher/launcheritem.cpp	2016-05-10 16:23:34 +0000
156
+++ plugins/Greeter/Unity/Launcher/launcheritem.cpp	2016-12-12 16:49:02 +0000
157
@@ -76,6 +76,19 @@
158
76
    }
76
    }
159
77
}
77
}
160
78
78
161
79
QStringList LauncherItem::keywords() const
162
80
{
163
81
    return m_keywords;
164
82
}
165
83
166
84
void LauncherItem::setKeywords(const QStringList &keywords)
167
85
{
168
86
    if (m_keywords != keywords) {
169
87
        m_keywords = keywords;
170
88
        Q_EMIT keywordsChanged(keywords);
171
89
    }
172
90
}
173
91
174
79
bool LauncherItem::pinned() const
92
bool LauncherItem::pinned() const
175
80
{
93
{
176
81
    return m_pinned;
94
    return m_pinned;
177
82
95
178
=== modified file 'plugins/Greeter/Unity/Launcher/launcheritem.h'
179
--- plugins/Greeter/Unity/Launcher/launcheritem.h	2016-05-10 15:51:00 +0000
180
+++ plugins/Greeter/Unity/Launcher/launcheritem.h	2016-12-12 16:49:02 +0000
181
@@ -34,6 +34,7 @@
182
34
    QString appId() const override;
34
    QString appId() const override;
183
35
    QString name() const override;
35
    QString name() const override;
184
36
    QString icon() const override;
36
    QString icon() const override;
185
37
    QStringList keywords() const override;
186
37
    bool pinned() const override;
38
    bool pinned() const override;
187
38
    bool running() const override;
39
    bool running() const override;
188
39
    bool recent() const override;
40
    bool recent() const override;
189
@@ -49,6 +50,7 @@
190
49
private:
50
private:
191
50
    void setName(const QString &name);
51
    void setName(const QString &name);
192
51
    void setIcon(const QString &icon);
52
    void setIcon(const QString &icon);
193
53
    void setKeywords(const QStringList &keywords);
194
52
    void setPinned(bool pinned);
54
    void setPinned(bool pinned);
195
53
    void setRunning(bool running);
55
    void setRunning(bool running);
196
54
    void setRecent(bool recent);
56
    void setRecent(bool recent);
197
@@ -63,6 +65,7 @@
198
63
    QString m_appId;
65
    QString m_appId;
199
64
    QString m_name;
66
    QString m_name;
200
65
    QString m_icon;
67
    QString m_icon;
201
68
    QStringList m_keywords;
202
66
    bool m_pinned;
69
    bool m_pinned;
203
67
    bool m_running;
70
    bool m_running;
204
68
    bool m_recent;
71
    bool m_recent;
205
69
72
206
=== modified file 'plugins/LightDM/FullLightDM/CMakeLists.txt'
207
--- plugins/LightDM/FullLightDM/CMakeLists.txt	2016-07-08 15:44:53 +0000
208
+++ plugins/LightDM/FullLightDM/CMakeLists.txt	2016-12-12 16:49:02 +0000
209
@@ -6,8 +6,12 @@
210
6
6
211
7
include_directories(
7
include_directories(
212
8
    ../
8
    ../
213
9
    ${CMAKE_CURRENT_BINARY_DIR}
214
10
    )
215
11
216
12
include_directories(
217
13
    SYSTEM
218
9
    ${LIBLIGHTDM_INCLUDE_DIRS}
14
    ${LIBLIGHTDM_INCLUDE_DIRS}
219
10
    ${CMAKE_CURRENT_BINARY_DIR}
220
11
    )
15
    )
221
12
16
222
13
foreach(source_file ${QMLPLUGIN_SRC})
17
foreach(source_file ${QMLPLUGIN_SRC})
223
14
18
224
=== modified file 'plugins/Unity/Indicators/CMakeLists.txt'
225
--- plugins/Unity/Indicators/CMakeLists.txt	2016-06-02 09:32:33 +0000
226
+++ plugins/Unity/Indicators/CMakeLists.txt	2016-12-12 16:49:02 +0000
227
@@ -11,6 +11,9 @@
228
11
include_directories(
11
include_directories(
229
12
    SYSTEM
12
    SYSTEM
230
13
    ${GLIB_INCLUDE_DIRS}
13
    ${GLIB_INCLUDE_DIRS}
231
14
)
232
15
include_directories(
233
16
    SYSTEM
234
14
    ${GIO_INCLUDE_DIRS}
17
    ${GIO_INCLUDE_DIRS}
235
15
    ${QMENUMODEL_INCLUDE_DIRS}
18
    ${QMENUMODEL_INCLUDE_DIRS}
236
16
)
19
)
237
17
20
238
=== modified file 'plugins/Unity/Launcher/CMakeLists.txt'
239
--- plugins/Unity/Launcher/CMakeLists.txt	2016-10-28 12:08:59 +0000
240
+++ plugins/Unity/Launcher/CMakeLists.txt	2016-12-12 16:49:02 +0000
241
@@ -1,4 +1,4 @@
243
1
pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=10)
1
pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=11)
244
2
pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
2
pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
245
3
3
246
4
add_definitions(-DSM_BUSNAME=systemBus)
4
add_definitions(-DSM_BUSNAME=systemBus)
247
@@ -25,6 +25,8 @@
248
25
    dbusinterface.cpp
25
    dbusinterface.cpp
249
26
    gsettings.cpp
26
    gsettings.cpp
250
27
    asadapter.cpp
27
    asadapter.cpp
251
28
    appdrawermodel.cpp
252
29
    ualwrapper.cpp
253
28
    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
30
    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
254
29
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
31
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
255
30
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
32
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
256
@@ -32,6 +34,7 @@
257
32
    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
34
    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
258
33
    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
35
    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
259
34
    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
36
    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
260
37
    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/AppDrawerModelInterface.h
261
35
    )
38
    )
262
36
39
263
37
add_library(UnityLauncher-qml MODULE
40
add_library(UnityLauncher-qml MODULE
264
38
41
265
=== added file 'plugins/Unity/Launcher/appdrawermodel.cpp'
266
--- plugins/Unity/Launcher/appdrawermodel.cpp	1970-01-01 00:00:00 +0000
267
+++ plugins/Unity/Launcher/appdrawermodel.cpp	2016-12-12 16:49:02 +0000
268
@@ -0,0 +1,62 @@
269
1
/*
270
2
 * Copyright (C) 2016 Canonical, Ltd.
271
3
 *
272
4
 * This program is free software; you can redistribute it and/or modify
273
5
 * it under the terms of the GNU General Public License as published by
274
6
 * the Free Software Foundation; version 3.
275
7
 *
276
8
 * This program is distributed in the hope that it will be useful,
277
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
278
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
279
11
 * GNU General Public License for more details.
280
12
 *
281
13
 * You should have received a copy of the GNU General Public License
282
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
283
15
 */
284
16
285
17
#include "appdrawermodel.h"
286
18
#include "ualwrapper.h"
287
19
288
20
#include <QDebug>
289
21
#include <QDateTime>
290
22
291
23
AppDrawerModel::AppDrawerModel(QObject *parent):
292
24
    AppDrawerModelInterface(parent)
293
25
{
294
26
    Q_FOREACH (const QString &appId, UalWrapper::installedApps()) {
295
27
        UalWrapper::AppInfo info = UalWrapper::getApplicationInfo(appId);
296
28
        if (!info.valid) {
297
29
            qWarning() << "Failed to get app info for app" << appId;
298
30
            continue;
299
31
        }
300
32
        m_list.append(new LauncherItem(appId, info.name, info.icon, this));
301
33
        m_list.last()->setKeywords(info.keywords);
302
34
    }
303
35
    qsrand(QDateTime::currentMSecsSinceEpoch() / 100);
304
36
}
305
37
306
38
int AppDrawerModel::rowCount(const QModelIndex &parent) const
307
39
{
308
40
    Q_UNUSED(parent)
309
41
    return m_list.count();
310
42
}
311
43
312
44
QVariant AppDrawerModel::data(const QModelIndex &index, int role) const
313
45
{
314
46
    switch (role) {
315
47
    case RoleAppId:
316
48
        return m_list.at(index.row())->appId();
317
49
    case RoleName:
318
50
        return m_list.at(index.row())->name();
319
51
    case RoleIcon:
320
52
        return m_list.at(index.row())->icon();
321
53
    case RoleKeywords:
322
54
        return m_list.at(index.row())->keywords();
323
55
    case RoleUsage:
324
56
        // FIXME: u-a-l needs to provide API for usage stats.
325
57
        // don't forget to drop the qsrand() call in the ctor when dropping this.
326
58
        return qrand();
327
59
    }
328
60
329
61
    return QVariant();
330
62
}
331
0
63
332
=== added file 'plugins/Unity/Launcher/appdrawermodel.h'
333
--- plugins/Unity/Launcher/appdrawermodel.h	1970-01-01 00:00:00 +0000
334
+++ plugins/Unity/Launcher/appdrawermodel.h	2016-12-12 16:49:02 +0000
335
@@ -0,0 +1,33 @@
336
1
/*
337
2
 * Copyright (C) 2016 Canonical, Ltd.
338
3
 *
339
4
 * This program is free software; you can redistribute it and/or modify
340
5
 * it under the terms of the GNU General Public License as published by
341
6
 * the Free Software Foundation; version 3.
342
7
 *
343
8
 * This program is distributed in the hope that it will be useful,
344
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
345
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
346
11
 * GNU General Public License for more details.
347
12
 *
348
13
 * You should have received a copy of the GNU General Public License
349
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
350
15
 */
351
16
352
17
353
18
#include <unity/shell/launcher/AppDrawerModelInterface.h>
354
19
355
20
#include "launcheritem.h"
356
21
357
22
class AppDrawerModel: public AppDrawerModelInterface
358
23
{
359
24
    Q_OBJECT
360
25
public:
361
26
    AppDrawerModel(QObject* parent = nullptr);
362
27
363
28
    int rowCount(const QModelIndex &parent) const override;
364
29
    QVariant data(const QModelIndex &index, int role) const override;
365
30
366
31
private:
367
32
    QList<LauncherItem*> m_list;
368
33
};
369
0
34
370
=== modified file 'plugins/Unity/Launcher/launcheritem.cpp'
371
--- plugins/Unity/Launcher/launcheritem.cpp	2016-10-28 11:54:16 +0000
372
+++ plugins/Unity/Launcher/launcheritem.cpp	2016-12-12 16:49:02 +0000
373
@@ -90,6 +90,19 @@
374
90
    }
90
    }
375
91
}
91
}
376
92
92
377
93
QStringList LauncherItem::keywords() const
378
94
{
379
95
    return m_keywords;
380
96
}
381
97
382
98
void LauncherItem::setKeywords(const QStringList &keywords)
383
99
{
384
100
    if (m_keywords != keywords) {
385
101
        m_keywords = keywords;
386
102
        Q_EMIT keywordsChanged(keywords);
387
103
    }
388
104
}
389
105
390
93
bool LauncherItem::pinned() const
106
bool LauncherItem::pinned() const
391
94
{
107
{
392
95
    return m_pinned;
108
    return m_pinned;
393
96
109
394
=== modified file 'plugins/Unity/Launcher/launcheritem.h'
395
--- plugins/Unity/Launcher/launcheritem.h	2016-05-10 15:51:00 +0000
396
+++ plugins/Unity/Launcher/launcheritem.h	2016-12-12 16:49:02 +0000
397
@@ -37,6 +37,7 @@
398
37
    QString appId() const override;
37
    QString appId() const override;
399
38
    QString name() const override;
38
    QString name() const override;
400
39
    QString icon() const override;
39
    QString icon() const override;
401
40
    QStringList keywords() const override;
402
40
    bool pinned() const override;
41
    bool pinned() const override;
403
41
    bool running() const override;
42
    bool running() const override;
404
42
    bool recent() const override;
43
    bool recent() const override;
405
@@ -52,6 +53,7 @@
406
52
private:
53
private:
407
53
    void setName(const QString &name);
54
    void setName(const QString &name);
408
54
    void setIcon(const QString &icon);
55
    void setIcon(const QString &icon);
409
56
    void setKeywords(const QStringList &keywords);
410
55
    void setPinned(bool pinned);
57
    void setPinned(bool pinned);
411
56
    void setRunning(bool running);
58
    void setRunning(bool running);
412
57
    void setRecent(bool recent);
59
    void setRecent(bool recent);
413
@@ -66,6 +68,7 @@
414
66
    QString m_appId;
68
    QString m_appId;
415
67
    QString m_name;
69
    QString m_name;
416
68
    QString m_icon;
70
    QString m_icon;
417
71
    QStringList m_keywords;
418
69
    bool m_pinned;
72
    bool m_pinned;
419
70
    bool m_running;
73
    bool m_running;
420
71
    bool m_recent;
74
    bool m_recent;
421
@@ -79,6 +82,7 @@
422
79
    QuickListEntry m_quitAction;
82
    QuickListEntry m_quitAction;
423
80
83
424
81
    friend class LauncherModel;
84
    friend class LauncherModel;
425
85
    friend class AppDrawerModel;
426
82
};
86
};
427
83
87
428
84
#endif // LAUNCHERITEM_H
88
#endif // LAUNCHERITEM_H
429
85
89
430
=== modified file 'plugins/Unity/Launcher/launchermodel.cpp'
431
--- plugins/Unity/Launcher/launchermodel.cpp	2016-09-23 15:10:26 +0000
432
+++ plugins/Unity/Launcher/launchermodel.cpp	2016-12-12 16:49:02 +0000
433
@@ -19,18 +19,14 @@
434
19
#include "gsettings.h"
19
#include "gsettings.h"
435
20
#include "dbusinterface.h"
20
#include "dbusinterface.h"
436
21
#include "asadapter.h"
21
#include "asadapter.h"
437
22
#include "ualwrapper.h"
438
22
23
439
23
#include <ubuntu-app-launch/appid.h>
440
24
#include <ubuntu-app-launch/application.h>
441
25
#include <ubuntu-app-launch/registry.h>
442
26
#include <unity/shell/application/ApplicationInfoInterface.h>
24
#include <unity/shell/application/ApplicationInfoInterface.h>
443
27
#include <unity/shell/application/MirSurfaceListInterface.h>
25
#include <unity/shell/application/MirSurfaceListInterface.h>
444
28
26
445
29
#include <QDesktopServices>
27
#include <QDesktopServices>
446
30
#include <QDebug>
28
#include <QDebug>
447
31
29
448
32
namespace ual = ubuntu::app_launch;
449
33
450
34
using namespace unity::shell::application;
30
using namespace unity::shell::application;
451
35
31
452
36
LauncherModel::LauncherModel(QObject *parent):
32
LauncherModel::LauncherModel(QObject *parent):
453
@@ -38,8 +34,7 @@
454
38
    m_settings(new GSettings(this)),
34
    m_settings(new GSettings(this)),
455
39
    m_dbusIface(new DBusInterface(this)),
35
    m_dbusIface(new DBusInterface(this)),
456
40
    m_asAdapter(new ASAdapter()),
36
    m_asAdapter(new ASAdapter()),
459
41
    m_appManager(nullptr),
37
    m_appManager(nullptr)
458
42
    m_ualRegistry(std::make_shared<ual::Registry>())
460
43
{
38
{
461
44
    connect(m_dbusIface, &DBusInterface::countChanged, this, &LauncherModel::countChanged);
39
    connect(m_dbusIface, &DBusInterface::countChanged, this, &LauncherModel::countChanged);
462
45
    connect(m_dbusIface, &DBusInterface::countVisibleChanged, this, &LauncherModel::countVisibleChanged);
40
    connect(m_dbusIface, &DBusInterface::countVisibleChanged, this, &LauncherModel::countVisibleChanged);
463
@@ -159,7 +154,7 @@
464
159
            index = m_list.count();
154
            index = m_list.count();
465
160
        }
155
        }
466
161
156
468
162
        auto appInfo = getApplicationInfo(appId);
157
        UalWrapper::AppInfo appInfo = UalWrapper::getApplicationInfo(appId);
469
163
        if (!appInfo.valid) {
158
        if (!appInfo.valid) {
470
164
            qWarning() << "Can't pin application, appId not found:" << appId;
159
            qWarning() << "Can't pin application, appId not found:" << appId;
471
165
            return;
160
            return;
472
@@ -335,32 +330,6 @@
473
335
    return -1;
330
    return -1;
474
336
}
331
}
475
337
332
476
338
LauncherModel::AppInfo LauncherModel::getApplicationInfo(const QString &appId)
477
339
{
478
340
    AppInfo info;
479
341
480
342
    ual::AppID ualAppId = ual::AppID::find(m_ualRegistry, appId.toStdString());
481
343
    if (ualAppId.empty()) {
482
344
        return info;
483
345
    }
484
346
485
347
    std::shared_ptr<ual::Application> ualApp;
486
348
    try
487
349
    {
488
350
        ualApp = ual::Application::create(ualAppId, m_ualRegistry);
489
351
    }
490
352
    catch (std::runtime_error &e)
491
353
    {
492
354
        qWarning() << "Couldn't find application info for" << appId << "-" << e.what();
493
355
        return info;
494
356
    }
495
357
496
358
    info.valid = true;
497
359
    info.name = QString::fromStdString(ualApp->info()->name());
498
360
    info.icon = QString::fromStdString(ualApp->info()->iconPath());
499
361
    return info;
500
362
}
501
363
502
364
void LauncherModel::progressChanged(const QString &appId, int progress)
333
void LauncherModel::progressChanged(const QString &appId, int progress)
503
365
{
334
{
504
366
    const int idx = findApplication(appId);
335
    const int idx = findApplication(appId);
505
@@ -408,7 +377,7 @@
506
408
        }
377
        }
507
409
    } else {
378
    } else {
508
410
        // Need to create a new LauncherItem and show the highlight
379
        // Need to create a new LauncherItem and show the highlight
510
411
        auto appInfo = getApplicationInfo(appId);
380
        UalWrapper::AppInfo appInfo = UalWrapper::getApplicationInfo(appId);
511
412
        if (countVisible && appInfo.valid) {
381
        if (countVisible && appInfo.valid) {
512
413
            LauncherItem *item = new LauncherItem(appId,
382
            LauncherItem *item = new LauncherItem(appId,
513
414
                                                  appInfo.name,
383
                                                  appInfo.name,
514
@@ -428,7 +397,7 @@
515
428
    // First walk through all the existing items and see if we need to remove something
397
    // First walk through all the existing items and see if we need to remove something
516
429
    QList<LauncherItem*> toBeRemoved;
398
    QList<LauncherItem*> toBeRemoved;
517
430
    Q_FOREACH (LauncherItem* item, m_list) {
399
    Q_FOREACH (LauncherItem* item, m_list) {
519
431
        auto appInfo = getApplicationInfo(item->appId());
400
        UalWrapper::AppInfo appInfo = UalWrapper::getApplicationInfo(item->appId());
520
432
        if (!appInfo.valid) {
401
        if (!appInfo.valid) {
521
433
            // Application no longer available => drop it!
402
            // Application no longer available => drop it!
522
434
            toBeRemoved << item;
403
            toBeRemoved << item;
523
@@ -480,7 +449,7 @@
524
480
        if (itemIndex == -1) {
449
        if (itemIndex == -1) {
525
481
            // Need to add it. Just add it into the addedIndex to keep same ordering as the list
450
            // Need to add it. Just add it into the addedIndex to keep same ordering as the list
526
482
            // in the settings.
451
            // in the settings.
528
483
            auto appInfo = getApplicationInfo(entry);
452
            UalWrapper::AppInfo appInfo = UalWrapper::getApplicationInfo(entry);
529
484
            if (!appInfo.valid) {
453
            if (!appInfo.valid) {
530
485
                continue;
454
                continue;
531
486
            }
455
            }
532
487
456
533
=== modified file 'plugins/Unity/Launcher/launchermodel.h'
534
--- plugins/Unity/Launcher/launchermodel.h	2016-09-23 14:44:26 +0000
535
+++ plugins/Unity/Launcher/launchermodel.h	2016-12-12 16:49:02 +0000
536
@@ -27,12 +27,6 @@
537
27
class DBusInterface;
27
class DBusInterface;
538
28
class ASAdapter;
28
class ASAdapter;
539
29
29
540
30
namespace ubuntu {
541
31
    namespace app_launch {
542
32
        class Registry;
543
33
    }
544
34
}
545
35
546
36
using namespace unity::shell::launcher;
30
using namespace unity::shell::launcher;
547
37
using namespace unity::shell::application;
31
using namespace unity::shell::application;
548
38
32
549
@@ -73,13 +67,6 @@
550
73
67
551
74
    void unpin(const QString &appId);
68
    void unpin(const QString &appId);
552
75
69
553
76
    struct AppInfo {
554
77
        bool valid = false;
555
78
        QString name;
556
79
        QString icon;
557
80
    };
558
81
    AppInfo getApplicationInfo(const QString &appId);
559
82
560
83
private Q_SLOTS:
70
private Q_SLOTS:
561
84
    void countChanged(const QString &appId, int count);
71
    void countChanged(const QString &appId, int count);
562
85
    void countVisibleChanged(const QString &appId, bool count);
72
    void countVisibleChanged(const QString &appId, bool count);
563
@@ -98,7 +85,6 @@
564
98
    ASAdapter *m_asAdapter;
85
    ASAdapter *m_asAdapter;
565
99
86
566
100
    ApplicationManagerInterface *m_appManager;
87
    ApplicationManagerInterface *m_appManager;
567
101
    std::shared_ptr<ubuntu::app_launch::Registry> m_ualRegistry;
568
102
88
569
103
    friend class LauncherModelTest;
89
    friend class LauncherModelTest;
570
104
};
90
};
571
105
91
572
=== modified file 'plugins/Unity/Launcher/plugin.cpp'
573
--- plugins/Unity/Launcher/plugin.cpp	2015-09-14 09:11:08 +0000
574
+++ plugins/Unity/Launcher/plugin.cpp	2016-12-12 16:49:02 +0000
575
@@ -26,7 +26,7 @@
576
26
// local
26
// local
577
27
#include "launchermodel.h"
27
#include "launchermodel.h"
578
28
#include "launcheritem.h"
28
#include "launcheritem.h"
580
29
29
#include "appdrawermodel.h"
581
30
30
582
31
using namespace unity::shell::launcher;
31
using namespace unity::shell::launcher;
583
32
32
584
@@ -46,4 +46,5 @@
585
46
    qmlRegisterSingletonType<LauncherModel>(uri, 0, 1, "LauncherModel", modelProvider);
46
    qmlRegisterSingletonType<LauncherModel>(uri, 0, 1, "LauncherModel", modelProvider);
586
47
    qmlRegisterUncreatableType<LauncherItem>(uri, 0, 1, "LauncherItem", QStringLiteral("Can't create new Launcher Items in QML. Get them from the LauncherModel."));
47
    qmlRegisterUncreatableType<LauncherItem>(uri, 0, 1, "LauncherItem", QStringLiteral("Can't create new Launcher Items in QML. Get them from the LauncherModel."));
587
48
    qmlRegisterUncreatableType<QuickListModel>(uri, 0, 1, "QuickListModel", QStringLiteral("Can't create a QuickListModel in QML. Get them from the LauncherItems."));
48
    qmlRegisterUncreatableType<QuickListModel>(uri, 0, 1, "QuickListModel", QStringLiteral("Can't create a QuickListModel in QML. Get them from the LauncherItems."));
588
49
    qmlRegisterType<AppDrawerModel>(uri, 0, 1, "AppDrawerModel");
589
49
}
50
}
590
50
51
591
=== added file 'plugins/Unity/Launcher/ualwrapper.cpp'
592
--- plugins/Unity/Launcher/ualwrapper.cpp	1970-01-01 00:00:00 +0000
593
+++ plugins/Unity/Launcher/ualwrapper.cpp	2016-12-12 16:49:02 +0000
594
@@ -0,0 +1,73 @@
595
1
/*
596
2
 * Copyright (C) 2016 Canonical, Ltd.
597
3
 *
598
4
 * This program is free software; you can redistribute it and/or modify
599
5
 * it under the terms of the GNU General Public License as published by
600
6
 * the Free Software Foundation; version 3.
601
7
 *
602
8
 * This program is distributed in the hope that it will be useful,
603
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
604
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
605
11
 * GNU General Public License for more details.
606
12
 *
607
13
 * You should have received a copy of the GNU General Public License
608
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
609
15
 */
610
16
611
17
#include <QDebug>
612
18
613
19
#include "ualwrapper.h"
614
20
615
21
#include <ubuntu-app-launch/registry.h>
616
22
using namespace ubuntu::app_launch;
617
23
618
24
UalWrapper::UalWrapper(QObject *parent):
619
25
    QObject(parent)
620
26
{
621
27
622
28
}
623
29
624
30
QStringList UalWrapper::installedApps()
625
31
{
626
32
    QStringList appIds;
627
33
    try {
628
34
        for (const std::shared_ptr<Application> &app : Registry::installedApps()) {
629
35
            if (!app->appId().package.value().empty()) {
630
36
                appIds << QString::fromStdString(app->appId().package.value() + "_" + app->appId().appname.value());
631
37
            } else {
632
38
                appIds << QString::fromStdString(app->appId().appname);
633
39
            }
634
40
        }
635
41
    } catch (const std::runtime_error &e) {
636
42
        qWarning() << "ubuntu-all-launch threw an exception listing apps:" << e.what();
637
43
    }
638
44
639
45
    return appIds;
640
46
}
641
47
642
48
UalWrapper::AppInfo UalWrapper::getApplicationInfo(const QString &appId)
643
49
{
644
50
    AppInfo info;
645
51
646
52
    try {
647
53
        AppID ualAppId = AppID::find(appId.toStdString());
648
54
        if (ualAppId.empty()) {
649
55
            qWarning() << "Empty ualAppId result for" << appId;
650
56
            return info;
651
57
        }
652
58
653
59
        std::shared_ptr<Application> ualApp;
654
60
        ualApp = Application::create(ualAppId, Registry::getDefault());
655
61
656
62
        info.name = QString::fromStdString(ualApp->info()->name());
657
63
        info.icon = QString::fromStdString(ualApp->info()->iconPath());
658
64
        for (const std::string &keyword : ualApp->info()->keywords().value()) {
659
65
            info.keywords << QString::fromStdString(keyword);
660
66
        }
661
67
        info.valid = true;
662
68
    } catch (const std::runtime_error &e) {
663
69
        qWarning() << "ubuntu-app-launch threw an exception getting app info for appId:" << appId << ":" << e.what();
664
70
    }
665
71
666
72
    return info;
667
73
}
668
0
74
669
=== added file 'plugins/Unity/Launcher/ualwrapper.h'
670
--- plugins/Unity/Launcher/ualwrapper.h	1970-01-01 00:00:00 +0000
671
+++ plugins/Unity/Launcher/ualwrapper.h	2016-12-12 16:49:02 +0000
672
@@ -0,0 +1,35 @@
673
1
/*
674
2
 * Copyright (C) 2016 Canonical, Ltd.
675
3
 *
676
4
 * This program is free software; you can redistribute it and/or modify
677
5
 * it under the terms of the GNU General Public License as published by
678
6
 * the Free Software Foundation; version 3.
679
7
 *
680
8
 * This program is distributed in the hope that it will be useful,
681
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
682
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
683
11
 * GNU General Public License for more details.
684
12
 *
685
13
 * You should have received a copy of the GNU General Public License
686
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
687
15
 */
688
16
689
17
#include <QObject>
690
18
691
19
class UalWrapper: public QObject
692
20
{
693
21
    Q_OBJECT
694
22
public:
695
23
    struct AppInfo {
696
24
        bool valid = false;
697
25
        QString name;
698
26
        QString icon;
699
27
        QStringList keywords;
700
28
    };
701
29
702
30
    UalWrapper(QObject* parent = nullptr);
703
31
704
32
    static QStringList installedApps();
705
33
    static AppInfo getApplicationInfo(const QString &appId);
706
34
707
35
};
708
0
36
709
=== modified file 'plugins/Utils/CMakeLists.txt'
710
--- plugins/Utils/CMakeLists.txt	2016-06-29 18:05:44 +0000
711
+++ plugins/Utils/CMakeLists.txt	2016-12-12 16:49:02 +0000
712
@@ -15,6 +15,10 @@
713
15
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
15
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
714
16
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
16
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
715
17
    applicationsfiltermodel.cpp
17
    applicationsfiltermodel.cpp
716
18
    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/AppDrawerModelInterface.h
717
19
    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
718
20
    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
719
21
    appdrawerproxymodel.cpp
720
18
    constants.cpp
22
    constants.cpp
721
19
    WindowInputMonitor.cpp
23
    WindowInputMonitor.cpp
722
20
    inputwatcher.cpp
24
    inputwatcher.cpp
723
21
25
724
=== modified file 'plugins/Utils/ElapsedTimer.h'
725
--- plugins/Utils/ElapsedTimer.h	2015-04-22 10:40:54 +0000
726
+++ plugins/Utils/ElapsedTimer.h	2016-12-12 16:49:02 +0000
727
@@ -41,7 +41,7 @@
728
41
public:
41
public:
729
42
    void start() override { m_timer.start(); }
42
    void start() override { m_timer.start(); }
730
43
    qint64 msecsSinceReference() const override { return m_timer.msecsSinceReference(); }
43
    qint64 msecsSinceReference() const override { return m_timer.msecsSinceReference(); }
732
44
    qint64 elapsed() const override { return m_timer.elapsed(); }
44
    qint64 elapsed() const override { return m_timer.isValid() ? m_timer.elapsed() : 0; }
733
45
private:
45
private:
734
46
    QElapsedTimer m_timer;
46
    QElapsedTimer m_timer;
735
47
};
47
};
736
48
48
737
=== modified file 'plugins/Utils/Timer.cpp'
738
--- plugins/Utils/Timer.cpp	2015-04-22 10:40:54 +0000
739
+++ plugins/Utils/Timer.cpp	2016-12-12 16:49:02 +0000
740
@@ -37,13 +37,16 @@
741
37
void Timer::start()
37
void Timer::start()
742
38
{
38
{
743
39
    m_timer.start();
39
    m_timer.start();
744
40
    AbstractTimer::start();
745
41
}
40
}
746
42
41
747
43
void Timer::stop()
42
void Timer::stop()
748
44
{
43
{
749
45
    m_timer.stop();
44
    m_timer.stop();
751
46
    AbstractTimer::stop();
45
}
752
46
753
47
bool Timer::isRunning() const
754
48
{
755
49
    return m_timer.isActive();
756
47
}
50
}
757
48
51
758
49
bool Timer::isSingleShot() const
52
bool Timer::isSingleShot() const
759
50
53
760
=== modified file 'plugins/Utils/Timer.h'
761
--- plugins/Utils/Timer.h	2015-04-22 10:40:54 +0000
762
+++ plugins/Utils/Timer.h	2016-12-12 16:49:02 +0000
763
@@ -30,18 +30,16 @@
764
30
{
30
{
765
31
    Q_OBJECT
31
    Q_OBJECT
766
32
public:
32
public:
768
33
    AbstractTimer(QObject *parent) : QObject(parent), m_isRunning(false) {}
33
    AbstractTimer(QObject *parent) : QObject(parent) {}
769
34
    virtual int interval() const = 0;
34
    virtual int interval() const = 0;
770
35
    virtual void setInterval(int msecs) = 0;
35
    virtual void setInterval(int msecs) = 0;
774
36
    virtual void start() { m_isRunning = true; }
36
    virtual void start() = 0;
775
37
    virtual void stop() { m_isRunning = false; }
37
    virtual void stop() = 0;
776
38
    bool isRunning() const { return m_isRunning; }
38
    virtual bool isRunning() const = 0;
777
39
    virtual bool isSingleShot() const = 0;
39
    virtual bool isSingleShot() const = 0;
778
40
    virtual void setSingleShot(bool value) = 0;
40
    virtual void setSingleShot(bool value) = 0;
779
41
Q_SIGNALS:
41
Q_SIGNALS:
780
42
    void timeout();
42
    void timeout();
781
43
private:
782
44
    bool m_isRunning;
783
45
};
43
};
784
46
44
785
47
/** A QTimer wrapper */
45
/** A QTimer wrapper */
786
@@ -55,6 +53,7 @@
787
55
    void setInterval(int msecs) override;
53
    void setInterval(int msecs) override;
788
56
    void start() override;
54
    void start() override;
789
57
    void stop() override;
55
    void stop() override;
790
56
    bool isRunning() const override;
791
58
    bool isSingleShot() const override;
57
    bool isSingleShot() const override;
792
59
    void setSingleShot(bool value) override;
58
    void setSingleShot(bool value) override;
793
60
private:
59
private:
794
61
60
795
=== added file 'plugins/Utils/appdrawerproxymodel.cpp'
796
--- plugins/Utils/appdrawerproxymodel.cpp	1970-01-01 00:00:00 +0000
797
+++ plugins/Utils/appdrawerproxymodel.cpp	2016-12-12 16:49:02 +0000
798
@@ -0,0 +1,189 @@
799
1
/*
800
2
 * Copyright (C) 2016 Canonical, Ltd.
801
3
 *
802
4
 * This program is free software; you can redistribute it and/or modify
803
5
 * it under the terms of the GNU General Public License as published by
804
6
 * the Free Software Foundation; version 3.
805
7
 *
806
8
 * This program is distributed in the hope that it will be useful,
807
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
808
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
809
11
 * GNU General Public License for more details.
810
12
 *
811
13
 * You should have received a copy of the GNU General Public License
812
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
813
15
 */
814
16
815
17
#include "appdrawerproxymodel.h"
816
18
817
19
#include <unity/shell/launcher/LauncherItemInterface.h>
818
20
819
21
#include <QDebug>
820
22
821
23
AppDrawerProxyModel::AppDrawerProxyModel(QObject *parent):
822
24
    QSortFilterProxyModel(parent)
823
25
{
824
26
    setSortRole(AppDrawerModelInterface::RoleName);
825
27
    setSortLocaleAware(true);
826
28
    sort(0);
827
29
828
30
    connect(this, &QAbstractListModel::rowsInserted, this, &AppDrawerProxyModel::countChanged);
829
31
    connect(this, &QAbstractListModel::rowsRemoved, this, &AppDrawerProxyModel::countChanged);
830
32
    connect(this, &QAbstractListModel::layoutChanged, this, &AppDrawerProxyModel::countChanged);
831
33
}
832
34
833
35
QAbstractItemModel *AppDrawerProxyModel::source() const
834
36
{
835
37
    return m_source;
836
38
}
837
39
838
40
void AppDrawerProxyModel::setSource(QAbstractItemModel *source)
839
41
{
840
42
    if (m_source != source) {
841
43
        m_source = source;
842
44
        setSourceModel(m_source);
843
45
        setSortRole(m_sortBy == SortByAToZ ? AppDrawerModelInterface::RoleName : AppDrawerModelInterface::RoleUsage);
844
46
        connect(m_source, &QAbstractItemModel::rowsRemoved, this, &AppDrawerProxyModel::invalidateFilter);
845
47
        connect(m_source, &QAbstractItemModel::rowsInserted, this, &AppDrawerProxyModel::invalidateFilter);
846
48
        Q_EMIT sourceChanged();
847
49
    }
848
50
}
849
51
850
52
AppDrawerProxyModel::GroupBy AppDrawerProxyModel::group() const
851
53
{
852
54
    return m_group;
853
55
}
854
56
855
57
void AppDrawerProxyModel::setGroup(AppDrawerProxyModel::GroupBy group)
856
58
{
857
59
    if (m_group != group) {
858
60
        m_group = group;
859
61
        Q_EMIT groupChanged();
860
62
        invalidateFilter();
861
63
    }
862
64
}
863
65
864
66
QString AppDrawerProxyModel::filterLetter() const
865
67
{
866
68
    return m_filterLetter;
867
69
}
868
70
869
71
void AppDrawerProxyModel::setFilterLetter(const QString &filterLetter)
870
72
{
871
73
    if (m_filterLetter != filterLetter) {
872
74
        m_filterLetter = filterLetter;
873
75
        Q_EMIT filterLetterChanged();
874
76
        invalidateFilter();
875
77
    }
876
78
}
877
79
878
80
QString AppDrawerProxyModel::filterString() const
879
81
{
880
82
    return m_filterString;
881
83
}
882
84
883
85
void AppDrawerProxyModel::setFilterString(const QString &filterString)
884
86
{
885
87
    if (m_filterString != filterString) {
886
88
        m_filterString = filterString;
887
89
        Q_EMIT filterStringChanged();
888
90
        invalidateFilter();
889
91
    }
890
92
}
891
93
892
94
AppDrawerProxyModel::SortBy AppDrawerProxyModel::sortBy() const
893
95
{
894
96
    return m_sortBy;
895
97
}
896
98
897
99
void AppDrawerProxyModel::setSortBy(AppDrawerProxyModel::SortBy sortBy)
898
100
{
899
101
    if (m_sortBy != sortBy) {
900
102
        m_sortBy = sortBy;
901
103
        Q_EMIT sortByChanged();
902
104
        setSortRole(m_sortBy == SortByAToZ ? AppDrawerModelInterface::RoleName : AppDrawerModelInterface::RoleUsage);
903
105
        sort(0);
904
106
    }
905
107
}
906
108
907
109
int AppDrawerProxyModel::count() const
908
110
{
909
111
    return rowCount();
910
112
}
911
113
912
114
QVariant AppDrawerProxyModel::data(const QModelIndex &index, int role) const
913
115
{
914
116
    QModelIndex idx = mapToSource(index);
915
117
    if (role == Qt::UserRole) {
916
118
        QString name = m_source->data(idx, AppDrawerModelInterface::RoleName).toString();
917
119
        return name.length() > 0 ? QString(name.at(0)).toUpper() : QChar();
918
120
    }
919
121
    return m_source->data(idx, role);
920
122
}
921
123
922
124
QHash<int, QByteArray> AppDrawerProxyModel::roleNames() const
923
125
{
924
126
    if (m_source) {
925
127
        QHash<int, QByteArray> roles = m_source->roleNames();
926
128
        roles.insert(Qt::UserRole, "letter");
927
129
        return roles;
928
130
    }
929
131
    return QHash<int, QByteArray>();
930
132
}
931
133
932
134
bool AppDrawerProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
933
135
{
934
136
    Q_UNUSED(source_parent)
935
137
936
138
    if (m_group == GroupByAToZ && source_row > 0) {
937
139
        QString currentName = m_source->data(m_source->index(source_row, 0), AppDrawerModelInterface::RoleName).toString();
938
140
        QChar currentLetter = currentName.length() > 0 ? currentName.at(0) : QChar();
939
141
        QString previousName = m_source->data(m_source->index(source_row - 1,0 ), AppDrawerModelInterface::RoleName).toString();
940
142
        QChar previousLetter = previousName.length() > 0 ? previousName.at(0) : QChar();
941
143
        if (currentLetter.toLower() == previousLetter.toLower()) {
942
144
            return false;
943
145
        }
944
146
    } else if(m_group == GroupByAll && source_row > 0) {
945
147
        return false;
946
148
    }
947
149
    if (!m_filterLetter.isEmpty()) {
948
150
        QString currentName = m_source->data(m_source->index(source_row, 0), AppDrawerModelInterface::RoleName).toString();
949
151
        QString currentLetter = currentName.length() > 0 ? QString(currentName.at(0)) : QString();
950
152
        if (currentLetter.toLower() != m_filterLetter.toLower()) {
951
153
            return false;
952
154
        }
953
155
    }
954
156
    if (!m_filterString.isEmpty()) {
955
157
        QStringList allWords = m_source->data(m_source->index(source_row, 0), AppDrawerModelInterface::RoleKeywords).toStringList();
956
158
        allWords.prepend(m_source->data(m_source->index(source_row, 0), AppDrawerModelInterface::RoleName).toString());
957
159
        bool found = false;
958
160
        Q_FOREACH (const QString currentWord, allWords) {
959
161
            if (currentWord.toLower().startsWith(m_filterString.toLower())) {
960
162
                found = true;
961
163
                break;
962
164
            }
963
165
        }
964
166
        if (!found) {
965
167
            return false;
966
168
        }
967
169
    }
968
170
    return true;
969
171
}
970
172
971
173
QString AppDrawerProxyModel::appId(int index) const
972
174
{
973
175
    if (index >= 0 && index < rowCount()) {
974
176
        QModelIndex sourceIndex = mapToSource(this->index(index, 0));
975
177
976
178
        AppDrawerModelInterface* adm = dynamic_cast<AppDrawerModelInterface*>(m_source);
977
179
        if (adm) {
978
180
            return adm->data(sourceIndex, AppDrawerModelInterface::RoleAppId).toString();
979
181
        }
980
182
981
183
        AppDrawerProxyModel* adpm = qobject_cast<AppDrawerProxyModel*>(m_source);
982
184
        if (adpm) {
983
185
            return adpm->appId(sourceIndex.row());
984
186
        }
985
187
    }
986
188
    return nullptr;
987
189
}
988
0
190
989
=== added file 'plugins/Utils/appdrawerproxymodel.h'
990
--- plugins/Utils/appdrawerproxymodel.h	1970-01-01 00:00:00 +0000
991
+++ plugins/Utils/appdrawerproxymodel.h	2016-12-12 16:49:02 +0000
992
@@ -0,0 +1,87 @@
993
1
/*
994
2
 * Copyright (C) 2016 Canonical, Ltd.
995
3
 *
996
4
 * This program is free software; you can redistribute it and/or modify
997
5
 * it under the terms of the GNU General Public License as published by
998
6
 * the Free Software Foundation; version 3.
999
7
 *
1000
8
 * This program is distributed in the hope that it will be useful,
1001
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1002
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1003
11
 * GNU General Public License for more details.
1004
12
 *
1005
13
 * You should have received a copy of the GNU General Public License
1006
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1007
15
 */
1008
16
1009
17
#include <QSortFilterProxyModel>
1010
18
1011
19
#include <unity/shell/launcher/AppDrawerModelInterface.h>
1012
20
1013
21
using namespace unity::shell::launcher;
1014
22
1015
23
class AppDrawerProxyModel: public QSortFilterProxyModel
1016
24
{
1017
25
    Q_OBJECT
1018
26
    Q_ENUMS(GroupBy)
1019
27
    Q_ENUMS(SortBy)
1020
28
    Q_PROPERTY(QAbstractItemModel* source READ source WRITE setSource NOTIFY sourceChanged)
1021
29
    Q_PROPERTY(GroupBy group READ group WRITE setGroup NOTIFY groupChanged)
1022
30
    Q_PROPERTY(QString filterLetter READ filterLetter WRITE setFilterLetter NOTIFY filterLetterChanged)
1023
31
    Q_PROPERTY(QString filterString READ filterString WRITE setFilterString NOTIFY filterStringChanged)
1024
32
    Q_PROPERTY(SortBy sortBy READ sortBy WRITE setSortBy NOTIFY sortByChanged)
1025
33
    Q_PROPERTY(int count READ count NOTIFY countChanged)
1026
34
1027
35
public:
1028
36
    enum GroupBy {
1029
37
        GroupByNone,
1030
38
        GroupByAll,
1031
39
        GroupByAToZ
1032
40
    };
1033
41
    enum SortBy {
1034
42
        SortByAToZ,
1035
43
        SortByUsage
1036
44
    };
1037
45
1038
46
    AppDrawerProxyModel(QObject* parent = nullptr);
1039
47
1040
48
    QAbstractItemModel* source() const;
1041
49
    void setSource(QAbstractItemModel* source);
1042
50
1043
51
    GroupBy group() const;
1044
52
    void setGroup(GroupBy group);
1045
53
1046
54
    QString filterLetter() const;
1047
55
    void setFilterLetter(const QString &filterLetter);
1048
56
1049
57
    QString filterString() const;
1050
58
    void setFilterString(const QString &filterString);
1051
59
1052
60
    SortBy sortBy() const;
1053
61
    void setSortBy(SortBy sortBy);
1054
62
1055
63
    int count() const;
1056
64
1057
65
    QVariant data(const QModelIndex &index, int role) const override;
1058
66
    QHash<int, QByteArray> roleNames() const override;
1059
67
1060
68
    Q_INVOKABLE QString appId(int index) const;
1061
69
1062
70
protected:
1063
71
    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
1064
72
1065
73
Q_SIGNALS:
1066
74
    void sourceChanged();
1067
75
    void groupChanged();
1068
76
    void filterLetterChanged();
1069
77
    void filterStringChanged();
1070
78
    void sortByChanged();
1071
79
    void countChanged();
1072
80
1073
81
private:
1074
82
    QAbstractItemModel* m_source = nullptr;
1075
83
    GroupBy m_group = GroupByNone;
1076
84
    QString m_filterLetter;
1077
85
    QString m_filterString;
1078
86
    SortBy m_sortBy = SortByAToZ;
1079
87
};
1080
0
88
1081
=== modified file 'plugins/Utils/globalfunctions.cpp'
1082
--- plugins/Utils/globalfunctions.cpp	2016-06-02 09:32:33 +0000
1083
+++ plugins/Utils/globalfunctions.cpp	2016-12-12 16:49:02 +0000
1084
@@ -51,3 +51,8 @@
1085
51
    }
51
    }
1086
52
    return nullptr;
52
    return nullptr;
1087
53
}
53
}
1088
54
1089
55
bool GlobalFunctions::itemUnderMouse(QQuickItem* item)
1090
56
{
1091
57
    return item && item->isUnderMouse();
1092
58
}
1093
54
59
1094
=== modified file 'plugins/Utils/globalfunctions.h'
1095
--- plugins/Utils/globalfunctions.h	2016-03-11 20:18:12 +0000
1096
+++ plugins/Utils/globalfunctions.h	2016-12-12 16:49:02 +0000
1097
@@ -37,6 +37,8 @@
1098
37
                                          int x,
37
                                          int x,
1099
38
                                          int y,
38
                                          int y,
1100
39
                                          QJSValue matcher);
39
                                          QJSValue matcher);
1101
40
1102
41
    static Q_INVOKABLE bool itemUnderMouse(QQuickItem* item);
1103
40
};
42
};
1104
41
43
1105
42
#endif // GLOBALFUNCTIONS_H
44
#endif // GLOBALFUNCTIONS_H
1106
43
45
1107
=== modified file 'plugins/Utils/plugin.cpp'
1108
--- plugins/Utils/plugin.cpp	2016-06-28 20:38:00 +0000
1109
+++ plugins/Utils/plugin.cpp	2016-12-12 16:49:02 +0000
1110
@@ -39,6 +39,7 @@
1111
39
#include "deviceconfigparser.h"
39
#include "deviceconfigparser.h"
1112
40
#include "globalfunctions.h"
40
#include "globalfunctions.h"
1113
41
#include "URLDispatcher.h"
41
#include "URLDispatcher.h"
1114
42
#include "appdrawerproxymodel.h"
1115
42
43
1116
43
static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
44
static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
1117
44
{
45
{
1118
@@ -82,4 +83,5 @@
1119
82
    qmlRegisterType<DeviceConfigParser>(uri, 0, 1, "DeviceConfigParser");
83
    qmlRegisterType<DeviceConfigParser>(uri, 0, 1, "DeviceConfigParser");
1120
83
    qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);
84
    qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);
1121
84
    qmlRegisterType<URLDispatcher>(uri, 0, 1, "URLDispatcher");
85
    qmlRegisterType<URLDispatcher>(uri, 0, 1, "URLDispatcher");
1122
86
    qmlRegisterType<AppDrawerProxyModel>(uri, 0, 1, "AppDrawerProxyModel");
1123
85
}
87
}
1124
86
88
1125
=== modified file 'plugins/Utils/windowstatestorage.cpp'
1126
--- plugins/Utils/windowstatestorage.cpp	2016-08-23 13:53:07 +0000
1127
+++ plugins/Utils/windowstatestorage.cpp	2016-12-12 16:49:02 +0000
1128
@@ -189,3 +189,26 @@
1129
189
    }
189
    }
1130
190
    return query;
190
    return query;
1131
191
}
191
}
1132
192
1133
193
Mir::State WindowStateStorage::toMirState(WindowState state) const
1134
194
{
1135
195
    // assumes a single state (not an OR of several)
1136
196
    switch (state) {
1137
197
        case WindowStateMaximized:             return Mir::MaximizedState;
1138
198
        case WindowStateMinimized:             return Mir::MinimizedState;
1139
199
        case WindowStateFullscreen:            return Mir::FullscreenState;
1140
200
        case WindowStateMaximizedLeft:         return Mir::MaximizedLeftState;
1141
201
        case WindowStateMaximizedRight:        return Mir::MaximizedRightState;
1142
202
        case WindowStateMaximizedHorizontally: return Mir::HorizMaximizedState;
1143
203
        case WindowStateMaximizedVertically:   return Mir::VertMaximizedState;
1144
204
        case WindowStateMaximizedTopLeft:      return Mir::MaximizedTopLeftState;
1145
205
        case WindowStateMaximizedTopRight:     return Mir::MaximizedTopRightState;
1146
206
        case WindowStateMaximizedBottomLeft:   return Mir::MaximizedBottomLeftState;
1147
207
        case WindowStateMaximizedBottomRight:  return Mir::MaximizedBottomRightState;
1148
208
1149
209
        case WindowStateNormal:
1150
210
        case WindowStateRestored:
1151
211
        default:
1152
212
            return Mir::RestoredState;
1153
213
    }
1154
214
}
1155
192
215
1156
=== modified file 'plugins/Utils/windowstatestorage.h'
1157
--- plugins/Utils/windowstatestorage.h	2016-08-23 13:53:07 +0000
1158
+++ plugins/Utils/windowstatestorage.h	2016-12-12 16:49:02 +0000
1159
@@ -19,6 +19,9 @@
1160
19
#include <QMutex>
19
#include <QMutex>
1161
20
#include <QFuture>
20
#include <QFuture>
1162
21
21
1163
22
// unity-api
1164
23
#include <unity/shell/application/Mir.h>
1165
24
1166
22
class WindowStateStorage: public QObject
25
class WindowStateStorage: public QObject
1167
23
{
26
{
1168
24
    Q_OBJECT
27
    Q_OBJECT
1169
@@ -56,6 +59,8 @@
1170
56
    Q_INVOKABLE void saveStage(const QString &appId, int stage);
59
    Q_INVOKABLE void saveStage(const QString &appId, int stage);
1171
57
    Q_INVOKABLE int getStage(const QString &appId, int defaultValue) const;
60
    Q_INVOKABLE int getStage(const QString &appId, int defaultValue) const;
1172
58
61
1173
62
    Q_INVOKABLE Mir::State toMirState(WindowState state) const;
1174
63
1175
59
private:
64
private:
1176
60
    void initdb();
65
    void initdb();
1177
61
66
1178
62
67
1179
=== modified file 'plugins/WindowManager/CMakeLists.txt'
1180
--- plugins/WindowManager/CMakeLists.txt	2016-06-20 09:43:38 +0000
1181
+++ plugins/WindowManager/CMakeLists.txt	2016-12-12 16:49:02 +0000
1182
@@ -1,10 +1,12 @@
1183
1
set(WINDOWMANAGER_SRC
1
set(WINDOWMANAGER_SRC
1185
2
    TopLevelSurfaceList.cpp
2
    TopLevelWindowModel.cpp
1186
3
    Window.cpp
1187
3
    WindowManagerPlugin.cpp
4
    WindowManagerPlugin.cpp
1188
4
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
5
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
1189
5
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h
6
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h
1190
6
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h
7
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h
1191
7
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h
8
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h
1192
9
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/SurfaceManagerInterface.h
1193
8
   )
10
   )
1194
9
11
1195
10
add_library(windowmanager-qml SHARED ${WINDOWMANAGER_SRC})
12
add_library(windowmanager-qml SHARED ${WINDOWMANAGER_SRC})
1196
11
13
1197
=== removed file 'plugins/WindowManager/TopLevelSurfaceList.cpp'
1198
--- plugins/WindowManager/TopLevelSurfaceList.cpp	2016-09-14 15:02:01 +0000
1199
+++ plugins/WindowManager/TopLevelSurfaceList.cpp	1970-01-01 00:00:00 +0000
1200
@@ -1,481 +0,0 @@
1201
1
/*
1202
2
 * Copyright (C) 2016 Canonical, Ltd.
1203
3
 *
1204
4
 * This program is free software; you can redistribute it and/or modify
1205
5
 * it under the terms of the GNU General Public License as published by
1206
6
 * the Free Software Foundation; version 3.
1207
7
 *
1208
8
 * This program is distributed in the hope that it will be useful,
1209
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1210
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1211
11
 * GNU General Public License for more details.
1212
12
 *
1213
13
 * You should have received a copy of the GNU General Public License
1214
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1215
15
 */
1216
16
1217
17
#include "TopLevelSurfaceList.h"
1218
18
1219
19
// unity-api
1220
20
#include <unity/shell/application/ApplicationInfoInterface.h>
1221
21
#include <unity/shell/application/MirSurfaceInterface.h>
1222
22
#include <unity/shell/application/MirSurfaceListInterface.h>
1223
23
1224
24
#include <QMetaObject>
1225
25
1226
26
Q_LOGGING_CATEGORY(UNITY_TOPSURFACELIST, "unity.topsurfacelist", QtDebugMsg)
1227
27
1228
28
#define DEBUG_MSG qCDebug(UNITY_TOPSURFACELIST).nospace().noquote() << __func__
1229
29
1230
30
using namespace unity::shell::application;
1231
31
1232
32
TopLevelSurfaceList::TopLevelSurfaceList(QObject *parent) :
1233
33
    QAbstractListModel(parent)
1234
34
{
1235
35
    DEBUG_MSG << "()";
1236
36
}
1237
37
1238
38
TopLevelSurfaceList::~TopLevelSurfaceList()
1239
39
{
1240
40
    DEBUG_MSG << "()";
1241
41
}
1242
42
1243
43
int TopLevelSurfaceList::rowCount(const QModelIndex &parent) const
1244
44
{
1245
45
    return !parent.isValid() ? m_surfaceList.size() : 0;
1246
46
}
1247
47
1248
48
QVariant TopLevelSurfaceList::data(const QModelIndex& index, int role) const
1249
49
{
1250
50
    if (index.row() < 0 || index.row() >= m_surfaceList.size())
1251
51
        return QVariant();
1252
52
1253
53
    if (role == SurfaceRole) {
1254
54
        MirSurfaceInterface *surface = m_surfaceList.at(index.row()).surface;
1255
55
        return QVariant::fromValue(surface);
1256
56
    } else if (role == ApplicationRole) {
1257
57
        return QVariant::fromValue(m_surfaceList.at(index.row()).application);
1258
58
    } else if (role == IdRole) {
1259
59
        return QVariant::fromValue(m_surfaceList.at(index.row()).id);
1260
60
    } else {
1261
61
        return QVariant();
1262
62
    }
1263
63
}
1264
64
1265
65
void TopLevelSurfaceList::raise(MirSurfaceInterface *surface)
1266
66
{
1267
67
    if (!surface)
1268
68
        return;
1269
69
1270
70
    DEBUG_MSG << "(MirSurface[" << (void*)surface << "])";
1271
71
1272
72
    int i = indexOf(surface);
1273
73
    if (i != -1) {
1274
74
        raiseId(m_surfaceList.at(i).id);
1275
75
    }
1276
76
}
1277
77
1278
78
void TopLevelSurfaceList::appendPlaceholder(ApplicationInfoInterface *application)
1279
79
{
1280
80
    DEBUG_MSG << "(" << application->appId() << ")";
1281
81
1282
82
    appendSurfaceHelper(nullptr, application);
1283
83
}
1284
84
1285
85
void TopLevelSurfaceList::appendSurface(MirSurfaceInterface *surface, ApplicationInfoInterface *application)
1286
86
{
1287
87
    Q_ASSERT(surface != nullptr);
1288
88
1289
89
    bool filledPlaceholder = false;
1290
90
    for (int i = 0; i < m_surfaceList.count() && !filledPlaceholder; ++i) {
1291
91
        ModelEntry &entry = m_surfaceList[i];
1292
92
        if (entry.application == application && entry.surface == nullptr) {
1293
93
            entry.surface = surface;
1294
94
            connectSurface(surface);
1295
95
            DEBUG_MSG << " appId=" << application->appId() << " surface=" << surface
1296
96
                      << ", filling out placeholder. after: " << toString();
1297
97
            Q_EMIT dataChanged(index(i) /* topLeft */, index(i) /* bottomRight */, QVector<int>() << SurfaceRole);
1298
98
            filledPlaceholder = true;
1299
99
        }
1300
100
    }
1301
101
1302
102
    if (!filledPlaceholder) {
1303
103
        DEBUG_MSG << " appId=" << application->appId() << " surface=" << surface << ", adding new row";
1304
104
        appendSurfaceHelper(surface, application);
1305
105
    }
1306
106
}
1307
107
1308
108
void TopLevelSurfaceList::appendSurfaceHelper(MirSurfaceInterface *surface, ApplicationInfoInterface *application)
1309
109
{
1310
110
    if (m_modelState == IdleState) {
1311
111
        m_modelState = InsertingState;
1312
112
        beginInsertRows(QModelIndex(), m_surfaceList.size() /*first*/, m_surfaceList.size() /*last*/);
1313
113
    } else {
1314
114
        Q_ASSERT(m_modelState == ResettingState);
1315
115
        // No point in signaling anything if we're resetting the whole model
1316
116
    }
1317
117
1318
118
    int id = generateId();
1319
119
    m_surfaceList.append(ModelEntry(surface, application, id));
1320
120
    if (surface) {
1321
121
        connectSurface(surface);
1322
122
    }
1323
123
1324
124
    if (m_modelState == InsertingState) {
1325
125
        endInsertRows();
1326
126
        Q_EMIT countChanged();
1327
127
        Q_EMIT listChanged();
1328
128
        m_modelState = IdleState;
1329
129
    }
1330
130
1331
131
    DEBUG_MSG << " after " << toString();
1332
132
}
1333
133
1334
134
void TopLevelSurfaceList::connectSurface(MirSurfaceInterface *surface)
1335
135
{
1336
136
    connect(surface, &MirSurfaceInterface::liveChanged, this, [this, surface](bool live){
1337
137
            if (!live) {
1338
138
                onSurfaceDied(surface);
1339
139
            }
1340
140
        });
1341
141
    connect(surface, &QObject::destroyed, this, [this, surface](){ this->onSurfaceDestroyed(surface); });
1342
142
}
1343
143
1344
144
void TopLevelSurfaceList::onSurfaceDied(MirSurfaceInterface *surface)
1345
145
{
1346
146
    int i = indexOf(surface);
1347
147
    if (i == -1) {
1348
148
        return;
1349
149
    }
1350
150
1351
151
    auto application = m_surfaceList[i].application;
1352
152
1353
153
    // can't be starting if it already has a surface
1354
154
    Q_ASSERT(application->state() != ApplicationInfoInterface::Starting);
1355
155
1356
156
    if (application->state() == ApplicationInfoInterface::Running) {
1357
157
        m_surfaceList[i].removeOnceSurfaceDestroyed = true;
1358
158
    } else {
1359
159
        // assume it got killed by the out-of-memory daemon.
1360
160
        //
1361
161
        // So leave entry in the model and only remove its surface, so shell can display a screenshot
1362
162
        // in its place.
1363
163
        m_surfaceList[i].removeOnceSurfaceDestroyed = false;
1364
164
    }
1365
165
}
1366
166
1367
167
void TopLevelSurfaceList::onSurfaceDestroyed(MirSurfaceInterface *surface)
1368
168
{
1369
169
    int i = indexOf(surface);
1370
170
    if (i == -1) {
1371
171
        return;
1372
172
    }
1373
173
1374
174
    if (m_surfaceList[i].removeOnceSurfaceDestroyed) {
1375
175
        removeAt(i);
1376
176
    } else {
1377
177
        m_surfaceList[i].surface = nullptr;
1378
178
        Q_EMIT dataChanged(index(i) /* topLeft */, index(i) /* bottomRight */, QVector<int>() << SurfaceRole);
1379
179
        DEBUG_MSG << " Removed surface from entry. After: " << toString();
1380
180
    }
1381
181
}
1382
182
1383
183
void TopLevelSurfaceList::removeAt(int index)
1384
184
{
1385
185
    if (m_modelState == IdleState) {
1386
186
        beginRemoveRows(QModelIndex(), index, index);
1387
187
        m_modelState = RemovingState;
1388
188
    } else {
1389
189
        Q_ASSERT(m_modelState == ResettingState);
1390
190
        // No point in signaling anything if we're resetting the whole model
1391
191
    }
1392
192
1393
193
    m_surfaceList.removeAt(index);
1394
194
1395
195
    if (m_modelState == RemovingState) {
1396
196
        endRemoveRows();
1397
197
        Q_EMIT countChanged();
1398
198
        Q_EMIT listChanged();
1399
199
        m_modelState = IdleState;
1400
200
    }
1401
201
1402
202
    DEBUG_MSG << " after " << toString();
1403
203
}
1404
204
1405
205
int TopLevelSurfaceList::indexOf(MirSurfaceInterface *surface)
1406
206
{
1407
207
    for (int i = 0; i < m_surfaceList.count(); ++i) {
1408
208
        if (m_surfaceList.at(i).surface == surface) {
1409
209
            return i;
1410
210
        }
1411
211
    }
1412
212
    return -1;
1413
213
}
1414
214
1415
215
void TopLevelSurfaceList::move(int from, int to)
1416
216
{
1417
217
    if (from == to) return;
1418
218
    DEBUG_MSG << " from=" << from << " to=" << to;
1419
219
1420
220
    if (from >= 0 && from < m_surfaceList.size() && to >= 0 && to < m_surfaceList.size()) {
1421
221
        QModelIndex parent;
1422
222
        /* When moving an item down, the destination index needs to be incremented
1423
223
           by one, as explained in the documentation:
1424
224
           http://qt-project.org/doc/qt-5.0/qtcore/qabstractitemmodel.html#beginMoveRows */
1425
225
1426
226
        Q_ASSERT(m_modelState == IdleState);
1427
227
        m_modelState = MovingState;
1428
228
1429
229
        beginMoveRows(parent, from, from, parent, to + (to > from ? 1 : 0));
1430
230
        m_surfaceList.move(from, to);
1431
231
        endMoveRows();
1432
232
        Q_EMIT listChanged();
1433
233
1434
234
        m_modelState = IdleState;
1435
235
1436
236
        DEBUG_MSG << " after " << toString();
1437
237
    }
1438
238
}
1439
239
1440
240
MirSurfaceInterface *TopLevelSurfaceList::surfaceAt(int index) const
1441
241
{
1442
242
    if (index >=0 && index < m_surfaceList.count()) {
1443
243
        return m_surfaceList[index].surface;
1444
244
    } else {
1445
245
        return nullptr;
1446
246
    }
1447
247
}
1448
248
1449
249
ApplicationInfoInterface *TopLevelSurfaceList::applicationAt(int index) const
1450
250
{
1451
251
    if (index >=0 && index < m_surfaceList.count()) {
1452
252
        return m_surfaceList[index].application;
1453
253
    } else {
1454
254
        return nullptr;
1455
255
    }
1456
256
}
1457
257
1458
258
int TopLevelSurfaceList::idAt(int index) const
1459
259
{
1460
260
    if (index >=0 && index < m_surfaceList.count()) {
1461
261
        return m_surfaceList[index].id;
1462
262
    } else {
1463
263
        return 0;
1464
264
    }
1465
265
}
1466
266
1467
267
int TopLevelSurfaceList::indexForId(int id) const
1468
268
{
1469
269
    for (int i = 0; i < m_surfaceList.count(); ++i) {
1470
270
        if (m_surfaceList[i].id == id) {
1471
271
            return i;
1472
272
        }
1473
273
    }
1474
274
    return -1;
1475
275
}
1476
276
1477
277
void TopLevelSurfaceList::doRaiseId(int id)
1478
278
{
1479
279
    int fromIndex = indexForId(id);
1480
280
    if (fromIndex != -1) {
1481
281
        move(fromIndex, 0 /* toIndex */);
1482
282
    }
1483
283
}
1484
284
1485
285
void TopLevelSurfaceList::raiseId(int id)
1486
286
{
1487
287
    if (m_modelState == IdleState) {
1488
288
        DEBUG_MSG << "(id=" << id << ") - do it now.";
1489
289
        doRaiseId(id);
1490
290
    } else {
1491
291
        DEBUG_MSG << "(id=" << id << ") - Model busy (modelState=" << m_modelState << "). Try again in the next event loop.";
1492
292
        // The model has just signalled some change. If we have a Repeater responding to this update, it will get nuts
1493
293
        // if we perform yet another model change straight away.
1494
294
        //
1495
295
        // A bad sympton of this problem is a Repeater.itemAt(index) call returning null event though Repeater.count says
1496
296
        // the index is definitely within bounds.
1497
297
        QMetaObject::invokeMethod(this, "raiseId", Qt::QueuedConnection, Q_ARG(int, id));
1498
298
    }
1499
299
}
1500
300
1501
301
int TopLevelSurfaceList::generateId()
1502
302
{
1503
303
    int id = m_nextId;
1504
304
    m_nextId = nextFreeId(m_nextId + 1);
1505
305
    Q_EMIT nextIdChanged();
1506
306
    return id;
1507
307
}
1508
308
1509
309
int TopLevelSurfaceList::nextFreeId(int candidateId)
1510
310
{
1511
311
    if (candidateId > m_maxId) {
1512
312
        return nextFreeId(1);
1513
313
    } else {
1514
314
        if (indexForId(candidateId) == -1) {
1515
315
            // it's indeed free
1516
316
            return candidateId;
1517
317
        } else {
1518
318
            return nextFreeId(candidateId + 1);
1519
319
        }
1520
320
    }
1521
321
}
1522
322
1523
323
QString TopLevelSurfaceList::toString()
1524
324
{
1525
325
    QString str;
1526
326
    for (int i = 0; i < m_surfaceList.count(); ++i) {
1527
327
        auto item = m_surfaceList.at(i);
1528
328
1529
329
        QString itemStr = QString("(index=%1,appId=%2,surface=0x%3,id=%4)")
1530
330
            .arg(i)
1531
331
            .arg(item.application->appId())
1532
332
            .arg((qintptr)item.surface, 0, 16)
1533
333
            .arg(item.id);
1534
334
1535
335
        if (i > 0) {
1536
336
            str.append(",");
1537
337
        }
1538
338
        str.append(itemStr);
1539
339
    }
1540
340
    return str;
1541
341
}
1542
342
1543
343
void TopLevelSurfaceList::addApplication(ApplicationInfoInterface *application)
1544
344
{
1545
345
    DEBUG_MSG << "(" << application->appId() << ")";
1546
346
    Q_ASSERT(!m_applications.contains(application));
1547
347
    m_applications.append(application);
1548
348
1549
349
    MirSurfaceListInterface *surfaceList = application->surfaceList();
1550
350
1551
351
    if (application->state() != ApplicationInfoInterface::Stopped) {
1552
352
        if (surfaceList->count() == 0) {
1553
353
            appendPlaceholder(application);
1554
354
        } else {
1555
355
            for (int i = 0; i < surfaceList->count(); ++i) {
1556
356
                appendSurface(surfaceList->get(i), application);
1557
357
            }
1558
358
        }
1559
359
    }
1560
360
1561
361
    connect(surfaceList, &QAbstractItemModel::rowsInserted, this,
1562
362
            [this, application, surfaceList](const QModelIndex & /*parent*/, int first, int last)
1563
363
            {
1564
364
                for (int i = last; i >= first; --i) {
1565
365
                    this->appendSurface(surfaceList->get(i), application);
1566
366
                }
1567
367
            });
1568
368
}
1569
369
1570
370
void TopLevelSurfaceList::removeApplication(ApplicationInfoInterface *application)
1571
371
{
1572
372
    DEBUG_MSG << "(" << application->appId() << ")";
1573
373
    Q_ASSERT(m_applications.contains(application));
1574
374
1575
375
    MirSurfaceListInterface *surfaceList = application->surfaceList();
1576
376
1577
377
    disconnect(surfaceList, 0, this, 0);
1578
378
1579
379
    Q_ASSERT(m_modelState == IdleState);
1580
380
    m_modelState = RemovingState;
1581
381
1582
382
    int i = 0;
1583
383
    while (i < m_surfaceList.count()) {
1584
384
        if (m_surfaceList.at(i).application == application) {
1585
385
            beginRemoveRows(QModelIndex(), i, i);
1586
386
            m_surfaceList.removeAt(i);
1587
387
            endRemoveRows();
1588
388
            Q_EMIT countChanged();
1589
389
            Q_EMIT listChanged();
1590
390
        } else {
1591
391
            ++i;
1592
392
        }
1593
393
    }
1594
394
1595
395
    m_modelState = IdleState;
1596
396
1597
397
    DEBUG_MSG << " after " << toString();
1598
398
1599
399
    m_applications.removeAll(application);
1600
400
}
1601
401
1602
402
QAbstractListModel *TopLevelSurfaceList::applicationsModel() const
1603
403
{
1604
404
    return m_applicationsModel;
1605
405
}
1606
406
1607
407
void TopLevelSurfaceList::setApplicationsModel(QAbstractListModel* value)
1608
408
{
1609
409
    if (m_applicationsModel == value) {
1610
410
        return;
1611
411
    }
1612
412
1613
413
    DEBUG_MSG << "(" << value << ")";
1614
414
1615
415
    Q_ASSERT(m_modelState == IdleState);
1616
416
    m_modelState = ResettingState;
1617
417
1618
418
    beginResetModel();
1619
419
1620
420
    if (m_applicationsModel) {
1621
421
        m_surfaceList.clear();
1622
422
        m_applications.clear();
1623
423
        disconnect(m_applicationsModel, 0, this, 0);
1624
424
    }
1625
425
1626
426
    m_applicationsModel = value;
1627
427
1628
428
    if (m_applicationsModel) {
1629
429
        findApplicationRole();
1630
430
1631
431
        connect(m_applicationsModel, &QAbstractItemModel::rowsInserted,
1632
432
                this, [this](const QModelIndex &/*parent*/, int first, int last) {
1633
433
                    for (int i = first; i <= last; ++i) {
1634
434
                        auto application = getApplicationFromModelAt(i);
1635
435
                        addApplication(application);
1636
436
                    }
1637
437
                });
1638
438
1639
439
        connect(m_applicationsModel, &QAbstractItemModel::rowsAboutToBeRemoved,
1640
440
                this, [this](const QModelIndex &/*parent*/, int first, int last) {
1641
441
                    for (int i = first; i <= last; ++i) {
1642
442
                        auto application = getApplicationFromModelAt(i);
1643
443
                        removeApplication(application);
1644
444
                    }
1645
445
                });
1646
446
1647
447
        for (int i = 0; i < m_applicationsModel->rowCount(); ++i) {
1648
448
            auto application = getApplicationFromModelAt(i);
1649
449
            addApplication(application);
1650
450
        }
1651
451
    }
1652
452
1653
453
    endResetModel();
1654
454
    m_modelState = IdleState;
1655
455
}
1656
456
1657
457
ApplicationInfoInterface *TopLevelSurfaceList::getApplicationFromModelAt(int index)
1658
458
{
1659
459
    QModelIndex modelIndex = m_applicationsModel->index(index);
1660
460
1661
461
    QVariant variant =  m_applicationsModel->data(modelIndex, m_applicationRole);
1662
462
1663
463
    // variant.value<ApplicationInfoInterface*>() returns null for some reason.
1664
464
    return static_cast<ApplicationInfoInterface*>(variant.value<QObject*>());
1665
465
}
1666
466
1667
467
void TopLevelSurfaceList::findApplicationRole()
1668
468
{
1669
469
    QHash<int, QByteArray> namesHash = m_applicationsModel->roleNames();
1670
470
1671
471
    m_applicationRole = -1;
1672
472
    for (auto i = namesHash.begin(); i != namesHash.end() && m_applicationRole == -1; ++i) {
1673
473
        if (i.value() == "application") {
1674
474
            m_applicationRole = i.key();
1675
475
        }
1676
476
    }
1677
477
1678
478
    if (m_applicationRole == -1) {
1679
479
        qFatal("TopLevelSurfaceList: applicationsModel must have a \"application\" role.");
1680
480
    }
1681
481
}
1682
482
0
1683
=== removed file 'plugins/WindowManager/TopLevelSurfaceList.h'
1684
--- plugins/WindowManager/TopLevelSurfaceList.h	2016-04-04 13:39:44 +0000
1685
+++ plugins/WindowManager/TopLevelSurfaceList.h	1970-01-01 00:00:00 +0000
1686
@@ -1,223 +0,0 @@
1687
1
/*
1688
2
 * Copyright (C) 2016 Canonical, Ltd.
1689
3
 *
1690
4
 * This program is free software; you can redistribute it and/or modify
1691
5
 * it under the terms of the GNU General Public License as published by
1692
6
 * the Free Software Foundation; version 3.
1693
7
 *
1694
8
 * This program is distributed in the hope that it will be useful,
1695
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1696
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1697
11
 * GNU General Public License for more details.
1698
12
 *
1699
13
 * You should have received a copy of the GNU General Public License
1700
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1701
15
 */
1702
16
1703
17
#ifndef TOPLEVELSURFACELIST_H
1704
18
#define TOPLEVELSURFACELIST_H
1705
19
1706
20
#include <QAbstractListModel>
1707
21
#include <QList>
1708
22
#include <QLoggingCategory>
1709
23
1710
24
Q_DECLARE_LOGGING_CATEGORY(UNITY_TOPSURFACELIST)
1711
25
1712
26
namespace unity {
1713
27
    namespace shell {
1714
28
        namespace application {
1715
29
            class ApplicationInfoInterface;
1716
30
            class MirSurfaceInterface;
1717
31
        }
1718
32
    }
1719
33
}
1720
34
1721
35
/**
1722
36
 * @brief A model of top-level surfaces
1723
37
 *
1724
38
 * It's an abstraction of top-level application windows.
1725
39
 *
1726
40
 * When an entry first appears, it normaly doesn't have a surface yet, meaning that the application is
1727
41
 * still starting up. A shell should then display a splash screen or saved screenshot of the application
1728
42
 * until its surface comes up.
1729
43
 *
1730
44
 * As applications can have multiple surfaces and you can also have entries without surfaces at all,
1731
45
 * the only way to unambiguously refer to an entry in this model is through its id.
1732
46
 */
1733
47
class TopLevelSurfaceList : public QAbstractListModel
1734
48
{
1735
49
1736
50
    Q_OBJECT
1737
51
1738
52
    /**
1739
53
     * @brief A list model of applications.
1740
54
     *
1741
55
     * It's expected to have a role called "application" which returns a ApplicationInfoInterface
1742
56
     */
1743
57
    Q_PROPERTY(QAbstractListModel* applicationsModel READ applicationsModel
1744
58
                                                     WRITE setApplicationsModel
1745
59
                                                     NOTIFY applicationsModelChanged)
1746
60
1747
61
    /**
1748
62
     * @brief Number of top-level surfaces in this model
1749
63
     *
1750
64
     * This is the same as rowCount, added in order to keep compatibility with QML ListModels.
1751
65
     */
1752
66
    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
1753
67
1754
68
    /**
1755
69
      The id to be used on the next entry created
1756
70
      Useful for tests
1757
71
     */
1758
72
    Q_PROPERTY(int nextId READ nextId NOTIFY nextIdChanged)
1759
73
public:
1760
74
1761
75
    /**
1762
76
     * @brief The Roles supported by the model
1763
77
     *
1764
78
     * SurfaceRole - A MirSurfaceInterface. It will be null if the application is still starting up
1765
79
     * ApplicationRole - An ApplicationInfoInterface
1766
80
     * IdRole - A unique identifier for this entry. Useful to unambiguosly track elements as they move around in the list
1767
81
     */
1768
82
    enum Roles {
1769
83
        SurfaceRole = Qt::UserRole,
1770
84
        ApplicationRole = Qt::UserRole + 1,
1771
85
        IdRole = Qt::UserRole + 2,
1772
86
    };
1773
87
1774
88
    explicit TopLevelSurfaceList(QObject *parent = nullptr);
1775
89
    virtual ~TopLevelSurfaceList();
1776
90
1777
91
    // QAbstractItemModel methods
1778
92
    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
1779
93
    QVariant data(const QModelIndex& index, int role) const override;
1780
94
    QHash<int, QByteArray> roleNames() const override {
1781
95
        QHash<int, QByteArray> roleNames { {SurfaceRole, "surface"},
1782
96
                                           {ApplicationRole, "application"},
1783
97
                                           {IdRole, "id"} };
1784
98
        return roleNames;
1785
99
    }
1786
100
1787
101
    int nextId() const { return m_nextId; }
1788
102
1789
103
    QAbstractListModel *applicationsModel() const;
1790
104
    void setApplicationsModel(QAbstractListModel*);
1791
105
1792
106
public Q_SLOTS:
1793
107
    /**
1794
108
     * @brief Returns the surface at the given index
1795
109
     *
1796
110
     * It will be a nullptr if the application is still starting up and thus hasn't yet created
1797
111
     * and drawn into a surface.
1798
112
     */
1799
113
    unity::shell::application::MirSurfaceInterface *surfaceAt(int index) const;
1800
114
1801
115
    /**
1802
116
     * @brief Returns the application at the given index
1803
117
     */
1804
118
    unity::shell::application::ApplicationInfoInterface *applicationAt(int index) const;
1805
119
1806
120
    /**
1807
121
     * @brief Returns the unique id of the element at the given index
1808
122
     */
1809
123
    int idAt(int index) const;
1810
124
1811
125
    /**
1812
126
     * @brief Returns the index where the row with the given id is located
1813
127
     *
1814
128
     * Returns -1 if there's no row with the given id.
1815
129
     */
1816
130
    int indexForId(int id) const;
1817
131
1818
132
    /**
1819
133
     * @brief Raises the row with the given id to index 0
1820
134
     */
1821
135
    void raiseId(int id);
1822
136
1823
137
    void doRaiseId(int id);
1824
138
1825
139
Q_SIGNALS:
1826
140
    void countChanged();
1827
141
1828
142
    /**
1829
143
     * @brief Emitted when the list changes
1830
144
     *
1831
145
     * Emitted when model gains an element, loses an element or when elements exchange positions.
1832
146
     */
1833
147
    void listChanged();
1834
148
1835
149
    void nextIdChanged();
1836
150
1837
151
    void applicationsModelChanged();
1838
152
1839
153
private:
1840
154
    void addApplication(unity::shell::application::ApplicationInfoInterface *application);
1841
155
    void removeApplication(unity::shell::application::ApplicationInfoInterface *application);
1842
156
1843
157
    int indexOf(unity::shell::application::MirSurfaceInterface *surface);
1844
158
    void raise(unity::shell::application::MirSurfaceInterface *surface);
1845
159
    void move(int from, int to);
1846
160
    void appendSurfaceHelper(unity::shell::application::MirSurfaceInterface *surface,
1847
161
                              unity::shell::application::ApplicationInfoInterface *application);
1848
162
    void connectSurface(unity::shell::application::MirSurfaceInterface *surface);
1849
163
    int generateId();
1850
164
    int nextFreeId(int candidateId);
1851
165
    QString toString();
1852
166
    void onSurfaceDestroyed(unity::shell::application::MirSurfaceInterface *surface);
1853
167
    void onSurfaceDied(unity::shell::application::MirSurfaceInterface *surface);
1854
168
    void removeAt(int index);
1855
169
    void findApplicationRole();
1856
170
1857
171
    unity::shell::application::ApplicationInfoInterface *getApplicationFromModelAt(int index);
1858
172
1859
173
    /*
1860
174
        Placeholder for a future surface from a starting or running application.
1861
175
        Enables shell to give immediate feedback to the user by showing, eg,
1862
176
        a splash screen.
1863
177
1864
178
        It's a model row containing a null surface and the given application.
1865
179
     */
1866
180
    void appendPlaceholder(unity::shell::application::ApplicationInfoInterface *application);
1867
181
1868
182
    /*
1869
183
        Adds a model row with the given surface and application
1870
184
1871
185
        Alternatively, if a placeholder exists for the given application it's
1872
186
        filled with the given surface instead.
1873
187
     */
1874
188
    void appendSurface(unity::shell::application::MirSurfaceInterface *surface,
1875
189
            unity::shell::application::ApplicationInfoInterface *application);
1876
190
1877
191
    struct ModelEntry {
1878
192
        ModelEntry(unity::shell::application::MirSurfaceInterface *surface, unity::shell::application::ApplicationInfoInterface *application, int id)
1879
193
            : surface(surface), application(application), id(id) {}
1880
194
        unity::shell::application::MirSurfaceInterface *surface;
1881
195
        unity::shell::application::ApplicationInfoInterface *application;
1882
196
        int id;
1883
197
        bool removeOnceSurfaceDestroyed{false};
1884
198
    };
1885
199
1886
200
    QList<ModelEntry> m_surfaceList;
1887
201
    int m_nextId{1};
1888
202
    static const int m_maxId{1000000};
1889
203
1890
204
    // applications that are being monitored
1891
205
    QList<unity::shell::application::ApplicationInfoInterface *> m_applications;
1892
206
1893
207
    QAbstractListModel* m_applicationsModel{nullptr};
1894
208
    int m_applicationRole{-1};
1895
209
1896
210
    enum ModelState {
1897
211
        IdleState,
1898
212
        InsertingState,
1899
213
        RemovingState,
1900
214
        MovingState,
1901
215
        ResettingState
1902
216
    };
1903
217
    ModelState m_modelState{IdleState};
1904
218
};
1905
219
1906
220
Q_DECLARE_METATYPE(TopLevelSurfaceList*)
1907
221
Q_DECLARE_METATYPE(QAbstractListModel*)
1908
222
1909
223
#endif // TOPLEVELSURFACELIST_H
1910
224
0
1911
=== added file 'plugins/WindowManager/TopLevelWindowModel.cpp'
1912
--- plugins/WindowManager/TopLevelWindowModel.cpp	1970-01-01 00:00:00 +0000
1913
+++ plugins/WindowManager/TopLevelWindowModel.cpp	2016-12-12 16:49:02 +0000
1914
@@ -0,0 +1,668 @@
1915
1
/*
1916
2
 * Copyright (C) 2016 Canonical, Ltd.
1917
3
 *
1918
4
 * This program is free software: you can redistribute it and/or modify it under
1919
5
 * the terms of the GNU Lesser General Public License version 3, as published by
1920
6
 * the Free Software Foundation.
1921
7
 *
1922
8
 * This program is distributed in the hope that it will be useful, but WITHOUT
1923
9
 * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
1924
10
 * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
1925
11
 * Lesser General Public License for more details.
1926
12
 *
1927
13
 * You should have received a copy of the GNU Lesser General Public License
1928
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1929
15
 */
1930
16
1931
17
#include "TopLevelWindowModel.h"
1932
18
1933
19
// unity-api
1934
20
#include <unity/shell/application/ApplicationInfoInterface.h>
1935
21
#include <unity/shell/application/ApplicationManagerInterface.h>
1936
22
#include <unity/shell/application/MirSurfaceInterface.h>
1937
23
#include <unity/shell/application/MirSurfaceListInterface.h>
1938
24
#include <unity/shell/application/SurfaceManagerInterface.h>
1939
25
1940
26
// Qt
1941
27
#include <QGuiApplication>
1942
28
#include <QDebug>
1943
29
1944
30
// local
1945
31
#include "Window.h"
1946
32
1947
33
Q_LOGGING_CATEGORY(TOPLEVELWINDOWMODEL, "toplevelwindowmodel", QtInfoMsg)
1948
34
1949
35
#define DEBUG_MSG qCDebug(TOPLEVELWINDOWMODEL).nospace().noquote() << __func__
1950
36
#define INFO_MSG qCInfo(TOPLEVELWINDOWMODEL).nospace().noquote() << __func__
1951
37
1952
38
namespace unityapi = unity::shell::application;
1953
39
1954
40
TopLevelWindowModel::TopLevelWindowModel()
1955
41
{
1956
42
}
1957
43
1958
44
void TopLevelWindowModel::setApplicationManager(unityapi::ApplicationManagerInterface* value)
1959
45
{
1960
46
    if (m_applicationManager == value) {
1961
47
        return;
1962
48
    }
1963
49
1964
50
    DEBUG_MSG << "(" << value << ")";
1965
51
1966
52
    Q_ASSERT(m_modelState == IdleState);
1967
53
    m_modelState = ResettingState;
1968
54
1969
55
    beginResetModel();
1970
56
1971
57
    if (m_applicationManager) {
1972
58
        m_windowModel.clear();
1973
59
        disconnect(m_applicationManager, 0, this, 0);
1974
60
    }
1975
61
1976
62
    m_applicationManager = value;
1977
63
1978
64
    if (m_applicationManager) {
1979
65
        connect(m_applicationManager, &QAbstractItemModel::rowsInserted,
1980
66
                this, [this](const QModelIndex &/*parent*/, int first, int last) {
1981
67
                    for (int i = first; i <= last; ++i) {
1982
68
                        auto application = m_applicationManager->get(i);
1983
69
                        addApplication(application);
1984
70
                    }
1985
71
                });
1986
72
1987
73
        connect(m_applicationManager, &QAbstractItemModel::rowsAboutToBeRemoved,
1988
74
                this, [this](const QModelIndex &/*parent*/, int first, int last) {
1989
75
                    for (int i = first; i <= last; ++i) {
1990
76
                        auto application = m_applicationManager->get(i);
1991
77
                        removeApplication(application);
1992
78
                    }
1993
79
                });
1994
80
1995
81
        for (int i = 0; i < m_applicationManager->rowCount(); ++i) {
1996
82
            auto application = m_applicationManager->get(i);
1997
83
            addApplication(application);
1998
84
        }
1999
85
    }
2000
86
2001
87
    endResetModel();
2002
88
    m_modelState = IdleState;
2003
89
}
2004
90
2005
91
void TopLevelWindowModel::setSurfaceManager(unityapi::SurfaceManagerInterface *surfaceManager)
2006
92
{
2007
93
    if (surfaceManager == m_surfaceManager) {
2008
94
        return;
2009
95
    }
2010
96
2011
97
    DEBUG_MSG << "(" << surfaceManager << ")";
2012
98
2013
99
    if (m_surfaceManager) {
2014
100
        disconnect(m_surfaceManager, 0, this, 0);
2015
101
    }
2016
102
2017
103
    m_surfaceManager = surfaceManager;
2018
104
2019
105
    if (m_surfaceManager) {
2020
106
        connect(m_surfaceManager, &unityapi::SurfaceManagerInterface::surfaceCreated, this, &TopLevelWindowModel::onSurfaceCreated);
2021
107
        connect(m_surfaceManager, &unityapi::SurfaceManagerInterface::surfacesRaised, this, &TopLevelWindowModel::onSurfacesRaised);
2022
108
        connect(m_surfaceManager, &unityapi::SurfaceManagerInterface::modificationsStarted, this, &TopLevelWindowModel::onModificationsStarted);
2023
109
        connect(m_surfaceManager, &unityapi::SurfaceManagerInterface::modificationsEnded, this, &TopLevelWindowModel::onModificationsEnded);
2024
110
    }
2025
111
2026
112
    Q_EMIT surfaceManagerChanged(m_surfaceManager);
2027
113
}
2028
114
2029
115
void TopLevelWindowModel::addApplication(unityapi::ApplicationInfoInterface *application)
2030
116
{
2031
117
    DEBUG_MSG << "(" << application->appId() << ")";
2032
118
2033
119
    if (application->state() != unityapi::ApplicationInfoInterface::Stopped && application->surfaceList()->count() == 0) {
2034
120
        prependPlaceholder(application);
2035
121
    }
2036
122
}
2037
123
2038
124
void TopLevelWindowModel::removeApplication(unityapi::ApplicationInfoInterface *application)
2039
125
{
2040
126
    DEBUG_MSG << "(" << application->appId() << ")";
2041
127
2042
128
    Q_ASSERT(m_modelState == IdleState);
2043
129
2044
130
    int i = 0;
2045
131
    while (i < m_windowModel.count()) {
2046
132
        if (m_windowModel.at(i).application == application) {
2047
133
            removeAt(i);
2048
134
        } else {
2049
135
            ++i;
2050
136
        }
2051
137
    }
2052
138
}
2053
139
2054
140
void TopLevelWindowModel::prependPlaceholder(unityapi::ApplicationInfoInterface *application)
2055
141
{
2056
142
    INFO_MSG << "(" << application->appId() << ")";
2057
143
2058
144
    prependSurfaceHelper(nullptr, application);
2059
145
}
2060
146
2061
147
void TopLevelWindowModel::prependSurface(unityapi::MirSurfaceInterface *surface, unityapi::ApplicationInfoInterface *application)
2062
148
{
2063
149
    Q_ASSERT(surface != nullptr);
2064
150
2065
151
    bool filledPlaceholder = false;
2066
152
    for (int i = 0; i < m_windowModel.count() && !filledPlaceholder; ++i) {
2067
153
        ModelEntry &entry = m_windowModel[i];
2068
154
        if (entry.application == application && entry.window->surface() == nullptr) {
2069
155
            entry.window->setSurface(surface);
2070
156
            connectSurface(surface);
2071
157
            INFO_MSG << " appId=" << application->appId() << " surface=" << surface
2072
158
                      << ", filling out placeholder. after: " << toString();
2073
159
            filledPlaceholder = true;
2074
160
        }
2075
161
    }
2076
162
2077
163
    if (!filledPlaceholder) {
2078
164
        INFO_MSG << " appId=" << application->appId() << " surface=" << surface << ", adding new row";
2079
165
        prependSurfaceHelper(surface, application);
2080
166
    }
2081
167
}
2082
168
2083
169
void TopLevelWindowModel::prependSurfaceHelper(unityapi::MirSurfaceInterface *surface, unityapi::ApplicationInfoInterface *application)
2084
170
{
2085
171
    if (m_modelState == IdleState) {
2086
172
        m_modelState = InsertingState;
2087
173
        beginInsertRows(QModelIndex(), 0 /*first*/, 0 /*last*/);
2088
174
    } else {
2089
175
        Q_ASSERT(m_modelState == ResettingState);
2090
176
        // No point in signaling anything if we're resetting the whole model
2091
177
    }
2092
178
2093
179
    int id = generateId();
2094
180
    Window *window = new Window(id, this);
2095
181
    if (surface) {
2096
182
        window->setSurface(surface);
2097
183
    }
2098
184
    m_windowModel.prepend(ModelEntry(window, application));
2099
185
    if (surface) {
2100
186
        connectSurface(surface);
2101
187
    }
2102
188
2103
189
    connectWindow(window);
2104
190
2105
191
    if (m_modelState == InsertingState) {
2106
192
        endInsertRows();
2107
193
        Q_EMIT countChanged();
2108
194
        Q_EMIT listChanged();
2109
195
        m_modelState = IdleState;
2110
196
    }
2111
197
2112
198
    if (!surface) {
2113
199
        activateEmptyWindow(window);
2114
200
    }
2115
201
2116
202
    INFO_MSG << " after " << toString();
2117
203
}
2118
204
2119
205
void TopLevelWindowModel::connectWindow(Window *window)
2120
206
{
2121
207
    connect(window, &Window::focusRequested, this, [this, window]() {
2122
208
        if (!window->surface()) {
2123
209
            activateEmptyWindow(window);
2124
210
        }
2125
211
    });
2126
212
2127
213
    connect(window, &Window::focusedChanged, this, [this, window](bool focused) {
2128
214
        if (window->surface()) {
2129
215
            // Condense changes to the focused window
2130
216
            // eg: Do focusedWindow=A to focusedWindow=B instead of
2131
217
            // focusedWindow=A to focusedWindow=null to focusedWindow=B
2132
218
            if (focused) {
2133
219
                Q_ASSERT(m_newlyFocusedWindow == nullptr);
2134
220
                m_focusedWindowChanged = true;
2135
221
                m_newlyFocusedWindow = window;
2136
222
            } else if (m_focusedWindow == window) {
2137
223
                m_focusedWindowChanged = true;
2138
224
            } else {
2139
225
                // don't clear the focused window if you were not there in the first place
2140
226
                // happens when a filled window gets replaced with an empty one (no surface) as the focused window.
2141
227
            }
2142
228
        }
2143
229
    });
2144
230
2145
231
    connect(window, &Window::closeRequested, this, [this, window]() {
2146
232
        if (!window->surface()) {
2147
233
            // do things ourselves as miral doesn't know about this window
2148
234
            int id = window->id();
2149
235
            int index = indexForId(id);
2150
236
            bool focusOther = false;
2151
237
            Q_ASSERT(index >= 0);
2152
238
            if (window->focused()) {
2153
239
                focusOther = true;
2154
240
            }
2155
241
            m_windowModel[index].application->close();
2156
242
            if (focusOther) {
2157
243
                activateTopMostWindowWithoutId(id);
2158
244
            }
2159
245
        }
2160
246
    });
2161
247
2162
248
    connect(window, &Window::emptyWindowActivated, this, [this, window]() {
2163
249
        activateEmptyWindow(window);
2164
250
    });
2165
251
}
2166
252
2167
253
void TopLevelWindowModel::activateEmptyWindow(Window *window)
2168
254
{
2169
255
    Q_ASSERT(!window->surface());
2170
256
    DEBUG_MSG << "(" << window << ")";
2171
257
2172
258
    // miral doesn't know about empty windows (ie, windows that are not backed up by MirSurfaces)
2173
259
    // So we have to activate them ourselves (instead of asking SurfaceManager to do it for us).
2174
260
2175
261
    window->setFocused(true);
2176
262
    raiseId(window->id());
2177
263
    Window *previousWindow = m_focusedWindow;
2178
264
    setFocusedWindow(window);
2179
265
    if (previousWindow && previousWindow->surface() && previousWindow->surface()->focused()) {
2180
266
        m_surfaceManager->activate(nullptr);
2181
267
    }
2182
268
}
2183
269
2184
270
void TopLevelWindowModel::connectSurface(unityapi::MirSurfaceInterface *surface)
2185
271
{
2186
272
    connect(surface, &unityapi::MirSurfaceInterface::liveChanged, this, [this, surface](bool live){
2187
273
            if (!live) {
2188
274
                onSurfaceDied(surface);
2189
275
            }
2190
276
        });
2191
277
    connect(surface, &QObject::destroyed, this, [this, surface](){ this->onSurfaceDestroyed(surface); });
2192
278
}
2193
279
2194
280
void TopLevelWindowModel::onSurfaceDied(unityapi::MirSurfaceInterface *surface)
2195
281
{
2196
282
    if (surface->type() == Mir::InputMethodType) {
2197
283
        removeInputMethodWindow();
2198
284
        return;
2199
285
    }
2200
286
2201
287
    int i = indexOf(surface);
2202
288
    if (i == -1) {
2203
289
        return;
2204
290
    }
2205
291
2206
292
    auto application = m_windowModel[i].application;
2207
293
2208
294
    // can't be starting if it already has a surface
2209
295
    Q_ASSERT(application->state() != unityapi::ApplicationInfoInterface::Starting);
2210
296
2211
297
    if (application->state() == unityapi::ApplicationInfoInterface::Running) {
2212
298
        m_windowModel[i].removeOnceSurfaceDestroyed = true;
2213
299
    } else {
2214
300
        // assume it got killed by the out-of-memory daemon.
2215
301
        //
2216
302
        // So leave entry in the model and only remove its surface, so shell can display a screenshot
2217
303
        // in its place.
2218
304
        m_windowModel[i].removeOnceSurfaceDestroyed = false;
2219
305
    }
2220
306
}
2221
307
2222
308
void TopLevelWindowModel::onSurfaceDestroyed(unityapi::MirSurfaceInterface *surface)
2223
309
{
2224
310
    int i = indexOf(surface);
2225
311
    if (i == -1) {
2226
312
        return;
2227
313
    }
2228
314
2229
315
    if (m_windowModel[i].removeOnceSurfaceDestroyed) {
2230
316
        removeAt(i);
2231
317
    } else {
2232
318
        auto window = m_windowModel[i].window;
2233
319
        window->setSurface(nullptr);
2234
320
        window->setFocused(false);
2235
321
        INFO_MSG << " Removed surface from entry. After: " << toString();
2236
322
    }
2237
323
}
2238
324
2239
325
void TopLevelWindowModel::onSurfaceCreated(unityapi::MirSurfaceInterface *surface)
2240
326
{
2241
327
    DEBUG_MSG << "(" << surface << ")";
2242
328
    if (surface->type() == Mir::InputMethodType) {
2243
329
        int id = generateId();
2244
330
        Window *qmlWindow = new Window(id, this);
2245
331
        connectWindow(qmlWindow);
2246
332
        qmlWindow->setSurface(surface);
2247
333
        setInputMethodWindow(qmlWindow);
2248
334
    } else {
2249
335
        auto application = m_applicationManager->findApplicationWithSurface(surface);
2250
336
        if (application) {
2251
337
            prependSurface(surface, application);
2252
338
        } else {
2253
339
            // Must be a prompt session. No need to do add it as a prompt surface is not top-level.
2254
340
            // It will show up in the ApplicationInfoInterface::promptSurfaceList of some application.
2255
341
            // Still wrap it in a Window though, so that we keep focusedWindow() up to date.
2256
342
            int id = generateId();
2257
343
            Window *promptWindow = new Window(id, this);
2258
344
            connectWindow(promptWindow);
2259
345
            promptWindow->setSurface(surface);
2260
346
            connect(surface, &QObject::destroyed, promptWindow, [=](){
2261
347
                promptWindow->setSurface(nullptr);
2262
348
                promptWindow->deleteLater();
2263
349
            });
2264
350
        }
2265
351
    }
2266
352
    // TODO: handle surfaces that are neither top-level windows nor input method. eg: child dialogs, popups, menus
2267
353
}
2268
354
2269
355
void TopLevelWindowModel::removeAt(int index)
2270
356
{
2271
357
    if (m_modelState == IdleState) {
2272
358
        beginRemoveRows(QModelIndex(), index, index);
2273
359
        m_modelState = RemovingState;
2274
360
    } else {
2275
361
        Q_ASSERT(m_modelState == ResettingState);
2276
362
        // No point in signaling anything if we're resetting the whole model
2277
363
    }
2278
364
2279
365
    auto window = m_windowModel[index].window;
2280
366
2281
367
    window->setSurface(nullptr);
2282
368
    window->setFocused(false);
2283
369
2284
370
    m_windowModel.removeAt(index);
2285
371
2286
372
    if (m_modelState == RemovingState) {
2287
373
        endRemoveRows();
2288
374
        Q_EMIT countChanged();
2289
375
        Q_EMIT listChanged();
2290
376
        m_modelState = IdleState;
2291
377
    }
2292
378
2293
379
    disconnect(window, 0, this, 0);
2294
380
    if (m_focusedWindow == window) {
2295
381
        setFocusedWindow(nullptr);
2296
382
    }
2297
383
    delete window;
2298
384
2299
385
    INFO_MSG << " after " << toString();
2300
386
}
2301
387
2302
388
void TopLevelWindowModel::setInputMethodWindow(Window *window)
2303
389
{
2304
390
    if (m_inputMethodWindow) {
2305
391
        qWarning("Multiple Input Method Surfaces created, removing the old one!");
2306
392
        delete m_inputMethodWindow;
2307
393
    }
2308
394
    m_inputMethodWindow = window;
2309
395
    Q_EMIT inputMethodSurfaceChanged(m_inputMethodWindow->surface());
2310
396
}
2311
397
2312
398
void TopLevelWindowModel::removeInputMethodWindow()
2313
399
{
2314
400
    if (m_inputMethodWindow) {
2315
401
        delete m_inputMethodWindow;
2316
402
        m_inputMethodWindow = nullptr;
2317
403
        Q_EMIT inputMethodSurfaceChanged(nullptr);
2318
404
    }
2319
405
}
2320
406
2321
407
void TopLevelWindowModel::onSurfacesRaised(const QVector<unityapi::MirSurfaceInterface*> &surfaces)
2322
408
{
2323
409
    DEBUG_MSG << "(" << surfaces << ")";
2324
410
    const int raiseCount = surfaces.size();
2325
411
    for (int i = 0; i < raiseCount; i++) {
2326
412
        int fromIndex = findIndexOf(surfaces[i]);
2327
413
        if (fromIndex != -1) {
2328
414
            move(fromIndex, 0);
2329
415
        }
2330
416
    }
2331
417
}
2332
418
2333
419
int TopLevelWindowModel::rowCount(const QModelIndex &/*parent*/) const
2334
420
{
2335
421
    return m_windowModel.count();
2336
422
}
2337
423
2338
424
QVariant TopLevelWindowModel::data(const QModelIndex& index, int role) const
2339
425
{
2340
426
    if (index.row() < 0 || index.row() >= m_windowModel.size())
2341
427
        return QVariant();
2342
428
2343
429
    if (role == WindowRole) {
2344
430
        Window *window = m_windowModel.at(index.row()).window;
2345
431
        return QVariant::fromValue(window);
2346
432
    } else if (role == ApplicationRole) {
2347
433
        return QVariant::fromValue(m_windowModel.at(index.row()).application);
2348
434
    } else {
2349
435
        return QVariant();
2350
436
    }
2351
437
}
2352
438
2353
439
int TopLevelWindowModel::findIndexOf(const unityapi::MirSurfaceInterface *surface) const
2354
440
{
2355
441
    for (int i=0; i<m_windowModel.count(); i++) {
2356
442
        if (m_windowModel[i].window->surface() == surface) {
2357
443
            return i;
2358
444
        }
2359
445
    }
2360
446
    return -1;
2361
447
}
2362
448
2363
449
int TopLevelWindowModel::generateId()
2364
450
{
2365
451
    int id = m_nextId;
2366
452
    m_nextId = nextFreeId(nextId(id), id);
2367
453
    return id;
2368
454
}
2369
455
2370
456
int TopLevelWindowModel::nextId(int id) const
2371
457
{
2372
458
    if (id == m_maxId) {
2373
459
        return id = 1;
2374
460
    } else {
2375
461
        return id + 1;
2376
462
    }
2377
463
}
2378
464
2379
465
int TopLevelWindowModel::nextFreeId(int candidateId, const int latestId)
2380
466
{
2381
467
    int firstCandidateId = candidateId;
2382
468
2383
469
    while (indexForId(candidateId) != -1 || candidateId == latestId) {
2384
470
        candidateId = nextId(candidateId);
2385
471
2386
472
        if (candidateId == firstCandidateId) {
2387
473
            qFatal("TopLevelWindowModel: run out of window ids.");
2388
474
        }
2389
475
    }
2390
476
2391
477
    return candidateId;
2392
478
}
2393
479
2394
480
QString TopLevelWindowModel::toString()
2395
481
{
2396
482
    QString str;
2397
483
    for (int i = 0; i < m_windowModel.count(); ++i) {
2398
484
        auto item = m_windowModel.at(i);
2399
485
2400
486
        QString itemStr = QString("(index=%1,appId=%2,surface=0x%3,id=%4)")
2401
487
            .arg(QString::number(i),
2402
488
                 item.application->appId(),
2403
489
                 QString::number((qintptr)item.window->surface(), 16),
2404
490
                 QString::number(item.window->id()));
2405
491
2406
492
        if (i > 0) {
2407
493
            str.append(",");
2408
494
        }
2409
495
        str.append(itemStr);
2410
496
    }
2411
497
    return str;
2412
498
}
2413
499
2414
500
int TopLevelWindowModel::indexOf(unityapi::MirSurfaceInterface *surface)
2415
501
{
2416
502
    for (int i = 0; i < m_windowModel.count(); ++i) {
2417
503
        if (m_windowModel.at(i).window->surface() == surface) {
2418
504
            return i;
2419
505
        }
2420
506
    }
2421
507
    return -1;
2422
508
}
2423
509
2424
510
int TopLevelWindowModel::indexForId(int id) const
2425
511
{
2426
512
    for (int i = 0; i < m_windowModel.count(); ++i) {
2427
513
        if (m_windowModel[i].window->id() == id) {
2428
514
            return i;
2429
515
        }
2430
516
    }
2431
517
    return -1;
2432
518
}
2433
519
2434
520
Window *TopLevelWindowModel::windowAt(int index) const
2435
521
{
2436
522
    if (index >=0 && index < m_windowModel.count()) {
2437
523
        return m_windowModel[index].window;
2438
524
    } else {
2439
525
        return nullptr;
2440
526
    }
2441
527
}
2442
528
2443
529
unityapi::MirSurfaceInterface *TopLevelWindowModel::surfaceAt(int index) const
2444
530
{
2445
531
    if (index >=0 && index < m_windowModel.count()) {
2446
532
        return m_windowModel[index].window->surface();
2447
533
    } else {
2448
534
        return nullptr;
2449
535
    }
2450
536
}
2451
537
2452
538
unityapi::ApplicationInfoInterface *TopLevelWindowModel::applicationAt(int index) const
2453
539
{
2454
540
    if (index >=0 && index < m_windowModel.count()) {
2455
541
        return m_windowModel[index].application;
2456
542
    } else {
2457
543
        return nullptr;
2458
544
    }
2459
545
}
2460
546
2461
547
int TopLevelWindowModel::idAt(int index) const
2462
548
{
2463
549
    if (index >=0 && index < m_windowModel.count()) {
2464
550
        return m_windowModel[index].window->id();
2465
551
    } else {
2466
552
        return 0;
2467
553
    }
2468
554
}
2469
555
2470
556
void TopLevelWindowModel::raiseId(int id)
2471
557
{
2472
558
    if (m_modelState == IdleState) {
2473
559
        DEBUG_MSG << "(id=" << id << ") - do it now.";
2474
560
        doRaiseId(id);
2475
561
    } else {
2476
562
        DEBUG_MSG << "(id=" << id << ") - Model busy (modelState=" << m_modelState << "). Try again in the next event loop.";
2477
563
        // The model has just signalled some change. If we have a Repeater responding to this update, it will get nuts
2478
564
        // if we perform yet another model change straight away.
2479
565
        //
2480
566
        // A bad sympton of this problem is a Repeater.itemAt(index) call returning null event though Repeater.count says
2481
567
        // the index is definitely within bounds.
2482
568
        QMetaObject::invokeMethod(this, "raiseId", Qt::QueuedConnection, Q_ARG(int, id));
2483
569
    }
2484
570
}
2485
571
2486
572
void TopLevelWindowModel::doRaiseId(int id)
2487
573
{
2488
574
    int fromIndex = indexForId(id);
2489
575
    // can't raise something that doesn't exist or that it's already on top
2490
576
    if (fromIndex != -1 && fromIndex != 0) {
2491
577
        auto surface = m_windowModel[fromIndex].window->surface();
2492
578
        if (surface) {
2493
579
            m_surfaceManager->raise(surface);
2494
580
        } else {
2495
581
            // move it ourselves. Since there's no mir::scene::Surface/miral::Window, there's nothing
2496
582
            // miral can do about it.
2497
583
            move(fromIndex, 0);
2498
584
        }
2499
585
    }
2500
586
}
2501
587
2502
588
void TopLevelWindowModel::setFocusedWindow(Window *window)
2503
589
{
2504
590
    if (window != m_focusedWindow) {
2505
591
        INFO_MSG << "(" << window << ")";
2506
592
2507
593
        Window* previousWindow = m_focusedWindow;
2508
594
2509
595
        m_focusedWindow = window;
2510
596
        Q_EMIT focusedWindowChanged(m_focusedWindow);
2511
597
2512
598
        if (previousWindow && previousWindow->focused() && !previousWindow->surface()) {
2513
599
            // do it ourselves. miral doesn't know about this window
2514
600
            previousWindow->setFocused(false);
2515
601
        }
2516
602
    }
2517
603
}
2518
604
2519
605
unityapi::MirSurfaceInterface* TopLevelWindowModel::inputMethodSurface() const
2520
606
{
2521
607
    return m_inputMethodWindow ? m_inputMethodWindow->surface() : nullptr;
2522
608
}
2523
609
2524
610
Window* TopLevelWindowModel::focusedWindow() const
2525
611
{
2526
612
    return m_focusedWindow;
2527
613
}
2528
614
2529
615
void TopLevelWindowModel::move(int from, int to)
2530
616
{
2531
617
    if (from == to) return;
2532
618
    DEBUG_MSG << " from=" << from << " to=" << to;
2533
619
2534
620
    if (from >= 0 && from < m_windowModel.size() && to >= 0 && to < m_windowModel.size()) {
2535
621
        QModelIndex parent;
2536
622
        /* When moving an item down, the destination index needs to be incremented
2537
623
           by one, as explained in the documentation:
2538
624
           http://qt-project.org/doc/qt-5.0/qtcore/qabstractitemmodel.html#beginMoveRows */
2539
625
2540
626
        Q_ASSERT(m_modelState == IdleState);
2541
627
        m_modelState = MovingState;
2542
628
2543
629
        beginMoveRows(parent, from, from, parent, to + (to > from ? 1 : 0));
2544
630
#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
2545
631
        const auto &window = m_windowModel.takeAt(from);
2546
632
        m_windowModel.insert(to, window);
2547
633
#else
2548
634
        m_windowModel.move(from, to);
2549
635
#endif
2550
636
        endMoveRows();
2551
637
2552
638
        Q_EMIT listChanged();
2553
639
        m_modelState = IdleState;
2554
640
2555
641
        INFO_MSG << " after " << toString();
2556
642
    }
2557
643
}
2558
644
void TopLevelWindowModel::onModificationsStarted()
2559
645
{
2560
646
}
2561
647
2562
648
void TopLevelWindowModel::onModificationsEnded()
2563
649
{
2564
650
    if (m_focusedWindowChanged) {
2565
651
        setFocusedWindow(m_newlyFocusedWindow);
2566
652
    }
2567
653
    // reset
2568
654
    m_focusedWindowChanged = false;
2569
655
    m_newlyFocusedWindow = nullptr;
2570
656
}
2571
657
2572
658
void TopLevelWindowModel::activateTopMostWindowWithoutId(int forbiddenId)
2573
659
{
2574
660
    DEBUG_MSG << "(" << forbiddenId << ")";
2575
661
2576
662
    for (int i = 0; i < m_windowModel.count(); ++i) {
2577
663
        Window *window = m_windowModel[i].window;
2578
664
        if (window->id() != forbiddenId) {
2579
665
            window->activate();
2580
666
        }
2581
667
    }
2582
668
}
2583
0
669
2584
=== added file 'plugins/WindowManager/TopLevelWindowModel.h'
2585
--- plugins/WindowManager/TopLevelWindowModel.h	1970-01-01 00:00:00 +0000
2586
+++ plugins/WindowManager/TopLevelWindowModel.h	2016-12-12 16:49:02 +0000
2587
@@ -0,0 +1,260 @@
2588
1
/*
2589
2
 * Copyright (C) 2016 Canonical, Ltd.
2590
3
 *
2591
4
 * This program is free software: you can redistribute it and/or modify it under
2592
5
 * the terms of the GNU Lesser General Public License version 3, as published by
2593
6
 * the Free Software Foundation.
2594
7
 *
2595
8
 * This program is distributed in the hope that it will be useful, but WITHOUT
2596
9
 * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
2597
10
 * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
2598
11
 * Lesser General Public License for more details.
2599
12
 *
2600
13
 * You should have received a copy of the GNU Lesser General Public License
2601
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2602
15
 */
2603
16
2604
17
#ifndef TOPLEVELWINDOWMODEL_H
2605
18
#define TOPLEVELWINDOWMODEL_H
2606
19
2607
20
#include <QAbstractListModel>
2608
21
#include <QLoggingCategory>
2609
22
2610
23
Q_DECLARE_LOGGING_CATEGORY(TOPLEVELWINDOWMODEL)
2611
24
2612
25
class Window;
2613
26
2614
27
namespace unity {
2615
28
    namespace shell {
2616
29
        namespace application {
2617
30
            class ApplicationInfoInterface;
2618
31
            class ApplicationManagerInterface;
2619
32
            class MirSurfaceInterface;
2620
33
            class SurfaceManagerInterface;
2621
34
        }
2622
35
    }
2623
36
}
2624
37
2625
38
/**
2626
39
 * @brief A model of top-level surfaces
2627
40
 *
2628
41
 * It's an abstraction of top-level application windows.
2629
42
 *
2630
43
 * When an entry first appears, it normaly doesn't have a surface yet, meaning that the application is
2631
44
 * still starting up. A shell should then display a splash screen or saved screenshot of the application
2632
45
 * until its surface comes up.
2633
46
 *
2634
47
 * As applications can have multiple surfaces and you can also have entries without surfaces at all,
2635
48
 * the only way to unambiguously refer to an entry in this model is through its id.
2636
49
 */
2637
50
class TopLevelWindowModel : public QAbstractListModel
2638
51
{
2639
52
    Q_OBJECT
2640
53
2641
54
    /**
2642
55
     * @brief Number of top-level surfaces in this model
2643
56
     *
2644
57
     * This is the same as rowCount, added in order to keep compatibility with QML ListModels.
2645
58
     */
2646
59
    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
2647
60
2648
61
    /**
2649
62
     * @brief The input method surface, if any
2650
63
     *
2651
64
     * The surface of a onscreen keyboard (akak "virtual keyboard") would be kept here and not in the model itself.
2652
65
     */
2653
66
    Q_PROPERTY(unity::shell::application::MirSurfaceInterface* inputMethodSurface READ inputMethodSurface NOTIFY inputMethodSurfaceChanged)
2654
67
2655
68
    /**
2656
69
     * @brief The currently focused window, if any
2657
70
     */
2658
71
    Q_PROPERTY(Window* focusedWindow READ focusedWindow NOTIFY focusedWindowChanged)
2659
72
2660
73
    Q_PROPERTY(unity::shell::application::SurfaceManagerInterface* surfaceManager
2661
74
            READ surfaceManager
2662
75
            WRITE setSurfaceManager
2663
76
            NOTIFY surfaceManagerChanged)
2664
77
2665
78
    Q_PROPERTY(unity::shell::application::ApplicationManagerInterface* applicationManager
2666
79
            READ applicationManager
2667
80
            WRITE setApplicationManager
2668
81
            NOTIFY applicationManagerChanged)
2669
82
2670
83
    /**
2671
84
      The id to be used on the next entry created
2672
85
      Useful for tests
2673
86
     */
2674
87
    Q_PROPERTY(int nextId READ nextId NOTIFY nextIdChanged)
2675
88
2676
89
public:
2677
90
    /**
2678
91
     * @brief The Roles supported by the model
2679
92
     *
2680
93
     * WindowRole - A Window.
2681
94
     * ApplicationRole - An ApplicationInfoInterface
2682
95
     */
2683
96
    enum Roles {
2684
97
        WindowRole = Qt::UserRole,
2685
98
        ApplicationRole = Qt::UserRole + 1,
2686
99
    };
2687
100
2688
101
    TopLevelWindowModel();
2689
102
2690
103
    // From QAbstractItemModel
2691
104
    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
2692
105
    QVariant data(const QModelIndex& index, int role) const override;
2693
106
    QHash<int, QByteArray> roleNames() const override {
2694
107
        QHash<int, QByteArray> roleNames { {WindowRole, "window"},
2695
108
                                           {ApplicationRole, "application"} };
2696
109
        return roleNames;
2697
110
    }
2698
111
2699
112
    // Own API
2700
113
2701
114
    unity::shell::application::MirSurfaceInterface* inputMethodSurface() const;
2702
115
    Window* focusedWindow() const;
2703
116
2704
117
    unity::shell::application::ApplicationManagerInterface *applicationManager() const { return m_applicationManager; }
2705
118
    void setApplicationManager(unity::shell::application::ApplicationManagerInterface*);
2706
119
2707
120
    unity::shell::application::SurfaceManagerInterface *surfaceManager() const { return m_surfaceManager; }
2708
121
    void setSurfaceManager(unity::shell::application::SurfaceManagerInterface*);
2709
122
2710
123
    int nextId() const { return m_nextId; }
2711
124
2712
125
public:
2713
126
    /**
2714
127
     * @brief Returns the surface at the given index
2715
128
     *
2716
129
     * It will be a nullptr if the application is still starting up and thus hasn't yet created
2717
130
     * and drawn into a surface.
2718
131
     *
2719
132
     * Same as windowAt(index).surface()
2720
133
     */
2721
134
    Q_INVOKABLE unity::shell::application::MirSurfaceInterface *surfaceAt(int index) const;
2722
135
2723
136
    /**
2724
137
     * @brief Returns the window at the given index
2725
138
     *
2726
139
     * Will always be valid
2727
140
     */
2728
141
    Q_INVOKABLE Window *windowAt(int index) const;
2729
142
2730
143
    /**
2731
144
     * @brief Returns the application at the given index
2732
145
     */
2733
146
    Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *applicationAt(int index) const;
2734
147
2735
148
    /**
2736
149
     * @brief Returns the unique id of the element at the given index
2737
150
     */
2738
151
    Q_INVOKABLE int idAt(int index) const;
2739
152
2740
153
    /**
2741
154
     * @brief Returns the index where the row with the given id is located
2742
155
     *
2743
156
     * Returns -1 if there's no row with the given id.
2744
157
     */
2745
158
    Q_INVOKABLE int indexForId(int id) const;
2746
159
2747
160
    /**
2748
161
     * @brief Raises the row with the given id to the top of the window stack (index == count-1)
2749
162
     */
2750
163
    Q_INVOKABLE void raiseId(int id);
2751
164
2752
165
Q_SIGNALS:
2753
166
    void countChanged();
2754
167
    void inputMethodSurfaceChanged(unity::shell::application::MirSurfaceInterface* inputMethodSurface);
2755
168
    void focusedWindowChanged(Window *focusedWindow);
2756
169
    void applicationManagerChanged(unity::shell::application::ApplicationManagerInterface*);
2757
170
    void surfaceManagerChanged(unity::shell::application::SurfaceManagerInterface*);
2758
171
2759
172
    /**
2760
173
     * @brief Emitted when the list changes
2761
174
     *
2762
175
     * Emitted when model gains an element, loses an element or when elements exchange positions.
2763
176
     */
2764
177
    void listChanged();
2765
178
2766
179
    void nextIdChanged();
2767
180
2768
181
private Q_SLOTS:
2769
182
    void onSurfaceCreated(unity::shell::application::MirSurfaceInterface *surface);
2770
183
    void onSurfacesRaised(const QVector<unity::shell::application::MirSurfaceInterface*> &surfaces);
2771
184
2772
185
    void onModificationsStarted();
2773
186
    void onModificationsEnded();
2774
187
2775
188
private:
2776
189
    void doRaiseId(int id);
2777
190
    int generateId();
2778
191
    int nextFreeId(int candidateId, const int latestId);
2779
192
    int nextId(int id) const;
2780
193
    QString toString();
2781
194
    int indexOf(unity::shell::application::MirSurfaceInterface *surface);
2782
195
2783
196
    void setInputMethodWindow(Window *window);
2784
197
    void setFocusedWindow(Window *window);
2785
198
    void removeInputMethodWindow();
2786
199
    int findIndexOf(const unity::shell::application::MirSurfaceInterface *surface) const;
2787
200
    void removeAt(int index);
2788
201
2789
202
    void addApplication(unity::shell::application::ApplicationInfoInterface *application);
2790
203
    void removeApplication(unity::shell::application::ApplicationInfoInterface *application);
2791
204
2792
205
    void prependPlaceholder(unity::shell::application::ApplicationInfoInterface *application);
2793
206
    void prependSurface(unity::shell::application::MirSurfaceInterface *surface,
2794
207
                        unity::shell::application::ApplicationInfoInterface *application);
2795
208
    void prependSurfaceHelper(unity::shell::application::MirSurfaceInterface *surface,
2796
209
                              unity::shell::application::ApplicationInfoInterface *application);
2797
210
2798
211
    void connectWindow(Window *window);
2799
212
    void connectSurface(unity::shell::application::MirSurfaceInterface *surface);
2800
213
2801
214
    void onSurfaceDied(unity::shell::application::MirSurfaceInterface *surface);
2802
215
    void onSurfaceDestroyed(unity::shell::application::MirSurfaceInterface *surface);
2803
216
2804
217
    void move(int from, int to);
2805
218
2806
219
    void activateEmptyWindow(Window *window);
2807
220
2808
221
    void activateTopMostWindowWithoutId(int forbiddenId);
2809
222
2810
223
    struct ModelEntry {
2811
224
        ModelEntry() {}
2812
225
        ModelEntry(Window *window,
2813
226
                   unity::shell::application::ApplicationInfoInterface *application)
2814
227
            : window(window), application(application) {}
2815
228
        Window *window{nullptr};
2816
229
        unity::shell::application::ApplicationInfoInterface *application{nullptr};
2817
230
        bool removeOnceSurfaceDestroyed{false};
2818
231
    };
2819
232
2820
233
    QVector<ModelEntry> m_windowModel;
2821
234
    Window* m_inputMethodWindow{nullptr};
2822
235
    Window* m_focusedWindow{nullptr};
2823
236
2824
237
    int m_nextId{1};
2825
238
    // Just something big enough that we don't risk running out of unused id numbers.
2826
239
    // Not sure if QML int type supports something close to std::numeric_limits<int>::max() and
2827
240
    // there's no reason to try out its limits.
2828
241
    static const int m_maxId{1000000};
2829
242
2830
243
    unity::shell::application::ApplicationManagerInterface* m_applicationManager{nullptr};
2831
244
    unity::shell::application::SurfaceManagerInterface *m_surfaceManager{nullptr};
2832
245
2833
246
    enum ModelState {
2834
247
        IdleState,
2835
248
        InsertingState,
2836
249
        RemovingState,
2837
250
        MovingState,
2838
251
        ResettingState
2839
252
    };
2840
253
    ModelState m_modelState{IdleState};
2841
254
2842
255
    // Valid between modificationsStarted and modificationsEnded
2843
256
    bool m_focusedWindowChanged{false};
2844
257
    Window *m_newlyFocusedWindow{nullptr};
2845
258
};
2846
259
2847
260
#endif // TOPLEVELWINDOWMODEL_H
2848
0
261
2849
=== added file 'plugins/WindowManager/Window.cpp'
2850
--- plugins/WindowManager/Window.cpp	1970-01-01 00:00:00 +0000
2851
+++ plugins/WindowManager/Window.cpp	2016-12-12 16:49:02 +0000
2852
@@ -0,0 +1,237 @@
2853
1
/*
2854
2
 * Copyright (C) 2016 Canonical, Ltd.
2855
3
 *
2856
4
 * This program is free software; you can redistribute it and/or modify
2857
5
 * it under the terms of the GNU General Public License as published by
2858
6
 * the Free Software Foundation; version 3.
2859
7
 *
2860
8
 * This program is distributed in the hope that it will be useful,
2861
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2862
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2863
11
 * GNU General Public License for more details.
2864
12
 *
2865
13
 * You should have received a copy of the GNU General Public License
2866
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2867
15
 */
2868
16
2869
17
#include "Window.h"
2870
18
2871
19
// unity-api
2872
20
#include <unity/shell/application/MirSurfaceInterface.h>
2873
21
2874
22
#include <QQmlEngine>
2875
23
#include <QTextStream>
2876
24
2877
25
namespace unityapi = unity::shell::application;
2878
26
2879
27
Q_LOGGING_CATEGORY(UNITY_WINDOW, "unity.window", QtWarningMsg)
2880
28
2881
29
#define DEBUG_MSG qCDebug(UNITY_WINDOW).nospace() << qPrintable(toString()) << "::" << __func__
2882
30
2883
31
Window::Window(int id, QObject *parent)
2884
32
    : QObject(parent)
2885
33
    , m_id(id)
2886
34
{
2887
35
    DEBUG_MSG << "()";
2888
36
    QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
2889
37
}
2890
38
2891
39
Window::~Window()
2892
40
{
2893
41
    DEBUG_MSG << "()";
2894
42
}
2895
43
2896
44
QPoint Window::position() const
2897
45
{
2898
46
    return m_position;
2899
47
}
2900
48
2901
49
QPoint Window::requestedPosition() const
2902
50
{
2903
51
    return m_requestedPosition;
2904
52
}
2905
53
2906
54
void Window::setRequestedPosition(const QPoint &value)
2907
55
{
2908
56
    m_positionRequested = true;
2909
57
    if (value != m_requestedPosition) {
2910
58
        m_requestedPosition = value;
2911
59
        Q_EMIT requestedPositionChanged(m_requestedPosition);
2912
60
        if (m_surface) {
2913
61
            m_surface->setRequestedPosition(value);
2914
62
        } else {
2915
63
            // fake-miral: always comply
2916
64
            m_position = m_requestedPosition;
2917
65
            Q_EMIT positionChanged(m_position);
2918
66
        }
2919
67
    }
2920
68
}
2921
69
2922
70
Mir::State Window::state() const
2923
71
{
2924
72
    return m_state;
2925
73
}
2926
74
2927
75
bool Window::focused() const
2928
76
{
2929
77
    return m_focused;
2930
78
}
2931
79
2932
80
bool Window::confinesMousePointer() const
2933
81
{
2934
82
    if (m_surface) {
2935
83
        return m_surface->confinesMousePointer();
2936
84
    } else {
2937
85
        return false;
2938
86
    }
2939
87
}
2940
88
2941
89
int Window::id() const
2942
90
{
2943
91
    return m_id;
2944
92
}
2945
93
2946
94
unityapi::MirSurfaceInterface* Window::surface() const
2947
95
{
2948
96
    return m_surface;
2949
97
}
2950
98
2951
99
void Window::requestState(Mir::State state)
2952
100
{
2953
101
    m_stateRequested = true;
2954
102
    if (m_surface) {
2955
103
        m_surface->requestState(state);
2956
104
    } else if (m_state != state) {
2957
105
        m_state = state;
2958
106
        Q_EMIT stateChanged(m_state);
2959
107
    }
2960
108
}
2961
109
2962
110
void Window::close()
2963
111
{
2964
112
    if (m_surface) {
2965
113
        m_surface->close();
2966
114
    } else {
2967
115
        Q_EMIT closeRequested();
2968
116
    }
2969
117
}
2970
118
2971
119
void Window::activate()
2972
120
{
2973
121
    DEBUG_MSG << "()";
2974
122
    if (m_surface) {
2975
123
        m_surface->activate();
2976
124
    } else {
2977
125
        Q_EMIT emptyWindowActivated();
2978
126
    }
2979
127
}
2980
128
2981
129
void Window::setSurface(unityapi::MirSurfaceInterface *surface)
2982
130
{
2983
131
    DEBUG_MSG << "(" << surface << ")";
2984
132
    if (m_surface) {
2985
133
        disconnect(m_surface, 0, this, 0);
2986
134
    }
2987
135
2988
136
    m_surface = surface;
2989
137
2990
138
    if (m_surface) {
2991
139
        connect(surface, &unityapi::MirSurfaceInterface::focusRequested, this, [this]() {
2992
140
            Q_EMIT focusRequested();
2993
141
        });
2994
142
2995
143
        connect(surface, &unityapi::MirSurfaceInterface::closeRequested, this, &Window::closeRequested);
2996
144
2997
145
        connect(surface, &unityapi::MirSurfaceInterface::positionChanged, this, [this]() {
2998
146
            updatePosition();
2999
147
        });
3000
148
3001
149
        connect(surface, &unityapi::MirSurfaceInterface::stateChanged, this, [this]() {
3002
150
            updateState();
3003
151
        });
3004
152
3005
153
        connect(surface, &unityapi::MirSurfaceInterface::focusedChanged, this, [this]() {
3006
154
            updateFocused();
3007
155
        });
3008
156
3009
157
        // bring it up to speed
3010
158
        if (m_positionRequested) {
3011
159
            m_surface->setRequestedPosition(m_requestedPosition);
3012
160
        }
3013
161
        if (m_stateRequested && m_surface->state() == Mir::RestoredState) {
3014
162
            m_surface->requestState(m_state);
3015
163
        }
3016
164
3017
165
        // and sync with surface
3018
166
        updatePosition();
3019
167
        updateState();
3020
168
        updateFocused();
3021
169
    }
3022
170
3023
171
    Q_EMIT surfaceChanged(surface);
3024
172
}
3025
173
3026
174
void Window::updatePosition()
3027
175
{
3028
176
    if (m_surface->position() != m_position) {
3029
177
        m_position = m_surface->position();
3030
178
        Q_EMIT positionChanged(m_position);
3031
179
    }
3032
180
}
3033
181
3034
182
void Window::updateState()
3035
183
{
3036
184
    if (m_surface->state() != m_state) {
3037
185
        m_state = m_surface->state();
3038
186
        Q_EMIT stateChanged(m_state);
3039
187
    }
3040
188
}
3041
189
3042
190
void Window::updateFocused()
3043
191
{
3044
192
    if (m_surface->focused() != m_focused) {
3045
193
        m_focused = m_surface->focused();
3046
194
        Q_EMIT focusedChanged(m_focused);
3047
195
    }
3048
196
}
3049
197
3050
198
void Window::setFocused(bool value)
3051
199
{
3052
200
    if (value != m_focused) {
3053
201
        DEBUG_MSG << "(" << value << ")";
3054
202
        m_focused = value;
3055
203
        Q_EMIT focusedChanged(m_focused);
3056
204
        // when we have a surface we get focus changes from updateFocused() instead
3057
205
        Q_ASSERT(!m_surface);
3058
206
    }
3059
207
}
3060
208
3061
209
QString Window::toString() const
3062
210
{
3063
211
    QString result;
3064
212
    {
3065
213
        QTextStream stream(&result);
3066
214
        stream << "Window["<<(void*)this<<", id="<<id()<<", ";
3067
215
        if (surface()) {
3068
216
            stream << "MirSurface["<<(void*)surface()<<",\""<<surface()->name()<<"\"]";
3069
217
        } else {
3070
218
            stream << "null";
3071
219
        }
3072
220
        stream << "]";
3073
221
    }
3074
222
    return result;
3075
223
}
3076
224
3077
225
QDebug operator<<(QDebug dbg, const Window *window)
3078
226
{
3079
227
    QDebugStateSaver saver(dbg);
3080
228
    dbg.nospace();
3081
229
3082
230
    if (window) {
3083
231
        dbg << qPrintable(window->toString());
3084
232
    } else {
3085
233
        dbg << (void*)(window);
3086
234
    }
3087
235
3088
236
    return dbg;
3089
237
}
3090
0
238
3091
=== added file 'plugins/WindowManager/Window.h'
3092
--- plugins/WindowManager/Window.h	1970-01-01 00:00:00 +0000
3093
+++ plugins/WindowManager/Window.h	2016-12-12 16:49:02 +0000
3094
@@ -0,0 +1,161 @@
3095
1
/*
3096
2
 * Copyright (C) 2016 Canonical, Ltd.
3097
3
 *
3098
4
 * This program is free software; you can redistribute it and/or modify
3099
5
 * it under the terms of the GNU General Public License as published by
3100
6
 * the Free Software Foundation; version 3.
3101
7
 *
3102
8
 * This program is distributed in the hope that it will be useful,
3103
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3104
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3105
11
 * GNU General Public License for more details.
3106
12
 *
3107
13
 * You should have received a copy of the GNU General Public License
3108
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3109
15
 */
3110
16
3111
17
#ifndef UNITY_WINDOW_H
3112
18
#define UNITY_WINDOW_H
3113
19
3114
20
#include <QLoggingCategory>
3115
21
#include <QObject>
3116
22
#include <QPoint>
3117
23
3118
24
// Unity API
3119
25
#include <unity/shell/application/Mir.h>
3120
26
3121
27
namespace unity {
3122
28
    namespace shell {
3123
29
        namespace application {
3124
30
            class MirSurfaceInterface;
3125
31
        }
3126
32
    }
3127
33
}
3128
34
3129
35
3130
36
Q_DECLARE_LOGGING_CATEGORY(UNITY_WINDOW)
3131
37
3132
38
/**
3133
39
   @brief A slightly higher concept than MirSurface
3134
40
3135
41
   A Window exists before its MirSurface gets created (for splashscreen purposes)
3136
42
   and might also hang around after the backing surface is gone (In case the application
3137
43
   was killed to free up memory, as it should still remain in the window list since the user
3138
44
   did not explicitly close it).
3139
45
 */
3140
46
class Window : public QObject
3141
47
{
3142
48
    Q_OBJECT
3143
49
3144
50
    /**
3145
51
     * @brief Position of the current surface buffer, in pixels.
3146
52
     */
3147
53
    Q_PROPERTY(QPoint position READ position NOTIFY positionChanged)
3148
54
3149
55
    /**
3150
56
     * @brief Requested position of the current surface buffer, in pixels.
3151
57
     */
3152
58
    Q_PROPERTY(QPoint requestedPosition READ requestedPosition WRITE setRequestedPosition NOTIFY requestedPositionChanged)
3153
59
3154
60
    /**
3155
61
     * @brief State of the surface
3156
62
     */
3157
63
    Q_PROPERTY(Mir::State state READ state NOTIFY stateChanged)
3158
64
3159
65
    /**
3160
66
     * @brief Whether the surface is focused
3161
67
     *
3162
68
     * It will be true if this surface is MirFocusControllerInterface::focusedSurface
3163
69
     */
3164
70
    Q_PROPERTY(bool focused READ focused NOTIFY focusedChanged)
3165
71
3166
72
    /**
3167
73
     * @brief Whether the surface wants to confine the mouse pointer within its boundaries
3168
74
     *
3169
75
     * If true, the surface doesn't want the mouse pointer to leave its boundaries while it's focused.
3170
76
     */
3171
77
    Q_PROPERTY(bool confinesMousePointer READ confinesMousePointer NOTIFY confinesMousePointerChanged)
3172
78
3173
79
    /**
3174
80
     * @brief A unique identifier for this window.
3175
81
     * Useful for telling windows apart in a list model as they get moved around
3176
82
     */
3177
83
    Q_PROPERTY(int id READ id CONSTANT)
3178
84
3179
85
    /**
3180
86
     * @brief Surface backing up this window
3181
87
     * It might be null if a surface hasn't been created yet (application is starting up) or if
3182
88
     * the corresponding application has been killed (but can still get restarted to continue from
3183
89
     * where it left)
3184
90
     */
3185
91
    Q_PROPERTY(unity::shell::application::MirSurfaceInterface* surface READ surface NOTIFY surfaceChanged)
3186
92
3187
93
public:
3188
94
    Window(int id, QObject *parent = nullptr);
3189
95
    virtual ~Window();
3190
96
    QPoint position() const;
3191
97
    QPoint requestedPosition() const;
3192
98
    void setRequestedPosition(const QPoint &);
3193
99
    Mir::State state() const;
3194
100
    bool focused() const;
3195
101
    bool confinesMousePointer() const;
3196
102
    int id() const;
3197
103
    unity::shell::application::MirSurfaceInterface* surface() const;
3198
104
3199
105
    void setSurface(unity::shell::application::MirSurfaceInterface *surface);
3200
106
    void setFocused(bool value);
3201
107
3202
108
    QString toString() const;
3203
109
3204
110
public Q_SLOTS:
3205
111
    /**
3206
112
     * @brief Requests a change to the specified state
3207
113
     */
3208
114
    void requestState(Mir::State state);
3209
115
3210
116
    /**
3211
117
     * @brief Sends a close request
3212
118
     *
3213
119
     */
3214
120
    void close();
3215
121
3216
122
    /**
3217
123
     * @brief Focuses and raises the window
3218
124
     */
3219
125
    void activate();
3220
126
3221
127
Q_SIGNALS:
3222
128
    void closeRequested();
3223
129
    void emptyWindowActivated();
3224
130
3225
131
    void positionChanged(QPoint position);
3226
132
    void requestedPositionChanged(QPoint position);
3227
133
    void stateChanged(Mir::State value);
3228
134
    void focusedChanged(bool value);
3229
135
    void confinesMousePointerChanged(bool value);
3230
136
    void surfaceChanged(unity::shell::application::MirSurfaceInterface *surface);
3231
137
3232
138
    /**
3233
139
     * @brief Emitted when focus for this window is requested by an external party
3234
140
     */
3235
141
    void focusRequested();
3236
142
3237
143
private:
3238
144
    void updatePosition();
3239
145
    void updateState();
3240
146
    void updateFocused();
3241
147
3242
148
    QPoint m_position;
3243
149
    QPoint m_requestedPosition;
3244
150
    bool m_positionRequested{false};
3245
151
    bool m_focused{false};
3246
152
    int m_id;
3247
153
    Mir::State m_state{Mir::RestoredState};
3248
154
    bool m_stateRequested{false};
3249
155
    unity::shell::application::MirSurfaceInterface *m_surface{nullptr};
3250
156
};
3251
157
3252
158
QDebug operator<<(QDebug dbg, const Window *window);
3253
159
3254
160
Q_DECLARE_METATYPE(Window*)
3255
161
#endif // UNITY_WINDOW_H
3256
0
162
3257
=== modified file 'plugins/WindowManager/WindowManagerPlugin.cpp'
3258
--- plugins/WindowManager/WindowManagerPlugin.cpp	2016-04-04 13:37:49 +0000
3259
+++ plugins/WindowManager/WindowManagerPlugin.cpp	2016-12-12 16:49:02 +0000
3260
@@ -16,13 +16,16 @@
3261
16
16
3262
17
#include "WindowManagerPlugin.h"
17
#include "WindowManagerPlugin.h"
3263
18
18
3265
19
#include "TopLevelSurfaceList.h"
19
#include "TopLevelWindowModel.h"
3266
20
#include "Window.h"
3267
20
21
3268
21
#include <QtQml>
22
#include <QtQml>
3269
22
23
3270
23
void WindowManagerPlugin::registerTypes(const char *uri)
24
void WindowManagerPlugin::registerTypes(const char *uri)
3271
24
{
25
{
3273
25
    qmlRegisterType<TopLevelSurfaceList>(uri, 0, 1, "TopLevelSurfaceList");
26
    qmlRegisterType<TopLevelWindowModel>(uri, 1, 0, "TopLevelWindowModel");
3274
27
3275
28
    qRegisterMetaType<Window*>("Window*");
3276
26
29
3277
27
    qRegisterMetaType<QAbstractListModel*>("QAbstractListModel*");
30
    qRegisterMetaType<QAbstractListModel*>("QAbstractListModel*");
3278
28
}
31
}
3279
29
32
3280
=== modified file 'po/unity8.pot'
3281
--- po/unity8.pot	2016-11-29 09:43:33 +0000
3282
+++ po/unity8.pot	2016-12-12 16:49:02 +0000
3283
@@ -8,7 +8,7 @@
3284
8
msgstr ""
8
msgstr ""
3285
9
"Project-Id-Version: unity8\n"
9
"Project-Id-Version: unity8\n"
3286
10
"Report-Msgid-Bugs-To: \n"
10
"Report-Msgid-Bugs-To: \n"
3288
11
"POT-Creation-Date: 2016-11-29 09:43+0000\n"
11
"POT-Creation-Date: 2016-12-07 13:49+0000\n"
3289
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
3290
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
3291
14
"Language-Team: LANGUAGE <LL@li.org>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
3292
@@ -23,7 +23,7 @@
3293
23
msgstr ""
23
msgstr ""
3294
24
24
3295
25
#: plugins/Unity/Launcher/launcheritem.cpp:50
25
#: plugins/Unity/Launcher/launcheritem.cpp:50
3297
26
#: plugins/Unity/Launcher/launcheritem.cpp:109
26
#: plugins/Unity/Launcher/launcheritem.cpp:122
3298
27
msgid "Pin shortcut"
27
msgid "Pin shortcut"
3299
28
msgstr ""
28
msgstr ""
3300
29
29
3301
@@ -31,7 +31,7 @@
3302
31
msgid "Quit"
31
msgid "Quit"
3303
32
msgstr ""
32
msgstr ""
3304
33
33
3306
34
#: plugins/Unity/Launcher/launcheritem.cpp:109
34
#: plugins/Unity/Launcher/launcheritem.cpp:122
3307
35
msgid "Unpin shortcut"
35
msgid "Unpin shortcut"
3308
36
msgstr ""
36
msgstr ""
3309
37
37
3310
@@ -175,87 +175,95 @@
3311
175
msgid "Same as clicking on a launcher icon."
175
msgid "Same as clicking on a launcher icon."
3312
176
msgstr ""
176
msgstr ""
3313
177
177
3315
178
#: qml/Components/KeyboardShortcutsOverlay.qml:181
178
#: qml/Components/KeyboardShortcutsOverlay.qml:177
3316
179
msgid "Super + A"
3317
180
msgstr ""
3318
181
3319
182
#: qml/Components/KeyboardShortcutsOverlay.qml:182
3320
183
msgid "Opens the Application Drawer."
3321
184
msgstr ""
3322
185
3323
186
#: qml/Components/KeyboardShortcutsOverlay.qml:194
3324
179
msgid "Scopes"
187
msgid "Scopes"
3325
180
msgstr ""
188
msgstr ""
3326
181
189
3328
182
#: qml/Components/KeyboardShortcutsOverlay.qml:188
190
#: qml/Components/KeyboardShortcutsOverlay.qml:201
3329
183
msgid "Super (Tap)"
191
msgid "Super (Tap)"
3330
184
msgstr ""
192
msgstr ""
3331
185
193
3333
186
#: qml/Components/KeyboardShortcutsOverlay.qml:193
194
#: qml/Components/KeyboardShortcutsOverlay.qml:206
3334
187
msgid "Opens the Scopes home."
195
msgid "Opens the Scopes home."
3335
188
msgstr ""
196
msgstr ""
3336
189
197
3338
190
#: qml/Components/KeyboardShortcutsOverlay.qml:209
198
#: qml/Components/KeyboardShortcutsOverlay.qml:222
3339
191
msgid "Switching"
199
msgid "Switching"
3340
192
msgstr ""
200
msgstr ""
3341
193
201
3343
194
#: qml/Components/KeyboardShortcutsOverlay.qml:216
202
#: qml/Components/KeyboardShortcutsOverlay.qml:229
3344
195
msgid "Alt + Tab"
203
msgid "Alt + Tab"
3345
196
msgstr ""
204
msgstr ""
3346
197
205
3348
198
#: qml/Components/KeyboardShortcutsOverlay.qml:221
206
#: qml/Components/KeyboardShortcutsOverlay.qml:234
3349
199
msgid "Switches between applications."
207
msgid "Switches between applications."
3350
200
msgstr ""
208
msgstr ""
3351
201
209
3353
202
#: qml/Components/KeyboardShortcutsOverlay.qml:229
210
#: qml/Components/KeyboardShortcutsOverlay.qml:242
3354
203
msgid "Super + W"
211
msgid "Super + W"
3355
204
msgstr ""
212
msgstr ""
3356
205
213
3358
206
#: qml/Components/KeyboardShortcutsOverlay.qml:234
214
#: qml/Components/KeyboardShortcutsOverlay.qml:247
3359
207
msgid "Opens the desktop spread."
215
msgid "Opens the desktop spread."
3360
208
msgstr ""
216
msgstr ""
3361
209
217
3363
210
#: qml/Components/KeyboardShortcutsOverlay.qml:242
218
#: qml/Components/KeyboardShortcutsOverlay.qml:255
3364
211
msgid "Cursor Left or Right"
219
msgid "Cursor Left or Right"
3365
212
msgstr ""
220
msgstr ""
3366
213
221
3368
214
#: qml/Components/KeyboardShortcutsOverlay.qml:247
222
#: qml/Components/KeyboardShortcutsOverlay.qml:260
3369
215
msgid "Moves the focus."
223
msgid "Moves the focus."
3370
216
msgstr ""
224
msgstr ""
3371
217
225
3373
218
#: qml/Components/KeyboardShortcutsOverlay.qml:259
226
#: qml/Components/KeyboardShortcutsOverlay.qml:272
3374
219
msgid "Windows"
227
msgid "Windows"
3375
220
msgstr ""
228
msgstr ""
3376
221
229
3378
222
#: qml/Components/KeyboardShortcutsOverlay.qml:266
230
#: qml/Components/KeyboardShortcutsOverlay.qml:279
3379
223
msgid "Ctrl + Super + D"
231
msgid "Ctrl + Super + D"
3380
224
msgstr ""
232
msgstr ""
3381
225
233
3383
226
#: qml/Components/KeyboardShortcutsOverlay.qml:271
234
#: qml/Components/KeyboardShortcutsOverlay.qml:284
3384
227
msgid "Minimizes all windows."
235
msgid "Minimizes all windows."
3385
228
msgstr ""
236
msgstr ""
3386
229
237
3388
230
#: qml/Components/KeyboardShortcutsOverlay.qml:279
238
#: qml/Components/KeyboardShortcutsOverlay.qml:292
3389
231
msgid "Ctrl + Super + Up"
239
msgid "Ctrl + Super + Up"
3390
232
msgstr ""
240
msgstr ""
3391
233
241
3393
234
#: qml/Components/KeyboardShortcutsOverlay.qml:284
242
#: qml/Components/KeyboardShortcutsOverlay.qml:297
3394
235
msgid "Maximizes the current window."
243
msgid "Maximizes the current window."
3395
236
msgstr ""
244
msgstr ""
3396
237
245
3398
238
#: qml/Components/KeyboardShortcutsOverlay.qml:292
246
#: qml/Components/KeyboardShortcutsOverlay.qml:305
3399
239
msgid "Ctrl + Super + Down"
247
msgid "Ctrl + Super + Down"
3400
240
msgstr ""
248
msgstr ""
3401
241
249
3403
242
#: qml/Components/KeyboardShortcutsOverlay.qml:297
250
#: qml/Components/KeyboardShortcutsOverlay.qml:310
3404
243
msgid "Minimizes or restores the current window."
251
msgid "Minimizes or restores the current window."
3405
244
msgstr ""
252
msgstr ""
3406
245
253
3408
246
#: qml/Components/KeyboardShortcutsOverlay.qml:305
254
#: qml/Components/KeyboardShortcutsOverlay.qml:318
3409
247
msgid "Ctrl + Super + Left or Right"
255
msgid "Ctrl + Super + Left or Right"
3410
248
msgstr ""
256
msgstr ""
3411
249
257
3413
250
#: qml/Components/KeyboardShortcutsOverlay.qml:310
258
#: qml/Components/KeyboardShortcutsOverlay.qml:323
3414
251
msgid "Semi-maximizes the current window."
259
msgid "Semi-maximizes the current window."
3415
252
msgstr ""
260
msgstr ""
3416
253
261
3418
254
#: qml/Components/KeyboardShortcutsOverlay.qml:318
262
#: qml/Components/KeyboardShortcutsOverlay.qml:331
3419
255
msgid "Alt + F4"
263
msgid "Alt + F4"
3420
256
msgstr ""
264
msgstr ""
3421
257
265
3423
258
#: qml/Components/KeyboardShortcutsOverlay.qml:323
266
#: qml/Components/KeyboardShortcutsOverlay.qml:336
3424
259
msgid "Closes the current window."
267
msgid "Closes the current window."
3425
260
msgstr ""
268
msgstr ""
3426
261
269
3427
@@ -311,6 +319,28 @@
3428
311
msgid "Preview Share Item"
319
msgid "Preview Share Item"
3429
312
msgstr ""
320
msgstr ""
3430
313
321
3431
322
#: qml/Components/VirtualTouchPad.qml:317
3432
323
msgid ""
3433
324
"Your device is now connected to an external display. Use this screen as a "
3434
325
"touch pad to interact with the pointer."
3435
326
msgstr ""
3436
327
3437
328
#: qml/Components/VirtualTouchPad.qml:327
3438
329
msgid "Tap left button to click."
3439
330
msgstr ""
3440
331
3441
332
#: qml/Components/VirtualTouchPad.qml:339
3442
333
msgid "Tap right button to right click."
3443
334
msgstr ""
3444
335
3445
336
#: qml/Components/VirtualTouchPad.qml:351
3446
337
msgid "Swipe with two fingers to scroll."
3447
338
msgstr ""
3448
339
3449
340
#: qml/Components/VirtualTouchPad.qml:396
3450
341
msgid "Find more settings in the system settings."
3451
342
msgstr ""
3452
343
3453
314
#: qml/Dash/DashPageHeader.qml:361
344
#: qml/Dash/DashPageHeader.qml:361
3454
315
msgctxt "Button: Open the Ubuntu Store"
345
msgctxt "Button: Open the Ubuntu Store"
3455
316
msgid "Store"
346
msgid "Store"
3456
@@ -408,12 +438,6 @@
3457
408
msgid "Also installed"
438
msgid "Also installed"
3458
409
msgstr ""
439
msgstr ""
3459
410
440
3460
411
#: qml/DisabledScreenNotice.qml:109
3461
412
msgid ""
3462
413
"Your device is now connected to an external display. Use this screen as a "
3463
414
"touch pad to interact with the pointer."
3464
415
msgstr ""
3465
416
3466
417
#: qml/Greeter/CoverPage.qml:127
441
#: qml/Greeter/CoverPage.qml:127
3467
418
msgid "Unlock"
442
msgid "Unlock"
3468
419
msgstr ""
443
msgstr ""
3469
@@ -437,7 +461,7 @@
3470
437
msgstr[0] ""
461
msgstr[0] ""
3471
438
msgstr[1] ""
462
msgstr[1] ""
3472
439
463
3474
440
#: qml/Greeter/Greeter.qml:596
464
#: qml/Greeter/Greeter.qml:592
3475
441
msgid "Try again"
465
msgid "Try again"
3476
442
msgstr ""
466
msgstr ""
3477
443
467
3478
@@ -465,6 +489,19 @@
3479
465
msgid "Select desktop environment"
489
msgid "Select desktop environment"
3480
466
msgstr ""
490
msgstr ""
3481
467
491
3482
492
#: qml/Launcher/Drawer.qml:80
3483
493
msgid "Search…"
3484
494
msgstr ""
3485
495
3486
496
#: qml/Launcher/Drawer.qml:101
3487
497
msgctxt "Apps sorted alphabetically"
3488
498
msgid "A-Z"
3489
499
msgstr ""
3490
500
3491
501
#: qml/Launcher/MoreAppsHeader.qml:32
3492
502
msgid "More apps in the store"
3493
503
msgstr ""
3494
504
3495
468
#: qml/Notifications/NotificationMenuItemFactory.qml:124
505
#: qml/Notifications/NotificationMenuItemFactory.qml:124
3496
469
msgid "Show password"
506
msgid "Show password"
3497
470
msgstr ""
507
msgstr ""
3498
@@ -477,62 +514,62 @@
3499
477
msgid "Conference"
514
msgid "Conference"
3500
478
msgstr ""
515
msgstr ""
3501
479
516
3503
480
#: qml/Panel/Indicators/MenuItemFactory.qml:847
517
#: qml/Panel/Indicators/MenuItemFactory.qml:868
3504
481
msgid "Nothing is playing"
518
msgid "Nothing is playing"
3505
482
msgstr ""
519
msgstr ""
3506
483
520
3508
484
#: qml/Panel/Indicators/MenuItemFactory.qml:975
521
#: qml/Panel/Indicators/MenuItemFactory.qml:996
3509
485
#, qt-format
522
#, qt-format
3510
486
msgid "%1 hour"
523
msgid "%1 hour"
3511
487
msgid_plural "%1 hours"
524
msgid_plural "%1 hours"
3512
488
msgstr[0] ""
525
msgstr[0] ""
3513
489
msgstr[1] ""
526
msgstr[1] ""
3514
490
527
3516
491
#: qml/Panel/Indicators/MenuItemFactory.qml:979
528
#: qml/Panel/Indicators/MenuItemFactory.qml:1000
3517
492
#, qt-format
529
#, qt-format
3518
493
msgid "%1 minute"
530
msgid "%1 minute"
3519
494
msgid_plural "%1 minutes"
531
msgid_plural "%1 minutes"
3520
495
msgstr[0] ""
532
msgstr[0] ""
3521
496
msgstr[1] ""
533
msgstr[1] ""
3522
497
534
3524
498
#: qml/Panel/Indicators/MenuItemFactory.qml:984
535
#: qml/Panel/Indicators/MenuItemFactory.qml:1005
3525
499
#, qt-format
536
#, qt-format
3526
500
msgid "%1 second"
537
msgid "%1 second"
3527
501
msgid_plural "%1 seconds"
538
msgid_plural "%1 seconds"
3528
502
msgstr[0] ""
539
msgstr[0] ""
3529
503
msgstr[1] ""
540
msgstr[1] ""
3530
504
541
3532
505
#: qml/Panel/Indicators/MenuItemFactory.qml:987
542
#: qml/Panel/Indicators/MenuItemFactory.qml:1008
3533
506
msgid "0 seconds"
543
msgid "0 seconds"
3534
507
msgstr ""
544
msgstr ""
3535
508
545
3536
509
#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
546
#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
3538
510
#: qml/Panel/Indicators/MenuItemFactory.qml:989
547
#: qml/Panel/Indicators/MenuItemFactory.qml:1010
3539
511
#, qt-format
548
#, qt-format
3540
512
msgid "%1 remaining"
549
msgid "%1 remaining"
3541
513
msgstr ""
550
msgstr ""
3542
514
551
3544
515
#: qml/Panel/Indicators/MenuItemFactory.qml:995
552
#: qml/Panel/Indicators/MenuItemFactory.qml:1016
3545
516
msgid "In queue…"
553
msgid "In queue…"
3546
517
msgstr ""
554
msgstr ""
3547
518
555
3549
519
#: qml/Panel/Indicators/MenuItemFactory.qml:999
556
#: qml/Panel/Indicators/MenuItemFactory.qml:1020
3550
520
msgid "Downloading"
557
msgid "Downloading"
3551
521
msgstr ""
558
msgstr ""
3552
522
559
3554
523
#: qml/Panel/Indicators/MenuItemFactory.qml:1001
560
#: qml/Panel/Indicators/MenuItemFactory.qml:1022
3555
524
msgid "Paused, tap to resume"
561
msgid "Paused, tap to resume"
3556
525
msgstr ""
562
msgstr ""
3557
526
563
3559
527
#: qml/Panel/Indicators/MenuItemFactory.qml:1003
564
#: qml/Panel/Indicators/MenuItemFactory.qml:1024
3560
528
msgid "Canceled"
565
msgid "Canceled"
3561
529
msgstr ""
566
msgstr ""
3562
530
567
3564
531
#: qml/Panel/Indicators/MenuItemFactory.qml:1005
568
#: qml/Panel/Indicators/MenuItemFactory.qml:1026
3565
532
msgid "Finished"
569
msgid "Finished"
3566
533
msgstr ""
570
msgstr ""
3567
534
571
3569
535
#: qml/Panel/Indicators/MenuItemFactory.qml:1007
572
#: qml/Panel/Indicators/MenuItemFactory.qml:1028
3570
536
msgid "Failed, tap to retry"
573
msgid "Failed, tap to retry"
3571
537
msgstr ""
574
msgstr ""
3572
538
575
3573
539
576
3574
=== modified file 'qml/Components/InputMethod.qml'
3575
--- qml/Components/InputMethod.qml	2016-10-06 13:06:31 +0000
3576
+++ qml/Components/InputMethod.qml	2016-12-12 16:49:02 +0000
3577
@@ -23,6 +23,8 @@
3578
23
23
3579
24
    readonly property rect visibleRect: surfaceItem.surface && visible ? surfaceItem.surface.inputBounds : Qt.rect(0, 0, 0, 0)
24
    readonly property rect visibleRect: surfaceItem.surface && visible ? surfaceItem.surface.inputBounds : Qt.rect(0, 0, 0, 0)
3580
25
25
3581
26
    property var surface
3582
27
3583
26
    MirSurfaceItem {
28
    MirSurfaceItem {
3584
27
        id: surfaceItem
29
        id: surfaceItem
3585
28
        anchors.fill: parent
30
        anchors.fill: parent
3586
@@ -31,7 +33,7 @@
3587
31
33
3588
32
        surfaceWidth: root.enabled ? width : -1
34
        surfaceWidth: root.enabled ? width : -1
3589
33
        surfaceHeight: root.enabled ? height : -1
35
        surfaceHeight: root.enabled ? height : -1
3591
34
        surface: SurfaceManager.inputMethodSurface
36
        surface: root.surface
3592
35
37
3593
36
        onLiveChanged: {
38
        onLiveChanged: {
3594
37
            if (surface !== null && !live) {
39
            if (surface !== null && !live) {
3595
@@ -50,7 +52,6 @@
3596
50
    }
52
    }
3597
51
53
3598
52
    visible: surfaceItem.surface &&
54
    visible: surfaceItem.surface &&
3602
53
              surfaceItem.surfaceState != Mir.HiddenState &&
55
             surfaceItem.surface.visible &&
3603
54
              surfaceItem.surfaceState != Mir.MinimizedState &&
56
             root.enabled
3601
55
              root.enabled
3604
56
}
57
}
3605
57
58
3606
=== modified file 'qml/Components/KeyboardShortcutsOverlay.qml'
3607
--- qml/Components/KeyboardShortcutsOverlay.qml	2016-05-11 11:09:42 +0000
3608
+++ qml/Components/KeyboardShortcutsOverlay.qml	2016-12-12 16:49:02 +0000
3609
@@ -173,6 +173,19 @@
3610
173
                    Layout.maximumWidth: maxTextSize
173
                    Layout.maximumWidth: maxTextSize
3611
174
                }
174
                }
3612
175
175
3613
176
                Label {
3614
177
                    text: i18n.tr("Super + A")
3615
178
                    fontSize: "small"
3616
179
                    font.weight: Font.Medium
3617
180
                }
3618
181
                Label {
3619
182
                    text: i18n.tr("Opens the Application Drawer.")
3620
183
                    fontSize: "small"
3621
184
                    font.weight: Font.Light
3622
185
                    wrapMode: Text.Wrap
3623
186
                    Layout.maximumWidth: maxTextSize
3624
187
                }
3625
188
3626
176
189
3627
177
                // Scopes section
190
                // Scopes section
3628
178
                Item { Layout.columnSpan: 2; height: units.gu(2) }
191
                Item { Layout.columnSpan: 2; height: units.gu(2) }
3629
179
192
3630
=== modified file 'qml/Components/KeymapSwitcher.qml'
3631
--- qml/Components/KeymapSwitcher.qml	2016-07-11 14:40:56 +0000
3632
+++ qml/Components/KeymapSwitcher.qml	2016-12-12 16:49:02 +0000
3633
@@ -23,6 +23,9 @@
3634
23
QtObject {
23
QtObject {
3635
24
    id: root
24
    id: root
3636
25
25
3637
26
    // to be set from outside
3638
27
    property var focusedSurface: null
3639
28
3640
26
    property GlobalShortcut shortcutNext: GlobalShortcut {
29
    property GlobalShortcut shortcutNext: GlobalShortcut {
3641
27
        shortcut: Qt.MetaModifier|Qt.Key_Space
30
        shortcut: Qt.MetaModifier|Qt.Key_Space
3642
28
        onTriggered: root.nextKeymap()
31
        onTriggered: root.nextKeymap()
3643
@@ -60,7 +63,7 @@
3644
60
    }
63
    }
3645
61
64
3646
62
    property Binding surfaceKeymapBinding: Binding {
65
    property Binding surfaceKeymapBinding: Binding {
3648
63
        target: MirFocusController.focusedSurface
66
        target: root.focusedSurface
3649
64
        property: "keymap"
67
        property: "keymap"
3650
65
        value: root.currentKeymap
68
        value: root.currentKeymap
3651
66
    }
69
    }
3652
67
70
3653
=== modified file 'qml/Components/VirtualTouchPad.qml'
3654
--- qml/Components/VirtualTouchPad.qml	2016-02-18 17:21:40 +0000
3655
+++ qml/Components/VirtualTouchPad.qml	2016-12-12 16:49:02 +0000
3656
@@ -15,20 +15,58 @@
3657
15
 */
15
 */
3658
16
16
3659
17
import QtQuick 2.4
17
import QtQuick 2.4
3660
18
import QtQuick.Layouts 1.1
3661
18
import Ubuntu.Components 1.3
19
import Ubuntu.Components 1.3
3662
20
import Qt.labs.settings 1.0
3663
21
import Unity.Screens 0.1
3664
19
import UInput 0.1
22
import UInput 0.1
3665
23
import "../Components"
3666
20
24
3667
21
Item {
25
Item {
3668
26
    id: root
3669
22
    property var uinput: UInput {
27
    property var uinput: UInput {
3670
23
        Component.onCompleted: createMouse();
28
        Component.onCompleted: createMouse();
3671
24
        Component.onDestruction: removeMouse();
29
        Component.onDestruction: removeMouse();
3672
25
    }
30
    }
3673
26
31
3675
27
    readonly property bool pressed: point1.pressed || point2.pressed
32
    Component.onCompleted: {
3676
33
        if (!settings.touchpadTutorialHasRun) {
3677
34
            root.runTutorial()
3678
35
        }
3679
36
    }
3680
37
3681
38
    function runTutorial() {
3682
39
        // If the tutorial animation is started too early, e.g. in Component.onCompleted,
3683
40
        // root width & height might be reported as 0x0 still. As animations read their
3684
41
        // values at startup and won't update them, lets make sure to only start once
3685
42
        // we have some actual size.
3686
43
        if (root.width > 0 && root.height > 0) {
3687
44
            tutorial.start();
3688
45
        } else {
3689
46
            tutorialTimer.start();
3690
47
        }
3691
48
    }
3692
49
3693
50
    Timer {
3694
51
        id: tutorialTimer
3695
52
        interval: 50
3696
53
        repeat: false
3697
54
        running: false
3698
55
        onTriggered: root.runTutorial();
3699
56
    }
3700
57
3701
58
    readonly property bool pressed: point1.pressed || point2.pressed || leftButton.pressed || rightButton.pressed
3702
59
3703
60
    property var settings: Settings {
3704
61
        objectName: "virtualTouchPadSettings"
3705
62
        property bool touchpadTutorialHasRun: false
3706
63
        property bool oskEnabled: true
3707
64
    }
3708
28
65
3709
29
    MultiPointTouchArea {
66
    MultiPointTouchArea {
3710
30
        objectName: "touchPadArea"
67
        objectName: "touchPadArea"
3711
31
        anchors.fill: parent
68
        anchors.fill: parent
3712
69
        enabled: !tutorial.running || tutorial.paused
3713
32
70
3714
33
        // FIXME: Once we have Qt DPR support, this should be Qt.styleHints.startDragDistance
71
        // FIXME: Once we have Qt DPR support, this should be Qt.styleHints.startDragDistance
3715
34
        readonly property int clickThreshold: internalGu * 1.5
72
        readonly property int clickThreshold: internalGu * 1.5
3716
@@ -37,6 +75,11 @@
3717
37
        property bool isDrag: false
75
        property bool isDrag: false
3718
38
76
3719
39
        onPressed: {
77
        onPressed: {
3720
78
            if (tutorial.paused) {
3721
79
                tutorial.resume();
3722
80
                return;
3723
81
            }
3724
82
3725
40
            // If double-tapping *really* fast, it could happen that we end up having only point2 pressed
83
            // If double-tapping *really* fast, it could happen that we end up having only point2 pressed
3726
41
            // Make sure we check for both combos, only point1 or only point2
84
            // Make sure we check for both combos, only point1 or only point2
3727
42
            if (((point1.pressed && !point2.pressed) || (!point1.pressed && point2.pressed))
85
            if (((point1.pressed && !point2.pressed) || (!point1.pressed && point2.pressed))
3728
@@ -135,4 +178,229 @@
3729
135
            }
178
            }
3730
136
        ]
179
        ]
3731
137
    }
180
    }
3732
181
3733
182
    RowLayout {
3734
183
        anchors { left: parent.left; right: parent.right; bottom: parent.bottom; margins: -internalGu * 1 }
3735
184
        height: internalGu * 10
3736
185
        spacing: internalGu * 1
3737
186
3738
187
        MouseArea {
3739
188
            id: leftButton
3740
189
            objectName: "leftButton"
3741
190
            Layout.fillWidth: true
3742
191
            Layout.fillHeight: true
3743
192
            onPressed: uinput.pressMouse(UInput.ButtonLeft);
3744
193
            onReleased: uinput.releaseMouse(UInput.ButtonLeft);
3745
194
            property bool highlight: false
3746
195
            UbuntuShape {
3747
196
                anchors.fill: parent
3748
197
                backgroundColor: leftButton.highlight || leftButton.pressed ? UbuntuColors.ash : UbuntuColors.inkstone
3749
198
                Behavior on backgroundColor { ColorAnimation { duration: UbuntuAnimation.FastDuration } }
3750
199
            }
3751
200
        }
3752
201
3753
202
        MouseArea {
3754
203
            id: rightButton
3755
204
            objectName: "rightButton"
3756
205
            Layout.fillWidth: true
3757
206
            Layout.fillHeight: true
3758
207
            onPressed: uinput.pressMouse(UInput.ButtonRight);
3759
208
            onReleased: uinput.releaseMouse(UInput.ButtonRight);
3760
209
            property bool highlight: false
3761
210
            UbuntuShape {
3762
211
                anchors.fill: parent
3763
212
                backgroundColor: rightButton.highlight || rightButton.pressed ? UbuntuColors.ash : UbuntuColors.inkstone
3764
213
                Behavior on backgroundColor { ColorAnimation { duration: UbuntuAnimation.FastDuration } }
3765
214
            }
3766
215
        }
3767
216
    }
3768
217
3769
218
    AbstractButton {
3770
219
        id: oskButton
3771
220
        objectName: "oskButton"
3772
221
        anchors { right: parent.right; top: parent.top; margins: internalGu * 2 }
3773
222
        height: internalGu * 6
3774
223
        width: height
3775
224
3776
225
        onClicked: {
3777
226
            settings.oskEnabled = !settings.oskEnabled
3778
227
        }
3779
228
3780
229
        Rectangle {
3781
230
            anchors.fill: parent
3782
231
            radius: width / 2
3783
232
            color: UbuntuColors.inkstone
3784
233
        }
3785
234
3786
235
        Icon {
3787
236
            anchors.fill: parent
3788
237
            anchors.margins: internalGu * 1.5
3789
238
            name: "input-keyboard-symbolic"
3790
239
        }
3791
240
    }
3792
241
3793
242
    Screens {
3794
243
        id: screens
3795
244
    }
3796
245
3797
246
    InputMethod {
3798
247
        id: inputMethod
3799
248
        // Don't resize when there is only one screen to avoid resize clashing with the InputMethod in the Shell.
3800
249
        enabled: screens.count > 1 && settings.oskEnabled && !tutorial.running
3801
250
        objectName: "inputMethod"
3802
251
        anchors.fill: parent
3803
252
    }
3804
253
3805
254
    Label {
3806
255
        id: tutorialLabel
3807
256
        objectName: "tutorialLabel"
3808
257
        anchors { left: parent.left; top: parent.top; right: parent.right; margins: internalGu * 4; topMargin: internalGu * 10 }
3809
258
        opacity: 0
3810
259
        visible: opacity > 0
3811
260
        font.pixelSize: 2 * internalGu
3812
261
        color: "white"
3813
262
        wrapMode: Text.WordWrap
3814
263
    }
3815
264
3816
265
    Icon {
3817
266
        id: tutorialImage
3818
267
        objectName: "tutorialImage"
3819
268
        height: internalGu * 8
3820
269
        width: height
3821
270
        name: "input-touchpad-symbolic"
3822
271
        color: "white"
3823
272
        opacity: 0
3824
273
        visible: opacity > 0
3825
274
        anchors { top: tutorialLabel.bottom; horizontalCenter: parent.horizontalCenter; margins: internalGu * 2 }
3826
275
    }
3827
276
3828
277
    Item {
3829
278
        id: tutorialFinger1
3830
279
        objectName: "tutorialFinger1"
3831
280
        width: internalGu * 5
3832
281
        height: width
3833
282
        property real scale: 1
3834
283
        opacity: 0
3835
284
        visible: opacity > 0
3836
285
        Rectangle {
3837
286
            width: parent.width * parent.scale
3838
287
            height: width
3839
288
            anchors.centerIn: parent
3840
289
            radius: width / 2
3841
290
            color: UbuntuColors.inkstone
3842
291
        }
3843
292
    }
3844
293
3845
294
    Item {
3846
295
        id: tutorialFinger2
3847
296
        objectName: "tutorialFinger2"
3848
297
        width: internalGu * 5
3849
298
        height: width
3850
299
        property real scale: 1
3851
300
        opacity: 0
3852
301
        visible: opacity > 0
3853
302
        Rectangle {
3854
303
            width: parent.width * parent.scale
3855
304
            height: width
3856
305
            anchors.centerIn: parent
3857
306
            radius: width / 2
3858
307
            color: UbuntuColors.inkstone
3859
308
        }
3860
309
    }
3861
310
3862
311
    SequentialAnimation {
3863
312
        id: tutorial
3864
313
        objectName: "tutorialAnimation"
3865
314
3866
315
        PropertyAction { targets: [leftButton, rightButton, oskButton]; property: "enabled"; value: false }
3867
316
        PropertyAction { targets: [leftButton, rightButton, oskButton]; property: "opacity"; value: 0 }
3868
317
        PropertyAction { target: tutorialLabel; property: "text"; value: i18n.tr("Your device is now connected to an external display. Use this screen as a touch pad to interact with the pointer.") }
3869
318
        UbuntuNumberAnimation { targets: [tutorialLabel, tutorialImage]; property: "opacity"; to: 1; duration: UbuntuAnimation.FastDuration }
3870
319
        PropertyAction { target: tutorial; property: "paused"; value: true }
3871
320
        PauseAnimation { duration: 500 } // it takes a bit until pausing actually takes effect
3872
321
        UbuntuNumberAnimation { targets: [tutorialLabel, tutorialImage]; property: "opacity"; to: 0; duration: UbuntuAnimation.FastDuration }
3873
322
3874
323
        UbuntuNumberAnimation { target: leftButton; property: "opacity"; to: 1 }
3875
324
        UbuntuNumberAnimation { target: rightButton; property: "opacity"; to: 1 }
3876
325
3877
326
        PauseAnimation { duration: UbuntuAnimation.SleepyDuration }
3878
327
        PropertyAction { target: tutorialLabel; property: "text"; value: i18n.tr("Tap left button to click.") }
3879
328
        UbuntuNumberAnimation { target: tutorialLabel; property: "opacity"; to: 1; duration: UbuntuAnimation.FastDuration }
3880
329
        SequentialAnimation {
3881
330
            loops: 2
3882
331
            PropertyAction { target: leftButton; property: "highlight"; value: true }
3883
332
            PauseAnimation { duration: UbuntuAnimation.FastDuration }
3884
333
            PropertyAction { target: leftButton; property: "highlight"; value: false }
3885
334
            PauseAnimation { duration: UbuntuAnimation.SleepyDuration }
3886
335
        }
3887
336
        UbuntuNumberAnimation { target: tutorialLabel; property: "opacity"; to: 0; duration: UbuntuAnimation.FastDuration }
3888
337
3889
338
        PauseAnimation { duration: UbuntuAnimation.SleepyDuration }
3890
339
        PropertyAction { target: tutorialLabel; property: "text"; value: i18n.tr("Tap right button to right click.") }
3891
340
        UbuntuNumberAnimation { target: tutorialLabel; property: "opacity"; to: 1; duration: UbuntuAnimation.FastDuration }
3892
341
        SequentialAnimation {
3893
342
            loops: 2
3894
343
            PropertyAction { target: rightButton; property: "highlight"; value: true }
3895
344
            PauseAnimation { duration: UbuntuAnimation.FastDuration }
3896
345
            PropertyAction { target: rightButton; property: "highlight"; value: false }
3897
346
            PauseAnimation { duration: UbuntuAnimation.SleepyDuration }
3898
347
        }
3899
348
        UbuntuNumberAnimation { target: tutorialLabel; property: "opacity"; to: 0; duration: UbuntuAnimation.FastDuration }
3900
349
3901
350
        PauseAnimation { duration: UbuntuAnimation.SleepyDuration }
3902
351
        PropertyAction { target: tutorialLabel; property: "text"; value: i18n.tr("Swipe with two fingers to scroll.") }
3903
352
        UbuntuNumberAnimation { target: tutorialLabel; property: "opacity"; to: 1; duration: UbuntuAnimation.FastDuration }
3904
353
        PropertyAction { target: tutorialFinger1; property: "x"; value: root.width / 2 - tutorialFinger1.width - internalGu * 1 }
3905
354
        PropertyAction { target: tutorialFinger2; property: "x"; value: root.width / 2 + tutorialFinger1.width + internalGu * 1 - tutorialFinger2.width }
3906
355
        PropertyAction { target: tutorialFinger1; property: "y"; value: root.height / 2 - internalGu * 10 }
3907
356
        PropertyAction { target: tutorialFinger2; property: "y"; value: root.height / 2 - internalGu * 10 }
3908
357
        SequentialAnimation {
3909
358
            ParallelAnimation {
3910
359
                UbuntuNumberAnimation { target: tutorialFinger1; property: "opacity"; to: 1; duration: UbuntuAnimation.FastDuration }
3911
360
                UbuntuNumberAnimation { target: tutorialFinger2; property: "opacity"; to: 1; duration: UbuntuAnimation.FastDuration }
3912
361
                UbuntuNumberAnimation { target: tutorialFinger1; property: "scale"; from: 0; to: 1; duration: UbuntuAnimation.FastDuration }
3913
362
                UbuntuNumberAnimation { target: tutorialFinger2; property: "scale"; from: 0; to: 1; duration: UbuntuAnimation.FastDuration }
3914
363
            }
3915
364
            ParallelAnimation {
3916
365
                UbuntuNumberAnimation { target: tutorialFinger1; property: "y"; to: root.height / 2 + internalGu * 10; duration: UbuntuAnimation.SleepyDuration }
3917
366
                UbuntuNumberAnimation { target: tutorialFinger2; property: "y"; to: root.height / 2 + internalGu * 10; duration: UbuntuAnimation.SleepyDuration }
3918
367
            }
3919
368
            ParallelAnimation {
3920
369
                UbuntuNumberAnimation { target: tutorialFinger1; property: "opacity"; to: 0; duration: UbuntuAnimation.FastDuration }
3921
370
                UbuntuNumberAnimation { target: tutorialFinger2; property: "opacity"; to: 0; duration: UbuntuAnimation.FastDuration }
3922
371
                UbuntuNumberAnimation { target: tutorialFinger1; property: "scale"; from: 1; to: 0; duration: UbuntuAnimation.FastDuration }
3923
372
                UbuntuNumberAnimation { target: tutorialFinger2; property: "scale"; from: 1; to: 0; duration: UbuntuAnimation.FastDuration }
3924
373
            }
3925
374
            PauseAnimation { duration: UbuntuAnimation.SlowDuration }
3926
375
            ParallelAnimation {
3927
376
                UbuntuNumberAnimation { target: tutorialFinger1; property: "opacity"; to: 1; duration: UbuntuAnimation.FastDuration }
3928
377
                UbuntuNumberAnimation { target: tutorialFinger2; property: "opacity"; to: 1; duration: UbuntuAnimation.FastDuration }
3929
378
                UbuntuNumberAnimation { target: tutorialFinger1; property: "scale"; from: 0; to: 1; duration: UbuntuAnimation.FastDuration }
3930
379
                UbuntuNumberAnimation { target: tutorialFinger2; property: "scale"; from: 0; to: 1; duration: UbuntuAnimation.FastDuration }
3931
380
            }
3932
381
            ParallelAnimation {
3933
382
                UbuntuNumberAnimation { target: tutorialFinger1; property: "y"; to: root.height / 2 - internalGu * 10; duration: UbuntuAnimation.SleepyDuration }
3934
383
                UbuntuNumberAnimation { target: tutorialFinger2; property: "y"; to: root.height / 2 - internalGu * 10; duration: UbuntuAnimation.SleepyDuration }
3935
384
            }
3936
385
            ParallelAnimation {
3937
386
                UbuntuNumberAnimation { target: tutorialFinger1; property: "opacity"; to: 0; duration: UbuntuAnimation.FastDuration }
3938
387
                UbuntuNumberAnimation { target: tutorialFinger2; property: "opacity"; to: 0; duration: UbuntuAnimation.FastDuration }
3939
388
                UbuntuNumberAnimation { target: tutorialFinger1; property: "scale"; from: 1; to: 0; duration: UbuntuAnimation.FastDuration }
3940
389
                UbuntuNumberAnimation { target: tutorialFinger2; property: "scale"; from: 1; to: 0; duration: UbuntuAnimation.FastDuration }
3941
390
            }
3942
391
            PauseAnimation { duration: UbuntuAnimation.SlowDuration }
3943
392
        }
3944
393
        UbuntuNumberAnimation { target: tutorialLabel; property: "opacity"; to: 0; duration: UbuntuAnimation.FastDuration }
3945
394
3946
395
        PauseAnimation { duration: UbuntuAnimation.SleepyDuration }
3947
396
        PropertyAction { target: tutorialLabel; property: "text"; value: i18n.tr("Find more settings in the system settings.") }
3948
397
        UbuntuNumberAnimation { target: tutorialLabel; property: "opacity"; to: 1; duration: UbuntuAnimation.FastDuration }
3949
398
        PauseAnimation { duration: 2000 }
3950
399
        UbuntuNumberAnimation { target: tutorialLabel; property: "opacity"; to: 0; duration: UbuntuAnimation.FastDuration }
3951
400
3952
401
        UbuntuNumberAnimation { target: oskButton; property: "opacity"; to: 1 }
3953
402
        PropertyAction { targets: [leftButton, rightButton, oskButton]; property: "enabled"; value: true }
3954
403
3955
404
        PropertyAction { target: settings; property: "touchpadTutorialHasRun"; value: true }
3956
405
    }
3957
138
}
406
}
3958
139
407
3959
=== modified file 'qml/Dash/Previews/PreviewAudioPlayback.qml'
3960
--- qml/Dash/Previews/PreviewAudioPlayback.qml	2016-11-03 12:06:32 +0000
3961
+++ qml/Dash/Previews/PreviewAudioPlayback.qml	2016-12-12 16:49:02 +0000
3962
@@ -70,6 +70,7 @@
3963
70
                        objectName: "playButton"
70
                        objectName: "playButton"
3964
71
                        width: trackRow.column1Width
71
                        width: trackRow.column1Width
3965
72
                        height: width
72
                        height: width
3966
73
                        activeFocusOnPress: false
3967
73
74
3968
74
                        onClicked: {
75
                        onClicked: {
3969
75
                            if (trackItem.isPlayingItem) {
76
                            if (trackItem.isPlayingItem) {
3970
76
77
3971
=== modified file 'qml/DisabledScreenNotice.qml'
3972
--- qml/DisabledScreenNotice.qml	2016-05-06 14:29:25 +0000
3973
+++ qml/DisabledScreenNotice.qml	2016-12-12 16:49:02 +0000
3974
@@ -18,15 +18,12 @@
3975
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
3976
19
import Ubuntu.Components 1.3
19
import Ubuntu.Components 1.3
3977
20
import Unity.Session 0.1
20
import Unity.Session 0.1
3978
21
import Unity.Screens 0.1
3979
22
import QtQuick.Window 2.2
21
import QtQuick.Window 2.2
3980
23
import "Components"
22
import "Components"
3981
24
23
3982
25
Item {
24
Item {
3983
26
    id: root
25
    id: root
3984
27
26
3985
28
    property bool infoNoteDisplayed: true
3986
29
3987
30
    // For testing
27
    // For testing
3988
31
    property var screen: Screen
28
    property var screen: Screen
3989
32
    property var orientationLock: OrientationLock
29
    property var orientationLock: OrientationLock
3990
@@ -36,10 +33,6 @@
3991
36
        name: applicationArguments.deviceName
33
        name: applicationArguments.deviceName
3992
37
    }
34
    }
3993
38
35
3994
39
    Screens {
3995
40
        id: screens
3996
41
    }
3997
42
3998
43
    Item {
36
    Item {
3999
44
        id: contentContainer
37
        id: contentContainer
4000
45
        objectName: "contentContainer"
38
        objectName: "contentContainer"
4001
@@ -75,58 +68,13 @@
4002
75
        }
68
        }
4003
76
        transformOrigin: Item.Center
69
        transformOrigin: Item.Center
4004
77
70
4005
71
        Rectangle {
4006
72
            anchors.fill: parent
4007
73
            color: UbuntuColors.jet
4008
74
        }
4009
75
4010
78
        VirtualTouchPad {
76
        VirtualTouchPad {
4062
79
            anchors.fill: parent
77
            objectName: "virtualTouchPad"
4012
80
4013
81
            onPressedChanged: {
4014
82
                if (pressed && infoNoteDisplayed) {
4015
83
                    infoNoteDisplayed = false;
4016
84
                }
4017
85
            }
4018
86
        }
4019
87
4020
88
        Rectangle {
4021
89
            anchors.fill: parent
4022
90
            color: "#3b3b3b"
4023
91
        }
4024
92
4025
93
        Item {
4026
94
            objectName: "infoNoticeArea"
4027
95
            anchors.fill: parent
4028
96
            opacity: infoNoteDisplayed ? 1 : 0
4029
97
            visible: opacity > 0
4030
98
            Behavior on opacity {
4031
99
                UbuntuNumberAnimation { }
4032
100
            }
4033
101
4034
102
            Column {
4035
103
                anchors.centerIn: parent
4036
104
                width: parent.width - (internalGu * 8)
4037
105
                spacing: internalGu * 4
4038
106
4039
107
                Label {
4040
108
                    id: text
4041
109
                    text: i18n.tr("Your device is now connected to an external display. Use this screen as a touch pad to interact with the pointer.")
4042
110
                    color: "white"
4043
111
                    width: parent.width
4044
112
                    font.pixelSize: 2.5 * internalGu
4045
113
                    wrapMode: Text.Wrap
4046
114
                }
4047
115
                Icon {
4048
116
                    height: internalGu * 8
4049
117
                    width: height
4050
118
                    name: "input-touchpad-symbolic"
4051
119
                    color: "white"
4052
120
                    anchors.horizontalCenter: parent.horizontalCenter
4053
121
                }
4054
122
            }
4055
123
        }
4056
124
4057
125
        InputMethod {
4058
126
            id: inputMethod
4059
127
            // Don't resize when there is only one screen to avoid resize clashing with the InputMethod in the Shell.
4060
128
            enabled: screens.count > 1
4061
129
            objectName: "inputMethod"
4063
130
            anchors.fill: parent
78
            anchors.fill: parent
4064
131
        }
79
        }
4065
132
    }
80
    }
4066
133
81
4067
=== modified file 'qml/Greeter/Greeter.qml'
4068
--- qml/Greeter/Greeter.qml	2016-09-22 10:33:39 +0000
4069
+++ qml/Greeter/Greeter.qml	2016-12-12 16:49:02 +0000
4070
@@ -145,11 +145,7 @@
4071
145
            }
145
            }
4072
146
        }
146
        }
4073
147
147
4079
148
        if (loader.item.sessionToStart === LightDMService.greeter.defaultSession) {
148
        return LightDMService.greeter.defaultSession;
4075
149
            return LightDMService.greeter.defaultSession;
4076
150
        } else {
4077
151
            return "ubuntu"; // The default / fallback
4078
152
        }
4080
153
    }
149
    }
4081
154
150
4082
155
    QtObject {
151
    QtObject {
4083
156
152
4084
=== modified file 'qml/Greeter/LoginList.qml'
4085
--- qml/Greeter/LoginList.qml	2016-09-22 10:33:39 +0000
4086
+++ qml/Greeter/LoginList.qml	2016-12-12 16:49:02 +0000
4087
@@ -165,7 +165,7 @@
4088
165
        }
165
        }
4089
166
166
4090
167
        delegate: Item {
167
        delegate: Item {
4092
168
            width: parent.width
168
            width: userList.width
4093
169
            height: root.cellHeight
169
            height: root.cellHeight
4094
170
170
4095
171
            readonly property bool belowHighlight: (userList.currentIndex < 0 && index > 0) || (userList.currentIndex >= 0 && index > userList.currentIndex)
171
            readonly property bool belowHighlight: (userList.currentIndex < 0 && index > 0) || (userList.currentIndex >= 0 && index > userList.currentIndex)
4096
172
172
4097
=== modified file 'qml/Greeter/WideView.qml'
4098
--- qml/Greeter/WideView.qml	2016-09-07 17:13:38 +0000
4099
+++ qml/Greeter/WideView.qml	2016-12-12 16:49:02 +0000
4100
@@ -125,6 +125,8 @@
4101
125
            id: loginList
125
            id: loginList
4102
126
            objectName: "loginList"
126
            objectName: "loginList"
4103
127
127
4104
128
            property int selectedUserIndex: 0
4105
129
4106
128
            width: units.gu(40)
130
            width: units.gu(40)
4107
129
            anchors {
131
            anchors {
4108
130
                left: parent.left
132
                left: parent.left
4109
@@ -139,9 +141,12 @@
4110
139
            Behavior on boxVerticalOffset { UbuntuNumberAnimation {} }
141
            Behavior on boxVerticalOffset { UbuntuNumberAnimation {} }
4111
140
142
4112
141
            model: root.userModel
143
            model: root.userModel
4114
142
            currentSession: LightDMService.greeter.defaultSession
144
            currentSession: LightDMService.users.data(selectedUserIndex, LightDMService.userRoles.SessionRole);
4115
143
            onResponded: root.responded(response)
145
            onResponded: root.responded(response)
4117
144
            onSelected: root.selected(index)
146
            onSelected: {
4118
147
                root.selected(index)
4119
148
                loginList.selectedUserIndex = index;
4120
149
            }
4121
145
            onSessionChooserButtonClicked: parent.state = "SessionsList"
150
            onSessionChooserButtonClicked: parent.state = "SessionsList"
4122
146
151
4123
147
            Keys.forwardTo: [sessionChooserLoader.item]
152
            Keys.forwardTo: [sessionChooserLoader.item]
4124
148
153
4125
=== added file 'qml/Launcher/BackgroundBlur.qml'
4126
--- qml/Launcher/BackgroundBlur.qml	1970-01-01 00:00:00 +0000
4127
+++ qml/Launcher/BackgroundBlur.qml	2016-12-12 16:49:02 +0000
4128
@@ -0,0 +1,81 @@
4129
1
/*
4130
2
 * Copyright (C) 2016 Canonical, Ltd.
4131
3
 *
4132
4
 * This program is free software; you can redistribute it and/or modify
4133
5
 * it under the terms of the GNU General Public License as published by
4134
6
 * the Free Software Foundation; version 3.
4135
7
 *
4136
8
 * This program is distributed in the hope that it will be useful,
4137
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4138
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4139
11
 * GNU General Public License for more details.
4140
12
 *
4141
13
 * You should have received a copy of the GNU General Public License
4142
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4143
15
 */
4144
16
4145
17
import QtQuick 2.4
4146
18
import Ubuntu.Components 1.3
4147
19
import QtGraphicalEffects 1.0
4148
20
4149
21
Item {
4150
22
    id: root
4151
23
4152
24
    property int blurAmount: 32
4153
25
    property Item sourceItem
4154
26
    property rect blurRect: Qt.rect(0,0,0,0)
4155
27
    property alias cached: fastBlur.cached
4156
28
4157
29
    Rectangle {
4158
30
        id: blurMask
4159
31
        color: "yellow"
4160
32
        x: blurRect.x
4161
33
        y: blurRect.y
4162
34
        width: blurRect.width
4163
35
        height: blurRect.height
4164
36
    }
4165
37
4166
38
    ShaderEffect {
4167
39
        id: maskedBlurEffect
4168
40
        x: blurRect.x
4169
41
        y: blurRect.y
4170
42
        width: blurRect.width
4171
43
        height: blurRect.height
4172
44
4173
45
        property variant source: ShaderEffectSource {
4174
46
            id: shaderEffectSource
4175
47
            sourceItem: root.sourceItem
4176
48
            hideSource: false
4177
49
            sourceRect: root.blurRect
4178
50
        }
4179
51
4180
52
        property var mask: ShaderEffectSource {
4181
53
            sourceItem: blurMask
4182
54
            hideSource: true
4183
55
        }
4184
56
4185
57
        fragmentShader: "
4186
58
            varying highp vec2 qt_TexCoord0;
4187
59
            uniform sampler2D source;
4188
60
            uniform sampler2D mask;
4189
61
            void main(void)
4190
62
            {
4191
63
                highp vec4 sourceColor = texture2D(source, qt_TexCoord0);
4192
64
                highp vec4 maskColor = texture2D(mask, qt_TexCoord0);
4193
65
4194
66
                sourceColor *= maskColor.a;
4195
67
4196
68
                gl_FragColor = sourceColor;
4197
69
            }"
4198
70
    }
4199
71
4200
72
    FastBlur {
4201
73
        id: fastBlur
4202
74
        x: blurRect.x
4203
75
        y: blurRect.y
4204
76
        width: blurRect.width
4205
77
        height: blurRect.height
4206
78
        source: maskedBlurEffect
4207
79
        radius: Math.min(blurAmount, 128)
4208
80
    }
4209
81
 }
4210
0
82
4211
=== added file 'qml/Launcher/Drawer.qml'
4212
--- qml/Launcher/Drawer.qml	1970-01-01 00:00:00 +0000
4213
+++ qml/Launcher/Drawer.qml	2016-12-12 16:49:02 +0000
4214
@@ -0,0 +1,306 @@
4215
1
/*
4216
2
 * Copyright (C) 2016 Canonical, Ltd.
4217
3
 *
4218
4
 * This program is free software; you can redistribute it and/or modify
4219
5
 * it under the terms of the GNU General Public License as published by
4220
6
 * the Free Software Foundation; version 3.
4221
7
 *
4222
8
 * This program is distributed in the hope that it will be useful,
4223
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4224
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4225
11
 * GNU General Public License for more details.
4226
12
 *
4227
13
 * You should have received a copy of the GNU General Public License
4228
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4229
15
 */
4230
16
4231
17
import QtQuick 2.4
4232
18
import Ubuntu.Components 1.3
4233
19
import Unity.Launcher 0.1
4234
20
import Utils 0.1
4235
21
import "../Components"
4236
22
import Qt.labs.settings 1.0
4237
23
4238
24
FocusScope {
4239
25
    id: root
4240
26
4241
27
    property int panelWidth: 0
4242
28
    readonly property bool moving: listLoader.item && listLoader.item.moving
4243
29
4244
30
    signal applicationSelected(string appId)
4245
31
4246
32
    property bool draggingHorizontally: false
4247
33
    property int dragDistance: 0
4248
34
4249
35
    onFocusChanged: {
4250
36
        if (focus) {
4251
37
            searchField.selectAll();
4252
38
        }
4253
39
    }
4254
40
4255
41
    function focusInput() {
4256
42
        searchField.selectAll();
4257
43
        searchField.focus = true;
4258
44
    }
4259
45
4260
46
    Settings {
4261
47
        property alias selectedTab: sections.selectedIndex
4262
48
    }
4263
49
4264
50
    MouseArea {
4265
51
        anchors.fill: parent
4266
52
        hoverEnabled: true
4267
53
        acceptedButtons: Qt.AllButtons
4268
54
        onWheel: wheel.accepted = true
4269
55
    }
4270
56
4271
57
    Rectangle {
4272
58
        anchors.fill: parent
4273
59
        color: "#BF000000"
4274
60
4275
61
        AppDrawerModel {
4276
62
            id: appDrawerModel
4277
63
        }
4278
64
4279
65
        AppDrawerProxyModel {
4280
66
            id: sortProxyModel
4281
67
            source: appDrawerModel
4282
68
            filterString: searchField.displayText
4283
69
            sortBy: AppDrawerProxyModel.SortByAToZ
4284
70
        }
4285
71
4286
72
        Item {
4287
73
            id: contentContainer
4288
74
            anchors.fill: parent
4289
75
            anchors.leftMargin: root.panelWidth
4290
76
4291
77
            TextField {
4292
78
                id: searchField
4293
79
                anchors { left: parent.left; top: parent.top; right: parent.right; margins: units.gu(1) }
4294
80
                placeholderText: i18n.tr("Search…")
4295
81
                focus: true
4296
82
                onAccepted: {
4297
83
                    if (searchField.displayText != "" && listLoader.item && listLoader.item.currentItem) {
4298
84
                        root.applicationSelected(listLoader.item.getFirstAppId());
4299
85
                    }
4300
86
                }
4301
87
            }
4302
88
4303
89
            Item {
4304
90
                id: sectionsContainer
4305
91
                anchors { left: parent.left; top: searchField.bottom; right: parent.right; }
4306
92
                height: sections.height
4307
93
                clip: true
4308
94
                z: 2
4309
95
4310
96
                Sections {
4311
97
                    id: sections
4312
98
                    width: parent.width
4313
99
                    actions: [
4314
100
                        Action {
4315
101
                            text: i18n.ctr("Apps sorted alphabetically", "A-Z")
4316
102
                        // TODO: Disabling this for now as we don't get the right input from u-a-l yet.
4317
103
//                        },
4318
104
//                        Action {
4319
105
//                            text: i18n.ctr("Most used apps", "Most used")
4320
106
                        }
4321
107
                    ]
4322
108
4323
109
                    Rectangle {
4324
110
                        anchors.bottom: parent.bottom
4325
111
                        height: units.dp(1)
4326
112
                        color: 'gray'
4327
113
                        width: contentContainer.width
4328
114
                    }
4329
115
                }
4330
116
            }
4331
117
4332
118
            Loader {
4333
119
                id: listLoader
4334
120
                anchors { left: parent.left; top: sectionsContainer.bottom; right: parent.right; bottom: parent.bottom; leftMargin: units.gu(1); rightMargin: units.gu(1) }
4335
121
                sourceComponent: {
4336
122
                    switch (sections.selectedIndex) {
4337
123
                    case 0: return aToZComponent;
4338
124
                    case 1: return mostUsedComponent;
4339
125
                    }
4340
126
                }
4341
127
                Binding {
4342
128
                    target: listLoader.item || null
4343
129
                    property: "objectName"
4344
130
                    value: "drawerItemList"
4345
131
                }
4346
132
            }
4347
133
4348
134
            MouseArea {
4349
135
                parent: listLoader.item ? listLoader.item : null
4350
136
                anchors.fill: parent
4351
137
                propagateComposedEvents: true
4352
138
                property int oldX: 0
4353
139
                onPressed: {
4354
140
                    oldX = mouseX;
4355
141
                }
4356
142
                onMouseXChanged: {
4357
143
                    var diff = oldX - mouseX;
4358
144
                    root.draggingHorizontally |= diff > units.gu(2);
4359
145
                    if (!root.draggingHorizontally) {
4360
146
                        return;
4361
147
                    }
4362
148
                    propagateComposedEvents = false;
4363
149
                    parent.interactive = false;
4364
150
                    root.dragDistance += diff;
4365
151
                    oldX = mouseX
4366
152
                }
4367
153
                onReleased: {
4368
154
                    if (root.draggingHorizontally) {
4369
155
                        root.draggingHorizontally = false;
4370
156
                        parent.interactive = true;
4371
157
                    }
4372
158
                    reactivateTimer.start();
4373
159
                }
4374
160
                Timer {
4375
161
                    id: reactivateTimer
4376
162
                    interval: 0
4377
163
                    onTriggered: parent.propagateComposedEvents = true;
4378
164
                }
4379
165
            }
4380
166
4381
167
            Component {
4382
168
                id: mostUsedComponent
4383
169
                DrawerListView {
4384
170
4385
171
                    header: MoreAppsHeader {
4386
172
                        width: parent.width
4387
173
                        height: units.gu(6)
4388
174
                    }
4389
175
4390
176
                    model: AppDrawerProxyModel {
4391
177
                        source: sortProxyModel
4392
178
                        group: AppDrawerProxyModel.GroupByAll
4393
179
                        sortBy: AppDrawerProxyModel.SortByUsage
4394
180
                    }
4395
181
4396
182
                    delegate: UbuntuShape {
4397
183
                        width: parent.width
4398
184
                        color: "#20ffffff"
4399
185
                        aspect: UbuntuShape.Flat
4400
186
                        // NOTE: Cannot use gridView.rows here as it would evaluate to 0 at first and only update later,
4401
187
                        // which messes up the ListView.
4402
188
                        height: (Math.ceil(mostUsedGridView.model.count / mostUsedGridView.columns) * mostUsedGridView.delegateHeight) + units.gu(2)
4403
189
4404
190
                        readonly property string appId: model.appId
4405
191
4406
192
                        DrawerGridView {
4407
193
                            id: mostUsedGridView
4408
194
                            anchors.fill: parent
4409
195
                            topMargin: units.gu(1)
4410
196
                            bottomMargin: units.gu(1)
4411
197
                            clip: true
4412
198
4413
199
                            model: sortProxyModel
4414
200
4415
201
                            delegateWidth: units.gu(8)
4416
202
                            delegateHeight: units.gu(10)
4417
203
                            delegate: drawerDelegateComponent
4418
204
                        }
4419
205
                    }
4420
206
                }
4421
207
            }
4422
208
4423
209
            Component {
4424
210
                id: aToZComponent
4425
211
                DrawerListView {
4426
212
4427
213
                    header: MoreAppsHeader {
4428
214
                        width: parent.width
4429
215
                        height: units.gu(6)
4430
216
                    }
4431
217
4432
218
                    model: AppDrawerProxyModel {
4433
219
                        source: sortProxyModel
4434
220
                        sortBy: AppDrawerProxyModel.SortByAToZ
4435
221
                        group: AppDrawerProxyModel.GroupByAToZ
4436
222
                    }
4437
223
4438
224
                    delegate: UbuntuShape {
4439
225
                        width: parent.width
4440
226
                        color: "#20ffffff"
4441
227
                        aspect: UbuntuShape.Flat
4442
228
4443
229
                        readonly property string appId: model.appId
4444
230
4445
231
                        // NOTE: Cannot use gridView.rows here as it would evaluate to 0 at first and only update later,
4446
232
                        // which messes up the ListView.
4447
233
                        height: (Math.ceil(gridView.model.count / gridView.columns) * gridView.delegateHeight) +
4448
234
                                categoryNameLabel.implicitHeight + units.gu(2)
4449
235
4450
236
                        Label {
4451
237
                            id: categoryNameLabel
4452
238
                            anchors { left: parent.left; top: parent.top; right: parent.right; margins: units.gu(1) }
4453
239
                            text: model.letter
4454
240
                        }
4455
241
4456
242
                        DrawerGridView {
4457
243
                            id: gridView
4458
244
                            anchors { left: parent.left; top: categoryNameLabel.bottom; right: parent.right; topMargin: units.gu(1) }
4459
245
                            height: rows * delegateHeight
4460
246
4461
247
                            interactive: false
4462
248
4463
249
                            model: AppDrawerProxyModel {
4464
250
                                id: categoryModel
4465
251
                                source: sortProxyModel
4466
252
                                filterLetter: model.letter
4467
253
                            }
4468
254
                            delegateWidth: units.gu(8)
4469
255
                            delegateHeight: units.gu(10)
4470
256
                            delegate: drawerDelegateComponent
4471
257
                        }
4472
258
                    }
4473
259
                }
4474
260
            }
4475
261
        }
4476
262
4477
263
        Component {
4478
264
            id: drawerDelegateComponent
4479
265
            AbstractButton {
4480
266
                width: GridView.view.cellWidth
4481
267
                height: units.gu(10)
4482
268
                objectName: "drawerItem_" + model.appId
4483
269
4484
270
                onClicked: root.applicationSelected(model.appId)
4485
271
4486
272
                Column {
4487
273
                    width: units.gu(8)
4488
274
                    anchors.horizontalCenter: parent.horizontalCenter
4489
275
                    height: childrenRect.height
4490
276
                    spacing: units.gu(1)
4491
277
4492
278
                    UbuntuShape {
4493
279
                        id: appIcon
4494
280
                        width: units.gu(6)
4495
281
                        height: 7.5 / 8 * width
4496
282
                        anchors.horizontalCenter: parent.horizontalCenter
4497
283
                        backgroundMode: UbuntuShape.SolidColor
4498
284
                        backgroundColor: UbuntuColors.lightGrey
4499
285
                        radius: "medium"
4500
286
                        borderSource: 'undefined'
4501
287
                        source: Image {
4502
288
                            id: sourceImage
4503
289
                            sourceSize.width: appIcon.width
4504
290
                            source: model.icon
4505
291
                        }
4506
292
                        sourceFillMode: UbuntuShape.PreserveAspectCrop
4507
293
                    }
4508
294
4509
295
                    Label {
4510
296
                        text: model.name
4511
297
                        width: parent.width
4512
298
                        horizontalAlignment: Text.AlignHCenter
4513
299
                        fontSize: "small"
4514
300
                        elide: Text.ElideRight
4515
301
                    }
4516
302
                }
4517
303
            }
4518
304
        }
4519
305
    }
4520
306
}
4521
0
307
4522
=== added file 'qml/Launcher/DrawerGridView.qml'
4523
--- qml/Launcher/DrawerGridView.qml	1970-01-01 00:00:00 +0000
4524
+++ qml/Launcher/DrawerGridView.qml	2016-12-12 16:49:02 +0000
4525
@@ -0,0 +1,47 @@
4526
1
/*
4527
2
 * Copyright (C) 2016 Canonical, Ltd.
4528
3
 *
4529
4
 * This program is free software; you can redistribute it and/or modify
4530
5
 * it under the terms of the GNU General Public License as published by
4531
6
 * the Free Software Foundation; version 3.
4532
7
 *
4533
8
 * This program is distributed in the hope that it will be useful,
4534
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4535
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4536
11
 * GNU General Public License for more details.
4537
12
 *
4538
13
 * You should have received a copy of the GNU General Public License
4539
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4540
15
 */
4541
16
4542
17
import QtQuick 2.4
4543
18
import "../Components"
4544
19
4545
20
Item {
4546
21
    id: root
4547
22
4548
23
    property int delegateWidth: units.gu(10)
4549
24
    property int delegateHeight: units.gu(10)
4550
25
    property alias delegate: gridView.delegate
4551
26
    property alias model: gridView.model
4552
27
    property alias interactive: gridView.interactive
4553
28
4554
29
    property alias header: gridView.header
4555
30
    property alias topMargin: gridView.topMargin
4556
31
    property alias bottomMargin: gridView.bottomMargin
4557
32
4558
33
    readonly property int columns: width / delegateWidth
4559
34
    readonly property int rows: Math.ceil(gridView.model.count / root.columns)
4560
35
4561
36
    GridView {
4562
37
        id: gridView
4563
38
        anchors.fill: parent
4564
39
        leftMargin: spacing
4565
40
4566
41
        readonly property int overflow: width - (root.columns * root.delegateWidth)
4567
42
        readonly property real spacing: overflow / (root.columns)
4568
43
4569
44
        cellWidth: root.delegateWidth + spacing
4570
45
        cellHeight: root.delegateHeight
4571
46
    }
4572
47
}
4573
0
48
4574
=== added file 'qml/Launcher/DrawerListView.qml'
4575
--- qml/Launcher/DrawerListView.qml	1970-01-01 00:00:00 +0000
4576
+++ qml/Launcher/DrawerListView.qml	2016-12-12 16:49:02 +0000
4577
@@ -0,0 +1,32 @@
4578
1
/*
4579
2
 * Copyright (C) 2016 Canonical, Ltd.
4580
3
 *
4581
4
 * This program is free software; you can redistribute it and/or modify
4582
5
 * it under the terms of the GNU General Public License as published by
4583
6
 * the Free Software Foundation; version 3.
4584
7
 *
4585
8
 * This program is distributed in the hope that it will be useful,
4586
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4587
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4588
11
 * GNU General Public License for more details.
4589
12
 *
4590
13
 * You should have received a copy of the GNU General Public License
4591
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4592
15
 */
4593
16
4594
17
import QtQuick 2.4
4595
18
import Ubuntu.Components 1.3
4596
19
import "../Components"
4597
20
4598
21
ListView {
4599
22
    id: root
4600
23
    anchors.fill: parent
4601
24
    topMargin: units.gu(1)
4602
25
    bottomMargin: units.gu(1)
4603
26
    spacing: units.gu(1)
4604
27
    clip: true
4605
28
4606
29
    function getFirstAppId() {
4607
30
        return model.appId(0);
4608
31
    }
4609
32
}
4610
0
33
4611
=== modified file 'qml/Launcher/Launcher.qml'
4612
--- qml/Launcher/Launcher.qml	2016-09-22 10:14:18 +0000
4613
+++ qml/Launcher/Launcher.qml	2016-12-12 16:49:02 +0000
4614
@@ -19,18 +19,23 @@
4615
19
import Ubuntu.Components 1.3
19
import Ubuntu.Components 1.3
4616
20
import Ubuntu.Gestures 0.1
20
import Ubuntu.Gestures 0.1
4617
21
import Unity.Launcher 0.1
21
import Unity.Launcher 0.1
4618
22
import Utils 0.1 as Utils
4619
22
23
4620
23
FocusScope {
24
FocusScope {
4621
24
    id: root
25
    id: root
4622
25
26
4623
27
    readonly property int ignoreHideIfMouseOverLauncher: 1
4624
28
4625
26
    property bool autohideEnabled: false
29
    property bool autohideEnabled: false
4626
27
    property bool lockedVisible: false
30
    property bool lockedVisible: false
4627
28
    property bool available: true // can be used to disable all interactions
31
    property bool available: true // can be used to disable all interactions
4628
29
    property alias inverted: panel.inverted
32
    property alias inverted: panel.inverted
4629
33
    property Item blurSource: null
4630
34
    property int topPanelHeight: 0
4631
35
    property bool drawerEnabled: true
4632
30
36
4633
31
    property int panelWidth: units.gu(10)
37
    property int panelWidth: units.gu(10)
4634
32
    property int dragAreaWidth: units.gu(1)
38
    property int dragAreaWidth: units.gu(1)
4635
33
    property int minimizeDistance: units.gu(26)
4636
34
    property real progress: dragArea.dragging && dragArea.touchPosition.x > panelWidth ?
39
    property real progress: dragArea.dragging && dragArea.touchPosition.x > panelWidth ?
4637
35
                                (width * (dragArea.touchPosition.x-panelWidth) / (width - panelWidth)) : 0
40
                                (width * (dragArea.touchPosition.x-panelWidth) / (width - panelWidth)) : 0
4638
36
41
4639
@@ -43,13 +48,11 @@
4640
43
    readonly property alias shortcutHintsShown: panel.shortcutHintsShown
48
    readonly property alias shortcutHintsShown: panel.shortcutHintsShown
4641
44
49
4642
45
    readonly property bool shown: panel.x > -panel.width
50
    readonly property bool shown: panel.x > -panel.width
4643
51
    readonly property bool drawerShown: drawer.x == 0
4644
46
52
4645
47
    // emitted when an application is selected
53
    // emitted when an application is selected
4646
48
    signal launcherApplicationSelected(string appId)
54
    signal launcherApplicationSelected(string appId)
4647
49
55
4648
50
    // emitted when the apps dash should be shown because of a swipe gesture
4649
51
    signal dash()
4650
52
4651
53
    // emitted when the dash icon in the launcher has been tapped
56
    // emitted when the dash icon in the launcher has been tapped
4652
54
    signal showDashHome()
57
    signal showDashHome()
4653
55
58
4654
@@ -62,6 +65,9 @@
4655
62
    }
65
    }
4656
63
66
4657
64
    onSuperPressedChanged: {
67
    onSuperPressedChanged: {
4658
68
        if (state == "drawer")
4659
69
            return;
4660
70
4661
65
        if (superPressed) {
71
        if (superPressed) {
4662
66
            superPressTimer.start();
72
            superPressTimer.start();
4663
67
            superLongPressTimer.start();
73
            superLongPressTimer.start();
4664
@@ -102,7 +108,10 @@
4665
102
        }
108
        }
4666
103
    }
109
    }
4667
104
110
4669
105
    function hide() {
111
    function hide(flags) {
4670
112
        if ((flags & ignoreHideIfMouseOverLauncher) && Utils.Functions.itemUnderMouse(panel)) {
4671
113
            return;
4672
114
        }
4673
106
        switchToNextState("")
115
        switchToNextState("")
4674
107
    }
116
    }
4675
108
117
4676
@@ -132,7 +141,7 @@
4677
132
    }
141
    }
4678
133
142
4679
134
    function pushEdge(amount) {
143
    function pushEdge(amount) {
4681
135
        if (root.state === "") {
144
        if (root.state === "" || root.state == "visible" || root.state == "visibleTemporary") {
4682
136
            edgeBarrier.push(amount);
145
            edgeBarrier.push(amount);
4683
137
        }
146
        }
4684
138
    }
147
    }
4685
@@ -143,6 +152,22 @@
4686
143
        switchToNextState("visible")
152
        switchToNextState("visible")
4687
144
    }
153
    }
4688
145
154
4689
155
    function openDrawer(focusInputField) {
4690
156
        if (!drawerEnabled) {
4691
157
            return;
4692
158
        }
4693
159
4694
160
        panel.shortcutHintsShown = false;
4695
161
        superPressTimer.stop();
4696
162
        superLongPressTimer.stop();
4697
163
        root.focus = true;
4698
164
        drawer.focus = true;
4699
165
        if (focusInputField) {
4700
166
            drawer.focusInput();
4701
167
        }
4702
168
        switchToNextState("drawer")
4703
169
    }
4704
170
4705
146
    Keys.onPressed: {
171
    Keys.onPressed: {
4706
147
        switch (event.key) {
172
        switch (event.key) {
4707
148
        case Qt.Key_Backtab:
173
        case Qt.Key_Backtab:
4708
@@ -278,7 +303,7 @@
4709
278
    InverseMouseArea {
303
    InverseMouseArea {
4710
279
        id: closeMouseArea
304
        id: closeMouseArea
4711
280
        anchors.fill: panel
305
        anchors.fill: panel
4713
281
        enabled: root.state == "visible" && (!root.lockedVisible || panel.highlightIndex >= -1)
306
        enabled: root.state == "visible" || root.state == "drawer"
4714
282
        visible: enabled
307
        visible: enabled
4715
283
        onPressed: {
308
        onPressed: {
4716
284
            mouse.accepted = false;
309
            mouse.accepted = false;
4717
@@ -307,23 +332,61 @@
4718
307
        }
332
        }
4719
308
    }
333
    }
4720
309
334
4738
310
    EdgeBarrier {
335
    BackgroundBlur {
4739
311
        id: edgeBarrier
336
        id: backgroundBlur
4740
312
        edge: Qt.LeftEdge
337
        anchors.fill: parent
4741
313
        target: parent
338
        anchors.topMargin: root.inverted ? 0 : -root.topPanelHeight
4742
314
        enabled: root.available
339
        visible: root.blurSource && drawer.x > -drawer.width
4743
315
        onPassed: { root.switchToNextState("visibleTemporary"); }
340
        blurAmount: units.gu(6)
4744
316
        material: Component {
341
        sourceItem: root.blurSource
4745
317
            Item {
342
        blurRect: Qt.rect(panel.width,
4746
318
                Rectangle {
343
                          root.topPanelHeight,
4747
319
                    width: parent.height
344
                          drawer.width + drawer.x - panel.width,
4748
320
                    height: parent.width
345
                          height - root.topPanelHeight)
4749
321
                    rotation: -90
346
        cached: drawer.moving
4750
322
                    anchors.centerIn: parent
347
    }
4751
323
                    gradient: Gradient {
348
4752
324
                        GradientStop { position: 0.0; color: Qt.rgba(panel.color.r, panel.color.g, panel.color.b, .5)}
349
    Drawer {
4753
325
                        GradientStop { position: 1.0; color: Qt.rgba(panel.color.r,panel.color.g,panel.color.b,0)}
350
        id: drawer
4754
326
                    }
351
        objectName: "drawer"
4755
352
        anchors {
4756
353
            top: parent.top
4757
354
            topMargin: root.inverted ? root.topPanelHeight : 0
4758
355
            bottom: parent.bottom
4759
356
            right: parent.left
4760
357
        }
4761
358
        width: Math.min(root.width, units.gu(90)) * .9
4762
359
        panelWidth: panel.width
4763
360
        visible: x > -width
4764
361
4765
362
        Behavior on anchors.rightMargin {
4766
363
            enabled: !dragArea.dragging && !launcherDragArea.drag.active && panel.animate && !drawer.draggingHorizontally
4767
364
            NumberAnimation {
4768
365
                duration: 300
4769
366
                easing.type: Easing.OutCubic
4770
367
            }
4771
368
        }
4772
369
4773
370
        onApplicationSelected: {
4774
371
            root.hide();
4775
372
            root.launcherApplicationSelected(appId)
4776
373
            root.focus = false;
4777
374
        }
4778
375
4779
376
        Keys.onEscapePressed: {
4780
377
            switchToNextState("");
4781
378
            root.focus = false;
4782
379
        }
4783
380
4784
381
        onDragDistanceChanged: {
4785
382
            anchors.rightMargin = Math.max(-drawer.width, anchors.rightMargin + dragDistance);
4786
383
        }
4787
384
        onDraggingHorizontallyChanged: {
4788
385
            if (!draggingHorizontally) {
4789
386
                if (drawer.x < -units.gu(10)) {
4790
387
                    root.hide();
4791
388
                } else {
4792
389
                    root.openDrawer();
4793
327
                }
390
                }
4794
328
            }
391
            }
4795
329
        }
392
        }
4796
@@ -332,7 +395,7 @@
4797
332
    LauncherPanel {
395
    LauncherPanel {
4798
333
        id: panel
396
        id: panel
4799
334
        objectName: "launcherPanel"
397
        objectName: "launcherPanel"
4801
335
        enabled: root.available && root.state == "visible" || root.state == "visibleTemporary"
398
        enabled: root.available && (root.state == "visible" || root.state == "visibleTemporary" || root.state == "drawer")
4802
336
        width: root.panelWidth
399
        width: root.panelWidth
4803
337
        anchors {
400
        anchors {
4804
338
            top: parent.top
401
            top: parent.top
4805
@@ -359,11 +422,11 @@
4806
359
        property bool animate: true
422
        property bool animate: true
4807
360
423
4808
361
        onApplicationSelected: {
424
        onApplicationSelected: {
4810
362
            root.hide();
425
            root.hide(ignoreHideIfMouseOverLauncher);
4811
363
            launcherApplicationSelected(appId)
426
            launcherApplicationSelected(appId)
4812
364
        }
427
        }
4813
365
        onShowDashHome: {
428
        onShowDashHome: {
4815
366
            root.hide();
429
            root.hide(ignoreHideIfMouseOverLauncher);
4816
367
            root.showDashHome();
430
            root.showDashHome();
4817
368
        }
431
        }
4818
369
432
4819
@@ -394,6 +457,38 @@
4820
394
        }
457
        }
4821
395
    }
458
    }
4822
396
459
4823
460
    EdgeBarrier {
4824
461
        id: edgeBarrier
4825
462
        edge: Qt.LeftEdge
4826
463
        target: parent
4827
464
        enabled: root.available
4828
465
        onProgressChanged: {
4829
466
            if (progress > .5 && root.state != "visibleTemporary" && root.state != "drawer" && root.state != "visible") {
4830
467
                root.switchToNextState("visibleTemporary");
4831
468
            }
4832
469
        }
4833
470
        onPassed: {
4834
471
            if (root.drawerEnabled) {
4835
472
                root.switchToNextState("drawer");
4836
473
            }
4837
474
        }
4838
475
4839
476
        material: Component {
4840
477
            Item {
4841
478
                Rectangle {
4842
479
                    width: parent.height
4843
480
                    height: parent.width
4844
481
                    rotation: -90
4845
482
                    anchors.centerIn: parent
4846
483
                    gradient: Gradient {
4847
484
                        GradientStop { position: 0.0; color: Qt.rgba(panel.color.r, panel.color.g, panel.color.b, .5)}
4848
485
                        GradientStop { position: 1.0; color: Qt.rgba(panel.color.r,panel.color.g,panel.color.b,0)}
4849
486
                    }
4850
487
                }
4851
488
            }
4852
489
        }
4853
490
    }
4854
491
4855
397
    SwipeArea {
492
    SwipeArea {
4856
398
        id: dragArea
493
        id: dragArea
4857
399
        objectName: "launcherDragArea"
494
        objectName: "launcherDragArea"
4858
@@ -405,25 +500,62 @@
4859
405
        width: root.dragAreaWidth
500
        width: root.dragAreaWidth
4860
406
        height: root.height
501
        height: root.height
4861
407
502
4862
503
        function easeInOutCubic(t) { return t<.5 ? 4*t*t*t : (t-1)*(2*t-2)*(2*t-2)+1 }
4863
504
4864
505
        property var lastDragPoints: []
4865
506
4866
507
        function dragDirection() {
4867
508
            if (lastDragPoints.length < 5) {
4868
509
                return "unknown";
4869
510
            }
4870
511
4871
512
            var toRight = true;
4872
513
            var toLeft = true;
4873
514
            for (var i = lastDragPoints.length - 5; i < lastDragPoints.length; i++) {
4874
515
                if (toRight && lastDragPoints[i] < lastDragPoints[i-1]) {
4875
516
                    toRight = false;
4876
517
                }
4877
518
                if (toLeft && lastDragPoints[i] > lastDragPoints[i-1]) {
4878
519
                    toLeft = false;
4879
520
                }
4880
521
            }
4881
522
            return toRight ? "right" : toLeft ? "left" : "unknown";
4882
523
        }
4883
524
4884
408
        onDistanceChanged: {
525
        onDistanceChanged: {
4887
409
            if (!dragging || launcher.state == "visible")
526
            if (dragging && launcher.state != "visible" && launcher.state != "drawer") {
4888
410
                return;
527
                panel.x = -panel.width + Math.min(Math.max(0, distance), panel.width);
4889
528
            }
4890
411
529
4892
412
            panel.x = -panel.width + Math.min(Math.max(0, distance), panel.width);
530
            if (root.drawerEnabled && dragging && launcher.state != "drawer") {
4893
531
                lastDragPoints.push(distance)
4894
532
                var drawerHintDistance = panel.width + units.gu(1)
4895
533
                if (distance < drawerHintDistance) {
4896
534
                    drawer.anchors.rightMargin = -Math.min(Math.max(0, distance), drawer.width);
4897
535
                } else {
4898
536
                    var linearDrawerX = Math.min(Math.max(0, distance - drawerHintDistance), drawer.width);
4899
537
                    var linearDrawerProgress = linearDrawerX / (drawer.width)
4900
538
                    var easedDrawerProgress = easeInOutCubic(linearDrawerProgress);
4901
539
                    drawer.anchors.rightMargin = -(drawerHintDistance + easedDrawerProgress * (drawer.width - drawerHintDistance));
4902
540
                }
4903
541
            }
4904
413
        }
542
        }
4905
414
543
4906
415
        onDraggingChanged: {
544
        onDraggingChanged: {
4907
416
            if (!dragging) {
545
            if (!dragging) {
4908
417
                if (distance > panel.width / 2) {
546
                if (distance > panel.width / 2) {
4912
418
                    root.switchToNextState("visible")
547
                    if (root.drawerEnabled && distance > panel.width * 3 && dragDirection() !== "left") {
4913
419
                    if (distance > minimizeDistance) {
548
                        root.switchToNextState("drawer");
4914
420
                        root.dash();
549
                        root.focus = true;
4915
550
                    } else {
4916
551
                        root.switchToNextState("visible");
4917
421
                    }
552
                    }
4918
422
                } else if (root.state === "") {
553
                } else if (root.state === "") {
4919
423
                    // didn't drag far enough. rollback
554
                    // didn't drag far enough. rollback
4921
424
                    root.switchToNextState("")
555
                    root.switchToNextState("");
4922
425
                }
556
                }
4923
426
            }
557
            }
4924
558
            lastDragPoints = [];
4925
427
        }
559
        }
4926
428
    }
560
    }
4927
429
561
4928
@@ -434,6 +566,10 @@
4929
434
                target: panel
566
                target: panel
4930
435
                x: -root.panelWidth
567
                x: -root.panelWidth
4931
436
            }
568
            }
4932
569
            PropertyChanges {
4933
570
                target: drawer
4934
571
                anchors.rightMargin: 0
4935
572
            }
4936
437
        },
573
        },
4937
438
        State {
574
        State {
4938
439
            name: "visible"
575
            name: "visible"
4939
@@ -441,6 +577,18 @@
4940
441
                target: panel
577
                target: panel
4941
442
                x: -root.x // so we never go past panelWidth, even when teased by tutorial
578
                x: -root.x // so we never go past panelWidth, even when teased by tutorial
4942
443
            }
579
            }
4943
580
            PropertyChanges {
4944
581
                target: drawer
4945
582
                anchors.rightMargin: 0
4946
583
            }
4947
584
        },
4948
585
        State {
4949
586
            name: "drawer"
4950
587
            extend: "visible"
4951
588
            PropertyChanges {
4952
589
                target: drawer
4953
590
                anchors.rightMargin: -drawer.width + root.x // so we never go past panelWidth, even when teased by tutorial
4954
591
            }
4955
444
        },
592
        },
4956
445
        State {
593
        State {
4957
446
            name: "visibleTemporary"
594
            name: "visibleTemporary"
4958
447
595
4959
=== added file 'qml/Launcher/MoreAppsHeader.qml'
4960
--- qml/Launcher/MoreAppsHeader.qml	1970-01-01 00:00:00 +0000
4961
+++ qml/Launcher/MoreAppsHeader.qml	2016-12-12 16:49:02 +0000
4962
@@ -0,0 +1,46 @@
4963
1
import QtQuick 2.4
4964
2
import Ubuntu.Components 1.3
4965
3
4966
4
AbstractButton {
4967
5
    id: root
4968
6
4969
7
    onClicked: {
4970
8
        // TODO: Make this point to the snappy store as soon as we stop landing to vivid
4971
9
        Qt.openUrlExternally("scope://com.canonical.scopes.clickstore")
4972
10
    }
4973
11
4974
12
    UbuntuShape {
4975
13
        width: parent.width
4976
14
        height: parent.height - units.gu(1)
4977
15
        color: "#20ffffff"
4978
16
        aspect: UbuntuShape.Flat
4979
17
4980
18
        Row {
4981
19
            anchors.fill: parent
4982
20
            anchors.margins: units.gu(1)
4983
21
            spacing: units.gu(1)
4984
22
4985
23
            Icon {
4986
24
                height: units.gu(2.2)
4987
25
                width: height
4988
26
                name: "stock_application"
4989
27
                anchors.verticalCenter: parent.verticalCenter
4990
28
                color: "white"
4991
29
            }
4992
30
4993
31
            Label {
4994
32
                text: i18n.tr("More apps in the store")
4995
33
                anchors.verticalCenter: parent.verticalCenter
4996
34
                fontSize: "small"
4997
35
            }
4998
36
4999
37
            Icon {
5000
38
                height: units.gu(2.5)
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2016-11-30	Needs Fixing on 2016-12-07
Lukáš Tinkl (community)		2016-11-30	Approve on 2016-12-07
Emanuele Antonio Faraone (community)			Approve on 2016-12-05
Michael Zanetti		2016-11-30	Pending
Review via email: mp+312194@code.launchpad.net