kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 20:50:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

DynamicElementTextModel : change the way how to display the QFontDialog use for change the font of the dynamic text.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5805 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2019-03-20 20:38:58 +00:00
parent d18751b9a6
commit 69dfb598d3
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sources/ui/dynamicelementtextmodel.cpp
View File

@@ -1527,9 +1527,16 @@ QWidget *DynamicTextItemDelegate::createEditor(QWidget *parent, const QStyleOpti
} }
case DynamicElementTextModel::font: case DynamicElementTextModel::font:
{ {
QFontDialog *fd = new QFontDialog(index.data(Qt::UserRole+2).value<QFont>(), parent); bool ok;
fd->setObjectName("font_dialog"); QFont font = QFontDialog::getFont(&ok, index.data(Qt::UserRole+2).value<QFont>(), parent);
return fd; QWidget *w = new QWidget(parent);
if (ok)
{
w->setFont(font);
w->setProperty("ok", ok);
}
w->setObjectName("font_dialog");
return w;
} }
case DynamicElementTextModel::color: case DynamicElementTextModel::color:
{ {
@@ -1617,17 +1624,10 @@ void DynamicTextItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *
{ {
if(QStandardItem *qsi = qsim->itemFromIndex(index)) if(QStandardItem *qsi = qsim->itemFromIndex(index))
{ {
QFontDialog *fd = static_cast<QFontDialog *>(editor); if (editor->property("ok").toBool() == true)
if (fd->result() == QDialog::Accepted)
{ {
//qsi->setData(fd->selectedFont().family(), Qt::EditRole); qsi->setData(editor->font().family(), Qt::EditRole);
//qsi->setData(fd->selectedFont(), Qt::UserRole+2); qsi->setData(editor->font(), Qt::UserRole+2);
/**For unknow reason, call selectedFont doesn't work,
* (always return the same font, no matter what you select)
* Instead we use curentFont
**/
qsi->setData(fd->currentFont().family(), Qt::EditRole);
qsi->setData(fd->currentFont(), Qt::UserRole+2);
} }
return; return;
} }