Add mailmergeconfigurewidget.ui

agents/mailmergeagent/CMakeLists.txt

@@ -17,6 +17,8 @@ ecm_qt_declare_logging_category(mailmergeagent HEADER mailmergeagent_debug.h IDE
 
 qt_add_dbus_adaptor(mailmergeagent_SRCS org.freedesktop.Akonadi.MailMergeAgent.xml mailmergeagent.h MailMergeAgent)
 
+ki18n_wrap_ui(mailmergeagent_SRCS ui/mailmergeconfigurewidget.ui)
+
 target_sources(mailmergeagent PRIVATE
     mailmergeagent.cpp
     mailmergemanager.cpp

agents/mailmergeagent/mailmergeconfigurewidget.cpp

@@ -5,13 +5,14 @@
 */
 
 #include "mailmergeconfigurewidget.h"
+#include "ui_mailmergeconfigurewidget.h"
 #include <QVBoxLayout>
 
 MailMergeConfigureWidget::MailMergeConfigureWidget(QWidget *parent)
     : QWidget(parent)
 {
-    auto mainLayout = new QVBoxLayout(this);
-    mainLayout->setObjectName(QStringLiteral("mainLayout"));
+    mWidget = new Ui::MailMergeConfigureWidget;
+    mWidget->setupUi(this);
 }
 
 MailMergeConfigureWidget::~MailMergeConfigureWidget()

agents/mailmergeagent/mailmergeconfigurewidget.h

@@ -7,6 +7,10 @@
 #pragma once
 
 #include <QWidget>
+namespace Ui
+{
+class MailMergeConfigureWidget;
+};
 
 class MailMergeConfigureWidget : public QWidget
 {
@@ -14,4 +18,7 @@ class MailMergeConfigureWidget : public QWidget
 public:
     explicit MailMergeConfigureWidget(QWidget *parent = nullptr);
     ~MailMergeConfigureWidget() override;
+
+private:
+    Ui::MailMergeConfigureWidget *mWidget = nullptr;
 };

agents/mailmergeagent/ui/mailmergeconfigurewidget.ui

+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MailMergeConfigureWidget</class>
+ <widget class="QWidget" name="MailMergeConfigureWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>681</width>
+    <height>634</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item row="0" column="1">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="QPushButton" name="modifyItem">
+       <property name="text">
+        <string>Modify...</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="removeItem">
+       <property name="text">
+        <string>Remove</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="verticalSpacer">
+       <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>
+   </item>
+   <item row="0" column="0">
+    <widget class="PimCommon::CustomTreeView" name="treeWidget">
+     <column>
+      <property name="text">
+       <string notr="true">1</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>PimCommon::CustomTreeView</class>
+   <extends>QTreeWidget</extends>
+   <header>PimCommon/CustomTreeView</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>