[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - 2 commits - cui/uiconfig
andreas kainz (via logerrit)
logerrit at kemper.freedesktop.org
Mon Nov 18 12:34:40 UTC 2019
cui/uiconfig/ui/optonlineupdatepage.ui | 550 ++++++++++++++++---------
cui/uiconfig/ui/optviewpage.ui | 703 +++++++++++++++++----------------
2 files changed, 716 insertions(+), 537 deletions(-)
New commits:
commit f2afbe9062ef671eb3ab756bda25e4c614f1ab7d
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Mon Nov 11 22:52:37 2019 +0100
Commit: Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Mon Nov 18 13:33:50 2019 +0100
tdf#128721 Options -> View Dialog update
Change-Id: I3e769846c1dd5d57e62276a624fb209ca6bd7673
Reviewed-on: https://gerrit.libreoffice.org/82473
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
(cherry picked from commit 342a759dae8c58f2256e5aa92e1d27fd4a3601c7)
Reviewed-on: https://gerrit.libreoffice.org/83011
Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index c72eaab3eb09..188a3f9e2d09 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -15,39 +15,42 @@
<property name="halign">start</property>
<property name="valign">start</property>
<property name="border_width">6</property>
- <property name="column_spacing">12</property>
+ <property name="column_spacing">24</property>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">18</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">12</property>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkGrid" id="grid3">
+ <object class="GtkGrid" id="grid7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes" context="optviewpage|grid3|tooltip_text">Requires restart</property>
- <property name="row_spacing">6</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">6</property>
<child>
- <object class="GtkCheckButton" id="useaccel">
- <property name="label" translatable="yes" context="optviewpage|useaccel">Use hard_ware acceleration</property>
+ <object class="GtkLabel" id="label11">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="optviewpage|label11">_Positioning:</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">mousepos</property>
<property name="xalign">0</property>
- <property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -55,14 +58,13 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="useaa">
- <property name="label" translatable="yes" context="optviewpage|useaa">Use anti-a_liasing</property>
+ <object class="GtkLabel" id="label12">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="optviewpage|label12">Middle _button:</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">mousemiddle</property>
<property name="xalign">0</property>
- <property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -70,59 +72,37 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="useopengl">
- <property name="label" translatable="yes" context="optviewpage|useopengl">Use OpenGL for all rendering</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>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="forceopengl">
- <property name="label" translatable="yes" context="optviewpage|forceopengl">Ignore OpenGL blacklist</property>
+ <object class="GtkComboBoxText" id="mousepos">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes" context="optviewpage|forceopengl|tooltip_text">Requires restart. Enabling this may expose driver bugs</property>
- <property name="margin_left">12</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>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="openglenabled">
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="label" translatable="yes" context="optviewpage|openglenabled">GL is currently enabled.</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ <items>
+ <item translatable="yes" context="optviewpage|mousepos">Default button</item>
+ <item translatable="yes" context="optviewpage|mousepos">Dialog center</item>
+ <item translatable="yes" context="optviewpage|mousepos">No automatic positioning</item>
+ </items>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="opengldisabled">
+ <object class="GtkComboBoxText" id="mousemiddle">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="label" translatable="yes" context="optviewpage|opengldisabled">GL is currently disabled.</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ <items>
+ <item translatable="yes" context="optviewpage|mousemiddle">No function</item>
+ <item translatable="yes" context="optviewpage|mousemiddle">Automatic scrolling</item>
+ <item translatable="yes" context="optviewpage|mousemiddle">Paste clipboard</item>
+ </items>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
</packing>
</child>
</object>
@@ -130,10 +110,10 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optviewpage|label2">Graphics Output</property>
+ <property name="label" translatable="yes" context="optviewpage|label4">Mouse</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -142,7 +122,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
@@ -161,20 +141,20 @@
<object class="GtkGrid" id="grid8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
+ <property name="row_spacing">3</property>
<child>
<object class="GtkGrid" id="menuiconsbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes" context="optviewpage|label13">Icons in men_us:</property>
+ <property name="label" translatable="yes" context="optviewpage|label13">Menubar icons:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">menuicons</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -193,8 +173,8 @@
</items>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
@@ -207,35 +187,35 @@
<object class="GtkGrid" id="menushortcutsbpx">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
- <object class="GtkLabel" id="label10">
+ <object class="GtkComboBoxText" id="contextmenushortcuts">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes" context="optviewpage|label10">Shortcuts in context menus:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">contextmenushortcuts</property>
+ <property name="hexpand">True</property>
+ <items>
+ <item translatable="yes" context="optviewpage|contextmenushortcuts">Automatic</item>
+ <item translatable="yes" context="optviewpage|contextmenushortcuts">Hide</item>
+ <item translatable="yes" context="optviewpage|contextmenushortcuts">Show</item>
+ </items>
</object>
<packing>
- <property name="left_attach">0</property>
+ <property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="contextmenushortcuts">
+ <object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <items>
- <item translatable="yes" context="optviewpage|contextmenushortcuts">Automatic</item>
- <item translatable="yes" context="optviewpage|contextmenushortcuts">Hide</item>
- <item translatable="yes" context="optviewpage|contextmenushortcuts">Show</item>
- </items>
+ <property name="label" translatable="yes" context="optviewpage|label10">Shortcuts:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">contextmenushortcuts</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
@@ -252,7 +232,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optviewpage|label3">Menu</property>
+ <property name="label" translatable="yes" context="optviewpage|label3">Visibility</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -261,35 +241,112 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame5">
+ <object class="GtkFrame" id="frame6">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment5">
+ <object class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkGrid" id="grid9">
+ <object class="GtkGrid" id="refgrid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">6</property>
<child>
- <object class="GtkCheckButton" id="showfontpreview">
- <property name="label" translatable="yes" context="optviewpage|showfontpreview">Show p_review of fonts</property>
+ <object class="GtkComboBoxText" id="notebookbariconsize">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can_focus">False</property>
+ <items>
+ <item translatable="yes" context="optviewpage|notebookbariconsize">Automatic</item>
+ <item translatable="yes" context="optviewpage|notebookbariconsize">Small</item>
+ <item translatable="yes" context="optviewpage|notebookbariconsize">Large</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="optviewpage|label7">_Notebookbar:</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">notebookbariconsize</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="sidebariconsize">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <items>
+ <item translatable="yes" context="optviewpage|sidebariconsize">Automatic</item>
+ <item translatable="yes" context="optviewpage|sidebariconsize">Small</item>
+ <item translatable="yes" context="optviewpage|sidebariconsize">Large</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="optviewpage|label9">Sidebar:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">sidebariconsize</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="iconsize">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <items>
+ <item translatable="yes" context="optviewpage|iconsize">Automatic</item>
+ <item translatable="yes" context="optviewpage|iconsize">Small</item>
+ <item translatable="yes" context="optviewpage|iconsize">Large</item>
+ <item translatable="yes" context="optviewpage|iconsize">Extra Large</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="optviewpage|label8">Toolbar:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">iconsize</property>
<property name="xalign">0</property>
- <property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -301,10 +358,10 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label5">
+ <object class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optviewpage|label5">Font Lists</property>
+ <property name="label" translatable="yes" context="optviewpage|label1">Icon size</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -313,21 +370,9 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">1</property>
</packing>
</child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="row_spacing">18</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@@ -343,193 +388,40 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkGrid" id="grid4">
+ <object class="GtkGrid" id="refgrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
- <object class="GtkGrid" id="refgrid">
+ <object class="GtkComboBoxText" id="iconstyle">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes" context="optviewpage|label8">Toolbar 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">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="iconstyle">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <items>
- <item translatable="yes" context="optviewpage|iconstyle">Automatic</item>
- <item translatable="yes" context="optviewpage|iconstyle">Galaxy</item>
- <item translatable="yes" context="optviewpage|iconstyle">High Contrast</item>
- <item translatable="yes" context="optviewpage|iconstyle">Tango</item>
- <item translatable="yes" context="optviewpage|iconstyle">Oxygen</item>
- <item translatable="yes" context="optviewpage|iconstyle">Classic</item>
- <item translatable="yes" context="optviewpage|iconstyle">Sifr</item>
- <item translatable="yes" context="optviewpage|iconstyle">Breeze</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="iconsize">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item translatable="yes" context="optviewpage|iconsize">Automatic</item>
- <item translatable="yes" context="optviewpage|iconsize">Small</item>
- <item translatable="yes" context="optviewpage|iconsize">Large</item>
- <item translatable="yes" context="optviewpage|iconsize">Extra Large</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">0</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">start</property>
- <property name="label" translatable="yes" context="optviewpage|label6">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">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="aafont">
- <property name="label" translatable="yes" context="optviewpage|aafont">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">8</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes" context="optviewpage|label9">Sidebar _icon size:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">sidebariconsize</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="sidebariconsize">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item translatable="yes" context="optviewpage|sidebariconsize">Automatic</item>
- <item translatable="yes" context="optviewpage|sidebariconsize">Small</item>
- <item translatable="yes" context="optviewpage|sidebariconsize">Large</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes" context="optviewpage|label7">_Notebookbar icon size:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">notebookbariconsize</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="notebookbariconsize">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item translatable="yes" context="optviewpage|notebookbariconsize">Automatic</item>
- <item translatable="yes" context="optviewpage|notebookbariconsize">Small</item>
- <item translatable="yes" context="optviewpage|notebookbariconsize">Large</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">18</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="aafrom">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes" context="optviewpage|aafrom">fro_m:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">aanf</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="aanf">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="adjustment">adjustment2</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">9</property>
- </packing>
- </child>
+ <items>
+ <item translatable="yes" context="optviewpage|iconstyle">Automatic</item>
+ <item translatable="yes" context="optviewpage|iconstyle">Galaxy</item>
+ <item translatable="yes" context="optviewpage|iconstyle">High Contrast</item>
+ <item translatable="yes" context="optviewpage|iconstyle">Tango</item>
+ <item translatable="yes" context="optviewpage|iconstyle">Oxygen</item>
+ <item translatable="yes" context="optviewpage|iconstyle">Classic</item>
+ <item translatable="yes" context="optviewpage|iconstyle">Sifr</item>
+ <item translatable="yes" context="optviewpage|iconstyle">Breeze</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="optviewpage|label6">Icon s_tyle:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">iconstyle</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -544,7 +436,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optviewpage|label1">User Interface</property>
+ <property name="label" translatable="yes" context="optviewpage|label1">Icon style</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -556,34 +448,44 @@
<property name="top_attach">0</property>
</packing>
</child>
+ </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="row_spacing">12</property>
<child>
- <object class="GtkFrame" id="frame4">
+ <object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment4">
+ <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkGrid" id="grid7">
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="row_spacing">6</property>
+ <property name="tooltip_text" translatable="yes" context="optviewpage|grid3|tooltip_text">Requires restart</property>
+ <property name="row_spacing">3</property>
<child>
- <object class="GtkLabel" id="label11">
+ <object class="GtkCheckButton" id="useaccel">
+ <property name="label" translatable="yes" context="optviewpage|useaccel">Use hard_ware acceleration</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes" context="optviewpage|label11">Mouse _positioning:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">mousepos</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -591,13 +493,29 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label12">
+ <object class="GtkCheckButton" id="useaa">
+ <property name="label" translatable="yes" context="optviewpage|useaa">Use anti-a_liasing</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes" context="optviewpage|label12">Middle mouse _button:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">mousemiddle</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="useopengl">
+ <property name="label" translatable="yes" context="optviewpage|useopengl">Use OpenGL for all rendering</property>
+ <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="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -605,16 +523,107 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="mousepos">
+ <object class="GtkCheckButton" id="forceopengl">
+ <property name="label" translatable="yes" context="optviewpage|forceopengl">Ignore OpenGL blacklist</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes" context="optviewpage|forceopengl|tooltip_text">Requires restart. Enabling this may expose driver bugs</property>
+ <property name="halign">start</property>
+ <property name="margin_left">12</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="openglenabled">
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="hexpand">True</property>
- <items>
- <item translatable="yes" context="optviewpage|mousepos">Default button</item>
- <item translatable="yes" context="optviewpage|mousepos">Dialog center</item>
- <item translatable="yes" context="optviewpage|mousepos">No automatic positioning</item>
- </items>
+ <property name="margin_left">12</property>
+ <property name="label" translatable="yes" context="optviewpage|openglenabled">GL is currently enabled.</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="opengldisabled">
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">12</property>
+ <property name="label" translatable="yes" context="optviewpage|opengldisabled">GL is currently disabled.</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="optviewpage|label2">Graphics Output</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment5">
+ <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="grid9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">3</property>
+ <child>
+ <object class="GtkCheckButton" id="showfontpreview">
+ <property name="label" translatable="yes" context="optviewpage|showfontpreview">Show p_review of fonts</property>
+ <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="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="aafont">
+ <property name="label" translatable="yes" context="optviewpage|aafont">Screen font antialiasin_g</property>
+ <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="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -622,20 +631,41 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="mousemiddle">
+ <object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="hexpand">True</property>
- <items>
- <item translatable="yes" context="optviewpage|mousemiddle">No function</item>
- <item translatable="yes" context="optviewpage|mousemiddle">Automatic scrolling</item>
- <item translatable="yes" context="optviewpage|mousemiddle">Paste clipboard</item>
- </items>
+ <property name="margin_left">18</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="aafrom">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes" context="optviewpage|aafrom">fro_m:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">aanf</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="aanf">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustment2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="top_attach">2</property>
</packing>
</child>
</object>
@@ -643,10 +673,10 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label4">
+ <object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optviewpage|label4">Mouse</property>
+ <property name="label" translatable="yes" context="optviewpage|label5">Font Lists</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -660,14 +690,31 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
+ <property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>
- <object class="GtkSizeGroup" id="sizegroup1">
- <property name="ignore_hidden">True</property>
+ <object class="GtkSizeGroup" id="sizegroupLabel">
+ <widgets>
+ <widget name="label6"/>
+ <widget name="label14"/>
+ <widget name="label8"/>
+ <widget name="label9"/>
+ <widget name="label13"/>
+ <widget name="label10"/>
+ <widget name="label11"/>
+ <widget name="label12"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroupWidget">
<widgets>
+ <widget name="iconstyle"/>
+ <widget name="iconsize"/>
+ <widget name="notebookbariconsize"/>
+ <widget name="sidebariconsize"/>
+ <widget name="menuicons"/>
+ <widget name="contextmenushortcuts"/>
<widget name="mousepos"/>
<widget name="mousemiddle"/>
</widgets>
commit fce80654ccb649f2dd2778246e6b05a189b86281
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Tue Nov 12 01:00:18 2019 +0100
Commit: Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Mon Nov 18 13:33:40 2019 +0100
tdf#128725 Options Update Dialog change
Change-Id: If0fa8dddfc0c431b89fad071388f3f9c4fcb40c7
Reviewed-on: https://gerrit.libreoffice.org/82475
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
(cherry picked from commit cb1de02b1223ebe0f0e2b90c3ca5f5da630d5296)
Reviewed-on: https://gerrit.libreoffice.org/83013
Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>
diff --git a/cui/uiconfig/ui/optonlineupdatepage.ui b/cui/uiconfig/ui/optonlineupdatepage.ui
index 22986562451c..0008c2c14c74 100644
--- a/cui/uiconfig/ui/optonlineupdatepage.ui
+++ b/cui/uiconfig/ui/optonlineupdatepage.ui
@@ -10,291 +10,417 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkCheckButton" id="autocheck">
- <property name="label" translatable="yes" context="optonlineupdatepage|autocheck">_Check for updates automatically</property>
+ <object class="GtkGrid" id="grid2">
<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="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="autocheck">
+ <property name="label" translatable="yes" context="optonlineupdatepage|autocheck">_Check for updates automatically</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="halign">start</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">18</property>
+ <child>
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">0</property>
+ <child>
+ <object class="GtkRadioButton" id="everyday">
+ <property name="label" translatable="yes" context="optonlineupdatepage|everyday">Every da_y</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="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="everyweek">
+ <property name="label" translatable="yes" context="optonlineupdatepage|everyweek">Every _week</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="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">everyday</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="everymonth">
+ <property name="label" translatable="yes" context="optonlineupdatepage|everymonth">Every _month</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="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">everyday</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="checknow">
+ <property name="label" translatable="yes" context="optonlineupdatepage|checknow">Check _Now</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="valign">center</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">18</property>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="lastchecked">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="optonlineupdatepage|lastchecked">Last checked: %DATE%, %TIME%</property>
+ <property name="xalign">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="neverchecked">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="label" translatable="yes" context="optonlineupdatepage|neverchecked">Last checked: Not yet</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">2</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkGrid" id="grid2">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">6</property>
<child>
- <object class="GtkRadioButton" id="everyday">
- <property name="label" translatable="yes" context="optonlineupdatepage|everyday">Every da_y</property>
+ <object class="GtkCheckButton" id="autodownload">
+ <property name="label" translatable="yes" context="optonlineupdatepage|autodownload">_Download updates automatically</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="halign">start</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="everyweek">
- <property name="label" translatable="yes" context="optonlineupdatepage|everyweek">Every _week</property>
+ <object class="GtkAlignment">
<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">everyday</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">18</property>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkButton" id="changepath">
+ <property name="label" translatable="yes" context="optonlineupdatepage|changepath">Ch_ange...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="destpathlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="optonlineupdatepage|destpathlabel">Download destination:</property>
+ <property name="xalign">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="destpath">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="ellipsize">end</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="everymonth">
- <property name="label" translatable="yes" context="optonlineupdatepage|everymonth">Every _month</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">everyday</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="width">2</property>
</packing>
</child>
</object>
</child>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">2</property>
- </packing>
</child>
- <child>
- <object class="GtkLabel" id="lastchecked">
+ <child type="label">
+ <object class="GtkLabel" id="labeldest">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optonlineupdatepage|lastchecked">Last checked: %DATE%, %TIME%</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="checknow">
- <property name="label" translatable="yes" context="optonlineupdatepage|checknow">Check _Now</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="halign">start</property>
- <property name="use_underline">True</property>
+ <property name="label" translatable="yes" context="optonlineupdatepage|labeldest">Download Destination</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="autodownload">
- <property name="label" translatable="yes" context="optonlineupdatepage|autodownload">_Download updates automatically</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="margin_top">12</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">5</property>
- <property name="width">2</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkGrid" id="grid3">
+ <object class="GtkGrid" id="grid5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">6</property>
<child>
- <object class="GtkLabel" id="destpathlabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optonlineupdatepage|destpathlabel">Download destination:</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="changepath">
- <property name="label" translatable="yes" context="optonlineupdatepage|changepath">Ch_ange...</property>
+ <object class="GtkCheckButton" id="extrabits">
+ <property name="label" translatable="yes" context="optonlineupdatepage|extrabits">_Send OS version and basic hardware information</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="halign">start</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes" context="optonlineupdatepage|extrabits|tooltip_text">This information lets us make optimizations for your hardware and operating system.</property>
<property name="use_underline">True</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="destpath">
+ <object class="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="ellipsize">end</property>
- <property name="xalign">0</property>
+ <property name="left_padding">18</property>
+ <child>
+ <object class="GtkBox" id="hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="useragent_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="optonlineupdatepage|useragent_label">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="can_focus">False</property>
+ <property name="label" translatable="yes" context="optonlineupdatepage|useragent_changed">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>
+ <object class="GtkLabel" id="useragent">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">6</property>
- <property name="width">2</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="extrabits">
- <property name="label" translatable="yes" context="optonlineupdatepage|extrabits">_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" context="optonlineupdatepage|extrabits|tooltip_text">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>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="hbox">
+ <child type="label">
+ <object class="GtkLabel" id="labelagent">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <object class="GtkLabel" id="useragent_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optonlineupdatepage|useragent_label">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="can_focus">False</property>
- <property name="label" translatable="yes" context="optonlineupdatepage|useragent_changed">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>
- <object class="GtkLabel" id="useragent">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">8</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="neverchecked">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
- <property name="label" translatable="yes" context="optonlineupdatepage|neverchecked">Last checked: Not yet</property>
- <property name="xalign">0</property>
+ <property name="label" translatable="yes" context="optonlineupdatepage|labelagent">User Agent</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">2</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
</child>
@@ -309,10 +435,16 @@
</object>
</child>
</object>
- <object class="GtkSizeGroup" id="sizegroup1">
+ <object class="GtkSizeGroup" id="sizegroupButtons">
<widgets>
<widget name="checknow"/>
<widget name="changepath"/>
</widgets>
</object>
+ <object class="GtkSizeGroup" id="sizegroupLabel">
+ <widgets>
+ <widget name="box2"/>
+ <widget name="box1"/>
+ </widgets>
+ </object>
</interface>
More information about the Libreoffice-commits
mailing list