feat: dynamische Cookie-Bilder je nach Liste
- Füge listenspezifische PNGs hinzu (famous quotes, farmer wisdom, UNfortune, idioms, sandman, unicorn, vegan recipes) - Implementiere dynamische Bildauswahl basierend auf currentFortuneListName - Cookie-Bild aktualisiert sich sofort beim Start und Listenwechsel - Bereinige Cookie-Icon-Größen für einheitliches Aussehen (34x30 / 30x26 GU) - Entferne Spruchanzahl in Klammern aus Listenbeschreibungen - Füge Switch für Cookie-Knacksgeräusch (cookieCrackEnabled) in Einstellungen hinzu - Optimierte updateCookieImage()-Funktion mit expliziten Aufrufen bei allen Zustandsänderungen Generated by Mistral Vibe. Co-Authored-By: Mistral Vibe <vibe@mistral.ai>
This commit is contained in:
darklithium
+56
-13
@@ -19,8 +19,26 @@ MainView {
|
||||
property bool fortuneOpened: false
|
||||
property string currentFortune: ""
|
||||
property bool musicPlaying: false
|
||||
property bool cookieCrackEnabled: true
|
||||
property bool appInitialized: false
|
||||
property string currentFortuneListDescription: ""
|
||||
property string currentFortuneListName: ""
|
||||
|
||||
function updateCookieImage() {
|
||||
var listName = currentFortuneListName || "fortune";
|
||||
var availableLists = ["farmer wisdom", "UNfortune", "sandman", "famous quotes", "idioms", "vegan recipes", "unicorn"];
|
||||
if (availableLists.indexOf(listName) !== -1) {
|
||||
var encodedName = listName.replace(/ /g, "%20");
|
||||
cookieImage.source = Qt.resolvedUrl("../assets/" + encodedName + (fortuneOpened ? "_open.png" : "_close.png"));
|
||||
} else {
|
||||
cookieImage.source = fortuneOpened ? Qt.resolvedUrl("../assets/cookie_open2.png") : Qt.resolvedUrl("../assets/cookie_closed2.png");
|
||||
}
|
||||
}
|
||||
|
||||
// Entfernt Spruchanzahl in Klammern aus Beschreibung (z.B. "Text (15)" → "Text")
|
||||
function cleanDescription(text) {
|
||||
return text.replace(/\s*\(\d+\)$/, "");
|
||||
}
|
||||
|
||||
Python {
|
||||
id: py
|
||||
@@ -94,20 +112,25 @@ MainView {
|
||||
py.call("fortunecookie.get_initial_fortune", [], function(result) {
|
||||
currentFortune = result;
|
||||
currentFortuneLabel.text = currentFortune;
|
||||
cookieImage.source = Qt.resolvedUrl("../assets/cookie_closed2.png");
|
||||
});
|
||||
|
||||
// Musik-Status laden
|
||||
py.call("fortunecookie.get_music_enabled", [], function(result) {
|
||||
musicPlaying = result;
|
||||
console.log("DEBUG QML: musicPlaying geladen: " + musicPlaying);
|
||||
if (musicPlaying) {
|
||||
mediaPlayer.play();
|
||||
}
|
||||
});
|
||||
|
||||
// Cookie-Crack-Sound-Status laden (lokal gespeichert)
|
||||
py.call("fortunecookie.get_cookie_crack_enabled", [], function(result) {
|
||||
root.cookieCrackEnabled = (result !== false && result !== undefined); // Default: true
|
||||
});
|
||||
|
||||
// Aktuelle Liste laden und Beschreibung setzen
|
||||
py.call("fortunecookie.get_current_fortune_list", [], function(listName) {
|
||||
root.currentFortuneListName = listName;
|
||||
Qt.callLater(function() { updateCookieImage(); });
|
||||
var descriptions = {
|
||||
"fortune": "klassische Glückskeks-Sprüche",
|
||||
"farmer wisdom": "Bauernweisheiten",
|
||||
@@ -118,7 +141,7 @@ MainView {
|
||||
"vegan recipes": "Vegane Rezeptideen",
|
||||
"unicorn": "Einhorn Glückssprüche (die fast schon wehtun)"
|
||||
};
|
||||
root.currentFortuneListDescription = descriptions[listName] || listName;
|
||||
root.currentFortuneListDescription = cleanDescription(descriptions[listName] || listName);
|
||||
});
|
||||
|
||||
appInitialized = true;
|
||||
@@ -132,9 +155,9 @@ MainView {
|
||||
Image {
|
||||
id: cookieImage
|
||||
anchors.centerIn: parent
|
||||
width: fortuneOpened ? units.gu(36) : units.gu(32)
|
||||
height: fortuneOpened ? units.gu(28) : units.gu(24)
|
||||
source: fortuneOpened ? Qt.resolvedUrl("../assets/cookie_open2.png") : Qt.resolvedUrl("../assets/cookie_closed2.png")
|
||||
width: fortuneOpened ? units.gu(34) : units.gu(30)
|
||||
height: fortuneOpened ? units.gu(30) : units.gu(26)
|
||||
source: ""
|
||||
fillMode: Image.PreserveAspectFit
|
||||
|
||||
MouseArea {
|
||||
@@ -146,13 +169,13 @@ MainView {
|
||||
onReleased: {
|
||||
if (mouseY < startY - units.gu(2)) {
|
||||
py.call("fortunecookie.open_fortune", [], function() {
|
||||
crackMediaPlayer.play();
|
||||
if (cookieCrackEnabled) crackMediaPlayer.play();
|
||||
fortuneOpened = true;
|
||||
updateCookieImage();
|
||||
py.call("fortunecookie.get_current_fortune", [], function(result) {
|
||||
currentFortune = result;
|
||||
currentFortuneLabel.text = currentFortune;
|
||||
currentFortuneLabel.visible = true;
|
||||
cookieImage.source = Qt.resolvedUrl("../assets/cookie_open2.png");
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -166,20 +189,20 @@ MainView {
|
||||
onClicked: {
|
||||
if (!fortuneOpened) {
|
||||
py.call("fortunecookie.open_fortune", [], function() {
|
||||
crackMediaPlayer.play();
|
||||
if (cookieCrackEnabled) crackMediaPlayer.play();
|
||||
fortuneOpened = true;
|
||||
updateCookieImage();
|
||||
py.call("fortunecookie.get_current_fortune", [], function(result) {
|
||||
currentFortune = result;
|
||||
currentFortuneLabel.text = currentFortune;
|
||||
currentFortuneLabel.visible = true;
|
||||
cookieImage.source = Qt.resolvedUrl("../assets/cookie_open2.png");
|
||||
});
|
||||
});
|
||||
} else {
|
||||
fortuneOpened = false;
|
||||
updateCookieImage();
|
||||
currentFortuneLabel.text = "";
|
||||
currentFortuneLabel.visible = false;
|
||||
cookieImage.source = Qt.resolvedUrl("../assets/cookie_closed2.png");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -207,10 +230,10 @@ MainView {
|
||||
onClicked: {
|
||||
py.call("fortunecookie.get_new_fortune", [], function() {
|
||||
fortuneOpened = false;
|
||||
updateCookieImage();
|
||||
py.call("fortunecookie.get_current_fortune", [], function(result) {
|
||||
currentFortune = result;
|
||||
currentFortuneLabel.text = currentFortune;
|
||||
cookieImage.source = Qt.resolvedUrl("../assets/cookie_closed2.png");
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -332,13 +355,33 @@ MainView {
|
||||
var newList = newListObj ? newListObj.list_name : "fortune";
|
||||
py.call("fortunecookie.set_fortune_list", [newList], function() {
|
||||
console.log("Spruchliste gewaehlt: " + newList);
|
||||
root.currentFortuneListName = newList;
|
||||
updateCookieImage();
|
||||
reloadFortune();
|
||||
// Aktualisiere die Anzeige im Hauptbildschirm
|
||||
root.currentFortuneListDescription = newListObj ? newListObj.description : "";
|
||||
root.currentFortuneListDescription = newListObj ? cleanDescription(newListObj.description) : "";
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// COOKIE-CRACK-SOUND TOGGLE
|
||||
Label {
|
||||
text: "Cookie-Knacksgeräusch:"
|
||||
Layout.fillWidth: true
|
||||
fontSize: "large"
|
||||
}
|
||||
|
||||
Switch {
|
||||
id: crackSoundSwitch
|
||||
Layout.fillWidth: false
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
checked: cookieCrackEnabled
|
||||
onCheckedChanged: {
|
||||
cookieCrackEnabled = checked;
|
||||
py.call("fortunecookie.set_cookie_crack_enabled", [checked]);
|
||||
}
|
||||
}
|
||||
|
||||
// ZURÜCK-BUTTON
|
||||
Item {
|
||||
Layout.fillWidth: true
|
||||
|
||||
Reference in New Issue
Block a user