1900bd0 · unity8 · git.iko.soy

ApplicationArguments.hnew file+49

compare with xenial

unifiedsplit

@@ -0,0 +1,49 @@

1+/*

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU General Public License for more details.

12+ *

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

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

15+ *

16+ * Authored by: Nick Dedekind <nick.dedekind@canonical.com>

17+ */

18+

19+

20+#ifndef APPLICATION_ARGUMENTS_H

21+#define APPLICATION_ARGUMENTS_H

22+

23+#include <QObject>

24+#include <QSize>

25+#include <QStringList>

26+

27+class ApplicationArguments : public QObject

28+{

29+ Q_OBJECT

30+public:

31+ ApplicationArguments(const QStringList& args) {

32+ if (args.contains(QLatin1String("-geometry")) && args.size() > args.indexOf(QLatin1String("-geometry")) + 1) {

33+ QStringList geometryArg = args.at(args.indexOf(QLatin1String("-geometry")) + 1).split('x');

34+ if (geometryArg.size() == 2) {

35+ m_size.rwidth() = geometryArg.at(0).toInt();

36+ m_size.rheight() = geometryArg.at(1).toInt();

37+ }

38+ }

39+ }

40+

41+ Q_INVOKABLE bool hasGeometry() const { return m_size.isValid(); }

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

43+ Q_INVOKABLE int height() const { return m_size.height(); }

44+

45+private:

46+ QSize m_size;

47+};

48+

49+#endif // APPLICATION_ARGUMENTS_H

CMakeLists.txt+1

@@ -101,6 +101,7 @@ set(shell_app_HDRS

101

102add_executable(${SHELL_APP}

103 ${shellapplication_MOC_SRCS}

104+ ApplicationArguments.h

104 main.cpp

105 main.cpp

105 MouseTouchAdaptor.cpp

106 MouseTouchAdaptor.cpp

106 )

107 )

Dash/Dash.qml−3

@@ -27,9 +27,6 @@ Showable {

27 property string showScopeOnLoaded: "home.scope"

28 property real contentScale: 1.0

29

30− width: units.gu(40)

31− height: units.gu(71)

32−

33 function setCurrentScope(scopeId, animate, reset) {

30 function setCurrentScope(scopeId, animate, reset) {

34 var scopeIndex = filteredScopes.findFirst(Scopes.RoleId, scopeId)

31 var scopeIndex = filteredScopes.findFirst(Scopes.RoleId, scopeId)

35

32

Dash/DashContent.qml−2

@@ -20,8 +20,6 @@ import Unity 0.1

20

21Item {

22 id: dashContent

23− width: units.gu(40)

24− height: units.gu(71)

25

23

26 property var model: null

24 property var model: null

27 property var scopes: null

25 property var scopes: null

Shell.qml+2−2

@@ -36,8 +36,8 @@ FocusScope {

36

37 // this is only here to select the width / height of the window if not running fullscreen

38 property bool tablet: false

39− width: tablet ? units.gu(160) : units.gu(40)

39+ width: tablet ? units.gu(160) : ApplicationArguments.hasGeometry() ? ApplicationArguments.width() : units.gu(40)

40− height: tablet ? units.gu(100) : units.gu(71)

40+ height: tablet ? units.gu(100) : ApplicationArguments.hasGeometry() ? ApplicationArguments.height() : units.gu(71)

41

42 property real edgeSize: units.gu(2)

43 property url default_background: shell.width >= units.gu(60) ? "graphics/tablet_background.jpg" : "graphics/phone_background.jpg"

main.cpp+4−6

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

18 */

19

20// Qt

21+#include <QtQml>

21#include <QtQuick/QQuickView>

22#include <QtQuick/QQuickView>

22#include <QtGui/QIcon>

23#include <QtGui/QIcon>

23#include <QtGui/QGuiApplication>

24#include <QtGui/QGuiApplication>

@@ -30,6 +31,7 @@

30// local

31// local

31#include "paths.h"

32#include "paths.h"

32#include "MouseTouchAdaptor.h"

33#include "MouseTouchAdaptor.h"

34+#include "ApplicationArguments.h"

33

35

34namespace {

36namespace {

35

37

@@ -86,6 +88,7 @@ int main(int argc, char** argv)

86 resolveIconTheme();

88 resolveIconTheme();

87

89

88 QStringList args = application.arguments();

90 QStringList args = application.arguments();

91+ ApplicationArguments qmlArgs(args);

89

92

90 // The testability driver is only loaded by QApplication but not by QGuiApplication.

93 // The testability driver is only loaded by QApplication but not by QGuiApplication.

91 // However, QApplication depends on QWidget which would add some unneeded overhead => Let's load the testability driver on our own.

94 // However, QApplication depends on QWidget which would add some unneeded overhead => Let's load the testability driver on our own.

@@ -110,6 +113,7 @@ int main(int argc, char** argv)

110 view->setResizeMode(QQuickView::SizeRootObjectToView);

113 view->setResizeMode(QQuickView::SizeRootObjectToView);

111 view->setTitle("Qml Phone Shell");

114 view->setTitle("Qml Phone Shell");

112 view->engine()->setBaseUrl(QUrl::fromLocalFile(::shellAppDirectory()));

115 view->engine()->setBaseUrl(QUrl::fromLocalFile(::shellAppDirectory()));

116+ view->rootContext()->setContextProperty("ApplicationArguments", &qmlArgs);

113 if (args.contains(QLatin1String("-frameless"))) {

117 if (args.contains(QLatin1String("-frameless"))) {

114 view->setFlags(Qt::FramelessWindowHint);

118 view->setFlags(Qt::FramelessWindowHint);

115 }

119 }

@@ -141,12 +145,6 @@ int main(int argc, char** argv)

141 if (qgetenv("QT_QPA_PLATFORM") == "ubuntu" || args.contains(QLatin1String("-fullscreen"))) {

145 if (qgetenv("QT_QPA_PLATFORM") == "ubuntu" || args.contains(QLatin1String("-fullscreen"))) {

142 view->showFullScreen();

146 view->showFullScreen();

143 } else {

147 } else {

144− if (args.contains(QLatin1String("-geometry")) && args.size() > args.indexOf(QLatin1String("-geometry")) + 1) {

145− QStringList geometryArg = args.at(args.indexOf(QLatin1String("-geometry")) + 1).split('x');

146− if (geometryArg.size() == 2) {

147− view->resize(geometryArg.at(0).toInt(), geometryArg.at(1).toInt());

148− }

149− }

150 view->show();

148 view->show();

151 }

149 }

152

150