git.iko.soy/unity8
on xenial help sign in
Load shim stage when shellMode==greeter
5fff643Josh Arenson
qml/Shell.qml+2−2
compare with xenial
unifiedsplit
@@ -233,8 +233,8 @@ Item {
233 // the screen larger (maybe connects to monitor) and tries to enter
233 // the screen larger (maybe connects to monitor) and tries to enter
234 // tablet mode.
234 // tablet mode.
235 property bool tabletMode: shell.sideStageEnabled && !greeter.hasLockedApp
235 property bool tabletMode: shell.sideStageEnabled && !greeter.hasLockedApp
236− source: usageModeSettings.usageMode === "Windowed" ? "Stages/DesktopStage.qml"
236+ property string stageSource: usageModeSettings.usageMode === "Windowed" ? "Stages/DesktopStage.qml": tabletMode ? "Stages/TabletStage.qml" : "Stages/PhoneStage.qml"
237− : tabletMode ? "Stages/TabletStage.qml" : "Stages/PhoneStage.qml"
237+ source: shellMode != "greeter" ? stageSource : "Stages/ShimStage.qml"
238
238
239 property bool interactive: tutorial.spreadEnabled
239 property bool interactive: tutorial.spreadEnabled
240 && !greeter.shown
240 && !greeter.shown
qml/Stages/ShimStage.qmlnew file+28
@@ -0,0 +1,28 @@
1+import QtQuick 2.3
2+import Ubuntu.Components 0.1
3+
4+Rectangle {
5+ id: shimStage
6+
7+ anchors.fill: parent
8+ color: UbuntuColors.lightAubergine
9+
10+ Text {
11+ id: greeterModeText
12+
13+ anchors.horizontalCenter: parent.horizontalCenter
14+ anchors.top: parent.top
15+ anchors.topMargin: units.gu(10)
16+ font.bold: true
17+ horizontalAlignment: Text.AlignHCenter
18+ text: "Shel is in \"greeter\" mode"
19+ }
20+
21+ Text {
22+ anchors.centerIn: parent
23+ color: UbuntuColors.orange
24+ font.pointSize: units.gu(8)
25+ horizontalAlignment: Text.AlignHCenter
26+ text: "Shim \nStage"
27+ }
28+}