Compilation fix: Linux

This commit is contained in:
Jakub Melka 2022-07-16 18:46:23 +02:00
parent f1be3a7ec0
commit 3cdee09ade
3 changed files with 11 additions and 17 deletions

View File

@ -45,6 +45,9 @@ PDFPageContentEditorWidget::PDFPageContentEditorWidget(QWidget* parent) :
button->setIconSize(m_toolButtonIconSize); 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->alignVertTopButton, static_cast<int>(PDFPageContentElementManipulator::Operation::AlignTop));
m_operationMapper.setMapping(ui->alignVertMiddleButton, static_cast<int>(PDFPageContentElementManipulator::Operation::AlignCenterVertically)); m_operationMapper.setMapping(ui->alignVertMiddleButton, static_cast<int>(PDFPageContentElementManipulator::Operation::AlignCenterVertically));
m_operationMapper.setMapping(ui->alignVertBottomButton, static_cast<int>(PDFPageContentElementManipulator::Operation::AlignBottom)); 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(&m_operationMapper, &QSignalMapper::mappedInt, this, &PDFPageContentEditorWidget::operationTriggered);
connect(ui->itemsListWidget->selectionModel(), &QItemSelectionModel::selectionChanged, this, &PDFPageContentEditorWidget::onItemSelectionChanged); connect(ui->itemsListWidget->selectionModel(), &QItemSelectionModel::selectionChanged, this, &PDFPageContentEditorWidget::onItemSelectionChanged);
connect(ui->appearanceSettingsWidget, &PDFPageContentEditorStyleSettings::penChanged, this, &PDFPageContentEditorWidget::penChanged); connect(m_settingsWidget, &PDFPageContentEditorStyleSettings::penChanged, this, &PDFPageContentEditorWidget::penChanged);
connect(ui->appearanceSettingsWidget, &PDFPageContentEditorStyleSettings::brushChanged, this, &PDFPageContentEditorWidget::brushChanged); connect(m_settingsWidget, &PDFPageContentEditorStyleSettings::brushChanged, this, &PDFPageContentEditorWidget::brushChanged);
connect(ui->appearanceSettingsWidget, &PDFPageContentEditorStyleSettings::fontChanged, this, &PDFPageContentEditorWidget::fontChanged); connect(m_settingsWidget, &PDFPageContentEditorStyleSettings::fontChanged, this, &PDFPageContentEditorWidget::fontChanged);
connect(ui->appearanceSettingsWidget, &PDFPageContentEditorStyleSettings::alignmentChanged, this, &PDFPageContentEditorWidget::alignmentChanged); connect(m_settingsWidget, &PDFPageContentEditorStyleSettings::alignmentChanged, this, &PDFPageContentEditorWidget::alignmentChanged);
connect(ui->appearanceSettingsWidget, &PDFPageContentEditorStyleSettings::textAngleChanged, this, &PDFPageContentEditorWidget::textAngleChanged); connect(m_settingsWidget, &PDFPageContentEditorStyleSettings::textAngleChanged, this, &PDFPageContentEditorWidget::textAngleChanged);
} }
PDFPageContentEditorWidget::~PDFPageContentEditorWidget() PDFPageContentEditorWidget::~PDFPageContentEditorWidget()
@ -267,7 +270,7 @@ void PDFPageContentEditorWidget::setSelection(const std::set<PDFInteger>& select
void PDFPageContentEditorWidget::loadStyleFromElement(const PDFPageContentElement* element) void PDFPageContentEditorWidget::loadStyleFromElement(const PDFPageContentElement* element)
{ {
ui->appearanceSettingsWidget->loadFromElement(element, false); m_settingsWidget->loadFromElement(element, false);
} }
} // namespace pdf } // namespace pdf

View File

@ -36,6 +36,7 @@ namespace pdf
{ {
class PDFPageContentScene; class PDFPageContentScene;
class PDFPageContentElement; class PDFPageContentElement;
class PDFPageContentEditorStyleSettings;
class PDF4QTLIBSHARED_EXPORT PDFPageContentEditorWidget : public QDockWidget class PDF4QTLIBSHARED_EXPORT PDFPageContentEditorWidget : public QDockWidget
{ {
@ -79,6 +80,7 @@ private:
void onItemSelectionChanged(); void onItemSelectionChanged();
Ui::PDFPageContentEditorWidget* ui; Ui::PDFPageContentEditorWidget* ui;
PDFPageContentEditorStyleSettings* m_settingsWidget;
QSignalMapper m_actionMapper; QSignalMapper m_actionMapper;
QSignalMapper m_operationMapper; QSignalMapper m_operationMapper;
int m_toolBoxColumnCount; int m_toolBoxColumnCount;

View File

@ -177,9 +177,6 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item>
<widget class="pdf::PDFPageContentEditorStyleSettings" name="appearanceSettingsWidget" native="true"/>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -202,14 +199,6 @@
</layout> </layout>
</widget> </widget>
</widget> </widget>
<customwidgets>
<customwidget>
<class>pdf::PDFPageContentEditorStyleSettings</class>
<extends>QWidget</extends>
<header>pdfpagecontenteditorstylesettings.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>