diff options
author | BogDan Vatra <bogdan@kde.org> | 2015-01-23 11:06:54 +0200 |
---|---|---|
committer | BogDan Vatra <bogdan@kde.org> | 2015-01-23 11:07:13 +0100 |
commit | 309d38c8f0434c551fe6a4161dab5614ce0419ea (patch) | |
tree | dd016fc667fe95e7659870dde160191e897c698d | |
parent | 7af11ebaf9aeeeee5075a429c349dcc7e3f9153f (diff) | |
download | qt-creator-309d38c8f0434c551fe6a4161dab5614ce0419ea.tar.gz |
Sort the possible import list.
Change-Id: Iaa77273ebaf0867119f06c6ee3c2d29a61168933
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
-rw-r--r-- | src/plugins/qmldesigner/components/importmanager/importswidget.cpp | 55 | ||||
-rw-r--r-- | src/plugins/qmldesigner/components/importmanager/importswidget.h | 2 |
2 files changed, 29 insertions, 28 deletions
diff --git a/src/plugins/qmldesigner/components/importmanager/importswidget.cpp b/src/plugins/qmldesigner/components/importmanager/importswidget.cpp index 4102b96523..df5d94b78a 100644 --- a/src/plugins/qmldesigner/components/importmanager/importswidget.cpp +++ b/src/plugins/qmldesigner/components/importmanager/importswidget.cpp @@ -64,33 +64,6 @@ static bool isImportAlreadyUsed(const Import &import, QList<ImportLabel*> import return false; } -void ImportsWidget::setPossibleImports(const QList<Import> &possibleImports) -{ - m_addImportComboBox->clear(); - foreach (const Import &possibleImport, possibleImports) { - if (!isImportAlreadyUsed(possibleImport, m_importLabels)) - m_addImportComboBox->addItem(possibleImport.toString(true), QVariant::fromValue(possibleImport)); - } -} - -void ImportsWidget::removePossibleImports() -{ - m_addImportComboBox->clear(); -} - -void ImportsWidget::setUsedImports(const QList<Import> &usedImports) -{ - foreach (ImportLabel *importLabel, m_importLabels) - importLabel->setReadOnly(usedImports.contains(importLabel->import())); - -} - -void ImportsWidget::removeUsedImports() -{ - foreach (ImportLabel *importLabel, m_importLabels) - importLabel->setEnabled(true); -} - static bool importLess(const Import &firstImport, const Import &secondImport) { if (firstImport.url() == secondImport.url()) @@ -117,6 +90,34 @@ static bool importLess(const Import &firstImport, const Import &secondImport) return false; } +void ImportsWidget::setPossibleImports(QList<Import> possibleImports) +{ + Utils::sort(possibleImports, importLess); + m_addImportComboBox->clear(); + foreach (const Import &possibleImport, possibleImports) { + if (!isImportAlreadyUsed(possibleImport, m_importLabels)) + m_addImportComboBox->addItem(possibleImport.toString(true), QVariant::fromValue(possibleImport)); + } +} + +void ImportsWidget::removePossibleImports() +{ + m_addImportComboBox->clear(); +} + +void ImportsWidget::setUsedImports(const QList<Import> &usedImports) +{ + foreach (ImportLabel *importLabel, m_importLabels) + importLabel->setReadOnly(usedImports.contains(importLabel->import())); + +} + +void ImportsWidget::removeUsedImports() +{ + foreach (ImportLabel *importLabel, m_importLabels) + importLabel->setEnabled(true); +} + void ImportsWidget::setImports(const QList<Import> &imports) { qDeleteAll(m_importLabels); diff --git a/src/plugins/qmldesigner/components/importmanager/importswidget.h b/src/plugins/qmldesigner/components/importmanager/importswidget.h index 5716f23915..c0a1920bc5 100644 --- a/src/plugins/qmldesigner/components/importmanager/importswidget.h +++ b/src/plugins/qmldesigner/components/importmanager/importswidget.h @@ -52,7 +52,7 @@ public: void setImports(const QList<Import> &imports); void removeImports(); - void setPossibleImports(const QList<Import> &possibleImports); + void setPossibleImports(QList<Import> possibleImports); void removePossibleImports(); void setUsedImports(const QList<Import> &possibleImports); |