diff options
Diffstat (limited to 'rbutil/rbutilFrm.cpp')
-rw-r--r-- | rbutil/rbutilFrm.cpp | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/rbutil/rbutilFrm.cpp b/rbutil/rbutilFrm.cpp index 0dc85c09b0..2aa2b362ca 100644 --- a/rbutil/rbutilFrm.cpp +++ b/rbutil/rbutilFrm.cpp | |||
@@ -22,19 +22,21 @@ | |||
22 | #include "credits.h" | 22 | #include "credits.h" |
23 | 23 | ||
24 | #include "rbutilFrm_XPM.xpm" | 24 | #include "rbutilFrm_XPM.xpm" |
25 | #include "install_3d.xpm" | 25 | #include "icons/rbinstall_btn.h" |
26 | #include "uninstall_3d.xpm" | 26 | #include "icons/remrb_btn.h" |
27 | #include "fonts_3d.xpm" | 27 | #include "icons/font_btn.h" |
28 | #include "tools2_3d.xpm" | 28 | #include "icons/bootloader_btn.h" |
29 | #include "icons/rembootloader_btn.h" | ||
30 | #include "icons/themes_btn.h" | ||
31 | #include "icons/doom_btn.h" | ||
32 | |||
29 | #include "rblogo.xpm" | 33 | #include "rblogo.xpm" |
30 | #include "untools2_3d.xpm" | ||
31 | #include "themes_3d.xpm" | ||
32 | #include "doom_3d.xpm" | ||
33 | 34 | ||
34 | #include "bootloaders.h" | 35 | #include "bootloaders.h" |
35 | #include "install_dialogs.h" | 36 | #include "install_dialogs.h" |
36 | 37 | ||
37 | 38 | ||
39 | |||
38 | //---------------------------------------------------------------------------- | 40 | //---------------------------------------------------------------------------- |
39 | // rbutilFrm | 41 | // rbutilFrm |
40 | //---------------------------------------------------------------------------- | 42 | //---------------------------------------------------------------------------- |
@@ -125,7 +127,8 @@ void rbutilFrm::CreateGUIControls(void) | |||
125 | wxFlexGridSizer* WxFlexGridSizer1 = new wxFlexGridSizer(2,2,0,0); | 127 | wxFlexGridSizer* WxFlexGridSizer1 = new wxFlexGridSizer(2,2,0,0); |
126 | WxStaticBoxSizer3->Add(WxFlexGridSizer1,0,wxGROW | wxALL,0); | 128 | WxStaticBoxSizer3->Add(WxFlexGridSizer1,0,wxGROW | wxALL,0); |
127 | 129 | ||
128 | wxBitmap BootloaderInstallButton (tools2_3d_xpm); | 130 | |
131 | wxBitmap BootloaderInstallButton (wxGetBitmapFromMemory(bootloader_btn_png,bootloader_btn_png_length)); | ||
129 | WxBitmapButton4 = new wxBitmapButton(installpage, ID_BOOTLOADER_BTN, | 132 | WxBitmapButton4 = new wxBitmapButton(installpage, ID_BOOTLOADER_BTN, |
130 | BootloaderInstallButton, wxPoint(0,0), wxSize(64,54), | 133 | BootloaderInstallButton, wxPoint(0,0), wxSize(64,54), |
131 | wxRAISED_BORDER | wxBU_AUTODRAW, wxDefaultValidator,wxT("Bootloader Installation")); | 134 | wxRAISED_BORDER | wxBU_AUTODRAW, wxDefaultValidator,wxT("Bootloader Installation")); |
@@ -141,7 +144,7 @@ void rbutilFrm::CreateGUIControls(void) | |||
141 | WxFlexGridSizer1->Add(WxStaticText5, 0, | 144 | WxFlexGridSizer1->Add(WxStaticText5, 0, |
142 | wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5); | 145 | wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5); |
143 | 146 | ||
144 | wxBitmap WxBitmapButton1_BITMAP (install_3d_xpm); | 147 | wxBitmap WxBitmapButton1_BITMAP (wxGetBitmapFromMemory(rbinstall_btn_png,rbinstall_btn_png_length)); |
145 | WxBitmapButton1 = new wxBitmapButton(installpage, ID_INSTALL_BTN, | 148 | WxBitmapButton1 = new wxBitmapButton(installpage, ID_INSTALL_BTN, |
146 | WxBitmapButton1_BITMAP, wxPoint(0,0), wxSize(64,54), | 149 | WxBitmapButton1_BITMAP, wxPoint(0,0), wxSize(64,54), |
147 | wxRAISED_BORDER | wxBU_AUTODRAW, wxDefaultValidator, | 150 | wxRAISED_BORDER | wxBU_AUTODRAW, wxDefaultValidator, |
@@ -172,7 +175,7 @@ void rbutilFrm::CreateGUIControls(void) | |||
172 | wxFlexGridSizer* WxFlexGridSizer2 = new wxFlexGridSizer(2,2,0,0); | 175 | wxFlexGridSizer* WxFlexGridSizer2 = new wxFlexGridSizer(2,2,0,0); |
173 | WxStaticBoxSizer4->Add(WxFlexGridSizer2,0,wxGROW | wxALL,0); | 176 | WxStaticBoxSizer4->Add(WxFlexGridSizer2,0,wxGROW | wxALL,0); |
174 | 177 | ||
175 | wxBitmap FontInstallButton (fonts_3d_xpm); | 178 | wxBitmap FontInstallButton (wxGetBitmapFromMemory(font_btn_png,font_btn_png_length)); |
176 | WxBitmapButton3 = new wxBitmapButton(themepage, ID_FONT_BTN, | 179 | WxBitmapButton3 = new wxBitmapButton(themepage, ID_FONT_BTN, |
177 | FontInstallButton, wxPoint(0,0), wxSize(64,54), | 180 | FontInstallButton, wxPoint(0,0), wxSize(64,54), |
178 | wxRAISED_BORDER | wxBU_AUTODRAW,wxDefaultValidator, wxT("Font installation")); | 181 | wxRAISED_BORDER | wxBU_AUTODRAW,wxDefaultValidator, wxT("Font installation")); |
@@ -189,7 +192,7 @@ void rbutilFrm::CreateGUIControls(void) | |||
189 | WxFlexGridSizer2->Add(WxStaticText4, 0, | 192 | WxFlexGridSizer2->Add(WxStaticText4, 0, |
190 | wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5); | 193 | wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5); |
191 | 194 | ||
192 | wxBitmap ThemesInstallButton (themes_3d_xpm); | 195 | wxBitmap ThemesInstallButton (wxGetBitmapFromMemory(themes_btn_png,themes_btn_png_length)); |
193 | WxBitmapButton5 = new wxBitmapButton(themepage, ID_THEMES_BTN, | 196 | WxBitmapButton5 = new wxBitmapButton(themepage, ID_THEMES_BTN, |
194 | ThemesInstallButton, wxPoint(0,0), wxSize(64,54), | 197 | ThemesInstallButton, wxPoint(0,0), wxSize(64,54), |
195 | wxRAISED_BORDER | wxBU_AUTODRAW,wxDefaultValidator, wxT("Theme installation")); | 198 | wxRAISED_BORDER | wxBU_AUTODRAW,wxDefaultValidator, wxT("Theme installation")); |
@@ -203,7 +206,7 @@ void rbutilFrm::CreateGUIControls(void) | |||
203 | wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5); | 206 | wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5); |
204 | 207 | ||
205 | 208 | ||
206 | wxBitmap DoomInstallButton (doom_3d_xpm); | 209 | wxBitmap DoomInstallButton (wxGetBitmapFromMemory(doom_btn_png,doom_btn_png_length)); |
207 | WxBitmapButton6 = new wxBitmapButton(themepage, ID_DOOM_BTN, | 210 | WxBitmapButton6 = new wxBitmapButton(themepage, ID_DOOM_BTN, |
208 | DoomInstallButton, wxPoint(0,0), wxSize(64,54), | 211 | DoomInstallButton, wxPoint(0,0), wxSize(64,54), |
209 | wxRAISED_BORDER | wxBU_AUTODRAW,wxDefaultValidator, wxT("Freedoom installation")); | 212 | wxRAISED_BORDER | wxBU_AUTODRAW,wxDefaultValidator, wxT("Freedoom installation")); |
@@ -233,7 +236,7 @@ void rbutilFrm::CreateGUIControls(void) | |||
233 | wxFlexGridSizer* WxFlexGridSizer3 = new wxFlexGridSizer(2,2,0,0); | 236 | wxFlexGridSizer* WxFlexGridSizer3 = new wxFlexGridSizer(2,2,0,0); |
234 | WxStaticBoxSizer5->Add(WxFlexGridSizer3,0,wxGROW | wxALL,0); | 237 | WxStaticBoxSizer5->Add(WxFlexGridSizer3,0,wxGROW | wxALL,0); |
235 | 238 | ||
236 | wxBitmap WxBitmapButton2_BITMAP (uninstall_3d_xpm); | 239 | wxBitmap WxBitmapButton2_BITMAP (wxGetBitmapFromMemory(remrb_btn_png,remrb_btn_png_length)); |
237 | WxBitmapButton2 = new wxBitmapButton(uninstallpage, ID_REMOVE_BTN, | 240 | WxBitmapButton2 = new wxBitmapButton(uninstallpage, ID_REMOVE_BTN, |
238 | WxBitmapButton2_BITMAP, wxPoint(0,0), wxSize(64,54), | 241 | WxBitmapButton2_BITMAP, wxPoint(0,0), wxSize(64,54), |
239 | wxRAISED_BORDER | wxBU_AUTODRAW,wxDefaultValidator, wxT("Rockbox uninstallation")); | 242 | wxRAISED_BORDER | wxBU_AUTODRAW,wxDefaultValidator, wxT("Rockbox uninstallation")); |
@@ -246,7 +249,7 @@ void rbutilFrm::CreateGUIControls(void) | |||
246 | WxFlexGridSizer3->Add(WxStaticText3,0, | 249 | WxFlexGridSizer3->Add(WxStaticText3,0, |
247 | wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5); | 250 | wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5); |
248 | 251 | ||
249 | wxBitmap WxBitmapButton4_BITMAP (untools2_3d_xpm); | 252 | wxBitmap WxBitmapButton4_BITMAP (wxGetBitmapFromMemory(rembootloader_btn_png,rembootloader_btn_png_length)); |
250 | WxBitmapButton4 = new wxBitmapButton(uninstallpage, ID_BOOTLOADERREMOVE_BTN, | 253 | WxBitmapButton4 = new wxBitmapButton(uninstallpage, ID_BOOTLOADERREMOVE_BTN, |
251 | WxBitmapButton4_BITMAP, wxPoint(0,0), wxSize(64,54), | 254 | WxBitmapButton4_BITMAP, wxPoint(0,0), wxSize(64,54), |
252 | wxRAISED_BORDER | wxBU_AUTODRAW, wxDefaultValidator, | 255 | wxRAISED_BORDER | wxBU_AUTODRAW, wxDefaultValidator, |