setup: Replace GtkTable /w GtkGrid

This commit is contained in:
fujiwarat 2018-06-15 19:23:27 +09:00
Родитель ddc2284200
Коммит 37aa95f1ad
1 изменённых файлов: 41 добавлений и 72 удалений

Просмотреть файл

@ -99,11 +99,9 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkTable" id="table1">
<object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">5</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<property name="margin_top">6</property>
@ -117,8 +115,8 @@
<property name="label" translatable="yes">Next input method:</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
@ -131,10 +129,8 @@
<property name="label" translatable="yes">Previous input method:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@ -143,6 +139,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<property name="hexpand">True</property>
<child>
<object class="GtkEntry" id="entry_switch_engine">
<property name="visible">True</property>
@ -174,8 +171,7 @@
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="y_options">GTK_FILL</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
@ -184,6 +180,7 @@
<property name="no_show_all">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<property name="hexpand">True</property>
<child>
<object class="GtkEntry" id="entry_prev_engine">
> <property name="no_show_all">True</property>
@ -217,10 +214,7 @@
</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>
</packing>
</child>
<child>
@ -232,10 +226,8 @@
<property name="label" translatable="yes">Enable or disable:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@ -246,10 +238,8 @@
<property name="label" translatable="yes">Enable:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@ -258,6 +248,7 @@
<property name="no_show_all">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<property name="hexpand">True</property>
<child>
<object class="GtkEntry" id="entry_enable_unconditional">
<property name="visible">True</property>
@ -289,10 +280,7 @@
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@ -303,10 +291,8 @@
<property name="label" translatable="yes">Disable:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@ -315,6 +301,7 @@
<property name="no_show_all">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<property name="hexpand">True</property>
<child>
<object class="GtkEntry" id="entry_disable_unconditional">
<property name="visible">True</property>
@ -346,10 +333,7 @@
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
@ -376,11 +360,9 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkTable" id="table2">
<object class="GtkGrid" id="table2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">7</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<property name="margin_top">6</property>
@ -393,10 +375,11 @@
<property name="halign">start</property>
<property name="label" translatable="yes">Candidates orientation:</property>
<property name="justify">right</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
@ -404,6 +387,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">model_candidates_orientation</property>
<property name="hexpand">True</property>
<child>
<object class="GtkCellRendererText" id="renderer1"/>
<attributes>
@ -413,8 +397,7 @@
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="y_options">GTK_FILL</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
@ -425,12 +408,11 @@
<property name="halign">start</property>
<property name="label" translatable="yes">Show property panel:</property>
<property name="justify">right</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@ -440,12 +422,11 @@
<property name="halign">start</property>
<property name="label" translatable="yes">Language panel position:</property>
<property name="justify">right</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@ -453,6 +434,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">model_panel_show_mode</property>
<property name="hexpand">True</property>
<child>
<object class="GtkCellRendererText" id="renderer2"/>
<attributes>
@ -462,10 +444,7 @@
</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>
</packing>
</child>
<child>
@ -473,6 +452,7 @@
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="model">model_panel_position</property>
<property name="hexpand">True</property>
<child>
<object class="GtkCellRendererText" id="renderer3"/>
<attributes>
@ -482,10 +462,7 @@
</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>
</packing>
</child>
<child>
@ -499,13 +476,12 @@
<property name="use_action_appearance">False</property>
<property name="halign">start</property>
<property name="draw_indicator">True</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="right_attach">2</property>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="width">2</property>
</packing>
</child>
<child>
@ -519,13 +495,12 @@
<property name="use_action_appearance">False</property>
<property name="halign">start</property>
<property name="draw_indicator">True</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="right_attach">2</property>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="width">2</property>
</packing>
</child>
<child>
@ -539,13 +514,12 @@
<property name="use_action_appearance">False</property>
<property name="halign">start</property>
<property name="draw_indicator">True</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="right_attach">2</property>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="width">2</property>
</packing>
</child>
<child>
@ -559,12 +533,11 @@
<property name="use_underline">True</property>
<property name="halign">start</property>
<property name="draw_indicator">True</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@ -573,13 +546,11 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
@ -888,11 +859,9 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkTable" id="table_emoji1">
<object class="GtkGrid" id="table_emoji1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">5</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<property name="margin_top">6</property>
@ -906,8 +875,8 @@
<property name="label" translatable="yes">Emoji choice:</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
@ -916,6 +885,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<property name="hexpand">true</property>
<child>
<object class="GtkEntry" id="entry_emoji_dialog">
<property name="visible">True</property>
@ -947,8 +917,7 @@
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="y_options">GTK_FILL</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>