on xenial help sign in
Drop type=unity and ShimStage.qml
commit57d5998c401d813064583b142a9a8f2644d6dfb2 authorMichael Terry <michael.terry@canonical.com> dateWed 8 Jun 2016, 16:52 (10 years ago) parent54706e5
3 files changed+2−48
data/51-unity8-greeter.conf−3 qml/Shell.qml+2−2 qml/Stages/ShimStage.qml−43
data/51-unity8-greeter.conf−3
@@ -1,5 +1,2 @@
11[Seat:*]
22greeter-session=unity8-greeter
3−
4−# When unity8 can be run under mir on the desktop, change this to unity.
5−type=unity
qml/Shell.qml+2−2
@@ -259,8 +259,8 @@ StyledItem {
259259 ? "phone"
260260 : shell.usageScenario
261261 readonly property string qmlComponent: {
262− if(shell.mode === "greeter") {
263− return "Stages/ShimStage.qml"
262+ if (shell.mode === "greeter") {
263+ return "Stages/AbstractStage.qml"
264264 } else if (applicationsDisplayLoader.usageScenario === "phone") {
265265 return "Stages/PhoneStage.qml";
266266 } else if (applicationsDisplayLoader.usageScenario === "tablet") {
qml/Stages/ShimStage.qmldeleted−43
@@ -1,43 +0,0 @@
1−/*
2− * Copyright (C) 2015 Canonical, Ltd.
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−
17−import QtQuick 2.4
18−import Ubuntu.Components 1.3
19−
20−AbstractStage {
21− id: shimStage
22−
23− anchors.fill: parent
24−
25− Text {
26− id: greeterModeText
27−
28− anchors.horizontalCenter: parent.horizontalCenter
29− anchors.top: parent.top
30− anchors.topMargin: units.gu(10)
31− font.bold: true
32− horizontalAlignment: Text.AlignHCenter
33− text: "Shell is in \"greeter\" mode"
34− }
35−
36− Text {
37− anchors.centerIn: parent
38− color: UbuntuColors.orange
39− font.pointSize: units.gu(8)
40− horizontalAlignment: Text.AlignHCenter
41− text: "Shim \nStage"
42− }
43−}