connectivity/registry/mork/org/openoffice/Office/DataAccess/Drivers.xcu | 2 extensions/uiconfig/sabpilot/ui/selecttypepage.ui | 339 ++++------ 2 files changed, 152 insertions(+), 189 deletions(-)
New commits: commit a3895160f7981099a800de2458a0a946d60cac17 Author: Adolfo Jayme Barrientos <[email protected]> Date: Sun Apr 22 07:33:37 2018 -0500 Iceweasel and Icedove are dead… … since 2016 and 2017, respectively. Change-Id: Ic4e501ceee198d9a802e7a5e7732fda3b899a8cb diff --git a/connectivity/registry/mork/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/mork/org/openoffice/Office/DataAccess/Drivers.xcu index ff3aa66dfbcf..08c0d22e853d 100644 --- a/connectivity/registry/mork/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/mork/org/openoffice/Office/DataAccess/Drivers.xcu @@ -23,7 +23,7 @@ <value>com.sun.star.comp.sdbc.MorkDriver</value> </prop> <prop oor:name="DriverTypeDisplayName" oor:type="xs:string"> - <value xml:lang="en-US">Thunderbird/Icedove Address Book</value> + <value xml:lang="en-US">Thunderbird Address Book</value> </prop> <node oor:name="Features"> <node oor:name="EscapeDateTime" oor:op="replace"> diff --git a/extensions/uiconfig/sabpilot/ui/selecttypepage.ui b/extensions/uiconfig/sabpilot/ui/selecttypepage.ui index be4f8856e653..c08d2b5f6ff1 100644 --- a/extensions/uiconfig/sabpilot/ui/selecttypepage.ui +++ b/extensions/uiconfig/sabpilot/ui/selecttypepage.ui @@ -80,7 +80,7 @@ This wizard helps you create the data source.</property> </child> <child> <object class="GtkRadioButton" id="firefox"> - <property name="label" translatable="yes" context="selecttypepage|firefox">Firefox/Iceweasel</property> + <property name="label" translatable="yes" context="selecttypepage|firefox">Firefox</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -96,7 +96,7 @@ This wizard helps you create the data source.</property> </child> <child> <object class="GtkRadioButton" id="thunderbird"> - <property name="label" translatable="yes" context="selecttypepage|thunderbird">Thunderbird/Icedove</property> + <property name="label" translatable="yes" context="selecttypepage|thunderbird">Thunderbird</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> commit c1eaa5215c0870a896f25880782e612fa83ccd99 Author: Adolfo Jayme Barrientos <[email protected]> Date: Sun Apr 22 07:23:23 2018 -0500 Don’t use frames to group only one set of controls Just add a simple label to them. Change-Id: I5382d521ac744a6760c572599489589f49b303d6 diff --git a/extensions/uiconfig/sabpilot/ui/selecttypepage.ui b/extensions/uiconfig/sabpilot/ui/selecttypepage.ui index 7799a836401a..be4f8856e653 100644 --- a/extensions/uiconfig/sabpilot/ui/selecttypepage.ui +++ b/extensions/uiconfig/sabpilot/ui/selecttypepage.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.22.1 --> <interface domain="pcr"> <requires lib="gtk+" version="3.18"/> <object class="GtkGrid" id="SelectTypePage"> @@ -8,208 +8,171 @@ <property name="border_width">6</property> <property name="row_spacing">12</property> <child> - <object class="GtkFrame" id="frame1"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="selecttypepage|label2">%PRODUCTNAME lets you access address data already present in your system. To do this, a %PRODUCTNAME data source will be created in which your address data is available in tabular form. + +This wizard helps you create the data source.</property> + <property name="wrap">True</property> + <property name="max_width_chars">90</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="border_width">6</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="row_spacing">6</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkRadioButton" id="evolution"> + <property name="label" translatable="yes" context="selecttypepage|evolution">Evolution</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> - <child> - <object class="GtkGrid" id="grid1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkRadioButton" id="evolution"> - <property name="label" translatable="yes" context="selecttypepage|evolution">Evolution</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="active">True</property> - <property name="draw_indicator">True</property> - <property name="group">groupwise</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="GtkRadioButton" id="groupwise"> - <property name="label" translatable="yes" context="selecttypepage|groupwise">Groupwise</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> - <property name="group">evoldap</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="GtkRadioButton" id="evoldap"> - <property name="label" translatable="yes" context="selecttypepage|evoldap">Evolution LDAP</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> - <property name="group">firefox</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="GtkRadioButton" id="firefox"> - <property name="label" translatable="yes" context="selecttypepage|firefox">Firefox/Iceweasel</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> - <property name="group">thunderbird</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="GtkRadioButton" id="thunderbird"> - <property name="label" translatable="yes" context="selecttypepage|thunderbird">Thunderbird/Icedove</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> - <property name="group">kde</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="GtkRadioButton" id="kde"> - <property name="label" translatable="yes" context="selecttypepage|kde">KDE address book</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> - <property name="group">macosx</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> - <child> - <object class="GtkRadioButton" id="macosx"> - <property name="label" translatable="yes" context="selecttypepage|macosx">Mac OS X address book</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> - <property name="group">other</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="other"> - <property name="label" translatable="yes" context="selecttypepage|other">Other external data source</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> - <property name="group">evolution</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - </object> - </child> + <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="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">groupwise</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="groupwise"> + <property name="label" translatable="yes" context="selecttypepage|groupwise">Groupwise</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> + <property name="group">evoldap</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="evoldap"> + <property name="label" translatable="yes" context="selecttypepage|evoldap">Evolution LDAP</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> + <property name="group">firefox</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="firefox"> + <property name="label" translatable="yes" context="selecttypepage|firefox">Firefox/Iceweasel</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> + <property name="group">thunderbird</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="thunderbird"> + <property name="label" translatable="yes" context="selecttypepage|thunderbird">Thunderbird/Icedove</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> + <property name="group">kde</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="kde"> + <property name="label" translatable="yes" context="selecttypepage|kde">KDE address book</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> + <property name="group">macosx</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="macosx"> + <property name="label" translatable="yes" context="selecttypepage|macosx">Mac OS X address book</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> + <property name="group">other</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="other"> + <property name="label" translatable="yes" context="selecttypepage|other">Other external data source</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> + <property name="group">evolution</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">8</property> + </packing> </child> - <child type="label"> + <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="selecttypepage|label1">Please Select the Type of Your External Address Book</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + <property name="label" translatable="yes" context="selecttypepage|label1">Select the type of your external address book:</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </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="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes" context="selecttypepage|label2">%PRODUCTNAME lets you access address data already present in your system. To do this, a %PRODUCTNAME data source will be created in which your address data is available in tabular form. - -This wizard helps you create the data source.</property> - <property name="wrap">True</property> - <property name="max_width_chars">90</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> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
