Changeset View
Changeset View
Standalone View
Standalone View
src/core/main.qml
Show First 20 Lines • Show All 230 Lines • ▼ Show 20 Line(s) | 228 | delegate: StackViewDelegate { | |||
---|---|---|---|---|---|
231 | { | 231 | { | ||
232 | audioVoices.clearQueue() | 232 | audioVoices.clearQueue() | ||
233 | audioVoices.stop() | 233 | audioVoices.stop() | ||
234 | 234 | | |||
235 | if(!properties.exitItem.isDialog && // if coming from menu and | 235 | if(!properties.exitItem.isDialog && // if coming from menu and | ||
236 | !properties.enterItem.isDialog) // going into an activity then | 236 | !properties.enterItem.isDialog) // going into an activity then | ||
237 | playIntroVoice(properties.enterItem.activityInfo.name); // play intro | 237 | playIntroVoice(properties.enterItem.activityInfo.name); // play intro | ||
238 | 238 | | |||
239 | // is this if needed? | 239 | // Don't restart an activity if you click on help | ||
240 | //if (!properties.exitItem.isDialog || // if coming from menu or | 240 | if (!properties.exitItem.isDialog || // if coming from menu or | ||
241 | // properties.enterItem.alwaysStart) // start signal enforced (for special case like transition from config-dialog to editor) | 241 | properties.enterItem.alwaysStart) // start signal enforced (for special case like transition from config-dialog to editor) | ||
242 | properties.enterItem.start(); | 242 | properties.enterItem.start(); | ||
243 | 243 | | |||
244 | if(properties.name === "pushTransition") { | 244 | if(properties.name === "pushTransition") { | ||
245 | if(properties.enterItem.isDialog) { | 245 | if(properties.enterItem.isDialog) { | ||
246 | return pushVTransition | 246 | return pushVTransition | ||
247 | } else { | 247 | } else { | ||
248 | if(properties.enterItem.isMusicalActivity) | 248 | if(properties.enterItem.isMusicalActivity) | ||
249 | main.isMusicalActivityRunning = true | 249 | main.isMusicalActivityRunning = true | ||
▲ Show 20 Lines • Show All 102 Lines • Show Last 20 Lines |