Commit 1c849dce authored by Adrien Plazas's avatar Adrien Plazas

prefs-dialog: Drop the notebook

parent 6b4ed5cb
Pipeline #52978 passed with stages
in 16 minutes and 16 seconds
......@@ -72,8 +72,6 @@ enum {
struct _PrefsDialog {
HdyDialog parent_instance;
GtkWidget *notebook;
/* general */
GtkWidget *homepage_box;
GtkWidget *homepage_list;
......@@ -990,8 +988,6 @@ prefs_dialog_class_init (PrefsDialogClass *klass)
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/epiphany/gtk/prefs-dialog.ui");
gtk_widget_class_bind_template_child (widget_class, PrefsDialog, notebook);
/* general */
gtk_widget_class_bind_template_child (widget_class, PrefsDialog, homepage_box);
gtk_widget_class_bind_template_child (widget_class, PrefsDialog, homepage_list);
......@@ -2391,8 +2387,9 @@ prefs_dialog_init (PrefsDialog *dialog)
if (mode == EPHY_EMBED_SHELL_MODE_BROWSER)
setup_sync_page (dialog);
else
gtk_notebook_remove_page (GTK_NOTEBOOK (dialog->notebook), -1);
/* FIXME What does that do? The widget should be hidden instead. */
/* else */
/* gtk_notebook_remove_page (GTK_NOTEBOOK (dialog->notebook), -1); */
ephy_gui_ensure_window_group (GTK_WINDOW (dialog));
g_signal_connect (dialog, "response",
......
......@@ -21,9 +21,24 @@
<property name="spacing">2</property>
<property name="border_width">0</property>
<child>
<object class="GtkNotebook" id="notebook">
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="show_border">False</property>
<property name="expand">True</property>
<property name="hscrollbar_policy">never</property>
<child>
<object class="HdyColumn">
<property name="visible">True</property>
<property name="maximum_width">600</property>
<property name="linear_growth_width">400</property>
<property name="margin_top">32</property>
<property name="margin_bottom">32</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
......@@ -486,15 +501,6 @@
</child>
</object>
</child>
<child type="tab">
<object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">General</property>
</object>
<packing>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
......@@ -729,16 +735,6 @@
<property name="position">1</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Fonts &amp; Style</property>
</object>
<packing>
<property name="position">1</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
......@@ -959,16 +955,6 @@
<property name="position">2</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Stored Data</property>
</object>
<packing>
<property name="position">2</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
......@@ -1220,16 +1206,6 @@
<property name="position">3</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Language</property>
</object>
<packing>
<property name="position">3</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<object class="GtkBox" id="sync_page_box">
<property name="visible">True</property>
......@@ -1546,20 +1522,15 @@
</child>
</object>
</child>
<child type="tab">
<object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Sync</property>
</object>
<packing>
<property name="tab_fill">False</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
</packing>
</child>
</object>
</child>
</object>
</child>
</object>
</child>
</template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment