Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 2 files). Show all
Unified · Split
| @@ -276,7 +276,7 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr · 275 unmodified lines | |||
| 276 | } | 276 | } |
| 277 | 277 | ||
| 278 | // force to the tablet to go to the homescreen | 278 | // force to the tablet to go to the homescreen |
| 279 | gotoHomeScreen(true); | 279 | loadHomeScreen(true); |
| 280 | 280 | ||
| 281 | QMetaObject::invokeMethod(_qmlTabletRoot, "setUsername", Q_ARG(const QVariant&, QVariant(getUsername()))); | 281 | QMetaObject::invokeMethod(_qmlTabletRoot, "setUsername", Q_ARG(const QVariant&, QVariant(getUsername()))); |
| 282 | 282 | ||
| @@ -295,7 +295,7 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr · 12 unmodified lines | |||
| 295 | } | 295 | } |
| 296 | 296 | ||
| 297 | void TabletProxy::gotoHomeScreen() { | 297 | void TabletProxy::gotoHomeScreen() { |
| 298 | gotoHomeScreen(false); | 298 | loadHomeScreen(false); |
| 299 | } | 299 | } |
| 300 | void TabletProxy::gotoMenuScreen(const QString& submenu) { | 300 | void TabletProxy::gotoMenuScreen(const QString& submenu) { |
| 301 | 301 | ||
| @@ -338,7 +338,7 @@ void TabletProxy::loadQMLSource(const QVariant& path) { · 36 unmodified lines | |||
| 338 | } | 338 | } |
| 339 | } | 339 | } |
| 340 | 340 | ||
| 341 | void TabletProxy::gotoHomeScreen(bool forceOntoHomeScreen) { | 341 | void TabletProxy::loadHomeScreen(bool forceOntoHomeScreen) { |
| 342 | if (_state != State::Home && ( _state != State::Uninitialized || forceOntoHomeScreen)) { | 342 | if (_state != State::Home && ( _state != State::Uninitialized || forceOntoHomeScreen)) { |
| 343 | if (!_toolbarMode && _qmlTabletRoot) { | 343 | if (!_toolbarMode && _qmlTabletRoot) { |
| 344 | auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader"); | 344 | auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader"); |