diff options
-rw-r--r-- | rbutil/rbutilCtrls.cpp | 8 | ||||
-rw-r--r-- | rbutil/rbutilCtrls.h | 2 | ||||
-rw-r--r-- | rbutil/rbutilFrm.cpp | 6 |
3 files changed, 7 insertions, 9 deletions
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() | |||
123 | wxStaticText* desc_desc= new wxStaticText(this,wxID_ANY,wxT("Description:")); | 123 | wxStaticText* desc_desc= new wxStaticText(this,wxID_ANY,wxT("Description:")); |
124 | styleSizer->Add(desc_desc,0,wxGROW | wxALL,5); | 124 | styleSizer->Add(desc_desc,0,wxGROW | wxALL,5); |
125 | 125 | ||
126 | m_themedesc= new wxStaticText(this,ID_DESC,wxT("")); | 126 | m_themedesc= new wxTextCtrl(this,ID_DESC,wxT(""),wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY); |
127 | styleSizer->Add(m_themedesc,0,wxGROW | wxALL,5); | 127 | styleSizer->Add(m_themedesc,0,wxGROW | wxALL,5); |
128 | 128 | ||
129 | topSizer->Fit(this); | 129 | topSizer->Fit(this); |
@@ -156,7 +156,7 @@ void ThemeCtrl::setDevice(wxString device) | |||
156 | // load the themelist | 156 | // load the themelist |
157 | Init(); | 157 | Init(); |
158 | m_size->SetLabel(wxT("")); | 158 | m_size->SetLabel(wxT("")); |
159 | m_themedesc->SetLabel(wxT("")); | 159 | m_themedesc->SetValue(wxT("")); |
160 | m_themeList->Clear(); | 160 | m_themeList->Clear(); |
161 | 161 | ||
162 | //get correct Themes list | 162 | //get correct Themes list |
@@ -231,8 +231,8 @@ void ThemeCtrl::OnThemesLst(wxCommandEvent& event) | |||
231 | int index = selected[0]; | 231 | int index = selected[0]; |
232 | 232 | ||
233 | m_size->SetLabel(m_Themes_size[index]); | 233 | m_size->SetLabel(m_Themes_size[index]); |
234 | m_themedesc->SetLabel(m_Themes_desc[index]); | 234 | m_themedesc->SetValue(m_Themes_desc[index]); |
235 | m_themedesc->Wrap(200); // wrap desc | 235 | // m_themedesc->Wrap(200); // wrap desc |
236 | 236 | ||
237 | wxString src,dest; | 237 | wxString src,dest; |
238 | 238 | ||
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: | |||
89 | wxStaticText* m_desc; | 89 | wxStaticText* m_desc; |
90 | wxListBox* m_themeList; | 90 | wxListBox* m_themeList; |
91 | wxStaticText* m_size; | 91 | wxStaticText* m_size; |
92 | wxStaticText* m_themedesc; | 92 | wxTextCtrl* m_themedesc; |
93 | ImageCtrl* m_PreviewBitmap; | 93 | ImageCtrl* m_PreviewBitmap; |
94 | 94 | ||
95 | wxArrayString m_Themes; | 95 | 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) | |||
136 | wxStaticText* WxStaticText5 = new wxStaticText(installpage, wxID_ANY, | 136 | wxStaticText* WxStaticText5 = new wxStaticText(installpage, wxID_ANY, |
137 | wxT("Bootloader installation instructions\n\n" | 137 | wxT("Bootloader installation instructions\n\n" |
138 | "Before Rockbox can be installed on your audio player, you " | 138 | "Before Rockbox can be installed on your audio player, you " |
139 | "may have to\ninstall a bootloader. This can not currently " | 139 | "may have to\ninstall a bootloader.\nThis is only necessary the first time " |
140 | "be done automatically, but is\nonly necessary the first time " | ||
141 | "Rockbox is installed.")); | 140 | "Rockbox is installed.")); |
142 | WxFlexGridSizer1->Add(WxStaticText5, 0, | 141 | WxFlexGridSizer1->Add(WxStaticText5, 0, |
143 | wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5); | 142 | wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5); |
@@ -184,8 +183,7 @@ void rbutilFrm::CreateGUIControls(void) | |||
184 | 183 | ||
185 | wxStaticText* WxStaticText4 = new wxStaticText(themepage, wxID_ANY, | 184 | wxStaticText* WxStaticText4 = new wxStaticText(themepage, wxID_ANY, |
186 | wxT("Install the Rockbox fonts package\n\n" | 185 | wxT("Install the Rockbox fonts package\n\n" |
187 | "This step is only needed if you have installed " | 186 | "This step is needed for many Themes. You " |
188 | "a daily build and want\nthe full set of Rockbox fonts. You " | ||
189 | "will not need to download these\nagain unless you uninstall " | 187 | "will not need to download these\nagain unless you uninstall " |
190 | "Rockbox.")); | 188 | "Rockbox.")); |
191 | WxFlexGridSizer2->Add(WxStaticText4, 0, | 189 | WxFlexGridSizer2->Add(WxStaticText4, 0, |