From 3cdee09ade878dae92ef126b9d24cf914a263e96 Mon Sep 17 00:00:00 2001
From: Jakub Melka <Mgr.Jakub.Melka@gmail.com>
Date: Sat, 16 Jul 2022 18:46:23 +0200
Subject: [PATCH] Compilation fix: Linux

---
 Pdf4QtLib/sources/pdfpagecontenteditorwidget.cpp | 15 +++++++++------
 Pdf4QtLib/sources/pdfpagecontenteditorwidget.h   |  2 ++
 Pdf4QtLib/sources/pdfpagecontenteditorwidget.ui  | 11 -----------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/Pdf4QtLib/sources/pdfpagecontenteditorwidget.cpp b/Pdf4QtLib/sources/pdfpagecontenteditorwidget.cpp
index 78cf64d..471aae8 100644
--- a/Pdf4QtLib/sources/pdfpagecontenteditorwidget.cpp
+++ b/Pdf4QtLib/sources/pdfpagecontenteditorwidget.cpp
@@ -45,6 +45,9 @@ PDFPageContentEditorWidget::PDFPageContentEditorWidget(QWidget* parent) :
         button->setIconSize(m_toolButtonIconSize);
     }
 
+    m_settingsWidget = new PDFPageContentEditorStyleSettings(this);
+    ui->appearanceLayout->addWidget(m_settingsWidget);
+
     m_operationMapper.setMapping(ui->alignVertTopButton, static_cast<int>(PDFPageContentElementManipulator::Operation::AlignTop));
     m_operationMapper.setMapping(ui->alignVertMiddleButton, static_cast<int>(PDFPageContentElementManipulator::Operation::AlignCenterVertically));
     m_operationMapper.setMapping(ui->alignVertBottomButton, static_cast<int>(PDFPageContentElementManipulator::Operation::AlignBottom));
@@ -83,11 +86,11 @@ PDFPageContentEditorWidget::PDFPageContentEditorWidget(QWidget* parent) :
     connect(&m_operationMapper, &QSignalMapper::mappedInt, this, &PDFPageContentEditorWidget::operationTriggered);
     connect(ui->itemsListWidget->selectionModel(), &QItemSelectionModel::selectionChanged, this, &PDFPageContentEditorWidget::onItemSelectionChanged);
 
-    connect(ui->appearanceSettingsWidget, &PDFPageContentEditorStyleSettings::penChanged, this, &PDFPageContentEditorWidget::penChanged);
-    connect(ui->appearanceSettingsWidget, &PDFPageContentEditorStyleSettings::brushChanged, this, &PDFPageContentEditorWidget::brushChanged);
-    connect(ui->appearanceSettingsWidget, &PDFPageContentEditorStyleSettings::fontChanged, this, &PDFPageContentEditorWidget::fontChanged);
-    connect(ui->appearanceSettingsWidget, &PDFPageContentEditorStyleSettings::alignmentChanged, this, &PDFPageContentEditorWidget::alignmentChanged);
-    connect(ui->appearanceSettingsWidget, &PDFPageContentEditorStyleSettings::textAngleChanged, this, &PDFPageContentEditorWidget::textAngleChanged);
+    connect(m_settingsWidget, &PDFPageContentEditorStyleSettings::penChanged, this, &PDFPageContentEditorWidget::penChanged);
+    connect(m_settingsWidget, &PDFPageContentEditorStyleSettings::brushChanged, this, &PDFPageContentEditorWidget::brushChanged);
+    connect(m_settingsWidget, &PDFPageContentEditorStyleSettings::fontChanged, this, &PDFPageContentEditorWidget::fontChanged);
+    connect(m_settingsWidget, &PDFPageContentEditorStyleSettings::alignmentChanged, this, &PDFPageContentEditorWidget::alignmentChanged);
+    connect(m_settingsWidget, &PDFPageContentEditorStyleSettings::textAngleChanged, this, &PDFPageContentEditorWidget::textAngleChanged);
 }
 
 PDFPageContentEditorWidget::~PDFPageContentEditorWidget()
@@ -267,7 +270,7 @@ void PDFPageContentEditorWidget::setSelection(const std::set<PDFInteger>& select
 
 void PDFPageContentEditorWidget::loadStyleFromElement(const PDFPageContentElement* element)
 {
-    ui->appearanceSettingsWidget->loadFromElement(element, false);
+    m_settingsWidget->loadFromElement(element, false);
 }
 
 }   // namespace pdf
diff --git a/Pdf4QtLib/sources/pdfpagecontenteditorwidget.h b/Pdf4QtLib/sources/pdfpagecontenteditorwidget.h
index 4e60b7a..7c9d9cd 100644
--- a/Pdf4QtLib/sources/pdfpagecontenteditorwidget.h
+++ b/Pdf4QtLib/sources/pdfpagecontenteditorwidget.h
@@ -36,6 +36,7 @@ namespace pdf
 {
 class PDFPageContentScene;
 class PDFPageContentElement;
+class PDFPageContentEditorStyleSettings;
 
 class PDF4QTLIBSHARED_EXPORT PDFPageContentEditorWidget : public QDockWidget
 {
@@ -79,6 +80,7 @@ private:
     void onItemSelectionChanged();
 
     Ui::PDFPageContentEditorWidget* ui;
+    PDFPageContentEditorStyleSettings* m_settingsWidget;
     QSignalMapper m_actionMapper;
     QSignalMapper m_operationMapper;
     int m_toolBoxColumnCount;
diff --git a/Pdf4QtLib/sources/pdfpagecontenteditorwidget.ui b/Pdf4QtLib/sources/pdfpagecontenteditorwidget.ui
index f9bdde7..2cd4430 100644
--- a/Pdf4QtLib/sources/pdfpagecontenteditorwidget.ui
+++ b/Pdf4QtLib/sources/pdfpagecontenteditorwidget.ui
@@ -177,9 +177,6 @@
        <property name="bottomMargin">
         <number>0</number>
        </property>
-       <item>
-        <widget class="pdf::PDFPageContentEditorStyleSettings" name="appearanceSettingsWidget" native="true"/>
-       </item>
       </layout>
      </widget>
     </item>
@@ -202,14 +199,6 @@
    </layout>
   </widget>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>pdf::PDFPageContentEditorStyleSettings</class>
-   <extends>QWidget</extends>
-   <header>pdfpagecontenteditorstylesettings.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>