From d250f7b201cbb4c7b3bbba157ca33158df287aa2 Mon Sep 17 00:00:00 2001 From: Christopher Roy Bratusek Date: Mon, 8 Apr 2013 19:53:26 +0200 Subject: [PATCH] + disable reading Homewbrew from DVD on vWii + display GC-MemoryCard symbol in app-info-dialog on real Wii, if device icon is enabled in settings + Fixed bug that made HBF search for Settings Editor GUI on DVD, GCA and GCB, even if already found on SD or USB + Set "Settings.{dvd,gca,gcb}_insert" to false on vWii --- NEWS | 1 - main/source/Menus/menu_main.cpp | 14 +++++++------- main/source/Neek/data/raw2c.exe | Bin main/source/Prompts/prompt_app_info.cpp | 10 ++++++++++ main/source/Prompts/prompt_device.cpp | 16 ++++++++-------- main/source/Prompts/prompt_loader.cpp | 4 ++-- main/source/Tools/app_list.cpp | 6 +++--- main/source/Tools/copy_app_in_category.cpp | 16 ++++++++-------- main/source/Tools/fileop.cpp | 8 ++++---- main/source/main.cpp | 16 +++++++++++----- main/source/menu.cpp | 6 +++--- web/updates | 6 ++++++ 12 files changed, 62 insertions(+), 41 deletions(-) delete mode 120000 NEWS mode change 100644 => 100755 main/source/Neek/data/raw2c.exe diff --git a/NEWS b/NEWS deleted file mode 120000 index 9a5115d..0000000 --- a/NEWS +++ /dev/null @@ -1 +0,0 @@ -web/updates \ No newline at end of file diff --git a/main/source/Menus/menu_main.cpp b/main/source/Menus/menu_main.cpp index 5871be1..9f8b85f 100644 --- a/main/source/Menus/menu_main.cpp +++ b/main/source/Menus/menu_main.cpp @@ -82,7 +82,7 @@ int MenuMain() temp_apps_btn = Theme.apps_list; temp_apps_btnOver = Theme.apps_list_hover; - // symbol fr grid ansicht + // symbol für grid ansicht temp_normal_grid_inactive = Theme.normal_inactive; temp_normal_grid_active = Theme.normal_active; @@ -90,7 +90,7 @@ int MenuMain() apps_row = 1; } - // sd / usb / dvd Ansicht + // Geräte Auswahl if(Settings.device == "sd1") { temp_sd_usb_active = Theme.sd_active; @@ -106,12 +106,12 @@ int MenuMain() temp_sd_usb_active = Theme.sd_usb_active; temp_sd_usb_inactive = Theme.sd_usb_inactive; } +#ifndef VWII else if(Settings.device == "dvd") { temp_sd_usb_active = Theme.dvd_active; temp_sd_usb_inactive = Theme.dvd_inactive; } -#ifndef VWII else if(Settings.device == "gca") { temp_sd_usb_active = Theme.gca_active; @@ -422,12 +422,12 @@ int MenuMain() viewdevice = new GuiImage(new GuiImageData(Theme.usb_inactive)); icon = true; } +#ifndef VWII else if(strncmp(vechomebrew_list_choice[i].foldername.c_str(), "dvd", 3) == 0) { viewdevice = new GuiImage (new GuiImageData(Theme.dvd_inactive)); icon = true; } -#ifndef VWII else if(strncmp(vechomebrew_list_choice[i].foldername.c_str(), "gca", 3) == 0) { viewdevice = new GuiImage (new GuiImageData(Theme.gca_inactive)); @@ -748,8 +748,8 @@ int MenuMain() // SD, USB else if(sd_usb_Btn.GetState() == STATE_CLICKED || Settings.sd_insert == -1 || Settings.sd_insert == 2 || Settings.usb_insert == -1 || Settings.usb_insert == 2 - || Settings.dvd_insert == -1 || Settings.dvd_insert == 2 #ifndef VWII + || Settings.dvd_insert == -1 || Settings.dvd_insert == 2 || Settings.gca_insert == -1 || Settings.gca_insert == 2 || Settings.gcb_insert == -1 || Settings.gcb_insert == 2 #endif @@ -765,9 +765,9 @@ int MenuMain() Settings.device = "usb1"; else if(device == 3) Settings.device = "sd_usb"; +#ifndef VWII else if(device == 4) Settings.device = "dvd"; -#ifndef VWII else if(device == 5) Settings.device = "gca"; else if(device == 6) @@ -778,8 +778,8 @@ int MenuMain() if(device != -1 || Settings.sd_insert == -1 || Settings.sd_insert == 2 || Settings.usb_insert == -1 || Settings.usb_insert == 2 - || Settings.dvd_insert == -1 || Settings.dvd_insert == 2 #ifndef VWII + || Settings.dvd_insert == -1 || Settings.dvd_insert == 2 || Settings.gca_insert == -1 || Settings.gca_insert == 2 || Settings.gcb_insert == -1 || Settings.gcb_insert == 2 #endif diff --git a/main/source/Neek/data/raw2c.exe b/main/source/Neek/data/raw2c.exe old mode 100644 new mode 100755 diff --git a/main/source/Prompts/prompt_app_info.cpp b/main/source/Prompts/prompt_app_info.cpp index 48138db..23f4e30 100644 --- a/main/source/Prompts/prompt_app_info.cpp +++ b/main/source/Prompts/prompt_app_info.cpp @@ -72,11 +72,21 @@ AppInfo(const char *title, string dir, u8* icon) viewdevice = new GuiImage(new GuiImageData(Theme.usb_inactive)); icon = true; } + #ifndef VWII else if(strncmp(dir.c_str(), "dvd", 3) == 0) { viewdevice = new GuiImage(new GuiImageData(Theme.dvd_inactive)); icon = true; } + else if(strncmp(dir.c_str(), "gca", 3) == 0) + viewdevice = new GuiImage(new GuiImageData(Theme.gca_inactive)); + icon = true; + } + else if(strncmp(dir.c_str(), "gcb", 3) == 0) + { + viewdevice = new GuiImage(new GuiImageData(Theme.gcb_inactive)); + icon = true; + } if(icon) { diff --git a/main/source/Prompts/prompt_device.cpp b/main/source/Prompts/prompt_device.cpp index ea816b7..9ff6af0 100644 --- a/main/source/Prompts/prompt_device.cpp +++ b/main/source/Prompts/prompt_device.cpp @@ -41,9 +41,9 @@ int devicePrompt() GuiImageData usb_BtnImgDataOver(Theme.usb_active); GuiImageData sd_usb_BtnImgData(Theme.sd_usb_inactive); GuiImageData sd_usb_BtnImgDataOver(Theme.sd_usb_active); +#ifndef VWII GuiImageData dvd_BtnImgData(Theme.dvd_inactive); GuiImageData dvd_BtnImgDataOver(Theme.dvd_active); -#ifndef VWII GuiImageData gca_BtnImgData(Theme.gca_inactive); GuiImageData gca_BtnImgDataOver(Theme.gca_active); GuiImageData gcb_BtnImgData(Theme.gcb_inactive); @@ -56,8 +56,8 @@ int devicePrompt() GuiImage sd_BtnImg(&sd_BtnImgData); GuiImage usb_BtnImg(&usb_BtnImgData); GuiImage sd_usb_BtnImg(&sd_usb_BtnImgData); - GuiImage dvd_BtnImg(&dvd_BtnImgData); #ifndef VWII + GuiImage dvd_BtnImg(&dvd_BtnImgData); GuiImage gca_BtnImg(&gca_BtnImgData); GuiImage gcb_BtnImg(&gca_BtnImgData); #endif @@ -67,8 +67,8 @@ int devicePrompt() GuiImage sd_BtnImgOver(&sd_BtnImgDataOver); GuiImage usb_BtnImgOver(&usb_BtnImgDataOver); GuiImage sd_usb_BtnImgOver(&sd_usb_BtnImgDataOver); - GuiImage dvd_BtnImgOver(&dvd_BtnImgDataOver); #ifndef VWII + GuiImage dvd_BtnImgOver(&dvd_BtnImgDataOver); GuiImage gca_BtnImgOver(&gca_BtnImgDataOver); GuiImage gcb_BtnImgOver(&gca_BtnImgDataOver); #endif @@ -94,14 +94,14 @@ int devicePrompt() sd_usb_Btn.SetImage(&sd_usb_BtnImg); sd_usb_Btn.SetImageOver(&sd_usb_BtnImgOver); sd_usb_Btn.SetTrigger(&trigA); - +#ifndef VWII GuiButton dvd_Btn(dvd_BtnImgData.GetWidth(), dvd_BtnImgData.GetHeight()); dvd_Btn.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); dvd_Btn.SetPosition(0, 0); dvd_Btn.SetImage(&dvd_BtnImg); dvd_Btn.SetImageOver(&dvd_BtnImgOver); dvd_Btn.SetTrigger(&trigA); -#ifndef VWII + GuiButton gca_Btn(gca_BtnImgData.GetWidth(), gca_BtnImgData.GetHeight()); gca_Btn.SetAlignment(ALIGN_RIGHT, ALIGN_MIDDLE); gca_Btn.SetPosition(-96, 0); @@ -130,8 +130,8 @@ int devicePrompt() promptWindow.Append(&sd_Btn); promptWindow.Append(&usb_Btn); promptWindow.Append(&sd_usb_Btn); - promptWindow.Append(&dvd_Btn); #ifndef VWII + promptWindow.Append(&dvd_Btn); promptWindow.Append(&gca_Btn); promptWindow.Append(&gcb_Btn); #endif @@ -165,13 +165,13 @@ int devicePrompt() device = 3; stop = true; } - +#ifndef VWII if(dvd_Btn.GetState() == STATE_CLICKED) { device = 4; stop = true; } -#ifndef VWII + if(gca_Btn.GetState() == STATE_CLICKED) { device = 5; diff --git a/main/source/Prompts/prompt_loader.cpp b/main/source/Prompts/prompt_loader.cpp index e15ba38..2aae675 100644 --- a/main/source/Prompts/prompt_loader.cpp +++ b/main/source/Prompts/prompt_loader.cpp @@ -37,12 +37,12 @@ bool check_segui() segui_loc = "usb1:/apps/SettingsEditorGUI/boot.dol"; return true; } - if (opendir(check_path("dvd:/apps/SettingsEditorGUI/").c_str()) != NULL) +#ifndef VWII + else if (opendir(check_path("dvd:/apps/SettingsEditorGUI/").c_str()) != NULL) { segui_loc = "dvd1:/apps/SettingsEditorGUI/boot.dol"; return true; } -#ifndef VWII else if(opendir(check_path("gca:/apps/Settings Editor GUI/").c_str()) != NULL) { segui_loc = "gca:/apps/SettingsEditorGUI/boot.dol"; diff --git a/main/source/Tools/app_list.cpp b/main/source/Tools/app_list.cpp index 4f505d4..a8b2ba3 100644 --- a/main/source/Tools/app_list.cpp +++ b/main/source/Tools/app_list.cpp @@ -126,9 +126,9 @@ void app_list() { vechomebrew_list_category[0].clear(); - if(Settings.device == "sd1" || Settings.device == "usb1" || Settings.device == "dvd" + if(Settings.device == "sd1" || Settings.device == "usb1" #ifndef VWII - || Settings.device == "gca" || Settings.device == "gcb" + || Settings.device == "dvd" || Settings.device == "gca" || Settings.device == "gcb" #endif ) { @@ -176,8 +176,8 @@ void app_list() { add("sd1", "apps/"); add("usb1", "apps/"); - add("dvd", "apps/"); #ifndef VWII + add("dvd", "apps/"); add("gca", "apps/"); add("gcb", "apps/"); diff --git a/main/source/Tools/copy_app_in_category.cpp b/main/source/Tools/copy_app_in_category.cpp index 4b954ea..78cce13 100644 --- a/main/source/Tools/copy_app_in_category.cpp +++ b/main/source/Tools/copy_app_in_category.cpp @@ -18,9 +18,9 @@ void copy_app_in_unassigned() int anzahl_device = 0, anzahl_ordner = 0; // Geräte SD, USB - if(Settings.device == "sd1" || Settings.device == "usb1" || Settings.device == "dvd" + if(Settings.device == "sd1" || Settings.device == "usb1" #ifndef VWII - || Settings.device == "gca" || Settings.device == "gcb" + || Settings.device == "dvd" || Settings.device == "gca" || Settings.device == "gcb" #endif ) anzahl_device = 1; @@ -30,7 +30,7 @@ void copy_app_in_unassigned() #ifndef VWII anzahl_device = 5; #else - anzahl_device = 3; + anzahl_device = 2; #endif // Ordner APPS, GC_APPS @@ -67,9 +67,9 @@ void copy_app_in_unassigned() foldername = "sd1" + ordner + apps[a] + "/"; else if(x == 1) foldername = "usb1" + ordner + apps[a] + "/"; +#ifndef VWII else if(x == 2) foldername = "dvd" + ordner + apps[a] + "/"; -#ifndef VWII else if(x == 3) foldername = "gca" + ordner + apps[a] + "/"; else if(x == 4) @@ -107,9 +107,9 @@ void copy_app_in_category(int category) //Apps im Kategorie kopieren int anzahl_device = 0, anzahl_ordner = 0; // Geräte SD, USB - if(Settings.device == "sd1" || Settings.device == "usb1" || Settings.device == "dvd" + if(Settings.device == "sd1" || Settings.device == "usb1" #ifndef VWII - || Settings.device == "gca" || Settings.device == "gcb" + || Settings.device == "dvd" || Settings.device == "gca" || Settings.device == "gcb" #endif ) anzahl_device = 1; @@ -119,7 +119,7 @@ void copy_app_in_category(int category) //Apps im Kategorie kopieren #ifndef VWII anzahl_device = 5; #else - anzahl_device = 3; + anzahl_device = 2; #endif // Ordner APPS, GC_APPS @@ -154,9 +154,9 @@ void copy_app_in_category(int category) //Apps im Kategorie kopieren foldername = "sd1" + ordner + AvailableCategory.apps[category][a] + "/"; else if(x == 1) foldername = "usb1" + ordner + AvailableCategory.apps[category][a] + "/"; +#ifndef VWII else if(x == 2) foldername = "dvd" + ordner + AvailableCategory.apps[category][a] + "/"; -#ifndef VWII else if(x == 3) foldername = "gca" + ordner + AvailableCategory.apps[category][a] + "/"; else if(x == 4) diff --git a/main/source/Tools/fileop.cpp b/main/source/Tools/fileop.cpp index b33754d..60183a4 100644 --- a/main/source/Tools/fileop.cpp +++ b/main/source/Tools/fileop.cpp @@ -553,12 +553,12 @@ void MountAllDevices() if(usb->startup() && usb->isInserted()) MountPartitions(DEVICE_USB); - +#ifndef VWII usleep(250000); // 1/4 sec if(dvd->startup() && dvd->isInserted()) MountDVD(); -#ifndef VWII + usleep(250000); if(__io_gcsda.startup() && __io_gcsda.isInserted()) @@ -781,12 +781,12 @@ void check_device() Settings.usb_insert = 1; else if(Settings.usb_insert == -1) Settings.usb_insert = 0; - +#ifndef VWII if(Settings.dvd_insert == 2) Settings.dvd_insert = 1; else if(Settings.dvd_insert == -1) Settings.dvd_insert = 0; -#ifndef VWII + if(Settings.gca_insert == 2) Settings.gca_insert = 1; else if(Settings.gca_insert == -1) diff --git a/main/source/main.cpp b/main/source/main.cpp index 7164585..a3becb0 100644 --- a/main/source/main.cpp +++ b/main/source/main.cpp @@ -138,18 +138,24 @@ DefaultSettings() xprintf("Loading factory defaults 1/2\n"); Settings.sd_insert = SDCard_Inserted(); Settings.usb_insert = USBDevice_Inserted(); +#ifndef VWII Settings.dvd_insert = DVD_Inserted(); Settings.gca_insert = GCA_Inserted(); Settings.gcb_insert = GCB_Inserted(); - Settings.category_name_all = "All"; +#else + Settings.dvd_insert = false; + Settings.gca_insert = false; + Settings.gcb_insert = false; +#endif + Settings.category_name_all = "All"; sprintf (Settings.new_category_name, "New Category"); - Settings.current_category = 0; - Settings.current_page = 1; - Settings.last_app_pos = -1; + Settings.current_category = 0; + Settings.current_page = 1; + Settings.last_app_pos = -1; Settings.checkrev = -1; sprintf (Settings.code, "NULL"); Settings.Apps_from = EFFECT_SLIDE_TOP; // Apps kommen von "EFFECT_SLIDE_TOP", "EFFECT_SLIDE_BOTTOM", "EFFECT_SLIDE_RIGHT", "EFFECT_SLIDE_LEFT" - Settings.Apps_to = 0; // Apps geht nach "EFFECT_SLIDE_TOP", "EFFECT_SLIDE_BOTTOM", "EFFECT_SLIDE_RIGHT", "EFFECT_SLIDE_LEFT" + Settings.Apps_to = 0; // Apps geht nach "EFFECT_SLIDE_TOP", "EFFECT_SLIDE_BOTTOM", "EFFECT_SLIDE_RIGHT", "EFFECT_SLIDE_LEFT" Settings.grid = false; Settings.system = 1; Settings.device = "sd1"; diff --git a/main/source/menu.cpp b/main/source/menu.cpp index e72ffdc..da21469 100644 --- a/main/source/menu.cpp +++ b/main/source/menu.cpp @@ -164,10 +164,10 @@ UpdateGUI (void *arg) check_sd(); check_usb(); } - +#ifndef VWII else if(Settings.device == "dvd") check_dvd(); -#ifndef VWII + else if(Settings.device == "gca") check_gca(); @@ -178,8 +178,8 @@ UpdateGUI (void *arg) { check_sd(); check_usb(); - check_dvd(); #ifndef VWII + check_dvd(); check_gca(); check_gcb(); #endif diff --git a/web/updates b/web/updates index 7611cdc..44d58be 100644 --- a/web/updates +++ b/web/updates @@ -2,6 +2,12 @@ - added chinese translation and font file (thanks to kavid) - fixed downloading japanese font file from server - add "Return to Wii U menu" in vWii versions +- disable reading Homewbrew from DVD on vWii +- display GC-MemoryCard symbol in app-info-dialog on real + Wii, if device icon is enabled in settings +- Fixed bug that made HBF search for Settings Editor GUI + on DVD, GCA and GCB, even if already found on SD or USB +- Set "Settings.{dvd,gca,gcb}_insert" to false on vWii //rev42: - changed default options: