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

Small improvements to the PropertyLink editor

Browse Source 
* The "Edit" link is now a button, same as the Placement editor
* Added a "None" entry on top of the Link dialog
This commit is contained in:
Yorik van Havre
2017-04-17 23:00:14 -03:00
parent 63f77dec59
commit 7e487f0fee
3 changed files with 60 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Gui/DlgPropertyLink.cpp
View File

@@ -84,6 +84,8 @@ QStringList DlgPropertyLink::propertyLink() const
QStringList list = link;
list[1] = items[0]->data(Qt::UserRole).toString();
list[2] = items[0]->text();
if (list[1].isEmpty())
list[2] = QString::fromUtf8("");
return list;
}
}
@@ -126,6 +128,12 @@ void DlgPropertyLink::findObjects(bool on)
outList.push_back(par);
}
// Add a "None" entry on top
QListWidgetItem* item = new QListWidgetItem(ui->listWidget);
item->setText(tr("None (Remove link)"));
QByteArray ba("");
item->setData(Qt::UserRole, ba);
std::vector<App::DocumentObject*> obj = doc->getObjectsOfType(baseType);
for (std::vector<App::DocumentObject*>::iterator it = obj.begin(); it != obj.end(); ++it) {
Gui::ViewProvider* vp = Gui::Application::Instance->getViewProvider(*it);

66
src/Gui/propertyeditor/PropertyItem.cpp
View File

@@ -34,6 +34,7 @@
# include <QTimer>
# include <QApplication>
# include <QPalette>
# include <QtGlobal>
#endif
#include <Base/Tools.h>
@@ -3366,11 +3367,27 @@ void LinkSelection::select()
// ---------------------------------------------------------------
LinkLabel::LinkLabel (QWidget * parent) : QLabel(parent)
{
setTextFormat(Qt::RichText);
connect(this, SIGNAL(linkActivated(const QString&)),
LinkLabel::LinkLabel (QWidget * parent) : QWidget(parent)
{
QHBoxLayout *layout = new QHBoxLayout(this);
layout->setMargin(0);
layout->setSpacing(1);
label = new QLabel(this);
label->setAutoFillBackground(true);
label->setTextFormat(Qt::RichText);
layout->addWidget(label);
editButton = new QPushButton(QLatin1String("..."), this);
editButton->setToolTip(tr("Change the linked object"));
layout->addWidget(editButton);
// setLayout(layout);
connect(label, SIGNAL(linkActivated(const QString&)),
this, SLOT(onLinkActivated(const QString&)));
connect(editButton, SIGNAL(clicked()),
this, SLOT(onEditClicked()));
}
LinkLabel::~LinkLabel()
@@ -3387,17 +3404,13 @@ void LinkLabel::setPropertyLink(const QStringList& o)
"</style></head><body>"
"<p>"
"<a href=\"%1.%2\"><span style=\" text-decoration: underline; color:%3;\">%4</span></a>"
"<span> </span>"
"<a href=\"@__edit_link_prop__@\"><span style=\" text-decoration: underline; color:%5;\">%6</span></a>"
"</p></body></html>"
)
.arg(link[0])
.arg(link[1])
.arg(linkcolor)
.arg(link[2])
.arg(linkcolor)
.arg(tr("Edit..."));
setText(text);
.arg(link[2]);
label->setText(text);
}
QStringList LinkLabel::propertyLink() const
@@ -3407,19 +3420,26 @@ QStringList LinkLabel::propertyLink() const
void LinkLabel::onLinkActivated (const QString& s)
{
if (s == QLatin1String("@__edit_link_prop__@")) {
Gui::Dialog::DlgPropertyLink dlg(link, this);
if (dlg.exec() == QDialog::Accepted) {
setPropertyLink(dlg.propertyLink());
/*emit*/ linkChanged(link);
}
}
else {
LinkSelection* select = new LinkSelection(link);
QTimer::singleShot(50, select, SLOT(select()));
Q_UNUSED(s);
LinkSelection* select = new LinkSelection(link);
QTimer::singleShot(50, select, SLOT(select()));
}
void LinkLabel::onEditClicked ()
{
Gui::Dialog::DlgPropertyLink dlg(link, this);
if (dlg.exec() == QDialog::Accepted) {
setPropertyLink(dlg.propertyLink());
/*emit*/ linkChanged(link);
}
}
void LinkLabel::resizeEvent(QResizeEvent* e)
{
editButton->setFixedWidth(e->size().height());
}
PROPERTYITEM_SOURCE(Gui::PropertyEditor::PropertyLinkItem)
PropertyLinkItem::PropertyLinkItem()
@@ -3483,7 +3503,11 @@ void PropertyLinkItem::setValue(const QVariant& value)
if (items.size() > 1) {
QString d = items[0];
QString o = items[1];
QString data = QString::fromLatin1("App.getDocument('%1').getObject('%2')").arg(d).arg(o);
QString data;
if ( o.isEmpty() )
data = QString::fromLatin1("None");
else
data = QString::fromLatin1("App.getDocument('%1').getObject('%2')").arg(d).arg(o);
setPropertyValue(data);
}
}

8
src/Gui/propertyeditor/PropertyItem.h
View File

@@ -908,7 +908,7 @@ private:
QStringList link;
};
class LinkLabel : public QLabel
class LinkLabel : public QWidget
{
Q_OBJECT
@@ -918,13 +918,19 @@ public:
void setPropertyLink(const QStringList& o);
QStringList propertyLink() const;
protected:
void resizeEvent(QResizeEvent*);
protected Q_SLOTS:
void onLinkActivated(const QString&);
void onEditClicked();
Q_SIGNALS:
void linkChanged(const QStringList&);
private:
QLabel* label;
QPushButton* editButton;
QStringList link;
};