Mercurial > hg > svgui

comparison widgets/PropertyStack.cpp @ 1216:dc2af6616c83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch 3.0-integration
author Chris Cannam
date Fri, 13 Jan 2017 10:29:50 +0000
parents 3f5c82034f9b
children a34a2a25907c
comparison
equal deleted inserted replaced
1048:e8102ff5573b 1216:dc2af6616c83
23 #include "widgets/IconLoader.h" 23 #include "widgets/IconLoader.h"
24 #include "base/Command.h" 24 #include "base/Command.h"
25 #include "widgets/CommandHistory.h" 25 #include "widgets/CommandHistory.h"
26 #include "layer/ShowLayerCommand.h" 26 #include "layer/ShowLayerCommand.h"
27 27
28 #include "WidgetScale.h"
29
28 #include <QIcon> 30 #include <QIcon>
29 #include <QTabWidget> 31 #include <QTabWidget>
30 32
31 #include <iostream> 33 #include <iostream>
32 34
43 connect(bar, SIGNAL(mouseLeft()), this, SLOT(mouseLeftTabBar())); 45 connect(bar, SIGNAL(mouseLeft()), this, SLOT(mouseLeftTabBar()));
44 connect(bar, SIGNAL(activeTabClicked()), this, SLOT(activeTabClicked())); 46 connect(bar, SIGNAL(activeTabClicked()), this, SLOT(activeTabClicked()));
45 47
46 setTabBar(bar); 48 setTabBar(bar);
47 49
48 #if (QT_VERSION >= 0x0402)
49 setElideMode(Qt::ElideNone); 50 setElideMode(Qt::ElideNone);
50 tabBar()->setUsesScrollButtons(true); 51 tabBar()->setUsesScrollButtons(true);
51 tabBar()->setIconSize(QSize(16, 16)); 52 tabBar()->setIconSize(WidgetScale::scaleQSize(QSize(16, 16)));
52 #endif 53
53
54 repopulate(); 54 repopulate();
55 55
56 connect(this, SIGNAL(currentChanged(int)), 56 connect(this, SIGNAL(currentChanged(int)),
57 this, SLOT(selectedContainerChanged(int))); 57 this, SLOT(selectedContainerChanged(int)));
58 58