kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: fix failure of QMetaObject::connectSlotsByName

Browse Source 
because in Qt6 QSpinBox::valueChanged(QString) and QComboBox::activated(QString) have been removed
This commit is contained in:
wmayer
2023-03-24 21:58:34 +01:00
committed by wwmayer
parent 5b5431b650
commit 21ded4a4e0
2 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Gui/DlgEditorImp.cpp
View File

@@ -88,6 +88,8 @@ DlgSettingsEditorImp::DlgSettingsEditorImp( QWidget* parent )
ui->setupUi(this);
ui->EnableFolding->hide(); // Switch off until we have an editor with folding
setupConnections();
#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
ui->textEdit1->setTabStopWidth(40);
#else
@@ -176,11 +178,30 @@ DlgSettingsEditorImp::~DlgSettingsEditorImp()
delete d;
}
void DlgSettingsEditorImp::setupConnections()
{
connect(ui->displayItems, &QTreeWidget::currentItemChanged,
this, &DlgSettingsEditorImp::onDisplayItemsCurrentItemChanged);
connect(ui->colorButton, &ColorButton::changed,
this, &DlgSettingsEditorImp::onColorButtonChanged);
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
connect(ui->fontFamily, qOverload<const QString&>(&QComboBox::activated),
this, &DlgSettingsEditorImp::onFontFamilyActivated);
connect(ui->fontSize, qOverload<const QString&>(&PrefSpinBox::valueChanged),
this, &DlgSettingsEditorImp::onFontSizeValueChanged);
#else
connect(ui->fontFamily, &QComboBox::textActivated,
this, &DlgSettingsEditorImp::onFontFamilyActivated);
connect(ui->fontSize, &PrefSpinBox::textChanged,
this, &DlgSettingsEditorImp::onFontSizeValueChanged);
#endif
}
/** Searches for the color value corresponding to \e name in current editor
* settings ColorMap and assigns it to the color button
* @see Gui::ColorButton
*/
void DlgSettingsEditorImp::on_displayItems_currentItemChanged(QTreeWidgetItem *item)
void DlgSettingsEditorImp::onDisplayItemsCurrentItemChanged(QTreeWidgetItem *item)
{
int index = ui->displayItems->indexOfTopLevelItem(item);
unsigned int col = d->colormap[index].second;
@@ -188,7 +209,7 @@ void DlgSettingsEditorImp::on_displayItems_currentItemChanged(QTreeWidgetItem *i
}
/** Updates the color map if a color was changed */
void DlgSettingsEditorImp::on_colorButton_changed()
void DlgSettingsEditorImp::onColorButtonChanged()
{
QColor col = ui->colorButton->color();
unsigned int lcol = App::Color::asPackedRGB<QColor>(col);
@@ -297,7 +318,7 @@ void DlgSettingsEditorImp::loadSettings()
if (index < 0)
index = 0;
ui->fontFamily->setCurrentIndex(index);
on_fontFamily_activated(ui->fontFamily->currentText());
onFontFamilyActivated(ui->fontFamily->currentText());
ui->displayItems->setCurrentItem(ui->displayItems->topLevelItem(0));
}
@@ -316,16 +337,16 @@ void DlgSettingsEditorImp::changeEvent(QEvent *e)
}
}
void DlgSettingsEditorImp::on_fontFamily_activated(const QString& fontFamily)
void DlgSettingsEditorImp::onFontFamilyActivated(const QString& fontFamily)
{
int fontSize = ui->fontSize->value();
QFont ft(fontFamily, fontSize);
ui->textEdit1->setFont(ft);
}
void DlgSettingsEditorImp::on_fontSize_valueChanged(const QString&)
void DlgSettingsEditorImp::onFontSizeValueChanged(const QString&)
{
on_fontFamily_activated(ui->fontFamily->currentText());
onFontFamilyActivated(ui->fontFamily->currentText());
}
#include "moc_DlgEditorImp.cpp"

11
src/Gui/DlgEditorImp.h
View File

@@ -52,11 +52,12 @@ public:
void saveSettings() override;
void loadSettings() override;
protected Q_SLOTS:
void on_displayItems_currentItemChanged(QTreeWidgetItem *i);
void on_colorButton_changed();
void on_fontFamily_activated(const QString&);
void on_fontSize_valueChanged(const QString&);
private:
void setupConnections();
void onDisplayItemsCurrentItemChanged(QTreeWidgetItem *i);
void onColorButtonChanged();
void onFontFamilyActivated(const QString&);
void onFontSizeValueChanged(const QString&);
protected:
void changeEvent(QEvent *e) override;