1
=== modified file 'src/UbuntuToolkit/UbuntuToolkit.pro'
2
--- src/UbuntuToolkit/UbuntuToolkit.pro	2016-11-04 09:37:32 +0000
3
+++ src/UbuntuToolkit/UbuntuToolkit.pro	2017-01-12 02:42:37 +0000
4
@@ -106,6 +106,8 @@
5
106
    $$PWD/uclistitemstyle_p.h \
106
    $$PWD/uclistitemstyle_p.h \
6
107
    $$PWD/ucmainviewbase_p.h \
107
    $$PWD/ucmainviewbase_p.h \
7
108
    $$PWD/ucmainviewbase_p_p.h \
108
    $$PWD/ucmainviewbase_p_p.h \
8
109
    $$PWD/ucmainwindow_p.h \
9
110
    $$PWD/ucmainwindow_p_p.h \
10
109
    $$PWD/ucmargins_p.h \
111
    $$PWD/ucmargins_p.h \
11
110
    $$PWD/ucmathutils_p.h \
112
    $$PWD/ucmathutils_p.h \
12
111
    $$PWD/ucmouse_p.h \
113
    $$PWD/ucmouse_p.h \
13
@@ -203,6 +205,7 @@
14
203
    $$PWD/uclistitemlayout.cpp \
205
    $$PWD/uclistitemlayout.cpp \
15
204
    $$PWD/uclistitemstyle.cpp \
206
    $$PWD/uclistitemstyle.cpp \
16
205
    $$PWD/ucmainviewbase.cpp \
207
    $$PWD/ucmainviewbase.cpp \
17
208
    $$PWD/ucmainwindow.cpp \
18
206
    $$PWD/ucmathutils.cpp \
209
    $$PWD/ucmathutils.cpp \
19
207
    $$PWD/ucmousefilters.cpp \
210
    $$PWD/ucmousefilters.cpp \
20
208
    $$PWD/ucpagetreenode.cpp \
211
    $$PWD/ucpagetreenode.cpp \
21
209
212
22
=== modified file 'src/UbuntuToolkit/ubuntutoolkitmodule.cpp'
23
--- src/UbuntuToolkit/ubuntutoolkitmodule.cpp	2016-09-29 10:19:06 +0000
24
+++ src/UbuntuToolkit/ubuntutoolkitmodule.cpp	2017-01-12 02:42:37 +0000
25
@@ -39,6 +39,7 @@
26
39
#include "inversemouseareatype_p.h"
39
#include "inversemouseareatype_p.h"
27
40
#include "listener_p.h"
40
#include "listener_p.h"
28
41
#include "livetimer_p.h"
41
#include "livetimer_p.h"
29
42
#include "ucmainwindow_p.h"
30
42
#include "menu_p.h"
43
#include "menu_p.h"
31
43
#include "menubar_p.h"
44
#include "menubar_p.h"
32
44
#include "menugroup_p.h"
45
#include "menugroup_p.h"
33
@@ -439,6 +440,7 @@
34
439
    qmlRegisterType<SplitView>(uri, 1, 0, "SplitView");
440
    qmlRegisterType<SplitView>(uri, 1, 0, "SplitView");
35
440
    qmlRegisterType<SplitViewLayout>(uri, 1, 0, "SplitViewLayout");
441
    qmlRegisterType<SplitViewLayout>(uri, 1, 0, "SplitViewLayout");
36
441
    qmlRegisterType<ViewColumn>(uri, 1, 0, "ViewColumn");
442
    qmlRegisterType<ViewColumn>(uri, 1, 0, "ViewColumn");
37
443
    qmlRegisterType<UCMainWindow>(uri, 1, 0, "MainWindow");
38
442
    qmlRegisterType<Menu>(uri, 1, 0, "Menu");
444
    qmlRegisterType<Menu>(uri, 1, 0, "Menu");
39
443
    qmlRegisterType<MenuBar>(uri, 1, 0, "MenuBar");
445
    qmlRegisterType<MenuBar>(uri, 1, 0, "MenuBar");
40
444
    qmlRegisterType<MenuGroup>(uri, 1, 0, "MenuGroup");
446
    qmlRegisterType<MenuGroup>(uri, 1, 0, "MenuGroup");
41
445
447
42
=== modified file 'src/UbuntuToolkit/ucmainviewbase.cpp'
43
--- src/UbuntuToolkit/ucmainviewbase.cpp	2016-09-12 09:03:50 +0000
44
+++ src/UbuntuToolkit/ucmainviewbase.cpp	2017-01-12 02:42:37 +0000
45
@@ -145,6 +145,7 @@
46
145
void UCMainViewBase::setApplicationName(QString applicationName)
145
void UCMainViewBase::setApplicationName(QString applicationName)
47
146
{
146
{
48
147
    Q_D(UCMainViewBase);
147
    Q_D(UCMainViewBase);
49
148
50
148
    if (d->m_applicationName == applicationName)
149
    if (d->m_applicationName == applicationName)
51
149
        return;
150
        return;
52
150
151
53
151
152
54
=== added file 'src/UbuntuToolkit/ucmainwindow.cpp'
55
--- src/UbuntuToolkit/ucmainwindow.cpp	1970-01-01 00:00:00 +0000
56
+++ src/UbuntuToolkit/ucmainwindow.cpp	2017-01-12 02:42:37 +0000
57
@@ -0,0 +1,215 @@
58
1
/*
59
2
 * Copyright 2016 Canonical Ltd.
60
3
 *
61
4
 * This program is free software; you can redistribute it and/or modify
62
5
 * it under the terms of the GNU Lesser General Public License as published by
63
6
 * the Free Software Foundation; version 3.
64
7
 *
65
8
 * This program is distributed in the hope that it will be useful,
66
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
67
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
68
11
 * GNU Lesser General Public License for more details.
69
12
 *
70
13
 * You should have received a copy of the GNU Lesser General Public License
71
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
72
15
 */
73
16
74
17
#include "ucmainwindow_p_p.h"
75
18
76
19
#include <QtCore/QCoreApplication>
77
20
78
21
#include "ucactionmanager_p.h"
79
22
#include "ucactioncontext_p.h"
80
23
#include "ucapplication_p.h"
81
24
#include "uctheme_p.h"
82
25
#include "i18n_p.h"
83
26
#include "quickutils_p.h"
84
27
85
28
UT_NAMESPACE_BEGIN
86
29
87
30
/*!
88
31
  \internal
89
32
  \qmlabstract MainWindow
90
33
  \inqmlmodule Ubuntu.Components.Labs
91
34
  \ingroup ubuntu
92
35
  \brief MainWindow is an alternate window-based root Item providing \l units
93
36
  and \l i18n as native properties, an \ actionContext and an \l applicationName.
94
37
  Unlike \l MainView there is no built-in header.
95
38
96
39
  The simplest way to use a MainWindow is to include a single \l Page object:
97
40
  \qml
98
41
      import QtQuick 2.4
99
42
      import Ubuntu.Components 1.3
100
43
      import Ubuntu.Components.Labs 1.3
101
44
102
45
      MainWindow {
103
46
          minimumWidth: units.gu(48)
104
47
          minimumHeight: units.gu(60)
105
48
106
49
          Page {
107
50
	      anchors.fill: parent
108
51
              header: PageHeader {
109
52
                  title: "Simple page"
110
53
              }
111
54
              Button {
112
55
                  anchors {
113
56
                      horizontalCenter: parent.horizontalCenter
114
57
                      top: pageHeader.bottom
115
58
                      topMargin: units.gu(5)
116
59
                  }
117
60
                  width: units.gu(15)
118
61
                  text: "Push me"
119
62
                  onClicked: print("Click!")
120
63
              }
121
64
          }
122
65
      }
123
66
  \endqml
124
67
  Anchors need to be set, there's no automatic fill like with \l MainView.
125
68
126
69
  Do not include multiple Pages directly, but use \l AdaptivePageLayout
127
70
  inside MainWindow to navigate between several Pages.
128
71
129
72
  If the \l Page inside the MainWindow includes a Flickable, set the flickable property of
130
73
  the PageHeader to automatically hide and show the header when the user scrolls up or down:
131
74
  \qml
132
75
      import QtQuick 2.4
133
76
      import Ubuntu.Components 1.3
134
77
      import Ubuntu.Components.Labs 1.3
135
78
136
79
      MainWindow {
137
80
          minimumWidth: units.gu(48)
138
81
          maximumHeight: units.gu(60)
139
82
140
83
          Page {
141
84
              anchors.fill: parent
142
85
              header: PageHeader {
143
86
                  title: "Page with Flickable"
144
87
                  flickable: myFlickable
145
88
              }
146
89
147
90
              Flickable {
148
91
                  id: myFlickable
149
92
                  anchors.fill: parent
150
93
                  contentHeight: column.height
151
94
152
95
                  Column {
153
96
                      id: column
154
97
                      Repeater {
155
98
                          model: 100
156
99
                          Label {
157
100
                              text: "line "+index
158
101
                          }
159
102
                      }
160
103
                  }
161
104
              }
162
105
          }
163
106
      }
164
107
  \endqml
165
108
  The same header behavior is automatic when using a ListView instead of a Flickable in the above
166
109
  example.
167
110
168
111
  The examples above show how to include a single \l Page inside a MainWindow, but more
169
112
  advanced application structures are possible using \l AdaptivePageLayout.
170
113
**/
171
114
UCMainWindowPrivate::UCMainWindowPrivate()
172
115
    : m_actionContext(nullptr),
173
116
      m_units(nullptr)
174
117
{
175
118
}
176
119
177
120
void UCMainWindowPrivate::init()
178
121
{
179
122
    Q_Q(UCMainWindow);
180
123
181
124
    //need to init here because the q pointer is null in constructor
182
125
    m_actionContext = new UCPopupContext(q);
183
126
184
127
    m_actionContext->setObjectName(QStringLiteral("RootContext"));
185
128
    m_actionContext->setActive(true);
186
129
}
187
130
188
131
UCMainWindow::UCMainWindow(QWindow *parent)
189
132
    : QQuickWindow(*(new UCMainWindowPrivate), parent)
190
133
{
191
134
    d_func()->init();
192
135
193
136
    QObject::connect(UbuntuI18n::instance(this), SIGNAL(domainChanged()),
194
137
                     this, SIGNAL(i18nChanged()));
195
138
    QObject::connect(UbuntuI18n::instance(this), SIGNAL(languageChanged()),
196
139
                     this, SIGNAL(i18nChanged()));
197
140
}
198
141
199
142
/*!
200
143
  \qmlproperty string MainWindow::applicationName
201
144
202
145
  The property holds the application's name, which must be the same as the
203
146
  desktop file's name.
204
147
  The name also sets the name of the QCoreApplication and defaults for data
205
148
  and cache folders that work on the desktop and under confinement, as well as
206
149
  the default gettext domain.
207
150
  C++ code that writes files may use QStandardPaths::writableLocation with
208
151
  QStandardPaths::DataLocation or QStandardPaths::CacheLocation.
209
152
*/
210
153
QString UCMainWindow::applicationName() const
211
154
{
212
155
    return d_func()->m_applicationName;
213
156
}
214
157
215
158
void UCMainWindow::setApplicationName(QString applicationName)
216
159
{
217
160
    Q_D(UCMainWindow);
218
161
219
162
    if (d->m_applicationName == applicationName)
220
163
        return;
221
164
222
165
    d->m_applicationName = applicationName;
223
166
224
167
    if (applicationName != QStringLiteral("")) {
225
168
        UbuntuI18n::instance()->setDomain(applicationName);
226
169
        UCApplication::instance()->setApplicationName(applicationName);
227
170
    }
228
171
    Q_EMIT applicationNameChanged(applicationName);
229
172
}
230
173
231
174
/*!
232
175
  \qmlproperty Units MainWindow::units
233
176
234
177
  Grid units for this particular window - unlike the global context property
235
178
  by the same name.
236
179
*/
237
180
UCUnits* UCMainWindow::units()
238
181
{
239
182
    Q_D(UCMainWindow);
240
183
241
184
    if (!d->m_units) {
242
185
        d->m_units = new UCUnits(this);
243
186
        QObject::connect(d->m_units, SIGNAL(gridUnitChanged()),
244
187
                         this, SIGNAL(unitsChanged()));
245
188
    }
246
189
    return d->m_units;
247
190
}
248
191
249
192
/*!
250
193
  \qmlproperty Units MainWindow::i18n
251
194
252
195
  The property holds its breath for documentation.
253
196
*/
254
197
UbuntuI18n* UCMainWindow::i18n() const
255
198
{
256
199
    return UbuntuI18n::instance();
257
200
}
258
201
259
202
/*!
260
203
  \qmlproperty ActionContext MainWindow::actionContext
261
204
  \readonly
262
205
  \since Ubuntu.Components 1.3
263
206
  The action context of the MainWindow.
264
207
  */
265
208
UCPopupContext *UCMainWindow::actionContext() const
266
209
{
267
210
    return d_func()->m_actionContext;
268
211
}
269
212
270
213
UT_NAMESPACE_END
271
214
272
215
#include "moc_ucmainwindow_p.cpp"
273
0
216
274
=== added file 'src/UbuntuToolkit/ucmainwindow_p.h'
275
--- src/UbuntuToolkit/ucmainwindow_p.h	1970-01-01 00:00:00 +0000
276
+++ src/UbuntuToolkit/ucmainwindow_p.h	2017-01-12 02:42:37 +0000
277
@@ -0,0 +1,73 @@
278
1
/*
279
2
 * Copyright 2016 Canonical Ltd.
280
3
 *
281
4
 * This program is free software; you can redistribute it and/or modify
282
5
 * it under the terms of the GNU Lesser General Public License as published by
283
6
 * the Free Software Foundation; version 3.
284
7
 *
285
8
 * This program is distributed in the hope that it will be useful,
286
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
287
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
288
11
 * GNU Lesser General Public License for more details.
289
12
 *
290
13
 * You should have received a copy of the GNU Lesser General Public License
291
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
292
15
 */
293
16
294
17
#ifndef UCMAINWINDOW_P_H
295
18
#define UCMAINWINDOW_P_H
296
19
297
20
#include <QtQuick/QQuickWindow>
298
21
299
22
#include <UbuntuToolkit/private/i18n_p.h>
300
23
#include <UbuntuToolkit/private/ucunits_p.h>
301
24
302
25
UT_NAMESPACE_BEGIN
303
26
304
27
class UCMainWindowPrivate;
305
28
class UCPopupContext;
306
29
class UCAction;
307
30
308
31
class UBUNTUTOOLKIT_EXPORT UCMainWindow : public QQuickWindow
309
32
{
310
33
    Q_OBJECT
311
34
    Q_PROPERTY(QString applicationName READ applicationName WRITE setApplicationName NOTIFY applicationNameChanged)
312
35
#ifndef Q_QDOC
313
36
    Q_PROPERTY(UT_PREPEND_NAMESPACE(UCUnits)* units READ units NOTIFY unitsChanged)
314
37
    Q_PROPERTY(UT_PREPEND_NAMESPACE(UbuntuI18n)* i18n READ i18n NOTIFY i18nChanged)
315
38
    Q_PROPERTY(UT_PREPEND_NAMESPACE(UCPopupContext)* actionContext READ actionContext NOTIFY actionContextChanged)
316
39
#else
317
40
    Q_PROPERTY(UCUnits* units READ units NOTIFY unitsChanged)
318
41
    Q_PROPERTY(UbuntuI18n* i18n READ i18n NOTIFY i18nChanged)
319
42
    Q_PROPERTY(UCPopupContext* actionContext READ actionContext NOTIFY actionContextChanged)
320
43
#endif
321
44
322
45
public:
323
46
    UCMainWindow(QWindow *parent = nullptr);
324
47
325
48
326
49
    QString applicationName() const;
327
50
    void setApplicationName(QString applicationName);
328
51
329
52
    UCUnits* units();
330
53
    UbuntuI18n* i18n() const;
331
54
332
55
    UCPopupContext* actionContext() const;
333
56
334
57
Q_SIGNALS:
335
58
    void applicationNameChanged(QString applicationName);
336
59
    void i18nChanged();
337
60
    void unitsChanged();
338
61
#ifndef Q_QDOC
339
62
    void actionContextChanged(UT_PREPEND_NAMESPACE(UCPopupContext)* actionContext);
340
63
#else
341
64
    void actionContextChanged(UCPopupContext* actionContext);
342
65
#endif
343
66
344
67
private:
345
68
    Q_DECLARE_PRIVATE(UCMainWindow)
346
69
};
347
70
348
71
UT_NAMESPACE_END
349
72
350
73
#endif // UCMAINWINDOW_P_H
351
0
74
352
=== added file 'src/UbuntuToolkit/ucmainwindow_p_p.h'
353
--- src/UbuntuToolkit/ucmainwindow_p_p.h	1970-01-01 00:00:00 +0000
354
+++ src/UbuntuToolkit/ucmainwindow_p_p.h	2017-01-12 02:42:37 +0000
355
@@ -0,0 +1,47 @@
356
1
/*
357
2
 * Copyright 2016 Canonical Ltd.
358
3
 *
359
4
 * This program is free software; you can redistribute it and/or modify
360
5
 * it under the terms of the GNU Lesser General Public License as published by
361
6
 * the Free Software Foundation; version 3.
362
7
 *
363
8
 * This program is distributed in the hope that it will be useful,
364
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
365
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
366
11
 * GNU Lesser General Public License for more details.
367
12
 *
368
13
 * You should have received a copy of the GNU Lesser General Public License
369
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
370
15
 */
371
16
372
17
#ifndef UCMAINWINDOW_P_P_H
373
18
#define UCMAINWINDOW_P_P_H
374
19
375
20
#include <UbuntuToolkit/private/ucmainwindow_p.h>
376
21
377
22
#include <QtQml/QQmlProperty>
378
23
379
24
#include <QtQuick/private/qquickwindow_p.h>
380
25
381
26
UT_NAMESPACE_BEGIN
382
27
383
28
class UCMainWindow;
384
29
class UCPopupContext;
385
30
386
31
class UCMainWindowPrivate : public QQuickWindowPrivate
387
32
{
388
33
    Q_DECLARE_PUBLIC(UCMainWindow)
389
34
390
35
public:
391
36
    UCMainWindowPrivate();
392
37
    void init();
393
38
394
39
    QString m_applicationName;
395
40
    UCPopupContext* m_actionContext = nullptr;
396
41
    UCUnits* m_units = nullptr;
397
42
398
43
};
399
44
400
45
UT_NAMESPACE_END
401
46
402
47
#endif // UCMAINWINDOW_P_P_H
403
0
48
404
=== modified file 'src/UbuntuToolkit/ucunits.cpp'
405
--- src/UbuntuToolkit/ucunits.cpp	2016-09-12 09:03:50 +0000
406
+++ src/UbuntuToolkit/ucunits.cpp	2017-01-12 02:42:37 +0000
407
@@ -97,18 +97,44 @@
408
97
 * isolated from Qt's own scaling concept.
97
 * isolated from Qt's own scaling concept.
409
98
 */
98
 */
410
99
99
411
100
UCUnits::UCUnits(QWindow *parent) :
412
101
    QObject(parent),
413
102
    m_devicePixelRatio(parent->devicePixelRatio())
414
103
{
415
104
    m_gridUnit = getenvFloat(ENV_GRID_UNIT_PX, DEFAULT_GRID_UNIT_PX * m_devicePixelRatio);
416
105
    QObject::connect(parent, &QWindow::screenChanged,
417
106
                     this, &UCUnits::screenChanged);
418
107
    m_screen = parent->screen();
419
108
    if (m_screen)
420
109
        QObject::connect(m_screen, &QScreen::physicalDotsPerInchChanged,
421
110
                         this, &UCUnits::devicePixelRatioChanged);
422
111
}
423
112
424
113
void UCUnits::screenChanged(QScreen *screen)
425
114
{
426
115
    if (m_screen)
427
116
        QObject::disconnect(m_screen, &QScreen::physicalDotsPerInchChanged,
428
117
                            this, &UCUnits::devicePixelRatioChanged);
429
118
    m_screen = screen;
430
119
    QObject::connect(m_screen, &QScreen::physicalDotsPerInchChanged,
431
120
                     this, &UCUnits::devicePixelRatioChanged);
432
121
    m_devicePixelRatio = screen->devicePixelRatio();
433
122
    setGridUnit(DEFAULT_GRID_UNIT_PX * m_devicePixelRatio);
434
123
}
435
124
436
125
void UCUnits::devicePixelRatioChanged(qreal dpi)
437
126
{
438
127
    m_devicePixelRatio = dpi;
439
128
    setGridUnit(DEFAULT_GRID_UNIT_PX * m_devicePixelRatio);
440
129
}
441
130
442
100
UCUnits *UCUnits::m_units = nullptr;
131
UCUnits *UCUnits::m_units = nullptr;
443
101
132
444
102
UCUnits::UCUnits(QObject *parent) :
133
UCUnits::UCUnits(QObject *parent) :
445
103
    QObject(parent),
134
    QObject(parent),
446
104
    m_devicePixelRatio(qGuiApp->devicePixelRatio())
135
    m_devicePixelRatio(qGuiApp->devicePixelRatio())
447
105
{
136
{
454
106
    // If GRID_UNIT_PX set, always use it. If not, 1GU := DEFAULT_GRID_UNIT_PX * m_devicePixelRatio
137
    m_gridUnit = getenvFloat(ENV_GRID_UNIT_PX, DEFAULT_GRID_UNIT_PX * m_devicePixelRatio);
449
107
    if (qEnvironmentVariableIsSet(ENV_GRID_UNIT_PX)) {
450
108
        m_gridUnit = getenvFloat(ENV_GRID_UNIT_PX, DEFAULT_GRID_UNIT_PX);
451
109
    } else {
452
110
        m_gridUnit = DEFAULT_GRID_UNIT_PX * m_devicePixelRatio;
453
111
    }
455
112
138
456
113
    auto nativeInterface = qGuiApp->platformNativeInterface();
139
    auto nativeInterface = qGuiApp->platformNativeInterface();
457
114
    if (nativeInterface) {
140
    if (nativeInterface) {
458
115
141
459
=== modified file 'src/UbuntuToolkit/ucunits_p.h'
460
--- src/UbuntuToolkit/ucunits_p.h	2016-09-09 17:49:07 +0000
461
+++ src/UbuntuToolkit/ucunits_p.h	2017-01-12 02:42:37 +0000
462
@@ -23,6 +23,7 @@
463
23
#include <QtCore/QObject>
23
#include <QtCore/QObject>
464
24
#include <QtCore/QString>
24
#include <QtCore/QString>
465
25
#include <QtCore/QUrl>
25
#include <QtCore/QUrl>
466
26
#include <QtGui/QWindow>
467
26
27
468
27
#include <UbuntuToolkit/ubuntutoolkitglobal.h>
28
#include <UbuntuToolkit/ubuntutoolkitglobal.h>
469
28
29
470
@@ -48,6 +49,7 @@
471
48
    }
49
    }
472
49
50
473
50
    explicit UCUnits(QObject *parent = 0);
51
    explicit UCUnits(QObject *parent = 0);
474
52
    explicit UCUnits(QWindow *parent);
475
51
    ~UCUnits();
53
    ~UCUnits();
476
52
    Q_INVOKABLE float dp(float value);
54
    Q_INVOKABLE float dp(float value);
477
53
    Q_INVOKABLE float gu(float value);
55
    Q_INVOKABLE float gu(float value);
478
@@ -68,10 +70,13 @@
479
68
70
480
69
private Q_SLOTS:
71
private Q_SLOTS:
481
70
    void windowPropertyChanged(QPlatformWindow *window, const QString &propertyName);
72
    void windowPropertyChanged(QPlatformWindow *window, const QString &propertyName);
482
73
    void screenChanged(QScreen *screen);
483
74
    void devicePixelRatioChanged(qreal dpi);
484
71
75
485
72
private:
76
private:
486
73
    static UCUnits *m_units;
77
    static UCUnits *m_units;
487
74
    float m_devicePixelRatio;
78
    float m_devicePixelRatio;
488
79
    QScreen *m_screen;
489
75
    float m_gridUnit;
80
    float m_gridUnit;
490
76
};
81
};
491
77
82
492
78
83
493
=== renamed file 'tests/autopilot/ubuntuuitoolkit/tests/test_launcher.window.qml' => 'tests/autopilot/ubuntuuitoolkit/tests/test_launcher.mainwindow.qml'
494
--- tests/autopilot/ubuntuuitoolkit/tests/test_launcher.window.qml	2016-07-12 12:05:11 +0000
495
+++ tests/autopilot/ubuntuuitoolkit/tests/test_launcher.mainwindow.qml	2017-01-12 02:42:37 +0000
496
@@ -17,23 +17,30 @@
497
17
import QtQuick 2.4
17
import QtQuick 2.4
498
18
import QtQuick.Window 2.2 // Not Ubuntu.Test
18
import QtQuick.Window 2.2 // Not Ubuntu.Test
499
19
import Ubuntu.Components 1.3
19
import Ubuntu.Components 1.3
500
20
import Ubuntu.Components.Labs 1.3
501
20
21
504
21
Window {
22
MainWindow {
505
22
    title: "Hello World"
23
    title: i18n.tr("Hello World")
506
23
    minimumWidth: units.gu(30)
24
    minimumWidth: units.gu(30)
507
24
    minimumHeight: units.gu(50)
25
    minimumHeight: units.gu(50)
508
25
    maximumWidth: units.gu(90)
26
    maximumWidth: units.gu(90)
509
26
    maximumHeight: units.gu(120)
27
    maximumHeight: units.gu(120)
511
27
    MainView {
28
512
29
    Item {
513
30
        anchors.fill: parent
514
28
        objectName: "mainView"
31
        objectName: "mainView"
515
29
32
516
30
        Page {
33
        Page {
518
31
            title: "Launcher/Window"
34
            anchors.fill: parent
519
35
            header: PageHeader {
520
36
                title: "Launcher/Window"
521
37
            }
522
32
38
523
33
            Column {
39
            Column {
524
40
                anchors.top: parent.header.bottom
525
34
                Label {
41
                Label {
526
35
                    objectName: "label"
42
                    objectName: "label"
528
36
                    text: "Lorem ipsum dolor sit amet"
43
                    text: i18n.tr("Lorem ipsum dolor sit amet")
529
37
                    width: units.gu(25)
44
                    width: units.gu(25)
530
38
                    height: units.gu(25)
45
                    height: units.gu(25)
531
39
                }
46
                }
532
40
47
533
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_launcher.py'
534
--- tests/autopilot/ubuntuuitoolkit/tests/test_launcher.py	2016-07-12 12:05:11 +0000
535
+++ tests/autopilot/ubuntuuitoolkit/tests/test_launcher.py	2017-01-12 02:42:37 +0000
536
@@ -49,6 +49,18 @@
537
49
                        Eventually(Equals("Lorem ipsum dolor sit amet")))
49
                        Eventually(Equals("Lorem ipsum dolor sit amet")))
538
50
50
539
51
51
540
52
class LauncherMainWindowTestCase(tests.QMLFileAppTestCase):
541
53
    path = os.path.abspath(__file__)
542
54
    dir_path = os.path.dirname(path)
543
55
    test_qml_file_path = os.path.join(
544
56
        dir_path, 'test_launcher.mainwindow.qml')
545
57
546
58
    def test_window_root_item(self):
547
59
        label = self.main_view.select_single(objectName="label")
548
60
        self.assertThat(label.text,
549
61
                        Eventually(Equals("Lorem ipsum dolor sit amet")))
550
62
551
63
552
52
class LauncherQtTestTestCase(tests.QMLFileAppTestCase):
64
class LauncherQtTestTestCase(tests.QMLFileAppTestCase):
553
53
    path = os.path.abspath(__file__)
65
    path = os.path.abspath(__file__)
554
54
    dir_path = os.path.dirname(path)
66
    dir_path = os.path.dirname(path)
555
55
67
556
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/test_launcher.window.qml'
557
--- tests/autopilot/ubuntuuitoolkit/tests/test_launcher.window.qml	1970-01-01 00:00:00 +0000
558
+++ tests/autopilot/ubuntuuitoolkit/tests/test_launcher.window.qml	2017-01-12 02:42:37 +0000
559
@@ -0,0 +1,43 @@
560
1
/*
561
2
 * Copyright 2014-2016 Canonical Ltd.
562
3
 *
563
4
 * This program is free software; you can redistribute it and/or modify
564
5
 * it under the terms of the GNU Lesser General Public License as published by
565
6
 * the Free Software Foundation; version 3.
566
7
 *
567
8
 * This program is distributed in the hope that it will be useful,
568
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
569
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
570
11
 * GNU Lesser General Public License for more details.
571
12
 *
572
13
 * You should have received a copy of the GNU Lesser General Public License
573
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
574
15
 */
575
16
576
17
import QtQuick 2.4
577
18
import QtQuick.Window 2.2 // Not Ubuntu.Test
578
19
import Ubuntu.Components 1.3
579
20
580
21
Window {
581
22
    title: "Hello World"
582
23
    minimumWidth: units.gu(30)
583
24
    minimumHeight: units.gu(50)
584
25
    maximumWidth: units.gu(90)
585
26
    maximumHeight: units.gu(120)
586
27
    MainView {
587
28
        objectName: "mainView"
588
29
589
30
        Page {
590
31
            title: "Launcher/Window"
591
32
592
33
            Column {
593
34
                Label {
594
35
                    objectName: "label"
595
36
                    text: "Lorem ipsum dolor sit amet"
596
37
                    width: units.gu(25)
597
38
                    height: units.gu(25)
598
39
                }
599
40
            }
600
41
        }
601
42
    }
602
43
}
603
0
44
604
=== added directory 'tests/unit/mainwindow'
605
=== added file 'tests/unit/mainwindow/AppName.qml'
606
--- tests/unit/mainwindow/AppName.qml	1970-01-01 00:00:00 +0000
607
+++ tests/unit/mainwindow/AppName.qml	2017-01-12 02:42:37 +0000
608
@@ -0,0 +1,28 @@
609
1
/*
610
2
 * Copyright 2013-2016 Canonical Ltd.
611
3
 *
612
4
 * This program is free software; you can redistribute it and/or modify
613
5
 * it under the terms of the GNU Lesser General Public License as published by
614
6
 * the Free Software Foundation; version 3.
615
7
 *
616
8
 * This program is distributed in the hope that it will be useful,
617
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
618
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
619
11
 * GNU Lesser General Public License for more details.
620
12
 *
621
13
 * You should have received a copy of the GNU Lesser General Public License
622
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
623
15
 */
624
16
625
17
import QtQuick 2.4
626
18
import Ubuntu.Components 1.3
627
19
import Ubuntu.Components.Labs 1.0
628
20
629
21
MainWindow {
630
22
    objectName: "appName"
631
23
    applicationName: "org.gnu.wildebeest"
632
24
633
25
    Label {
634
26
        text: "Lorem ipsum dolor sit amet"
635
27
    }
636
28
}
637
0
29
638
=== added file 'tests/unit/mainwindow/mainwindow.pro'
639
--- tests/unit/mainwindow/mainwindow.pro	1970-01-01 00:00:00 +0000
640
+++ tests/unit/mainwindow/mainwindow.pro	2017-01-12 02:42:37 +0000
641
@@ -0,0 +1,5 @@
642
1
CONFIG += custom_qpa   # needed by test to set device pixel ratio correctly
643
2
include(../test-include.pri)
644
3
645
4
QT += gui
646
5
SOURCES += tst_mainwindow.cpp
647
0
6
648
=== added file 'tests/unit/mainwindow/tst_mainwindow.cpp'
649
--- tests/unit/mainwindow/tst_mainwindow.cpp	1970-01-01 00:00:00 +0000
650
+++ tests/unit/mainwindow/tst_mainwindow.cpp	2017-01-12 02:42:37 +0000
651
@@ -0,0 +1,127 @@
652
1
/*
653
2
 * Copyright 2012-2016 Canonical Ltd.
654
3
 *
655
4
 * This program is free software; you can redistribute it and/or modify
656
5
 * it under the terms of the GNU Lesser General Public License as published by
657
6
 * the Free Software Foundation; version 3.
658
7
 *
659
8
 * This program is distributed in the hope that it will be useful,
660
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
661
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
662
11
 * GNU Lesser General Public License for more details.
663
12
 *
664
13
 * You should have received a copy of the GNU Lesser General Public License
665
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
666
15
 *
667
16
 * Author: Christian Dywan <christian.dywan@canonical.com>
668
17
 */
669
18
670
19
#include <QtCore/QString>
671
20
#include <QtCore/QTextCodec>
672
21
#include <QtCore/QStandardPaths>
673
22
#include <QtCore/QProcessEnvironment>
674
23
#include <QtCore/QDebug>
675
24
#include <QtTest/QTest>
676
25
#include <QtTest/QSignalSpy>
677
26
#include <QtCore/QCoreApplication>
678
27
#include <QtQml/QQmlEngine>
679
28
#include <QtQuick/QQuickView>
680
29
#include <QtQuick/QQuickItem>
681
30
#include <QtCore/QThread>
682
31
#include <QtCore/QFileInfo>
683
32
#include <QtCore/QDir>
684
33
#include <QtCore/QCryptographicHash>
685
34
#include <QtCore/QSettings>
686
35
687
36
#include <QtQuick/QQuickItem>
688
37
#include <QtQuick/QQuickView>
689
38
#include <QtGui/QGuiApplication>
690
39
#include <QtQml/QQmlEngine>
691
40
#include <QtQml/QQmlContext>
692
41
#include <QtQml/QQmlComponent>
693
42
694
43
#include <UbuntuToolkit/ubuntutoolkitmodule.h>
695
44
#include <UbuntuToolkit/private/ucapplication_p.h>
696
45
#include <UbuntuToolkit/private/ucunits_p.h>
697
46
698
47
UT_USE_NAMESPACE
699
48
700
49
class tst_MainWindow : public QObject
701
50
{
702
51
    Q_OBJECT
703
52
704
53
public:
705
54
    tst_MainWindow()
706
55
    {
707
56
    }
708
57
709
58
    QQuickWindow *loadTest(const QString &document)
710
59
    {
711
60
        // Can't use UbuntuTestCase: We need a Window root item
712
61
        QPointer<QQmlEngine> engine(new QQmlEngine());
713
62
        QString modulePath(UBUNTU_QML_IMPORT_PATH);
714
63
        if (!QDir(modulePath).exists()) {
715
64
            qWarning("'%s' doesn't exist", qPrintable(modulePath));
716
65
            return 0;
717
66
        }
718
67
        engine->addImportPath(modulePath);
719
68
        UbuntuToolkitModule::initializeContextProperties(engine);
720
69
        QPointer<QQmlComponent> component(new QQmlComponent(engine));
721
70
        component->loadUrl(QUrl::fromLocalFile(document), QQmlComponent::Asynchronous);
722
71
        while (component->isLoading())
723
72
            QCoreApplication::processEvents();
724
73
        QObject *toplevel(component->create());
725
74
        if (component->errorString() != "") {
726
75
            qWarning("%s", qPrintable(component->errorString()));
727
76
            return 0;
728
77
        }
729
78
        QQuickWindow* window(qobject_cast<QQuickWindow *>(toplevel));
730
79
        if (window)
731
80
            engine->setIncubationController(window->incubationController());
732
81
        else {
733
82
            QQuickItem *rootItem = qobject_cast<QQuickItem *>(toplevel);
734
83
            if (rootItem) {
735
84
                QQuickView *view(new QQuickView(engine, 0));
736
85
                window = view;
737
86
                view->setResizeMode(QQuickView::SizeRootObjectToView);
738
87
                view->setContent(document, component, rootItem);
739
88
            }
740
89
        }
741
90
        return window;
742
91
    }
743
92
744
93
    QQuickItem *testItem(QQuickItem *that, const QString &identifier)
745
94
    {
746
95
        if (that->property(identifier.toLocal8Bit()).isValid())
747
96
            return that->property(identifier.toLocal8Bit()).value<QQuickItem*>();
748
97
749
98
        QList<QQuickItem*> children = that->findChildren<QQuickItem*>(identifier);
750
99
        return (children.count() > 0) ? children[0] : 0;
751
100
    }
752
101
753
102
private Q_SLOTS:
754
103
755
104
    void initTestCase()
756
105
    {
757
106
    }
758
107
759
108
    void cleanupTestCase()
760
109
    {
761
110
    }
762
111
763
112
    // Note: tests/unit/mainview contains the UCApplication bits
764
113
765
114
    void testCase_AppName()
766
115
    {
767
116
        QString applicationName("org.gnu.wildebeest");
768
117
        QQuickWindow *mainWindow(loadTest("AppName.qml"));
769
118
        QVERIFY(mainWindow);
770
119
        QCOMPARE(applicationName, mainWindow->property("applicationName").toString());
771
120
        QCOMPARE(applicationName, QCoreApplication::applicationName());
772
121
        QCOMPARE(QString(""), QCoreApplication::organizationName());
773
122
    }
774
123
};
775
124
776
125
QTEST_MAIN(tst_MainWindow)
777
126
778
127
#include "tst_mainwindow.moc"
779
0
128
780
=== modified file 'tests/unit/unit.pro'
781
--- tests/unit/unit.pro	2016-09-30 05:39:57 +0000
782
+++ tests/unit/unit.pro	2017-01-12 02:42:37 +0000
783
@@ -41,6 +41,7 @@
784
41
    performance \
41
    performance \
785
42
    mainview11 \
42
    mainview11 \
786
43
    mainview13 \
43
    mainview13 \
787
44
    mainwindow \
788
44
    i18n \
45
    i18n \
789
45
    arguments \
46
    arguments \
790
46
    argument \
47
    argument \
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2017-01-13
Zsombor Egri		2016-07-27	Approve on 2017-01-13
Loïc Molinari (community)			Approve on 2016-09-21
Review via email: mp+301278@code.launchpad.net