diff --git a/src/plugins/coreplugin/images/panel_button.png b/src/plugins/coreplugin/images/panel_button.png index 76793ca2925..c1fe52a19f5 100644 Binary files a/src/plugins/coreplugin/images/panel_button.png and b/src/plugins/coreplugin/images/panel_button.png differ diff --git a/src/plugins/coreplugin/images/panel_button_checked.png b/src/plugins/coreplugin/images/panel_button_checked.png index 67f9fbbd6d9..15560993c46 100644 Binary files a/src/plugins/coreplugin/images/panel_button_checked.png and b/src/plugins/coreplugin/images/panel_button_checked.png differ diff --git a/src/plugins/coreplugin/images/panel_button_checked_hover.png b/src/plugins/coreplugin/images/panel_button_checked_hover.png index 0a820b3f622..2eb10f5f56f 100644 Binary files a/src/plugins/coreplugin/images/panel_button_checked_hover.png and b/src/plugins/coreplugin/images/panel_button_checked_hover.png differ diff --git a/src/plugins/coreplugin/images/panel_button_hover.png b/src/plugins/coreplugin/images/panel_button_hover.png index d9c99409d1d..f9d88f4f140 100644 Binary files a/src/plugins/coreplugin/images/panel_button_hover.png and b/src/plugins/coreplugin/images/panel_button_hover.png differ diff --git a/src/plugins/coreplugin/images/panel_button_pressed.png b/src/plugins/coreplugin/images/panel_button_pressed.png index dc522d23878..a053699feeb 100644 Binary files a/src/plugins/coreplugin/images/panel_button_pressed.png and b/src/plugins/coreplugin/images/panel_button_pressed.png differ diff --git a/src/plugins/coreplugin/images/panel_manage_button.png b/src/plugins/coreplugin/images/panel_manage_button.png index e8ad2a936e5..274c4cd9798 100644 Binary files a/src/plugins/coreplugin/images/panel_manage_button.png and b/src/plugins/coreplugin/images/panel_manage_button.png differ diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp index c7e2515ff16..211b7a959d2 100644 --- a/src/plugins/coreplugin/outputpanemanager.cpp +++ b/src/plugins/coreplugin/outputpanemanager.cpp @@ -612,14 +612,14 @@ int OutputPaneManager::currentIndex() const static QString buttonStyleSheet() { - QString styleSheet = QLatin1String("QToolButton { border-image: url(:/core/images/panel_button.png) 2 2 2 19;" - " border-width: 2px 2px 2px 19px; padding-left: -17; padding-right: 4 } " - "QToolButton:checked { border-image: url(:/core/images/panel_button_checked.png) 2 2 2 19 } " + QString styleSheet = QLatin1String("QToolButton { border-image: url(:/core/images/panel_button.png) 3 3 3 19;" + " border-width: 3px 3px 3px 19px; padding-left: -17; padding-right: 4 } " + "QToolButton:checked { border-image: url(:/core/images/panel_button_checked.png) 3 3 3 19 } " "QToolButton::menu-indicator { width:0; height:0 }"); if (!Utils::HostOsInfo::isMacHost()) { // Mac UIs usually don't hover - styleSheet += QLatin1String("QToolButton:checked:hover { border-image: url(:/core/images/panel_button_checked_hover.png) 2 2 2 19 } " - "QToolButton:pressed:hover { border-image: url(:/core/images/panel_button_pressed.png) 2 2 2 19 } " - "QToolButton:hover { border-image: url(:/core/images/panel_button_hover.png) 2 2 2 19 } "); + styleSheet += QLatin1String("QToolButton:checked:hover { border-image: url(:/core/images/panel_button_checked_hover.png) 3 3 3 19 } " + "QToolButton:pressed:hover { border-image: url(:/core/images/panel_button_pressed.png) 3 3 3 19 } " + "QToolButton:hover { border-image: url(:/core/images/panel_button_hover.png) 3 3 3 19 } "); } return styleSheet; } @@ -768,15 +768,15 @@ OutputPaneManageButton::OutputPaneManageButton() { setFocusPolicy(Qt::NoFocus); setCheckable(true); - setStyleSheet(QLatin1String("QToolButton { border-image: url(:/core/images/panel_manage_button.png) 2 2 2 2;" - " border-width: 2px 2px 2px 2px } " + setStyleSheet(QLatin1String("QToolButton { border-image: url(:/core/images/panel_manage_button.png) 3 3 3 3;" + " border-width: 3px 3px 3px 3px } " "QToolButton::menu-indicator { width:0; height:0 }")); } QSize OutputPaneManageButton::sizeHint() const { ensurePolished(); - return QSize(18, QApplication::globalStrut().height()); + return QSize(19, QApplication::globalStrut().height()); } void OutputPaneManageButton::paintEvent(QPaintEvent *event) @@ -786,7 +786,7 @@ void OutputPaneManageButton::paintEvent(QPaintEvent *event) QStyle *s = style(); QStyleOption arrowOpt; arrowOpt.initFrom(this); - arrowOpt.rect = QRect(5, rect().center().y() - 3, 9, 9); + arrowOpt.rect = QRect(6, rect().center().y() - 3, 9, 9); arrowOpt.rect.translate(0, -3); s->drawPrimitive(QStyle::PE_IndicatorArrowUp, &arrowOpt, &p, this); arrowOpt.rect.translate(0, 6); diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index a53f735cfd0..e19b37e69d3 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -18,6 +18,66 @@ sodipodi:docname="qtcreatoricons.svg"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + transform="translate(-212,-80)"> + style="fill:#000000;fill-opacity:0.07843137;stroke:none" + transform="translate(16.5,0.5)" /> + transform="translate(-139,-80)"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +