QmlDesigner: Replace redundant images + remove unused files
Replaces some redundant icons files with already available, themeble and HighDPI-able Utils::Icons. The removed files are mostly images which haven't been used since a while. Change-Id: I1c17eb176a0d3d0a80335b43909012eab822c6b1 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
@@ -26,6 +26,7 @@
|
||||
#include "easingcontextpane.h"
|
||||
#include "ui_easingcontextpane.h"
|
||||
#include <qmljs/qmljspropertyreader.h>
|
||||
#include <utils/utilsicons.h>
|
||||
|
||||
#include <QGraphicsPixmapItem>
|
||||
#include <QGraphicsScene>
|
||||
@@ -124,9 +125,7 @@ EasingContextPane::EasingContextPane(QWidget *parent) :
|
||||
m_easingGraph->raise();
|
||||
setLinear();
|
||||
|
||||
ui->playButton->setIcon(QIcon(QLatin1String(":/playicon.png")));
|
||||
|
||||
|
||||
ui->playButton->setIcon(Utils::Icons::RUN_SMALL.icon());
|
||||
|
||||
setGraphDisplayMode(GraphMode);
|
||||
|
||||
@@ -228,14 +227,14 @@ void EasingContextPane::startAnimation()
|
||||
m_simulation->stop();
|
||||
} else {
|
||||
m_simulation->animate(ui->durationSpinBox->value(), m_easingGraph->easingCurve());
|
||||
ui->playButton->setIcon(QIcon(QLatin1String(":/stopicon.png")));
|
||||
ui->playButton->setIcon(Utils::Icons::STOP_SMALL.icon());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void EasingContextPane::switchToGraph()
|
||||
{
|
||||
ui->playButton->setIcon(QIcon(QLatin1String(":/playicon.png")));
|
||||
ui->playButton->setIcon(Utils::Icons::RUN_SMALL.icon());
|
||||
setGraphDisplayMode(GraphMode);
|
||||
}
|
||||
|
||||
|
@@ -1,7 +1,5 @@
|
||||
<RCC>
|
||||
<qresource prefix="/">
|
||||
<file>qt_logo.png</file>
|
||||
<file>playicon.png</file>
|
||||
<file>stopicon.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
Before Width: | Height: | Size: 100 B |
Before Width: | Height: | Size: 78 B |
Before Width: | Height: | Size: 116 B |
Before Width: | Height: | Size: 525 B |
@@ -4,8 +4,6 @@
|
||||
<file>images/checkbox_indicator@2x.png</file>
|
||||
<file>images/tr.png</file>
|
||||
<file>images/tr@2x.png</file>
|
||||
<file>images/lock.png</file>
|
||||
<file>images/hole.png</file>
|
||||
<file>images/scrollbar-borderimage-horizontal.png</file>
|
||||
<file>images/scrollbar-borderimage-vertical.png</file>
|
||||
<file>images/aspectlockset.png</file>
|
||||
|
@@ -12,6 +12,5 @@
|
||||
<file>export_checked@2x.png</file>
|
||||
<file>export_unchecked.png</file>
|
||||
<file>export_unchecked@2x.png</file>
|
||||
<file>warning.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
@@ -102,8 +102,10 @@ NavigatorView::NavigatorView(QObject* parent) :
|
||||
Icons::EXPORT_UNCHECKED.pixmap());
|
||||
|
||||
#ifdef _LOCK_ITEMS_
|
||||
IconCheckboxItemDelegate *lockDelegate = new IconCheckboxItemDelegate(this,":/qmldesigner/images/lock.png",
|
||||
":/qmldesigner/images/hole.png",m_treeModel.data());
|
||||
IconCheckboxItemDelegate *lockDelegate =
|
||||
new IconCheckboxItemDelegate(this,
|
||||
Utils::Icons::LOCKED_TOOLBAR.pixmap(),
|
||||
Utils::Icons::UNLOCKED_TOOLBAR.pixmap());
|
||||
#endif
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 287 B |
Before Width: | Height: | Size: 898 B |
Before Width: | Height: | Size: 898 B |
Before Width: | Height: | Size: 898 B |
Before Width: | Height: | Size: 390 B |
Before Width: | Height: | Size: 379 B |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 4.7 KiB |
Before Width: | Height: | Size: 533 B |
@@ -27,5 +27,3 @@ HEADERS += propertyeditorview.h \
|
||||
qmlmodelnodeproxy.h
|
||||
|
||||
QT += qml quick
|
||||
|
||||
RESOURCES += propertyeditor.qrc
|
||||
|
@@ -1,12 +0,0 @@
|
||||
<RCC>
|
||||
<qresource prefix="/">
|
||||
<file>images/button_hovered.png</file>
|
||||
<file>images/button_normal.png</file>
|
||||
<file>images/button_pressed.png</file>
|
||||
<file>images/button2_hovered.png</file>
|
||||
<file>images/button2_normal.png</file>
|
||||
<file>images/button2_pressed.png</file>
|
||||
<file>images/frame.png</file>
|
||||
<file>images/gradient.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
@@ -94,8 +94,6 @@ PropertyEditorQmlBackend::PropertyEditorQmlBackend(PropertyEditorView *propertyE
|
||||
m_view(new Quick2PropertyEditorView), m_propertyEditorTransaction(new PropertyEditorTransaction(propertyEditor)), m_dummyPropertyEditorValue(new PropertyEditorValue()),
|
||||
m_contextObject(new PropertyEditorContextObject())
|
||||
{
|
||||
Q_ASSERT(QFileInfo(QLatin1String(":/images/button_normal.png")).exists());
|
||||
|
||||
m_view->engine()->setOutputWarningsToStandardError(QmlDesignerPlugin::instance()
|
||||
->settings().value(DesignerSettingsKey::SHOW_PROPERTYEDITOR_WARNINGS).toBool());
|
||||
|
||||
|
@@ -1,6 +1,5 @@
|
||||
<RCC>
|
||||
<qresource prefix="/qmldesigner">
|
||||
<file>templates/Standard/Form.xml</file>
|
||||
<file>stylesheet.css</file>
|
||||
<file>scrollbar.css</file>
|
||||
<file>formeditorstylesheet.css</file>
|
||||
|
@@ -1,10 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<QWidget objectName="Form" width="186" height="141">
|
||||
<windowTitle><?i18n?>Form</windowTitle>
|
||||
<QVBoxLayout objectName="verticalLayout">
|
||||
<!--Start of QLayoutItem 1--><QLabel objectName="label">
|
||||
<text><?i18n?>Hello world</text>
|
||||
</QLabel>
|
||||
<!--End of QLayoutItem 1--><!--Start of QLayoutItem 1--><QPlainTextEdit objectName="plainTextEdit"/>
|
||||
<!--End of QLayoutItem 1--></QVBoxLayout>
|
||||
</QWidget>
|