From 7cf178f286f325c4dc45f1e4602545f5b9017bab Mon Sep 17 00:00:00 2001 From: Ole Loots Date: Thu, 17 Jan 2013 02:04:43 +0100 Subject: Display download filename in download confirm message. --- atari/download.c | 5 ++++- atari/gemtk/guiwin.c | 2 -- atari/toolbar.c | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/atari/download.c b/atari/download.c index a94ec8afd..d20fd882d 100755 --- a/atari/download.c +++ b/atari/download.c @@ -257,6 +257,7 @@ struct gui_download_window * gui_download_window_create(download_context *ctx, struct gui_download_window * gdw; int dlgres = 0; OBJECT * tree = get_tree(DOWNLOAD); + char alert[200]; LOG(("Creating download window for gui window: %p", parent)); @@ -269,7 +270,9 @@ struct gui_download_window * gui_download_window_create(download_context *ctx, } filename = download_context_get_filename((const download_context*)ctx); - dlgres = form_alert(2, "[2][Accept download?][Yes|Save as...|No]"); + snprintf(alert, 200, "[2][Accept download?|%.*s][Yes|Save as...|No]", + 40,filename); + dlgres = form_alert(2, alert); if( dlgres == 3){ return( NULL ); } diff --git a/atari/gemtk/guiwin.c b/atari/gemtk/guiwin.c index 9f756a6be..097eb6e06 100644 --- a/atari/gemtk/guiwin.c +++ b/atari/gemtk/guiwin.c @@ -383,8 +383,6 @@ static short preproc_mu_button(GUIWIN * gw, EVMULT_OUT *ev_out, short msg[8]) ev_out->emo_events = oldevents; retval = 1; } else { - printf("not within"); - dbg_grect("tb", &tb_area); if (gw->toolbar_edit_obj != -1) { gw->toolbar_edit_obj = -1; } diff --git a/atari/toolbar.c b/atari/toolbar.c index 349d2c5e6..a6b7930b4 100644 --- a/atari/toolbar.c +++ b/atari/toolbar.c @@ -411,6 +411,7 @@ void toolbar_redraw(struct s_toolbar *tb, GRECT *clip) .y1 = MAX(0,area.g_y - area_ro.g_y) + area.g_h }; //dbg_rect("tb textarea clip: ", &r); + // TODO: let this be handled by an userdef object redraw function: textarea_redraw(tb->url.textarea, 0, 0, &r, &toolbar_rdrw_ctx); } } -- cgit v1.2.3