r10053 chris_y - in /trunk/netsurf/amiga: gui.c gui.h
resources/Themes/AISS/Theme resources/Themes/Default/Theme
netsurf at semichrome.net
netsurf at semichrome.net
Sun Feb 14 14:00:33 GMT 2010
Author: chris_y
Date: Sun Feb 14 08:00:33 2010
New Revision: 10053
URL: http://source.netsurf-browser.org?rev=10053&view=rev
Log:
Add an Add Tab button.
Could probably do with an image for this for the default theme (currently falls back
to a textual "+")
Modified:
trunk/netsurf/amiga/gui.c
trunk/netsurf/amiga/gui.h
trunk/netsurf/amiga/resources/Themes/AISS/Theme
trunk/netsurf/amiga/resources/Themes/Default/Theme
Modified: trunk/netsurf/amiga/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=10053&r1=10052&r2=10053&view=diff
==============================================================================
--- trunk/netsurf/amiga/gui.c (original)
+++ trunk/netsurf/amiga/gui.c Sun Feb 14 08:00:33 2010
@@ -1174,6 +1174,10 @@
browser_window_destroy(gwin->bw);
break;
+ case GID_ADDTAB:
+ browser_window_create(NULL, gwin->bw, 0, true, true);
+ break;
+
case GID_URL:
GetAttr(STRINGA_TextVal,
(Object *)gwin->objects[GID_URL],
@@ -2110,6 +2114,10 @@
if(show)
{
+ SetAttrs(gwin->objects[GID_TABLAYOUT],
+ LAYOUT_Inverted, TRUE,
+ TAG_DONE);
+
gwin->objects[GID_TABS] = ClickTabObject,
GA_ID, GID_TABS,
GA_RelVerify, TRUE,
@@ -2120,13 +2128,27 @@
CLICKTAB_FlagImage, gwin->objects[GID_TABS_FLAG],
ClickTabEnd;
+ gwin->objects[GID_ADDTAB] = ButtonObject,
+ GA_ID, GID_ADDTAB,
+ GA_RelVerify, TRUE,
+ GA_Text, "+",
+ BUTTON_Transparent, TRUE,
+ BUTTON_RenderImage, gwin->objects[GID_ADDTAB_BM],
+ ButtonEnd;
+
IDoMethod(gwin->objects[GID_TABLAYOUT], LM_ADDCHILD,
gwin->win, gwin->objects[GID_TABS], NULL);
+
+ IDoMethod(gwin->objects[GID_ADDTABLAYOUT], LM_ADDCHILD,
+ gwin->win, gwin->objects[GID_ADDTAB], NULL);
}
else
{
IDoMethod(gwin->objects[GID_TABLAYOUT], LM_REMOVECHILD,
gwin->win, gwin->objects[GID_TABS]);
+
+ IDoMethod(gwin->objects[GID_ADDTABLAYOUT], LM_REMOVECHILD,
+ gwin->win, gwin->objects[GID_ADDTAB]);
}
FlushLayoutDomainCache((struct Gadget *)gwin->objects[GID_MAIN]);
@@ -2152,6 +2174,7 @@
char reload[100],reload_s[100],reload_g[100];
char home[100],home_s[100],home_g[100];
char closetab[100],closetab_s[100],closetab_g[100];
+ char addtab[100],addtab_s[100],addtab_g[100];
char tabthrobber[100];
if((bw->browser_window_type == BROWSER_WINDOW_IFRAME) && option_no_iframes) return NULL;
@@ -2343,7 +2366,18 @@
ami_get_theme_filename(closetab,"theme_closetab");
ami_get_theme_filename(closetab_s,"theme_closetab_s");
ami_get_theme_filename(closetab_g,"theme_closetab_g");
+ ami_get_theme_filename(addtab,"theme_addtab");
+ ami_get_theme_filename(addtab_s,"theme_addtab_s");
+ ami_get_theme_filename(addtab_g,"theme_addtab_g");
ami_get_theme_filename(tabthrobber,"theme_tab_loading");
+
+ gwin->shared->objects[GID_ADDTAB_BM] = BitMapObject,
+ BITMAP_SourceFile, addtab,
+ BITMAP_SelectSourceFile, addtab_s,
+ BITMAP_DisabledSourceFile, addtab_g,
+ BITMAP_Screen, scrn,
+ BITMAP_Masking, TRUE,
+ BitMapEnd;
gwin->shared->objects[GID_CLOSETAB_BM] = BitMapObject,
BITMAP_SourceFile, closetab,
@@ -2351,12 +2385,6 @@
BITMAP_DisabledSourceFile, closetab_g,
BITMAP_Screen, scrn,
BITMAP_Masking, TRUE,
- BitMapEnd;
-
- gwin->shared->objects[GID_TABS_FLAG] = BitMapObject,
- BITMAP_SourceFile, tabthrobber,
- BITMAP_Screen,scrn,
- BITMAP_Masking,TRUE,
BitMapEnd;
if(ClickTabBase->lib_Version < 53)
@@ -2375,13 +2403,23 @@
GA_Underscore,13, // disable kb shortcuts
CLICKTAB_Labels,&gwin->shared->tab_list,
CLICKTAB_LabelTruncate,TRUE,
- CLICKTAB_CloseImage, gwin->shared->objects[GID_CLOSETAB_BM],
- CLICKTAB_FlagImage, BitMapObject,
- BITMAP_SourceFile, tabthrobber,
- BITMAP_Screen,scrn,
- BITMAP_Masking,TRUE,
- BitMapEnd,
ClickTabEnd;
+
+ gwin->shared->objects[GID_ADDTAB] = ButtonObject,
+ GA_ID, GID_ADDTAB,
+ GA_RelVerify, TRUE,
+ GA_Text, "+",
+ BUTTON_Transparent, TRUE,
+ BUTTON_RenderImage, gwin->shared->objects[GID_ADDTAB_BM],
+ ButtonEnd;
+ }
+ else
+ {
+ gwin->shared->objects[GID_TABS_FLAG] = BitMapObject,
+ BITMAP_SourceFile, tabthrobber,
+ BITMAP_Screen,scrn,
+ BITMAP_Masking,TRUE,
+ BitMapEnd;
}
gwin->shared->objects[OID_MAIN] = WindowObject,
@@ -2565,6 +2603,12 @@
addtabclosegadget, gwin->shared->objects[GID_TABS],
CHILD_CacheDomain,FALSE,
+
+ LAYOUT_AddChild, gwin->shared->objects[GID_ADDTABLAYOUT] = HGroupObject,
+ addtabclosegadget, gwin->shared->objects[GID_ADDTAB],
+ LayoutEnd,
+ CHILD_WeightedWidth,0,
+ CHILD_WeightedHeight,0,
LayoutEnd,
CHILD_WeightedHeight,0,
LAYOUT_AddChild, gwin->shared->objects[GID_BROWSER] = SpaceObject,
Modified: trunk/netsurf/amiga/gui.h
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.h?rev=10053&r1=10052&r2=10053&view=diff
==============================================================================
--- trunk/netsurf/amiga/gui.h (original)
+++ trunk/netsurf/amiga/gui.h Sun Feb 14 08:00:33 2010
@@ -48,6 +48,9 @@
GID_SEARCH_ICON,
GID_CLOSETAB,
GID_CLOSETAB_BM,
+ GID_ADDTAB,
+ GID_ADDTAB_BM,
+ GID_ADDTABLAYOUT,
GID_TABS,
GID_TABS_FLAG,
GID_USER,
Modified: trunk/netsurf/amiga/resources/Themes/AISS/Theme
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/resources/Themes/AISS/Theme?rev=10053&r1=10052&r2=10053&view=diff
==============================================================================
--- trunk/netsurf/amiga/resources/Themes/AISS/Theme (original)
+++ trunk/netsurf/amiga/resources/Themes/AISS/Theme Sun Feb 14 08:00:33 2010
@@ -21,6 +21,9 @@
theme_closetab:*TBImages:list_cancel
theme_closetab_s:*TBImages:list_cancel
theme_closetab_g:*TBImages:list_cancel
+theme_addtab:*TBImages:list_add
+theme_addtab_s:*TBImages:list_add
+theme_addtab_g:*TBImages:list_add
theme_list_folder_closed:*TBImages:list_folderfold
theme_list_folder_open:*TBImages:list_folderunfold
theme_list_bookmark:*TBImages:list_bookmark
Modified: trunk/netsurf/amiga/resources/Themes/Default/Theme
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/resources/Themes/Default/Theme?rev=10053&r1=10052&r2=10053&view=diff
==============================================================================
--- trunk/netsurf/amiga/resources/Themes/Default/Theme (original)
+++ trunk/netsurf/amiga/resources/Themes/Default/Theme Sun Feb 14 08:00:33 2010
@@ -34,6 +34,9 @@
theme_closetab:closetab.png
theme_closetab_s:closetab.png
theme_closetab_g:closetab_g.png
+theme_addtab:
+theme_addtab_s:
+theme_addtab_g:
theme_list_folder_closed:
theme_list_folder_open:
theme_list_bookmark:
More information about the netsurf-commits
mailing list