put menu=MenuDiscList after using the network in MenuDiscList to correct the bug in the list view.

change wifiBtn and channelBtn images and add IP address tooltip to the wifiBtn

*rockout with your cock out*

gui.pnps

@@ -1 +1 @@
-<pd><ViewState><e p="gui\source\mload" x="false"></e><e p="gui\source\settings" x="false"></e><e p="gui\source\images" x="false"></e><e p="gui\source\prompts" x="true"></e><e p="gui\source\banner" x="false"></e><e p="gui\source\cheats" x="true"></e><e p="gui\source\network" x="false"></e><e p="gui\source\unzip" x="false"></e><e p="gui\source\usbloader" x="false"></e><e p="gui\source\xml" x="false"></e><e p="gui\source\fonts" x="false"></e><e p="gui\source\ramdisc" x="false"></e><e p="gui\source\sounds" x="false"></e><e p="gui\source\wad" x="true"></e><e p="gui" x="true"></e><e p="gui\source\homebrewboot" x="false"></e><e p="gui\source\language" x="true"></e><e p="gui\source" x="true"></e><e p="gui\source\libwbfs" x="true"></e><e p="gui\source\libwiigui" x="false"></e><e p="gui\source\patches" x="false"></e></ViewState></pd>
+<pd><ViewState><e p="gui\source\mload" x="false"></e><e p="gui\source\settings" x="false"></e><e p="gui\source\images" x="false"></e><e p="gui\source\prompts" x="true"></e><e p="gui\source\banner" x="false"></e><e p="gui\source\cheats" x="true"></e><e p="gui\source\network" x="true"></e><e p="gui\source\unzip" x="false"></e><e p="gui\source\usbloader" x="false"></e><e p="gui\source\xml" x="false"></e><e p="gui\source\fonts" x="false"></e><e p="gui\source\ramdisc" x="false"></e><e p="gui\source\sounds" x="false"></e><e p="gui\source\wad" x="true"></e><e p="gui" x="true"></e><e p="gui\source\homebrewboot" x="false"></e><e p="gui\source\language" x="true"></e><e p="gui\source" x="true"></e><e p="gui\source\libwbfs" x="true"></e><e p="gui\source\libwiigui" x="false"></e><e p="gui\source\patches" x="false"></e></ViewState></pd>

source/filelist.h

@@ -26,6 +26,12 @@ extern const u32	gxlogo_png_size;
 extern const u8		sdcard_png[];
 extern const u32	sdcard_png_size;
 
+extern const u8     Wifi_btn_png[];
+extern const u32    Wifi_btn_png_size;
+
+extern const u8     Channel_btn_png[];
+extern const u32    Channel_btn_png_size;
+
 extern const u8     sdcard_over_png[];
 extern const u32    sdcard_over_png_size;
 
@@ -236,6 +242,18 @@ extern const u32	player3_point_png_size;
 extern const u8		player4_point_png[];
 extern const u32	player4_point_png_size;
 
+extern const u8		rplayer1_point_png[];
+extern const u32	rplayer1_point_png_size;
+
+extern const u8		rplayer2_point_png[];
+extern const u32	rplayer2_point_png_size;
+
+extern const u8		rplayer3_point_png[];
+extern const u32	rplayer3_point_png_size;
+
+extern const u8		rplayer4_point_png[];
+extern const u32	rplayer4_point_png_size;
+
 extern const u8		battery_png[];
 extern const u32	battery_png_size;
 

source/homebrewboot/HomebrewBrowse.cpp

@@ -108,11 +108,11 @@ int MenuHomebrewBrowse()
 	snprintf(imgPath, sizeof(imgPath), "%sstartgame_arrow_right.png", CFG.theme_path);
 	GuiImageData arrow_right(imgPath, startgame_arrow_right_png);
 
-	snprintf(imgPath, sizeof(imgPath), "%swifi1.png", CFG.theme_path);
+	snprintf(imgPath, sizeof(imgPath), "%sWifi_btn.png", CFG.theme_path);
-	GuiImageData wifiImgData(imgPath, wifi1_png);
+	GuiImageData wifiImgData(imgPath, Wifi_btn_png);
 	
-	snprintf(imgPath, sizeof(imgPath), "%sbrowser.png", CFG.theme_path);
+	snprintf(imgPath, sizeof(imgPath), "%sChannel_btn.png", CFG.theme_path);
-   GuiImageData channelImgData(imgPath, browser_png);
+   GuiImageData channelImgData(imgPath, Channel_btn_png);
 
 
     GuiImage background(&bgData);
@@ -296,6 +296,9 @@ int MenuHomebrewBrowse()
 	MainButton4.SetTrigger(&trigA);
 
 	GuiImage wifiImg(&wifiImgData);
+	if (Settings.wsprompt == yes){
+        wifiImg.SetWidescreen(CFG.widescreen);
+	}
 	GuiButton wifiBtn(wifiImg.GetWidth(), wifiImg.GetHeight());
 	wifiBtn.SetImage(&wifiImg);
 	wifiBtn.SetPosition(500, 400);
@@ -309,12 +312,14 @@ int MenuHomebrewBrowse()
    channelBtnImg.SetWidescreen(CFG.widescreen);
    GuiButton channelBtn(channelBtnImg.GetWidth(), channelBtnImg.GetHeight());
    channelBtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
-   channelBtn.SetPosition(425, 400);
+   channelBtn.SetPosition(440, 400);
    channelBtn.SetImage(&channelBtnImg);
    channelBtn.SetSoundOver(&btnSoundOver);
    channelBtn.SetSoundClick(&btnClick);
    channelBtn.SetEffectGrow();
    channelBtn.SetTrigger(&trigA);
+	
+	GuiTooltip * titleTT = NULL;
 
 
 	GuiWindow w(screenwidth, screenheight);
@@ -325,6 +330,7 @@ int MenuHomebrewBrowse()
 
 	int pageToDisplay = 1;
 	const int pages = roundup(filecount/4.0f);
+	bool wifi_btn_loaded=false;
 
 	while (menu == MENU_NONE) //set pageToDisplay to 0 to quit
 	{
@@ -920,7 +926,15 @@ int MenuHomebrewBrowse()
 					}
 					
             if(IsNetworkInit()) {
-                wifiBtn.SetAlpha(255);
+					if(!wifi_btn_loaded)
+						{
+						 wifiBtn.SetAlpha(255);
+						
+						titleTT = new GuiTooltip(GetNetworkIP());
+						titleTT->SetAlpha(THEME.tooltipAlpha);
+						wifiBtn.SetToolTip(titleTT,0,-50,0,5);
+						wifi_btn_loaded=true;
+						}
             }
         }
 	}
@@ -940,6 +954,9 @@ int MenuHomebrewBrowse()
             IconImg[i] = NULL;
         }
     }
+	 
+	 delete titleTT;
+	 titleTT = NULL;
 
     if(IsNetworkInit())
         HaltNetworkThread();

source/menu.cpp

@@ -217,7 +217,40 @@ void ExitGUIThreads()
 	LWP_JoinThread(guithread, NULL);
 	guithread = LWP_THREAD_NULL;
 }
+void rockout(int f = 0)
+{
+	char imgPath[100];
+	#ifdef HW_RVL
+	if(!(strcasestr(get_title(&gameList[gameSelected]),"guitar")||
+		strcasestr(get_title(&gameList[gameSelected]),"band")||
+		strcasestr(get_title(&gameList[gameSelected]),"rock"))){
+		for(int i = 0; i < 4; i++)
+			delete pointer[i];
+		snprintf(imgPath, sizeof(imgPath), "%splayer1_point.png", CFG.theme_path);
+		pointer[0] = new GuiImageData(imgPath, player1_point_png);
+		snprintf(imgPath, sizeof(imgPath), "%splayer2_point.png", CFG.theme_path);
+		pointer[1] = new GuiImageData(imgPath, player2_point_png);
+		snprintf(imgPath, sizeof(imgPath), "%splayer3_point.png", CFG.theme_path);
+		pointer[2] = new GuiImageData(imgPath, player3_point_png);
+		snprintf(imgPath, sizeof(imgPath), "%splayer4_point.png", CFG.theme_path);
+		pointer[3] = new GuiImageData(imgPath, player4_point_png);
+	}
+	else{
+		
+		for(int i = 0; i < 4; i++)
+			delete pointer[i];
+		snprintf(imgPath, sizeof(imgPath), "%srplayer1_point.png", CFG.theme_path);
+		pointer[0] = new GuiImageData(imgPath, rplayer1_point_png);
+		snprintf(imgPath, sizeof(imgPath), "%srplayer2_point.png", CFG.theme_path);
+		pointer[1] = new GuiImageData(imgPath, rplayer2_point_png);
+		snprintf(imgPath, sizeof(imgPath), "%srplayer3_point.png", CFG.theme_path);
+		pointer[2] = new GuiImageData(imgPath, rplayer3_point_png);
+		snprintf(imgPath, sizeof(imgPath), "%srplayer4_point.png", CFG.theme_path);
+		pointer[3] = new GuiImageData(imgPath, rplayer4_point_png);
+	}
+	#endif
 
+}
 
 /****************************************************************************
  * MenuDiscList
@@ -656,13 +689,6 @@ int MenuDiscList()
 
 		while(menu == MENU_NONE)
         {
-		  //this may not be needed.  just messing around with the GHWT controller
-			u32 expType = 0; // Stores only the controller/expansion type.
-			u32 buttonsDown = WPAD_ButtonsDown(0);
-
-			// Use WPAD_Probe to get the expansion type.
-			WPAD_Probe( WPAD_CHAN_0, &expType );
-								 VIDEO_WaitVSync ();
 
 				if (idiotFlag==1){
 				char idiotBuffer[200];
@@ -731,8 +757,16 @@ int MenuDiscList()
                         Sys_Reboot();
 
                 if(updateavailable == true) {
+					 HaltGui();
+						GuiWindow ww(640,480);
+						w.SetState(STATE_DISABLED);
+						mainWindow->Append(&ww);
+						ResumeGui();
                     ProgressUpdateWindow();
                     updateavailable = false;
+						  mainWindow->Remove(&ww);
+						  w.SetState(STATE_DEFAULT);
+						  menu = MENU_DISCLIST;
                 }
 
                 if(poweroffBtn.GetState() == STATE_CLICKED)
@@ -807,9 +841,7 @@ int MenuDiscList()
 
 
 
-                else if((sdcardBtn.GetState() == STATE_CLICKED)||
+                else if(sdcardBtn.GetState() == STATE_CLICKED){
-					 ( ( buttonsDown & GUITAR_HERO_3_BUTTON_ORANGE ) && ( expType == WPAD_EXP_GUITARHERO3 ) ))
-                {
 								SDCard_deInit();
                         SDCard_Init();
                         if (Settings.gameDisplay==list){
@@ -875,8 +907,8 @@ int MenuDiscList()
                                 }
                     } else {
                         WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to download images."), tr("OK"));
-                    }
+                    }menu = MENU_DISCLIST;
-                    DownloadBtn.ResetState();
+						  DownloadBtn.ResetState();
                         if (Settings.gameDisplay==list){gameBrowser->SetFocus(1);}
                         else if (Settings.gameDisplay==grid){gameGrid->SetFocus(1);}
                         else if (Settings.gameDisplay==carousel){gameCarousel->SetFocus(1);}
@@ -991,17 +1023,20 @@ int MenuDiscList()
                     break;
                 }
 				else if (gameInfo.GetState() == STATE_CLICKED) {
+				gameSelected = selectImg1;
+				rockout();
 					struct discHdr *header = &gameList[selectImg1];
                     snprintf (IDfull,sizeof(IDfull),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]);
 					choice = showGameInfo(IDfull);
                     gameInfo.ResetState();
+						  rockout(0);
 						  if (choice==2)
 							homeBtn.SetState(STATE_CLICKED);
                 }
 
                 if (Settings.gameDisplay==grid){
                         int selectimg;
-						DownloadBtn.SetSize(0,0);
+								DownloadBtn.SetSize(0,0);
                         selectimg = gameGrid->GetSelectedOption();
                         gameSelected = gameGrid->GetClickedOption();
 						selectImg1=selectimg;
@@ -1009,7 +1044,7 @@ int MenuDiscList()
 
                 if (Settings.gameDisplay==carousel){
                         int selectimg;
-						DownloadBtn.SetSize(0,0);
+								DownloadBtn.SetSize(0,0);
                         selectimg = gameCarousel->GetSelectedOption();
                         gameSelected = gameCarousel->GetClickedOption();
                 		selectImg1=selectimg;
@@ -1025,7 +1060,7 @@ int MenuDiscList()
 
                         if (gameSelected > 0) //if click occured
                                 selectimg = gameSelected;
-
+											
                         if ((selectimg >= 0) && (selectimg < (s32) gameCnt))
                         {
                                 if (selectimg != selectedold)
@@ -1127,7 +1162,8 @@ int MenuDiscList()
                 }
 
 				if ((gameSelected >= 0) && (gameSelected < (s32)gameCnt))
-                {
+                {			
+								rockout();
                         struct discHdr *header = &gameList[gameSelected];
                         WBFS_GameSize(header->id, &size);
                         if (strlen(get_title(header)) < (MAX_CHARACTERS + 3)) {
@@ -1313,6 +1349,8 @@ int MenuDiscList()
                                         else if (Settings.gameDisplay==grid){gameGrid->SetFocus(1);}
                                         else if (Settings.gameDisplay==carousel){gameCarousel->SetFocus(1);}
                                 }
+										  //reset cursor
+										  rockout(0);
                         }
                 }
 			// to skip the first call of windowScreensaver at startup when wiimote is not connected

source/svnrev.c

@@ -1,4 +1,4 @@
-#define SVN_REV "661M"
+#define SVN_REV "661:662M"
 
 const char *GetRev()
 {