nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove use of Gtk.Misc ::xpad and ::ypad. Bug 713991.

Browse source
This commit is contained in:
Michael James Gratton 2016-05-21 12:39:57 +10:00 • committed by Michael Gratton
parent 7b37e264c9
commit 1886e17f38
3 changed files with 52 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/client/composer/composer-widget.vala
View file

@ -1586,8 +1586,9 @@ public class ComposerWidget : Gtk.EventBox {
Gtk.Label label = new Gtk.Label(label_text);
box.pack_start(label);
label.halign = Gtk.Align.START;
label.xpad = 4;
label.margin_start = 4;
label.margin_end = 4;
Gtk.Button remove_button = new Gtk.Button.with_mnemonic(Stock._REMOVE);
box.pack_start(remove_button, false, false);
remove_button.clicked.connect(() => remove_attachment(attachment_file, box));

69
ui/login.glade
View file

@ -56,9 +56,11 @@
<object class="GtkLabel" id="label: error">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_start">2</property>
<property name="margin_end">2</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="xalign">0</property>
<property name="xpad">2</property>
<property name="ypad">6</property>
<property name="use_markup">True</property>
</object>
<packing>
@ -116,7 +118,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="xpad">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="label" translatable="yes">E_mail address</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry: email</property>
@ -136,7 +139,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="xpad">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="label" translatable="yes">_Password</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry: password</property>
@ -169,7 +173,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="xpad">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="label" translatable="yes">S_ervice</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">combo: service</property>
@ -189,7 +194,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="xpad">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="label" translatable="yes">N_ame</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry: real_name</property>
@ -245,7 +251,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="xpad">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="label" translatable="yes">N_ickname</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry: nickname</property>
@ -340,8 +347,9 @@
<object class="GtkLabel" id="label: imap">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
<property name="xalign">0</property>
<property name="ypad">10</property>
<property name="label" translatable="yes">IMAP settings</property>
<attributes>
<attribute name="weight" value="bold"/>
@ -359,7 +367,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="xpad">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="label" translatable="yes">Se_rver</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry: imap host</property>
@ -395,7 +404,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="xpad">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="label" translatable="yes">P_ort</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry: imap port</property>
@ -465,7 +475,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="xpad">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="label" translatable="yes">Ser_ver</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry: smtp host</property>
@ -485,7 +496,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="xpad">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="label" translatable="yes">Por_t</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry: smtp port</property>
@ -505,8 +517,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">8</property>
<property name="margin_bottom">10</property>
<property name="xalign">0</property>
<property name="ypad">10</property>
<property name="label" translatable="yes">SMTP settings</property>
<attributes>
<attribute name="weight" value="bold"/>
@ -524,7 +536,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="xpad">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="label" translatable="yes">User_name</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry: smtp username</property>
@ -544,7 +557,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="xpad">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="label" translatable="yes">Pass_word</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry: smtp password</property>
@ -595,7 +609,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="xpad">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="label" translatable="yes">_Username</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry: imap username</property>
@ -615,7 +630,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="xpad">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="label" translatable="yes">_Password</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry: imap password</property>
@ -665,9 +681,10 @@
<object class="GtkLabel" id="label: imap encryption">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="margin_top">2</property>
<property name="xalign">1</property>
<property name="xpad">6</property>
<property name="label" translatable="yes">Encr_yption</property>
<property name="use_underline">True</property>
<property name="justify">center</property>
@ -688,8 +705,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">2</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="xalign">1</property>
<property name="xpad">6</property>
<property name="label" translatable="yes">Encrypt_ion</property>
<property name="use_underline">True</property>
<property name="justify">fill</property>
@ -862,10 +880,11 @@
<object class="GtkLabel" id="label: composer">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_start">4</property>
<property name="margin_end">4</property>
<property name="margin_top">8</property>
<property name="margin_bottom">6</property>
<property name="xalign">0</property>
<property name="xpad">4</property>
<property name="ypad">6</property>
<property name="label" translatable="yes">Composer</property>
<attributes>
<attribute name="weight" value="bold"/>
@ -949,10 +968,11 @@
<object class="GtkLabel" id="label: storage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_start">4</property>
<property name="margin_end">4</property>
<property name="margin_top">8</property>
<property name="margin_bottom">6</property>
<property name="xalign">0</property>
<property name="xpad">4</property>
<property name="ypad">6</property>
<property name="label" translatable="yes">Storage</property>
<attributes>
<attribute name="weight" value="bold"/>
@ -973,7 +993,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="label" translatable="yes">_Download mail</property>
<property name="use_underline">True</property>
<style>

6
ui/remove_confirm.glade
View file

@ -105,7 +105,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@ -122,7 +123,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>