Update new ShellApplication class to handle greeter mode
commit555cc1508d8e760eb389efafe698b81e7d0dac88
authorJosh Arenson <josh@blackbox>
dateTue 27 Oct 2015, 10:55 (11 years ago)
parent8402714
.bazaar/plugins/makecheck_unity_phablet.pymode 100755 → 100644
Only the mode changed.
debian/control+1−1
@@ -9,7 +9,7 @@ Build-Depends: cmake,
99# To allow cross-compiling to work, we also must append :native
1010# to g++ so we don't try to run armhf g++
1111# on an x86 CPU for eaxmple, when cross-compiling.
12− g++:native,
12+# g++:native,
1313 libandroid-properties-dev,
1414 graphviz,
1515 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
debian/rulesmode 100755 → 100644
Only the mode changed.
debian/tests/qmluitests.shmode 100755 → 100644
Only the mode changed.
po/update-unity-potmode 100755 → 100644
Only the mode changed.
run.shmode 100755 → 100644
Only the mode changed.
run_on_device.shmode 100755 → 100644
Only the mode changed.
runtests.shmode 100755 → 100644
Only the mode changed.
src/ShellApplication.cpp+4−4
@@ -113,10 +113,10 @@ ShellApplication::ShellApplication(int & argc, char ** argv, bool isMirServer)
113113 }
114114
115115 if (parser.mode().compare("greeter") == 0) {
116− QSize primaryScreenSize = application->primaryScreen()->size();
117− view->setHeight(primaryScreenSize.height());
118− view->setWidth(primaryScreenSize.width());
119− view->show();
116+ QSize primaryScreenSize = this->primaryScreen()->size();
117+ m_shellView->setHeight(primaryScreenSize.height());
118+ m_shellView->setWidth(primaryScreenSize.width());
119+ m_shellView->show();
120120 } else if (isMirServer || parser.hasFullscreen()) {
121121 m_shellView->showFullScreen();
122122 } else {
tests/autopilot/unity8/settings_wizard/ofono_helper.pymode 100755 → 100644
Only the mode changed.
tests/copyright/check_copyright.shmode 100755 → 100644
Only the mode changed.
tests/mocks/libusermetrics/libusermetricsoutput/ColorTheme.hdeleted−1
@@ -1 +0,0 @@
1−../ColorTheme.h
tests/mocks/libusermetrics/libusermetricsoutput/UserMetrics.hdeleted−1
@@ -1 +0,0 @@
1−../UserMetrics.h
tests/scripts/alert-launcher-icon.shmode 100755 → 100644
Only the mode changed.
tests/scripts/get-progress.shmode 100755 → 100644
Only the mode changed.
tests/scripts/list-launcher-icons.shmode 100755 → 100644
Only the mode changed.
tests/scripts/set-count-visible.shmode 100755 → 100644
Only the mode changed.
tests/scripts/set-count.shmode 100755 → 100644
Only the mode changed.
tests/scripts/set-progress.shmode 100755 → 100644
Only the mode changed.
tests/whitespace/check_whitespace.pymode 100755 → 100644
Only the mode changed.
tools/unlock-devicemode 100755 → 100644
Only the mode changed.