diff -pru dillo-0.7.3/src/commands.c dillo-0.7.3-arg/src/commands.c --- dillo-0.7.3/src/commands.c Mon Jul 7 11:40:10 2003 +++ dillo-0.7.3-arg/src/commands.c Sat Sep 13 11:17:14 2003 @@ -118,7 +118,7 @@ void a_Commands_viewsource_callback (Gtk GTK_SIGNAL_FUNC(gtk_widget_destroyed), &bw->viewsource_window); - gtk_window_set_title (GTK_WINDOW (window), "View Source"); + gtk_window_set_title (GTK_WINDOW (window), "Dillo: View Source"); gtk_container_border_width (GTK_CONTAINER (window), 0); box1 = gtk_vbox_new (FALSE, 0); diff -pru dillo-0.7.3/src/html.c dillo-0.7.3-arg/src/html.c --- dillo-0.7.3/src/html.c Sat Jul 19 19:05:28 2003 +++ dillo-0.7.3-arg/src/html.c Sat Sep 13 12:48:36 2003 @@ -4231,7 +4231,7 @@ static void Html_write(DilloHtml *html, if ( html->bw ) { g_snprintf( - completestr, 32, "%s%.1f Kb", + completestr, 32, "%s %.1f Kb ", PBAR_PSTR(prefs.panel_size == 1), (float)html->Start_Ofs/1024); a_Progressbar_update(html->bw->progress, completestr, 1); diff -pru dillo-0.7.3/src/interface.c dillo-0.7.3-arg/src/interface.c --- dillo-0.7.3/src/interface.c Mon Jul 7 11:40:14 2003 +++ dillo-0.7.3-arg/src/interface.c Sat Sep 13 12:36:38 2003 @@ -152,7 +152,7 @@ void a_Interface_close_client(BrowserWin a_Interface_remove_client(bw, ClientKey); /* --Progress bars stuff-- */ - g_snprintf(numstr, 32, "%s%d of %d", PBAR_ISTR(prefs.panel_size == 1), + g_snprintf(numstr, 32, "%s %d of %d ", PBAR_ISTR(prefs.panel_size == 1), bw->NumImagesGot, bw->NumImages); a_Progressbar_update(bw->imgprogress, numstr, (bw->NumImagesGot == bw->NumImages) ? 0 : 1 ); @@ -219,7 +219,7 @@ void a_Interface_add_client(BrowserWindo a_Interface_set_button_sens(bw); /* --Progress bar stuff-- */ - g_snprintf(numstr, 32, "%s%d of %d", PBAR_ISTR(prefs.panel_size == 1), + g_snprintf(numstr, 32, "%s %d of %d ", PBAR_ISTR(prefs.panel_size == 1), bw->NumImagesGot, bw->NumImages); a_Progressbar_update(bw->imgprogress, numstr, 1); } diff -pru dillo-0.7.3/src/menu.c dillo-0.7.3-arg/src/menu.c --- dillo-0.7.3/src/menu.c Wed Jul 9 11:21:21 2003 +++ dillo-0.7.3-arg/src/menu.c Sat Sep 13 11:55:29 2003 @@ -171,13 +171,10 @@ GtkWidget *a_Menu_popup_op_new(BrowserWi GtkWidget *menu; menu = gtk_menu_new(); - Menu_sep(menu); - Menu_add(menu, " PAGE OPTIONS", NULL, bw, NULL, NULL); - Menu_sep(menu); - Menu_add(menu, "View page Source", NULL, bw, + Menu_add(menu, "View Page Source", NULL, bw, a_Commands_viewsource_callback, bw); - Menu_add(menu, "Bookmark this page", NULL, bw, + Menu_add(menu, "Bookmark This Page", NULL, bw, a_Commands_addbm_callback, bw); Menu_sep(menu); Menu_add(menu, "_Find Text", "F", bw, @@ -186,7 +183,7 @@ GtkWidget *a_Menu_popup_op_new(BrowserWi bw->pagemarks_menuitem = Menu_add(menu, "Jump to...", NULL, bw, NULL, bw); Menu_sep(menu); - Menu_add(menu, "Save page As...", NULL, bw, + Menu_add(menu, "Save Page As...", NULL, bw, a_Commands_save_callback, bw); return menu; @@ -256,15 +253,11 @@ GtkWidget *a_Menu_popup_history_new(Brow GString *text = g_string_sized_new(128); menu = gtk_menu_new(); - Menu_sep(menu); if (direction>0) { - Menu_add(menu, " FOLLOWING PAGES ", NULL, bw, NULL, NULL); i = a_Nav_stack_ptr(bw) + 1; } else { - Menu_add(menu, " PREVIOUS PAGES ", NULL, bw, NULL, NULL); i = a_Nav_stack_ptr(bw) - 1; } - Menu_sep(menu); for ( ; i >= 0 && i < a_Nav_stack_size(bw); i+=direction ) { if (a_History_get_title(NAV_IDX(bw,i))) { @@ -308,15 +301,12 @@ GtkWidget *a_Menu_popup_ol_new(BrowserWi GtkWidget *copy; menu = gtk_menu_new(); - Menu_sep(menu); - Menu_add(menu, " LINK OPTIONS", NULL, bw, NULL, NULL); - Menu_sep(menu); Menu_add(menu, "Open Link in New Window", NULL, bw, a_Commands_open_link_nw_callback, bw); - Menu_add(menu, "Add Bookmark for Link", NULL, bw, + Menu_add(menu, "Bookmark This Link", NULL, bw, a_Commands_addbm_callback, bw); - copy = Menu_add(menu, "Copy Link location", NULL, bw, + copy = Menu_add(menu, "Copy Link Location", NULL, bw, a_Menu_popup_select_url_callback, bw); a_Commands_init_selection(copy); gtk_signal_connect(GTK_OBJECT(copy), "selection_clear_event", diff -pru dillo-0.7.3/src/plain.c dillo-0.7.3-arg/src/plain.c --- dillo-0.7.3/src/plain.c Mon Jul 7 11:40:15 2003 +++ dillo-0.7.3-arg/src/plain.c Sat Sep 13 12:48:44 2003 @@ -195,7 +195,7 @@ static void Plain_write(DilloPlain *plai if ( plain->bw ) { gchar completestr[32]; g_snprintf( - completestr, 32, "%s%.1f Kb", + completestr, 32, "%s %.1f Kb ", PBAR_PSTR(prefs.panel_size == 1), (float)plain->Start_Ofs/1024); a_Progressbar_update(plain->bw->progress, completestr, 1); diff -pru dillo-0.7.3/src/progressbar.h dillo-0.7.3-arg/src/progressbar.h --- dillo-0.7.3/src/progressbar.h Mon Jul 7 11:40:15 2003 +++ dillo-0.7.3-arg/src/progressbar.h Sat Sep 13 12:35:37 2003 @@ -27,8 +27,8 @@ extern "C" { #endif /* __cplusplus */ -#define PBAR_ISTR(s) (s) ? "" : "Images: " -#define PBAR_PSTR(s) (s) ? "" : "Page: " +#define PBAR_ISTR(s) (s) ? "" : " Images:" +#define PBAR_PSTR(s) (s) ? "" : " Page:" GtkWidget* a_Progressbar_new(void); gint a_Progressbar_set_color(GtkWidget *pbar, GdkColor color);