[epiphany] Kill GtkTable.
- From: Arnaud Bonatti <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Kill GtkTable.
- Date: Mon, 26 Oct 2015 05:39:14 +0000 (UTC)
commit 240fedd8309be86ab2ac02aa96413ae1ddc7bbe9
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Tue Oct 20 00:26:57 2015 +0200
Kill GtkTable.
src/resources/prefs-dialog.ui | 78 +++++++++++++++-------------------------
1 files changed, 29 insertions(+), 49 deletions(-)
---
diff --git a/src/resources/prefs-dialog.ui b/src/resources/prefs-dialog.ui
index 6f2da29..9ac792d 100644
--- a/src/resources/prefs-dialog.ui
+++ b/src/resources/prefs-dialog.ui
@@ -206,7 +206,6 @@
<property name="border_width">12</property>
<property name="orientation">vertical</property>
<property name="spacing">18</property>
- <property name="valign">start</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
@@ -235,85 +234,77 @@
</object>
</child>
<child>
- <object class="GtkTable" id="custom_fonts_table">
+ <object class="GtkGrid" id="custom_fonts_table">
<property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<property name="margin_start">12</property>
<child>
- <object class="GtkFontButton" id="sans_fontbutton">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="font">Sans 12</property>
- <property name="use_font">True</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Sans serif font:</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkFontButton" id="serif_fontbutton">
+ <object class="GtkFontButton" id="sans_fontbutton">
<property name="visible">True</property>
<property name="font">Sans 12</property>
<property name="use_font">True</property>
+ <!-- hexpands the grid -->
+ <property name="hexpand">True</property>
</object>
<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="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkFontButton" id="mono_fontbutton">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="font">Sans 12</property>
- <property name="use_font">True</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Serif font:</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel">
+ <object class="GtkFontButton" id="serif_fontbutton">
<property name="visible">True</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Sans serif font:</property>
+ <property name="font">Sans 12</property>
+ <property name="use_font">True</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Serif font:</property>
+ <property name="label" translatable="yes">Monospace font:</property>
</object>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel">
+ <object class="GtkFontButton" id="mono_fontbutton">
<property name="visible">True</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Monospace font:</property>
+ <property name="font">Sans 12</property>
+ <property name="use_font">True</property>
</object>
<packing>
+ <property name="left_attach">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
</object>
@@ -600,11 +591,9 @@
</object>
</child>
<child>
- <object class="GtkTable">
+ <object class="GtkGrid">
<property name="visible">True</property>
- <property name="n_columns">2</property>
<property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
<property name="margin_start">12</property>
<child>
<object class="GtkLabel">
@@ -612,23 +601,14 @@
<property name="halign">start</property>
<property name="label" translatable="yes">De_fault:</property>
<property name="use_underline">True</property>
- <property name="justify">center</property>
<property name="mnemonic_widget">default_encoding_combo</property>
</object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
</child>
<child>
<object class="GtkComboBox" id="default_encoding_combo">
<property name="visible">True</property>
+ <property name="hexpand">True</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
</child>
</object>
</child>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
