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

QmlDesigner: Replace custom +/- button icons in connectioneditor

Browse Source 
Use the themable ones from Core::Icons instead

Change-Id: I45e831e9b0586bfde6468acca07b6138b48f82e0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2016-07-01 16:53:19 +02:00
committed by Alessandro Portale
parent 0db6f2a372
commit e2dab0cf07
5 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectioneditor.qrc
View File

@@ -1,7 +1,5 @@
<RCC> <RCC>
<qresource prefix="/connectionview"> <qresource prefix="/connectionview">
<file>stylesheet.css</file> <file>stylesheet.css</file>
<file>plus.png</file>
<file>minus.png</file>
</qresource> </qresource>
</RCC> </RCC>

5
src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.cpp
View File

@@ -33,6 +33,7 @@
#include "dynamicpropertiesmodel.h" #include "dynamicpropertiesmodel.h"
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/coreicons.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <QToolButton> #include <QToolButton>
@@ -118,13 +119,13 @@ QList<QToolButton *> ConnectionViewWidget::createToolBarWidgets()
QList<QToolButton *> buttons; QList<QToolButton *> buttons;
buttons << new QToolButton(); buttons << new QToolButton();
buttons.last()->setIcon(QIcon(QStringLiteral(":/connectionview/plus.png"))); buttons.last()->setIcon(Core::Icons::PLUS.icon());
buttons.last()->setToolTip(tr("Add binding or connection.")); buttons.last()->setToolTip(tr("Add binding or connection."));
connect(buttons.last(), SIGNAL(clicked()), this, SLOT(addButtonClicked())); connect(buttons.last(), SIGNAL(clicked()), this, SLOT(addButtonClicked()));
connect(this, SIGNAL(setEnabledAddButton(bool)), buttons.last(), SLOT(setEnabled(bool))); connect(this, SIGNAL(setEnabledAddButton(bool)), buttons.last(), SLOT(setEnabled(bool)));
buttons << new QToolButton(); buttons << new QToolButton();
buttons.last()->setIcon(QIcon(QStringLiteral(":/connectionview/minus.png"))); buttons.last()->setIcon(Core::Icons::MINUS.icon());
buttons.last()->setToolTip(tr("Remove selected binding or connection.")); buttons.last()->setToolTip(tr("Remove selected binding or connection."));
buttons.last()->setShortcut(QKeySequence(Qt::Key_Delete)); buttons.last()->setShortcut(QKeySequence(Qt::Key_Delete));
connect(buttons.last(), SIGNAL(clicked()), this, SLOT(removeButtonClicked())); connect(buttons.last(), SIGNAL(clicked()), this, SLOT(removeButtonClicked()));

BIN
src/plugins/qmldesigner/qmldesignerextension/connectioneditor/minus.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 189 B

BIN
src/plugins/qmldesigner/qmldesignerextension/connectioneditor/plus.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 197 B

2
src/plugins/qmldesigner/qmldesignerplugin.qbs
View File

@@ -583,8 +583,6 @@ Project {
"connectioneditor/connectionviewwidget.ui", "connectioneditor/connectionviewwidget.ui",
"connectioneditor/dynamicpropertiesmodel.cpp", "connectioneditor/dynamicpropertiesmodel.cpp",
"connectioneditor/dynamicpropertiesmodel.h", "connectioneditor/dynamicpropertiesmodel.h",
"connectioneditor/minus.png",
"connectioneditor/plus.png",
"connectioneditor/stylesheet.css", "connectioneditor/stylesheet.css",
"pathtool/controlpoint.cpp", "pathtool/controlpoint.cpp",
"pathtool/controlpoint.h", "pathtool/controlpoint.h",