svtools/uiconfig/ui/placeedit.ui |  220 +++++++++++++++++++--------------------
 vcl/qt5/QtInstanceBuilder.cxx    |    1 
 2 files changed, 111 insertions(+), 110 deletions(-)

New commits:
commit 3352e449e43304af26d361130fd93b65ee88ef31
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Aug 1 16:47:28 2025 +0200
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Aug 2 09:16:57 2025 +0200

    tdf#130857 Define widgets in "File Services" dialog in order
    
    Switch the order in which the widgets in the .ui file
    are defined so that the order matches the visual appearance
    and logical order, which makes sure that tab focus order with the
    Qt-based VCL plugins is correct as well when using native Qt
    widgets (SAL_VCL_QT_USE_WELDED_WIDGETS=1), where
    focus order is (by default) based on widget creation order.
    
    See
    
        commit 02692566ad9fc7c3484f8581ffa0004cd4e43987
        Author: Michael Weghorn <m.wegh...@posteo.de>
        Date:   Thu Oct 24 17:43:35 2024 +0200
    
            tdf#130857 optnewdictionarydialog.ui: Define focusable widgets in 
order
    
    for more background.
    
    This dialog can be triggered as follows:
    
    * "File" -> "Open Remote"
    * "Manage Services" -> "Add service"
    
    Change-Id: If2a2131a793a3a2a790ad4dd16d685017e9ae164
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188778
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/svtools/uiconfig/ui/placeedit.ui b/svtools/uiconfig/ui/placeedit.ui
index 197bd014ed54..ecb5c66e18b6 100644
--- a/svtools/uiconfig/ui/placeedit.ui
+++ b/svtools/uiconfig/ui/placeedit.ui
@@ -163,30 +163,73 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="pathLabel">
+              <object class="GtkBox" id="HostDetails">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes" 
context="placeedit|pathLabel">Root:</property>
-                <property name="use-underline">True</property>
-                <property name="mnemonic-widget">path</property>
-                <property name="xalign">0</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkEntry" id="host">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="activates-default">True</property>
+                    <property name="truncate-multiline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="portLabel">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes" 
context="placeedit|portLabel">Port:</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">port</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="port">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="activates-default">True</property>
+                    <property name="text">0</property>
+                    <property name="truncate-multiline">True</property>
+                    <property name="adjustment">adjustment1</property>
+                    <property name="numeric">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
               </object>
               <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">8</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="path">
-                <property name="visible">True</property>
+              <object class="GtkCheckButton" id="webdavs">
+                <property name="label" translatable="yes" 
context="placeedit|webdavs">Secure connection</property>
                 <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
                 <property name="hexpand">True</property>
-                <property name="activates-default">True</property>
-                <property name="truncate-multiline">True</property>
+                <property name="use-underline">True</property>
+                <property name="draw-indicator">True</property>
               </object>
               <packing>
                 <property name="left-attach">1</property>
-                <property name="top-attach">8</property>
+                <property name="top-attach">1</property>
               </packing>
             </child>
             <child>
@@ -216,34 +259,6 @@
                 <property name="top-attach">2</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkLabel" id="repositoryLabel">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="label" translatable="yes" 
context="placeedit|repositoryLabel">Repository:</property>
-                <property name="use-underline">True</property>
-                <property name="mnemonic-widget">repositories</property>
-                <property name="xalign">0</property>
-              </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">6</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="webdavs">
-                <property name="label" translatable="yes" 
context="placeedit|webdavs">Secure connection</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">False</property>
-                <property name="hexpand">True</property>
-                <property name="use-underline">True</property>
-                <property name="draw-indicator">True</property>
-              </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkLabel" id="loginLabel">
                 <property name="visible">True</property>
@@ -272,86 +287,57 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="nameLabel">
+              <object class="GtkLabel" id="passwordLabel">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes" 
context="placeedit|nameLabel">Label:</property>
-                <property name="use-underline">True</property>
-                <property name="mnemonic-widget">name</property>
+                <property name="label" translatable="yes" 
context="placeedit|passwordLabel">Password:</property>
+                <property name="mnemonic-widget">password</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
-                <property name="top-attach">7</property>
+                <property name="top-attach">4</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="name">
+              <object class="GtkEntry" id="password">
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
-                <property name="hexpand">True</property>
+                <property name="visibility">False</property>
                 <property name="activates-default">True</property>
                 <property name="truncate-multiline">True</property>
               </object>
               <packing>
                 <property name="left-attach">1</property>
-                <property name="top-attach">7</property>
+                <property name="top-attach">4</property>
               </packing>
             </child>
             <child>
-              <object class="GtkBox" id="HostDetails">
+              <object class="GtkCheckButton" id="rememberPassword">
+                <property name="label" translatable="yes" 
context="placeedit|rememberPassword">Remember password</property>
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkEntry" id="host">
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="hexpand">True</property>
-                    <property name="activates-default">True</property>
-                    <property name="truncate-multiline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="portLabel">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="placeedit|portLabel">Port:</property>
-                    <property name="use-underline">True</property>
-                    <property name="mnemonic-widget">port</property>
-                    <property name="xalign">0</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" id="port">
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="activates-default">True</property>
-                    <property name="text">0</property>
-                    <property name="truncate-multiline">True</property>
-                    <property name="adjustment">adjustment1</property>
-                    <property name="numeric">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-underline">True</property>
+                <property name="draw-indicator">True</property>
               </object>
               <packing>
                 <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
+                <property name="top-attach">5</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="repositoryLabel">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" 
context="placeedit|repositoryLabel">Repository:</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">repositories</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">6</property>
               </packing>
             </child>
             <child>
@@ -392,43 +378,57 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="passwordLabel">
+              <object class="GtkLabel" id="nameLabel">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes" 
context="placeedit|passwordLabel">Password:</property>
-                <property name="mnemonic-widget">password</property>
+                <property name="label" translatable="yes" 
context="placeedit|nameLabel">Label:</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">name</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
-                <property name="top-attach">4</property>
+                <property name="top-attach">7</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="password">
+              <object class="GtkEntry" id="name">
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
-                <property name="visibility">False</property>
+                <property name="hexpand">True</property>
                 <property name="activates-default">True</property>
                 <property name="truncate-multiline">True</property>
               </object>
               <packing>
                 <property name="left-attach">1</property>
-                <property name="top-attach">4</property>
+                <property name="top-attach">7</property>
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="rememberPassword">
-                <property name="label" translatable="yes" 
context="placeedit|rememberPassword">Remember password</property>
+              <object class="GtkLabel" id="pathLabel">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">False</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" 
context="placeedit|pathLabel">Root:</property>
                 <property name="use-underline">True</property>
-                <property name="draw-indicator">True</property>
+                <property name="mnemonic-widget">path</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">8</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="path">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="activates-default">True</property>
+                <property name="truncate-multiline">True</property>
               </object>
               <packing>
                 <property name="left-attach">1</property>
-                <property name="top-attach">5</property>
+                <property name="top-attach">8</property>
               </packing>
             </child>
             <child>
commit 6fd87d50d96dafb520fb50b2a98c4b44ab62ec66
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Aug 1 16:37:36 2025 +0200
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Aug 2 09:16:47 2025 +0200

    tdf#130857 qt weld: Support File Services 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.
    
    This dialog can be triggered as follows:
    
    * "File" -> "Open Remote"
    * "Manage Services" -> "Add service"
    
    Change-Id: I76af9a925903218dbc612532c06857837395b317
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188777
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index 75f056f4c14c..dfa42e9cfd3b 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -170,6 +170,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& 
rUIFile, const weld::W
         u"sfx/ui/versioncommentdialog.ui"_ustr,
         u"sfx/ui/versionsofdialog.ui"_ustr,
         u"svt/ui/addresstemplatedialog.ui"_ustr,
+        u"svt/ui/placeedit.ui"_ustr,
         u"svt/ui/printersetupdialog.ui"_ustr,
         u"svt/ui/restartdialog.ui"_ustr,
         u"svx/ui/compressgraphicdialog.ui"_ustr,

Reply via email to