diff options
-rw-r--r-- | rbutil/rbutil.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutil.h | 1 | ||||
-rw-r--r-- | rbutil/rbutilApp.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilFrm.cpp | 19 | ||||
-rw-r--r-- | rbutil/rbutilFrm.h | 2 |
5 files changed, 28 insertions, 2 deletions
diff --git a/rbutil/rbutil.cpp b/rbutil/rbutil.cpp index df496a1c42..e778cf404e 100644 --- a/rbutil/rbutil.cpp +++ b/rbutil/rbutil.cpp | |||
@@ -131,6 +131,10 @@ int DownloadURL(wxString src, wxString dest) | |||
131 | 131 | ||
132 | input = true; | 132 | input = true; |
133 | wxURL* in_http = new wxURL(src); | 133 | wxURL* in_http = new wxURL(src); |
134 | |||
135 | if(gv->proxy_url != wxT("")) | ||
136 | in_http->SetProxy(gv->proxy_url); | ||
137 | |||
134 | if (in_http->GetError() == wxURL_NOERR) | 138 | if (in_http->GetError() == wxURL_NOERR) |
135 | { | 139 | { |
136 | 140 | ||
diff --git a/rbutil/rbutil.h b/rbutil/rbutil.h index 47a2803981..bae62afd2d 100644 --- a/rbutil/rbutil.h +++ b/rbutil/rbutil.h | |||
@@ -107,6 +107,7 @@ public: | |||
107 | wxString bootloader_url; | 107 | wxString bootloader_url; |
108 | wxString themes_url; | 108 | wxString themes_url; |
109 | wxString manual_url; | 109 | wxString manual_url; |
110 | wxString proxy_url; | ||
110 | 111 | ||
111 | // User configuration data. | 112 | // User configuration data. |
112 | wxString curplat; | 113 | wxString curplat; |
diff --git a/rbutil/rbutilApp.cpp b/rbutil/rbutilApp.cpp index 15b012d041..8ecd4a0914 100644 --- a/rbutil/rbutilApp.cpp +++ b/rbutil/rbutilApp.cpp | |||
@@ -253,6 +253,7 @@ void rbutilFrmApp::ReadUserConfig() | |||
253 | if (gv->UserConfig->Read(wxT("curdestdir"), &str) ) gv->curdestdir = str; | 253 | if (gv->UserConfig->Read(wxT("curdestdir"), &str) ) gv->curdestdir = str; |
254 | if (gv->UserConfig->Read(wxT("curplatform"), &str) ) gv->curplat = str; | 254 | if (gv->UserConfig->Read(wxT("curplatform"), &str) ) gv->curplat = str; |
255 | if (gv->UserConfig->Read(wxT("curfirmware"), &str) ) gv->curfirmware = str; | 255 | if (gv->UserConfig->Read(wxT("curfirmware"), &str) ) gv->curfirmware = str; |
256 | if (gv->UserConfig->Read(wxT("proxy_url"), &str) ) gv->proxy_url = str; | ||
256 | gv->UserConfig->SetPath(stack); | 257 | gv->UserConfig->SetPath(stack); |
257 | } | 258 | } |
258 | 259 | ||
@@ -261,7 +262,8 @@ void rbutilFrmApp::WriteUserConfig() | |||
261 | gv->UserConfig->SetPath(wxT("/defaults")); | 262 | gv->UserConfig->SetPath(wxT("/defaults")); |
262 | gv->UserConfig->Write(wxT("curdestdir"), gv->curdestdir); | 263 | gv->UserConfig->Write(wxT("curdestdir"), gv->curdestdir); |
263 | gv->UserConfig->Write(wxT("curplatform"), gv->curplat); | 264 | gv->UserConfig->Write(wxT("curplatform"), gv->curplat); |
264 | gv->UserConfig->Write(wxT("curfirmware"), gv->curfirmware); | 265 | gv->UserConfig->Write(wxT("curfirmware"), gv->curfirmware); |
266 | gv->UserConfig->Write(wxT("proxy_url"), gv->proxy_url); | ||
265 | 267 | ||
266 | delete gv->UserConfig; | 268 | delete gv->UserConfig; |
267 | 269 | ||
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 | ||
diff --git a/rbutil/rbutilFrm.h b/rbutil/rbutilFrm.h index ed7db30a20..2f31df8867 100644 --- a/rbutil/rbutilFrm.h +++ b/rbutil/rbutilFrm.h | |||
@@ -97,6 +97,7 @@ public: | |||
97 | ID_WXPANEL1 = 1064, | 97 | ID_WXPANEL1 = 1064, |
98 | 98 | ||
99 | ID_MANUAL = 1065, | 99 | ID_MANUAL = 1065, |
100 | ID_FILE_PROXY = 1066, | ||
100 | 101 | ||
101 | ID_DUMMY_VALUE_ | 102 | ID_DUMMY_VALUE_ |
102 | }; //End of Enum | 103 | }; //End of Enum |
@@ -116,6 +117,7 @@ public: | |||
116 | void OnBootloaderRemoveBtn(wxCommandEvent& event); | 117 | void OnBootloaderRemoveBtn(wxCommandEvent& event); |
117 | 118 | ||
118 | void OnManualUpdate(wxUpdateUIEvent& event); | 119 | void OnManualUpdate(wxUpdateUIEvent& event); |
120 | void OnFileProxy(wxCommandEvent& event); | ||
119 | 121 | ||
120 | }; | 122 | }; |
121 | 123 | ||