From 6c9971d795a7b3189f2b684f828a2a7dace6f5bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Fri, 1 Dec 2017 19:21:55 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@338 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/application/edockwidget.cpp | 8 +- qad/application/emainwindow.cpp | 3 +- qad/application/emainwindow.h | 2 +- qad/blockview/drawtools.ui | 2 +- qad/blockview/qad_blockview.qrc | 1 - qad/icons/document-edit-.png | Bin 2955 -> 0 bytes qad/icons/led_3.png | Bin 8532 -> 12080 bytes qad/icons/led_off.png | Bin 540 -> 12177 bytes qad/icons/led_on.png | Bin 533 -> 12145 bytes qad/icons/run-build.png | Bin 880 -> 0 bytes qad/sql_table/qad_sql_table.qrc | 47 +++++------ qad/sql_table/sql_table_widget.cpp | 12 ++- qad/sql_table/sql_table_widget.ui | 125 +++++++++++++++++++++-------- qad/widgets/ecombobox.cpp | 2 +- qad/widgets/iconedlabel.h | 3 +- qad/widgets/qvariantedit.cpp | 6 +- 16 files changed, 141 insertions(+), 70 deletions(-) delete mode 100644 qad/icons/document-edit-.png delete mode 100644 qad/icons/run-build.png 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 e8fe0972a0ef38d3ecfe75795ed86422148eea1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2955 zcmV;63v~2}P)K~#9!)tU=%RMi>BfBW9--6Wd_kQYgWVn7U5Dl%5I#m;C& zI?#gF7gRE=n}2Tw8cDfWXxPqQEM4BYH`ub znE~Q7paG3Wqf?jsNP7Br71GtZasSll4dd-YhG5vTg@Q?wzBLvXFE79U{+9tEeG2$X zfPx>(fDSbI=eGV)8>p%Z9hb;Cd>Eb0#)-9S%M}Cb-Fx?*Gy3({mkp2sVZaF7tn9zU zkEDGcE~Qd_5nFxF zlTYp`12IFYb^mfxRq z;|8N4=rtJRPM`&F!_V}bQb`6JuU~0I5+#HEWB*Yg-;L#0cRCRTA z5ex!>O-3CSvtDk|YVUcdJ+=cNjR6L%chb!%vyf=$ z+u8->8=5dngXrsZGW#hD-Oji}-O<6M3AxPujT5s`r?F(|HOD)3tA4#O@Bt78Vy9O^ zWS9j|O(hPXe)p4<89qU>mEm;sF!vb)$2+wNbw9E~!{fJwF&ShOcT-MWH4cPs&3iGBniZ3!hCNnP8dm^DDqXGhz3C%JhQM58i?>Kv@v zY#|bf07Bx%d3s?U=auz|vN2`l(rj9e&NLVx78m&-K>7^CM==RLee~5i8u1f8GMntY zQqW1Xw)L=b^B{VAov3m+9L%3?WMZ{|SB9Ae?GmDfN_09MKokUgK#6`dy#Wg3WaZP{hluZjt4f?aa8sZkzE!@CUd`nK z+-Nka1|onP5|#cCLwfiW?ZxqZYbi80kd;$`*VVzQ*Wja_$B4yZsLC179N z7s=#VqXOPVHAnn^P$PeG2qT4sh3X+D^9&>br_O@C<#P)BFCi8Dlz`8{n_D}0>!Uu= z+w?2yW6j-BO7epOKBO&YuWJrEy-|(&$-^t)Efxz2$~*(<;XQp#NZqTj4j!uj2dMq3 zk+rY);Pd(7;v)0dtpP@s`2;-re0Fu;2|7uI7m?4)%Of{87a$`81A?Qz9$+2x_d?UX zSO;B5G-jl+p^oM2`fxg3#A}|?oLw@?tHA3qm@Mq*m`y}mm{2x3IXM&+6`|E?GcpkS zeg;T1lJpr7iv|fFT|jo>7-X$PXX^nLKi5rrXE*Vhewmx8KX+qQ;LRo@+fU5EE0-sf zjU-8wm6fURXEy`tYwzJjNO{B1noDrnkFaoc8+8pG#Ov~EKXa~eoV+eYo3N{G3SEJb z>Ww4jtgI|5D=S4NRAp}9G&9h3;86w0guzmdr~3f+K2^`5V~LSJzcR$q8+rwNw#C5S z&RoabQbJOOqm=PI^))MfBCuInnS1IUV<5 zJ!dijkDZO1KjO9bJ;cjska^-Z2NgvT1>S%wT)@o}Qo@fU7n=jZjPntr*T>woDI z@J6Gazt&Eq%U6QMVu-JO0k5pd=@4~U(S66!f| z1XH$^kk3xg*Tt>Bug2r)WB-v}##i}R_}e}KZ!&6m^Q()f?;fUr>IJkK{i>=e^7Hdg zLW}1CpU;m!;3pgk_cwe}PA)xd?csawp0@(nDjp-#8%S>?;OzmOS255f49H!&U5Q9xciyuEP|cvdVog9w%LHw|E-!`+Rtn5mF4;Y`GMdl+tat z%k$^n@mPI*{ht+hSB7UGQJ&sbbS6}IF}_>d89T~Mi=&)jrESz6E#SR_7c1~)(U1)v zKAfRLhcbBZV6wBb1-!%Iq_wpLuivMbwu(P18ZtzfY;0>?-tifg#a3>abr(~wyOm_6h6nl$g#L35Y&IJv zlbNQb@5-j;A2kb<_j*uu1~VX1zhudSTzu&jWT3<{ibRPi>xznVXlQJdmp-_3jZ*W= zRQR)DKs+gB0I!ynfR8tln_oa*U$4Aq;aw|t*X~&*;4_exvnv6s8c}a1LzZ;%AwN84 z_U#WO!e^dZb*NdHC7(elbuR~kVcFsF$*uNYdGp)vxQ34yu?Vn=pPTs@@L%fnz?DD= zpg9{!0lI;0nMXeTfA-Ly#S)7FsEyefG4TJae*;jyi6Mj;Nxc97002ovPDHLkV1n>e BfMWmv diff --git a/qad/icons/led_3.png b/qad/icons/led_3.png index 604c241058f8bb9a39ad995b9cb2d69152fe4d8f..a2c73abf7633405c543a9e14a49e23cca3ac55b1 100644 GIT binary patch literal 12080 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 U3JGfXXl*+{NlqP(7Ey)#2aD6+E&u=k literal 8532 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 T>=xp-00000NkvXXu0mjfZKVgy literal 540 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 - - ../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"));