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

Android: Hide AndroidSdkManagerDialog

Browse Source 
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:
Jarek Kobus
2024-05-03 18:37:12 +02:00
parent 1de932437a
commit e2612705b1
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/android/androidsdkmanagerdialog.cpp
View File

@@ -12,6 +12,7 @@
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <QCheckBox> #include <QCheckBox>
#include <QDialog>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QHeaderView> #include <QHeaderView>
#include <QLineEdit> #include <QLineEdit>
@@ -101,6 +102,16 @@ private:
QString m_searchText; 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) AndroidSdkManagerDialog::AndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent)
: QDialog(parent) : QDialog(parent)
, m_sdkManager(sdkManager) , m_sdkManager(sdkManager)
@@ -322,4 +333,10 @@ bool PackageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sour
return showTopLevel || ((packageState(srcIndex) & m_packageState) && packageFound(srcIndex)); return showTopLevel || ((packageState(srcIndex) & m_packageState) && packageFound(srcIndex));
} }
void executeAndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent)
{
AndroidSdkManagerDialog dialog(sdkManager, parent);
dialog.exec();
}
} // Android::Internal } // Android::Internal

15
src/plugins/android/androidsdkmanagerdialog.h
View File

@@ -2,23 +2,12 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#pragma once #pragma once
#include "androidsdkmanager.h" #include <QWidget>
#include <QDialog>
namespace Android::Internal { namespace Android::Internal {
class AndroidSdkManager; class AndroidSdkManager;
class AndroidSdkModel;
class AndroidSdkManagerDialog : public QDialog void executeAndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent);
{
public:
AndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent = nullptr);
private:
AndroidSdkManager *m_sdkManager = nullptr;
AndroidSdkModel *m_sdkModel = nullptr;
};
} // Android::Internal } // Android::Internal

3
src/plugins/android/androidsettingswidget.cpp
View File

@@ -495,8 +495,7 @@ AndroidSettingsWidget::AndroidSettingsWidget()
m_androidProgress->show(); m_androidProgress->show();
}); });
connect(sdkManagerToolButton, &QAbstractButton::clicked, this, [this] { connect(sdkManagerToolButton, &QAbstractButton::clicked, this, [this] {
AndroidSdkManagerDialog dialog(&m_sdkManager, this); executeAndroidSdkManagerDialog(&m_sdkManager, this);
dialog.exec();
}); });
connect(sdkToolsAutoDownloadButton, &QAbstractButton::clicked, connect(sdkToolsAutoDownloadButton, &QAbstractButton::clicked,
this, &AndroidSettingsWidget::downloadSdk); this, &AndroidSettingsWidget::downloadSdk);