diff --git a/Plugins/org.blueberry.ui.qt/resources/org_blueberry_ui_qt.qrc b/Plugins/org.blueberry.ui.qt/resources/org_blueberry_ui_qt.qrc
index 8b9a9bd9e8..b8c7fa4579 100755
--- a/Plugins/org.blueberry.ui.qt/resources/org_blueberry_ui_qt.qrc
+++ b/Plugins/org.blueberry.ui.qt/resources/org_blueberry_ui_qt.qrc
@@ -1,67 +1,67 @@
cursor_bottom.xpm
cursor_center.xpm
cursor_left.xpm
cursor_offscreen.xpm
cursor_right.xpm
cursor_top.xpm
dialog-error.svg
icon_missing.png
- tab_close_icon.png
- tab_close_icon-active.png
+ tab_close_grey.svg
+ tab_close_grey_active.svg
defaultstyle.qss
defaultstyle-activetab.qss
defaultstyle-tab.qss
dark/up_arrow_disabled.png
dark/Hmovetoolbar.png
dark/stylesheet-branch-end.png
dark/branch_closed-on.png
dark/stylesheet-vline.png
dark/branch_closed.png
dark/branch_open-on.png
dark/transparent.png
dark/right_arrow_disabled.png
dark/sizegrip.png
dark/close.png
dark/close-hover.png
dark/close-pressed.png
dark/down_arrow.png
dark/Vmovetoolbar.png
dark/left_arrow.png
dark/stylesheet-branch-more.png
dark/up_arrow.png
dark/right_arrow.png
dark/left_arrow_disabled.png
dark/Hsepartoolbar.png
dark/branch_open.png
dark/Vsepartoolbar.png
dark/down_arrow_disabled.png
dark/undock.png
dark/checkbox_checked_disabled.png
dark/checkbox_checked_focus.png
dark/checkbox_checked.png
dark/checkbox_indeterminate.png
dark/checkbox_indeterminate_focus.png
dark/checkbox_unchecked_disabled.png
dark/checkbox_unchecked_focus.png
dark/checkbox_unchecked.png
dark/radio_checked_disabled.png
dark/radio_checked_focus.png
dark/radio_checked.png
dark/radio_unchecked_disabled.png
dark/radio_unchecked_focus.png
dark/radio_unchecked.png
darkstyle.qss
darkstyle-tab.qss
darkstyle-activetab.qss
fonts/FiraSans/FiraSans.ttc
fonts/LightFiraSans/LightFiraSans.ttc
fonts/Roboto/Roboto.ttf
fonts/xkcd/xkcd.ttf
diff --git a/Plugins/org.blueberry.ui.qt/src/internal/defaultpresentation/berryNativeTabItem.cpp b/Plugins/org.blueberry.ui.qt/src/internal/defaultpresentation/berryNativeTabItem.cpp
index 479539188e..cf56522af0 100755
--- a/Plugins/org.blueberry.ui.qt/src/internal/defaultpresentation/berryNativeTabItem.cpp
+++ b/Plugins/org.blueberry.ui.qt/src/internal/defaultpresentation/berryNativeTabItem.cpp
@@ -1,128 +1,128 @@
/*===================================================================
BlueBerry Platform
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
All rights reserved.
This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
See LICENSE.txt or http://www.mitk.org for details.
===================================================================*/
#include "berryNativeTabItem.h"
#include "berryNativeTabFolder.h"
#include "berryQCTabBar.h"
#include
#include
namespace berry
{
NativeTabItem::NativeTabItem(NativeTabFolder* _parent, int index, int flags) :
parent(_parent), style(flags), showClose(true), closeButton(nullptr)
{
parent->GetTabFolder()->insertTab(index, this);
if (this->GetShowClose())
{
parent->GetTabFolder()->setTabButton(index, QTabBar::RightSide, this->GetCloseButton());
this->connect(this->GetCloseButton(), SIGNAL(clicked()), this, SLOT(CloseButtonClicked()));
}
}
void NativeTabItem::CloseButtonClicked()
{
parent->CloseButtonClicked(this);
}
QRect NativeTabItem::GetBounds()
{
int index = parent->IndexOf(this);
QTabBar* folder = parent->GetTabFolder();
QRect localRect = folder->tabRect(index);
QPoint topLeft = localRect.topLeft();
QPoint bottomRight = localRect.bottomRight();
QPoint globalTopLeft = folder->mapToGlobal(topLeft);
QPoint globalBottomRight = folder->mapToGlobal(bottomRight);
return QRect(globalTopLeft, globalBottomRight);
}
void NativeTabItem::SetInfo(const PartInfo& info)
{
QTabBar* widget = parent->GetTabFolder();
int index = parent->IndexOf(this);
if (widget->tabText(index) != info.name)
{
widget->setTabText(index, info.name);
}
if (widget->tabToolTip(index) != info.toolTip)
{
widget->setTabToolTip(index, info.toolTip);
}
if (widget->tabIcon(index).cacheKey() != info.image.cacheKey())
{
widget->setTabIcon(index, info.image);
}
}
bool NativeTabItem::GetShowClose() const
{
return ((style & Constants::CLOSE) && showClose);
}
void NativeTabItem::SetShowClose(bool close)
{
showClose = close;
}
QWidget* NativeTabItem::GetCloseButton()
{
if (!closeButton)
{
- QIcon iconCloseTab( ":/org.blueberry.ui.qt/tab_close_icon.png" );
- iconCloseTab.addFile(":/org.blueberry.ui.qt/tab_close_icon-active.png", QSize(), QIcon::Active);
+ QIcon iconCloseTab( ":/org.blueberry.ui.qt/tab_close_grey.svg" );
+ iconCloseTab.addFile(":/org.blueberry.ui.qt/tab_close_grey_active.svg", QSize(), QIcon::Active);
closeButton = new QToolButton(parent->GetControl());
closeButton->setObjectName("TabCloseButton");
closeButton->setContentsMargins(0, 0, 0, 0);
closeButton->setFixedSize(12,12);
//closeButton->setFlat(true);
closeButton->setIcon(iconCloseTab);
closeButton->setAutoRaise(true);
}
return closeButton;
}
void NativeTabItem::Dispose()
{
QTabBar* widget = parent->GetTabFolder();
int index = parent->IndexOf(this);
widget->removeTab(index); // this calls QCTabBar::tabRemoved
}
Object::Pointer NativeTabItem::GetData()
{
return data;
}
void NativeTabItem::SetData(Object::Pointer d)
{
this->data = d;
}
}