git-svn-id: svn://db.shs.com.ru/libs@380 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
@@ -104,7 +104,7 @@ PathEdit::PathEdit(QWidget * parent): QWidget(parent), lay(QBoxLayout::LeftToRig
|
||||
is_dir = is_abs = false;
|
||||
filter = tr("All files(*)");
|
||||
line = new CLineEdit(this);
|
||||
line->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
|
||||
//line->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
|
||||
butt_select = new QPushButton(this);
|
||||
//butt_select->setIconSize(QSize(16, 16));
|
||||
butt_select->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
|
||||
@@ -128,6 +128,12 @@ void PathEdit::changeEvent(QEvent * e) {
|
||||
}
|
||||
|
||||
|
||||
void PathEdit::resizeEvent(QResizeEvent *) {
|
||||
butt_select->setMaximumHeight(line->height());
|
||||
|
||||
}
|
||||
|
||||
|
||||
void PathEdit::select() {
|
||||
QString ret;
|
||||
if (is_dir) ret = QFileDialog::getExistingDirectory(this, tr("Select directory"), value());
|
||||
@@ -143,6 +149,8 @@ void PathEdit::select() {
|
||||
|
||||
|
||||
QVariantEdit::QVariantEdit(QWidget * parent): QWidget(parent) {
|
||||
setLayout(new QBoxLayout(QBoxLayout::TopToBottom));
|
||||
layout()->setContentsMargins(0, 0, 0, 0);
|
||||
_empty = 0;
|
||||
_line = 0;
|
||||
_check = 0;
|
||||
@@ -166,7 +174,7 @@ QVariantEdit::~QVariantEdit() {
|
||||
|
||||
|
||||
void QVariantEdit::resizeEvent(QResizeEvent * e) {
|
||||
_resize();
|
||||
//_resize();
|
||||
QWidget::resizeEvent(e);
|
||||
}
|
||||
|
||||
@@ -310,7 +318,7 @@ void QVariantEdit::_recreate(const QVariant & new_value) {
|
||||
//qDebug() << _cur_edit;
|
||||
if (_cur_edit) {
|
||||
_resize();
|
||||
_cur_edit->show();
|
||||
//_cur_edit->show();
|
||||
}
|
||||
_value = new_value;
|
||||
}
|
||||
@@ -405,6 +413,12 @@ void QVariantEdit::_delete() {
|
||||
}
|
||||
|
||||
|
||||
void QVariantEdit::_resize() {
|
||||
if (!_cur_edit) return;
|
||||
layout()->addWidget(_cur_edit);
|
||||
}
|
||||
|
||||
|
||||
void QVariantEdit::_newPath() {
|
||||
_delete();
|
||||
_path = new PathEdit(this);
|
||||
@@ -412,7 +426,7 @@ void QVariantEdit::_newPath() {
|
||||
_value = _value.toString();
|
||||
connect(_path, SIGNAL(valueChanged()), this, SLOT(_changed()));
|
||||
_resize();
|
||||
_cur_edit->show();
|
||||
//_cur_edit->show();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -60,7 +60,8 @@ public:
|
||||
|
||||
private:
|
||||
virtual void changeEvent(QEvent * e);
|
||||
|
||||
virtual void resizeEvent(QResizeEvent * );
|
||||
|
||||
QBoxLayout lay;
|
||||
CLineEdit * line;
|
||||
QPushButton * butt_select;
|
||||
@@ -89,14 +90,14 @@ public:
|
||||
~QVariantEdit();
|
||||
|
||||
QVariant value() const;
|
||||
QSize sizeHint() const {if (_cur_edit) return _cur_edit->sizeHint(); return QWidget::sizeHint();}
|
||||
QSize minimumSizeHint() const {if (_cur_edit) return _cur_edit->minimumSizeHint(); return QWidget::minimumSizeHint();}
|
||||
//QSize sizeHint() const {if (_cur_edit) return _cur_edit->sizeHint(); return QWidget::sizeHint();}
|
||||
//QSize minimumSizeHint() const {if (_cur_edit) return _cur_edit->minimumSizeHint(); return QWidget::minimumSizeHint();}
|
||||
|
||||
protected:
|
||||
void resizeEvent(QResizeEvent * );
|
||||
virtual void resizeEvent(QResizeEvent * );
|
||||
void _recreate(const QVariant & new_value);
|
||||
void _delete();
|
||||
void _resize() {if (_cur_edit) _cur_edit->resize(size());}
|
||||
void _resize();
|
||||
void _newPath();
|
||||
void _setEnum(const QAD::Enum & v);
|
||||
void _setFile(const QAD::File & v);
|
||||
|
||||
Reference in New Issue
Block a user