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

ManageDefinitionsDialog: download exact url in sorted TableWidget

Browse Source 
If TableWidget was sorted by user, position in QList of metadata and in
View differs.
Side effects:
- QTableWidget sorted by first column by default
- Connections are moved to Qt5 style

Change-Id: I4a15e2cc9394431719ed1e2dd88f713af43c40d0
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Nikita Baryshnikov
2015-01-14 16:14:25 +03:00
committed by David Schulz
parent a9014e074d
commit 102e49ca37
2 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp
View File

@@ -37,8 +37,6 @@
#include <QFileInfo> #include <QFileInfo>
#include <QMessageBox> #include <QMessageBox>
#include <QDebug>
using namespace TextEditor; using namespace TextEditor;
using namespace Internal; using namespace Internal;
@@ -47,30 +45,30 @@ ManageDefinitionsDialog::ManageDefinitionsDialog(
const QString &path, const QString &path,
QWidget *parent) : QWidget *parent) :
QDialog(parent), QDialog(parent),
m_definitionsMetaData(metaDataList),
m_path(path) m_path(path)
{ {
ui.setupUi(this); ui.setupUi(this);
ui.definitionsTable->setHorizontalHeaderLabels( ui.definitionsTable->setHorizontalHeaderLabels(
QStringList() << tr("Name") << tr("Installed") << tr("Available")); QStringList() << tr("Name") << tr("Installed") << tr("Available"));
ui.definitionsTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch); ui.definitionsTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
ui.definitionsTable->sortItems(0);
setWindowTitle(tr("Download Definitions")); setWindowTitle(tr("Download Definitions"));
populateDefinitionsWidget(); populateDefinitionsWidget(metaDataList);
connect(ui.downloadButton, SIGNAL(clicked()), this, SLOT(downloadDefinitions())); connect(ui.downloadButton, &QPushButton::clicked, this, &ManageDefinitionsDialog::downloadDefinitions);
connect(ui.allButton, SIGNAL(clicked()), this, SLOT(selectAll())); connect(ui.allButton, &QPushButton::clicked, this, &ManageDefinitionsDialog::selectAll);
connect(ui.clearButton, SIGNAL(clicked()), this, SLOT(clearSelection())); connect(ui.clearButton, &QPushButton::clicked, this, &ManageDefinitionsDialog::clearSelection);
connect(ui.invertButton, SIGNAL(clicked()), this, SLOT(invertSelection())); connect(ui.invertButton, &QPushButton::clicked, this, &ManageDefinitionsDialog::invertSelection);
} }
void ManageDefinitionsDialog::populateDefinitionsWidget() void ManageDefinitionsDialog::populateDefinitionsWidget(const QList<DefinitionMetaDataPtr> &definitionsMetaData)
{ {
const int size = m_definitionsMetaData.size(); const int size = definitionsMetaData.size();
ui.definitionsTable->setRowCount(size); ui.definitionsTable->setRowCount(size);
for (int i = 0; i < size; ++i) { for (int i = 0; i < size; ++i) {
const HighlightDefinitionMetaData &downloadData = *m_definitionsMetaData.at(i); const HighlightDefinitionMetaData &downloadData = *definitionsMetaData.at(i);
// Look for this definition in the current path specified by the user, not the one // Look for this definition in the current path specified by the user, not the one
// stored in the settings. So the manager should not be queried for this information. // stored in the settings. So the manager should not be queried for this information.
@@ -87,6 +85,7 @@ void ManageDefinitionsDialog::populateDefinitionsWidget()
QTableWidgetItem *item = new QTableWidgetItem; QTableWidgetItem *item = new QTableWidgetItem;
if (j == 0) { if (j == 0) {
item->setText(downloadData.name); item->setText(downloadData.name);
item->setData(Qt::UserRole, downloadData.url);
} else if (j == 1) { } else if (j == 1) {
item->setText(dirVersion); item->setText(dirVersion);
item->setTextAlignment(Qt::AlignCenter); item->setTextAlignment(Qt::AlignCenter);
@@ -110,8 +109,10 @@ void ManageDefinitionsDialog::downloadDefinitions()
} }
QList<QUrl> urls; QList<QUrl> urls;
foreach (const QModelIndex &index, ui.definitionsTable->selectionModel()->selectedRows()) foreach (const QModelIndex &index, ui.definitionsTable->selectionModel()->selectedRows()) {
urls.append(m_definitionsMetaData.at(index.row())->url); const QVariant url = ui.definitionsTable->item(index.row(), 0)->data(Qt::UserRole);
urls.append(url.toUrl());
}
Manager::instance()->downloadDefinitions(urls, m_path); Manager::instance()->downloadDefinitions(urls, m_path);
accept(); accept();
} }

9
src/plugins/texteditor/generichighlighter/managedefinitionsdialog.h
View File

@@ -34,8 +34,6 @@
#include "ui_managedefinitionsdialog.h" #include "ui_managedefinitionsdialog.h"
#include "highlightdefinitionmetadata.h" #include "highlightdefinitionmetadata.h"
#include <QList>
namespace TextEditor { namespace TextEditor {
namespace Internal { namespace Internal {
@@ -48,16 +46,13 @@ public:
const QString &path, const QString &path,
QWidget *parent = 0); QWidget *parent = 0);
private slots: private:
void downloadDefinitions(); void downloadDefinitions();
void selectAll(); void selectAll();
void clearSelection(); void clearSelection();
void invertSelection(); void invertSelection();
void populateDefinitionsWidget(const QList<DefinitionMetaDataPtr> &definitionsMetaData);
private:
void populateDefinitionsWidget();
QList<DefinitionMetaDataPtr> m_definitionsMetaData;
QString m_path; QString m_path;
Ui::ManageDefinitionsDialog ui; Ui::ManageDefinitionsDialog ui;
}; };