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

Move icons to Utils

Browse Source 
This way we can use them from libraries, not only from plugins.

Change-Id: Ic35cfd5f04d638d87606bf272b2c00ded1267c1b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Ulf Hermann
2016-08-03 17:55:54 +02:00
parent 5d6f5ff2c9
commit 15fbfaf2e9
214 changed files with 598 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/coreplugin/sidebar.cpp
View File

@@ -25,11 +25,11 @@
#include "sidebar.h"
#include "sidebarwidget.h"
#include "coreicons.h"
#include "actionmanager/command.h"
#include <utils/algorithm.h>
#include <utils/qtcassert.h>
#include <utils/utilsicons.h>
#include <QSettings>
#include <QPointer>
@@ -199,7 +199,7 @@ SideBarItem *SideBar::item(const QString &id)
Internal::SideBarWidget *SideBar::insertSideBarWidget(int position, const QString &id)
{
if (!d->m_widgets.isEmpty())
d->m_widgets.at(0)->setCloseIcon(Icons::CLOSE_SPLIT_BOTTOM.icon());
d->m_widgets.at(0)->setCloseIcon(Utils::Icons::CLOSE_SPLIT_BOTTOM.icon());
Internal::SideBarWidget *item = new Internal::SideBarWidget(this, id);
connect(item, &Internal::SideBarWidget::splitMe, this, &SideBar::splitSubWidget);
@@ -209,8 +209,8 @@ Internal::SideBarWidget *SideBar::insertSideBarWidget(int position, const QStrin
d->m_widgets.insert(position, item);
if (d->m_widgets.size() == 1)
d->m_widgets.at(0)->setCloseIcon(d->m_widgets.size() == 1
? Icons::CLOSE_SPLIT_LEFT.icon()
: Icons::CLOSE_SPLIT_TOP.icon());
? Utils::Icons::CLOSE_SPLIT_LEFT.icon()
: Utils::Icons::CLOSE_SPLIT_TOP.icon());
updateWidgets();
return item;
}
@@ -241,8 +241,8 @@ void SideBar::closeSubWidget()
// update close button of top item
if (d->m_widgets.size() == 1)
d->m_widgets.at(0)->setCloseIcon(d->m_widgets.size() == 1
? Icons::CLOSE_SPLIT_LEFT.icon()
: Icons::CLOSE_SPLIT_TOP.icon());
? Utils::Icons::CLOSE_SPLIT_LEFT.icon()
: Utils::Icons::CLOSE_SPLIT_TOP.icon());
updateWidgets();
} else {
if (d->m_closeWhenEmpty) {