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

QmlDesigner: convert itemIds to real entries

Browse Source 
Change-Id: I421d20a33f8f30fe796f72e4500a2756b97c7983
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Tim Jenssen
2014-06-19 17:50:34 +02:00
parent 1da0d018c2
commit 2e06f98a3b
7 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
View File

@@ -64,8 +64,7 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) :
m_iconProvider(m_resIconSize),
m_itemsView(new QQuickView()),
m_resourcesView(new ItemLibraryTreeView(this)),
m_filterFlag(QtBasic),
m_itemLibraryId(-1)
m_filterFlag(QtBasic)
{
ItemLibraryModel::registerQmlTypes();
@@ -79,6 +78,7 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) :
rootContext->setContextProperty(QStringLiteral("itemLibraryModel"), m_itemLibraryModel.data());
rootContext->setContextProperty(QStringLiteral("itemLibraryIconWidth"), m_itemIconSize.width());
rootContext->setContextProperty(QStringLiteral("itemLibraryIconHeight"), m_itemIconSize.height());
rootContext->setContextProperty(QStringLiteral("rootView"), this);
m_itemsView->rootContext()->setContextProperty(QStringLiteral("highlightColor"), Utils::StyleHelper::notTooBrightHighlightColor());
@@ -297,10 +297,6 @@ void ItemLibraryWidget::reloadQmlSource()
QTC_ASSERT(QFileInfo::exists(itemLibraryQmlFilePath), return);
m_itemsView->engine()->clearComponentCache();
m_itemsView->setSource(QUrl::fromLocalFile(itemLibraryQmlFilePath));
QQuickItem *rootItem = qobject_cast<QQuickItem*>(m_itemsView->rootObject());
connect(rootItem, SIGNAL(itemSelected(int)), this, SLOT(showItemInfo(int)));
connect(rootItem, SIGNAL(itemDragged(int)), this, SLOT(startDragAndDropDelayed(int)));
}
void ItemLibraryWidget::setImportFilter(FilterChangeFlag flag)
@@ -373,28 +369,23 @@ void ItemLibraryWidget::setResourcePath(const QString &resourcePath)
updateSearch();
}
void ItemLibraryWidget::startDragAndDropDelayed(int itemLibraryId)
void ItemLibraryWidget::startDragAndDropDelayed(QVariant itemLibraryId)
{
m_itemLibraryId = itemLibraryId;
m_currentitemLibraryEntry = itemLibraryId.value<ItemLibraryEntry>();
QTimer::singleShot(0, this, SLOT(startDragAndDrop()));
}
void ItemLibraryWidget::startDragAndDrop()
{
QMimeData *mimeData = m_itemLibraryModel->getMimeData(m_itemLibraryId);
QMimeData *mimeData = m_itemLibraryModel->getMimeData(m_currentitemLibraryEntry);
QDrag *drag = new QDrag(this);
drag->setPixmap(m_itemLibraryModel->getLibraryEntryIcon(m_itemLibraryId));
drag->setPixmap(m_currentitemLibraryEntry.libraryEntryIconPath());
drag->setMimeData(mimeData);
drag->exec();
}
void ItemLibraryWidget::showItemInfo(int /*itemLibId*/)
{
// qDebug() << "showing item info about id" << itemLibId;
}
void ItemLibraryWidget::removeImport(const QString &name)
{
if (!m_model)