diff --git a/qad/application/edockwidget.cpp b/qad/application/edockwidget.cpp index 7bca8f5..059d07b 100644 --- a/qad/application/edockwidget.cpp +++ b/qad/application/edockwidget.cpp @@ -1,4 +1,5 @@ #include "edockwidget.h" +#include "qad_types.h" #include @@ -16,7 +17,12 @@ void EDockWidget::init() { lay->setContentsMargins(2, 2, 2, 2); lay->setSpacing(2); lbl_icon = new QLabel(); - lbl_icon->setPixmap(windowIcon().pixmap(QSize(24, 24))); + QIcon wi = windowIcon(); + if (!wi.isNull()) { + lbl_icon->setPixmap(wi.pixmap(QSize(256,256))); + lbl_icon->setScaledContents(true); + lbl_icon->setFixedSize(preferredIconSize(1.5)); + } lbl_icon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); lbl_title = new QLabel(windowTitle()); lbl_title->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); diff --git a/qad/application/emainwindow.cpp b/qad/application/emainwindow.cpp index 70a868b..91dfdaf 100644 --- a/qad/application/emainwindow.cpp +++ b/qad/application/emainwindow.cpp @@ -233,7 +233,7 @@ void EMainWindow::changedDock() { tbars << t; connect(t, SIGNAL(tabCloseRequested(int)), this, SLOT(closeDock(int))); t->installEventFilter(this); - t->setIconSize(dockTabsIconSIze()); + t->setIconSize(dockTabsIconSize()); t->setTabsClosable(true); } // qDebug() << "tab" << t << t->count(); @@ -241,6 +241,7 @@ void EMainWindow::changedDock() { dock = (QDockWidget * )t->tabData(i).toULongLong(); //qDebug() << i << t->tabData(i); if (dock == 0) continue; + t->setIconSize(dockTabsIconSize()); t->setTabIcon(i, dock->windowIcon()); docks_tabs << dock; } diff --git a/qad/application/emainwindow.h b/qad/application/emainwindow.h index fa64e52..5fdc335 100644 --- a/qad/application/emainwindow.h +++ b/qad/application/emainwindow.h @@ -73,7 +73,7 @@ protected: void loadSession(); virtual void savingSession(QPIConfig & conf) {} virtual void loadingSession(QPIConfig & conf) {} - virtual QSize dockTabsIconSIze() const {return iconSize();} + virtual QSize dockTabsIconSize() const {return iconSize();} virtual QString loadFilter() {return "All files(*)";} virtual QString saveFilter() {return "All files(*)";} diff --git a/qad/blockview/drawtools.ui b/qad/blockview/drawtools.ui index 28ec86f..7f2da7f 100644 --- a/qad/blockview/drawtools.ui +++ b/qad/blockview/drawtools.ui @@ -95,7 +95,7 @@ - :/icons/document-edit-.png:/icons/document-edit-.png + :/icons/document-edit.png:/icons/document-edit.png Qt::ToolButtonIconOnly diff --git a/qad/blockview/qad_blockview.qrc b/qad/blockview/qad_blockview.qrc index 40e80ca..03b9335 100644 --- a/qad/blockview/qad_blockview.qrc +++ b/qad/blockview/qad_blockview.qrc @@ -34,7 +34,6 @@ ../icons/format-fill-color.png ../icons/format-stroke-color.png ../icons/document-open.png - ../icons/document-edit-.png ../icons/align-bottom-center.png ../icons/align-bottom-left.png ../icons/align-bottom-right.png diff --git a/qad/icons/document-edit-.png b/qad/icons/document-edit-.png deleted file mode 100644 index e8fe097..0000000 Binary files a/qad/icons/document-edit-.png and /dev/null differ diff --git a/qad/icons/led_3.png b/qad/icons/led_3.png index 604c241..a2c73ab 100644 Binary files a/qad/icons/led_3.png and b/qad/icons/led_3.png differ diff --git a/qad/icons/led_off.png b/qad/icons/led_off.png index fe60f36..e056895 100644 Binary files a/qad/icons/led_off.png and b/qad/icons/led_off.png differ diff --git a/qad/icons/led_on.png b/qad/icons/led_on.png index 946ba73..fe2b87e 100644 Binary files a/qad/icons/led_on.png and b/qad/icons/led_on.png differ diff --git a/qad/icons/run-build.png b/qad/icons/run-build.png deleted file mode 100644 index d5fa88f..0000000 Binary files a/qad/icons/run-build.png and /dev/null differ diff --git a/qad/sql_table/qad_sql_table.qrc b/qad/sql_table/qad_sql_table.qrc index bb36759..b1caabc 100644 --- a/qad/sql_table/qad_sql_table.qrc +++ b/qad/sql_table/qad_sql_table.qrc @@ -1,25 +1,26 @@ - - ../icons/dialog-close.png - ../icons/edit-clear.png - ../icons/edit-guides.png - ../icons/view-grid.png - ../icons/zoom-fit-best.png - ../icons/configure.png - ../icons/document-save.png - ../icons/edit-clear-locationbar-rtl.png - ../icons/edit-find.png - ../icons/list-add.png - ../icons/edit-delete.png - ../icons/item.png - ../icons/node-add.png - ../icons/node.png - ../icons/edit-copy.png - ../icons/edit-paste.png - ../icons/expand_s_x.png - ../icons/expand_s_y.png - ../icons/expand_x.png - ../icons/expand_y.png - ../icons/sql_table.png - + + ../icons/edit-table-insert-row-below.png + ../icons/dialog-close.png + ../icons/edit-clear.png + ../icons/edit-guides.png + ../icons/view-grid.png + ../icons/zoom-fit-best.png + ../icons/configure.png + ../icons/document-save.png + ../icons/edit-clear-locationbar-rtl.png + ../icons/edit-find.png + ../icons/list-add.png + ../icons/edit-delete.png + ../icons/item.png + ../icons/node-add.png + ../icons/node.png + ../icons/edit-copy.png + ../icons/edit-paste.png + ../icons/expand_s_x.png + ../icons/expand_s_y.png + ../icons/expand_x.png + ../icons/expand_y.png + ../icons/sql_table.png + diff --git a/qad/sql_table/sql_table_widget.cpp b/qad/sql_table/sql_table_widget.cpp index ffce5b2..62c209e 100644 --- a/qad/sql_table/sql_table_widget.cpp +++ b/qad/sql_table/sql_table_widget.cpp @@ -5,6 +5,7 @@ #include #include #include +#include "qad_types.h" QString SQLTableWidget::_dir; @@ -335,12 +336,15 @@ SQLTableWidget::SQLTableWidget(QWidget * parent): QWidget(parent), filters_group connection_name = QSqlDatabase::defaultConnection; filters_active = first_update = true; table_opened = read_only = false; + ui->labelNew->setFixedSize(preferredIconSize(1.2)); + ui->labelFilter->setFixedSize(preferredIconSize(1.2)); ui->view->installEventFilter(this); ui->view->viewport()->installEventFilter(this); ui->view->horizontalHeader()->setSortIndicator(0, Qt::AscendingOrder); ui->view->horizontalHeader()->viewport()->installEventFilter(this); ui->view->setItemDelegate(new SQLItemDelegate(column_props, column_indexes, read_only, connection_name)); ui->view->horizontalHeader()->setItemDelegate(new QItemDelegate()); + ui->view->verticalHeader()->setDefaultSectionSize(fontHeight() * 1.5); //qDebug() << view->horizontalHeader()->itemDelegate(); //qDebug() << fontMetrics().elidedText(, Qt::ElideNone, 30, Qt::TextWordWrap); setTableVisible(false); @@ -526,8 +530,8 @@ bool SQLTableWidget::checkTable() { q.value(5).toString().toLower().indexOf("auto_increment") >= 0, q.value(3).toString().toLower().indexOf("pri") >= 0); }*/ - ui->labelNew->setFixedWidth(qMax(ui->view->verticalHeader()->sizeHint().width() + 2, 16)); - ui->labelFilter->setFixedWidth(qMax(ui->view->verticalHeader()->sizeHint().width() + 2, 16)); + //ui->labelNew->setFixedWidth(qMax(ui->view->verticalHeader()->sizeHint().width() + 2, 16)); + //ui->labelFilter->setFixedWidth(qMax(ui->view->verticalHeader()->sizeHint().width() + 2, 16)); ui->scrollAreaNew->setFixedHeight(QLineEdit().sizeHint().height() + 2); ui->scrollAreaFilter->setFixedHeight(QLineEdit().sizeHint().height() + 2); qDeleteAll(column_news); @@ -626,8 +630,8 @@ void SQLTableWidget::updateTable(bool save_selection) { ui->view->horizontalHeader()->resizeSection(i, 100); first_update = false; } - ui->labelNew->setFixedWidth(qMax(ui->view->verticalHeader()->sizeHint().width() + 2, 16)); - ui->labelFilter->setFixedWidth(qMax(ui->view->verticalHeader()->sizeHint().width() + 2, 16)); + //ui->labelNew->setFixedWidth(qMax(ui->view->verticalHeader()->sizeHint().width() + 2, 16)); + //ui->labelFilter->setFixedWidth(qMax(ui->view->verticalHeader()->sizeHint().width() + 2, 16)); ui->layoutNew->invalidate(); if (save_selection) { QItemSelectionModel * sm = ui->view->selectionModel(); diff --git a/qad/sql_table/sql_table_widget.ui b/qad/sql_table/sql_table_widget.ui index ae856e7..fba0fc1 100644 --- a/qad/sql_table/sql_table_widget.ui +++ b/qad/sql_table/sql_table_widget.ui @@ -7,21 +7,42 @@ 0 0 445 - 422 + 570 SQLTableWidget - + + 0 + + + 0 + + + 0 + + 0 + + 1 + - + + 0 + + + 0 + + + 0 + + 0 @@ -38,7 +59,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -50,7 +80,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -62,7 +101,10 @@ - :/icons/edit-table-insert-row-below.png + :/icons/edit-table-insert-row-below.png + + + true Qt::AlignCenter @@ -94,15 +136,24 @@ 0 0 - 401 - 87 + 352 + 154 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -131,15 +182,9 @@ Add record - + :/icons/list-add.png:/icons/list-add.png - - - 16 - 16 - - @@ -148,7 +193,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -160,7 +214,10 @@ - :/icons/edit-find.png + :/icons/edit-find.png + + + true Qt::AlignCenter @@ -192,15 +249,24 @@ 0 0 - 401 - 87 + 154 + 256 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -229,15 +295,9 @@ Configure filters - + :/icons/configure.png:/icons/configure.png - - - 16 - 16 - - QToolButton::InstantPopup @@ -263,9 +323,6 @@ true - - 24 - @@ -275,7 +332,7 @@ - + :/icons/edit-clear.png:/icons/edit-clear.png @@ -305,6 +362,8 @@ - + + + diff --git a/qad/widgets/ecombobox.cpp b/qad/widgets/ecombobox.cpp index 9da0df3..15e8c4e 100644 --- a/qad/widgets/ecombobox.cpp +++ b/qad/widgets/ecombobox.cpp @@ -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 diff --git a/qad/widgets/iconedlabel.h b/qad/widgets/iconedlabel.h index 0df69b1..8bce32d 100644 --- a/qad/widgets/iconedlabel.h +++ b/qad/widgets/iconedlabel.h @@ -4,6 +4,7 @@ #include #include #include +#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); } diff --git a/qad/widgets/qvariantedit.cpp b/qad/widgets/qvariantedit.cpp index 6408901..f9a8774 100644 --- a/qad/widgets/qvariantedit.cpp +++ b/qad/widgets/qvariantedit.cpp @@ -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"));