diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-11-14 21:19:30 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-11-15 20:14:10 +0100 |
commit | 15377223043d4430ebf49eefe0f00a736908d02d (patch) | |
tree | 0907eb53c6d27c089d83ea7b4f570158da7b4933 /reportdesign/uiconfig/dbreport | |
parent | 8a92373a20dfce8112e45bd80f0f6c927224ff98 (diff) |
add <!-- n-columns=1 n-rows=1 --> before every GtkGrid
for a in `git ls-files '*.ui'`; do sed -i 's/^\( *\)\(<object class="GtkGrid".*\)/\1<!-- n-columns=1 n-rows=1 -->\n\1\2/' $a; done
so we get the same behavior in glade as before 3.38 in that the grid preview
don't show any unoccupied grid squares
replace all existing n-columns=X n-rows=Y lines because they are
all wrong, except for
cui/uiconfig/ui/additionsfragment.ui
sw/uiconfig/swriter/ui/pageheaderpanel.ui
sw/uiconfig/swriter/ui/pagefooterpanel.ui
which are correct.
Change-Id: I401bbe8e098c26e7f57d6a872d3b70fc1ce85a00
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105846
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'reportdesign/uiconfig/dbreport')
8 files changed, 22 insertions, 0 deletions
diff --git a/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui b/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui index a9f17b904f83..3bcec597e1ff 100644 --- a/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui @@ -98,6 +98,7 @@ <property name="scrollable">True</property> <property name="enable_popup">True</property> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/reportdesign/uiconfig/dbreport/ui/chardialog.ui b/reportdesign/uiconfig/dbreport/ui/chardialog.ui index dc76f1d29023..282e9b31d772 100644 --- a/reportdesign/uiconfig/dbreport/ui/chardialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/chardialog.ui @@ -98,6 +98,7 @@ <property name="scrollable">True</property> <property name="enable_popup">True</property> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -141,6 +142,7 @@ </packing> </child> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -188,6 +190,7 @@ </packing> </child> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -235,6 +238,7 @@ </packing> </child> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -282,6 +286,7 @@ </packing> </child> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -329,6 +334,7 @@ </packing> </child> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/reportdesign/uiconfig/dbreport/ui/conditionwin.ui b/reportdesign/uiconfig/dbreport/ui/conditionwin.ui index 61fdc5a3fbb4..8fab16b56c80 100644 --- a/reportdesign/uiconfig/dbreport/ui/conditionwin.ui +++ b/reportdesign/uiconfig/dbreport/ui/conditionwin.ui @@ -32,6 +32,7 @@ </packing> </child> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -81,6 +82,7 @@ </packing> </child> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -132,6 +134,7 @@ </packing> </child> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -353,6 +356,7 @@ </packing> </child> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/reportdesign/uiconfig/dbreport/ui/datetimedialog.ui b/reportdesign/uiconfig/dbreport/ui/datetimedialog.ui index 9f8df937f6cb..b4228da10ac9 100644 --- a/reportdesign/uiconfig/dbreport/ui/datetimedialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/datetimedialog.ui @@ -80,6 +80,7 @@ </packing> </child> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/reportdesign/uiconfig/dbreport/ui/floatingfield.ui b/reportdesign/uiconfig/dbreport/ui/floatingfield.ui index 2e6392acc017..d45fc655aa62 100644 --- a/reportdesign/uiconfig/dbreport/ui/floatingfield.ui +++ b/reportdesign/uiconfig/dbreport/ui/floatingfield.ui @@ -42,6 +42,7 @@ </packing> </child> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="container"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/reportdesign/uiconfig/dbreport/ui/floatingsort.ui b/reportdesign/uiconfig/dbreport/ui/floatingsort.ui index d977b5645f51..7365038f450d 100644 --- a/reportdesign/uiconfig/dbreport/ui/floatingsort.ui +++ b/reportdesign/uiconfig/dbreport/ui/floatingsort.ui @@ -38,6 +38,7 @@ </packing> </child> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -61,6 +62,7 @@ <property name="top_padding">6</property> <property name="left_padding">12</property> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -68,6 +70,7 @@ <property name="vexpand">True</property> <property name="row_spacing">6</property> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -195,6 +198,7 @@ <property name="top_padding">6</property> <property name="left_padding">12</property> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/reportdesign/uiconfig/dbreport/ui/pagedialog.ui b/reportdesign/uiconfig/dbreport/ui/pagedialog.ui index ed5562b4a5c3..d0b0deaa80e9 100644 --- a/reportdesign/uiconfig/dbreport/ui/pagedialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/pagedialog.ui @@ -98,6 +98,7 @@ <property name="scrollable">True</property> <property name="enable_popup">True</property> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -141,6 +142,7 @@ </packing> </child> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui b/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui index f703bc27da88..086f7e52d490 100644 --- a/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui @@ -93,6 +93,7 @@ <property name="top_padding">6</property> <property name="left_padding">12</property> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -170,6 +171,7 @@ <property name="top_padding">6</property> <property name="left_padding">12</property> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -248,6 +250,7 @@ <property name="top_padding">6</property> <property name="left_padding">12</property> <child> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> |