diff options
| author | James Bursa <james@netsurf-browser.org> | 2004-07-27 15:49:28 +0000 |
|---|---|---|
| committer | James Bursa <james@netsurf-browser.org> | 2004-07-27 15:49:28 +0000 |
| commit | 534b464becb6c429b5976695bfe142690f45b779 (patch) | |
| tree | 00f97e2b09aa68ab1653566678fc6f64b86e463b /riscos/menus.c | |
| parent | d378575d4c484d4e9fe8dba56c93323053de668a (diff) | |
| download | netsurf-534b464becb6c429b5976695bfe142690f45b779.tar.gz netsurf-534b464becb6c429b5976695bfe142690f45b779.tar.bz2 | |
[project @ 2004-07-27 15:49:28 by bursa]
Implement proxy authentication. Bring templates in line with style guide (icon sizes and fill display fields), and remove dead icons. Clean up choices dialog code. Fix persistent dialog code. Make browser choices the default pane.
svn path=/import/netsurf/; revision=1153
Diffstat (limited to 'riscos/menus.c')
| -rw-r--r-- | riscos/menus.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/riscos/menus.c b/riscos/menus.c index 3fe6e7a80..ad35df084 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -383,6 +383,18 @@ static wimp_MENU(4) hotlist_root = { wimp_menu *hotlist_menu = (wimp_menu *)&hotlist_root; +/* Proxy auth popup menu (used in proxy Choices dialog +*/ +static wimp_MENU(3) proxy_menu = { + { "ProxyAuth" }, 7,2,7,0, 200, 44, 0, + { + { 0, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "ProxyNone" } }, + { 0, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "ProxyBasic" } }, + { wimp_MENU_LAST, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "ProxyNTLM" } }, + } +}; +wimp_menu *proxyauth_menu = (wimp_menu *) &proxy_menu; + static wimp_menu *browser_page_menu = (wimp_menu *)&page_menu; static wimp_menu *browser_export_menu = (wimp_menu *)&export_menu; @@ -441,6 +453,8 @@ void ro_gui_menus_init(void) translate_menu(hotlist_save_menu); translate_menu(hotlist_select_menu); + translate_menu(proxyauth_menu); + iconbar_menu->entries[0].sub_menu = (wimp_menu *) dialog_info; browser_page_menu->entries[0].sub_menu = (wimp_menu*) dialog_pageinfo; browser_object_menu->entries[0].sub_menu = (wimp_menu*) dialog_objinfo; @@ -593,7 +607,7 @@ void ro_gui_menu_selection(wimp_selection *selection) ro_gui_open_help_page("docs"); break; case 2: /* Choices */ - ro_gui_dialog_open_config(); + ro_gui_dialog_open_config(); break; case 3: /* Quit */ netsurf_quit = true; @@ -887,6 +901,9 @@ void ro_gui_menu_selection(wimp_selection *selection) break; } + } else if (current_menu == proxyauth_menu) { + ro_gui_dialog_proxyauth_menu_selection(selection->items[0]); + } if (pointer.buttons == wimp_CLICK_ADJUST) { |