Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rbutil: put the Theme description in a scrolling Control, also updated a few descriptions

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13507 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2007-05-28 20:55:50 +00:00
parent 993dbe628e
commit 1bae792e5c
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
rbutil/rbutilCtrls.cpp
View file

@ -123,7 +123,7 @@ void ThemeCtrl::CreateControls()
wxStaticText* desc_desc= new wxStaticText(this,wxID_ANY,wxT("Description:")); wxStaticText* desc_desc= new wxStaticText(this,wxID_ANY,wxT("Description:"));
styleSizer->Add(desc_desc,0,wxGROW | wxALL,5); 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); styleSizer->Add(m_themedesc,0,wxGROW | wxALL,5);
topSizer->Fit(this); topSizer->Fit(this);
@ -156,7 +156,7 @@ void ThemeCtrl::setDevice(wxString device)
// load the themelist // load the themelist
Init(); Init();
m_size->SetLabel(wxT("")); m_size->SetLabel(wxT(""));
m_themedesc->SetLabel(wxT("")); m_themedesc->SetValue(wxT(""));
m_themeList->Clear(); m_themeList->Clear();
//get correct Themes list //get correct Themes list
@ -231,8 +231,8 @@ void ThemeCtrl::OnThemesLst(wxCommandEvent& event)
int index = selected[0]; int index = selected[0];
m_size->SetLabel(m_Themes_size[index]); m_size->SetLabel(m_Themes_size[index]);
m_themedesc->SetLabel(m_Themes_desc[index]); m_themedesc->SetValue(m_Themes_desc[index]);
m_themedesc->Wrap(200); // wrap desc // m_themedesc->Wrap(200); // wrap desc
wxString src,dest; wxString src,dest;

2
rbutil/rbutilCtrls.h
View file

@ -89,7 +89,7 @@ protected:
wxStaticText* m_desc; wxStaticText* m_desc;
wxListBox* m_themeList; wxListBox* m_themeList;
wxStaticText* m_size; wxStaticText* m_size;
wxStaticText* m_themedesc; wxTextCtrl* m_themedesc;
ImageCtrl* m_PreviewBitmap; ImageCtrl* m_PreviewBitmap;
wxArrayString m_Themes; wxArrayString m_Themes;

6
rbutil/rbutilFrm.cpp
View file

@ -136,8 +136,7 @@ void rbutilFrm::CreateGUIControls(void)
wxStaticText* WxStaticText5 = new wxStaticText(installpage, wxID_ANY, wxStaticText* WxStaticText5 = new wxStaticText(installpage, wxID_ANY,
wxT("Bootloader installation instructions\n\n" wxT("Bootloader installation instructions\n\n"
"Before Rockbox can be installed on your audio player, you " "Before Rockbox can be installed on your audio player, you "
"may have to\ninstall a bootloader. This can not currently " "may have to\ninstall a bootloader.\nThis is only necessary the first time "
"be done automatically, but is\nonly necessary the first time "
"Rockbox is installed.")); "Rockbox is installed."));
WxFlexGridSizer1->Add(WxStaticText5, 0, WxFlexGridSizer1->Add(WxStaticText5, 0,
wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5); wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5);
@ -184,8 +183,7 @@ void rbutilFrm::CreateGUIControls(void)
wxStaticText* WxStaticText4 = new wxStaticText(themepage, wxID_ANY, wxStaticText* WxStaticText4 = new wxStaticText(themepage, wxID_ANY,
wxT("Install the Rockbox fonts package\n\n" wxT("Install the Rockbox fonts package\n\n"
"This step is only needed if you have installed " "This step is needed for many Themes. You "
"a daily build and want\nthe full set of Rockbox fonts. You "
"will not need to download these\nagain unless you uninstall " "will not need to download these\nagain unless you uninstall "
"Rockbox.")); "Rockbox."));
WxFlexGridSizer2->Add(WxStaticText4, 0, WxFlexGridSizer2->Add(WxStaticText4, 0,