diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2017-01-08 01:09:41 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2017-01-08 01:09:41 +0000 |
| commit | bf3ba5c97bac5aa79c43153311ea0d3d5945bd4d (patch) | |
| tree | 54f0c8052fcd22130b7523b6b97f641a817a6d1c /frontends/amiga/gui.c | |
| parent | d1693c27c0d9658b655c158a9652f87683719325 (diff) | |
| parent | 01e116ee1f5603ef6adeb365f403563a684a47b4 (diff) | |
| download | netsurf-bf3ba5c97bac5aa79c43153311ea0d3d5945bd4d.tar.gz netsurf-bf3ba5c97bac5aa79c43153311ea0d3d5945bd4d.tar.bz2 | |
Complete Amiga corewindow implementation and migration from old treeviews
Merge branch 'chris/amiga-corewindow'
Diffstat (limited to 'frontends/amiga/gui.c')
| -rw-r--r-- | frontends/amiga/gui.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index 9fce6813f..e27d10588 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -118,7 +118,6 @@ #include "desktop/searchweb.h" /* NetSurf Amiga platform includes */ -#include "amiga/desktop-tree.h" #include "amiga/gui.h" #include "amiga/arexx.h" #include "amiga/bitmap.h" @@ -151,7 +150,6 @@ #include "amiga/search.h" #include "amiga/selectmenu.h" #include "amiga/theme.h" -#include "amiga/tree.h" #include "amiga/utf8.h" #include "amiga/sslcert.h" @@ -547,6 +545,17 @@ static void ami_set_screen_defaults(struct Screen *screen) nsoption_default_set_int(cookies_window_xsize, width); nsoption_default_set_int(cookies_window_ysize, height); + nsoption_default_set_int(history_window_ypos, top); + nsoption_default_set_int(history_window_xpos, left); + nsoption_default_set_int(history_window_xsize, width); + nsoption_default_set_int(history_window_ysize, height); + + nsoption_default_set_int(hotlist_window_ypos, top); + nsoption_default_set_int(hotlist_window_xpos, left); + nsoption_default_set_int(hotlist_window_xsize, width); + nsoption_default_set_int(hotlist_window_ysize, height); + + nsoption_default_set_int(window_x, 0); nsoption_default_set_int(window_y, screen->BarHeight + 1); nsoption_default_set_int(window_width, screen->Width); @@ -1013,8 +1022,7 @@ static void gui_init2(int argc, char** argv) } /**/ - ami_hotlist_initialise(nsoption_charp(hotlist_file)); - ami_global_history_initialise(); + hotlist_init(nsoption_charp(hotlist_file)); search_web_select_provider(nsoption_int(search_provider)); if (notalreadyrunning && @@ -3037,8 +3045,7 @@ static void gui_quit(void) urldb_save(nsoption_charp(url_file)); urldb_save_cookies(nsoption_charp(cookie_file)); - ami_hotlist_free(nsoption_charp(hotlist_file)); - ami_global_history_free(); + hotlist_fini(nsoption_charp(hotlist_file)); #ifdef __amigaos4__ if(IApplication && ami_appid) UnregisterApplication(ami_appid, NULL); @@ -3182,7 +3189,7 @@ static bool ami_gui_hotlist_add(void *userdata, int level, int item, return true; } -static int ami_gui_hotlist_scan(struct tree *tree, struct List *speed_button_list, struct gui_window_2 *gwin) +static int ami_gui_hotlist_scan(struct List *speed_button_list, struct gui_window_2 *gwin) { struct ami_gui_tb_userdata userdata; userdata.gw = gwin; @@ -3204,7 +3211,7 @@ static void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin) NewList(&gwin->hotlist_toolbar_list); - if(ami_gui_hotlist_scan(ami_tree_get_tree(hotlist_window), &gwin->hotlist_toolbar_list, gwin) > 0) { + if(ami_gui_hotlist_scan(&gwin->hotlist_toolbar_list, gwin) > 0) { gwin->objects[GID_HOTLIST] = SpeedBarObj, GA_ID, GID_HOTLIST, @@ -3303,7 +3310,7 @@ static void ami_gui_hotlist_toolbar_update(struct gui_window_2 *gwin) ami_gui_hotlist_toolbar_free(gwin, &gwin->hotlist_toolbar_list); - if(ami_gui_hotlist_scan(ami_tree_get_tree(hotlist_window), &gwin->hotlist_toolbar_list, gwin) > 0) { + if(ami_gui_hotlist_scan(&gwin->hotlist_toolbar_list, gwin) > 0) { SetGadgetAttrs((struct Gadget *)gwin->objects[GID_HOTLIST], gwin->win, NULL, SPEEDBAR_Buttons, &gwin->hotlist_toolbar_list, |