From d3abbae211e13c245d1239d1ebfaab055a987712 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 1 Feb 2012 21:39:05 +0100 Subject: [PATCH] New close split buttons. This change moves the "close document" button back to the top-left and instead changes the icon on the "close split" buttons. Change-Id: I187c3f707f38ea8edef996cb5393654015d551ca Reviewed-by: Virva Auvinen --- src/plugins/coreplugin/core.qrc | 6 ++ src/plugins/coreplugin/coreconstants.h | 56 ++++++++++-------- .../coreplugin/editormanager/editorview.cpp | 27 +++++++++ .../coreplugin/editormanager/editorview.h | 13 ++-- src/plugins/coreplugin/editortoolbar.cpp | 16 +++-- src/plugins/coreplugin/editortoolbar.h | 3 + .../coreplugin/images/button_close.png | Bin 0 -> 1170 bytes src/plugins/coreplugin/images/filtericon.png | Bin 473 -> 1079 bytes src/plugins/coreplugin/images/linkicon.png | Bin 592 -> 1114 bytes .../images/splitbutton_closebottom.png | Bin 0 -> 1080 bytes .../images/splitbutton_closeleft.png | Bin 0 -> 1065 bytes .../images/splitbutton_closeright.png | Bin 0 -> 1068 bytes .../images/splitbutton_closetop.png | Bin 0 -> 1083 bytes .../images/splitbutton_horizontal.png | Bin 408 -> 1060 bytes .../images/splitbutton_vertical.png | Bin 0 -> 1067 bytes .../coreplugin/navigationsubwidget.cpp | 2 +- src/plugins/coreplugin/sidebarwidget.cpp | 2 +- .../projectexplorer/projecttreewidget.cpp | 1 + src/plugins/texteditor/outlinefactory.cpp | 1 + 19 files changed, 89 insertions(+), 38 deletions(-) create mode 100644 src/plugins/coreplugin/images/button_close.png create mode 100644 src/plugins/coreplugin/images/splitbutton_closebottom.png create mode 100644 src/plugins/coreplugin/images/splitbutton_closeleft.png create mode 100644 src/plugins/coreplugin/images/splitbutton_closeright.png create mode 100644 src/plugins/coreplugin/images/splitbutton_closetop.png create mode 100644 src/plugins/coreplugin/images/splitbutton_vertical.png diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index 3157c4f10ef..3af6f1c15b5 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -65,5 +65,11 @@ images/category_qml.png images/filtericon.png images/category_buildrun.png + images/button_close.png + images/splitbutton_closebottom.png + images/splitbutton_closeleft.png + images/splitbutton_closeright.png + images/splitbutton_closetop.png + images/splitbutton_vertical.png diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 88d3af79c6a..904d6478e7c 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -181,31 +181,37 @@ const char G_WINDOW_OTHER[] = "QtCreator.Group.Window.Other"; const char G_HELP_HELP[] = "QtCreator.Group.Help.Help"; const char G_HELP_ABOUT[] = "QtCreator.Group.Help.About"; -const char ICON_MINUS[] = ":/core/images/minus.png"; -const char ICON_PLUS[] = ":/core/images/plus.png"; -const char ICON_NEWFILE[] = ":/core/images/filenew.png"; -const char ICON_OPENFILE[] = ":/core/images/fileopen.png"; -const char ICON_SAVEFILE[] = ":/core/images/filesave.png"; -const char ICON_UNDO[] = ":/core/images/undo.png"; -const char ICON_REDO[] = ":/core/images/redo.png"; -const char ICON_COPY[] = ":/core/images/editcopy.png"; -const char ICON_PASTE[] = ":/core/images/editpaste.png"; -const char ICON_CUT[] = ":/core/images/editcut.png"; -const char ICON_NEXT[] = ":/core/images/next.png"; -const char ICON_PREV[] = ":/core/images/prev.png"; -const char ICON_DIR[] = ":/core/images/dir.png"; -const char ICON_CLEAN_PANE[] = ":/core/images/clean_pane_small.png"; -const char ICON_CLEAR[] = ":/core/images/clear.png"; -const char ICON_RESET[] = ":/core/images/reset.png"; -const char ICON_MAGNIFIER[] = ":/core/images/magnifier.png"; -const char ICON_TOGGLE_SIDEBAR[] = ":/core/images/sidebaricon.png"; -const char ICON_CLOSE[] = ":/core/images/closebutton.png"; -const char ICON_CLOSE_DARK[] = ":/core/images/darkclosebutton.png"; -const char ICON_SPLIT_HORIZONTAL[] = ":/core/images/splitbutton_horizontal.png"; -const char ICON_FILTER[] = ":/core/images/filtericon.png"; -const char ICON_LINK[] = ":/core/images/linkicon.png"; -const char ICON_QTLOGO_32[] = ":/core/images/logo/32/qtcreator.png"; -const char ICON_QTLOGO_128[] = ":/core/images/logo/128/qtcreator.png"; +const char ICON_MINUS[] = ":/core/images/minus.png"; +const char ICON_PLUS[] = ":/core/images/plus.png"; +const char ICON_NEWFILE[] = ":/core/images/filenew.png"; +const char ICON_OPENFILE[] = ":/core/images/fileopen.png"; +const char ICON_SAVEFILE[] = ":/core/images/filesave.png"; +const char ICON_UNDO[] = ":/core/images/undo.png"; +const char ICON_REDO[] = ":/core/images/redo.png"; +const char ICON_COPY[] = ":/core/images/editcopy.png"; +const char ICON_PASTE[] = ":/core/images/editpaste.png"; +const char ICON_CUT[] = ":/core/images/editcut.png"; +const char ICON_NEXT[] = ":/core/images/next.png"; +const char ICON_PREV[] = ":/core/images/prev.png"; +const char ICON_DIR[] = ":/core/images/dir.png"; +const char ICON_CLEAN_PANE[] = ":/core/images/clean_pane_small.png"; +const char ICON_CLEAR[] = ":/core/images/clear.png"; +const char ICON_RESET[] = ":/core/images/reset.png"; +const char ICON_MAGNIFIER[] = ":/core/images/magnifier.png"; +const char ICON_TOGGLE_SIDEBAR[] = ":/core/images/sidebaricon.png"; +const char ICON_CLOSE_DOCUMENT[] = ":/core/images/button_close.png"; +const char ICON_CLOSE[] = ":/core/images/closebutton.png"; +const char ICON_CLOSE_DARK[] = ":/core/images/darkclosebutton.png"; +const char ICON_SPLIT_HORIZONTAL[] = ":/core/images/splitbutton_horizontal.png"; +const char ICON_SPLIT_VERTICAL[] = ":/core/images/splitbutton_vertical.png"; +const char ICON_CLOSE_SPLIT_TOP[] = ":/core/images/splitbutton_closetop.png"; +const char ICON_CLOSE_SPLIT_BOTTOM[] = ":/core/images/splitbutton_closebottom.png"; +const char ICON_CLOSE_SPLIT_LEFT[] = ":/core/images/splitbutton_closeleft.png"; +const char ICON_CLOSE_SPLIT_RIGHT[] = ":/core/images/splitbutton_closeright.png"; +const char ICON_FILTER[] = ":/core/images/filtericon.png"; +const char ICON_LINK[] = ":/core/images/linkicon.png"; +const char ICON_QTLOGO_32[] = ":/core/images/logo/32/qtcreator.png"; +const char ICON_QTLOGO_128[] = ":/core/images/logo/128/qtcreator.png"; const char WIZARD_CATEGORY_QT[] = "R.Qt"; const char WIZARD_TR_CATEGORY_QT[] = QT_TRANSLATE_NOOP("Core", "Qt"); diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp index 0eadf2f1fa9..2ffbc9a270b 100644 --- a/src/plugins/coreplugin/editormanager/editorview.cpp +++ b/src/plugins/coreplugin/editormanager/editorview.cpp @@ -175,6 +175,11 @@ void EditorView::setCloseSplitEnabled(bool enable) m_toolBar->setCloseSplitEnabled(enable); } +void EditorView::setCloseSplitIcon(const QIcon &icon) +{ + m_toolBar->setCloseSplitIcon(icon); +} + void EditorView::addEditor(IEditor *editor) { if (m_editors.contains(editor)) @@ -686,6 +691,14 @@ void SplitterOrView::split(Qt::Orientation orientation) otherView->view()->copyNavigationHistoryFrom(m_view); otherView->view()->setCurrentEditor(otherView->view()->currentEditor()); + if (orientation == Qt::Horizontal) { + view->view()->setCloseSplitIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_LEFT))); + otherView->view()->setCloseSplitIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_RIGHT))); + } else { + view->view()->setCloseSplitIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP))); + otherView->view()->setCloseSplitIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM))); + } + if (m_view && !m_isRoot) { em->emptyView(m_view); delete m_view; @@ -750,6 +763,20 @@ void SplitterOrView::unsplit() } else { m_view = childSplitterOrView->takeView(); m_layout->addWidget(m_view); + QSplitter *parentSplitter = qobject_cast(parentWidget()); + if (parentSplitter) { // not the toplevel splitterOrView + if (parentSplitter->orientation() == Qt::Horizontal) { + if (parentSplitter->widget(0) == this) + m_view->setCloseSplitIcon(QIcon(Constants::ICON_CLOSE_SPLIT_LEFT)); + else + m_view->setCloseSplitIcon(QIcon(Constants::ICON_CLOSE_SPLIT_RIGHT)); + } else { + if (parentSplitter->widget(0) == this) + m_view->setCloseSplitIcon(QIcon(Constants::ICON_CLOSE_SPLIT_TOP)); + else + m_view->setCloseSplitIcon(QIcon(Constants::ICON_CLOSE_SPLIT_BOTTOM)); + } + } } m_layout->setCurrentWidget(m_view); } diff --git a/src/plugins/coreplugin/editormanager/editorview.h b/src/plugins/coreplugin/editormanager/editorview.h index 6106002dad0..2ae6b04aafd 100644 --- a/src/plugins/coreplugin/editormanager/editorview.h +++ b/src/plugins/coreplugin/editormanager/editorview.h @@ -38,19 +38,21 @@ #include #include #include -#include #include #include +#include +#include + QT_BEGIN_NAMESPACE +class QAction; class QComboBox; -class QToolButton; +class QFrame; class QLabel; -class QStackedWidget; class QSplitter; class QStackedLayout; -class QAction; -class QFrame; +class QStackedWidget; +class QToolButton; QT_END_NAMESPACE namespace Core { @@ -94,6 +96,7 @@ public: QObject *object, const char *member); void hideEditorStatusBar(const QString &id); void setCloseSplitEnabled(bool enable); + void setCloseSplitIcon(const QIcon &icon); private slots: void closeView(); diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp index 1aeb7c6ad57..9c77a61305c 100644 --- a/src/plugins/coreplugin/editortoolbar.cpp +++ b/src/plugins/coreplugin/editortoolbar.cpp @@ -103,7 +103,7 @@ EditorToolBarPrivate::EditorToolBarPrivate(QWidget *parent, EditorToolBar *q) : m_goForwardAction(new QAction(QIcon(QLatin1String(Constants::ICON_NEXT)), EditorManager::tr("Go Forward"), parent)), m_splitButton(new QToolButton), m_horizontalSplitAction(new QAction(QIcon(QLatin1String(Constants::ICON_SPLIT_HORIZONTAL)), EditorManager::tr("Split"), parent)), - m_verticalSplitAction(new QAction(EditorManager::tr("Split Side by Side"), parent)), + m_verticalSplitAction(new QAction(QIcon(QLatin1String(Constants::ICON_SPLIT_VERTICAL)), EditorManager::tr("Split Side by Side"), parent)), m_closeSplitButton(new QToolButton), m_activeToolBar(0), m_toolBarPlaceholder(new QWidget), @@ -141,13 +141,11 @@ EditorToolBar::EditorToolBar(QWidget *parent) : d->m_editorList->setModel(d->m_editorsListModel); d->m_editorList->setMaxVisibleItems(40); d->m_editorList->setContextMenuPolicy(Qt::CustomContextMenu); - d->m_editorList->setProperty("hideborder", true); d->m_closeEditorButton->setAutoRaise(true); - d->m_closeEditorButton->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE))); + d->m_closeEditorButton->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_DOCUMENT))); d->m_closeEditorButton->setToolTip(tr("Close Document")); d->m_closeEditorButton->setEnabled(false); - d->m_closeEditorButton->setProperty("showborder", true); d->m_toolBarPlaceholder->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); @@ -165,13 +163,14 @@ EditorToolBar::EditorToolBar(QWidget *parent) : d->m_splitButton->setIcon(QIcon(QLatin1String(Constants::ICON_SPLIT_HORIZONTAL))); d->m_splitButton->setToolTip(tr("Split")); d->m_splitButton->setPopupMode(QToolButton::InstantPopup); + d->m_splitButton->setProperty("noArrow", true); QMenu *splitMenu = new QMenu(d->m_splitButton); splitMenu->addAction(d->m_horizontalSplitAction); splitMenu->addAction(d->m_verticalSplitAction); d->m_splitButton->setMenu(splitMenu); d->m_closeSplitButton->setAutoRaise(true); - d->m_closeSplitButton->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE))); + d->m_closeSplitButton->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM))); d->m_closeSplitButton->setToolTip(tr("Remove Split")); QHBoxLayout *toplayout = new QHBoxLayout(this); @@ -181,10 +180,10 @@ EditorToolBar::EditorToolBar(QWidget *parent) : toplayout->addWidget(d->m_forwardButton); toplayout->addWidget(d->m_lockButton); toplayout->addWidget(d->m_editorList); - toplayout->addWidget(d->m_closeEditorButton); toplayout->addWidget(d->m_toolBarPlaceholder, 1); // Custom toolbar stretches toplayout->addWidget(d->m_splitButton); toplayout->addWidget(d->m_closeSplitButton); + toplayout->addWidget(d->m_closeEditorButton); setLayout(toplayout); @@ -240,6 +239,11 @@ void EditorToolBar::setCloseSplitEnabled(bool enable) d->m_closeSplitButton->setVisible(enable); } +void EditorToolBar::setCloseSplitIcon(const QIcon &icon) +{ + d->m_closeSplitButton->setIcon(icon); +} + void EditorToolBar::closeEditor() { if (!currentEditor()) diff --git a/src/plugins/coreplugin/editortoolbar.h b/src/plugins/coreplugin/editortoolbar.h index c432e1662bd..b0164d496a4 100644 --- a/src/plugins/coreplugin/editortoolbar.h +++ b/src/plugins/coreplugin/editortoolbar.h @@ -37,6 +37,8 @@ #include +#include + namespace Core { class IEditor; @@ -79,6 +81,7 @@ public: void setCanGoForward(bool canGoForward); void removeToolbarForEditor(IEditor *editor); void setCloseSplitEnabled(bool enable); + void setCloseSplitIcon(const QIcon &icon); public slots: void updateEditorStatus(IEditor *editor); diff --git a/src/plugins/coreplugin/images/button_close.png b/src/plugins/coreplugin/images/button_close.png new file mode 100644 index 0000000000000000000000000000000000000000..f6d37fd18c5350c8746c4874eabbf5cc304e4cf1 GIT binary patch literal 1170 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFlS_jM3hAM`dB6B=jtVb)aX^@7BGN-jeSKyVsdtB zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tSWK~ za#KqZ6)JLb@`|l0Y?Z*~TICg6frRyy6u?SKvTcwn`Gtf;oFf&vz zGto0NF|ahT)KM@pFf`CNG}1RP*EKY-GBvj{FjRm7B|8P1qLehNAQv~NT}3Hrwn`Z# zB?VUc`sL;2dgaD?`9ucp-l$oBHmzd*{pIn-onpfiKVyje< zTcDScnPTPUWbS5YXl`O)Ze(C)VQ6S+?r7>{L}^;$U>r6!i- z7lq{K=fF}xKt_H^esM;Afr4|esh**NZ(?$09!LZfLEzB0a!D=9EK5ysE6UGR0Ee(u zCKeaCxf1d@L~jZ?p{8%AV51L89!SXrCKTl224aF!HYkYF>)1QjwCq-K1H& ziWwLf4tTmahE&{2`t$$4J+o>(M9*Ok+tn9LqVrqV%@DMdYK&_zWSuxi zhhytimNe@N+$_w3OEw6m-zTdoN38g=TPLx8j_=?DBj}q_`lAiw>%!}4A>qSEZ`1HHcfE&#N^Px$j~EZ Vb*61OmmjE<@O1TaS?83{1OR|3dOiRE literal 0 HcmV?d00001 diff --git a/src/plugins/coreplugin/images/filtericon.png b/src/plugins/coreplugin/images/filtericon.png index 3fae2defdecc62af31371f25c2e94ff7e509163e..76a833690ba8201afb37f20b2fde4e5abeb8df9e 100644 GIT binary patch literal 1079 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFlS_jM3hAM`dB6B=jtVb)aX^@7BGN-jeSKyVsdtB zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tSWK~ za#KqZ6)JLb@`|l0Y?Z*~TICg6frRyy6u?SKvTcwn`Gtf;oFf&vz zGto0NF|ahT)KM@pFf`CNG}1RP*EKY-GBvj{FjRm7B|8P1qLehNAQv~NT}3Hrwn`Z# zB?VUc`sL;2dgaD?`9ucp-l$oBHmzd*{pIn-onpfiKVyje< zTcDScnPTPUWbS5YXl`O)Ze(C)VQ6S+?r7>{L;ZjASMCcN2g5{K#?HF1n2Krol1B e^Sum=Yz#-;?)SH>TKWf+l|5bkT-G@yGywpL6IdPq delta 447 zcmdnaag%w1NAX(xXQ4*Y= zR#Ki=l*&+EUaps!mtCBkSdglhUz9%kosAR&17nz{i(`mI@7l>5y$?Hx9E*Q+v1=`x z$iamt)6~5e&Tei};M?_+y+kXLMeyMMWrZ4fjd^W;k@YOw_4rOE>4|VPI$RRiB{S(x z@k*($O0B;hG(X<`{`bLVYfiz$sT0Gq{aVcFYnzny0))vGToXfMjbXzKf!iNVZ8s@LuL<(E^$tnV{y%Z)CS;TN1J^0(Dv zl8W=`O>*9hZ_9qyw**U}Pw(d&;`oX=~J7{-y)PGS5$Z-qUQr zQ|lUNwP?);MZ;rpmd_1l`ef~UzrOg~Qxo5Kmq;Zed$-WgwQ=k7|5;4cWPMUOFLPFz z>S?28nX{%pU9#!EhUXC8h+49{oo`HdZ!PC{xWt~$(6997d Byx;%; diff --git a/src/plugins/coreplugin/images/linkicon.png b/src/plugins/coreplugin/images/linkicon.png index 4e4d4f7b7fbac77c23076501afd79910395a5fce..786c8d65ba995e2a8c8d591a3151f66b16400565 100644 GIT binary patch literal 1114 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFlS_jM3hAM`dB6B=jtVb)aX^@7BGN-jeSKyVsdtB zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tSWK~ za#KqZ6)JLb@`|l0Y?Z*~TICg6frRyy6u?SKvTcwn`Gtf;oFf&vz zGto0NF|ahT)KM@pFf`CNG}1RP*EKY-GBvj{FjRm7B|8P1qLehNAQv~NT}3Hrwn`Z# zB?VUc`sL;2dgaD?`9ucp-l$oBHmzd*{pIn-onpfiKVyje< zTcDScnPTPUWbS5YXl`O)Ze(C)VQ6S+?r7>{fo+ z1_p)>PZ!6Kid%OkM{^xe;9%r?aeXdn=F++W?Ps2Hm?dNxL8Zew$>-IThhjTC} Ow|lz!xvX}RV0 delta 567 zcmcb`ae-xmNAX(xXQ4*Y= zR#Ki=l*&+EUaps!mtCBkSdglhUz9%kosAR&1LIjw7sn8b-nEnMGok`Tj_v=wXphGd zK`W7V1-^q5{BoylyU8Tv(Xm5R{rI&Y4n5Z7_Jo%~R`n$tWt~n=*~@!ULBoIYg@Ybi zT94vB__uz4v-Qrt=ZDL!LSA-9L~UT-_jJzhzZP?f^^}#)2wn1d_n)!A=j2)Dh#4nl zGW@vDV9wrrP?#ZlazguIM$buI4ELCK>~d335)jmydTMpn)?bQJy={zlHlKd~{k=xl zr$d|8Br8oiCa3g^wVvU@%d*{1-4<_5((ik+^7`xTO$Q&O?Z1Cs@FJVw$;k~<o|RX#wx(^4oRa!8Q$wWc`pXg~2Dv`#8J~aF+`gGpR^MOzZ(?zr zInQG477Y$Xu2rk%J^%c(*+)%SV()&z{^Roe?T07dKg=+P;Sa;LNhhD=?YiPih;S=-*1?cU7b$JmkWo;d6D+OXFkU7r b|Kgk(B5Qh;S>zQ10|SGntDnm{r-UW|ugC=0 diff --git a/src/plugins/coreplugin/images/splitbutton_closebottom.png b/src/plugins/coreplugin/images/splitbutton_closebottom.png new file mode 100644 index 0000000000000000000000000000000000000000..08a7dda4754f69ff03d7adf1ae28b1aa9077b080 GIT binary patch literal 1080 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFlS_jM3hAM`dB6B=jtVb)aX^@7BGN-jeSKyVsdtB zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tSWK~ za#KqZ6)JLb@`|l0Y?Z*~TICg6frRyy6u?SKvTcwn`Gtf;oFf&vz zGto0NF|ahT)KM@pFf`CNG}1RP*EKY-GBvj{FjRm7B|8P1qLehNAQv~NT}3Hrwn`Z# zB?VUc`sL;2dgaD?`9ucp-l$oBHmzd*{pIn-onpfiKVyje< zTcDScnPTPUWbS5YXl`O)Ze(C)VQ6S+?r7>{rmS~(Y`CYIzE zh2-bwz*0a!Mt(_taYlZDf^)E`o}q$oVsd64NCXr?;Lx{nNiE7OOHFYr%Fk5*hp<&9 z78kg=67o4jZwfh~rf;WUqYp|RNXZ2z6y)LtVuDjPD3#kOAhJ(tUW%R3%k83pj_xHE>IWb}3!>^py=rL%rWwuE+c^k*+A2`$!aKk{bOKs8NhC5pf eK6pwh9AG$k!LqCF;d2g9UiNhLb6Mw<&;$UeFjn3G literal 0 HcmV?d00001 diff --git a/src/plugins/coreplugin/images/splitbutton_closeleft.png b/src/plugins/coreplugin/images/splitbutton_closeleft.png new file mode 100644 index 0000000000000000000000000000000000000000..2c3a2321eb4d3db54451a7f0f16965574125e1f1 GIT binary patch literal 1065 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFlS_jM3hAM`dB6B=jtVb)aX^@7BGN-jeSKyVsdtB zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tSWK~ za#KqZ6)JLb@`|l0Y?Z*~TICg6frRyy6u?SKvTcwn`Gtf;oFf&vz zGto0NF|ahT)KM@pFf`CNG}1RP*EKY-GBvj{FjRm7B|8P1qLehNAQv~NT}3Hrwn`Z# zB?VUc`sL;2dgaD?`9ucp-l$oBHmzd*{pIn-onpfiKVyje< zTcDScnPTPUWbS5YXl`O)Ze(C)VQ6S+?r7>{OxT>@= zuDq9caH-_X-t*NuFB+LHd*sY8NaT*}y3DBAwqb&Fg~0)f2Rj874lu+lP`w@;_+c|B O^Lo1axvX{(JaZG%Q-e|yQz{EjrrIztFlS_jM3hAM`dB6B=jtVb)aX^@7BGN-jeSKyVsdtB zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tSWK~ za#KqZ6)JLb@`|l0Y?Z*~TICg6frRyy6u?SKvTcwn`Gtf;oFf&vz zGto0NF|ahT)KM@pFf`CNG}1RP*EKY-GBvj{FjRm7B|8P1qLehNAQv~NT}3Hrwn`Z# zB?VUc`sL;2dgaD?`9ucp-l$oBHmzd*{pIn-onpfiKVyje< zTcDScnPTPUWbS5YXl`O)Ze(C)VQ6S+?r7>{RWfn|r_f@_G|h`~2cCLO zI>azrQD;dOL#JZ({(JaZG%Q-e|yQz{EjrrIztFlS_jM3hAM`dB6B=jtVb)aX^@7BGN-jeSKyVsdtB zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tSWK~ za#KqZ6)JLb@`|l0Y?Z*~TICg6frRyy6u?SKvTcwn`Gtf;oFf&vz zGto0NF|ahT)KM@pFf`CNG}1RP*EKY-GBvj{FjRm7B|8P1qLehNAQv~NT}3Hrwn`Z# zB?VUc`sL;2dgaD?`9ucp-l$oBHmzd*{pIn-onpfiKVyje< zTcDScnPTPUWbS5YXl`O)Ze(C)VQ6S+?r7>{RWfpd<&uoH$gb<$`SZW$ocX2x4Gl{MAHXXSBL+fIdi6Dg2a*I(j6}xe0+KYpK&=Q9(K`~(%I$awP@0# hmLnDqb_yySVA!UmBg!~e;u{(JaZG%Q-e|yQz{EjrrIztFlS_jM3hAM`dB6B=jtVb)aX^@7BGN-jeSKyVsdtB zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tSWK~ za#KqZ6)JLb@`|l0Y?Z*~TICg6frRyy6u?SKvTcwn`Gtf;oFf&vz zGto0NF|ahT)KM@pFf`CNG}1RP*EKY-GBvj{FjRm7B|8P1qLehNAQv~NT}3Hrwn`Z# zB?VUc`sL;2dgaD?`9ucp-l$oBHmzd*{pIn-onpfiKVyje< zTcDScnPTPUWbS5YXl`O)Ze(C)VQ6S+?r7>{hA7gu8w zM^j5fLsvs5GfO8|b3;o7s_ z1_p*8PZ!6Kid#v4{{OdUR&D5PbTZ)KNnjK_Ki~eifv@)8RdGK>@G&`unkm{ZKe5eDU3Pgg&e IbxsLQ0HzR0oB#j- delta 381 zcmZ3&F@t%6NAX(xXQ4*Y= zR#Ki=l*&+EUaps!mtCBkSdglhUz9%kosAR&1EZ*?i(`mI@6yYLeyt7yY!B)yI+S*p zcrdy*OtP+E_Io7gV{+`+=@q)YcN(|_6c#$1ag&ZYR)0)F{N{BB%fx*@)0vK(x$!w- z_b$d8(p$Y5<~{sd&X8Zvy(Q`(`v;Z;BZlP+>-tnJB##F!$*kJ_j;HCsx>c|2PH+0W zE!W<+A?ca({qN_cFY^bTvOZoY!?6FruMVCDo{y3ZroO+*UbAouMl$H}aI^^AYN&5W zjWjdfpYuhJVS-B8$-;z4G1226&tChoYn}XIgDcnKn0;JQER>c^;a~SUi_>JS&gs?@ zCC&{qExVM8n-V2{u$THYJbx*_l1;?*VC?l?r;h8o3G<%!FUy=F$Z()?UcC0wbK4k{ ketoKq&)T|o|7Y{bNvU7>7V%ACU|?YIboFyt=akR{0Fk(!D*ylh diff --git a/src/plugins/coreplugin/images/splitbutton_vertical.png b/src/plugins/coreplugin/images/splitbutton_vertical.png new file mode 100644 index 0000000000000000000000000000000000000000..4f78506cf0d07f635c0a834204194d06110687c7 GIT binary patch literal 1067 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFlS_jM3hAM`dB6B=jtVb)aX^@7BGN-jeSKyVsdtB zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tSWK~ za#KqZ6)JLb@`|l0Y?Z*~TICg6frRyy6u?SKvTcwn`Gtf;oFf&vz zGto0NF|ahT)KM@pFf`CNG}1RP*EKY-GBvj{FjRm7B|8P1qLehNAQv~NT}3Hrwn`Z# zB?VUc`sL;2dgaD?`9ucp-l$oBHmzd*{pIn-onpfiKVyje< zTcDScnPTPUWbS5YXl`O)Ze(C)VQ6S+?r7>{r6!i- z7lq{K=fF}xKt_H^esM;Afr4|esh**NZ(?$09!LZfLEzB0a!D=9EK5ysE6UGR0Ee(u zCKeaCxf1d@L~jZ?p{8%AV51L89!SXrCKTl224aF!HYkYF>)1QjwCq-Hwaq z;tUK7k)AG&Ar-fh{`~)M&#c*?y}vd$@?2>@tvP+|Z8 literal 0 HcmV?d00001 diff --git a/src/plugins/coreplugin/navigationsubwidget.cpp b/src/plugins/coreplugin/navigationsubwidget.cpp index 8181190976c..88fcb65ef45 100644 --- a/src/plugins/coreplugin/navigationsubwidget.cpp +++ b/src/plugins/coreplugin/navigationsubwidget.cpp @@ -88,7 +88,7 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget, int pos splitAction->setIcon(QIcon(QLatin1String(Constants::ICON_SPLIT_HORIZONTAL))); splitAction->setToolTip(tr("Split")); QToolButton *close = new QToolButton(); - close->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE))); + close->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP))); close->setToolTip(tr("Close")); toolBarLayout->addWidget(splitAction); diff --git a/src/plugins/coreplugin/sidebarwidget.cpp b/src/plugins/coreplugin/sidebarwidget.cpp index 5671a151a41..93f8b5ca471 100644 --- a/src/plugins/coreplugin/sidebarwidget.cpp +++ b/src/plugins/coreplugin/sidebarwidget.cpp @@ -83,7 +83,7 @@ SideBarWidget::SideBarWidget(SideBar *sideBar, const QString &id) QAction *closeAction = new QAction(tr("Close"), m_toolbar); closeAction->setToolTip(tr("Close")); - closeAction->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE))); + closeAction->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP))); connect(closeAction, SIGNAL(triggered()), this, SIGNAL(closeMe())); m_toolbar->addAction(closeAction); diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp index 1916a0bb229..5bfd80952f5 100644 --- a/src/plugins/projectexplorer/projecttreewidget.cpp +++ b/src/plugins/projectexplorer/projecttreewidget.cpp @@ -427,6 +427,7 @@ Core::NavigationView ProjectTreeWidgetFactory::createWidget() filter->setIcon(QIcon(QLatin1String(Core::Constants::ICON_FILTER))); filter->setToolTip(tr("Filter Tree")); filter->setPopupMode(QToolButton::InstantPopup); + filter->setProperty("noArrow", true); QMenu *filterMenu = new QMenu(filter); filterMenu->addAction(ptw->m_filterProjectsAction); filterMenu->addAction(ptw->m_filterGeneratedFilesAction); diff --git a/src/plugins/texteditor/outlinefactory.cpp b/src/plugins/texteditor/outlinefactory.cpp index 85ef0e4aa77..1af5354e0c9 100644 --- a/src/plugins/texteditor/outlinefactory.cpp +++ b/src/plugins/texteditor/outlinefactory.cpp @@ -72,6 +72,7 @@ OutlineWidgetStack::OutlineWidgetStack(OutlineFactory *factory) : m_filterButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_FILTER))); m_filterButton->setToolTip(tr("Filter tree")); m_filterButton->setPopupMode(QToolButton::InstantPopup); + m_filterButton->setProperty("noArrow", true); m_filterMenu = new QMenu(m_filterButton); m_filterButton->setMenu(m_filterMenu);