svx/uiconfig/ui/sidebarparagraph.ui | 18 +--
svx/uiconfig/ui/sidebartextpanel.ui | 202 ++++++++++++++++++------------------
2 files changed, 110 insertions(+), 110 deletions(-)
New commits:
commit 7a001d3706bee453db46fb38c80c17bb84fda4af
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Oct 15 16:59:40 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Oct 15 21:13:16 2021 +0200
resave with latest glade
Change-Id: Ifbbb1e253996fdfd74ea792926b7eb9a22a5bd1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123673
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svx/uiconfig/ui/sidebartextpanel.ui
b/svx/uiconfig/ui/sidebartextpanel.ui
index d020277a8eb6..fd1a2e465e6c 100644
--- a/svx/uiconfig/ui/sidebartextpanel.ui
+++ b/svx/uiconfig/ui/sidebartextpanel.ui
@@ -1,50 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.38.2 -->
<interface domain="svx">
<requires lib="gtk+" version="3.20"/>
<!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid" id="SidebarTextPanel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
- <property name="border_width">6</property>
+ <property name="border-width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkToolbar" id="font">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
<property name="hexpand">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
+ <property name="toolbar-style">icons</property>
+ <property name="show-arrow">False</property>
<property name="icon_size">2</property>
<child>
<object class="GtkToolItem" id=".uno:CharFontName">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<child>
<object class="GtkComboBoxText" id="fontnamecombobox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
- <property name="has_entry">True</property>
- <property name="popup_fixed_width">False</property>
+ <property name="has-entry">True</property>
+ <property name="popup-fixed-width">False</property>
<child internal-child="entry">
<object class="GtkEntry">
+ <property name="can-focus">True</property>
<property name="truncate-multiline">True</property>
- <property name="can_focus">True</property>
</object>
</child>
</object>
@@ -65,23 +65,23 @@
<child>
<object class="GtkToolbar" id="fontheight">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
+ <property name="can-focus">True</property>
+ <property name="toolbar-style">icons</property>
+ <property name="show-arrow">False</property>
<property name="icon_size">2</property>
<child>
<object class="GtkToolItem" id=".uno:FontHeight">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
<object class="GtkComboBoxText" id="fontsizecombobox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_entry">True</property>
+ <property name="can-focus">False</property>
+ <property name="has-entry">True</property>
<child internal-child="entry">
<object class="GtkEntry">
+ <property name="can-focus">True</property>
<property name="truncate-multiline">True</property>
- <property name="can_focus">True</property>
</object>
</child>
</object>
@@ -96,7 +96,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
+ <property name="pack-type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -110,20 +110,20 @@
<child>
<object class="GtkBox" id="box3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkToolbar" id="fonteffects">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
+ <property name="can-focus">True</property>
+ <property name="toolbar-style">icons</property>
+ <property name="show-arrow">False</property>
<property name="icon_size">2</property>
<child>
<object class="GtkToggleToolButton" id=".uno:Bold">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -133,8 +133,8 @@
<child>
<object class="GtkToggleToolButton" id=".uno:Italic">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -144,8 +144,8 @@
<child>
<object class="GtkMenuToolButton" id=".uno:Underline">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -155,8 +155,8 @@
<child>
<object class="GtkToggleToolButton" id=".uno:Strikeout">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -166,8 +166,8 @@
<child>
<object class="GtkToggleToolButton" id=".uno:Shadowed">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -184,15 +184,15 @@
<child>
<object class="GtkToolbar" id="fontadjust">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
+ <property name="can-focus">True</property>
+ <property name="toolbar-style">icons</property>
+ <property name="show-arrow">False</property>
<property name="icon_size">2</property>
<child>
<object class="GtkToolButton" id=".uno:Grow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -202,8 +202,8 @@
<child>
<object class="GtkToolButton" id=".uno:Shrink">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -214,7 +214,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
+ <property name="pack-type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -228,20 +228,20 @@
<child>
<object class="GtkBox" id="box4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkToolbar" id="colorbar_writer">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
+ <property name="can-focus">True</property>
+ <property name="toolbar-style">icons</property>
+ <property name="show-arrow">False</property>
<property name="icon_size">2</property>
<child>
<object class="GtkMenuToolButton" id=".uno:FontColor">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -251,8 +251,8 @@
<child>
<object class="GtkMenuToolButton" id=".uno:BackColor">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -269,15 +269,15 @@
<child>
<object class="GtkToolbar" id="colorbar_others">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
+ <property name="can-focus">True</property>
+ <property name="toolbar-style">icons</property>
+ <property name="show-arrow">False</property>
<property name="icon_size">2</property>
<child>
<object class="GtkMenuToolButton" id=".uno:Color">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -294,14 +294,14 @@
<child>
<object class="GtkToolbar" id="colorbar_background">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
+ <property name="can-focus">True</property>
+ <property name="toolbar-style">icons</property>
<property name="icon_size">2</property>
<child>
<object class="GtkMenuToolButton" id=".uno:CharBackColor">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -316,17 +316,17 @@
</packing>
</child>
<child>
- <object class="GtkToolbar" id="resetattr">
+ <object class="GtkToolbar" id="defaultattr">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
+ <property name="can-focus">True</property>
+ <property name="toolbar-style">icons</property>
+ <property name="show-arrow">False</property>
<property name="icon_size">2</property>
<child>
- <object class="GtkToolButton" id=".uno:ResetAttributes">
+ <object class="GtkToolButton" id=".uno:SetDefault">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -341,17 +341,28 @@
</packing>
</child>
<child>
- <object class="GtkToolbar" id="defaultattr">
+ <object class="GtkToolbar" id="position">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
+ <property name="can-focus">True</property>
+ <property name="toolbar-style">icons</property>
+ <property name="show-arrow">False</property>
<property name="icon_size">2</property>
<child>
- <object class="GtkToolButton" id=".uno:SetDefault">
+ <object class="GtkToggleToolButton" id=".uno:SuperScript">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleToolButton" id=".uno:SubScript">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -362,32 +373,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="pack-type">end</property>
<property name="position">3</property>
</packing>
</child>
<child>
- <object class="GtkToolbar" id="position">
+ <object class="GtkToolbar" id="resetattr">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
+ <property name="can-focus">True</property>
+ <property name="toolbar-style">icons</property>
+ <property name="show-arrow">False</property>
<property name="icon_size">2</property>
<child>
- <object class="GtkToggleToolButton" id=".uno:SuperScript">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton" id=".uno:SubScript">
+ <object class="GtkToolButton" id=".uno:ResetAttributes">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -398,21 +399,20 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkToolbar" id="spacingbar">
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
+ <property name="can-focus">True</property>
+ <property name="toolbar-style">icons</property>
+ <property name="show-arrow">False</property>
<property name="icon_size">2</property>
<child>
<object class="GtkMenuToolButton" id=".uno:Spacing">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -423,7 +423,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
+ <property name="pack-type">end</property>
<property name="position">4</property>
</packing>
</child>
@@ -436,8 +436,8 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
</object>
commit f9d55bc472c2280e9dfaf0964a5cbc6af641049e
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Oct 15 16:48:53 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Oct 15 21:13:00 2021 +0200
gtk4: focus can only enter popover if its parent widget can-focus
even though the popover is a separate toplevel window.
just add can-focus for this one example first
Change-Id: I6b4b2942cdf2ed4b25b3a07d36f96c72ffc6d825
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123671
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui
b/svx/uiconfig/ui/sidebarparagraph.ui
index 553e95735eca..22fe53758c7a 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -232,7 +232,7 @@
<child>
<object class="GtkToolButton" id=".uno:ParaspaceIncrease">
<property name="visible">True</property>
- <property name="can-focus">False</property>
+ <property name="can-focus">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -243,7 +243,7 @@
<child>
<object class="GtkToolButton" id=".uno:ParaspaceDecrease">
<property name="visible">True</property>
- <property name="can-focus">False</property>
+ <property name="can-focus">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -422,7 +422,7 @@
<child>
<object class="GtkToolButton" id=".uno:IncrementIndent">
<property name="visible">True</property>
- <property name="can-focus">False</property>
+ <property name="can-focus">True</property>
<property name="tooltip-text" translatable="yes"
context="sidebarparagraph|increaseindent|tooltip_text">Increase
Indent</property>
<property name="use-underline">True</property>
</object>
@@ -434,7 +434,7 @@
<child>
<object class="GtkToolButton" id=".uno:DecrementIndent">
<property name="visible">True</property>
- <property name="can-focus">False</property>
+ <property name="can-focus">True</property>
<property name="tooltip-text" translatable="yes"
context="sidebarparagraph|decreaseindent|tooltip_text">Decrease
Indent</property>
<property name="use-underline">True</property>
</object>
@@ -446,7 +446,7 @@
<child>
<object class="GtkToolButton" id=".uno:HangingIndent">
<property name="visible">True</property>
- <property name="can-focus">False</property>
+ <property name="can-focus">True</property>
<property name="tooltip-text" translatable="yes"
context="sidebarparagraph|hangingindent|tooltip_text">Switch to Hanging
Indent</property>
<property name="use-underline">True</property>
</object>
@@ -644,7 +644,7 @@
<child>
<object class="GtkMenuToolButton" id=".uno:DefaultBullet">
<property name="visible">True</property>
- <property name="can-focus">False</property>
+ <property name="can-focus">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -655,7 +655,7 @@
<child>
<object class="GtkMenuToolButton" id=".uno:DefaultNumbering">
<property name="visible">True</property>
- <property name="can-focus">False</property>
+ <property name="can-focus">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -666,7 +666,7 @@
<child>
<object class="GtkToolButton" id=".uno:RemoveBullets">
<property name="visible">True</property>
- <property name="can-focus">False</property>
+ <property name="can-focus">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -694,7 +694,7 @@
<child>
<object class="GtkMenuToolButton" id=".uno:BackgroundColor">
<property name="visible">True</property>
- <property name="can-focus">False</property>
+ <property name="can-focus">True</property>
<property name="use-underline">True</property>
</object>
<packing>
