aboutsummaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorChristian Neumair <cneumair@src.gnome.org>2003-05-21 20:15:32 +0800
committerChristian Neumair <cneumair@src.gnome.org>2003-05-21 20:15:32 +0800
commit4158114036336446c7c4f793db0ae031dfa558c2 (patch)
tree5d7080d44f0f1b6b8b558a2cf3da78812b066c03 /data
parent8c7107742c5058841b22e52535a5ab316e44ad6e (diff)
downloadgsoc2013-epiphany-4158114036336446c7c4f793db0ae031dfa558c2.tar
gsoc2013-epiphany-4158114036336446c7c4f793db0ae031dfa558c2.tar.gz
gsoc2013-epiphany-4158114036336446c7c4f793db0ae031dfa558c2.tar.bz2
gsoc2013-epiphany-4158114036336446c7c4f793db0ae031dfa558c2.tar.lz
gsoc2013-epiphany-4158114036336446c7c4f793db0ae031dfa558c2.tar.xz
gsoc2013-epiphany-4158114036336446c7c4f793db0ae031dfa558c2.tar.zst
gsoc2013-epiphany-4158114036336446c7c4f793db0ae031dfa558c2.zip
data/glade/epiphany.glade data/glade/prefs-dialog.glade
* 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.
Diffstat (limited to 'data')
-rw-r--r--data/glade/epiphany.glade91
-rw-r--r--data/glade/prefs-dialog.glade2
2 files changed, 36 insertions, 57 deletions
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>