forgot to add the new Images, also try to fix unicode problems

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12783 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 51 insertions, 0 deletions

diff --git a/rbutil/wizard_pages.cpp b/rbutil/wizard_pages.cpp
index 1544675..4ef463a 100644
--- a/rbutil/wizard_pages.cpp
+++ b/rbutil/wizard_pages.cpp
@@ -494,6 +494,7 @@ void wxIpodLocationPage::OnIpodLocationBtn(wxCommandEvent& event)
 BEGIN_EVENT_TABLE(wxBootLocationPage,wxWizardPageSimple)
 	EVT_BUTTON   (ID_BOOTLOCATION_BTN, wxBootLocationPage::OnBootLocationBtn)
 	EVT_WIZARD_PAGE_CHANGING(wxID_ANY, wxBootLocationPage::OnWizardPageChanging)
+	EVT_WIZARD_PAGE_CHANGED (wxID_ANY, wxBootLocationPage::OnPageShown)
 END_EVENT_TABLE();
 
 wxBootLocationPage::wxBootLocationPage(wxWizard* parent) : wxWizardPageSimple(parent)
@@ -525,6 +526,12 @@ wxBootLocationPage::wxBootLocationPage(wxWizard* parent) : wxWizardPageSimple(pa
    	BootLocationBtn->SetToolTip(wxT("Select the location of your audio device"));
    	WxBoxSizer3->Add(BootLocationBtn,0,wxALIGN_CENTER_VERTICAL | wxALL, 5);
 
+
+    BootLocationInfo = new wxStaticText(this, wxID_ANY, wxT(""),
+        wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
+    WxBoxSizer1->Add(BootLocationInfo,0,
+        wxGROW | wxALIGN_CENTER_VERTICAL | wxALL, 5);
+
    	SetSizer(WxBoxSizer1);
     WxBoxSizer1->Fit(this);
 }
@@ -550,6 +557,25 @@ wxWizardPage* wxBootLocationPage::GetNext() const
     else return NULL;  // else this is the last page
 }
 
+void wxBootLocationPage::OnPageShown(wxWizardEvent& event)
+{
+   if(gv->curplat == wxT("h10") || gv->curplat == wxT("h10_5gb"))
+   {
+      BootLocationInfo->SetLabel(wxT("Your Device needs to be in UMS Mode. \n\n"
+                                     "If it is an MTP device, you can do this by \n"
+                                     "reseting you Device via the Pinhole,or disconnecting the Battery \n"
+                                     "then connecting it via the Data cable with the PC. \n"
+                                     "Then press and hold Next,push the Power button, and \n"
+                                     "continue to hold the Next button until the \n"
+                                     "USB-Connected Screen appears." ));
+   }
+   else
+   {
+      BootLocationInfo->SetLabel("");
+   }
+
+}
+
 void wxBootLocationPage::OnWizardPageChanging(wxWizardEvent& event)
 {
    if(event.GetDirection())  // going forwards in the Wizard
@@ -659,6 +685,7 @@ void wxFirmwareLocationPage::OnFirmwareFilenameBtn(wxCommandEvent& event)
 BEGIN_EVENT_TABLE(wxLocationPage,wxWizardPageSimple)
 	EVT_BUTTON   (ID_LOCATION_BTN, wxLocationPage::OnLocationBtn)
 	EVT_WIZARD_PAGE_CHANGING(wxID_ANY, wxLocationPage::OnWizardPageChanging)
+	EVT_WIZARD_PAGE_CHANGED(wxID_ANY, wxLocationPage::OnPageShown)
 END_EVENT_TABLE();
 
 wxLocationPage::wxLocationPage(wxWizard* parent) : wxWizardPageSimple(parent)
@@ -687,11 +714,35 @@ wxLocationPage::wxLocationPage(wxWizard* parent) : wxWizardPageSimple(parent)
    	LocationBtn->SetToolTip(wxT("Select the location of your audio device"));
    	WxBoxSizer3->Add(LocationBtn,0,wxALIGN_CENTER_VERTICAL | wxALL, 5);
 
+   	LocationInfo = new wxStaticText(this, wxID_ANY, wxT(""),
+        wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
+    WxBoxSizer1->Add(LocationInfo,0,wxGROW | wxALL, 5);
+
    	SetSizer(WxBoxSizer1);
     WxBoxSizer1->Fit(this);
 }
 
 
+void wxLocationPage::OnPageShown(wxWizardEvent& event)
+{
+   if(gv->curplat == wxT("h10") || gv->curplat == wxT("h10_5gb"))
+   {
+      LocationInfo->SetLabel(wxT("Your Device needs to be in UMS Mode. \n\n"
+                                     "If it is an MTP device, you can do this by \n"
+                                     "reseting you Device via the Pinhole,or disconnecting the Battery \n"
+                                     "then connecting it via the Data cable with the PC. \n"
+                                     "Then press and hold Next,push the Power button, and \n"
+                                     "continue to hold the Next button until the \n"
+                                     "USB-Connected Screen appears." ));
+   }
+   else
+   {
+      LocationInfo->SetLabel("");
+   }
+
+
+}
+
 void wxLocationPage::OnWizardPageChanging(wxWizardEvent& event)
 {
    if(event.GetDirection())  // going forwards in the Wizard