aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog11
-rw-r--r--data/glade/epiphany.glade91
-rw-r--r--data/glade/prefs-dialog.glade2
-rw-r--r--embed/downloader-view.c46
-rw-r--r--embed/downloader-view.h2
5 files changed, 60 insertions, 92 deletions
diff --git a/ChangeLog b/ChangeLog
index 14b65dcc4..540f3e99b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-05-21 Christian Neumair <chris@gnome-de.org>
+
+ * data/glade/epiphany.glade
+ * data/glade/prefs-dialog.glade
+ * data/epiphany.schemas.in
+ * embed/downloader-view.c
+ * embed/downloader-view.h:
+
+ Applied patch from #113367 which inter alia removes the keep_open
+ option from the download manager and does various download UI tweakage.
+
2003-05-21 Marco Pesenti Gritti <marco@it.gnome.org>
* src/bookmarks/ephy-bookmarks-editor.c:
diff --git a/data/glade/epiphany.glade b/data/glade/epiphany.glade
index 33f9b236d..135c6540d 100644
--- a/data/glade/epiphany.glade
+++ b/data/glade/epiphany.glade
@@ -302,7 +302,7 @@
<widget class="GtkWindow" id="download_manager_dialog">
<property name="border_width">12</property>
- <property name="title" translatable="yes">Downloading</property>
+ <property name="title" translatable="yes">Download Manager</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
@@ -402,28 +402,12 @@
</child>
<child>
- <widget class="GtkHBox" id="hbox82">
+ <widget class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">12</property>
-
- <child>
- <widget class="GtkCheckButton" id="keep_open_check">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Keep dialog open</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
+ <property name="xalign">1</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
<child>
<widget class="GtkToggleButton" id="details_togglebutton">
@@ -468,7 +452,7 @@
<child>
<widget class="GtkLabel" id="label1220">
<property name="visible">True</property>
- <property name="label" translatable="yes">Download _Details...</property>
+ <property name="label" translatable="yes">Download _Details</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -490,11 +474,6 @@
</widget>
</child>
</widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
</child>
</widget>
<packing>
@@ -505,16 +484,6 @@
</child>
<child>
- <widget class="GtkHSeparator" id="details_separator">
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkVBox" id="details_frame">
<property name="homogeneous">False</property>
<property name="spacing">0</property>
@@ -526,7 +495,20 @@
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
+ <property name="column_spacing">12</property>
+
+ <child>
+ <widget class="GtkHSeparator" id="details_separator">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ </packing>
+ </child>
<child>
<widget class="GtkLabel" id="label1142">
@@ -545,8 +527,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -569,8 +551,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -593,8 +575,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -617,15 +599,15 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="details_elapsed">
+ <widget class="GtkLabel" id="details_status">
<property name="visible">True</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
@@ -643,13 +625,12 @@
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="details_remaining">
+ <widget class="GtkLabel" id="details_elapsed">
<property name="visible">True</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
@@ -667,13 +648,12 @@
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="details_status">
+ <widget class="GtkLabel" id="details_remaining">
<property name="visible">True</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
@@ -689,9 +669,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="y_options"></property>
</packing>
</child>
@@ -708,7 +687,7 @@
<property name="right_attach">2</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
- <property name="y_options">fill</property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
diff --git a/data/glade/prefs-dialog.glade b/data/glade/prefs-dialog.glade
index 7d6fe4e26..3d9b7abd9 100644
--- a/data/glade/prefs-dialog.glade
+++ b/data/glade/prefs-dialog.glade
@@ -8,7 +8,7 @@
<property name="border_width">5</property>
<property name="title" translatable="yes">Preferences</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
diff --git a/embed/downloader-view.c b/embed/downloader-view.c
index 79acafc76..3aeb4e05c 100644
--- a/embed/downloader-view.c
+++ b/embed/downloader-view.c
@@ -70,7 +70,6 @@ struct DownloaderViewPrivate
GtkWidget *details_remaining;
GtkWidget *details_progress;
GtkWidget *details_button;
- GtkWidget *keep_open_check;
GtkWidget *open_button;
GtkWidget *pause_button;
@@ -105,9 +104,7 @@ enum
{
PROP_WINDOW,
PROP_TREEVIEW,
- PROP_KEEP_OPEN,
PROP_DETAILS_FRAME,
- PROP_DETAILS_SEPARATOR,
PROP_DETAILS_TABLE,
PROP_DETAILS_STATUS,
PROP_DETAILS_ELAPSED,
@@ -124,9 +121,7 @@ EphyDialogProperty properties [] =
{
{ PROP_WINDOW, "download_manager_dialog", NULL, PT_NORMAL, NULL},
{ PROP_TREEVIEW, "clist", NULL, PT_NORMAL, NULL },
- { PROP_KEEP_OPEN, "keep_open_check", CONF_DOWNLOADING_KEEP_OPEN, PT_NORMAL, NULL },
{ PROP_DETAILS_FRAME, "details_frame", NULL, PT_NORMAL, NULL },
- { PROP_DETAILS_SEPARATOR, "details_separator", NULL, PT_NORMAL, NULL },
{ PROP_DETAILS_TABLE, "details_table", NULL, PT_NORMAL, NULL },
{ PROP_DETAILS_STATUS, "details_status", NULL, PT_NORMAL, NULL },
{ PROP_DETAILS_ELAPSED, "details_elapsed", NULL, PT_NORMAL, NULL },
@@ -611,7 +606,6 @@ downloader_view_remove_download (DownloaderView *dv,
{
DownloadDetails *details;
GtkTreeIter iter;
- GValue keep_open = {0, };
details = g_hash_table_lookup (dv->priv->details_hash,
persist_object);
@@ -626,17 +620,7 @@ downloader_view_remove_download (DownloaderView *dv,
g_hash_table_remove (dv->priv->details_hash,
persist_object);
- ephy_dialog_get_value (EPHY_DIALOG(dv), PROP_KEEP_OPEN, &keep_open);
-
- if (!g_value_get_boolean (&keep_open) &&
- g_hash_table_size (dv->priv->details_hash) == 0)
- {
- g_object_unref (dv);
- }
- else
- {
- ensure_selected_row (dv);
- }
+ ensure_selected_row (dv);
}
void
@@ -677,7 +661,6 @@ downloader_view_set_download_status (DownloaderView *dv,
{
DownloadDetails *details;
GtkTreeIter iter;
- GValue keep_open = {0, };
details = g_hash_table_lookup (dv->priv->details_hash,
persist_object);
@@ -692,13 +675,10 @@ downloader_view_set_download_status (DownloaderView *dv,
downloader_view_set_download_info (dv->priv, details, &iter);
downloader_view_update_controls (dv->priv);
- ephy_dialog_get_value (EPHY_DIALOG(dv), PROP_KEEP_OPEN, &keep_open);
-
- if (status == DOWNLOAD_STATUS_COMPLETED &&
- !g_value_get_boolean (&keep_open))
+/* if (status == DOWNLOAD_STATUS_COMPLETED)
{
downloader_view_remove_download (dv, persist_object);
- }
+ }*/
}
static void
@@ -725,7 +705,6 @@ downloader_view_build_ui (DownloaderView *dv)
priv->details_elapsed = ephy_dialog_get_control (d, PROP_DETAILS_ELAPSED);
priv->details_remaining = ephy_dialog_get_control (d, PROP_DETAILS_REMAINING);
priv->details_progress = ephy_dialog_get_control (d, PROP_DETAILS_PROGRESS);
- priv->keep_open_check = ephy_dialog_get_control (d, PROP_KEEP_OPEN);
priv->details_button = ephy_dialog_get_control (d, PROP_DETAILS_BUTTON);
priv->open_button = ephy_dialog_get_control (d, PROP_OPEN_BUTTON);
priv->pause_button = ephy_dialog_get_control (d, PROP_PAUSE_BUTTON);
@@ -734,8 +713,9 @@ downloader_view_build_ui (DownloaderView *dv)
/* create file and location details labels */
priv->details_location = ephy_ellipsizing_label_new ("");
- gtk_table_attach_defaults (GTK_TABLE(details_table), priv->details_location,
- 1, 2, 0, 1);
+ gtk_table_attach_defaults (GTK_TABLE(details_table),
+ priv->details_location,
+ 1, 2, 1, 2);
gtk_misc_set_alignment (GTK_MISC(priv->details_location), 0, 0);
gtk_label_set_selectable (GTK_LABEL(priv->details_location), TRUE);
gtk_widget_show (priv->details_location);
@@ -904,11 +884,14 @@ downloader_treeview_selection_changed_cb (GtkTreeSelection *selection,
GValue val = {0, };
gpointer *persist_object;
DownloadDetails *details = NULL;
+ GtkWidget *details_button;
GtkWidget *details_frame;
DownloaderViewPrivate *priv= dv->priv;
+ details_button = ephy_dialog_get_control (EPHY_DIALOG(dv),
+ PROP_DETAILS_BUTTON);
details_frame = ephy_dialog_get_control (EPHY_DIALOG(dv),
- PROP_DETAILS_FRAME);
+ PROP_DETAILS_FRAME);
if (get_selected_row (priv, &iter))
{
@@ -919,6 +902,7 @@ downloader_treeview_selection_changed_cb (GtkTreeSelection *selection,
persist_object);
g_return_if_fail (details);
+ gtk_widget_set_sensitive (details_button, TRUE);
gtk_widget_set_sensitive (details_frame, TRUE);
downloader_view_update_details (priv, details);
@@ -935,6 +919,8 @@ downloader_treeview_selection_changed_cb (GtkTreeSelection *selection,
0);
gtk_widget_set_sensitive (details_frame, FALSE);
+ if (!gtk_tree_model_get_iter_first (priv->model, &iter))
+ gtk_widget_set_sensitive (details_button, FALSE);
}
}
@@ -1003,23 +989,17 @@ download_dialog_details_cb (GtkToggleButton *button,
DownloaderView *dv)
{
GtkWidget *details_frame;
- GtkWidget *details_separator;
details_frame = ephy_dialog_get_control (EPHY_DIALOG(dv),
PROP_DETAILS_FRAME);
- details_separator = ephy_dialog_get_control (EPHY_DIALOG(dv),
- PROP_DETAILS_SEPARATOR);
-
if (gtk_toggle_button_get_active (button))
{
gtk_widget_show (GTK_WIDGET (details_frame));
- gtk_widget_show (GTK_WIDGET (details_separator));
dv->priv->show_details = TRUE;
}
else
{
gtk_widget_hide (GTK_WIDGET (details_frame));
- gtk_widget_hide (GTK_WIDGET (details_separator));
dv->priv->show_details = FALSE;
}
diff --git a/embed/downloader-view.h b/embed/downloader-view.h
index 1a5d9bbdb..2b0b182a3 100644
--- a/embed/downloader-view.h
+++ b/embed/downloader-view.h
@@ -39,8 +39,6 @@ typedef struct DownloaderViewClass DownloaderViewClass;
typedef struct DownloaderViewPrivate DownloaderViewPrivate;
-#define CONF_DOWNLOADING_KEEP_OPEN "/apps/epiphany/downloader/keep_open"
-
typedef enum
{
DOWNLOAD_STATUS_DOWNLOADING,
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 00:26:13 +0800