d63d590 · unity8 · git.iko.soy

git.iko.soy/unity8

Merge lp:~dandrader/unity8/unityCommandLineParser

commitd63d590421fc3b16125beccbb53d89112994c0ed authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateThu 16 Apr 2015, 11:11 (12 years ago) parent369ec39 1efe4de

5 files changed+6−15

compare with xenial

unifiedsplit

src/ApplicationArguments.h+3−3 src/Dash/main.cpp+1−1 src/UnityCommandLineParser.cpp−5 src/UnityCommandLineParser.h−2 src/main.cpp+2−4

src/ApplicationArguments.h+3−3

@@ -31,9 +31,9 @@ public:

3131 ApplicationArguments(QObject *parent = nullptr);

3232

3333 void setDeviceName(QString deviceName) { m_deviceName = deviceName; }

34− void setSize(int width, int height) {

35− m_size.rwidth() = width;

36− m_size.rheight() = height;

34+

35+ void setSize(const QSize &size) {

36+ m_size = size;

3737 }

3838

3939 Q_INVOKABLE int width() const { return m_size.width(); }

src/Dash/main.cpp+1−1

@@ -65,7 +65,7 @@ int main(int argc, const char *argv[])

6565 parser.value(windowGeometryOption).split('x').size() == 2)

6666 {

6767 QStringList geom = parser.value(windowGeometryOption).split('x');

68− qmlArgs.setSize(geom.at(0).toInt(), geom.at(1).toInt());

68+ qmlArgs.setSize(QSize(geom.at(0).toInt(), geom.at(1).toInt()));

6969 }

7070

7171 if (getenv("QT_LOAD_TESTABILITY")) {

src/UnityCommandLineParser.cpp−5

@@ -49,10 +49,6 @@ UnityCommandLineParser::UnityCommandLineParser(const QCoreApplication &app)

4949 "DISCOURAGED: Please set QT_LOAD_TESTABILITY instead.\nLoad the testability driver");

5050 parser.addOption(testabilityOption);

5151

52− QCommandLineOption devicenameOption(QStringList() << "devicename",

53− "Specify the device name instead of letting Unity 8 find it out", "devicename", "");

54− parser.addOption(devicenameOption);

55−

5652 QCommandLineOption modeOption("mode",

5753 "Whether to run greeter and/or shell [full-greeter, full-shell, greeter, shell]",

5854 "mode", "full-greeter");

@@ -77,7 +73,6 @@ UnityCommandLineParser::UnityCommandLineParser(const QCoreApplication &app)

7773 m_hasFrameless = parser.isSet(framelessOption);

7874 m_hasMouseToTouch = parser.isSet(mousetouchOption);

7975 m_hasFullscreen = parser.isSet(fullscreenOption);

80− m_deviceName = parser.value(devicenameOption);

8176 resolveMode(parser, modeOption);

8277}

8378

src/UnityCommandLineParser.h−2

@@ -30,7 +30,6 @@ public:

3030 bool hasFrameless() const { return m_hasFrameless; }

3131 bool hasMouseToTouch() const { return m_hasMouseToTouch; }

3232 bool hasFullscreen() const { return m_hasFullscreen; }

33− QString deviceName() const { return m_deviceName; }

3433 QString mode() const { return m_mode; }

3534private:

3635

@@ -45,7 +44,6 @@ private:

4544 bool m_hasFrameless;

4645 bool m_hasMouseToTouch;

4746 bool m_hasFullscreen;

48− QString m_deviceName;

4947 QString m_mode;

5048};

5149

src/main.cpp+2−4

@@ -54,6 +54,8 @@ int main(int argc, const char *argv[])

5454 UnityCommandLineParser parser(*application);

5555

5656 ApplicationArguments qmlArgs;

57+ qmlArgs.setSize(parser.windowGeometry());

58+

5759 if (!parser.deviceName().isEmpty()) {

5860 qmlArgs.setDeviceName(parser.deviceName());

5961 } else {

@@ -94,10 +96,6 @@ int main(int argc, const char *argv[])

9496 }

9597 TouchRegistry touchRegistry;

9698 view->installEventFilter(&touchRegistry);

97− if (parser.windowGeometry().isValid()) {

98− view->setWidth(parser.windowGeometry().width());

99− view->setHeight(parser.windowGeometry().height());

100− }

10199

102100 // You will need this if you want to interact with touch-only components using a mouse

103101 // Needed only when manually testing on a desktop.