diff --git a/rbutil/rbutilCtrls.cpp b/rbutil/rbutilCtrls.cpp index 1b45213139..007bd6e17d 100644 --- a/rbutil/rbutilCtrls.cpp +++ b/rbutil/rbutilCtrls.cpp @@ -123,7 +123,7 @@ void ThemeCtrl::CreateControls() wxStaticText* desc_desc= new wxStaticText(this,wxID_ANY,wxT("Description:")); styleSizer->Add(desc_desc,0,wxGROW | wxALL,5); - m_themedesc= new wxStaticText(this,ID_DESC,wxT("")); + m_themedesc= new wxTextCtrl(this,ID_DESC,wxT(""),wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY); styleSizer->Add(m_themedesc,0,wxGROW | wxALL,5); topSizer->Fit(this); @@ -156,7 +156,7 @@ void ThemeCtrl::setDevice(wxString device) // load the themelist Init(); m_size->SetLabel(wxT("")); - m_themedesc->SetLabel(wxT("")); + m_themedesc->SetValue(wxT("")); m_themeList->Clear(); //get correct Themes list @@ -231,8 +231,8 @@ void ThemeCtrl::OnThemesLst(wxCommandEvent& event) int index = selected[0]; m_size->SetLabel(m_Themes_size[index]); - m_themedesc->SetLabel(m_Themes_desc[index]); - m_themedesc->Wrap(200); // wrap desc + m_themedesc->SetValue(m_Themes_desc[index]); + // m_themedesc->Wrap(200); // wrap desc wxString src,dest; diff --git a/rbutil/rbutilCtrls.h b/rbutil/rbutilCtrls.h index fcad8dea52..89e2b0b3d1 100644 --- a/rbutil/rbutilCtrls.h +++ b/rbutil/rbutilCtrls.h @@ -89,7 +89,7 @@ protected: wxStaticText* m_desc; wxListBox* m_themeList; wxStaticText* m_size; - wxStaticText* m_themedesc; + wxTextCtrl* m_themedesc; ImageCtrl* m_PreviewBitmap; wxArrayString m_Themes; diff --git a/rbutil/rbutilFrm.cpp b/rbutil/rbutilFrm.cpp index c2f35de43c..d49faee895 100644 --- a/rbutil/rbutilFrm.cpp +++ b/rbutil/rbutilFrm.cpp @@ -136,8 +136,7 @@ void rbutilFrm::CreateGUIControls(void) wxStaticText* WxStaticText5 = new wxStaticText(installpage, wxID_ANY, wxT("Bootloader installation instructions\n\n" "Before Rockbox can be installed on your audio player, you " - "may have to\ninstall a bootloader. This can not currently " - "be done automatically, but is\nonly necessary the first time " + "may have to\ninstall a bootloader.\nThis is only necessary the first time " "Rockbox is installed.")); WxFlexGridSizer1->Add(WxStaticText5, 0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5); @@ -184,8 +183,7 @@ void rbutilFrm::CreateGUIControls(void) wxStaticText* WxStaticText4 = new wxStaticText(themepage, wxID_ANY, wxT("Install the Rockbox fonts package\n\n" - "This step is only needed if you have installed " - "a daily build and want\nthe full set of Rockbox fonts. You " + "This step is needed for many Themes. You " "will not need to download these\nagain unless you uninstall " "Rockbox.")); WxFlexGridSizer2->Add(WxStaticText4, 0,