bd74b71 · unity8 · git.iko.soy

qml/DeviceConfiguration.qml+5

compare with xenial

unifiedsplit

@@ -15,6 +15,7 @@

15 */

16

17import QtQuick 2.0

18+import "Components"

18

19

19StateGroup {

20StateGroup {

20 id: root

21 id: root

@@ -28,6 +29,10 @@ StateGroup {

28 | Qt.LandscapeOrientation

29 | Qt.LandscapeOrientation

29 | Qt.InvertedLandscapeOrientation

30 | Qt.InvertedLandscapeOrientation

30

31

32+ property var deviceSpecificOrientationOverrides: QtObject{

33+ property string hello: "world"

34+ }

35+

31 // Supported values so far:

36 // Supported values so far:

32 // "phone", "tablet" or "desktop"

37 // "phone", "tablet" or "desktop"

33 property string category: "phone"

38 property string category: "phone"

qml/OrientedShell.qml+2

@@ -67,6 +67,7 @@ Rectangle {

67 }

68 }

69 Component.onCompleted: {

70+ console.log("JOSH: OrientedShell: " + deviceConfiguration.deviceSpecificOrientationOverrides.hello);

70 if (orientationLocked) {

71 if (orientationLocked) {

71 orientation = orientationLock.savedOrientation;

72 orientation = orientationLock.savedOrientation;

72 }

73 }

@@ -154,6 +155,7 @@ Rectangle {

154 width: root.width

155 width: root.width

155 height: root.height

156 height: root.height

156 orientation: root.angleToOrientation(orientationAngle)

157 orientation: root.angleToOrientation(orientationAngle)

158+ deviceSpecificOrientationOverrides: deviceConfiguration.deviceSpecificOrientationOverrides

157 primaryOrientation: root.primaryOrientation

159 primaryOrientation: root.primaryOrientation

158 nativeOrientation: root.nativeOrientation

160 nativeOrientation: root.nativeOrientation

159 nativeWidth: root.width

161 nativeWidth: root.width

qml/Shell.qml+41

@@ -48,6 +48,7 @@ Item {

48 // to be set from outside

49 property int orientationAngle: 0

50 property int orientation

51+ property QtObject deviceSpecificOrientationOverrides

51 property int primaryOrientation

52 property int primaryOrientation

52 property int nativeOrientation

53 property int nativeOrientation

53 property real nativeWidth

54 property real nativeWidth

@@ -159,7 +160,40 @@ Item {

159 value: ApplicationManager

160 value: ApplicationManager

160 }

161 }

161

162

163+function serialize(object, maxDepth) {

164+ function _processObject(object, maxDepth, level) {

165+ var output = Array()

166+ var pad = " "

167+ if (maxDepth == undefined) {

168+ maxDepth = -1

169+ }

170+ if (level == undefined) {

171+ level = 0

172+ }

173+ var padding = Array(level + 1).join(pad)

174+

175+ output.push((Array.isArray(object) ? "[" : "{"))

176+ var fields = Array()

177+ for (var key in object) {

178+ var keyText = Array.isArray(object) ? "" : ("\"" + key + "\": ")

179+ if (typeof (object[key]) == "object" && key != "parent" && maxDepth != 0) {

180+ var res = _processObject(object[key], maxDepth > 0 ? maxDepth - 1 : -1, level + 1)

181+ fields.push(padding + pad + keyText + res)

182+ } else {

183+ fields.push(padding + pad + keyText + "\"" + object[key] + "\"")

184+ }

185+ }

186+ output.push(fields.join(",\n"))

187+ output.push(padding + (Array.isArray(object) ? "]" : "}"))

188+

189+ return output.join("\n")

190+ }

191+

192+ return _processObject(object, maxDepth)

193+}

194+

162 Component.onCompleted: {

195 Component.onCompleted: {

196+ console.log("JOSH: Shell: " + deviceSpecificOrientationOverrides.hello);

163 Theme.name = "Ubuntu.Components.Themes.SuruGradient"

197 Theme.name = "Ubuntu.Components.Themes.SuruGradient"

164 if (ApplicationManager.count > 0) {

198 if (ApplicationManager.count > 0) {

165 ApplicationManager.focusApplication(ApplicationManager.get(0).appId);

199 ApplicationManager.focusApplication(ApplicationManager.get(0).appId);

@@ -267,6 +301,8 @@ Item {

267 }

301 }

268 }

302 }

269

303

304+ onLoaded: console.log("JOSH in shell loader: " + deviceSpecificOrientationOverrides.hello)

305+

270 property bool interactive: tutorial.spreadEnabled

306 property bool interactive: tutorial.spreadEnabled

271 && (!greeter || !greeter.shown)

307 && (!greeter || !greeter.shown)

272 && panel.indicators.fullyClosed

308 && panel.indicators.fullyClosed

@@ -336,6 +372,11 @@ Item {

336 property: "nativeWidth"

372 property: "nativeWidth"

337 value: shell.nativeWidth

373 value: shell.nativeWidth

338 }

374 }

375+ Binding {

376+ target: applicationsDisplayLoader.item

377+ property: "deviceSpecificOrientationOverrides"

378+ value: shell.deviceSpecificOrientationOverrides

379+ }

339 Binding {

380 Binding {

340 target: applicationsDisplayLoader.item

381 target: applicationsDisplayLoader.item

341 property: "nativeHeight"

382 property: "nativeHeight"

qml/Stages/PhoneStage.qml+2

@@ -42,6 +42,7 @@ Rectangle {

42 property int shellOrientation

43 property int shellPrimaryOrientation

44 property int nativeOrientation

45+ property QtObject deviceSpecificOrientationOverrides

45 property real nativeWidth

46 property real nativeWidth

46 property real nativeHeight

47 property real nativeHeight

47 property bool beingResized: false

48 property bool beingResized: false

@@ -530,6 +531,7 @@ Rectangle {

530

531

531 shellOrientationAngle: root.shellOrientationAngle

532 shellOrientationAngle: root.shellOrientationAngle

532 shellOrientation: root.shellOrientation

533 shellOrientation: root.shellOrientation

534+ deviceSpecificOrientationOverrides: root.deviceSpecificOrientationOverrides

533 shellPrimaryOrientation: root.shellPrimaryOrientation

535 shellPrimaryOrientation: root.shellPrimaryOrientation

534 nativeOrientation: root.nativeOrientation

536 nativeOrientation: root.nativeOrientation

535

537

qml/Stages/SpreadDelegate.qml+4−1

@@ -42,6 +42,7 @@ FocusScope {

42 property alias application: appWindow.application

43 property int shellOrientationAngle

44 property int shellOrientation

45+ property string deviceSpecificOrientationOverrides

45 property int shellPrimaryOrientation

46 property int shellPrimaryOrientation

46 property int nativeOrientation

47 property int nativeOrientation

47

48

@@ -76,7 +77,7 @@ FocusScope {

76 property bool startingUp: true

77 property bool startingUp: true

77 }

78 }

78

79

79− Component.onCompleted: { finishStartUpTimer.start(); }

80+ Component.onCompleted: { finishStartUpTimer.start();}

80 Timer { id: finishStartUpTimer; interval: 400; onTriggered: priv.startingUp = false }

81 Timer { id: finishStartUpTimer; interval: 400; onTriggered: priv.startingUp = false }

81

82

82 Rectangle {

83 Rectangle {

@@ -163,6 +164,8 @@ FocusScope {

163 // If it doesn't support shell's current orientation

164 // If it doesn't support shell's current orientation

164 // then simply pick some arbitraty one that it does support

165 // then simply pick some arbitraty one that it does support

165 var chosenOrientation = 0;

166 var chosenOrientation = 0;

167+

168+ console.log("JOSH: SPREAD DELEGATE: " + root.deviceSpecificOrientationOverrides);

166 if (supportedOrientations & root.shellOrientation) {

169 if (supportedOrientations & root.shellOrientation) {

167 chosenOrientation = root.shellOrientation;

170 chosenOrientation = root.shellOrientation;

168 } else if (supportedOrientations & Qt.PortraitOrientation) {

171 } else if (supportedOrientations & Qt.PortraitOrientation) {

qml/Stages/TabletStage.qml+6

@@ -39,11 +39,15 @@ Rectangle {

39 property bool keepDashRunning: true

40 property bool suspended: false

41 property int shellOrientationAngle: 0

42+ property var deviceSpecificOrientationOverrides

42 property int shellOrientation

43 property int shellOrientation

43 property int shellPrimaryOrientation

44 property int shellPrimaryOrientation

44 property int nativeOrientation

45 property int nativeOrientation

45 property real nativeWidth

46 property real nativeWidth

46 property real nativeHeight

47 property real nativeHeight

48+

49+ Component.onCompleted: console.log("JOSH ts onComp: " + deviceSpecificOrientationOverrides)

50+

47 function updateFocusedAppOrientation() {

51 function updateFocusedAppOrientation() {

48 var mainStageAppIndex = priv.indexOf(priv.mainStageAppId);

52 var mainStageAppIndex = priv.indexOf(priv.mainStageAppId);

49 if (mainStageAppIndex >= 0 && mainStageAppIndex < spreadRepeater.count) {

53 if (mainStageAppIndex >= 0 && mainStageAppIndex < spreadRepeater.count) {

@@ -325,6 +329,7 @@ Rectangle {

325 // In case the ApplicationManager already holds an app when starting up we're missing animations

329 // In case the ApplicationManager already holds an app when starting up we're missing animations

326 // Make sure we end up in the same state

330 // Make sure we end up in the same state

327 Component.onCompleted: {

331 Component.onCompleted: {

332+ console.log("JOSH: tablet stage: " + root.deviceSpecificOrientationOverrides)

328 spreadView.contentX = -spreadView.shift

333 spreadView.contentX = -spreadView.shift

329 }

334 }

330

335

@@ -689,6 +694,7 @@ Rectangle {

689 return progress;

694 return progress;

690 }

695 }

691

696

697+ deviceSpecificOrientationOverrides: root.deviceSpecificOrientationOverrides

692 shellOrientationAngle: wantsMainStage ? root.shellOrientationAngle : 0

698 shellOrientationAngle: wantsMainStage ? root.shellOrientationAngle : 0

693 shellOrientation: wantsMainStage ? root.shellOrientation : Qt.PortraitOrientation

699 shellOrientation: wantsMainStage ? root.shellOrientation : Qt.PortraitOrientation

694 shellPrimaryOrientation: wantsMainStage ? root.shellPrimaryOrientation : Qt.PortraitOrientation

700 shellPrimaryOrientation: wantsMainStage ? root.shellPrimaryOrientation : Qt.PortraitOrientation

tests/CMakeLists.txt+2−2

@@ -123,6 +123,6 @@ endfunction()

123

124# Actual test definitions

125add_subdirectory(libs)

126−add_subdirectory(plugins)

126+#add_subdirectory(plugins)

127add_subdirectory(qmltests)

128−add_subdirectory(whitespace)

128+#add_subdirectory(whitespace)