feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.6'

Browse Source 
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp

Change-Id: Ibdf433b54e36e58182b7094f78d47ed3e8c81684
This commit is contained in:
Eike Ziller
2015-11-12 13:43:08 +01:00
parent 2afae6f2c6 0bcddcd014
commit d13b22e6bc
181 changed files with 13518 additions and 2106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/coreplugin/fancyactionbar.cpp
View File

@@ -53,9 +53,13 @@ using namespace Utils;
namespace Core {
namespace Internal {
FancyToolButton::FancyToolButton(QWidget *parent)
FancyToolButton::FancyToolButton(QAction *action, QWidget *parent)
: QToolButton(parent), m_fader(0)
{
setDefaultAction(action);
connect(action, &QAction::changed, this, &FancyToolButton::actionChanged);
actionChanged();
setAttribute(Qt::WA_Hover, true);
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
}
@@ -364,18 +368,12 @@ FancyActionBar::FancyActionBar(QWidget *parent)
void FancyActionBar::addProjectSelector(QAction *action)
{
FancyToolButton* toolButton = new FancyToolButton(this);
toolButton->setDefaultAction(action);
connect(action, SIGNAL(changed()), toolButton, SLOT(actionChanged()));
m_actionsLayout->insertWidget(0, toolButton);
m_actionsLayout->insertWidget(0, new FancyToolButton(action, this));
}
void FancyActionBar::insertAction(int index, QAction *action)
{
FancyToolButton *toolButton = new FancyToolButton(this);
toolButton->setDefaultAction(action);
connect(action, SIGNAL(changed()), toolButton, SLOT(actionChanged()));
m_actionsLayout->insertWidget(index, toolButton);
m_actionsLayout->insertWidget(index, new FancyToolButton(action, this));
}
QLayout *FancyActionBar::actionsLayout() const