The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-10-02 03:35:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix issue 287 (really this time). Make battery theme-able. Use battery.png, battery_red.png, and battery_bar,png images. Use batteryUnused = ### in theme.txt to define transparency of icons for unused controllers. 0 is invisible; 255 is opauqe.

Browse Source
This commit is contained in:
giantpune 2009-05-15 04:07:34 +00:00
parent a97cfd3431
commit d15e8218a4
3 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/cfg.c
View File

@ -33,6 +33,7 @@ char current_path[100];
struct CFG CFG; struct CFG CFG;
struct THEME THEME; struct THEME THEME;
struct LANGUAGE LANGUAGE;
u8 ocarinaChoice = 0; u8 ocarinaChoice = 0;
u8 videoChoice = 0; u8 videoChoice = 0;
u8 languageChoice = 0; u8 languageChoice = 0;
@ -234,6 +235,7 @@ void CFG_Default(int widescreen) // -1 = non forced Mode
THEME.selection_y = 40; THEME.selection_y = 40;
THEME.selection_w = 396; THEME.selection_w = 396;
THEME.selection_h = 280; THEME.selection_h = 280;
THEME.batteryUnused = 70;
THEME.cover_x = 26; THEME.cover_x = 26;
THEME.cover_y = 55; THEME.cover_y = 55;
THEME.showID = 1; THEME.showID = 1;
@ -633,6 +635,13 @@ void theme_set(char *name, char *val)
} }
} }
else if (strcmp(cfg_name, "batteryUnused") == 0) {
short x;
if (sscanf(val, "%hd", &x) == 1) {
THEME.batteryUnused = x;
}
}
else if (strcmp(cfg_name, "maxcharacters") == 0) { else if (strcmp(cfg_name, "maxcharacters") == 0) {
short x; short x;
if (sscanf(val, "%hd", &x) == 1) { if (sscanf(val, "%hd", &x) == 1) {

6
source/cfg.h
View File

@ -70,6 +70,10 @@ struct CFG
char disc_path[100]; char disc_path[100];
}; };
struct LANGUAGE
{char Install[20];
};
struct THEME struct THEME
{ {
int selection_x; int selection_x;
@ -80,6 +84,7 @@ struct THEME
short cover_y; short cover_y;
short showID; short showID;
short maxcharacters; short maxcharacters;
short batteryUnused;
short id_x; short id_x;
short id_y; short id_y;
short region_x; short region_x;
@ -130,6 +135,7 @@ struct THEME
extern struct CFG CFG; extern struct CFG CFG;
extern struct THEME THEME; extern struct THEME THEME;
extern struct LANGUAGE LANGUAGE;
extern u8 ocarinaChoice; extern u8 ocarinaChoice;
extern u8 videoChoice; extern u8 videoChoice;
extern u8 languageChoice; extern u8 languageChoice;

46
source/menu.cpp
View File

@ -678,6 +678,9 @@ int GameWindowPrompt()
GuiImageData dialogBox(imgPath, CFG.widescreen ? wdialogue_box_startgame_png : dialogue_box_startgame_png); GuiImageData dialogBox(imgPath, CFG.widescreen ? wdialogue_box_startgame_png : dialogue_box_startgame_png);
GuiImage dialogBoxImg(&dialogBox); GuiImage dialogBoxImg(&dialogBox);
GuiTooltip nameBtnTT("Rename Game on WBFS");
if (Settings.wsprompt == yes)
nameBtnTT.SetWidescreen(CFG.widescreen);
GuiText msgTxt("", 22, (GXColor){50, 50, 50, 255}); GuiText msgTxt("", 22, (GXColor){50, 50, 50, 255});
GuiButton nameBtn(120,50); GuiButton nameBtn(120,50);
nameBtn.SetLabel(&msgTxt); nameBtn.SetLabel(&msgTxt);
@ -686,6 +689,7 @@ int GameWindowPrompt()
nameBtn.SetPosition(0,-122); nameBtn.SetPosition(0,-122);
nameBtn.SetSoundOver(&btnSoundOver); nameBtn.SetSoundOver(&btnSoundOver);
nameBtn.SetSoundClick(&btnClick); nameBtn.SetSoundClick(&btnClick);
nameBtn.SetToolTip(&nameBtnTT,24,-30, ALIGN_LEFT);
if (CFG.godmode == 1){ if (CFG.godmode == 1){
nameBtn.SetTrigger(&trigA); nameBtn.SetTrigger(&trigA);
@ -2000,9 +2004,17 @@ static int MenuInstall()
GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM, vol); GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM, vol);
GuiImageData battery(battery_png); //GuiImageData battery(battery_png);
GuiImageData batteryRed(battery_red_png); //GuiImageData batteryRed(battery_red_png);
GuiImageData batteryBar(battery_bar_png); //GuiImageData batteryBar(battery_bar_png);
char imgPath[100];
snprintf(imgPath, sizeof(imgPath), "%sbattery.png", CFG.theme_path);
GuiImageData battery(imgPath, battery_png);
snprintf(imgPath, sizeof(imgPath), "%sbattery_red.png", CFG.theme_path);
GuiImageData batteryRed(imgPath, battery_red_png);
snprintf(imgPath, sizeof(imgPath), "%sbattery_bar.png", CFG.theme_path);
GuiImageData batteryBar(imgPath, battery_bar_png);
#ifdef HW_RVL #ifdef HW_RVL
@ -2280,9 +2292,12 @@ static int MenuDiscList()
snprintf(imgPath, sizeof(imgPath), "%sSDcard.png", CFG.theme_path); snprintf(imgPath, sizeof(imgPath), "%sSDcard.png", CFG.theme_path);
GuiImageData btnsdcard(imgPath, sdcard_png); GuiImageData btnsdcard(imgPath, sdcard_png);
GuiImageData battery(battery_png); snprintf(imgPath, sizeof(imgPath), "%sbattery.png", CFG.theme_path);
GuiImageData batteryRed(battery_red_png); GuiImageData battery(imgPath, battery_png);
GuiImageData batteryBar(battery_bar_png); snprintf(imgPath, sizeof(imgPath), "%sbattery_red.png", CFG.theme_path);
GuiImageData batteryRed(imgPath, battery_red_png);
snprintf(imgPath, sizeof(imgPath), "%sbattery_bar.png", CFG.theme_path);
GuiImageData batteryBar(imgPath, battery_bar_png);
GuiTrigger trigA; GuiTrigger trigA;
trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A);
@ -2454,7 +2469,7 @@ static int MenuDiscList()
batteryBtn[i]->SetIcon(batteryImg[i]); batteryBtn[i]->SetIcon(batteryImg[i]);
batteryBtn[i]->SetAlignment(ALIGN_LEFT, ALIGN_TOP); batteryBtn[i]->SetAlignment(ALIGN_LEFT, ALIGN_TOP);
batteryBtn[i]->SetRumble(false); batteryBtn[i]->SetRumble(false);
batteryBtn[i]->SetAlpha(70); batteryBtn[i]->SetAlpha(THEME.batteryUnused);
} }
batteryBtn[0]->SetPosition(THEME.battery1_x, THEME.battery1_y); batteryBtn[0]->SetPosition(THEME.battery1_x, THEME.battery1_y);
@ -2572,7 +2587,7 @@ static int MenuDiscList()
{ {
batteryImg[i]->SetTile(0); batteryImg[i]->SetTile(0);
batteryImg[i]->SetImage(&battery); batteryImg[i]->SetImage(&battery);
batteryBtn[i]->SetAlpha(70); batteryBtn[i]->SetAlpha(THEME.batteryUnused);
} }
} }
#endif #endif
@ -4063,19 +4078,22 @@ static int MenuSettings()
{ {
//password check to unlock Install,Delete and Format //password check to unlock Install,Delete and Format
mainWindow->Remove(&optionBrowser2); mainWindow->Remove(&optionBrowser2);
// mainWindow->Remove(&page1Btn); mainWindow->Remove(&page1Btn);
// mainWindow->Remove(&page2Btn); mainWindow->Remove(&page2Btn);
mainWindow->Remove(&tabBtn);
mainWindow->Remove(&page3Btn);
w.Remove(&backBtn); w.Remove(&backBtn);
w.Remove(&lockBtn); w.Remove(&lockBtn);
w.Remove(&tabBtn);
char entered[20] = ""; char entered[20] = "";
int result = OnScreenKeyboard(entered, 20,0); int result = OnScreenKeyboard(entered, 20,0);
// mainWindow->Append(&page1Btn);
// mainWindow->Append(&page2Btn);
mainWindow->Append(&optionBrowser2); mainWindow->Append(&optionBrowser2);
mainWindow->Append(&tabBtn);
mainWindow->Append(&page1Btn);
mainWindow->Append(&page2Btn);
mainWindow->Append(&page3Btn);
w.Append(&backBtn); w.Append(&backBtn);
w.Append(&lockBtn); w.Append(&lockBtn);
w.Append(&tabBtn); mainWindow->Append(&tabBtn);
if ( result == 1 ) if ( result == 1 )
{ {
if (!strcmp(entered, Settings.unlockCode)) //if password correct if (!strcmp(entered, Settings.unlockCode)) //if password correct