Skip to content

Commit adfc260

Browse files
fitojbCaolán McNamara
fitojb
authored and
Caolán McNamara
committed
fdo#67343 Arrange Help button in a secondary group
This helps de-clutter action button groups and eases visual scanning. This patch also contains little layout tweaks where needed to separate the Help button from its neighbors when the dialog is too small. Change-Id: I56aafdaf2a5351bd7bcb4db693e520fd5c5166ce Reviewed-on: https://gerrit.libreoffice.org/13427 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]>
1 parent 68e0fb7 commit adfc260

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+269
-374
lines changed

‎basctl/uiconfig/basicide/ui/exportdialog.ui

+2
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
<property name="visible">True</property>
5454
<property name="can_focus">True</property>
5555
<property name="receives_default">True</property>
56+
<property name="margin_right">6</property>
5657
<property name="use_stock">True</property>
5758
</object>
5859
<packing>
@@ -74,6 +75,7 @@
7475
<object class="GtkGrid" id="grid3">
7576
<property name="visible">True</property>
7677
<property name="can_focus">False</property>
78+
<property name="halign">center</property>
7779
<property name="hexpand">True</property>
7880
<property name="row_spacing">6</property>
7981
<child>

‎basctl/uiconfig/basicide/ui/gotolinedialog.ui

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<property name="visible">True</property>
5353
<property name="can_focus">True</property>
5454
<property name="receives_default">True</property>
55+
<property name="margin_right">6</property>
5556
<property name="use_stock">True</property>
5657
</object>
5758
<packing>

‎basctl/uiconfig/basicide/ui/managebreakpoints.ui

+1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
<property name="visible">True</property>
8686
<property name="can_focus">True</property>
8787
<property name="receives_default">True</property>
88+
<property name="margin_right">6</property>
8889
<property name="use_stock">True</property>
8990
</object>
9091
<packing>

‎basctl/uiconfig/basicide/ui/newlibdialog.ui

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
<property name="visible">True</property>
5252
<property name="can_focus">True</property>
5353
<property name="receives_default">True</property>
54+
<property name="margin_right">6</property>
5455
<property name="use_stock">True</property>
5556
</object>
5657
<packing>

‎chart2/uiconfig/ui/3dviewdialog.ui

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- Generated with glade 3.18.3 -->
23
<interface>
3-
<!-- interface-requires gtk+ 3.0 -->
4+
<requires lib="gtk+" version="3.0"/>
45
<object class="GtkDialog" id="3DViewDialog">
56
<property name="can_focus">False</property>
67
<property name="border_width">6</property>
@@ -57,6 +58,7 @@
5758
<property name="expand">False</property>
5859
<property name="fill">True</property>
5960
<property name="position">2</property>
61+
<property name="secondary">True</property>
6062
</packing>
6163
</child>
6264
</object>

‎chart2/uiconfig/ui/attributedialog.ui

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- Generated with glade 3.18.3 -->
23
<interface>
3-
<!-- interface-requires gtk+ 3.0 -->
4+
<requires lib="gtk+" version="3.0"/>
45
<object class="GtkDialog" id="AttributeDialog">
56
<property name="can_focus">False</property>
67
<property name="border_width">6</property>
@@ -56,6 +57,7 @@
5657
<property name="expand">False</property>
5758
<property name="fill">True</property>
5859
<property name="position">3</property>
60+
<property name="secondary">True</property>
5961
</packing>
6062
</child>
6163
<child>

‎chart2/uiconfig/ui/chardialog.ui

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- Generated with glade 3.16.0 on Sat Jan 4 17:30:31 2014 -->
2+
<!-- Generated with glade 3.18.3 -->
33
<interface>
4-
<!-- interface-requires gtk+ 3.0 -->
4+
<requires lib="gtk+" version="3.0"/>
55
<object class="GtkDialog" id="CharDialog">
66
<property name="can_focus">False</property>
77
<property name="border_width">6</property>
@@ -58,6 +58,7 @@
5858
<property name="expand">False</property>
5959
<property name="fill">True</property>
6060
<property name="position">2</property>
61+
<property name="secondary">True</property>
6162
</packing>
6263
</child>
6364
<child>

‎chart2/uiconfig/ui/chartdatadialog.ui

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- Generated with glade 3.16.1 -->
2+
<!-- Generated with glade 3.18.3 -->
33
<interface>
4-
<requires lib="gtk+" version="3.0"/>
4+
<requires lib="gtk+" version="3.4"/>
55
<object class="GtkDialog" id="ChartDataDialog">
66
<property name="can_focus">False</property>
77
<property name="border_width">6</property>
@@ -58,6 +58,7 @@
5858
<property name="expand">False</property>
5959
<property name="fill">True</property>
6060
<property name="position">2</property>
61+
<property name="secondary">True</property>
6162
</packing>
6263
</child>
6364
</object>
@@ -201,8 +202,6 @@
201202
<packing>
202203
<property name="left_attach">0</property>
203204
<property name="top_attach">0</property>
204-
<property name="width">1</property>
205-
<property name="height">1</property>
206205
</packing>
207206
</child>
208207
<child>
@@ -276,8 +275,6 @@
276275
<packing>
277276
<property name="left_attach">0</property>
278277
<property name="top_attach">1</property>
279-
<property name="width">1</property>
280-
<property name="height">1</property>
281278
</packing>
282279
</child>
283280
</object>

‎chart2/uiconfig/ui/charttypedialog.ui

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- Generated with glade 3.16.1 -->
2+
<!-- Generated with glade 3.18.3 -->
33
<interface>
44
<requires lib="gtk+" version="3.0"/>
55
<object class="GtkDialog" id="ChartTypeDialog">
@@ -58,6 +58,7 @@
5858
<property name="expand">False</property>
5959
<property name="fill">True</property>
6060
<property name="position">2</property>
61+
<property name="secondary">True</property>
6162
</packing>
6263
</child>
6364
</object>

‎chart2/uiconfig/ui/datarangedialog.ui

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- Generated with glade 3.16.0 on Fri Jan 17 15:55:31 2014 -->
2+
<!-- Generated with glade 3.18.3 -->
33
<interface>
4-
<!-- interface-requires gtk+ 3.0 -->
4+
<requires lib="gtk+" version="3.0"/>
55
<object class="GtkDialog" id="DataRangeDialog">
66
<property name="can_focus">False</property>
77
<property name="border_width">6</property>
@@ -58,6 +58,7 @@
5858
<property name="expand">False</property>
5959
<property name="fill">True</property>
6060
<property name="position">2</property>
61+
<property name="secondary">True</property>
6162
</packing>
6263
</child>
6364
</object>

‎chart2/uiconfig/ui/dlg_DataLabel.ui

+3-20
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- Generated with glade 3.16.1 -->
2+
<!-- Generated with glade 3.18.3 -->
33
<interface>
44
<requires lib="gtk+" version="3.0"/>
5-
<!-- interface-requires LibreOffice 1.0 -->
5+
<requires lib="LibreOffice" version="1.0"/>
66
<object class="GtkAdjustment" id="adjustmentDEGREE">
77
<property name="upper">359</property>
88
<property name="step_increment">1</property>
@@ -152,6 +152,7 @@
152152
<property name="expand">False</property>
153153
<property name="fill">True</property>
154154
<property name="position">2</property>
155+
<property name="secondary">True</property>
155156
</packing>
156157
</child>
157158
</object>
@@ -201,8 +202,6 @@
201202
<packing>
202203
<property name="left_attach">0</property>
203204
<property name="top_attach">0</property>
204-
<property name="width">1</property>
205-
<property name="height">1</property>
206205
</packing>
207206
</child>
208207
<child>
@@ -218,8 +217,6 @@
218217
<packing>
219218
<property name="left_attach">0</property>
220219
<property name="top_attach">1</property>
221-
<property name="width">1</property>
222-
<property name="height">1</property>
223220
</packing>
224221
</child>
225222
<child>
@@ -235,8 +232,6 @@
235232
<packing>
236233
<property name="left_attach">0</property>
237234
<property name="top_attach">2</property>
238-
<property name="width">1</property>
239-
<property name="height">1</property>
240235
</packing>
241236
</child>
242237
<child>
@@ -252,8 +247,6 @@
252247
<packing>
253248
<property name="left_attach">0</property>
254249
<property name="top_attach">3</property>
255-
<property name="width">1</property>
256-
<property name="height">1</property>
257250
</packing>
258251
</child>
259252
<child>
@@ -268,8 +261,6 @@
268261
<packing>
269262
<property name="left_attach">1</property>
270263
<property name="top_attach">0</property>
271-
<property name="width">1</property>
272-
<property name="height">1</property>
273264
</packing>
274265
</child>
275266
<child>
@@ -284,8 +275,6 @@
284275
<packing>
285276
<property name="left_attach">1</property>
286277
<property name="top_attach">1</property>
287-
<property name="width">1</property>
288-
<property name="height">1</property>
289278
</packing>
290279
</child>
291280
<child>
@@ -300,8 +289,6 @@
300289
<packing>
301290
<property name="left_attach">1</property>
302291
<property name="top_attach">3</property>
303-
<property name="width">1</property>
304-
<property name="height">1</property>
305292
</packing>
306293
</child>
307294
<child>
@@ -342,7 +329,6 @@
342329
<property name="left_attach">0</property>
343330
<property name="top_attach">4</property>
344331
<property name="width">2</property>
345-
<property name="height">1</property>
346332
</packing>
347333
</child>
348334
<child>
@@ -383,7 +369,6 @@
383369
<property name="left_attach">0</property>
384370
<property name="top_attach">5</property>
385371
<property name="width">2</property>
386-
<property name="height">1</property>
387372
</packing>
388373
</child>
389374
<child>
@@ -394,8 +379,6 @@
394379
<packing>
395380
<property name="left_attach">1</property>
396381
<property name="top_attach">2</property>
397-
<property name="width">1</property>
398-
<property name="height">1</property>
399382
</packing>
400383
</child>
401384
</object>

0 commit comments

Comments
 (0)