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

This commit is contained in:
2017-12-01 19:21:55 +00:00
parent 5319da69aa
commit 6c9971d795
16 changed files with 141 additions and 70 deletions

View File

@@ -38,7 +38,7 @@ EComboBox::EComboBox(QWidget * parent): QComboBox(parent) {
iv.setMinimumHeight(100);
icon.setPixmap(QPixmap(":/icons/edit-find.png"));
icon.setScaledContents(true);
icon.setFixedSize(QSize(fontHeight(), fontHeight()));
icon.setFixedSize(preferredIconSize(1.2));
ifont = nfont = font();
ifont.setItalic(true);
#if QT_VERSION >= 0x040700

View File

@@ -4,6 +4,7 @@
#include <QLabel>
#include <QIcon>
#include <QHBoxLayout>
#include "qad_types.h"
QT_BEGIN_HEADER
@@ -23,7 +24,7 @@ public:
explicit IconedLabel(QWidget * parent = 0): QFrame(parent) {
label_.setAlignment(Qt::AlignCenter);
icon_.setAlignment(Qt::AlignCenter);
size_ = QSize(16, 16);
size_ = preferredIconSize();
setDirection(LeftToRight);
}

View File

@@ -58,9 +58,9 @@ StringListEdit::StringListEdit(QWidget * parent): QWidget(parent), lay(QBoxLayou
/*butt_add->setIconSize(QSize(16, 16));
butt_del->setIconSize(QSize(16, 16));
butt_clear->setIconSize(QSize(16, 16));*/
butt_add->setMaximumWidth(combo->height());
butt_del->setMaximumWidth(combo->height());
butt_clear->setMaximumWidth(combo->height());
butt_add->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
butt_del->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
butt_clear->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
butt_add->setIcon(QIcon(":/icons/list-add.png"));
butt_del->setIcon(QIcon(":/icons/edit-delete.png"));
butt_clear->setIcon(QIcon(":/icons/edit-clear.png"));