forked from qt-creator/qt-creator
Android: Hide AndroidSdkManagerDialog
Provide executeAndroidSdkManagerDialog() function instead. Change-Id: If7033ce797710f4dfbb7df0630962316b20c8a12 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
@@ -12,6 +12,7 @@
|
||||
#include <utils/qtcprocess.h>
|
||||
|
||||
#include <QCheckBox>
|
||||
#include <QDialog>
|
||||
#include <QDialogButtonBox>
|
||||
#include <QHeaderView>
|
||||
#include <QLineEdit>
|
||||
@@ -101,6 +102,16 @@ private:
|
||||
QString m_searchText;
|
||||
};
|
||||
|
||||
class AndroidSdkManagerDialog : public QDialog
|
||||
{
|
||||
public:
|
||||
AndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent);
|
||||
|
||||
private:
|
||||
AndroidSdkManager *m_sdkManager = nullptr;
|
||||
AndroidSdkModel *m_sdkModel = nullptr;
|
||||
};
|
||||
|
||||
AndroidSdkManagerDialog::AndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent)
|
||||
: QDialog(parent)
|
||||
, m_sdkManager(sdkManager)
|
||||
@@ -322,4 +333,10 @@ bool PackageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sour
|
||||
return showTopLevel || ((packageState(srcIndex) & m_packageState) && packageFound(srcIndex));
|
||||
}
|
||||
|
||||
void executeAndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent)
|
||||
{
|
||||
AndroidSdkManagerDialog dialog(sdkManager, parent);
|
||||
dialog.exec();
|
||||
}
|
||||
|
||||
} // Android::Internal
|
||||
|
@@ -2,23 +2,12 @@
|
||||
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
||||
#pragma once
|
||||
|
||||
#include "androidsdkmanager.h"
|
||||
|
||||
#include <QDialog>
|
||||
#include <QWidget>
|
||||
|
||||
namespace Android::Internal {
|
||||
|
||||
class AndroidSdkManager;
|
||||
class AndroidSdkModel;
|
||||
|
||||
class AndroidSdkManagerDialog : public QDialog
|
||||
{
|
||||
public:
|
||||
AndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent = nullptr);
|
||||
|
||||
private:
|
||||
AndroidSdkManager *m_sdkManager = nullptr;
|
||||
AndroidSdkModel *m_sdkModel = nullptr;
|
||||
};
|
||||
void executeAndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent);
|
||||
|
||||
} // Android::Internal
|
||||
|
@@ -495,8 +495,7 @@ AndroidSettingsWidget::AndroidSettingsWidget()
|
||||
m_androidProgress->show();
|
||||
});
|
||||
connect(sdkManagerToolButton, &QAbstractButton::clicked, this, [this] {
|
||||
AndroidSdkManagerDialog dialog(&m_sdkManager, this);
|
||||
dialog.exec();
|
||||
executeAndroidSdkManagerDialog(&m_sdkManager, this);
|
||||
});
|
||||
connect(sdkToolsAutoDownloadButton, &QAbstractButton::clicked,
|
||||
this, &AndroidSettingsWidget::downloadSdk);
|
||||
|
Reference in New Issue
Block a user