From 40f6ab259b35502f9c687807e3520cefbe6c9919 Mon Sep 17 00:00:00 2001
From: Julien <dev@ingeoveritas.com>
Date: Wed, 1 May 2024 22:27:37 +0200
Subject: [PATCH 1/2] fix(ui): replace RDP labels in article form

---
 qtribu/gui/form_article.ui | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/qtribu/gui/form_article.ui b/qtribu/gui/form_article.ui
index d32e3d51..1f04cf0f 100644
--- a/qtribu/gui/form_article.ui
+++ b/qtribu/gui/form_article.ui
@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>801</width>
-    <height>810</height>
+    <width>589</width>
+    <height>813</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>GeoRDP - News Form</string>
+   <string>Article - Proposal form</string>
   </property>
   <property name="windowOpacity">
    <double>0.980000000000000</double>
@@ -26,6 +26,9 @@
    <bool>true</bool>
   </property>
   <layout class="QFormLayout" name="formLayout_2">
+   <item row="0" column="1">
+    <widget class="QgsMessageBar" name="msg_bar" native="true"/>
+   </item>
    <item row="4" column="0" colspan="2">
     <widget class="QGroupBox" name="grp_news">
      <property name="font">
@@ -34,7 +37,7 @@
       </font>
      </property>
      <property name="title">
-      <string>The news</string>
+      <string>The article</string>
      </property>
      <property name="flat">
       <bool>false</bool>
@@ -269,8 +272,18 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
-    <widget class="QgsMessageBar" name="msg_bar" native="true"/>
+   <item row="11" column="1">
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
    </item>
   </layout>
  </widget>

From 8221795a19e1fbfb38e39d6ce26731f97b22239d Mon Sep 17 00:00:00 2001
From: Julien <dev@ingeoveritas.com>
Date: Wed, 1 May 2024 22:28:20 +0200
Subject: [PATCH 2/2] ui(rdp): minor improvements

---
 qtribu/gui/form_rdp_news.ui | 69 +++++++++++++++----------------------
 1 file changed, 28 insertions(+), 41 deletions(-)

diff --git a/qtribu/gui/form_rdp_news.ui b/qtribu/gui/form_rdp_news.ui
index ba853083..fd54d70e 100644
--- a/qtribu/gui/form_rdp_news.ui
+++ b/qtribu/gui/form_rdp_news.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
-    <height>1156</height>
+    <width>562</width>
+    <height>1077</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -26,7 +26,23 @@
    <bool>true</bool>
   </property>
   <layout class="QFormLayout" name="formLayout_2">
-   <item row="4" column="0" colspan="2">
+   <item row="0" column="1">
+    <widget class="QgsMessageBar" name="msg_bar" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2">
     <widget class="QGroupBox" name="grp_news">
      <property name="font">
       <font>
@@ -160,8 +176,8 @@
          <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
        </widget>
       </item>
@@ -218,7 +234,7 @@ p, li { white-space: pre-wrap; }
      </layout>
     </widget>
    </item>
-   <item row="5" column="0" colspan="2">
+   <item row="4" column="0" colspan="2">
     <widget class="Line" name="line_2">
      <property name="minimumSize">
       <size>
@@ -231,7 +247,7 @@ p, li { white-space: pre-wrap; }
      </property>
     </widget>
    </item>
-   <item row="6" column="0" colspan="2">
+   <item row="5" column="0" colspan="2">
     <widget class="QGroupBox" name="grp_meta">
      <property name="title">
       <string>Publication</string>
@@ -292,7 +308,7 @@ p, li { white-space: pre-wrap; }
      </layout>
     </widget>
    </item>
-   <item row="7" column="0" colspan="2">
+   <item row="6" column="0" colspan="2">
     <widget class="Line" name="line">
      <property name="minimumSize">
       <size>
@@ -308,10 +324,10 @@ p, li { white-space: pre-wrap; }
      </property>
     </widget>
    </item>
-   <item row="8" column="1">
+   <item row="7" column="1">
     <widget class="AuthoringWidget" name="wdg_author" native="true"/>
    </item>
-   <item row="9" column="1">
+   <item row="8" column="1">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -324,7 +340,7 @@ p, li { white-space: pre-wrap; }
      </property>
     </spacer>
    </item>
-   <item row="10" column="1">
+   <item row="9" column="1">
     <widget class="QDialogButtonBox" name="btn_box">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -334,7 +350,7 @@ p, li { white-space: pre-wrap; }
      </property>
     </widget>
    </item>
-   <item row="11" column="1">
+   <item row="10" column="1">
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -347,35 +363,6 @@ p, li { white-space: pre-wrap; }
      </property>
     </spacer>
    </item>
-   <item row="0" column="1">
-    <widget class="QgsMessageBar" name="msg_bar" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
-    <spacer name="verticalSpacer_3">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <customwidgets>