From c20560d25037ec070799e6f7d57069ba675ec82a Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 19 Oct 2008 13:01:01 +0000 Subject: Allow theming of default treeview folder and item images. svn path=/trunk/netsurf/; revision=5600 --- amiga/gui.h | 1 + amiga/resources/Themes/AISS/Theme | 5 +++++ amiga/resources/Themes/Default/Theme | 5 +++++ amiga/tree.c | 24 ++++++++++++++++++++++++ 4 files changed, 35 insertions(+) (limited to 'amiga') diff --git a/amiga/gui.h b/amiga/gui.h index 2fe5cf40e..9e453ac85 100755 --- a/amiga/gui.h +++ b/amiga/gui.h @@ -124,6 +124,7 @@ void ami_get_msg(void); void ami_update_pointer(struct Window *win, gui_pointer_shape shape); void ami_close_all_tabs(struct gui_window_2 *gwin); void ami_quit_netsurf(void); +void ami_get_theme_filename(char *filename,char *themestring); struct RastPort *currp; struct TextFont *origrpfont; diff --git a/amiga/resources/Themes/AISS/Theme b/amiga/resources/Themes/AISS/Theme index 2e9cf28b6..5450dede1 100755 --- a/amiga/resources/Themes/AISS/Theme +++ b/amiga/resources/Themes/AISS/Theme @@ -17,5 +17,10 @@ theme_home:*TBImages:home theme_home_s:*TBImages:home_s theme_home_g:*TBImages:home_g theme_closetab:*TBImages:list_cancel +theme_list_folder_closed:*TBImages:list_folderfold +theme_list_folder_open:*TBImages:list_folderunfold +theme_list_bookmark:*TBImages:list_bookmark +theme_list_cookie:*TBImages:list_abstract +theme_list_history:*TBImages:list_archive theme_throbber:Throbber theme_throbber_frames:13 diff --git a/amiga/resources/Themes/Default/Theme b/amiga/resources/Themes/Default/Theme index 3faf1eaf9..75d5148be 100755 --- a/amiga/resources/Themes/Default/Theme +++ b/amiga/resources/Themes/Default/Theme @@ -32,5 +32,10 @@ theme_home:*TBImages:home theme_home_s:*TBImages:home_s theme_home_g:*TBImages:home_g theme_closetab:*TBImages:list_cancel +theme_list_folder_closed: +theme_list_folder_open: +theme_list_bookmark: +theme_list_cookie: +theme_list_history: theme_throbber:Throbber theme_throbber_frames:9 diff --git a/amiga/tree.c b/amiga/tree.c index 10fbd52c4..5780a4af3 100755 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -34,6 +34,8 @@ #include #include #include "utils/messages.h" +#include +#include void ami_add_elements(struct treeview_window *twin,struct node *root,WORD *gen); bool ami_tree_launch_node(struct tree *tree, struct node *node); @@ -189,6 +191,7 @@ void ami_open_tree(struct tree *tree,int type) BOOL msel = TRUE,nothl = TRUE,launchdisable=FALSE; static WORD gen=0; char *wintitle; + char folderclosed[100],folderopen[100],item[100]; if(tree->handle) { @@ -211,20 +214,26 @@ void ami_open_tree(struct tree *tree,int type) if(tree->single_selection) msel = FALSE; + ami_get_theme_filename(&folderclosed,"theme_list_folder_closed"); + ami_get_theme_filename(&folderopen,"theme_list_folder_open"); + switch(type) { case AMI_TREE_HOTLIST: nothl = FALSE; wintitle = (char *)messages_get("Hotlist"); + ami_get_theme_filename(&item,"theme_list_bookmark"); break; case AMI_TREE_COOKIES: nothl = TRUE; launchdisable=TRUE; wintitle = (char *)messages_get("Cookies"); + ami_get_theme_filename(&item,"theme_list_cookie"); break; case AMI_TREE_HISTORY: nothl = TRUE; wintitle = (char *)messages_get("GlobalHistory"); + ami_get_theme_filename(&item,"theme_list_history"); break; } @@ -262,6 +271,21 @@ void ami_open_tree(struct tree *tree,int type) LISTBROWSER_Labels, twin->listbrowser_list, // LISTBROWSER_MultiSelect,msel, LISTBROWSER_ShowSelected,TRUE, + LISTBROWSER_ShowImage,BitMapObject, + BITMAP_SourceFile,folderclosed, + BITMAP_Screen,scrn, + BITMAP_Masking,TRUE, + BitMapEnd, + LISTBROWSER_HideImage,BitMapObject, + BITMAP_SourceFile,folderopen, + BITMAP_Screen,scrn, + BITMAP_Masking,TRUE, + BitMapEnd, + LISTBROWSER_LeafImage,BitMapObject, + BITMAP_SourceFile,item, + BITMAP_Screen,scrn, + BITMAP_Masking,TRUE, + BitMapEnd, ListBrowserEnd, CHILD_NominalSize,TRUE, LAYOUT_AddChild, HGroupObject, -- cgit v1.2.3