Author: chris_y Date: Thu Apr 30 13:40:26 2009 New Revision: 7384 URL: http://source.netsurf-browser.org?rev=7384&view=rev Log: Add Abort button to download window Modified: trunk/netsurf/!NetSurf/Resources/de/Messages trunk/netsurf/!NetSurf/Resources/en/Messages trunk/netsurf/!NetSurf/Resources/fr/Messages trunk/netsurf/!NetSurf/Resources/it/Messages trunk/netsurf/!NetSurf/Resources/nl/Messages trunk/netsurf/amiga/download.c trunk/netsurf/amiga/download.h trunk/netsurf/amiga/gui.c Modified: trunk/netsurf/!NetSurf/Resources/de/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/de/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/de/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/de/Messages Thu Apr 30 13:40:26 2009 @@ -373,6 +373,7 @@ DownloadU:%s von unbekannt • %s/s • bisher %s Downloaded:%s komplett • etwa %s/s • gesamt %s Unwritten:Schreiben der Datei ist fehlgeschlagen. +Abort:Abort # Amiga download window tokens # Modified: trunk/netsurf/!NetSurf/Resources/en/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/en/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/en/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/en/Messages Thu Apr 30 13:40:26 2009 @@ -373,6 +373,7 @@ DownloadU:%s of unknown • %s/s • %s total Downloaded:%s complete • average %s/s • %s total Unwritten:Writing data to file failed. +Abort:Abort # Amiga download window tokens # Modified: trunk/netsurf/!NetSurf/Resources/fr/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/fr/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/fr/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/fr/Messages Thu Apr 30 13:40:26 2009 @@ -373,6 +373,7 @@ DownloadU:%s sur inconnu • %s/s • %s total Downloaded:%s effectués • moyenne %s/s • %s total Unwritten:L'écriture de données dans le fichier a échoué. +Abort:Abort # Amiga download window tokens # Modified: trunk/netsurf/!NetSurf/Resources/it/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/it/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/it/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/it/Messages Thu Apr 30 13:40:26 2009 @@ -374,6 +374,7 @@ DownloadU:%s sconosciuto ? %s/s ? %s totale Downloaded:%s completato ? media %s/s ? %s totale Unwritten:Scrittura dei dati sul file fallita. +Abort:Abort # Amiga download window tokens # Modified: trunk/netsurf/!NetSurf/Resources/nl/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/nl/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/nl/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/nl/Messages Thu Apr 30 13:40:26 2009 @@ -373,6 +373,7 @@ DownloadU:%s van onbekend • %s/s • %s totaal Downloaded:%s compleet • gemiddeld %s/s • %s totaal Unwritten:Data naar bestand schrijven ging fout. +Abort:Abort # Amiga download window tokens # Modified: trunk/netsurf/amiga/download.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/download.c?rev=7384... ============================================================================== --- trunk/netsurf/amiga/download.c (original) +++ trunk/netsurf/amiga/download.c Thu Apr 30 13:40:26 2009 @@ -31,6 +31,8 @@ #include "amiga/options.h" #include "amiga/save_complete.h" +#include "content/fetch.h" + #include "desktop/selection.h" #include "utils/messages.h" @@ -103,6 +105,8 @@ WA_CloseGadget, FALSE, WA_SizeGadget, TRUE, WA_CustomScreen,scrn, + WINDOW_SharedPort,sport, + WINDOW_UserData,dw, WINDOW_IconifyGadget, TRUE, WINDOW_LockHeight,TRUE, WINDOW_Position, WPOS_CENTERSCREEN, @@ -118,13 +122,20 @@ FUELGAUGE_VarArgs,va, FUELGAUGE_Percent,FALSE, FUELGAUGE_Justification,FGJ_CENTER, - StringEnd, + FuelGaugeEnd, CHILD_NominalSize,TRUE, CHILD_WeightedHeight,0, + LAYOUT_AddChild, dw->gadgets[GID_CANCEL] = ButtonObject, + GA_ID,GID_CANCEL, + GA_RelVerify,TRUE, + GA_Text,messages_get("Abort"), + GA_TabCycle,TRUE, + ButtonEnd, EndGroup, EndWindow; dw->win = (struct Window *)RA_OpenWindow(dw->objects[OID_MAIN]); + dw->fetch = fetch; dw->node = AddObject(window_list,AMINS_DLWINDOW); dw->node->objstruct = dw; @@ -167,6 +178,12 @@ const char *error_msg) { warn_user("Unwritten",""); + gui_download_window_done(dw); +} + +void ami_download_window_abort(struct gui_download_window *dw) +{ + fetch_abort(dw->fetch); gui_download_window_done(dw); } Modified: trunk/netsurf/amiga/download.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/download.h?rev=7384... ============================================================================== --- trunk/netsurf/amiga/download.h (original) +++ trunk/netsurf/amiga/download.h Thu Apr 30 13:40:26 2009 @@ -37,11 +37,13 @@ uint32 downloaded; struct dlnode *dln; struct browser_window *bw; + struct fetch *fetch; }; int drag_save; void *drag_save_data; +void ami_download_window_abort(struct gui_download_window *dw); void ami_drag_save(struct Window *win); void ami_free_download_list(struct List *dllist); Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=7384&... ============================================================================== --- trunk/netsurf/amiga/gui.c (original) +++ trunk/netsurf/amiga/gui.c Thu Apr 30 13:40:26 2009 @@ -945,6 +945,11 @@ if(gwin->node->Type == AMINS_LOGINWINDOW) { ami_401login_close((struct gui_login_window *)gwin); + win_destroyed = true; + } + else if(gwin->node->Type == AMINS_DLWINDOW) + { + ami_download_window_abort((struct gui_download_window *)gwin); win_destroyed = true; } break;