Let the address field be a non-editable text entry
This commit is contained in:
parent
4e493c3af1
commit
0fec08b469
@ -121,8 +121,8 @@ static gboolean _download_on_timeout(gpointer data);
|
|||||||
/* functions */
|
/* functions */
|
||||||
/* download_new */
|
/* download_new */
|
||||||
static void _download_label(GtkWidget * vbox, PangoFontDescription * bold,
|
static void _download_label(GtkWidget * vbox, PangoFontDescription * bold,
|
||||||
GtkSizeGroup * left, GtkSizeGroup * right, char const * label,
|
GtkSizeGroup * left, char const * label, GtkWidget ** widget,
|
||||||
GtkWidget ** widget, char const * text);
|
char const * text);
|
||||||
|
|
||||||
Download * download_new(DownloadPrefs * prefs, char const * url)
|
Download * download_new(DownloadPrefs * prefs, char const * url)
|
||||||
{
|
{
|
||||||
@ -131,7 +131,7 @@ Download * download_new(DownloadPrefs * prefs, char const * url)
|
|||||||
GtkWidget * vbox;
|
GtkWidget * vbox;
|
||||||
GtkWidget * hbox;
|
GtkWidget * hbox;
|
||||||
GtkSizeGroup * left;
|
GtkSizeGroup * left;
|
||||||
GtkSizeGroup * right;
|
GtkWidget * widget;
|
||||||
PangoFontDescription * bold;
|
PangoFontDescription * bold;
|
||||||
|
|
||||||
/* verify arguments */
|
/* verify arguments */
|
||||||
@ -180,27 +180,35 @@ Download * download_new(DownloadPrefs * prefs, char const * url)
|
|||||||
bold = pango_font_description_new();
|
bold = pango_font_description_new();
|
||||||
pango_font_description_set_weight(bold, PANGO_WEIGHT_BOLD);
|
pango_font_description_set_weight(bold, PANGO_WEIGHT_BOLD);
|
||||||
left = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
|
left = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
|
||||||
right = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
|
/* address */
|
||||||
_download_label(vbox, bold, left, right, _("Address: "),
|
hbox = gtk_hbox_new(FALSE, 4);
|
||||||
&download->address, url);
|
widget = gtk_label_new(_("Address: "));
|
||||||
_download_label(vbox, bold, left, right, _("File: "),
|
gtk_widget_modify_font(widget, bold);
|
||||||
&download->filename, download->prefs.output);
|
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
|
||||||
_download_label(vbox, bold, left, right, _("Status: "),
|
gtk_size_group_add_widget(left, widget);
|
||||||
&download->status, _("Resolving..."));
|
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
|
||||||
_download_label(vbox, bold, left, right, _("Done: "), &download->done,
|
download->address = gtk_entry_new();
|
||||||
|
gtk_entry_set_text(GTK_ENTRY(download->address), url);
|
||||||
|
gtk_editable_set_editable(GTK_EDITABLE(download->address), FALSE);
|
||||||
|
gtk_box_pack_start(GTK_BOX(hbox), download->address, TRUE, TRUE, 0);
|
||||||
|
gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
|
||||||
|
_download_label(vbox, bold, left, _("File: "), &download->filename,
|
||||||
|
download->prefs.output);
|
||||||
|
_download_label(vbox, bold, left, _("Status: "), &download->status,
|
||||||
|
_("Resolving..."));
|
||||||
|
_download_label(vbox, bold, left, _("Done: "), &download->done,
|
||||||
_("0.0 kB"));
|
_("0.0 kB"));
|
||||||
_download_label(vbox, bold, left, right, _("Speed: "), &download->speed,
|
_download_label(vbox, bold, left, _("Speed: "), &download->speed,
|
||||||
_("0.0 kB/s"));
|
_("0.0 kB/s"));
|
||||||
/* progress bar */
|
/* progress bar */
|
||||||
download->progress = gtk_progress_bar_new();
|
download->progress = gtk_progress_bar_new();
|
||||||
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(download->progress), " ");
|
|
||||||
gtk_box_pack_start(GTK_BOX(vbox), download->progress, TRUE, TRUE, 4);
|
gtk_box_pack_start(GTK_BOX(vbox), download->progress, TRUE, TRUE, 4);
|
||||||
/* checkbox */
|
/* checkbox */
|
||||||
download->check = gtk_check_button_new_with_label(
|
download->check = gtk_check_button_new_with_label(
|
||||||
_("Close window when the download is complete"));
|
_("Close window when the download is complete"));
|
||||||
gtk_box_pack_start(GTK_BOX(vbox), download->check, TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(vbox), download->check, TRUE, TRUE, 0);
|
||||||
/* button */
|
/* button */
|
||||||
hbox = gtk_hbox_new(FALSE, 0);
|
hbox = gtk_hbox_new(FALSE, 4);
|
||||||
download->cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
|
download->cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
|
||||||
g_signal_connect_swapped(G_OBJECT(download->cancel), "clicked",
|
g_signal_connect_swapped(G_OBJECT(download->cancel), "clicked",
|
||||||
G_CALLBACK(_download_on_cancel), download);
|
G_CALLBACK(_download_on_cancel), download);
|
||||||
@ -216,20 +224,19 @@ Download * download_new(DownloadPrefs * prefs, char const * url)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void _download_label(GtkWidget * vbox, PangoFontDescription * bold,
|
static void _download_label(GtkWidget * vbox, PangoFontDescription * bold,
|
||||||
GtkSizeGroup * left, GtkSizeGroup * right, char const * label,
|
GtkSizeGroup * left, char const * label, GtkWidget ** widget,
|
||||||
GtkWidget ** widget, char const * text)
|
char const * text)
|
||||||
{
|
{
|
||||||
GtkWidget * hbox;
|
GtkWidget * hbox;
|
||||||
|
|
||||||
hbox = gtk_hbox_new(FALSE, 0);
|
hbox = gtk_hbox_new(FALSE, 4);
|
||||||
*widget = gtk_label_new(label);
|
*widget = gtk_label_new(label);
|
||||||
gtk_widget_modify_font(*widget, bold);
|
gtk_widget_modify_font(*widget, bold);
|
||||||
gtk_misc_set_alignment(GTK_MISC(*widget), 0, 0);
|
gtk_misc_set_alignment(GTK_MISC(*widget), 0.0, 0.5);
|
||||||
gtk_size_group_add_widget(left, *widget);
|
gtk_size_group_add_widget(left, *widget);
|
||||||
gtk_box_pack_start(GTK_BOX(hbox), *widget, TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(hbox), *widget, FALSE, TRUE, 0);
|
||||||
*widget = gtk_label_new(text);
|
*widget = gtk_label_new(text);
|
||||||
gtk_misc_set_alignment(GTK_MISC(*widget), 0, 0);
|
gtk_misc_set_alignment(GTK_MISC(*widget), 0.0, 0.5);
|
||||||
gtk_size_group_add_widget(right, *widget);
|
|
||||||
gtk_box_pack_start(GTK_BOX(hbox), *widget, TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(hbox), *widget, TRUE, TRUE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
|
||||||
}
|
}
|
||||||
@ -346,7 +353,7 @@ static void _download_refresh(Download * download)
|
|||||||
}
|
}
|
||||||
snprintf(buf, sizeof(buf), _("%.1f %s"), rate, _(unit));
|
snprintf(buf, sizeof(buf), _("%.1f %s"), rate, _(unit));
|
||||||
gtk_label_set_text(GTK_LABEL(download->done), buf);
|
gtk_label_set_text(GTK_LABEL(download->done), buf);
|
||||||
buf[0] = '\0';
|
snprintf(buf, sizeof(buf), " ");
|
||||||
if(download->pulse != 0)
|
if(download->pulse != 0)
|
||||||
{
|
{
|
||||||
gtk_progress_bar_pulse(GTK_PROGRESS_BAR(
|
gtk_progress_bar_pulse(GTK_PROGRESS_BAR(
|
||||||
|
Loading…
Reference in New Issue
Block a user