Element info widget : remove the check box 'visible'

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5334 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2018-04-14 12:21:07 +00:00
parent e3930df5b5
commit 2cf181bf84
4 changed files with 12 additions and 70 deletions

View File

@@ -33,11 +33,9 @@ ElementInfoPartWidget::ElementInfoPartWidget(QString key, QString translated_key
{
ui->setupUi(this);
ui->label_->setText(translated_key);
if(key == "label") ui->checkBox->setChecked(true);
connect(ui->line_edit, &QLineEdit::textEdited, this, &ElementInfoPartWidget::textEdited);
connect(ui->line_edit, &QLineEdit::textChanged, this, &ElementInfoPartWidget::textChanged);
connect(ui->checkBox, &QCheckBox::clicked, this, &ElementInfoPartWidget::showClicked);
}
/**
@@ -66,32 +64,6 @@ QString ElementInfoPartWidget::text() const {
return (ui->line_edit->text());
}
/**
* @brief ElementInfoPartWidget::mustShow
* @return return true if the value must be show, else false
*/
bool ElementInfoPartWidget::mustShow() const {
return (ui->checkBox->isChecked());
}
/**
* @brief ElementInfoPartWidget::setShow
* Check or not the ckeck box
* @param s true-> checked
*/
void ElementInfoPartWidget::setShow(const bool &s) {
ui->checkBox->setChecked(s);
}
/**
* @brief ElementInfoPartWidget::setHideShow
* Hide or not the check box
* @param hide true -> hidden
*/
void ElementInfoPartWidget::setHideShow(const bool &hide) {
ui -> checkBox -> setHidden(hide);
}
/**
* @brief ElementInfoPartWidget::setFocusTolineEdit
* Set the focus to the line edit

View File

@@ -36,9 +36,6 @@ class ElementInfoPartWidget : public QWidget
QString key () const {return key_;}
void setText (const QString &);
QString text () const;
bool mustShow () const;
void setShow (const bool &);
void setHideShow (const bool &);
void setFocusTolineEdit();
void setEnabled(bool e);
void setDisabled(bool d);
@@ -46,7 +43,6 @@ class ElementInfoPartWidget : public QWidget
signals:
void textEdited (const QString & text);
void textChanged (const QString & text);
void showClicked (bool checked);
//ATTRIBUTES
private:

View File

@@ -48,19 +48,6 @@
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="checkBox">
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Visible</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLineEdit" name="line_edit">
<property name="clearButtonEnabled">

View File

@@ -157,11 +157,8 @@ bool ElementInfoWidget::event(QEvent *event)
*/
void ElementInfoWidget::enableLiveEdit()
{
foreach (ElementInfoPartWidget *eipw, m_eipw_list)
{
for (ElementInfoPartWidget *eipw : m_eipw_list)
connect(eipw, &ElementInfoPartWidget::textChanged, this, &ElementInfoWidget::apply);
connect(eipw, &ElementInfoPartWidget::showClicked, this, &ElementInfoWidget::apply);
}
}
/**
@@ -170,11 +167,8 @@ void ElementInfoWidget::enableLiveEdit()
*/
void ElementInfoWidget::disableLiveEdit()
{
foreach (ElementInfoPartWidget *eipw, m_eipw_list)
{
for (ElementInfoPartWidget *eipw : m_eipw_list)
disconnect(eipw, &ElementInfoPartWidget::textChanged, this, &ElementInfoWidget::apply);
disconnect(eipw, &ElementInfoPartWidget::showClicked, this, &ElementInfoWidget::apply);
}
}
/**
@@ -219,23 +213,14 @@ void ElementInfoWidget::updateUi()
if (m_live_edit) disableLiveEdit();
DiagramContext element_info = m_element->elementInformations();
foreach (ElementInfoPartWidget *eipw, m_eipw_list)
{
for (ElementInfoPartWidget *eipw : m_eipw_list) {
eipw -> setText (element_info[eipw->key()].toString());
eipw -> setShow (element_info.keyMustShow(eipw->key()));
//If the current eipw is for label or comment and the text is empty
//we force the checkbox to ckecked
if (eipw -> key() == "label" || eipw -> key() == "comment" || eipw -> key() == "location" ) {
if (element_info[eipw->key()].toString().isEmpty())
eipw->setShow(true);
}
else //< for other eipw we hide the checkbox
eipw->setHideShow(true);
}
if (m_live_edit) enableLiveEdit();
if (m_live_edit) {
enableLiveEdit();
}
}
/**
@@ -246,9 +231,11 @@ DiagramContext ElementInfoWidget::currentInfo() const
{
DiagramContext info_;
foreach (ElementInfoPartWidget *eipw, m_eipw_list)
if (!eipw->text().isEmpty()) //add value only if they're something to store
info_.addValue(eipw->key(), eipw->text(), eipw->mustShow());
for (ElementInfoPartWidget *eipw : m_eipw_list) {
if (!eipw->text().isEmpty()) { //add value only if they're something to store
info_.addValue(eipw->key(), eipw->text());
}
}
return info_;
}