From 732bf0636fa79f7dc58ed657a97ab9cc7aa826a0 Mon Sep 17 00:00:00 2001
From: Rob Emery <git@mintsoft.net>
Date: Mon, 7 Oct 2024 20:21:29 +0100
Subject: [PATCH] Fixing rebase mangle

---
 kcm/kcm.ui | 102 +++++++++++++++++++++--------------------------------
 1 file changed, 41 insertions(+), 61 deletions(-)

diff --git a/kcm/kcm.ui b/kcm/kcm.ui
index e1590e082..d6882184b 100644
--- a/kcm/kcm.ui
+++ b/kcm/kcm.ui
@@ -47,10 +47,24 @@
       <item>
        <layout class="QHBoxLayout" name="rename_group_2">
         <item>
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+         <widget class="QLabel" name="rename_label">
+          <property name="font">
+           <font>
+            <pointsize>12</pointsize>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
           </property>
+          <property name="text">
+           <string>KDE Connect</string>
+          </property>
+          <property name="textFormat">
+           <enum>Qt::PlainText</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_2">
           <property name="sizeHint" stdset="0">
            <size>
             <width>40</width>
@@ -59,29 +73,14 @@
           </property>
          </spacer>
         </item>
-        <item>
-         <widget class="QLabel" name="rename_label">
-          <property name="font">
-           <font>
-            <pointsize>12</pointsize>
-            <bold>true</bold>
-           </font>
-          </property>
-          <property name="text">
-           <string>KDE Connect</string>
-          </property>
-          <property name="textFormat">
-           <enum>Qt::TextFormat::PlainText</enum>
-          </property>
-         </widget>
-        </item>
         <item>
          <widget class="QToolButton" name="renameShow_button">
           <property name="text">
            <string>Edit</string>
           </property>
           <property name="icon">
-           <iconset theme="edit-rename"/>
+           <iconset theme="edit-rename">
+            <normaloff>.</normaloff>.</iconset>
           </property>
          </widget>
         </item>
@@ -102,46 +101,35 @@
            <string>Save</string>
           </property>
           <property name="icon">
-           <iconset theme="dialog-ok"/>
+           <iconset theme="dialog-ok">
+            <normaloff>.</normaloff>.</iconset>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item>
-       <widget class="QListView" name="deviceList">
+       <widget class="QQuickWidget" name="list_quick_widget">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="resizeMode">
+         <enum>QQuickWidget::SizeViewToRootObject</enum>
+        </property>
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="linkProvider_label">
+       <widget class="QLabel" name="label">
         <property name="text">
-         <string>Link Providers</string>
+         <string>Backends:</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QListWidget" name="linkProviders_list">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="selectionMode">
-         <enum>QAbstractItemView::MultiSelection</enum>
-        </property>
-        <item>
-         <property name="text">
-          <string>Placeholder</string>
-         </property>
-        </item>
-       </widget>
+       <widget class="QListWidget" name="linkProviders_list"/>
       </item>
       <item>
        <widget class="QPushButton" name="refresh_button">
@@ -181,7 +169,7 @@
            </property>
            <layout class="QHBoxLayout" name="header">
             <property name="sizeConstraint">
-             <enum>QLayout::SizeConstraint::SetMaximumSize</enum>
+             <enum>QLayout::SetDefaultConstraint</enum>
             </property>
             <item>
              <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -214,6 +202,7 @@
                    <property name="font">
                     <font>
                      <pointsize>10</pointsize>
+                     <weight>75</weight>
                      <bold>true</bold>
                     </font>
                    </property>
@@ -221,7 +210,7 @@
                     <string>Device</string>
                    </property>
                    <property name="textFormat">
-                    <enum>Qt::TextFormat::PlainText</enum>
+                    <enum>Qt::PlainText</enum>
                    </property>
                   </widget>
                  </item>
@@ -240,9 +229,6 @@
                  </item>
                  <item>
                   <spacer name="horizontalSpacer_3">
-                   <property name="orientation">
-                    <enum>Qt::Orientation::Horizontal</enum>
-                   </property>
                    <property name="sizeHint" stdset="0">
                     <size>
                      <width>40</width>
@@ -260,7 +246,7 @@
                  <string>KSqueezedTextLabel</string>
                 </property>
                 <property name="textInteractionFlags">
-                 <set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
+                 <set>Qt::NoTextInteraction</set>
                 </property>
                </widget>
               </item>
@@ -268,9 +254,6 @@
             </item>
             <item>
              <spacer name="horizontalSpacer">
-              <property name="orientation">
-               <enum>Qt::Orientation::Horizontal</enum>
-              </property>
               <property name="sizeHint" stdset="0">
                <size>
                 <width>40</width>
@@ -379,7 +362,7 @@
             </sizepolicy>
            </property>
            <property name="focusPolicy">
-            <enum>Qt::FocusPolicy::WheelFocus</enum>
+            <enum>Qt::NoFocus</enum>
            </property>
           </widget>
          </item>
@@ -401,10 +384,7 @@
             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;No device selected.&lt;br&gt;&lt;br&gt;If you own an Android device, make sure to install the &lt;a href=&quot;https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;KDE Connect Android app&lt;/span&gt;&lt;/a&gt; (also available &lt;a href=&quot;https://f-droid.org/repository/browse/?fdid=org.kde.kdeconnect_tp&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;from F-Droid&lt;/span&gt;&lt;/a&gt;) and it should appear in the list. If you have an iPhone, make sure to install the &lt;a href=&quot;https://apps.apple.com/us/app/kde-connect/id1580245991&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;KDE Connect iOS app&lt;/span&gt;&lt;/a&gt; &lt;br&gt;&lt;br&gt;If you are having problems, visit the &lt;a href=&quot;https://userbase.kde.org/KDEConnect&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;KDE Connect Community wiki&lt;/span&gt;&lt;/a&gt; for help.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="textFormat">
-            <enum>Qt::TextFormat::RichText</enum>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignmentFlag::AlignCenter</set>
+            <enum>Qt::PlainText</enum>
            </property>
            <property name="wordWrap">
             <bool>true</bool>
@@ -416,7 +396,7 @@
             <bool>true</bool>
            </property>
            <property name="textInteractionFlags">
-            <set>Qt::TextInteractionFlag::LinksAccessibleByKeyboard|Qt::TextInteractionFlag::LinksAccessibleByMouse</set>
+            <set>Qt::NoTextInteraction</set>
            </property>
           </widget>
          </item>
@@ -429,6 +409,11 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>QQuickWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">QtQuickWidgets/QQuickWidget</header>
+  </customwidget>
   <customwidget>
    <class>KMessageWidget</class>
    <extends>QFrame</extends>
@@ -440,11 +425,6 @@
    <extends>QLabel</extends>
    <header>ksqueezedtextlabel.h</header>
   </customwidget>
-  <customwidget>
-   <class>QQuickWidget</class>
-   <extends>QWidget</extends>
-   <header location="global">QtQuickWidgets/QQuickWidget</header>
-  </customwidget>
   <customwidget>
    <class>KPluginWidget</class>
    <extends>QWidget</extends>