diff options
-rw-r--r-- | rbutil/credits.h | 2 | ||||
-rw-r--r-- | rbutil/install_dialogs.cpp | 6 | ||||
-rw-r--r-- | rbutil/rbutil-rc.rc | 8 | ||||
-rw-r--r-- | rbutil/rbutilApp.cpp | 25 | ||||
-rw-r--r-- | rbutil/rbutilCtrls.cpp | 56 | ||||
-rw-r--r-- | rbutil/rbutilCtrls.h | 342 | ||||
-rw-r--r-- | rbutil/rbutilFrm.cpp | 18 | ||||
-rw-r--r-- | rbutil/rbutilFrm.h | 30 |
8 files changed, 103 insertions, 384 deletions
diff --git a/rbutil/credits.h b/rbutil/credits.h index 5a948f7cf6..5dd6c6432f 100644 --- a/rbutil/credits.h +++ b/rbutil/credits.h | |||
@@ -22,7 +22,7 @@ | |||
22 | #define CREDITS_H_INCLUDED | 22 | #define CREDITS_H_INCLUDED |
23 | 23 | ||
24 | #define RBUTIL_FULLNAME "The Rockbox Utility" | 24 | #define RBUTIL_FULLNAME "The Rockbox Utility" |
25 | #define RBUTIL_VERSION "Version 0.3.2.3" | 25 | #define RBUTIL_VERSION "Version 0.3.2.4" |
26 | 26 | ||
27 | static const wxString rbutil_developers[] = { | 27 | static const wxString rbutil_developers[] = { |
28 | wxT("Christi Alice Scarborough"), | 28 | wxT("Christi Alice Scarborough"), |
diff --git a/rbutil/install_dialogs.cpp b/rbutil/install_dialogs.cpp index 80ce618989..40f1ea0588 100644 --- a/rbutil/install_dialogs.cpp +++ b/rbutil/install_dialogs.cpp | |||
@@ -106,7 +106,7 @@ bool bootloaderInstallDlg::TransferDataFromWindow() | |||
106 | return false; | 106 | return false; |
107 | } | 107 | } |
108 | } | 108 | } |
109 | 109 | ||
110 | return true; | 110 | return true; |
111 | 111 | ||
112 | } | 112 | } |
@@ -653,7 +653,7 @@ bool rockboxInstallDlg::TransferDataToWindow() | |||
653 | wxRadioBox* BuildRadioBox = (wxRadioBox*) FindWindow(ID_BUILD_BOX); | 653 | wxRadioBox* BuildRadioBox = (wxRadioBox*) FindWindow(ID_BUILD_BOX); |
654 | 654 | ||
655 | int index =gv->plat_id.Index(gv->curplat); | 655 | int index =gv->plat_id.Index(gv->curplat); |
656 | 656 | ||
657 | wxCommandEvent updateradiobox(wxEVT_COMMAND_RADIOBOX_SELECTED, | 657 | wxCommandEvent updateradiobox(wxEVT_COMMAND_RADIOBOX_SELECTED, |
658 | ID_BUILD_BOX); | 658 | ID_BUILD_BOX); |
659 | 659 | ||
@@ -663,7 +663,7 @@ bool rockboxInstallDlg::TransferDataToWindow() | |||
663 | BuildRadioBox->SetSelection(BUILD_RELEASE); | 663 | BuildRadioBox->SetSelection(BUILD_RELEASE); |
664 | } else { | 664 | } else { |
665 | BuildRadioBox->Enable(BUILD_RELEASE, false); | 665 | BuildRadioBox->Enable(BUILD_RELEASE, false); |
666 | BuildRadioBox->SetSelection(BUILD_DAILY); | 666 | BuildRadioBox->SetSelection(BUILD_BLEEDING); |
667 | 667 | ||
668 | } | 668 | } |
669 | wxPostEvent(this, updateradiobox); | 669 | wxPostEvent(this, updateradiobox); |
diff --git a/rbutil/rbutil-rc.rc b/rbutil/rbutil-rc.rc index 59ec6d27e4..0182338d1e 100644 --- a/rbutil/rbutil-rc.rc +++ b/rbutil/rbutil-rc.rc | |||
@@ -1,8 +1,8 @@ | |||
1 | #define RBUTIL 1 | 1 | #define RBUTIL 1 |
2 | #include <wx/msw/wx.rc> | 2 | #include <wx/msw/wx.rc> |
3 | RBUTIL VERSIONINFO | 3 | RBUTIL VERSIONINFO |
4 | FILEVERSION 0,3,2,3 | 4 | FILEVERSION 0,3,2,4 |
5 | PRODUCTVERSION 0,3,2,3 | 5 | PRODUCTVERSION 0,3,2,4 |
6 | FILEOS 0x00000004 | 6 | FILEOS 0x00000004 |
7 | FILETYPE 0x00000001 | 7 | FILETYPE 0x00000001 |
8 | BEGIN | 8 | BEGIN |
@@ -10,8 +10,8 @@ BEGIN | |||
10 | BEGIN | 10 | BEGIN |
11 | BLOCK "FFFF0000" | 11 | BLOCK "FFFF0000" |
12 | BEGIN | 12 | BEGIN |
13 | VALUE "FileVersion", "0.3.2.3\0" | 13 | VALUE "FileVersion", "0.3.2.4\0" |
14 | VALUE "ProductVersion", "0.3.2.3\0" | 14 | VALUE "ProductVersion", "0.3.2.4\0" |
15 | VALUE "CompanyName", "Rockbox Team\0" | 15 | VALUE "CompanyName", "Rockbox Team\0" |
16 | VALUE "FileDescription", "Rockbox Utility\0" | 16 | VALUE "FileDescription", "Rockbox Utility\0" |
17 | VALUE "InternalName", "rbutil\0" | 17 | VALUE "InternalName", "rbutil\0" |
diff --git a/rbutil/rbutilApp.cpp b/rbutil/rbutilApp.cpp index 8233554e23..71e63884fb 100644 --- a/rbutil/rbutilApp.cpp +++ b/rbutil/rbutilApp.cpp | |||
@@ -123,20 +123,19 @@ bool rbutilFrmApp::ReadGlobalConfig(rbutilFrm* myFrame) | |||
123 | wxLogVerbose(wxT("=== begin rbutilFrmApp::ReadGlobalConfig(%p)"), | 123 | wxLogVerbose(wxT("=== begin rbutilFrmApp::ReadGlobalConfig(%p)"), |
124 | (void*) myFrame); | 124 | (void*) myFrame); |
125 | 125 | ||
126 | // Cross-platform compatibility: look for rbutil.ini in the same dir as the | 126 | // Cross-platform compatibility: look for rbutil.ini in then in the app dir |
127 | // executable before trying the standard data directory. On Windows these | 127 | // then in the user config dir (linux ~/) and |
128 | // are of course the same directory. | 128 | // then config dir (linux /etc/ ) |
129 | buf.Printf(wxT("%s" PATH_SEP "rbutil.ini"), gv->AppDir.c_str() ); | ||
130 | 129 | ||
131 | // if (! wxFileExists(buf) ) | 130 | buf.Printf(wxT("%s" PATH_SEP "rbutil.ini"), gv->AppDir.c_str() ); |
132 | // { | 131 | if (! wxFileExists(buf) ) |
133 | // gv->ResourceDir = gv->stdpaths->GetResourcesDir(); | 132 | { |
134 | // buf.Printf(wxT("%s" PATH_SEP "rbutil.ini"), | 133 | buf.Printf(wxT("%s" PATH_SEP ".rbutil" PATH_SEP "rbutil.ini"), gv->stdpaths->GetUserConfigDir().c_str() ); |
135 | // gv->ResourceDir.c_str() ); | 134 | if (! wxFileExists(buf) ) |
136 | // } else | 135 | { |
137 | // { | 136 | buf.Printf(wxT("%s" PATH_SEP "rbutil.ini"), gv->stdpaths->GetConfigDir().c_str() ); |
138 | // gv->ResourceDir = gv->AppDir; | 137 | } |
139 | // } | 138 | } |
140 | 139 | ||
141 | wxFileInputStream* cfgis = new wxFileInputStream(buf); | 140 | wxFileInputStream* cfgis = new wxFileInputStream(buf); |
142 | 141 | ||
diff --git a/rbutil/rbutilCtrls.cpp b/rbutil/rbutilCtrls.cpp index 007bd6e17d..aef37fd0d3 100644 --- a/rbutil/rbutilCtrls.cpp +++ b/rbutil/rbutilCtrls.cpp | |||
@@ -52,17 +52,17 @@ wxSize ImageCtrl::DoGetBestSize() const | |||
52 | //// Theme Control | 52 | //// Theme Control |
53 | ////////////////////////////////////////////// | 53 | ////////////////////////////////////////////// |
54 | 54 | ||
55 | BEGIN_EVENT_TABLE(ThemeCtrl, wxControl) | 55 | BEGIN_EVENT_TABLE(ThemeCtrl, wxPanel) |
56 | EVT_LISTBOX(ID_THEME_LST, ThemeCtrl::OnThemesLst) | 56 | EVT_LISTBOX(ID_THEME_LST, ThemeCtrl::OnThemesLst) |
57 | END_EVENT_TABLE() | 57 | END_EVENT_TABLE() |
58 | 58 | ||
59 | IMPLEMENT_DYNAMIC_CLASS(ThemeCtrl, wxControl) | 59 | IMPLEMENT_DYNAMIC_CLASS(ThemeCtrl, wxPanel) |
60 | 60 | ||
61 | bool ThemeCtrl::Create(wxWindow* parent, wxWindowID id, | 61 | bool ThemeCtrl::Create(wxWindow* parent, wxWindowID id, |
62 | const wxPoint& pos, const wxSize& size, long style, | 62 | const wxPoint& pos, const wxSize& size, long style, |
63 | const wxValidator& validator) | 63 | const wxString title ) |
64 | { | 64 | { |
65 | if (!wxControl::Create(parent, id, pos, size, style, validator)) return false; | 65 | if (!wxPanel::Create(parent, id, pos, size, style, title)) return false; |
66 | 66 | ||
67 | CreateControls(); | 67 | CreateControls(); |
68 | 68 | ||
@@ -291,17 +291,17 @@ void ThemeCtrl::OnThemesLst(wxCommandEvent& event) | |||
291 | //// Ok Cancel Control | 291 | //// Ok Cancel Control |
292 | ////////////////////////////////////////////// | 292 | ////////////////////////////////////////////// |
293 | 293 | ||
294 | BEGIN_EVENT_TABLE(OkCancelCtrl, wxControl) | 294 | BEGIN_EVENT_TABLE(OkCancelCtrl, wxPanel) |
295 | 295 | ||
296 | END_EVENT_TABLE() | 296 | END_EVENT_TABLE() |
297 | 297 | ||
298 | IMPLEMENT_DYNAMIC_CLASS(OkCancelCtrl, wxControl) | 298 | IMPLEMENT_DYNAMIC_CLASS(OkCancelCtrl, wxPanel) |
299 | 299 | ||
300 | bool OkCancelCtrl::Create(wxWindow* parent, wxWindowID id, | 300 | bool OkCancelCtrl::Create(wxWindow* parent, wxWindowID id, |
301 | const wxPoint& pos, const wxSize& size, long style, | 301 | const wxPoint& pos, const wxSize& size, long style, |
302 | const wxValidator& validator) | 302 | const wxString title) |
303 | { | 303 | { |
304 | if (!wxControl::Create(parent, id, pos, size, style, validator)) return false; | 304 | if (!wxPanel::Create(parent, id, pos, size, style, title)) return false; |
305 | 305 | ||
306 | CreateControls(); | 306 | CreateControls(); |
307 | GetSizer()->Fit(this); | 307 | GetSizer()->Fit(this); |
@@ -333,23 +333,23 @@ void OkCancelCtrl::CreateControls() | |||
333 | //// Device Selector | 333 | //// Device Selector |
334 | ////////////////////////////////////////////// | 334 | ////////////////////////////////////////////// |
335 | 335 | ||
336 | BEGIN_EVENT_TABLE(DeviceSelectorCtrl, wxControl) | 336 | BEGIN_EVENT_TABLE(DeviceSelectorCtrl, wxPanel) |
337 | EVT_BUTTON(ID_AUTODETECT_BTN, DeviceSelectorCtrl::OnAutoDetect) | 337 | EVT_BUTTON(ID_AUTODETECT_BTN, DeviceSelectorCtrl::OnAutoDetect) |
338 | EVT_COMBOBOX(ID_DEVICE_CBX,DeviceSelectorCtrl::OnComboBox) | 338 | EVT_COMBOBOX(ID_DEVICE_CBX,DeviceSelectorCtrl::OnComboBox) |
339 | END_EVENT_TABLE() | 339 | END_EVENT_TABLE() |
340 | 340 | ||
341 | IMPLEMENT_DYNAMIC_CLASS(DeviceSelectorCtrl, wxControl) | 341 | IMPLEMENT_DYNAMIC_CLASS(DeviceSelectorCtrl, wxPanel) |
342 | 342 | ||
343 | bool DeviceSelectorCtrl::Create(wxWindow* parent, wxWindowID id, | 343 | bool DeviceSelectorCtrl::Create(wxWindow* parent, wxWindowID id, |
344 | const wxPoint& pos, const wxSize& size, long style, | 344 | const wxPoint& pos, const wxSize& size, long style, |
345 | const wxValidator& validator) | 345 | const wxString title) |
346 | { | 346 | { |
347 | if (!wxControl::Create(parent, id, pos, size, style, validator)) return false; | 347 | if (!wxPanel::Create(parent, id, pos, size, style, title)) return false; |
348 | 348 | ||
349 | CreateControls(); | 349 | CreateControls(); |
350 | GetSizer()->Fit(this); | 350 | GetSizer()->Fit(this); |
351 | GetSizer()->SetSizeHints(this); | 351 | GetSizer()->SetSizeHints(this); |
352 | return true; | 352 | return true; |
353 | } | 353 | } |
354 | 354 | ||
355 | void DeviceSelectorCtrl::CreateControls() | 355 | void DeviceSelectorCtrl::CreateControls() |
@@ -358,8 +358,7 @@ void DeviceSelectorCtrl::CreateControls() | |||
358 | wxBoxSizer* topSizer = new wxBoxSizer(wxVERTICAL); | 358 | wxBoxSizer* topSizer = new wxBoxSizer(wxVERTICAL); |
359 | this->SetSizer(topSizer); | 359 | this->SetSizer(topSizer); |
360 | 360 | ||
361 | //Device Selection | 361 | //Device Selection |
362 | |||
363 | wxBoxSizer* horizontalSizer = new wxBoxSizer(wxHORIZONTAL); | 362 | wxBoxSizer* horizontalSizer = new wxBoxSizer(wxHORIZONTAL); |
364 | topSizer->Add(horizontalSizer, 0, wxALIGN_LEFT|wxALL, 5); | 363 | topSizer->Add(horizontalSizer, 0, wxALIGN_LEFT|wxALL, 5); |
365 | m_desc = new wxStaticText( this, wxID_STATIC, | 364 | m_desc = new wxStaticText( this, wxID_STATIC, |
@@ -367,7 +366,7 @@ void DeviceSelectorCtrl::CreateControls() | |||
367 | wxDefaultSize, 0 ); | 366 | wxDefaultSize, 0 ); |
368 | horizontalSizer->Add(m_desc, 0, wxALIGN_LEFT|wxALL, 5); | 367 | horizontalSizer->Add(m_desc, 0, wxALIGN_LEFT|wxALL, 5); |
369 | 368 | ||
370 | m_deviceCbx = new wxComboBox(this, ID_DEVICE_CBX,wxT(""), | 369 | m_deviceCbx = new wxComboBox(this, ID_DEVICE_CBX,wxT("Select your Device"), |
371 | wxDefaultPosition,wxDefaultSize,gv->plat_name,wxCB_READONLY); | 370 | wxDefaultPosition,wxDefaultSize,gv->plat_name,wxCB_READONLY); |
372 | 371 | ||
373 | m_deviceCbx->SetToolTip(wxT("Select your Device.")); | 372 | m_deviceCbx->SetToolTip(wxT("Select your Device.")); |
@@ -379,8 +378,9 @@ void DeviceSelectorCtrl::CreateControls() | |||
379 | wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, | 378 | wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, |
380 | wxT("AutodetectBtn")); | 379 | wxT("AutodetectBtn")); |
381 | 380 | ||
382 | m_autodetectBtn->SetToolTip(wxT("Autodetection of the Device.")); | 381 | m_autodetectBtn->SetToolTip(wxT("Click here to autodetect your Device.")); |
383 | m_autodetectBtn->SetHelpText(wxT("Autodetection of the Device.")); | 382 | m_autodetectBtn->SetHelpText(wxT("Autodetection of the Device.")); |
383 | // m_autodetectBtn->SetFocus(); | ||
384 | 384 | ||
385 | horizontalSizer->Add(m_autodetectBtn,0,wxGROW | wxALL,5); | 385 | horizontalSizer->Add(m_autodetectBtn,0,wxGROW | wxALL,5); |
386 | Layout(); | 386 | Layout(); |
@@ -457,17 +457,17 @@ void DeviceSelectorCtrl::OnAutoDetect(wxCommandEvent& event) | |||
457 | //// DevicePosition Selector | 457 | //// DevicePosition Selector |
458 | ////////////////////////////////////////////// | 458 | ////////////////////////////////////////////// |
459 | 459 | ||
460 | BEGIN_EVENT_TABLE(DevicePositionCtrl, wxControl) | 460 | BEGIN_EVENT_TABLE(DevicePositionCtrl, wxPanel) |
461 | EVT_BUTTON(ID_BROWSE_BTN, DevicePositionCtrl::OnBrowseBtn) | 461 | EVT_BUTTON(ID_BROWSE_BTN, DevicePositionCtrl::OnBrowseBtn) |
462 | END_EVENT_TABLE() | 462 | END_EVENT_TABLE() |
463 | 463 | ||
464 | IMPLEMENT_DYNAMIC_CLASS(DevicePositionCtrl, wxControl) | 464 | IMPLEMENT_DYNAMIC_CLASS(DevicePositionCtrl, wxPanel) |
465 | 465 | ||
466 | bool DevicePositionCtrl::Create(wxWindow* parent, wxWindowID id, | 466 | bool DevicePositionCtrl::Create(wxWindow* parent, wxWindowID id, |
467 | const wxPoint& pos, const wxSize& size, long style, | 467 | const wxPoint& pos, const wxSize& size, long style, |
468 | const wxValidator& validator) | 468 | const wxString title) |
469 | { | 469 | { |
470 | if (!wxControl::Create(parent, id, pos, size, style, validator)) return false; | 470 | if (!wxPanel::Create(parent, id, pos, size, style, title)) return false; |
471 | 471 | ||
472 | CreateControls(); | 472 | CreateControls(); |
473 | GetSizer()->Fit(this); | 473 | GetSizer()->Fit(this); |
@@ -491,8 +491,8 @@ void DevicePositionCtrl::CreateControls() | |||
491 | topSizer->Add(horizontalSizer, 0, wxGROW|wxALL, 5); | 491 | topSizer->Add(horizontalSizer, 0, wxGROW|wxALL, 5); |
492 | 492 | ||
493 | m_devicePos = new wxTextCtrl(this,wxID_ANY,gv->curdestdir); | 493 | m_devicePos = new wxTextCtrl(this,wxID_ANY,gv->curdestdir); |
494 | m_devicePos->SetToolTip(wxT("Select your Devicefolder")); | 494 | m_devicePos->SetToolTip(wxT("Type the folder where your Device is here")); |
495 | m_devicePos->SetHelpText(wxT("Select your Devicefolder")); | 495 | m_devicePos->SetHelpText(wxT("Type the folder where your Device is here")); |
496 | horizontalSizer->Add(m_devicePos,0,wxGROW | wxALL,5); | 496 | horizontalSizer->Add(m_devicePos,0,wxGROW | wxALL,5); |
497 | 497 | ||
498 | m_browseBtn = new wxButton(this, ID_BROWSE_BTN, wxT("Browse"), | 498 | m_browseBtn = new wxButton(this, ID_BROWSE_BTN, wxT("Browse"), |
@@ -534,7 +534,7 @@ void DevicePositionCtrl::OnBrowseBtn(wxCommandEvent& event) | |||
534 | //// FirmwarePosition Selector | 534 | //// FirmwarePosition Selector |
535 | ////////////////////////////////////////////// | 535 | ////////////////////////////////////////////// |
536 | 536 | ||
537 | BEGIN_EVENT_TABLE(FirmwarePositionCtrl, wxControl) | 537 | BEGIN_EVENT_TABLE(FirmwarePositionCtrl, wxPanel) |
538 | EVT_BUTTON(ID_BROWSE_BTN, FirmwarePositionCtrl::OnBrowseBtn) | 538 | EVT_BUTTON(ID_BROWSE_BTN, FirmwarePositionCtrl::OnBrowseBtn) |
539 | END_EVENT_TABLE() | 539 | END_EVENT_TABLE() |
540 | 540 | ||
@@ -542,9 +542,9 @@ IMPLEMENT_DYNAMIC_CLASS(FirmwarePositionCtrl, wxControl) | |||
542 | 542 | ||
543 | bool FirmwarePositionCtrl::Create(wxWindow* parent, wxWindowID id, | 543 | bool FirmwarePositionCtrl::Create(wxWindow* parent, wxWindowID id, |
544 | const wxPoint& pos, const wxSize& size, long style, | 544 | const wxPoint& pos, const wxSize& size, long style, |
545 | const wxValidator& validator) | 545 | const wxString title) |
546 | { | 546 | { |
547 | if (!wxControl::Create(parent, id, pos, size, style, validator)) return false; | 547 | if (!wxPanel::Create(parent, id, pos, size, style, title)) return false; |
548 | 548 | ||
549 | CreateControls(); | 549 | CreateControls(); |
550 | GetSizer()->Fit(this); | 550 | GetSizer()->Fit(this); |
@@ -568,8 +568,8 @@ void FirmwarePositionCtrl::CreateControls() | |||
568 | topSizer->Add(horizontalSizer, 0, wxALIGN_LEFT|wxALL, 5); | 568 | topSizer->Add(horizontalSizer, 0, wxALIGN_LEFT|wxALL, 5); |
569 | 569 | ||
570 | m_firmwarePos = new wxTextCtrl(this,wxID_ANY,gv->curdestdir); | 570 | m_firmwarePos = new wxTextCtrl(this,wxID_ANY,gv->curdestdir); |
571 | m_firmwarePos->SetToolTip(wxT("Select the original Firmware")); | 571 | m_firmwarePos->SetToolTip(wxT("Type the folder where the original Firmware is here")); |
572 | m_firmwarePos->SetHelpText(wxT("Select the original Firmware")); | 572 | m_firmwarePos->SetHelpText(wxT("Type the folder where the original Firmware is here")); |
573 | horizontalSizer->Add(m_firmwarePos,0,wxGROW | wxALL,5); | 573 | horizontalSizer->Add(m_firmwarePos,0,wxGROW | wxALL,5); |
574 | 574 | ||
575 | m_browseBtn = new wxButton(this, ID_BROWSE_BTN, wxT("Browse"), | 575 | m_browseBtn = new wxButton(this, ID_BROWSE_BTN, wxT("Browse"), |
diff --git a/rbutil/rbutilCtrls.h b/rbutil/rbutilCtrls.h index 89e2b0b3d1..1b084a88d9 100644 --- a/rbutil/rbutilCtrls.h +++ b/rbutil/rbutilCtrls.h | |||
@@ -39,7 +39,7 @@ protected: | |||
39 | 39 | ||
40 | }; | 40 | }; |
41 | 41 | ||
42 | class ThemeCtrl: public wxControl | 42 | class ThemeCtrl: public wxPanel |
43 | { | 43 | { |
44 | DECLARE_DYNAMIC_CLASS(ThemeCtrl) | 44 | DECLARE_DYNAMIC_CLASS(ThemeCtrl) |
45 | DECLARE_EVENT_TABLE() | 45 | DECLARE_EVENT_TABLE() |
@@ -58,18 +58,18 @@ public: | |||
58 | ThemeCtrl(wxWindow* parent, wxWindowID id, | 58 | ThemeCtrl(wxWindow* parent, wxWindowID id, |
59 | const wxPoint& pos = wxDefaultPosition, | 59 | const wxPoint& pos = wxDefaultPosition, |
60 | const wxSize& size = wxDefaultSize, | 60 | const wxSize& size = wxDefaultSize, |
61 | long style = wxNO_BORDER, | 61 | long style = wxNO_BORDER|wxTAB_TRAVERSAL, |
62 | const wxValidator& validator = wxDefaultValidator) | 62 | const wxString title = wxT("")) |
63 | { | 63 | { |
64 | Init(); | 64 | Init(); |
65 | Create(parent, id, pos, size, style, validator); | 65 | Create(parent, id, pos, size, style, title); |
66 | } | 66 | } |
67 | // Creation | 67 | // Creation |
68 | bool Create(wxWindow* parent, wxWindowID id, | 68 | bool Create(wxWindow* parent, wxWindowID id, |
69 | const wxPoint& pos = wxDefaultPosition, | 69 | const wxPoint& pos = wxDefaultPosition, |
70 | const wxSize& size = wxDefaultSize, | 70 | const wxSize& size = wxDefaultSize, |
71 | long style = wxNO_BORDER, | 71 | long style = wxNO_BORDER|wxTAB_TRAVERSAL, |
72 | const wxValidator& validator = wxDefaultValidator); | 72 | const wxString title = wxT("")); |
73 | 73 | ||
74 | // Creates the controls and sizers | 74 | // Creates the controls and sizers |
75 | void CreateControls(); | 75 | void CreateControls(); |
@@ -100,7 +100,7 @@ protected: | |||
100 | 100 | ||
101 | }; | 101 | }; |
102 | 102 | ||
103 | class OkCancelCtrl: public wxControl | 103 | class OkCancelCtrl: public wxPanel |
104 | { | 104 | { |
105 | DECLARE_DYNAMIC_CLASS(OkCancelCtrl) | 105 | DECLARE_DYNAMIC_CLASS(OkCancelCtrl) |
106 | DECLARE_EVENT_TABLE() | 106 | DECLARE_EVENT_TABLE() |
@@ -111,18 +111,18 @@ public: | |||
111 | OkCancelCtrl(wxWindow* parent, wxWindowID id, | 111 | OkCancelCtrl(wxWindow* parent, wxWindowID id, |
112 | const wxPoint& pos = wxDefaultPosition, | 112 | const wxPoint& pos = wxDefaultPosition, |
113 | const wxSize& size = wxDefaultSize, | 113 | const wxSize& size = wxDefaultSize, |
114 | long style = wxNO_BORDER, | 114 | long style = wxNO_BORDER|wxTAB_TRAVERSAL, |
115 | const wxValidator& validator = wxDefaultValidator) | 115 | const wxString title = wxT("")) |
116 | { | 116 | { |
117 | Init(); | 117 | Init(); |
118 | Create(parent, id, pos, size, style, validator); | 118 | Create(parent, id, pos, size, style, title); |
119 | } | 119 | } |
120 | // Creation | 120 | // Creation |
121 | bool Create(wxWindow* parent, wxWindowID id, | 121 | bool Create(wxWindow* parent, wxWindowID id, |
122 | const wxPoint& pos = wxDefaultPosition, | 122 | const wxPoint& pos = wxDefaultPosition, |
123 | const wxSize& size = wxDefaultSize, | 123 | const wxSize& size = wxDefaultSize, |
124 | long style = wxNO_BORDER, | 124 | long style = wxNO_BORDER|wxTAB_TRAVERSAL, |
125 | const wxValidator& validator = wxDefaultValidator); | 125 | const wxString title = wxT("")); |
126 | 126 | ||
127 | // Creates the controls and sizers | 127 | // Creates the controls and sizers |
128 | void CreateControls(); | 128 | void CreateControls(); |
@@ -135,7 +135,7 @@ protected: | |||
135 | 135 | ||
136 | }; | 136 | }; |
137 | 137 | ||
138 | class DeviceSelectorCtrl: public wxControl | 138 | class DeviceSelectorCtrl: public wxPanel |
139 | { | 139 | { |
140 | DECLARE_DYNAMIC_CLASS(DeviceSelectorCtrl) | 140 | DECLARE_DYNAMIC_CLASS(DeviceSelectorCtrl) |
141 | DECLARE_EVENT_TABLE() | 141 | DECLARE_EVENT_TABLE() |
@@ -151,17 +151,17 @@ public: | |||
151 | DeviceSelectorCtrl(wxWindow* parent, wxWindowID id, | 151 | DeviceSelectorCtrl(wxWindow* parent, wxWindowID id, |
152 | const wxPoint& pos = wxDefaultPosition, | 152 | const wxPoint& pos = wxDefaultPosition, |
153 | const wxSize& size = wxDefaultSize, | 153 | const wxSize& size = wxDefaultSize, |
154 | long style = wxNO_BORDER, | 154 | long style = wxNO_BORDER|wxTAB_TRAVERSAL, |
155 | const wxValidator& validator = wxDefaultValidator) | 155 | const wxString title = wxT("")) |
156 | { | 156 | { |
157 | Create(parent, id, pos, size, style, validator); | 157 | Create(parent, id, pos, size, style, title); |
158 | } | 158 | } |
159 | // Creation | 159 | // Creation |
160 | bool Create(wxWindow* parent, wxWindowID id, | 160 | bool Create(wxWindow* parent, wxWindowID id, |
161 | const wxPoint& pos = wxDefaultPosition, | 161 | const wxPoint& pos = wxDefaultPosition, |
162 | const wxSize& size = wxDefaultSize, | 162 | const wxSize& size = wxDefaultSize, |
163 | long style = wxNO_BORDER, | 163 | long style = wxNO_BORDER|wxTAB_TRAVERSAL, |
164 | const wxValidator& validator = wxDefaultValidator); | 164 | const wxString title = wxT("")); |
165 | 165 | ||
166 | // Creates the controls and sizers | 166 | // Creates the controls and sizers |
167 | void CreateControls(); | 167 | void CreateControls(); |
@@ -181,7 +181,7 @@ protected: | |||
181 | }; | 181 | }; |
182 | 182 | ||
183 | 183 | ||
184 | class DevicePositionCtrl: public wxControl | 184 | class DevicePositionCtrl: public wxPanel |
185 | { | 185 | { |
186 | DECLARE_DYNAMIC_CLASS(DevicePositionCtrl) | 186 | DECLARE_DYNAMIC_CLASS(DevicePositionCtrl) |
187 | DECLARE_EVENT_TABLE() | 187 | DECLARE_EVENT_TABLE() |
@@ -196,18 +196,18 @@ public: | |||
196 | DevicePositionCtrl(wxWindow* parent, wxWindowID id, | 196 | DevicePositionCtrl(wxWindow* parent, wxWindowID id, |
197 | const wxPoint& pos = wxDefaultPosition, | 197 | const wxPoint& pos = wxDefaultPosition, |
198 | const wxSize& size = wxDefaultSize, | 198 | const wxSize& size = wxDefaultSize, |
199 | long style = wxNO_BORDER, | 199 | long style = wxNO_BORDER|wxTAB_TRAVERSAL, |
200 | const wxValidator& validator = wxDefaultValidator) | 200 | const wxString title = wxT("")) |
201 | { | 201 | { |
202 | Init(); | 202 | Init(); |
203 | Create(parent, id, pos, size, style, validator); | 203 | Create(parent, id, pos, size, style, title); |
204 | } | 204 | } |
205 | // Creation | 205 | // Creation |
206 | bool Create(wxWindow* parent, wxWindowID id, | 206 | bool Create(wxWindow* parent, wxWindowID id, |
207 | const wxPoint& pos = wxDefaultPosition, | 207 | const wxPoint& pos = wxDefaultPosition, |
208 | const wxSize& size = wxDefaultSize, | 208 | const wxSize& size = wxDefaultSize, |
209 | long style = wxNO_BORDER, | 209 | long style = wxNO_BORDER|wxTAB_TRAVERSAL, |
210 | const wxValidator& validator = wxDefaultValidator); | 210 | const wxString title = wxT("")); |
211 | 211 | ||
212 | // Creates the controls and sizers | 212 | // Creates the controls and sizers |
213 | void CreateControls(); | 213 | void CreateControls(); |
@@ -228,7 +228,7 @@ protected: | |||
228 | }; | 228 | }; |
229 | 229 | ||
230 | 230 | ||
231 | class FirmwarePositionCtrl: public wxControl | 231 | class FirmwarePositionCtrl: public wxPanel |
232 | { | 232 | { |
233 | DECLARE_DYNAMIC_CLASS(FirmwarePositionCtrl) | 233 | DECLARE_DYNAMIC_CLASS(FirmwarePositionCtrl) |
234 | DECLARE_EVENT_TABLE() | 234 | DECLARE_EVENT_TABLE() |
@@ -243,300 +243,18 @@ public: | |||
243 | FirmwarePositionCtrl(wxWindow* parent, wxWindowID id, | 243 | FirmwarePositionCtrl(wxWindow* parent, wxWindowID id, |
244 | const wxPoint& pos = wxDefaultPosition, | 244 | const wxPoint& pos = wxDefaultPosition, |
245 | const wxSize& size = wxDefaultSize, | 245 | const wxSize& size = wxDefaultSize, |
246 | long style = wxNO_BORDER, | 246 | long style = wxNO_BORDER|wxTAB_TRAVERSAL, |
247 | const wxValidator& validator = wxDefaultValidator) | 247 | const wxString title = wxT("")) |
248 | { | 248 | { |
249 | Init(); | 249 | Init(); |
250 | Create(parent, id, pos, size, style, validator); | 250 | Create(parent, id, pos, size, style, title); |
251 | } | 251 | } |
252 | // Creation | 252 | // Creation |
253 | bool Create(wxWindow* parent, wxWindowID id, | 253 | bool Create(wxWindow* parent, wxWindowID id, |
254 | const wxPoint& pos = wxDefaultPosition, | 254 | const wxPoint& pos = wxDefaultPosition, |
255 | const wxSize& size = wxDefaultSize, | 255 | const wxSize& size = wxDefaultSize, |
256 | long style = wxNO_BORDER, | 256 | long style = wxNO_BORDER|wxTAB_TRAVERSAL, |
257 | const wxValidator& validator = wxDefaultValidator); | 257 | const wxString title = wxT("")); |
258 | |||
259 | // Creates the controls and sizers | ||
260 | void CreateControls(); | ||
261 | // Common initialization | ||
262 | void Init() { } | ||
263 | // Event handlers | ||
264 | void OnBrowseBtn(wxCommandEvent& event); | ||
265 | // Accessors | ||
266 | wxString getFirmwarePos(); | ||
267 | void setDefault(); | ||
268 | |||
269 | protected: | ||
270 | wxTextCtrl* m_firmwarePos; | ||
271 | wxStaticText* m_desc; | ||
272 | wxButton* m_browseBtn; | ||
273 | |||
274 | }; | ||
275 | |||
276 | |||
277 | |||
278 | #endif | ||
279 | |||
280 | #ifndef RBUTILCTRLS_H_INCLUDED | ||
281 | #define RBUTILCTRLS_H_INCLUDED | ||
282 | |||
283 | #include "rbutil.h" | ||
284 | |||
285 | |||
286 | class ImageCtrl: public wxControl | ||
287 | { | ||
288 | DECLARE_DYNAMIC_CLASS(ImageCtrl) | ||
289 | DECLARE_EVENT_TABLE() | ||
290 | |||
291 | public: | ||
292 | // Constructors | ||
293 | ImageCtrl() { } | ||
294 | ImageCtrl(wxWindow* parent, wxWindowID id, | ||
295 | const wxPoint& pos = wxDefaultPosition, | ||
296 | const wxSize& size = wxDefaultSize, | ||
297 | long style = wxNO_BORDER, | ||
298 | const wxValidator& validator = wxDefaultValidator) | ||
299 | { | ||
300 | Create(parent, id, pos, size, style, validator); | ||
301 | } | ||
302 | // Creation | ||
303 | bool Create(wxWindow* parent, wxWindowID id, | ||
304 | const wxPoint& pos = wxDefaultPosition, | ||
305 | const wxSize& size = wxDefaultSize, | ||
306 | long style = wxNO_BORDER, | ||
307 | const wxValidator& validator = wxDefaultValidator); | ||
308 | |||
309 | // Event handlers | ||
310 | void OnPaint(wxPaintEvent& event); | ||
311 | |||
312 | wxSize DoGetBestSize() const ; | ||
313 | |||
314 | void SetBitmap(wxBitmap bmp); | ||
315 | |||
316 | protected: | ||
317 | wxBitmap m_bitmap; | ||
318 | |||
319 | }; | ||
320 | |||
321 | class ThemeCtrl: public wxControl | ||
322 | { | ||
323 | DECLARE_DYNAMIC_CLASS(ThemeCtrl) | ||
324 | DECLARE_EVENT_TABLE() | ||
325 | public: | ||
326 | enum { | ||
327 | ID_DESC = 10001, | ||
328 | ID_FILESIZE= 10002, | ||
329 | ID_INSTALLCHECKBOX= 10003, | ||
330 | ID_PREVIEW_BITMAP = 10004, | ||
331 | ID_THEME_LST = 10005, | ||
332 | }; //End of Enum | ||
333 | |||
334 | public: | ||
335 | // Constructors | ||
336 | ThemeCtrl() { Init(); } | ||
337 | ThemeCtrl(wxWindow* parent, wxWindowID id, | ||
338 | const wxPoint& pos = wxDefaultPosition, | ||
339 | const wxSize& size = wxDefaultSize, | ||
340 | long style = wxNO_BORDER, | ||
341 | const wxValidator& validator = wxDefaultValidator) | ||
342 | { | ||
343 | Init(); | ||
344 | Create(parent, id, pos, size, style, validator); | ||
345 | } | ||
346 | // Creation | ||
347 | bool Create(wxWindow* parent, wxWindowID id, | ||
348 | const wxPoint& pos = wxDefaultPosition, | ||
349 | const wxSize& size = wxDefaultSize, | ||
350 | long style = wxNO_BORDER, | ||
351 | const wxValidator& validator = wxDefaultValidator); | ||
352 | |||
353 | // Creates the controls and sizers | ||
354 | void CreateControls(); | ||
355 | // Common initialization | ||
356 | void Init(); | ||
357 | // Event handlers | ||
358 | void OnThemesLst(wxCommandEvent& event); | ||
359 | void OnCheckBox(wxCommandEvent& event); | ||
360 | |||
361 | void setDevice(wxString device); | ||
362 | wxArrayString getThemesToInstall(); | ||
363 | |||
364 | protected: | ||
365 | wxString m_currentimage; | ||
366 | wxString m_currentResolution; | ||
367 | |||
368 | wxStaticText* m_desc; | ||
369 | wxListBox* m_themeList; | ||
370 | wxStaticText* m_size; | ||
371 | wxStaticText* m_themedesc; | ||
372 | ImageCtrl* m_PreviewBitmap; | ||
373 | |||
374 | wxArrayString m_Themes; | ||
375 | wxArrayString m_Themes_path; | ||
376 | wxArrayString m_Themes_size; | ||
377 | wxArrayString m_Themes_image; | ||
378 | wxArrayString m_Themes_desc; | ||
379 | |||
380 | wxCriticalSection m_setDeviceSection; | ||
381 | wxCriticalSection m_ThemeSelectSection; | ||
382 | |||
383 | }; | ||
384 | |||
385 | class OkCancelCtrl: public wxControl | ||
386 | { | ||
387 | DECLARE_DYNAMIC_CLASS(OkCancelCtrl) | ||
388 | DECLARE_EVENT_TABLE() | ||
389 | |||
390 | public: | ||
391 | // Constructors | ||
392 | OkCancelCtrl() { Init(); } | ||
393 | OkCancelCtrl(wxWindow* parent, wxWindowID id, | ||
394 | const wxPoint& pos = wxDefaultPosition, | ||
395 | const wxSize& size = wxDefaultSize, | ||
396 | long style = wxNO_BORDER, | ||
397 | const wxValidator& validator = wxDefaultValidator) | ||
398 | { | ||
399 | Init(); | ||
400 | Create(parent, id, pos, size, style, validator); | ||
401 | } | ||
402 | // Creation | ||
403 | bool Create(wxWindow* parent, wxWindowID id, | ||
404 | const wxPoint& pos = wxDefaultPosition, | ||
405 | const wxSize& size = wxDefaultSize, | ||
406 | long style = wxNO_BORDER, | ||
407 | const wxValidator& validator = wxDefaultValidator); | ||
408 | |||
409 | // Creates the controls and sizers | ||
410 | void CreateControls(); | ||
411 | // Common initialization | ||
412 | void Init() { } | ||
413 | |||
414 | protected: | ||
415 | wxButton* m_OkBtn; | ||
416 | wxButton* m_CancelBtn; | ||
417 | |||
418 | }; | ||
419 | |||
420 | class DeviceSelectorCtrl: public wxControl | ||
421 | { | ||
422 | DECLARE_DYNAMIC_CLASS(DeviceSelectorCtrl) | ||
423 | DECLARE_EVENT_TABLE() | ||
424 | public: | ||
425 | enum { | ||
426 | ID_DEVICE_CBX = 10001, | ||
427 | ID_AUTODETECT_BTN= 10002, | ||
428 | }; //End of Enum | ||
429 | |||
430 | public: | ||
431 | // Constructors | ||
432 | DeviceSelectorCtrl() { } | ||
433 | DeviceSelectorCtrl(wxWindow* parent, wxWindowID id,bool bootmode, | ||
434 | const wxPoint& pos = wxDefaultPosition, | ||
435 | const wxSize& size = wxDefaultSize, | ||
436 | long style = wxNO_BORDER, | ||
437 | const wxValidator& validator = wxDefaultValidator) | ||
438 | { | ||
439 | Create(parent, id,bootmode, pos, size, style, validator); | ||
440 | } | ||
441 | // Creation | ||
442 | bool Create(wxWindow* parent, wxWindowID id,bool bootmode, | ||
443 | const wxPoint& pos = wxDefaultPosition, | ||
444 | const wxSize& size = wxDefaultSize, | ||
445 | long style = wxNO_BORDER, | ||
446 | const wxValidator& validator = wxDefaultValidator); | ||
447 | |||
448 | // Creates the controls and sizers | ||
449 | void CreateControls(bool bootmode); | ||
450 | // Event handlers | ||
451 | void OnAutoDetect(wxCommandEvent& event); | ||
452 | void OnComboBox(wxCommandEvent& event); | ||
453 | // Accessors | ||
454 | wxString getDevice(); | ||
455 | void setDefault(); | ||
456 | |||
457 | protected: | ||
458 | wxString m_currentDevice; | ||
459 | wxComboBox* m_deviceCbx; | ||
460 | wxStaticText* m_desc; | ||
461 | wxButton* m_autodetectBtn; | ||
462 | |||
463 | }; | ||
464 | |||
465 | |||
466 | class DevicePositionCtrl: public wxControl | ||
467 | { | ||
468 | DECLARE_DYNAMIC_CLASS(DevicePositionCtrl) | ||
469 | DECLARE_EVENT_TABLE() | ||
470 | public: | ||
471 | enum { | ||
472 | ID_BROWSE_BTN = 10003, | ||
473 | }; //End of Enum | ||
474 | |||
475 | public: | ||
476 | // Constructors | ||
477 | DevicePositionCtrl() { Init(); } | ||
478 | DevicePositionCtrl(wxWindow* parent, wxWindowID id, | ||
479 | const wxPoint& pos = wxDefaultPosition, | ||
480 | const wxSize& size = wxDefaultSize, | ||
481 | long style = wxNO_BORDER, | ||
482 | const wxValidator& validator = wxDefaultValidator) | ||
483 | { | ||
484 | Init(); | ||
485 | Create(parent, id, pos, size, style, validator); | ||
486 | } | ||
487 | // Creation | ||
488 | bool Create(wxWindow* parent, wxWindowID id, | ||
489 | const wxPoint& pos = wxDefaultPosition, | ||
490 | const wxSize& size = wxDefaultSize, | ||
491 | long style = wxNO_BORDER, | ||
492 | const wxValidator& validator = wxDefaultValidator); | ||
493 | |||
494 | // Creates the controls and sizers | ||
495 | void CreateControls(); | ||
496 | // Common initialization | ||
497 | void Init() { } | ||
498 | // Event handlers | ||
499 | void OnBrowseBtn(wxCommandEvent& event); | ||
500 | // Accessors | ||
501 | wxString getDevicePos(); | ||
502 | |||
503 | void setDefault(); | ||
504 | |||
505 | protected: | ||
506 | wxTextCtrl* m_devicePos; | ||
507 | wxStaticText* m_desc; | ||
508 | wxButton* m_browseBtn; | ||
509 | |||
510 | }; | ||
511 | |||
512 | |||
513 | class FirmwarePositionCtrl: public wxControl | ||
514 | { | ||
515 | DECLARE_DYNAMIC_CLASS(FirmwarePositionCtrl) | ||
516 | DECLARE_EVENT_TABLE() | ||
517 | public: | ||
518 | enum { | ||
519 | ID_BROWSE_BTN = 10004, | ||
520 | }; //End of Enum | ||
521 | |||
522 | public: | ||
523 | // Constructors | ||
524 | FirmwarePositionCtrl() { Init(); } | ||
525 | FirmwarePositionCtrl(wxWindow* parent, wxWindowID id, | ||
526 | const wxPoint& pos = wxDefaultPosition, | ||
527 | const wxSize& size = wxDefaultSize, | ||
528 | long style = wxNO_BORDER, | ||
529 | const wxValidator& validator = wxDefaultValidator) | ||
530 | { | ||
531 | Init(); | ||
532 | Create(parent, id, pos, size, style, validator); | ||
533 | } | ||
534 | // Creation | ||
535 | bool Create(wxWindow* parent, wxWindowID id, | ||
536 | const wxPoint& pos = wxDefaultPosition, | ||
537 | const wxSize& size = wxDefaultSize, | ||
538 | long style = wxNO_BORDER, | ||
539 | const wxValidator& validator = wxDefaultValidator); | ||
540 | 258 | ||
541 | // Creates the controls and sizers | 259 | // Creates the controls and sizers |
542 | void CreateControls(); | 260 | void CreateControls(); |
diff --git a/rbutil/rbutilFrm.cpp b/rbutil/rbutilFrm.cpp index d49faee895..fd9558905b 100644 --- a/rbutil/rbutilFrm.cpp +++ b/rbutil/rbutilFrm.cpp | |||
@@ -89,12 +89,15 @@ void rbutilFrm::CreateGUIControls(void) | |||
89 | wxBitmap rockboxbmp(rblogo_xpm); | 89 | wxBitmap rockboxbmp(rblogo_xpm); |
90 | ImageCtrl* rockboxbmpCtrl = new ImageCtrl(mainPanel,wxID_ANY); | 90 | ImageCtrl* rockboxbmpCtrl = new ImageCtrl(mainPanel,wxID_ANY); |
91 | rockboxbmpCtrl->SetBitmap(rockboxbmp); | 91 | rockboxbmpCtrl->SetBitmap(rockboxbmp); |
92 | |||
92 | WxBoxSizer0->Add(rockboxbmpCtrl,0,wxALIGN_CENTER_HORIZONTAL | wxALL,5); | 93 | WxBoxSizer0->Add(rockboxbmpCtrl,0,wxALIGN_CENTER_HORIZONTAL | wxALL,5); |
93 | 94 | ||
94 | myDeviceSelector = new DeviceSelectorCtrl(mainPanel,wxID_ANY); | 95 | myDeviceSelector = new DeviceSelectorCtrl(mainPanel,wxID_ANY); |
95 | myDeviceSelector->setDefault(); | 96 | myDeviceSelector->setDefault(); |
96 | WxBoxSizer0->Add(myDeviceSelector,0,wxGROW|wxALL,5); | 97 | WxBoxSizer0->Add(myDeviceSelector,0,wxGROW|wxALL,5); |
97 | 98 | ||
99 | |||
100 | |||
98 | wxNotebook* tabwindow = new wxNotebook(mainPanel,wxID_ANY); | 101 | wxNotebook* tabwindow = new wxNotebook(mainPanel,wxID_ANY); |
99 | WxBoxSizer0->Add(tabwindow,1,wxGROW|wxALL,5); | 102 | WxBoxSizer0->Add(tabwindow,1,wxGROW|wxALL,5); |
100 | 103 | ||
@@ -128,8 +131,7 @@ void rbutilFrm::CreateGUIControls(void) | |||
128 | WxBitmapButton4 = new wxBitmapButton(installpage, ID_BOOTLOADER_BTN, | 131 | WxBitmapButton4 = new wxBitmapButton(installpage, ID_BOOTLOADER_BTN, |
129 | BootloaderInstallButton, wxPoint(0,0), wxSize(64,54), | 132 | BootloaderInstallButton, wxPoint(0,0), wxSize(64,54), |
130 | wxRAISED_BORDER | wxBU_AUTODRAW); | 133 | wxRAISED_BORDER | wxBU_AUTODRAW); |
131 | WxBitmapButton4->SetToolTip(wxT("Instructions for installing the " | 134 | WxBitmapButton4->SetToolTip(wxT("Click here to install the Rockbox bootloader")); |
132 | "Rockbox bootloader on your audio device")); | ||
133 | WxFlexGridSizer1->Add(WxBitmapButton4, 0, | 135 | WxFlexGridSizer1->Add(WxBitmapButton4, 0, |
134 | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxALL,5); | 136 | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxALL,5); |
135 | 137 | ||
@@ -146,7 +148,7 @@ void rbutilFrm::CreateGUIControls(void) | |||
146 | WxBitmapButton1_BITMAP, wxPoint(0,0), wxSize(64,54), | 148 | WxBitmapButton1_BITMAP, wxPoint(0,0), wxSize(64,54), |
147 | wxRAISED_BORDER | wxBU_AUTODRAW, wxDefaultValidator, | 149 | wxRAISED_BORDER | wxBU_AUTODRAW, wxDefaultValidator, |
148 | wxT("WxBitmapButton1")); | 150 | wxT("WxBitmapButton1")); |
149 | WxBitmapButton1->SetToolTip(wxT("Install Rockbox")); | 151 | WxBitmapButton1->SetToolTip(wxT("Click here to install Rockbox")); |
150 | WxFlexGridSizer1->Add(WxBitmapButton1,0, | 152 | WxFlexGridSizer1->Add(WxBitmapButton1,0, |
151 | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxALL,5); | 153 | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxALL,5); |
152 | 154 | ||
@@ -176,7 +178,7 @@ void rbutilFrm::CreateGUIControls(void) | |||
176 | WxBitmapButton3 = new wxBitmapButton(themepage, ID_FONT_BTN, | 178 | WxBitmapButton3 = new wxBitmapButton(themepage, ID_FONT_BTN, |
177 | FontInstallButton, wxPoint(0,0), wxSize(64,54), | 179 | FontInstallButton, wxPoint(0,0), wxSize(64,54), |
178 | wxRAISED_BORDER | wxBU_AUTODRAW); | 180 | wxRAISED_BORDER | wxBU_AUTODRAW); |
179 | WxBitmapButton3->SetToolTip(wxT("Download the most up to date " | 181 | WxBitmapButton3->SetToolTip(wxT("Click here to install the most up to date " |
180 | "Rockbox fonts.")); | 182 | "Rockbox fonts.")); |
181 | WxFlexGridSizer2->Add(WxBitmapButton3, 0, | 183 | WxFlexGridSizer2->Add(WxBitmapButton3, 0, |
182 | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxALL,5); | 184 | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxALL,5); |
@@ -193,7 +195,7 @@ void rbutilFrm::CreateGUIControls(void) | |||
193 | WxBitmapButton5 = new wxBitmapButton(themepage, ID_THEMES_BTN, | 195 | WxBitmapButton5 = new wxBitmapButton(themepage, ID_THEMES_BTN, |
194 | ThemesInstallButton, wxPoint(0,0), wxSize(64,54), | 196 | ThemesInstallButton, wxPoint(0,0), wxSize(64,54), |
195 | wxRAISED_BORDER | wxBU_AUTODRAW); | 197 | wxRAISED_BORDER | wxBU_AUTODRAW); |
196 | WxBitmapButton5->SetToolTip(wxT("Download other Themes for Rockbox.")); | 198 | WxBitmapButton5->SetToolTip(wxT("Click here to install themes for Rockbox.")); |
197 | WxFlexGridSizer2->Add(WxBitmapButton5, 0, | 199 | WxFlexGridSizer2->Add(WxBitmapButton5, 0, |
198 | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxALL,5); | 200 | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxALL,5); |
199 | 201 | ||
@@ -207,7 +209,7 @@ void rbutilFrm::CreateGUIControls(void) | |||
207 | WxBitmapButton6 = new wxBitmapButton(themepage, ID_DOOM_BTN, | 209 | WxBitmapButton6 = new wxBitmapButton(themepage, ID_DOOM_BTN, |
208 | DoomInstallButton, wxPoint(0,0), wxSize(64,54), | 210 | DoomInstallButton, wxPoint(0,0), wxSize(64,54), |
209 | wxRAISED_BORDER | wxBU_AUTODRAW); | 211 | wxRAISED_BORDER | wxBU_AUTODRAW); |
210 | WxBitmapButton6->SetToolTip(wxT("Download freedoom wad files.")); | 212 | WxBitmapButton6->SetToolTip(wxT("Click here to install the freedoom wad files.")); |
211 | WxFlexGridSizer2->Add(WxBitmapButton6, 0, | 213 | WxFlexGridSizer2->Add(WxBitmapButton6, 0, |
212 | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxALL,5); | 214 | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxALL,5); |
213 | 215 | ||
@@ -238,7 +240,7 @@ void rbutilFrm::CreateGUIControls(void) | |||
238 | WxBitmapButton2_BITMAP, wxPoint(0,0), wxSize(64,54), | 240 | WxBitmapButton2_BITMAP, wxPoint(0,0), wxSize(64,54), |
239 | wxRAISED_BORDER | wxBU_AUTODRAW, wxDefaultValidator, | 241 | wxRAISED_BORDER | wxBU_AUTODRAW, wxDefaultValidator, |
240 | wxT("WxBitmapButton2")); | 242 | wxT("WxBitmapButton2")); |
241 | WxBitmapButton2->SetToolTip(wxT("Uninstall Rockbox")); | 243 | WxBitmapButton2->SetToolTip(wxT("Click here to uninstall Rockbox")); |
242 | WxFlexGridSizer3->Add(WxBitmapButton2,0, | 244 | WxFlexGridSizer3->Add(WxBitmapButton2,0, |
243 | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxALL,5); | 245 | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxALL,5); |
244 | 246 | ||
@@ -252,7 +254,7 @@ void rbutilFrm::CreateGUIControls(void) | |||
252 | WxBitmapButton4_BITMAP, wxPoint(0,0), wxSize(64,54), | 254 | WxBitmapButton4_BITMAP, wxPoint(0,0), wxSize(64,54), |
253 | wxRAISED_BORDER | wxBU_AUTODRAW, wxDefaultValidator, | 255 | wxRAISED_BORDER | wxBU_AUTODRAW, wxDefaultValidator, |
254 | wxT("WxBitmapButton4")); | 256 | wxT("WxBitmapButton4")); |
255 | WxBitmapButton4->SetToolTip(wxT("Uninstall Bootloader")); | 257 | WxBitmapButton4->SetToolTip(wxT("Click here to uninstall the Bootloader")); |
256 | WxFlexGridSizer3->Add(WxBitmapButton4,0, | 258 | WxFlexGridSizer3->Add(WxBitmapButton4,0, |
257 | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxALL,5); | 259 | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxALL,5); |
258 | 260 | ||
diff --git a/rbutil/rbutilFrm.h b/rbutil/rbutilFrm.h index a560ff6b86..f33adc13f1 100644 --- a/rbutil/rbutilFrm.h +++ b/rbutil/rbutilFrm.h | |||
@@ -56,12 +56,12 @@ public: | |||
56 | wxMINIMIZE_BOX|wxMAXIMIZE_BOX | wxCLOSE_BOX); | 56 | wxMINIMIZE_BOX|wxMAXIMIZE_BOX | wxCLOSE_BOX); |
57 | virtual ~rbutilFrm(); | 57 | virtual ~rbutilFrm(); |
58 | public: | 58 | public: |
59 | DeviceSelectorCtrl* myDeviceSelector; | 59 | DeviceSelectorCtrl* myDeviceSelector; |
60 | wxHyperlinkCtrl* manuallink; | 60 | wxHyperlinkCtrl* manuallink; |
61 | wxHtmlWindow* manual; | 61 | wxHtmlWindow* manual; |
62 | wxString curManualDevice; | 62 | wxString curManualDevice; |
63 | 63 | ||
64 | wxMenuBar *WxMenuBar1; | 64 | wxMenuBar *WxMenuBar1; |
65 | wxStaticText *WxStaticText3; | 65 | wxStaticText *WxStaticText3; |
66 | wxBitmapButton *WxBitmapButton2; | 66 | wxBitmapButton *WxBitmapButton2; |
67 | wxStaticText *WxStaticText2; | 67 | wxStaticText *WxStaticText2; |
@@ -91,16 +91,16 @@ public: | |||
91 | ID_WXSTATICTEXT2 = 1029, | 91 | ID_WXSTATICTEXT2 = 1029, |
92 | ID_INSTALL_BTN = 1028, | 92 | ID_INSTALL_BTN = 1028, |
93 | ID_WXSTATICBITMAP1 = 1053, | 93 | ID_WXSTATICBITMAP1 = 1053, |
94 | ID_FONT_BTN = 1128, | 94 | ID_FONT_BTN = 1128, |
95 | ID_THEMES_BTN = 1139, | 95 | ID_THEMES_BTN = 1139, |
96 | ID_DOOM_BTN = 1140, | 96 | ID_DOOM_BTN = 1140, |
97 | ID_BOOTLOADER_BTN = 1129, | 97 | ID_BOOTLOADER_BTN = 1129, |
98 | ID_WXPANEL1 = 1064, | 98 | ID_WXPANEL1 = 1064, |
99 | 99 | ||
100 | ID_MANUAL = 1065, | 100 | ID_MANUAL = 1065, |
101 | ID_FILE_PROXY = 1066, | 101 | ID_FILE_PROXY = 1066, |
102 | 102 | ||
103 | ID_DUMMY_VALUE_ | 103 | ID_DUMMY_VALUE_ |
104 | }; //End of Enum | 104 | }; //End of Enum |
105 | public: | 105 | public: |
106 | void rbutilFrmClose(wxCloseEvent& event); | 106 | void rbutilFrmClose(wxCloseEvent& event); |
@@ -116,9 +116,9 @@ public: | |||
116 | void OnBootloaderBtn(wxCommandEvent& event); | 116 | void OnBootloaderBtn(wxCommandEvent& event); |
117 | void OnPortableInstall(wxCommandEvent& event); | 117 | void OnPortableInstall(wxCommandEvent& event); |
118 | void OnBootloaderRemoveBtn(wxCommandEvent& event); | 118 | void OnBootloaderRemoveBtn(wxCommandEvent& event); |
119 | void OnManualUpdate(wxUpdateUIEvent& event); | 119 | void OnManualUpdate(wxUpdateUIEvent& event); |
120 | void OnFileProxy(wxCommandEvent& event); | 120 | void OnFileProxy(wxCommandEvent& event); |
121 | void OnDoomBtn(wxCommandEvent& event); | 121 | void OnDoomBtn(wxCommandEvent& event); |
122 | 122 | ||
123 | }; | 123 | }; |
124 | 124 | ||