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

Minor GUI improvement

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5092 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2017-11-06 16:17:48 +00:00
parent 33bc4e1072
commit d2d1b74fad
4 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sources/ui/compositetexteditdialog.cpp
View File

@@ -84,3 +84,14 @@ void CompositeTextEditDialog::on_m_info_cb_activated(const QString &arg1)
Q_UNUSED(arg1) Q_UNUSED(arg1)
ui->m_plain_text_edit->insertPlainText(ui->m_info_cb->currentData().toString()); ui->m_plain_text_edit->insertPlainText(ui->m_info_cb->currentData().toString());
} }
/**
* @brief CompositeTextEditDialog::focusInEvent
* Reimplemented from QWidget::focusInEvent
* @param event
*/
void CompositeTextEditDialog::focusInEvent(QFocusEvent *event)
{
ui->m_plain_text_edit->setFocus();
QDialog::focusInEvent(event);
}

3
sources/ui/compositetexteditdialog.h
View File

@@ -29,6 +29,9 @@ class CompositeTextEditDialog : public QDialog
private slots: private slots:
void on_m_info_cb_activated(const QString &arg1); void on_m_info_cb_activated(const QString &arg1);
protected:
void focusInEvent(QFocusEvent *event) override;
private : private :
void setUpComboBox(); void setUpComboBox();
QString infoToVar(const QString& info) const; QString infoToVar(const QString& info) const;

8
sources/ui/dynamicelementtextmodel.cpp
View File

@@ -563,6 +563,7 @@ QWidget *DynamicTextItemDelegate::createEditor(QWidget *parent, const QStyleOpti
case DynamicElementTextModel::textFrom: case DynamicElementTextModel::textFrom:
{ {
QComboBox *qcb = new QComboBox(parent); QComboBox *qcb = new QComboBox(parent);
qcb->setObjectName("text_from");
qcb->addItem(tr("Texte utilisateur")); qcb->addItem(tr("Texte utilisateur"));
qcb->addItem(tr("Information de l'élément")); qcb->addItem(tr("Information de l'élément"));
qcb->addItem(tr("Texte composé")); qcb->addItem(tr("Texte composé"));
@@ -716,6 +717,13 @@ bool DynamicTextItemDelegate::eventFilter(QObject *object, QEvent *event)
emit commitData(sb); emit commitData(sb);
} }
//Like the hack above, change the current index of the combobox, apply the change immediately, no need to lose focus or press enter.
if((object->objectName() == "text_from" || object->objectName() == "info_text") && event->type() == QEvent::FocusIn)
{
QComboBox *qcb = static_cast<QComboBox *>(object);
connect(qcb, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [this,qcb](){emit commitData(qcb);});
}
return QStyledItemDelegate::eventFilter(object, event); return QStyledItemDelegate::eventFilter(object, event);
} }

2
sources/ui/dynamicelementtextmodel.h
View File

@@ -73,6 +73,8 @@ class DynamicElementTextModel : public QStandardItemModel
class DynamicTextItemDelegate : public QStyledItemDelegate class DynamicTextItemDelegate : public QStyledItemDelegate
{ {
Q_OBJECT
public: public:
DynamicTextItemDelegate(QObject *parent = Q_NULLPTR); DynamicTextItemDelegate(QObject *parent = Q_NULLPTR);