From 07050183c09ebeacd6fbb3bfd8914d03362e52ff Mon Sep 17 00:00:00 2001 From: Hominem te esse Date: Wed, 7 Mar 2012 20:54:36 +0100 Subject: [PATCH] layout adjustment --- lng/lang_English.lng | 2 +- lng/lang_French.lng | 6 ++-- lng/lang_German.lng | 10 +++--- lng/lang_Hungarian.lng | 57 ++++++++++++++++++++++++------ src/dialogs.c | 95 ++++++++++++++++++++++++-------------------------- src/themes.c | 6 ++-- 6 files changed, 104 insertions(+), 72 deletions(-) diff --git a/lng/lang_English.lng b/lng/lang_English.lng index 9a08711..b8f3175 100644 --- a/lng/lang_English.lng +++ b/lng/lang_English.lng @@ -98,7 +98,7 @@ Rename Delete Run Display settings -Enable Delete and Rename operations +Enable Delete and Rename actions Check USB game fragmentation Remember last played game Error, the game is fragmented diff --git a/lng/lang_French.lng b/lng/lang_French.lng index d34407b..8d33df4 100644 --- a/lng/lang_French.lng +++ b/lng/lang_French.lng @@ -69,7 +69,7 @@ Renommer Supprimer Démarrer Réglages graphique -Activer les opérations Supprimer/Renommer +Activer les actions Supprimer/Renommer Vérifier la fragmentation des jeux USB Se rappeler le dernier jeu Erreur, le jeu est fragmenté @@ -100,7 +100,7 @@ La VMC existe Fichier VMC incorrect, taille de VMC invalide La VMC doit être crée Erreur sur VMC %s, continuer avec la MC physique (carte %d) ? -Rafraîchissement automatique +Mise à jour automatique À propos Développeurs Délai USB @@ -136,5 +136,5 @@ Mode 6 Mode 7 Mode 8 Mode 9 -Temporisation callback +Temporisation CDVD Applique un délai aux opérations du CDVD (0 par défaut) \ No newline at end of file diff --git a/lng/lang_German.lng b/lng/lang_German.lng index 5c56cae..3bed634 100644 --- a/lng/lang_German.lng +++ b/lng/lang_German.lng @@ -20,7 +20,7 @@ Fehler beim Starten des Netzwerks: %d Ein Aus Ok -Spiel-Einstellungen +Spieleinstellungen Alle Einstellungen entfernen Alle Einstellungen des Spiels entfernt. Scrolling @@ -33,7 +33,7 @@ Bitte warten Fehler beim Laden der Spiel-ID Automatische Sortierung Fehler beim Laden der Sprachdatei -Debugfarben ausschalten +Keine Debugfarben Kein Controller gefunden, warte ... Cover-Art einschalten Breitbild @@ -70,7 +70,7 @@ Löschen Starten Anzeige-Konfiguration Löschen/Umbenennen aktivieren -USB-Fragmentierung überprüfen +USB-Fragmentierung prüfen Zuletzt gespieltes Spiel merken Fehler! Das Spiel ist fragmentiert. Fehler! Der Eintrag konnte nicht gestartet werden. @@ -97,9 +97,9 @@ Größe Status Fortschritt VMC-Datei existiert -Ungültige VMC-Datei, Größe ist inkorrekt +Ungültige VMC-Datei, Grösse ist inkorrekt VMC-Datei muss erstellt werden -Fehlerhafte VMC-Datei, mit physischer MC fortfahren? +Fehler mit VMC %s, mit echter Karte im Anschluß %d fortfahren? Automatische Aktualisierung Über OPL Programmierer diff --git a/lng/lang_Hungarian.lng b/lng/lang_Hungarian.lng index 3ad8aed..a9428d1 100644 --- a/lng/lang_Hungarian.lng +++ b/lng/lang_Hungarian.lng @@ -3,7 +3,7 @@ Hungarian ÜDVÖZÖL AZ OPEN PS2 LOADER. FŐ KÓD A HD PROJECT FORRÁSKÓDJÁN ALAPUL AZ USB ADVANCE FORMÁTUM ÉS A KEZDŐ GUI IFCARO NEVÉHEZ FŰZŐDIK A LOADER MAGJÁT NAGYRÉSZBEN JIMMIKAELKAEL KÉSZÍTETTE. A GUI FEJLESZTÉSEKET VOLCA KÉSZÍTETTE. KÖSZÖNJÜK, HOGY A PROGRAMUNKAT HASZNÁLOD ^^ Open PS2 Loader %s Beállítások mentése -O Vissza +Vissza Hálózat beállítása Beállítások elmentve... @@ -12,11 +12,11 @@ Kilépés Beállítások USB játékok HDD játékok -Hálózati játékok +ETH játékok Alkalmazások Téma Nyelv -Hálózati hiba +Hálózati hiba: %d Be Ki Ok @@ -49,10 +49,10 @@ Automatikus Kézi HDL szerver indítása HDL szerver indítása folyamatban... -A HDL szerver megy... Nyomd meg a [O]-t a megállításhoz +A HDL szerver fut... Nyomd meg a [O]-t a megállításhoz Nyomd meg az [X]-t a HDL szerver befejezéséhez HDL szerver feltöltés folyamatban... -Kilépés ide: +Kilépés ide Háttérszín Szöveg színe IP @@ -63,7 +63,7 @@ Megosztás Felhasználónév Jelszó -X elfogadás +Elfogadás Az adat véglegesen törölve lesz, folytatod? Átnevezés Törlés @@ -82,7 +82,7 @@ Syscall kiakasztása 0 PSS mód DVD-DL kikapcsolása IGR kikapcsolása -Csökkentett cdvdfsv puffer +Használaton kívül dev9 modul elrejtése Alternatív IGR kombináció A méret megváltoztatása, újraformázza a VMC-t @@ -90,16 +90,51 @@ Készít Változtat Megszakít Reset -Use generic +Általános használata VMC beállítása Név Méret Státusz Folyamat A VMC fájl már létezik -Érvénytelen VMC fájl, nem megfelelő a méret +Érvénytelen a VMC fájl, nem megfelelő a méret El kell készíteni a VMC fájlt -Hiba a VMC fájllal, folytatod a fizikai MC-vel? +Hiba a VMC %s fájllal, folytatod a fizikai MC (hely %d)-vel? Automatikus frissítés Névjegy -Kódolók \ No newline at end of file +Kódolók +USB késleltetés +USB elérési útvonala +Hagyd üresen ha a Browserbe akarsz kilépni +Érték percben, 0 a leállítás kikapcsolása +Automatikus HDD leállítás +Videó mód +Felirat színe +Kiválasztott szín +Információs oldal megjelenítése +Információ +Custom ELF +Szín kijelölés +Újracsatlakozás +Hagyd szabadon a lista megosztáshoz +ETH elérési útvonala +Visszatörlés +Szóköz +Enter +Mód +VMC hely 1 +VMC hely 2 +Game ID +DMA Mód +V-Sync +Mód 1 +Mód 2 +Mód 3 +Mód 4 +Mód 5 +Mód 6 +Mód 7 +Mód 8 +Mód 9 +Visszahívás időzítő +A CDVD funkciók késleltetésének engedélyezése (0 az alapértelmezett) \ No newline at end of file diff --git a/src/dialogs.c b/src/dialogs.c index 0a89562..ea4813c 100644 --- a/src/dialogs.c +++ b/src/dialogs.c @@ -15,7 +15,7 @@ struct UIItem diaIPConfig[] = { {UI_LABEL, 0, 1, -1, 0, 0, {.label = {"- PS2 -", -1}}}, {UI_BREAK}, // ---- IP address ---- - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_IP}}}, {UI_SPACER}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_IP}}}, {UI_SPACER}, {UI_INT, 2, 1, -1, 0, 0, {.intvalue = {192, 192, 0, 255}}}, {UI_LABEL, 0, 1, -1, 0, 0, {.label = {".", -1}}}, {UI_INT, 3, 1, -1, 0, 0, {.intvalue = {168, 168, 0, 255}}}, {UI_LABEL, 0, 1, -1, 0, 0, {.label = {".", -1}}}, @@ -23,7 +23,7 @@ struct UIItem diaIPConfig[] = { {UI_INT, 5, 1, -1, 0, 0, {.intvalue = {10, 10, 0, 255}}}, {UI_BREAK}, // ---- Netmask ---- - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_MASK}}}, {UI_SPACER}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_MASK}}}, {UI_SPACER}, {UI_INT, 6, 1, -1, 0, 0, {.intvalue = {255, 255, 0, 255}}}, {UI_LABEL, 0, 1, -1, 0, 0, {.label = {".", -1}}}, {UI_INT, 7, 1, -1, 0, 0, {.intvalue = {255, 255, 0, 255}}}, {UI_LABEL, 0, 1, -1, 0, 0, {.label = {".", -1}}}, @@ -31,7 +31,7 @@ struct UIItem diaIPConfig[] = { {UI_INT, 9, 1, -1, 0, 0, {.intvalue = {0, 0, 0, 255}}}, {UI_BREAK}, // ---- Gateway ---- - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_GATEWAY}}}, {UI_SPACER}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_GATEWAY}}}, {UI_SPACER}, {UI_INT, 10, 1, -1, 0, 0, {.intvalue = {192, 192, 0, 255}}}, {UI_LABEL, 0, 1, -1, 0, 0, {.label = {".", -1}}}, {UI_INT, 11, 1, -1, 0, 0, {.intvalue = {168, 168, 0, 255}}}, {UI_LABEL, 0, 1, -1, 0, 0, {.label = {".", -1}}}, @@ -43,21 +43,21 @@ struct UIItem diaIPConfig[] = { // ---- PC ---- {UI_LABEL, 0, 1, -1, 0, 0, {.label = {"- PC -", -1}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_IP}}}, {UI_SPACER}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_IP}}}, {UI_SPACER}, {UI_INT, 14, 1, -1, 0, 0, {.intvalue = {192, 192, 0, 255}}}, {UI_LABEL, 0, 1, -1, 0, 0, {.label = {".", -1}}}, {UI_INT, 15, 1, -1, 0, 0, {.intvalue = {168, 168, 0, 255}}}, {UI_LABEL, 0, 1, -1, 0, 0, {.label = {".", -1}}}, {UI_INT, 16, 1, -1, 0, 0, {.intvalue = {0, 0, 0, 255}}}, {UI_LABEL, 0, 1, -1, 0, 0, {.label = {".", -1}}}, {UI_INT, 17, 1, -1, 0, 0, {.intvalue = {1, 1, 0, 255}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_PORT}}}, {UI_SPACER}, {UI_INT, 18, 1, -1, 0, 0, {.intvalue = {445, 445, 0, 1024}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_PORT}}}, {UI_SPACER}, {UI_INT, 18, 1, -1, 0, 0, {.intvalue = {445, 445, 0, 1024}}}, {UI_BREAK}, {UI_BREAK}, // ---- PC share name ---- - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_SHARE}}}, {UI_SPACER}, {UI_STRING, 19, 1, _STR_HINT_SHARENAME, 0, 0, {.stringvalue = {"PS2SMB", "PS2SMB", NULL}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_USER}}}, {UI_SPACER}, {UI_STRING, 20, 1, -1, 0, 0, {.stringvalue = {"GUEST", "GUEST", NULL}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_PASSWORD}}}, {UI_SPACER}, {UI_PASSWORD, 21, 1, _STR_HINT_GUEST, 0, 0, {.stringvalue = {"", "", NULL}}}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_SHARE}}}, {UI_SPACER}, {UI_STRING, 19, 1, _STR_HINT_SHARENAME, 0, 0, {.stringvalue = {"PS2SMB", "PS2SMB", NULL}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_USER}}}, {UI_SPACER}, {UI_STRING, 20, 1, -1, 0, 0, {.stringvalue = {"GUEST", "GUEST", NULL}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_PASSWORD}}}, {UI_SPACER}, {UI_PASSWORD, 21, 1, _STR_HINT_GUEST, 0, 0, {.stringvalue = {"", "", NULL}}}, {UI_SPLITTER}, @@ -89,19 +89,19 @@ struct UIItem diaCompatConfig[] = { {UI_BREAK}, - {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_CDVDMAN_TIMER}}}, {UI_SPACER}, {UI_INT, COMPAT_CDVDMAN_TIMER, 1, _STR_HINT_CDVDMAN_TIMER, 0, 0, {.intvalue = {0, 0, 0, 255}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_DMA_MODE}}}, {UI_SPACER}, {UI_ENUM, COMPAT_DMA, 1, -1, 0, 0, {.intvalue = {0, 0}}}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_CDVDMAN_TIMER}}}, {UI_SPACER}, {UI_INT, COMPAT_CDVDMAN_TIMER, 1, _STR_HINT_CDVDMAN_TIMER, 0, 0, {.intvalue = {0, 0, 0, 255}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_DMA_MODE}}}, {UI_SPACER}, {UI_ENUM, COMPAT_DMA, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_SPLITTER}, #ifdef VMC - {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_VMC_SLOT1}}}, {UI_SPACER}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_VMC_SLOT1}}}, {UI_SPACER}, #ifndef __CHILDPROOF {UI_BUTTON, COMPAT_VMC1_DEFINE, 1, -1, 0, 0, {.label = {NULL, -1}}}, {UI_SPACER}, {UI_BUTTON, COMPAT_VMC1_ACTION, 1, -1, 0, 0, {.label = {NULL, -1}}}, {UI_BREAK}, #else {UI_BUTTON, COMPAT_VMC1_DEFINE, 0, -1, 0, 0, {.label = {NULL, -1}}}, {UI_BREAK}, #endif - {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_VMC_SLOT2}}}, {UI_SPACER}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_VMC_SLOT2}}}, {UI_SPACER}, #ifndef __CHILDPROOF {UI_BUTTON, COMPAT_VMC2_DEFINE, 1, -1, 0, 0, {.label = {NULL, -1}}}, {UI_SPACER}, {UI_BUTTON, COMPAT_VMC2_ACTION, 1, -1, 0, 0, {.label = {NULL, -1}}}, #else @@ -111,12 +111,12 @@ struct UIItem diaCompatConfig[] = { {UI_SPLITTER}, #endif - {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_GAME_ID}}}, {UI_SPACER}, {UI_STRING, COMPAT_GAMEID, 1, -1, 0, 0, {.stringvalue = {"", "", NULL}}}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_GAME_ID}}}, {UI_SPACER}, {UI_STRING, COMPAT_GAMEID, 1, -1, 0, 0, {.stringvalue = {"", "", NULL}}}, {UI_SPACER}, {UI_BUTTON, COMPAT_LOADFROMDISC, 1, -1, 0, 0, {.label = {NULL, _STR_LOAD_FROM_DISC}}}, {UI_SPLITTER}, - {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_ALTSTARTUP}}}, {UI_SPACER}, {UI_STRING, COMPAT_ALTSTARTUP, 1, -1, 0, 0, {.stringvalue = {"", "", &guiAltStartupNameHandler}}}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_ALTSTARTUP}}}, {UI_SPACER}, {UI_STRING, COMPAT_ALTSTARTUP, 1, -1, 0, 0, {.stringvalue = {"", "", &guiAltStartupNameHandler}}}, {UI_SPLITTER}, @@ -138,29 +138,26 @@ struct UIItem diaConfig[] = { {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_SETTINGS}}}, {UI_SPLITTER}, - {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_DEBUG}}}, {UI_SPACER}, {UI_BOOL, CFG_DEBUG, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_EXITTO}}}, {UI_SPACER}, {UI_STRING, CFG_EXITTO, 1, _STR_HINT_EXITPATH, 0, 0, {.stringvalue = {"", "", NULL}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_DANDROP}}}, {UI_SPACER}, {UI_BOOL, CFG_DANDROP, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_LASTPLAYED}}}, {UI_SPACER}, {UI_BOOL, CFG_LASTPLAYED, 1, -1, 0, 0, {.intvalue = {0, 0}}}, + {UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_DEBUG}}}, {UI_SPACER}, {UI_BOOL, CFG_DEBUG, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_EXITTO}}}, {UI_SPACER}, {UI_STRING, CFG_EXITTO, 1, _STR_HINT_EXITPATH, 0, 0, {.stringvalue = {"", "", NULL}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_DANDROP}}}, {UI_SPACER}, {UI_BOOL, CFG_DANDROP, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_LASTPLAYED}}}, {UI_SPACER}, {UI_BOOL, CFG_LASTPLAYED, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_SPLITTER}, - {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_CHECKUSBFRAG}}}, {UI_SPACER}, {UI_BOOL, CFG_CHECKUSBFRAG, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_USB_DELAY}}}, {UI_SPACER}, {UI_INT, CFG_USBDELAY, 1, -1, 0, 0, {.intvalue = {3, 3, 0, 99}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_USB_PREFIX}}}, {UI_SPACER}, {UI_STRING, CFG_USBPREFIX, 1, -1, 0, 0, {.stringvalue = {"", "", NULL}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_ETH_PREFIX}}}, {UI_SPACER}, {UI_STRING, CFG_ETHPREFIX, 1, -1, 0, 0, {.stringvalue = {"", "", NULL}}}, {UI_BREAK}, - - {UI_BREAK}, - - {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_HDD_SPINDOWN}}}, {UI_SPACER}, {UI_INT, CFG_HDDSPINDOWN, 1, _STR_HINT_SPINDOWN, 0, 0, {.intvalue = {20, 20, 0, 20}}}, + {UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_CHECKUSBFRAG}}}, {UI_SPACER}, {UI_BOOL, CFG_CHECKUSBFRAG, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_USB_DELAY}}}, {UI_SPACER}, {UI_INT, CFG_USBDELAY, 1, -1, 0, 0, {.intvalue = {3, 3, 0, 99}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_USB_PREFIX}}}, {UI_SPACER}, {UI_STRING, CFG_USBPREFIX, 1, -1, 0, 0, {.stringvalue = {"", "", NULL}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_ETH_PREFIX}}}, {UI_SPACER}, {UI_STRING, CFG_ETHPREFIX, 1, -1, 0, 0, {.stringvalue = {"", "", NULL}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_HDD_SPINDOWN}}}, {UI_SPACER}, {UI_INT, CFG_HDDSPINDOWN, 1, _STR_HINT_SPINDOWN, 0, 0, {.intvalue = {20, 20, 0, 20}}}, {UI_SPLITTER}, - {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_USBMODE}}}, {UI_SPACER}, {UI_ENUM, CFG_USBMODE, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_HDDMODE}}}, {UI_SPACER}, {UI_ENUM, CFG_HDDMODE, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_ETHMODE}}}, {UI_SPACER}, {UI_ENUM, CFG_ETHMODE, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_APPMODE}}}, {UI_SPACER}, {UI_ENUM, CFG_APPMODE, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_DEFDEVICE}}}, {UI_SPACER}, {UI_ENUM, CFG_DEFDEVICE, 1, -1, 0, 0, {.intvalue = {0, 0}}}, + {UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_USBMODE}}}, {UI_SPACER}, {UI_ENUM, CFG_USBMODE, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_HDDMODE}}}, {UI_SPACER}, {UI_ENUM, CFG_HDDMODE, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_ETHMODE}}}, {UI_SPACER}, {UI_ENUM, CFG_ETHMODE, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_APPMODE}}}, {UI_SPACER}, {UI_ENUM, CFG_APPMODE, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_DEFDEVICE}}}, {UI_SPACER}, {UI_ENUM, CFG_DEFDEVICE, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_SPLITTER}, @@ -175,30 +172,30 @@ struct UIItem diaUIConfig[] = { {UI_SPLITTER}, - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_THEME}}}, {UI_SPACER}, {UI_ENUM, UICFG_THEME, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_LANGUAGE}}}, {UI_SPACER}, {UI_ENUM, UICFG_LANG, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_SCROLLING}}}, {UI_SPACER}, {UI_ENUM, UICFG_SCROLL, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_AUTOSORT}}}, {UI_SPACER}, {UI_BOOL, UICFG_AUTOSORT, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_AUTOREFRESH}}}, {UI_SPACER}, {UI_BOOL, UICFG_AUTOREFRESH, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_COVERART}}}, {UI_SPACER}, {UI_BOOL, UICFG_COVERART, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_USE_INFO_SCREEN}}}, {UI_SPACER}, {UI_BOOL, UICFG_INFOPAGE, 1, -1, 0, 0, {.intvalue = {0, 0}}}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_THEME}}}, {UI_SPACER}, {UI_ENUM, UICFG_THEME, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_LANGUAGE}}}, {UI_SPACER}, {UI_ENUM, UICFG_LANG, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_SCROLLING}}}, {UI_SPACER}, {UI_ENUM, UICFG_SCROLL, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_AUTOSORT}}}, {UI_SPACER}, {UI_BOOL, UICFG_AUTOSORT, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_AUTOREFRESH}}}, {UI_SPACER}, {UI_BOOL, UICFG_AUTOREFRESH, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_COVERART}}}, {UI_SPACER}, {UI_BOOL, UICFG_COVERART, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_USE_INFO_SCREEN}}}, {UI_SPACER}, {UI_BOOL, UICFG_INFOPAGE, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_SPLITTER}, - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_TXTCOLOR}}}, {UI_SPACER}, {UI_COLOUR, UICFG_TXTCOL, 1, -1, -10, 17, {.colourvalue = {0, 0}}}, // UIItem #32 + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_TXTCOLOR}}}, {UI_SPACER}, {UI_COLOUR, UICFG_TXTCOL, 1, -1, -10, 17, {.colourvalue = {0, 0}}}, // UIItem #32 {UI_SPACER}, - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_SELCOLOR}}}, {UI_SPACER}, {UI_COLOUR, UICFG_SELCOL, 1, -1, -10, 17, {.colourvalue = {0, 0}}}, // UIItem #36 + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_SELCOLOR}}}, {UI_SPACER}, {UI_COLOUR, UICFG_SELCOL, 1, -1, -10, 17, {.colourvalue = {0, 0}}}, // UIItem #36 {UI_BREAK}, - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_UICOLOR}}}, {UI_SPACER}, {UI_COLOUR, UICFG_UICOL, 1, -1, -10, 17, {.colourvalue = {0, 0}}}, // UIItem #40 + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_UICOLOR}}}, {UI_SPACER}, {UI_COLOUR, UICFG_UICOL, 1, -1, -10, 17, {.colourvalue = {0, 0}}}, // UIItem #40 {UI_SPACER}, - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_BGCOLOR}}}, {UI_SPACER}, {UI_COLOUR, UICFG_BGCOL, 1, -1, -10, 17, {.colourvalue = {0, 0}}}, // UIItem #44 + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_BGCOLOR}}}, {UI_SPACER}, {UI_COLOUR, UICFG_BGCOL, 1, -1, -10, 17, {.colourvalue = {0, 0}}}, // UIItem #44 {UI_BREAK}, {UI_SPLITTER}, - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_VMODE}}}, {UI_SPACER}, {UI_ENUM, UICFG_VMODE, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_VSYNC}}}, {UI_SPACER}, {UI_BOOL, UICFG_VSYNC, 1, -1, 0, 0, {.intvalue = {1, 1}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_WIDE_SCREEN}}}, {UI_SPACER}, {UI_BOOL, UICFG_WIDESCREEN, 1, -1, 0, 0, {.intvalue = {0, 0}}}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_VMODE}}}, {UI_SPACER}, {UI_ENUM, UICFG_VMODE, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_VSYNC}}}, {UI_SPACER}, {UI_BOOL, UICFG_VSYNC, 1, -1, 0, 0, {.intvalue = {1, 1}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -30, 0, {.label = {NULL, _STR_WIDE_SCREEN}}}, {UI_SPACER}, {UI_BOOL, UICFG_WIDESCREEN, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_SPLITTER}, @@ -238,13 +235,13 @@ struct UIItem diaVMC[] = { {UI_SPLITTER}, - {UI_LABEL, 0, 1, -1, -15, 0, {.label = {NULL, _STR_VMC_NAME}}}, {UI_SPACER}, {UI_STRING, VMC_NAME, 1, -1, 0, 0, {.stringvalue = {"", "", &guiVmcNameHandler}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, -15, 0, {.label = {NULL, _STR_VMC_SIZE}}}, {UI_SPACER}, {UI_ENUM, VMC_SIZE, 1, _STR_HINT_VMC_SIZE, 0, 0, {.intvalue = {0, 0}}}, + {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_VMC_NAME}}}, {UI_SPACER}, {UI_STRING, VMC_NAME, 1, -1, 0, 0, {.stringvalue = {"", "", &guiVmcNameHandler}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_VMC_SIZE}}}, {UI_SPACER}, {UI_ENUM, VMC_SIZE, 1, _STR_HINT_VMC_SIZE, 0, 0, {.intvalue = {0, 0}}}, {UI_SPLITTER}, - {UI_LABEL, 0, 1, -1, -15, 0, {.label = {NULL, _STR_VMC_STATUS}}}, {UI_SPACER}, {UI_LABEL, VMC_STATUS, 0, -1, 0, 0, {.label = {NULL, -1}}}, {UI_BREAK}, - {UI_LABEL, 0, 1, -1, -15, 0, {.label = {NULL, _STR_VMC_PROGRESS}}}, {UI_SPACER}, {UI_INT, VMC_PROGRESS, 0, -1, 0, 0, {.intvalue = {0, 0, 0, 100}}}, {UI_LABEL, 0, 1, -1, 0, 0, {.label = {"%", -1}}}, + {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_VMC_STATUS}}}, {UI_SPACER}, {UI_LABEL, VMC_STATUS, 0, -1, 0, 0, {.label = {NULL, -1}}}, {UI_BREAK}, + {UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_VMC_PROGRESS}}}, {UI_SPACER}, {UI_INT, VMC_PROGRESS, 0, -1, 0, 0, {.intvalue = {0, 0, 0, 100}}}, {UI_LABEL, 0, 1, -1, 0, 0, {.label = {"%", -1}}}, {UI_SPLITTER}, diff --git a/src/themes.c b/src/themes.c index 938f9b4..86bf7e7 100644 --- a/src/themes.c +++ b/src/themes.c @@ -347,13 +347,13 @@ static mutable_image_t* initMutableImage(char* themePath, config_set_t* themeCon if (type == TYPE_ATTRIBUTE_IMAGE) { snprintf(elemProp, 64, "%s_attribute", name); configGetStr(themeConfig, elemProp, &cachePattern); - LOG("THEMES MutableImage %s: type: %d using cache pattern: %s\n", name, type, cachePattern); + LOG("THEMES MutableImage %s: type: %s using cache pattern: %s\n", name, elementsType[type], cachePattern); } else if ((type == TYPE_GAME_IMAGE) || type == (TYPE_BACKGROUND)) { snprintf(elemProp, 64, "%s_pattern", name); configGetStr(themeConfig, elemProp, &cachePattern); snprintf(elemProp, 64, "%s_count", name); configGetInt(themeConfig, elemProp, &cacheCount); - LOG("THEMES MutableImage %s: type: %d using cache pattern: %s\n", name, type, cachePattern); + LOG("THEMES MutableImage %s: type: %s using cache pattern: %s count: %d\n", name, elementsType[type], cachePattern, cacheCount); } snprintf(elemProp, 64, "%s_default", name); @@ -861,7 +861,7 @@ static int addGUIElem(char* themePath, config_set_t* themeConfig, theme_t* theme elem->drawElem = &drawInfoHintText; } else if (!strcmp(elementsType[TYPE_LOADING_ICON], type)) { if (!theme->loadingIcon) - theme->loadingIcon = initBasic(themePath, themeConfig, theme, name, TYPE_LOADING_ICON, -50, -50, ALIGN_CENTER, DIM_UNDEF, DIM_UNDEF, SCALING_RATIO, gDefaultCol, FNT_DEFAULT); + theme->loadingIcon = initBasic(themePath, themeConfig, theme, name, TYPE_LOADING_ICON, -40, -60, ALIGN_CENTER, DIM_UNDEF, DIM_UNDEF, SCALING_RATIO, gDefaultCol, FNT_DEFAULT); } if (elem) { -- 2.11.4.GIT