SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@40 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2015-11-02 10:00:01 +00:00
parent 90e5c5612b
commit 8da2529bda
3 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
qad_blockview/blockitem.cpp
View File

@@ -188,7 +188,6 @@ void BlockItem::addDecor(QGraphicsItem & item) {
qgraphicsitem_cast<AlignedTextItem*>(&item)->setData(1010, qgraphicsitem_cast<AlignedTextItem*>(&item)->text());
item.setData(1002, true);
item.setData(1011, "decor");
item.setData(1011, "decor");
//decors_ << &item;
item.setParentItem(this);
}

44
qad_widgets/qvariantedit.cpp
View File

@@ -6,6 +6,50 @@
__QVariantEditRegistrator__ __registrator__;
StringListEdit::~StringListEdit() {
delete combo;
delete butt_add;
delete butt_del;
delete butt_clear;
}
QStringList StringListEdit::value() const {
QStringList l;
for (int i = 0; i < combo->count(); ++i) l << combo->itemText(i);
return l;
}
void StringListEdit::setValue(const QStringList & v) {
combo->clear();
if (!v.isEmpty()) {
combo->addItems(v);
combo->setCurrentIndex(0);
}
}
void StringListEdit::addItem() {
combo->addItem(combo->currentText());
emit valueChanged();
}
void StringListEdit::delItem() {
if (combo->currentIndex() < 0) return;
combo->removeItem(combo->currentIndex());
emit valueChanged();
}
void StringListEdit::clear() {
if (combo->count() == 0) return;
combo->clear();
emit valueChanged();
}
StringListEdit::StringListEdit(QWidget * parent): QWidget(parent), lay(QBoxLayout::LeftToRight, this) {
combo = new EComboBox(this);
combo->setEditable(true);

12
qad_widgets/qvariantedit.h
View File

@@ -15,9 +15,9 @@ class StringListEdit: public QWidget
Q_OBJECT
public:
StringListEdit(QWidget * parent = 0);
~StringListEdit() {delete combo; delete butt_add; delete butt_del; delete butt_clear;}
~StringListEdit();
QStringList value() const {QStringList l; for (int i = 0; i < combo->count(); ++i) l << combo->itemText(i); return l;}
QStringList value() const;
private:
virtual void changeEvent(QEvent * e);
@@ -27,13 +27,13 @@ private:
QPushButton * butt_add, * butt_del, * butt_clear;
public slots:
void setValue(const QStringList & v) {combo->clear(); combo->addItems(v); combo->setCurrentIndex(0);}
void setValue(const QStringList & v);
private slots:
void editItem();
void addItem() {combo->addItem(combo->currentText()); emit valueChanged();}
void delItem() {if (combo->currentIndex() < 0) return; combo->removeItem(combo->currentIndex()); emit valueChanged();}
void clear() {if (combo->count() == 0) return; combo->clear(); emit valueChanged();}
void addItem();
void delItem();
void clear();
signals:
void valueChanged();