1
=== modified file 'src/ApplicationArguments.h'
2
--- src/ApplicationArguments.h	2014-03-19 15:29:35 +0000
3
+++ src/ApplicationArguments.h	2014-05-05 22:46:16 +0000
4
@@ -28,14 +28,10 @@
5
28
{
28
{
6
29
    Q_OBJECT
29
    Q_OBJECT
7
30
public:
30
public:
16
31
    ApplicationArguments(const QStringList& args) {
31
    // Not exposed to the app as setSize isn't invokable
17
32
        if (args.contains(QLatin1String("-windowgeometry")) && args.size() > args.indexOf(QLatin1String("-windowgeometry")) + 1) {
32
    void setSize(int width, int height) {
18
33
            QStringList geometryArg = args.at(args.indexOf(QLatin1String("-windowgeometry")) + 1).split('x');
33
        m_size.rwidth()  = width;
19
34
            if (geometryArg.size() == 2) {
34
        m_size.rheight() = height;
12
35
                m_size.rwidth() = geometryArg.at(0).toInt();
13
36
                m_size.rheight() = geometryArg.at(1).toInt();
14
37
            }
15
38
        }
20
39
    }
35
    }
21
40
36
22
41
    Q_INVOKABLE bool hasGeometry() const { return m_size.isValid(); }
37
    Q_INVOKABLE bool hasGeometry() const { return m_size.isValid(); }
23
42
38
24
=== modified file 'src/main.cpp'
25
--- src/main.cpp	2014-04-02 11:19:54 +0000
26
+++ src/main.cpp	2014-05-05 22:46:16 +0000
27
@@ -18,6 +18,7 @@
28
18
 */
18
 */
29
19
19
30
20
// Qt
20
// Qt
31
21
#include <QCommandLineParser>
32
21
#include <QtQuick/QQuickView>
22
#include <QtQuick/QQuickView>
33
22
#include <QtGui/QGuiApplication>
23
#include <QtGui/QGuiApplication>
34
23
#include <QtQml/QQmlEngine>
24
#include <QtQml/QQmlEngine>
35
@@ -43,6 +44,32 @@
36
43
44
37
44
    QGuiApplication::setApplicationName("Unity 8");
45
    QGuiApplication::setApplicationName("Unity 8");
38
45
    QGuiApplication *application;
46
    QGuiApplication *application;
39
47
40
48
    QCommandLineParser parser;
41
49
    parser.setApplicationDescription("Description: Unity 8 Shell");
42
50
    parser.addHelpOption();
43
51
44
52
    QCommandLineOption fullscreenOption("fullscreen",
45
53
        "Run in fullscreen");
46
54
    parser.addOption(fullscreenOption);
47
55
48
56
    QCommandLineOption framelessOption("frameless",
49
57
        "Run without window borders");
50
58
    parser.addOption(framelessOption);
51
59
52
60
    QCommandLineOption mousetouchOption("mousetouch",
53
61
        "Allow the mouse to provide touch input");
54
62
    parser.addOption(mousetouchOption);
55
63
56
64
    QCommandLineOption windowGeometryOption(QStringList() << "windowgeometry",
57
65
            "Specify the window geometry as [<width>x<height>]", "windowgeometry", "1");
58
66
    parser.addOption(windowGeometryOption);
59
67
60
68
    QCommandLineOption testabilityOption("testability",
61
69
        "DISCOURAGED: Please set QT_LOAD_TESTABILITY instead. \n \
62
70
Load the testability driver");
63
71
    parser.addOption(testabilityOption);
64
72
65
46
    if (isUbuntuMirServer) {
73
    if (isUbuntuMirServer) {
66
47
        QLibrary unityMir("unity-mir", 1);
74
        QLibrary unityMir("unity-mir", 1);
67
48
        unityMir.load();
75
        unityMir.load();
68
@@ -59,6 +86,11 @@
69
59
        application = new QGuiApplication(argc, (char**)argv);
86
        application = new QGuiApplication(argc, (char**)argv);
70
60
    }
87
    }
71
61
88
72
89
    // Treat args with single dashes the same as arguments with two dashes
73
90
    // Ex: -fullscreen == --fullscreen
74
91
    parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
75
92
    parser.process(*application);
76
93
77
62
    QString indicatorProfile = qgetenv("UNITY_INDICATOR_PROFILE");
94
    QString indicatorProfile = qgetenv("UNITY_INDICATOR_PROFILE");
78
63
    if (indicatorProfile.isEmpty()) {
95
    if (indicatorProfile.isEmpty()) {
79
64
        indicatorProfile = "phone";
96
        indicatorProfile = "phone";
80
@@ -66,12 +98,17 @@
81
66
98
82
67
    resolveIconTheme();
99
    resolveIconTheme();
83
68
100
86
69
    QStringList args = application->arguments();
101
    ApplicationArguments qmlArgs;
87
70
    ApplicationArguments qmlArgs(args);
102
    if (parser.isSet(windowGeometryOption) &&
88
103
        parser.value(windowGeometryOption).split('x').size() == 2)
89
104
    {
90
105
      QStringList geom = parser.value(windowGeometryOption).split('x');
91
106
      qmlArgs.setSize(geom.at(0).toInt(), geom.at(1).toInt());
92
107
    }
93
71
108
94
72
    // The testability driver is only loaded by QApplication but not by QGuiApplication.
109
    // The testability driver is only loaded by QApplication but not by QGuiApplication.
95
73
    // However, QApplication depends on QWidget which would add some unneeded overhead => Let's load the testability driver on our own.
110
    // However, QApplication depends on QWidget which would add some unneeded overhead => Let's load the testability driver on our own.
97
74
    if (args.contains(QLatin1String("-testability")) || getenv("QT_LOAD_TESTABILITY")) {
111
    if (parser.isSet(testabilityOption) || getenv("QT_LOAD_TESTABILITY")) {
98
75
        QLibrary testLib(QLatin1String("qttestability"));
112
        QLibrary testLib(QLatin1String("qttestability"));
99
76
        if (testLib.load()) {
113
        if (testLib.load()) {
100
77
            typedef void (*TasInitialize)(void);
114
            typedef void (*TasInitialize)(void);
101
@@ -94,14 +131,14 @@
102
94
    view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));
131
    view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));
103
95
    view->rootContext()->setContextProperty("applicationArguments", &qmlArgs);
132
    view->rootContext()->setContextProperty("applicationArguments", &qmlArgs);
104
96
    view->rootContext()->setContextProperty("indicatorProfile", indicatorProfile);
133
    view->rootContext()->setContextProperty("indicatorProfile", indicatorProfile);
106
97
    if (args.contains(QLatin1String("-frameless"))) {
134
    if (parser.isSet(framelessOption)) {
107
98
        view->setFlags(Qt::FramelessWindowHint);
135
        view->setFlags(Qt::FramelessWindowHint);
108
99
    }
136
    }
109
100
137
110
101
    // You will need this if you want to interact with touch-only components using a mouse
138
    // You will need this if you want to interact with touch-only components using a mouse
111
102
    // Needed only when manually testing on a desktop.
139
    // Needed only when manually testing on a desktop.
112
103
    MouseTouchAdaptor *mouseTouchAdaptor = 0;
140
    MouseTouchAdaptor *mouseTouchAdaptor = 0;
114
104
    if (args.contains(QLatin1String("-mousetouch"))) {
141
    if (parser.isSet(mousetouchOption)) {
115
105
        mouseTouchAdaptor = new MouseTouchAdaptor;
142
        mouseTouchAdaptor = new MouseTouchAdaptor;
116
106
        application->installNativeEventFilter(mouseTouchAdaptor);
143
        application->installNativeEventFilter(mouseTouchAdaptor);
117
107
    }
144
    }
118
@@ -125,7 +162,7 @@
119
125
    view->setSource(source);
162
    view->setSource(source);
120
126
    view->setColor("transparent");
163
    view->setColor("transparent");
121
127
164
123
128
    if (qgetenv("QT_QPA_PLATFORM") == "ubuntu" || isUbuntuMirServer || args.contains(QLatin1String("-fullscreen"))) {
165
    if (qgetenv("QT_QPA_PLATFORM") == "ubuntu" || isUbuntuMirServer || parser.isSet(fullscreenOption)) {
124
129
        view->showFullScreen();
166
        view->showFullScreen();
125
130
    } else {
167
    } else {
126
131
        view->show();
168
        view->show();
Reviewer	Review Type	Date Requested	Status
Michał Sawicz			Abstain on 2014-05-13
Albert Astals Cid (community)		2014-04-30	Approve on 2014-05-06
PS Jenkins bot (community)	continuous-integration	2014-04-30	Needs Fixing on 2014-05-06
Review via email: mp+217840@code.launchpad.net