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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
qad/application/edockwidget.cpp
View File

@@ -1,4 +1,5 @@
#include "edockwidget.h"
#include "qad_types.h"
#include <QStyle>
@@ -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);

3
qad/application/emainwindow.cpp
View File

@@ -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;
}

2
qad/application/emainwindow.h
View File

@@ -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(*)";}