basctl/uiconfig/basicide/ui/defaultlanguage.ui | 157 ++++++++++++------------- basctl/uiconfig/basicide/ui/managelanguages.ui | 107 ++++++++--------- vcl/qt5/QtInstanceBuilder.cxx | 1 3 files changed, 130 insertions(+), 135 deletions(-)
New commits: commit 214817cc8861d7c1149e8d578a968550efc71665 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Feb 19 15:42:49 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Feb 20 10:06:43 2026 +0100 basctl: Resave managelanguages.ui with glade 3.40 The dialog can be triggered like this: * start Writer * "Tools" -> "Macros" -> "Edit Macros..." * "Dialog" -> "Manage Language" Change-Id: I99e2d15beb9bea58a6ad844f4fbaf576d1271655 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199733 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/basctl/uiconfig/basicide/ui/managelanguages.ui b/basctl/uiconfig/basicide/ui/managelanguages.ui index 75e9a4f46820..8813d20b04b9 100644 --- a/basctl/uiconfig/basicide/ui/managelanguages.ui +++ b/basctl/uiconfig/basicide/ui/managelanguages.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="basctl"> <requires lib="gtk+" version="3.24"/> <object class="GtkTreeStore" id="liststore1"> @@ -11,30 +11,27 @@ </columns> </object> <object class="GtkDialog" id="ManageLanguagesDialog"> - <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="can-focus">False</property> + <property name="border-width">6</property> <property name="title" translatable="yes" context="managelanguages|ManageLanguagesDialog">Manage User Interface Languages [$1]</property> <property name="resizable">False</property> <property name="modal">True</property> - <property name="type_hint">normal</property> - <child> - <placeholder/> - </child> + <property name="type-hint">normal</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> - <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" id="dialog-action_area1"> - <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="GtkButton" id="close"> <property name="label" translatable="yes" context="stock">_Close</property> <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="use-underline">True</property> </object> <packing> @@ -47,8 +44,8 @@ <object class="GtkButton" id="help"> <property name="label" translatable="yes" context="stock">_Help</property> <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="use-underline">True</property> </object> <packing> @@ -62,71 +59,71 @@ <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">0</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=3 --> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">6</property> + <property name="row-spacing">6</property> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="managelanguages|label1">Present languages:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">treeview</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">treeview</property> <property name="xalign">0</property> </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> <child> <object class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="managelanguages|label2">The default language is used if no localization for a user interface locale is present. Furthermore all strings from the default language are copied to resources of newly added languages.</property> <property name="wrap">True</property> - <property name="max_width_chars">68</property> + <property name="max-width-chars">68</property> <property name="xalign">0</property> <attributes> - <attribute name="scale" value="0.9"/> + <attribute name="scale" value="0.90000000000000002"/> </attributes> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=1 --> <object class="GtkGrid" id="grid2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="column_spacing">12</property> + <property name="column-spacing">12</property> <child> <object class="GtkButtonBox" id="buttonbox1"> <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">6</property> - <property name="layout_style">start</property> + <property name="layout-style">start</property> <child> <object class="GtkButton" id="add"> <property name="label" translatable="yes" context="managelanguages|add">Add...</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> </object> <packing> <property name="expand">False</property> @@ -138,8 +135,8 @@ <object class="GtkButton" id="delete"> <property name="label" translatable="yes" context="stock">_Delete</property> <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="use-underline">True</property> </object> <packing> @@ -152,9 +149,9 @@ <object class="GtkButton" id="default"> <property name="label" translatable="yes" context="managelanguages|default">Default</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> </object> <packing> <property name="expand">False</property> @@ -165,29 +162,29 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="shadow_type">in</property> + <property name="shadow-type">in</property> <child> <object class="GtkTreeView" id="treeview"> - <property name="width_request">-1</property> + <property name="width-request">-1</property> <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="hexpand">True</property> <property name="vexpand">True</property> <property name="model">liststore1</property> - <property name="headers_visible">False</property> - <property name="search_column">1</property> - <property name="enable_tree_lines">True</property> + <property name="headers-visible">False</property> + <property name="search-column">1</property> + <property name="enable-tree-lines">True</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="Macro Library List-selection1"/> </child> @@ -205,14 +202,14 @@ </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> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> </object> commit f8088339cf8b1d934092309265e035aa01ca834b Author: Michael Weghorn <[email protected]> AuthorDate: Thu Feb 19 15:30:09 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Feb 20 10:06:36 2026 +0100 tdf#130857 qt weld: Support BasicIDE "Add UI Languages" dialog This means that native Qt widgets are used for that dialog now when using the qt5 or qt6 VCL plugin and starting LO with environment variable SAL_VCL_QT_USE_WELDED_WIDGETS=1 set. The dialog can be triggered like this: * start Writer * "Tools" -> "Macros" -> "Edit Macros..." * "Dialog" -> "Manage Language" * press the "Add" button Change-Id: I433659c953c59e6e73845a958215ed0b1fceadef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199732 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 3940455dfaf2..6a6fe9d79114 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -135,6 +135,7 @@ constexpr auto SUPPORTED_UI_FILES = frozen::make_unordered_set<std::u16string_vi u"filter/ui/xsltfilterdialog.ui", u"fps/ui/foldernamedialog.ui", u"modules/BasicIDE/ui/colorscheme.ui", + u"modules/BasicIDE/ui/defaultlanguage.ui", u"modules/BasicIDE/ui/exportdialog.ui", u"modules/BasicIDE/ui/gotolinedialog.ui", u"modules/BasicIDE/ui/newlibdialog.ui", commit 15904eafb96991c0170d8ab454530d86dbf4897f Author: Michael Weghorn <[email protected]> AuthorDate: Thu Feb 19 15:25:53 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Feb 20 10:06:29 2026 +0100 basctl: Resave defaultlanguage.ui with glade 3.40 The dialog can be triggered like this: * start Writer * "Tools" -> "Macros" -> "Edit Macros..." * "Dialog" -> "Manage Language" * press the "Add" button Change-Id: If0cbb66c1bd483ee9d49a20ec0c827b3799118da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199731 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/basctl/uiconfig/basicide/ui/defaultlanguage.ui b/basctl/uiconfig/basicide/ui/defaultlanguage.ui index 168f2dcb5e29..6403de84ab92 100644 --- a/basctl/uiconfig/basicide/ui/defaultlanguage.ui +++ b/basctl/uiconfig/basicide/ui/defaultlanguage.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="basctl"> <requires lib="gtk+" version="3.24"/> <object class="GtkTreeStore" id="liststore1"> @@ -25,32 +25,29 @@ </columns> </object> <object class="GtkDialog" id="DefaultLanguageDialog"> - <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="can-focus">False</property> + <property name="border-width">6</property> <property name="title" translatable="yes" context="defaultlanguage|DefaultLanguageDialog">Set Default User Interface Language</property> <property name="resizable">False</property> <property name="modal">True</property> - <property name="type_hint">dialog</property> - <child> - <placeholder/> - </child> + <property name="type-hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> - <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" id="dialog-action_area1"> - <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="GtkButton" id="ok"> <property name="label" translatable="yes" context="stock">_OK</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="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-underline">True</property> </object> <packing> @@ -63,8 +60,8 @@ <object class="GtkButton" id="cancel"> <property name="label" translatable="yes" context="stock">_Cancel</property> <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="use-underline">True</property> </object> <packing> @@ -77,8 +74,8 @@ <object class="GtkButton" id="help"> <property name="label" translatable="yes" context="stock">_Help</property> <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="use-underline">True</property> </object> <packing> @@ -92,59 +89,59 @@ <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">0</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=4 --> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">12</property> + <property name="row-spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=5 --> <object class="GtkGrid" id="grid2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">6</property> + <property name="row-spacing">6</property> <child> <object class="GtkLabel" id="defaultlabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="defaultlanguage|defaultlabel">Default language:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">entries</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">entries</property> <property name="xalign">0</property> </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> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="shadow_type">in</property> + <property name="shadow-type">in</property> <child> <object class="GtkTreeView" id="entries"> - <property name="width_request">-1</property> + <property name="width-request">-1</property> <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="hexpand">True</property> <property name="vexpand">True</property> <property name="model">liststore2</property> - <property name="headers_visible">False</property> - <property name="search_column">1</property> - <property name="enable_tree_lines">True</property> + <property name="headers-visible">False</property> + <property name="search-column">1</property> + <property name="enable-tree-lines">True</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="Macro Library List-selection1"/> </child> @@ -163,27 +160,27 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkScrolledWindow"> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="shadow_type">in</property> + <property name="shadow-type">in</property> <child> <object class="GtkTreeView" id="checkedentries"> - <property name="width_request">-1</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="width-request">-1</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="model">liststore1</property> - <property name="headers_visible">False</property> - <property name="search_column">1</property> - <property name="show_expanders">False</property> + <property name="headers-visible">False</property> + <property name="search-column">1</property> + <property name="show-expanders">False</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="Macro Library List-selection2"/> </child> @@ -214,87 +211,87 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkLabel" id="checkedlabel"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="label" translatable="yes" context="defaultlanguage|checkedlabel">Available languages:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">checkedentries</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">checkedentries</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkComboBoxText" id="hidden"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="has_entry">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="has-entry">True</property> <child internal-child="entry"> <object class="GtkEntry"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> - <property name="activates_default">True</property> </object> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="left-attach">0</property> + <property name="top-attach">4</property> </packing> </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> <child> <object class="GtkLabel" id="defined"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="defaultlanguage|defined">Select a language to define the default user interface language. All currently present strings will be assigned to the resources created for the selected language.</property> <property name="wrap">True</property> - <property name="wrap_mode">word-char</property> - <property name="max_width_chars">72</property> + <property name="wrap-mode">word-char</property> + <property name="max-width-chars">72</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="added"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="label" translatable="yes" context="defaultlanguage|added">Select languages to be added. Resources for these languages will be created in the library. Strings of the current default user interface language will be copied to these new resources by default.</property> <property name="wrap">True</property> - <property name="wrap_mode">word-char</property> - <property name="max_width_chars">72</property> + <property name="wrap-mode">word-char</property> + <property name="max-width-chars">72</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkLabel" id="alttitle"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="label" translatable="yes" context="defaultlanguage|alttitle">Add User Interface Languages</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> </packing> </child> </object>
