diff options
author | Dominik Wenger <domonoky@googlemail.com> | 2007-05-05 20:23:28 +0000 |
---|---|---|
committer | Dominik Wenger <domonoky@googlemail.com> | 2007-05-05 20:23:28 +0000 |
commit | 1b36be2946d276ab81d80cafcd4a39792f8a3272 (patch) | |
tree | 486f5fa70387086e8c739896116d1c61da10476b /rbutil/rbutilFrm.cpp | |
parent | 5e7b140a0935415a965ac13ea09f86363e651cd7 (diff) | |
download | rockbox-1b36be2946d276ab81d80cafcd4a39792f8a3272.tar.gz rockbox-1b36be2946d276ab81d80cafcd4a39792f8a3272.zip |
early proxy support on rbutil
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13330 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilFrm.cpp')
-rw-r--r-- | rbutil/rbutilFrm.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/rbutil/rbutilFrm.cpp b/rbutil/rbutilFrm.cpp index 5db93b3996..913e22df14 100644 --- a/rbutil/rbutilFrm.cpp +++ b/rbutil/rbutilFrm.cpp | |||
@@ -51,6 +51,7 @@ BEGIN_EVENT_TABLE(rbutilFrm,wxFrame) | |||
51 | EVT_MENU(ID_FILE_ABOUT, rbutilFrm::OnFileAbout) | 51 | EVT_MENU(ID_FILE_ABOUT, rbutilFrm::OnFileAbout) |
52 | EVT_MENU(ID_FILE_WIPECACHE, rbutilFrm::OnFileWipeCache) | 52 | EVT_MENU(ID_FILE_WIPECACHE, rbutilFrm::OnFileWipeCache) |
53 | EVT_MENU(ID_PORTABLE_INSTALL, rbutilFrm::OnPortableInstall) | 53 | EVT_MENU(ID_PORTABLE_INSTALL, rbutilFrm::OnPortableInstall) |
54 | EVT_MENU(ID_FILE_PROXY, rbutilFrm::OnFileProxy) | ||
54 | 55 | ||
55 | EVT_UPDATE_UI (ID_MANUAL, rbutilFrm::OnManualUpdate) | 56 | EVT_UPDATE_UI (ID_MANUAL, rbutilFrm::OnManualUpdate) |
56 | 57 | ||
@@ -275,6 +276,8 @@ void rbutilFrm::CreateGUIControls(void) | |||
275 | ID_FILE_MENU_Mnu_Obj->Append(ID_PORTABLE_INSTALL, | 276 | ID_FILE_MENU_Mnu_Obj->Append(ID_PORTABLE_INSTALL, |
276 | wxT("&Install Rockbox Utility on device"), wxT(""), wxITEM_NORMAL); | 277 | wxT("&Install Rockbox Utility on device"), wxT(""), wxITEM_NORMAL); |
277 | } | 278 | } |
279 | ID_FILE_MENU_Mnu_Obj->Append(ID_FILE_PROXY, wxT("Set &Proxy"), wxT(""), | ||
280 | wxITEM_NORMAL); | ||
278 | ID_FILE_MENU_Mnu_Obj->Append(ID_FILE_ABOUT, wxT("&About"), wxT(""), | 281 | ID_FILE_MENU_Mnu_Obj->Append(ID_FILE_ABOUT, wxT("&About"), wxT(""), |
279 | wxITEM_NORMAL); | 282 | wxITEM_NORMAL); |
280 | ID_FILE_MENU_Mnu_Obj->Append(ID_FILE_EXIT, wxT("E&xit\tCtrl+X"), wxT(""), | 283 | ID_FILE_MENU_Mnu_Obj->Append(ID_FILE_EXIT, wxT("E&xit\tCtrl+X"), wxT(""), |
@@ -319,8 +322,22 @@ void rbutilFrm::OnManualUpdate(wxUpdateUIEvent& event) | |||
319 | // construct link to html | 322 | // construct link to html |
320 | wxString htmllink; | 323 | wxString htmllink; |
321 | htmllink.Printf(wxT("%s%s/rockbox-build.html"),gv->manual_url.c_str(),curManualDevice.c_str()); | 324 | htmllink.Printf(wxT("%s%s/rockbox-build.html"),gv->manual_url.c_str(),curManualDevice.c_str()); |
322 | manual->LoadPage(htmllink); | 325 | if(!manual->LoadPage(htmllink)) |
326 | manual->SetPage(wxT("<p>unable to display manual -- please use the PDF link above</p>")); | ||
327 | |||
328 | |||
329 | } | ||
330 | |||
323 | 331 | ||
332 | void rbutilFrm::OnFileProxy(wxCommandEvent& event) | ||
333 | { | ||
334 | |||
335 | wxTextEntryDialog proxydlg(this,wxT("Please enter your Proxy in the Format: URL:PORT"),wxT("Proxy Configuration")); | ||
336 | |||
337 | if(proxydlg.ShowModal() == wxID_OK) | ||
338 | { | ||
339 | gv->proxy_url = proxydlg.GetValue(); | ||
340 | } | ||
324 | 341 | ||
325 | } | 342 | } |
326 | 343 | ||