Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/2763 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/2763/1 various .ui fixes caught by linter tool Change-Id: Ic92ddc9550b33358a3bb0458b31a23f2c32fd46f --- M cui/uiconfig/ui/gradientpage.ui M cui/uiconfig/ui/insertfloatingframe.ui M desktop/uiconfig/ui/cmdlinehelp.ui M padmin/uiconfig/ui/printerdevicepage.ui M padmin/uiconfig/ui/printerpaperpage.ui M sw/uiconfig/swriter/ui/columnwidth.ui M sw/uiconfig/swriter/ui/documentfontspage.ui M sw/uiconfig/swriter/ui/endnotepage.ui M sw/uiconfig/swriter/ui/footnotepage.ui M sw/uiconfig/swriter/ui/formattablepage.ui M sw/uiconfig/swriter/ui/outlinenumberingpage.ui M sw/uiconfig/swriter/ui/outlinepositionpage.ui M sw/uiconfig/swriter/ui/statisticsinfopage.ui M sw/uiconfig/swriter/ui/tablecolumnpage.ui M sw/uiconfig/swriter/ui/tabletextflowpage.ui 15 files changed, 60 insertions(+), 68 deletions(-) diff --git a/cui/uiconfig/ui/gradientpage.ui b/cui/uiconfig/ui/gradientpage.ui index bea9f2e..1978aa7 100644 --- a/cui/uiconfig/ui/gradientpage.ui +++ b/cui/uiconfig/ui/gradientpage.ui @@ -10,6 +10,7 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> <child> <object class="GtkFrame" id="frame1"> @@ -283,36 +284,6 @@ </packing> </child> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> <object class="GtkLabel" id="anglemtrdegrees"> <property name="can_focus">False</property> <property name="label" translatable="yes"> degrees</property> @@ -323,6 +294,36 @@ <property name="width">1</property> <property name="height">1</property> </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> </child> </object> <packing> @@ -385,11 +386,9 @@ <child> <object class="GtkButton" id="add"> <property name="label">gtk-add</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -401,11 +400,9 @@ <child> <object class="GtkButton" id="modify"> <property name="label" translatable="yes">_Modify</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> </object> <packing> @@ -417,11 +414,9 @@ <child> <object class="GtkButton" id="delete"> <property name="label">gtk-delete</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -438,7 +433,6 @@ <property name="column_spacing">6</property> <child> <object class="GtkButton" id="load"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -447,7 +441,6 @@ <property name="tooltip_text" translatable="yes">Load Gradient List</property> <property name="halign">center</property> <property name="hexpand">True</property> - <property name="use_action_appearance">False</property> <property name="image">image1</property> </object> <packing> @@ -459,7 +452,6 @@ </child> <child> <object class="GtkButton" id="save"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -468,7 +460,6 @@ <property name="tooltip_text" translatable="yes">Save Gradient List</property> <property name="halign">center</property> <property name="hexpand">True</property> - <property name="use_action_appearance">False</property> <property name="image">image2</property> </object> <packing> diff --git a/cui/uiconfig/ui/insertfloatingframe.ui b/cui/uiconfig/ui/insertfloatingframe.ui index d147cc1..0b38c89 100644 --- a/cui/uiconfig/ui/insertfloatingframe.ui +++ b/cui/uiconfig/ui/insertfloatingframe.ui @@ -90,12 +90,10 @@ <child> <object class="GtkButton" id="buttonbrowse"> <property name="label" translatable="yes">Browse...</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="halign">end</property> - <property name="use_action_appearance">False</property> </object> <packing> <property name="left_attach">2</property> @@ -126,6 +124,7 @@ <object class="GtkAlignment" id="alignment1"> <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="GtkBox" id="box3"> @@ -135,11 +134,9 @@ <child> <object class="GtkRadioButton" id="scrollbaron"> <property name="label" translatable="yes">On</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> @@ -154,11 +151,9 @@ <child> <object class="GtkRadioButton" id="scrollbaroff"> <property name="label" translatable="yes">Off</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">scrollbarauto</property> @@ -172,11 +167,9 @@ <child> <object class="GtkRadioButton" id="scrollbarauto"> <property name="label" translatable="yes">Automatic</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">scrollbaron</property> @@ -218,6 +211,7 @@ <object class="GtkAlignment" id="alignment2"> <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="GtkBox" id="box4"> @@ -227,11 +221,9 @@ <child> <object class="GtkRadioButton" id="borderon"> <property name="label" translatable="yes">On</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> @@ -246,11 +238,9 @@ <child> <object class="GtkRadioButton" id="borderoff"> <property name="label" translatable="yes">Off</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">borderon</property> @@ -295,6 +285,7 @@ <object class="GtkAlignment" id="alignment3"> <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="grid2"> @@ -363,11 +354,9 @@ <child> <object class="GtkCheckButton" id="defaultwidth"> <property name="label" translatable="yes">Default</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -381,11 +370,9 @@ <child> <object class="GtkCheckButton" id="defaultheight"> <property name="label" translatable="yes">Default</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -439,13 +426,11 @@ <child> <object class="GtkButton" id="ok"> <property name="label">gtk-ok</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -457,11 +442,9 @@ <child> <object class="GtkButton" id="cancel"> <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -473,11 +456,9 @@ <child> <object class="GtkButton" id="help"> <property name="label">gtk-help</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> diff --git a/desktop/uiconfig/ui/cmdlinehelp.ui b/desktop/uiconfig/ui/cmdlinehelp.ui index a21e9ba..4c77147 100644 --- a/desktop/uiconfig/ui/cmdlinehelp.ui +++ b/desktop/uiconfig/ui/cmdlinehelp.ui @@ -3,7 +3,7 @@ <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="CmdLineHelp"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Help Message</property> <property name="destroy_with_parent">True</property> <property name="type_hint">dialog</property> @@ -106,14 +106,12 @@ <child> <object class="GtkButton" id="button1"> <property name="label">gtk-close</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">True</property> <property name="halign">center</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -126,6 +124,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> diff --git a/padmin/uiconfig/ui/printerdevicepage.ui b/padmin/uiconfig/ui/printerdevicepage.ui index dbd3c3f..a054891 100644 --- a/padmin/uiconfig/ui/printerdevicepage.ui +++ b/padmin/uiconfig/ui/printerdevicepage.ui @@ -6,6 +6,7 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="border_width">6</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> <property name="column_homogeneous">True</property> diff --git a/padmin/uiconfig/ui/printerpaperpage.ui b/padmin/uiconfig/ui/printerpaperpage.ui index 0ecf42c..422ba17 100644 --- a/padmin/uiconfig/ui/printerpaperpage.ui +++ b/padmin/uiconfig/ui/printerpaperpage.ui @@ -6,6 +6,7 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="border_width">6</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> <property name="column_homogeneous">True</property> diff --git a/sw/uiconfig/swriter/ui/columnwidth.ui b/sw/uiconfig/swriter/ui/columnwidth.ui index 697bfe3..0a9845a 100644 --- a/sw/uiconfig/swriter/ui/columnwidth.ui +++ b/sw/uiconfig/swriter/ui/columnwidth.ui @@ -83,7 +83,7 @@ <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">3</property> + <property name="top_padding">6</property> <property name="left_padding">12</property> <child> <object class="GtkGrid" id="grid1"> diff --git a/sw/uiconfig/swriter/ui/documentfontspage.ui b/sw/uiconfig/swriter/ui/documentfontspage.ui index 0003f47..67f2e80 100644 --- a/sw/uiconfig/swriter/ui/documentfontspage.ui +++ b/sw/uiconfig/swriter/ui/documentfontspage.ui @@ -4,16 +4,15 @@ <object class="GtkGrid" id="DocumentFontsPage"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="row_spacing">12</property> <property name="column_spacing">18</property> <child> <object class="GtkCheckButton" id="embedFonts"> <property name="label" translatable="yes">_Embed fonts in the document</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> diff --git a/sw/uiconfig/swriter/ui/endnotepage.ui b/sw/uiconfig/swriter/ui/endnotepage.ui index 1afc564..28f4af5 100644 --- a/sw/uiconfig/swriter/ui/endnotepage.ui +++ b/sw/uiconfig/swriter/ui/endnotepage.ui @@ -11,6 +11,7 @@ <object class="GtkBox" id="EndnotePage"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> @@ -23,6 +24,7 @@ <object class="GtkAlignment" id="alignment2"> <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="grid6"> @@ -183,6 +185,7 @@ <object class="GtkAlignment" id="alignment6"> <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="grid8"> @@ -274,6 +277,7 @@ <object class="GtkAlignment" id="alignment7"> <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"> diff --git a/sw/uiconfig/swriter/ui/footnotepage.ui b/sw/uiconfig/swriter/ui/footnotepage.ui index 9972ad9..bbe6e17 100644 --- a/sw/uiconfig/swriter/ui/footnotepage.ui +++ b/sw/uiconfig/swriter/ui/footnotepage.ui @@ -11,6 +11,7 @@ <object class="GtkBox" id="FootnotePage"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> <property name="spacing">13</property> <child> @@ -23,6 +24,7 @@ <object class="GtkAlignment" id="alignment1"> <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"> @@ -279,6 +281,7 @@ <object class="GtkAlignment" id="alignment4"> <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="grid3"> @@ -370,6 +373,7 @@ <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="grid4"> @@ -468,6 +472,7 @@ <object class="GtkAlignment" id="alignment3"> <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="grid5"> diff --git a/sw/uiconfig/swriter/ui/formattablepage.ui b/sw/uiconfig/swriter/ui/formattablepage.ui index 150b18d..85d0838 100644 --- a/sw/uiconfig/swriter/ui/formattablepage.ui +++ b/sw/uiconfig/swriter/ui/formattablepage.ui @@ -17,6 +17,7 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="border_width">6</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> @@ -42,6 +43,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> + <property name="top_padding">6</property> <property name="bottom_padding">6</property> <property name="left_padding">12</property> <child> diff --git a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui index 550aa26..d16f8f7 100644 --- a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui +++ b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui @@ -18,6 +18,7 @@ <property name="can_focus">False</property> <property name="margin_left">10</property> <property name="margin_right">10</property> + <property name="border_width">6</property> <child> <object class="GtkFrame" id="frame1"> <property name="visible">True</property> @@ -28,6 +29,7 @@ <object class="GtkAlignment" id="alignment1"> <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="GtkTreeView" id="level"> @@ -69,6 +71,7 @@ <object class="GtkAlignment" id="alignment2"> <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="GtkBox" id="box2"> diff --git a/sw/uiconfig/swriter/ui/outlinepositionpage.ui b/sw/uiconfig/swriter/ui/outlinepositionpage.ui index 08e19f1..de97b4b 100644 --- a/sw/uiconfig/swriter/ui/outlinepositionpage.ui +++ b/sw/uiconfig/swriter/ui/outlinepositionpage.ui @@ -19,6 +19,7 @@ <property name="margin_right">10</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="border_width">6</property> <child> <object class="GtkFrame" id="frame3"> <property name="visible">True</property> @@ -29,6 +30,7 @@ <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="GtkTreeView" id="levellb"> @@ -76,6 +78,7 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="top_padding">6</property> <property name="left_padding">12</property> <child> <object class="GtkGrid" id="grid1"> diff --git a/sw/uiconfig/swriter/ui/statisticsinfopage.ui b/sw/uiconfig/swriter/ui/statisticsinfopage.ui index 0fbae92..7034eae 100644 --- a/sw/uiconfig/swriter/ui/statisticsinfopage.ui +++ b/sw/uiconfig/swriter/ui/statisticsinfopage.ui @@ -4,6 +4,7 @@ <object class="GtkGrid" id="StatisticsInfoPage"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="row_spacing">12</property> <property name="column_spacing">18</property> <child> diff --git a/sw/uiconfig/swriter/ui/tablecolumnpage.ui b/sw/uiconfig/swriter/ui/tablecolumnpage.ui index 25da9f2..ee22c3e 100644 --- a/sw/uiconfig/swriter/ui/tablecolumnpage.ui +++ b/sw/uiconfig/swriter/ui/tablecolumnpage.ui @@ -28,6 +28,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> + <property name="border_width">6</property> <property name="row_spacing">12</property> <child> <object class="GtkCheckButton" id="adaptwidth"> diff --git a/sw/uiconfig/swriter/ui/tabletextflowpage.ui b/sw/uiconfig/swriter/ui/tabletextflowpage.ui index b31c36a..9af0800 100644 --- a/sw/uiconfig/swriter/ui/tabletextflowpage.ui +++ b/sw/uiconfig/swriter/ui/tabletextflowpage.ui @@ -59,6 +59,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> + <property name="border_width">6</property> <property name="row_spacing">5</property> <property name="column_spacing">5</property> <child> -- To view, visit https://gerrit.libreoffice.org/2763 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic92ddc9550b33358a3bb0458b31a23f2c32fd46f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jack Leigh <leigh...@gmx.se> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice