mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-03 17:54:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Port to new recursive expand/contract functions.

Browse Source
This commit is contained in:
Michael Drake 2013-09-03 12:36:55 +01:00
parent 11b784a167
commit f2b4a7a997
8 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
amiga/tree.c
View File

@ -1013,13 +1013,13 @@ BOOL ami_tree_event(struct treeview_window *twin)
switch(twin->type) switch(twin->type)
{ {
case AMI_TREE_HISTORY: case AMI_TREE_HISTORY:
history_global_expand_all(); global_history_expand(false);
break; break;
case AMI_TREE_COOKIES: case AMI_TREE_COOKIES:
cookies_expand_all(); cookie_manager_expand(false);
break; break;
case AMI_TREE_HOTLIST: case AMI_TREE_HOTLIST:
hotlist_old_expand_all(); hotlist_expand(false);
break; break;
} }
break; break;
@ -1028,13 +1028,13 @@ BOOL ami_tree_event(struct treeview_window *twin)
switch(twin->type) switch(twin->type)
{ {
case AMI_TREE_HISTORY: case AMI_TREE_HISTORY:
history_global_expand_directories(); global_history_expand(true);
break; break;
case AMI_TREE_COOKIES: case AMI_TREE_COOKIES:
cookies_expand_domains(); cookie_manager_expand(true);
break; break;
case AMI_TREE_HOTLIST: case AMI_TREE_HOTLIST:
hotlist_old_expand_directories(); hotlist_expand(true);
break; break;
} }
break; break;
@ -1043,13 +1043,13 @@ BOOL ami_tree_event(struct treeview_window *twin)
switch(twin->type) switch(twin->type)
{ {
case AMI_TREE_HISTORY: case AMI_TREE_HISTORY:
history_global_expand_addresses(); global_history_expand(false);
break; break;
case AMI_TREE_COOKIES: case AMI_TREE_COOKIES:
cookies_expand_cookies(); cookie_manager_expand(false);
break; break;
case AMI_TREE_HOTLIST: case AMI_TREE_HOTLIST:
hotlist_old_expand_addresses(); hotlist_expand(false);
break; break;
} }
break; break;
@ -1063,13 +1063,13 @@ BOOL ami_tree_event(struct treeview_window *twin)
switch(twin->type) switch(twin->type)
{ {
case AMI_TREE_HISTORY: case AMI_TREE_HISTORY:
history_global_collapse_all(); global_history_contract(true);
break; break;
case AMI_TREE_COOKIES: case AMI_TREE_COOKIES:
cookies_collapse_all(); cookie_manager_contract(true);
break; break;
case AMI_TREE_HOTLIST: case AMI_TREE_HOTLIST:
hotlist_old_collapse_all(); hotlist_contract(true);
break; break;
} }
break; break;
@ -1078,13 +1078,13 @@ BOOL ami_tree_event(struct treeview_window *twin)
switch(twin->type) switch(twin->type)
{ {
case AMI_TREE_HISTORY: case AMI_TREE_HISTORY:
history_global_collapse_directories(); global_history_contract(true);
break; break;
case AMI_TREE_COOKIES: case AMI_TREE_COOKIES:
cookies_collapse_domains(); cookie_manager_contract(true);
break; break;
case AMI_TREE_HOTLIST: case AMI_TREE_HOTLIST:
hotlist_old_collapse_directories(); hotlist_contract(true);
break; break;
} }
break; break;
@ -1093,13 +1093,13 @@ BOOL ami_tree_event(struct treeview_window *twin)
switch(twin->type) switch(twin->type)
{ {
case AMI_TREE_HISTORY: case AMI_TREE_HISTORY:
history_global_collapse_addresses(); global_history_contract(false);
break; break;
case AMI_TREE_COOKIES: case AMI_TREE_COOKIES:
cookies_collapse_cookies(); cookie_manager_contract(false);
break; break;
case AMI_TREE_HOTLIST: case AMI_TREE_HOTLIST:
hotlist_old_collapse_addresses(); hotlist_contract(false);
break; break;
} }
break; break;

4
cocoa/BookmarksController.m
View File

@ -181,8 +181,8 @@ static const char *cocoa_hotlist_path( void )
- (void) windowDidLoad; - (void) windowDidLoad;
{ {
hotlist_old_expand_all(); hotlist_expand(false);
hotlist_old_collapse_all(); hotlist_contract(true);
[view setTree: tree]; [view setTree: tree];
} }

12
gtk/cookies.c
View File

@ -187,36 +187,36 @@ MENUHANDLER(clear_selection)
/* view menu*/ /* view menu*/
MENUHANDLER(expand_all) MENUHANDLER(expand_all)
{ {
cookies_expand_all(); cookie_manager_expand(false);
return TRUE; return TRUE;
} }
MENUHANDLER(expand_domains) MENUHANDLER(expand_domains)
{ {
cookies_expand_domains(); cookie_manager_expand(true);
return TRUE; return TRUE;
} }
MENUHANDLER(expand_cookies) MENUHANDLER(expand_cookies)
{ {
cookies_expand_cookies(); cookie_manager_expand(false);
return TRUE; return TRUE;
} }
MENUHANDLER(collapse_all) MENUHANDLER(collapse_all)
{ {
cookies_collapse_all(); cookie_manager_contract(true);
return TRUE; return TRUE;
} }
MENUHANDLER(collapse_domains) MENUHANDLER(collapse_domains)
{ {
cookies_collapse_domains(); cookie_manager_contract(true);
return TRUE; return TRUE;
} }
MENUHANDLER(collapse_cookies) MENUHANDLER(collapse_cookies)
{ {
cookies_collapse_cookies(); cookie_manager_contract(false);
return TRUE; return TRUE;
} }

12
gtk/history.c
View File

@ -223,37 +223,37 @@ MENUHANDLER(clear_selection)
/* view menu*/ /* view menu*/
MENUHANDLER(expand_all) MENUHANDLER(expand_all)
{ {
history_global_expand_all(); global_history_expand(false);
return TRUE; return TRUE;
} }
MENUHANDLER(expand_directories) MENUHANDLER(expand_directories)
{ {
history_global_expand_directories(); global_history_expand(true);
return TRUE; return TRUE;
} }
MENUHANDLER(expand_addresses) MENUHANDLER(expand_addresses)
{ {
history_global_expand_addresses(); global_history_expand(false);
return TRUE; return TRUE;
} }
MENUHANDLER(collapse_all) MENUHANDLER(collapse_all)
{ {
history_global_collapse_all(); global_history_contract(true);
return TRUE; return TRUE;
} }
MENUHANDLER(collapse_directories) MENUHANDLER(collapse_directories)
{ {
history_global_collapse_directories(); global_history_contract(true);
return TRUE; return TRUE;
} }
MENUHANDLER(collapse_addresses) MENUHANDLER(collapse_addresses)
{ {
history_global_collapse_addresses(); global_history_contract(false);
return TRUE; return TRUE;
} }

12
gtk/hotlist.c
View File

@ -239,37 +239,37 @@ MENUHANDLER(clear_selection)
/* view menu*/ /* view menu*/
MENUHANDLER(expand_all) MENUHANDLER(expand_all)
{ {
hotlist_old_expand_all(); hotlist_expand(false);
return TRUE; return TRUE;
} }
MENUHANDLER(expand_directories) MENUHANDLER(expand_directories)
{ {
hotlist_old_expand_directories(); hotlist_expand(true);
return TRUE; return TRUE;
} }
MENUHANDLER(expand_addresses) MENUHANDLER(expand_addresses)
{ {
hotlist_old_expand_addresses(); hotlist_expand(false);
return TRUE; return TRUE;
} }
MENUHANDLER(collapse_all) MENUHANDLER(collapse_all)
{ {
hotlist_old_collapse_all(); hotlist_contract(true);
return TRUE; return TRUE;
} }
MENUHANDLER(collapse_directories) MENUHANDLER(collapse_directories)
{ {
hotlist_old_collapse_directories(); hotlist_contract(true);
return TRUE; return TRUE;
} }
MENUHANDLER(collapse_addresses) MENUHANDLER(collapse_addresses)
{ {
hotlist_old_collapse_addresses(); hotlist_contract(false);
return TRUE; return TRUE;
} }

20
riscos/cookies.c
View File

@ -183,19 +183,19 @@ void ro_gui_cookies_toolbar_click(button_bar_action action)
break; break;
case TOOLBAR_BUTTON_EXPAND: case TOOLBAR_BUTTON_EXPAND:
cookies_expand_cookies(); cookie_manager_expand(false);
break; break;
case TOOLBAR_BUTTON_COLLAPSE: case TOOLBAR_BUTTON_COLLAPSE:
cookies_collapse_cookies(); cookie_manager_contract(false);
break; break;
case TOOLBAR_BUTTON_OPEN: case TOOLBAR_BUTTON_OPEN:
cookies_expand_domains(); cookie_manager_expand(true);
break; break;
case TOOLBAR_BUTTON_CLOSE: case TOOLBAR_BUTTON_CLOSE:
cookies_collapse_domains(); cookie_manager_contract(true);
break; break;
default: default:
@ -300,22 +300,22 @@ bool ro_gui_cookies_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
{ {
switch (action) { switch (action) {
case TREE_EXPAND_ALL: case TREE_EXPAND_ALL:
cookies_expand_all(); cookie_manager_expand(false);
return true; return true;
case TREE_EXPAND_FOLDERS: case TREE_EXPAND_FOLDERS:
cookies_expand_domains(); cookie_manager_expand(true);
return true; return true;
case TREE_EXPAND_LINKS: case TREE_EXPAND_LINKS:
cookies_expand_cookies(); cookie_manager_expand(false);
return true; return true;
case TREE_COLLAPSE_ALL: case TREE_COLLAPSE_ALL:
cookies_collapse_all(); cookie_manager_contract(true);
return true; return true;
case TREE_COLLAPSE_FOLDERS: case TREE_COLLAPSE_FOLDERS:
cookies_collapse_domains(); cookie_manager_contract(true);
return true; return true;
case TREE_COLLAPSE_LINKS: case TREE_COLLAPSE_LINKS:
cookies_collapse_cookies(); cookie_manager_contract(false);
return true; return true;
case TREE_SELECTION_DELETE: case TREE_SELECTION_DELETE:
cookie_manager_keypress(KEY_DELETE_LEFT); cookie_manager_keypress(KEY_DELETE_LEFT);

20
riscos/global_history.c
View File

@ -189,19 +189,19 @@ void ro_gui_global_history_toolbar_click(button_bar_action action)
break; break;
case TOOLBAR_BUTTON_EXPAND: case TOOLBAR_BUTTON_EXPAND:
history_global_expand_addresses(); global_history_expand(false);
break; break;
case TOOLBAR_BUTTON_COLLAPSE: case TOOLBAR_BUTTON_COLLAPSE:
history_global_collapse_addresses(); global_history_contract(false);
break; break;
case TOOLBAR_BUTTON_OPEN: case TOOLBAR_BUTTON_OPEN:
history_global_expand_directories(); global_history_expand(true);
break; break;
case TOOLBAR_BUTTON_CLOSE: case TOOLBAR_BUTTON_CLOSE:
history_global_collapse_directories(); global_history_contract(true);
break; break;
case TOOLBAR_BUTTON_LAUNCH: case TOOLBAR_BUTTON_LAUNCH:
@ -324,22 +324,22 @@ bool ro_gui_global_history_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
ro_gui_dialog_open_persistent(w, dialog_saveas, true); ro_gui_dialog_open_persistent(w, dialog_saveas, true);
return true; return true;
case TREE_EXPAND_ALL: case TREE_EXPAND_ALL:
history_global_expand_all(); global_history_expand(false);
return true; return true;
case TREE_EXPAND_FOLDERS: case TREE_EXPAND_FOLDERS:
history_global_expand_directories(); global_history_expand(true);
return true; return true;
case TREE_EXPAND_LINKS: case TREE_EXPAND_LINKS:
history_global_expand_addresses(); global_history_expand(false);
return true; return true;
case TREE_COLLAPSE_ALL: case TREE_COLLAPSE_ALL:
history_global_collapse_all(); global_history_contract(true);
return true; return true;
case TREE_COLLAPSE_FOLDERS: case TREE_COLLAPSE_FOLDERS:
history_global_collapse_directories(); global_history_contract(true);
return true; return true;
case TREE_COLLAPSE_LINKS: case TREE_COLLAPSE_LINKS:
history_global_collapse_addresses(); global_history_contract(false);
return true; return true;
case TREE_SELECTION_LAUNCH: case TREE_SELECTION_LAUNCH:
global_history_keypress(KEY_CR); global_history_keypress(KEY_CR);

22
riscos/hotlist.c
View File

@ -231,19 +231,19 @@ void ro_gui_hotlist_toolbar_click(button_bar_action action)
break; break;
case TOOLBAR_BUTTON_EXPAND: case TOOLBAR_BUTTON_EXPAND:
hotlist_old_expand_addresses(); hotlist_expand(false);
break; break;
case TOOLBAR_BUTTON_COLLAPSE: case TOOLBAR_BUTTON_COLLAPSE:
hotlist_old_collapse_addresses(); hotlist_contract(false);
break; break;
case TOOLBAR_BUTTON_OPEN: case TOOLBAR_BUTTON_OPEN:
hotlist_old_expand_directories(); hotlist_expand(true);
break; break;
case TOOLBAR_BUTTON_CLOSE: case TOOLBAR_BUTTON_CLOSE:
hotlist_old_collapse_directories(); hotlist_contract(true);
break; break;
case TOOLBAR_BUTTON_LAUNCH: case TOOLBAR_BUTTON_LAUNCH:
@ -372,22 +372,22 @@ bool ro_gui_hotlist_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
hotlist_add_entry(NULL, NULL, false, 0); hotlist_add_entry(NULL, NULL, false, 0);
return true; return true;
case TREE_EXPAND_ALL: case TREE_EXPAND_ALL:
hotlist_old_expand_all(); hotlist_expand(false);
return true; return true;
case TREE_EXPAND_FOLDERS: case TREE_EXPAND_FOLDERS:
hotlist_old_expand_directories(); hotlist_expand(true);
return true; return true;
case TREE_EXPAND_LINKS: case TREE_EXPAND_LINKS:
hotlist_old_expand_addresses(); hotlist_expand(false);
return true; return true;
case TREE_COLLAPSE_ALL: case TREE_COLLAPSE_ALL:
hotlist_old_collapse_all(); hotlist_contract(true);
return true; return true;
case TREE_COLLAPSE_FOLDERS: case TREE_COLLAPSE_FOLDERS:
hotlist_old_collapse_directories(); hotlist_contract(true);
return true; return true;
case TREE_COLLAPSE_LINKS: case TREE_COLLAPSE_LINKS:
hotlist_old_collapse_addresses(); hotlist_contract(false);
return true; return true;
case TREE_SELECTION_EDIT: case TREE_SELECTION_EDIT:
hotlist_edit_selection(); hotlist_edit_selection();
@ -541,7 +541,7 @@ static void ro_gui_hotlist_addurl_bounce(wimp_message *message)
if (nsurl_create(hotlist_url, &nsurl) != NSERROR_OK) if (nsurl_create(hotlist_url, &nsurl) != NSERROR_OK)
return; return;
hotlist_add_page(nsurl); hotlist_add_url(nsurl);
nsurl_unref(nsurl); nsurl_unref(nsurl);
} }