[Libreoffice-commits] core.git: cui/uiconfig sw/uiconfig
Adolfo Jayme Barrientos
fitojb at ubuntu.com
Sun Feb 21 01:47:58 UTC 2016
cui/uiconfig/ui/optadvancedpage.ui | 26 ++--
cui/uiconfig/ui/optmemorypage.ui | 41 +-----
cui/uiconfig/ui/optonlineupdatepage.ui | 21 +--
cui/uiconfig/ui/optuserpage.ui | 44 +++----
cui/uiconfig/ui/optviewpage.ui | 193 ++++++++++---------------------
sw/uiconfig/swriter/ui/mailconfigpage.ui | 52 ++++----
6 files changed, 148 insertions(+), 229 deletions(-)
New commits:
commit 943af6cd6f07c2e0ccd067f661d8dc664eea1e4b
Author: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Date: Sat Feb 20 19:40:02 2016 -0600
Options: Some layout tweaks and copyediting
Change-Id: If3b2bd1d75472b25de65670784f3508daa20857d
diff --git a/cui/uiconfig/ui/optadvancedpage.ui b/cui/uiconfig/ui/optadvancedpage.ui
index 7f15f19..eac6078 100644
--- a/cui/uiconfig/ui/optadvancedpage.ui
+++ b/cui/uiconfig/ui/optadvancedpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.19.0 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
@@ -39,8 +39,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -68,7 +68,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">_Java runtime environments (JRE) already installed:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">javas</property>
@@ -91,7 +91,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">12</property>
+ <property name="spacing">6</property>
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="add">
@@ -156,8 +156,8 @@
<object class="GtkLabel" id="vendor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Vendor</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -168,8 +168,8 @@
<object class="GtkLabel" id="version">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Version</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -180,8 +180,8 @@
<object class="GtkLabel" id="features">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Features</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -251,8 +251,8 @@
<object class="GtkLabel" id="javapath">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Location: </property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -316,8 +316,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -331,7 +331,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -341,11 +341,11 @@
</child>
<child>
<object class="GtkButton" id="expertconfig">
- <property name="label" translatable="yes">Expert Configuration</property>
+ <property name="label" translatable="yes">Open Expert Configuration</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="halign">center</property>
+ <property name="halign">end</property>
<property name="hexpand">True</property>
</object>
<packing>
@@ -361,7 +361,7 @@
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Optional Features:</property>
+ <property name="label" translatable="yes">Optional Features</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/cui/uiconfig/ui/optmemorypage.ui b/cui/uiconfig/ui/optmemorypage.ui
index 072f9b5..38953cd 100644
--- a/cui/uiconfig/ui/optmemorypage.ui
+++ b/cui/uiconfig/ui/optmemorypage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.19.0 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -51,76 +51,66 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Use for %PRODUCTNAME:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">graphiccache</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Memory per object:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">objectcache</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Remove _from memory after:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">objecttime:hh:mm</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">MB</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">MB</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -132,8 +122,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -147,8 +135,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -160,8 +146,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -173,8 +157,6 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -225,24 +207,20 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Number of objects:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">olecache</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -282,6 +260,7 @@
<object class="GtkGrid" id="grid4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="quicklaunch">
<property name="label" translatable="yes">Load %PRODUCTNAME during system start-up</property>
@@ -294,8 +273,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -310,8 +287,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/cui/uiconfig/ui/optonlineupdatepage.ui b/cui/uiconfig/ui/optonlineupdatepage.ui
index 4de1123..fca1c99 100644
--- a/cui/uiconfig/ui/optonlineupdatepage.ui
+++ b/cui/uiconfig/ui/optonlineupdatepage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.19.0 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkFrame" id="OptOnlineUpdatePage">
@@ -111,8 +111,8 @@
<object class="GtkLabel" id="lastchecked">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Last checked: %DATE%, %TIME%</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -169,8 +169,8 @@
<object class="GtkLabel" id="destpathlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Download destination:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -217,11 +217,11 @@
</child>
<child>
<object class="GtkCheckButton" id="extrabits">
- <property name="label" translatable="yes">_Send OS version & simple hardware info.</property>
- <property name="tooltip_text" translatable="yes">This information lets us optimize for your hardware & OS.</property>
+ <property name="label" translatable="yes">_Send OS version and basic hardware information</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">This information lets us make optimizations for your hardware and operating system.</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -237,29 +237,29 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">8</property>
- <property name="homogeneous">False</property>
<child>
<object class="GtkLabel" id="useragent_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="yalign">0</property>
<property name="label" translatable="yes">User Agent:</property>
+ <property name="yalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="useragent_changed">
- <property name="visible">False</property>
<property name="can_focus">False</property>
- <property name="yalign">0</property>
<property name="label" translatable="yes">Hit apply to update</property>
+ <property name="yalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -271,6 +271,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -284,8 +285,8 @@
<object class="GtkLabel" id="neverchecked">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Last checked: Not yet</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui
index 9b9ff32..29fdd45 100644
--- a/cui/uiconfig/ui/optuserpage.ui
+++ b/cui/uiconfig/ui/optuserpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.19.0 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkFrame" id="OptUserPage">
@@ -24,7 +24,7 @@
<object class="GtkLabel" id="companyft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="xalign">0</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">_Company:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">company</property>
@@ -38,7 +38,7 @@
<object class="GtkLabel" id="nameft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="xalign">0</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">First/last _name/initials:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">firstname</property>
@@ -52,7 +52,7 @@
<object class="GtkLabel" id="streetft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="xalign">0</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">_Street:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">street</property>
@@ -66,7 +66,7 @@
<object class="GtkLabel" id="cityft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="xalign">0</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">City/state/_zip:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">city</property>
@@ -80,7 +80,7 @@
<object class="GtkLabel" id="countryft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="xalign">0</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">Country/re_gion:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">country</property>
@@ -94,7 +94,7 @@
<object class="GtkLabel" id="titleft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="xalign">0</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">_Title/position:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">title</property>
@@ -108,7 +108,7 @@
<object class="GtkLabel" id="phoneft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="xalign">0</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">Telephone (home/_work):</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">home</property>
@@ -127,7 +127,7 @@
<object class="GtkLabel" id="faxft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="xalign">0</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">Fa_x/e-mail:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">fax</property>
@@ -141,7 +141,7 @@
<object class="GtkGrid" id="grid2">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="column_spacing">12</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkEntry" id="firstname">
<property name="can_focus">True</property>
@@ -206,7 +206,7 @@
<object class="GtkGrid" id="grid3">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="column_spacing">12</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkEntry" id="city">
<property name="can_focus">True</property>
@@ -272,7 +272,7 @@
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="hexpand">True</property>
- <property name="column_spacing">12</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkEntry" id="title">
<property name="can_focus">True</property>
@@ -319,7 +319,7 @@
<object class="GtkGrid" id="grid6">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="column_spacing">12</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkEntry" id="home">
<property name="can_focus">True</property>
@@ -367,7 +367,7 @@
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="hexpand">True</property>
- <property name="column_spacing">12</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkEntry" id="fax">
<property name="can_focus">True</property>
@@ -429,7 +429,7 @@
<object class="GtkLabel" id="rusnameft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="xalign">0</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">Last name/first _name/father’s name/initials:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ruslastname</property>
@@ -443,7 +443,7 @@
<object class="GtkGrid" id="grid8">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="column_spacing">12</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkEntry" id="ruslastname">
<property name="can_focus">True</property>
@@ -526,7 +526,7 @@
<object class="GtkLabel" id="eastnameft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="xalign">0</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">Last/first _name/initials:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eastlastname</property>
@@ -540,7 +540,7 @@
<object class="GtkGrid" id="grid9">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="column_spacing">12</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkEntry" id="eastlastname">
<property name="can_focus">True</property>
@@ -605,7 +605,7 @@
<object class="GtkLabel" id="russtreetft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="xalign">0</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">_Street/apartment number:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">russtreet</property>
@@ -619,7 +619,7 @@
<object class="GtkGrid" id="grid10">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="column_spacing">12</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkEntry" id="russtreet">
<property name="can_focus">True</property>
@@ -666,7 +666,7 @@
<object class="GtkLabel" id="icityft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="xalign">0</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">_Zip/city:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">izip</property>
@@ -680,7 +680,7 @@
<object class="GtkGrid" id="grid11">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="column_spacing">12</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkEntry" id="icity">
<property name="can_focus">True</property>
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index e53f0dd..c6b899a 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.19.0 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -16,13 +16,6 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkAdjustment" id="adjustment3">
- <property name="lower">10</property>
- <property name="upper">90</property>
- <property name="value">75</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
<object class="GtkGrid" id="OptViewPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -65,8 +58,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -82,8 +73,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -98,8 +87,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -109,42 +96,37 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Enabling this may expose driver bugs</property>
+ <property name="margin_left">12</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="openglenabled">
- <property name="visible">Galse</property>
<property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="label" translatable="yes">GL is currently enabled.</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Current GL status: Enabled</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="opengldisabled">
- <property name="visible">False</property>
<property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="label" translatable="yes">GL is currently disabled.</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Current GL status: Disabled</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -165,8 +147,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -197,8 +177,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -214,8 +192,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -236,8 +212,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -270,8 +244,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -292,16 +264,12 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -341,7 +309,7 @@
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">Sc_aling:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">windowsize:0%</property>
@@ -349,8 +317,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -364,41 +330,20 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Icon _size and style:</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Icon _size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">iconsize</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">2</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="iconsize">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item translatable="yes">Automatic</item>
- <item translatable="yes">Small</item>
- <item translatable="yes">Large</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -423,81 +368,86 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="aafont">
- <property name="label" translatable="yes">Screen font antialiasin_g</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="fromft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkComboBoxText" id="iconsize">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <items>
+ <item translatable="yes">Automatic</item>
+ <item translatable="yes">Small</item>
+ <item translatable="yes">Large</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Icon s_tyle:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">iconstyle</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="aafont">
+ <property name="label" translatable="yes">Screen font antialiasin_g</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
<child>
<object class="GtkLabel" id="aafrom">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">fro_m:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">aanf:0pixels</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="top_attach">4</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="aanf:0pixels">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="halign">start</property>
<property name="invisible_char">•</property>
<property name="adjustment">adjustment2</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="top_attach">4</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
@@ -516,8 +466,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -544,7 +492,7 @@
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Mouse _positioning:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">mousepos</property>
@@ -552,15 +500,13 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Middle mouse _button:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">mousemiddle</property>
@@ -568,8 +514,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -587,8 +531,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -606,8 +548,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -628,16 +568,12 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -648,4 +584,11 @@
<widget name="mousemiddle"/>
</widgets>
</object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="lower">10</property>
+ <property name="upper">90</property>
+ <property name="value">75</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
</interface>
diff --git a/sw/uiconfig/swriter/ui/mailconfigpage.ui b/sw/uiconfig/swriter/ui/mailconfigpage.ui
index 0398f69..0d45281 100644
--- a/sw/uiconfig/swriter/ui/mailconfigpage.ui
+++ b/sw/uiconfig/swriter/ui/mailconfigpage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.19.0 -->
<interface>
- <requires lib="gtk+" version="3.0"/>
+ <requires lib="gtk+" version="3.6"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
<property name="upper">65535</property>
@@ -81,7 +81,7 @@
<object class="GtkLabel" id="displayname_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">_Your name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">displayname</property>
@@ -95,7 +95,7 @@
<object class="GtkLabel" id="address_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">_E-mail address:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">address</property>
@@ -125,8 +125,7 @@
<object class="GtkLabel" id="replyto_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="xalign">0</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">_Reply address:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">replyto</property>
@@ -216,14 +215,16 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="port">
+ <object class="GtkLabel" id="server_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property name="adjustment">adjustment1</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">_Server name:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">server</property>
</object>
<packing>
- <property name="left_attach">3</property>
+ <property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
@@ -231,28 +232,27 @@
<object class="GtkLabel" id="port_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0.75</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">_Port:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">port</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="server_label">
+ <object class="GtkSpinButton" id="port">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Server name:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">server</property>
+ <property name="can_focus">True</property>
+ <property name="halign">start</property>
+ <property name="invisible_char">●</property>
+ <property name="adjustment">adjustment1</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
</packing>
</child>
</object>
@@ -265,13 +265,13 @@
<object class="GtkButtonBox" id="buttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">center</property>
+ <property name="halign">start</property>
<property name="margin_right">12</property>
<property name="orientation">vertical</property>
<property name="layout_style">center</property>
<child>
<object class="GtkButton" id="serverauthentication">
- <property name="label" translatable="yes">Server Au_thentication</property>
+ <property name="label" translatable="yes">Ser_ver Authentication…</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -314,12 +314,12 @@
<object class="GtkButtonBox" id="buttonbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">center</property>
+ <property name="halign">end</property>
<property name="orientation">vertical</property>
<property name="layout_style">center</property>
<child>
<object class="GtkButton" id="test">
- <property name="label" translatable="yes">Test S_ettings...</property>
+ <property name="label" translatable="yes">_Test Settings</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
More information about the Libreoffice-commits
mailing list