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

Android: Make runconfiguration use aspects

Browse Source 
Change-Id: I6d89de901e64b2f29d62073e458eb6cd86c44acd
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
hjk
2018-05-04 16:01:13 +02:00
parent 54d6e3ad7b
commit 2487768388
11 changed files with 160 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/android/adbcommandswidget.cpp
View File

@@ -54,7 +54,7 @@ static void swapData(QStringListModel *model, const QModelIndex &srcIndex,
class AdbCommandsWidgetPrivate
{
public:
AdbCommandsWidgetPrivate(const AdbCommandsWidget &parent, QWidget *parentWidget);
AdbCommandsWidgetPrivate(AdbCommandsWidget *parent);
~AdbCommandsWidgetPrivate();
private:
@@ -65,16 +65,15 @@ private:
void onRemove();
void onCurrentIndexChanged(const QModelIndex &newIndex, const QModelIndex &prevIndex);
const AdbCommandsWidget &m_parent;
QGroupBox *m_rootWidget = nullptr;
AdbCommandsWidget *q;
Ui::AdbCommandsWidget *m_ui = nullptr;
QStringListModel *m_stringModel = nullptr;
friend class AdbCommandsWidget;
};
AdbCommandsWidget::AdbCommandsWidget(QWidget *parent) :
QObject(parent),
d(new AdbCommandsWidgetPrivate(*this, parent))
QGroupBox(parent),
d(new AdbCommandsWidgetPrivate(this))
{
}
@@ -87,14 +86,9 @@ QStringList AdbCommandsWidget::commandsList() const
return d->m_stringModel->stringList();
}
QWidget *AdbCommandsWidget::widget() const
{
return d->m_rootWidget;
}
void AdbCommandsWidget::setTitleText(const QString &title)
{
d->m_rootWidget->setTitle(title);
setTitle(title);
}
void AdbCommandsWidget::setCommandList(const QStringList &commands)
@@ -102,14 +96,12 @@ void AdbCommandsWidget::setCommandList(const QStringList &commands)
d->m_stringModel->setStringList(commands);
}
AdbCommandsWidgetPrivate::AdbCommandsWidgetPrivate(const AdbCommandsWidget &parent,
QWidget *parentWidget):
m_parent(parent),
m_rootWidget(new QGroupBox(parentWidget)),
AdbCommandsWidgetPrivate::AdbCommandsWidgetPrivate(AdbCommandsWidget *q):
q(q),
m_ui(new Ui::AdbCommandsWidget),
m_stringModel(new QStringListModel)
{
m_ui->setupUi(m_rootWidget);
m_ui->setupUi(q);
m_ui->addButton->setIcon(Utils::Icons::PLUS.icon());
m_ui->removeButton->setIcon(Utils::Icons::MINUS.icon());
m_ui->moveUpButton->setIcon(Utils::Icons::ARROW_UP.icon());
@@ -131,9 +123,9 @@ AdbCommandsWidgetPrivate::AdbCommandsWidgetPrivate(const AdbCommandsWidget &pare
m_ui->commandsView->setModel(m_stringModel);
QObject::connect(m_stringModel, &QStringListModel::dataChanged,
&m_parent, &AdbCommandsWidget::commandsChanged);
q, &AdbCommandsWidget::commandsChanged);
QObject::connect(m_stringModel, &QStringListModel::rowsRemoved,
&m_parent, &AdbCommandsWidget::commandsChanged);
q, &AdbCommandsWidget::commandsChanged);
QObject::connect(m_ui->commandsView->selectionModel(), &QItemSelectionModel::currentChanged,
std::bind(&AdbCommandsWidgetPrivate::onCurrentIndexChanged, this, _1, _2));
}