cui/uiconfig/ui/additionsdialog.ui | 110 +++++++++++++++++--------------------
vcl/qt5/QtBuilder.cxx | 6 +-
2 files changed, 56 insertions(+), 60 deletions(-)
New commits:
commit d45f2087c76563c3b085d356b23fbae82fb24b5b
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Jun 23 22:13:02 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Jun 24 08:02:03 2025 +0200
tdf#130857 cui: Don't use multiple names for same radio menu group
In the .ui file for the dialog that can e.g. be triggered
from Writer using "Tools" -> "Language" ->
"More Dictionaries Online...", use the ID of the first
GtkRadioMenuItem of the radio group and set the "group"
property on the other GtkRadioMenuItems belonging to
the same group. Don't set the "group" property on the
menu item that is the first in the group to the ID
of another item of the same group. That isn't necessary
and not handled in QtBuilder.
Change-Id: I954c5aeb97e1175041e4d8cae84d69fe18d8acf1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186862
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/cui/uiconfig/ui/additionsdialog.ui
b/cui/uiconfig/ui/additionsdialog.ui
index 9c1a9f09697e..901a1f5cd635 100644
--- a/cui/uiconfig/ui/additionsdialog.ui
+++ b/cui/uiconfig/ui/additionsdialog.ui
@@ -33,7 +33,6 @@
<property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|gear_textOnly">Voting</property>
<property name="draw-as-radio">True</property>
- <property name="group">gear_sort_downloads</property>
</object>
</child>
<child>
@@ -72,7 +71,6 @@
<property name="use-underline">True</property>
<property name="active">True</property>
<property name="draw-as-radio">True</property>
- <property name="group">gear_condensedList</property>
</object>
</child>
<child>
commit ec371490e4265b97fecad974adbc20694ba9c358
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Jun 23 22:12:23 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Jun 24 08:01:55 2025 +0200
tdf#130857 qt weld: Implement support for "GtkCheckMenuItem"
Change-Id: Ia438ba6f3c8effa54050fe6dae1b53245720ba37
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186861
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/vcl/qt5/QtBuilder.cxx b/vcl/qt5/QtBuilder.cxx
index 541130ab72a6..0aa9a415083b 100644
--- a/vcl/qt5/QtBuilder.cxx
+++ b/vcl/qt5/QtBuilder.cxx
@@ -691,7 +691,11 @@ void QtBuilder::insertMenuObject(QMenu* pParent, QMenu*
pSubMenu, const OUString
const OUString sActionName(extractActionName(rProps));
QtInstanceMenu::setActionName(*pAction, sActionName);
- if (rClass == u"GtkMenuItem")
+ if (rClass == u"GtkCheckMenuItem")
+ {
+ pAction->setCheckable(true);
+ }
+ else if (rClass == u"GtkMenuItem")
{
// nothing else to do
}
commit 704bb1e6d66c00239b7b3d1c61b9bc84e42fbdc0
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Jun 23 21:58:07 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Jun 24 08:01:49 2025 +0200
cui: Resave additionsdialog.ui with glade 3.40
The dialog can e.g. be triggered from Writer using
"Tools" -> "Language" -> "More Dictionaries Online...".
Change-Id: If04e9575971c59d4e0ecdd828b03ad43f6a430e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186860
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/cui/uiconfig/ui/additionsdialog.ui
b/cui/uiconfig/ui/additionsdialog.ui
index 16476affe672..9c1a9f09697e 100644
--- a/cui/uiconfig/ui/additionsdialog.ui
+++ b/cui/uiconfig/ui/additionsdialog.ui
@@ -1,56 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="cui">
<requires lib="gtk+" version="3.20"/>
<object class="GtkMenu" id="additionsmenu">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
<object class="GtkCheckMenuItem" id="gear_activeVersionOnly">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="customanimationfragment|90">Active version only</property>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="gear_separator1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="sort">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="bulletandposition|gallery">Sort by</property>
<child type="submenu">
<object class="GtkMenu" id="sortSubMenu">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
<object class="GtkRadioMenuItem" id="gear_sort_voting">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|gear_textOnly">Voting</property>
- <property name="draw_as_radio">True</property>
+ <property name="draw-as-radio">True</property>
<property name="group">gear_sort_downloads</property>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="gear_sort_downloads">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|gear_textOnly">Downloads</property>
- <property name="draw_as_radio">True</property>
+ <property name="draw-as-radio">True</property>
<property name="group">gear_sort_voting</property>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="gear_sort_comments">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|gear_textOnly">Comments</property>
- <property name="draw_as_radio">True</property>
+ <property name="draw-as-radio">True</property>
<property name="group">gear_sort_voting</property>
</object>
</child>
@@ -61,64 +61,64 @@
<child>
<object class="GtkSeparatorMenuItem" id="gear_separator2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="gear_detailView">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|gear_iconAndText">Detail view</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
<property name="active">True</property>
- <property name="draw_as_radio">True</property>
+ <property name="draw-as-radio">True</property>
<property name="group">gear_condensedList</property>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="gear_condensedList">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|gear_iconAndText">Condensed list</property>
- <property name="draw_as_radio">True</property>
+ <property name="draw-as-radio">True</property>
<property name="group">gear_detailView</property>
</object>
</child>
</object>
<object class="GtkImage" id="imageGear">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">open-menu-symbolic</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">open-menu-symbolic</property>
</object>
<object class="GtkDialog" id="AdditionsDialog">
- <property name="width_request">550</property>
- <property name="height_request">600</property>
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
+ <property name="width-request">550</property>
+ <property name="height-request">600</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">6</property>
<property name="title" translatable="yes"
context="additionsdialog|AdditionsDialog">Additions</property>
<property name="modal">True</property>
- <property name="default_width">300</property>
- <property name="default_height">400</property>
- <property name="type_hint">dialog</property>
+ <property name="default-width">300</property>
+ <property name="default-height">400</property>
+ <property name="type-hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
+ <property name="can-focus">False</property>
+ <property name="layout-style">end</property>
<child>
<object class="GtkBox">
- <property name="width_request">200</property>
+ <property name="width-request">200</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="labelProgress">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes"
context="additionsdialog|ProgressLabel">Progress Label</property>
<child internal-child="accessible">
@@ -147,8 +147,8 @@
<property name="label" translatable="yes"
context="stock">_Close</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="valign">end</property>
<property name="use-underline">True</property>
</object>
@@ -168,20 +168,20 @@
<child>
<object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkBox">
<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="GtkEntry" id="entrySearch">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="max_length">50</property>
- <property name="max_width_chars">50</property>
+ <property name="can-focus">True</property>
+ <property name="max-length">50</property>
+ <property name="max-width-chars">50</property>
<property name="truncate-multiline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="entrySearch-atkobject">
@@ -199,14 +199,14 @@
<child>
<object class="GtkMenuButton" id="buttonGear">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="halign">end</property>
<property name="margin-start">1</property>
<property name="image">imageGear</property>
- <property name="always_show_image">True</property>
+ <property name="always-show-image">True</property>
<property name="popup">additionsmenu</property>
- <property name="use_popover">False</property>
+ <property name="use-popover">False</property>
<child internal-child="accessible">
<object class="AtkObject" id="buttonGear-atkobject">
<property name="AtkObject::accessible-name"
translatable="yes" context="additionsdialog|buttonGear">Gear Menu</property>
@@ -230,25 +230,22 @@
<child>
<object class="GtkScrolledWindow" id="contentWindow">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="shadow_type">in</property>
+ <property name="can-focus">True</property>
+ <property name="hscrollbar-policy">never</property>
+ <property name="shadow-type">in</property>
<child>
<object class="GtkViewport">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
<!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid" id="contentGrid">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <placeholder/>
- </child>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
<child>
<placeholder/>
</child>
@@ -275,8 +272,5 @@
<action-widgets>
<action-widget response="-7">buttonClose</action-widget>
</action-widgets>
- <child type="titlebar">
- <placeholder/>
- </child>
</object>
</interface>
