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

Android: Introduce QuestionProgressDialog

Browse Source 
It's going to replace AndroidSdkManagerWidget's m_outputStack.

Change-Id: I1307c8413a772d574715db90ddb8fecc05038070
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2024-04-26 14:34:25 +02:00
parent 546f25c3de
commit ef85a983c0
1 changed files with 86 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/plugins/android/androidsdkmanager.cpp
View File

@@ -6,14 +6,21 @@
#include "androidtr.h"
#include "sdkmanageroutputparser.h"
#include <coreplugin/icore.h>
#include <utils/algorithm.h>
#include <utils/async.h>
#include <utils/layoutbuilder.h>
#include <utils/outputformatter.h>
#include <utils/qtcprocess.h>
#include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <QFutureWatcher>
#include <QDialogButtonBox>
#include <QLoggingCategory>
#include <QPlainTextEdit>
#include <QProgressBar>
#include <QReadWriteLock>
#include <QRegularExpression>
#include <QTextCodec>
@@ -31,6 +38,83 @@ using namespace std::chrono_literals;
namespace Android {
namespace Internal {
class QuestionProgressDialog : public QDialog
{
Q_OBJECT
public:
QuestionProgressDialog(QWidget *parent)
: QDialog(parent)
, m_outputTextEdit(new QPlainTextEdit)
, m_questionLabel(new QLabel(Tr::tr("Do you want to accept the Android SDK license?")))
, m_answerButtonBox(new QDialogButtonBox)
, m_progressBar(new QProgressBar)
, m_dialogButtonBox(new QDialogButtonBox)
, m_formatter(new OutputFormatter)
{
setWindowTitle(Tr::tr("Android SDK Manager"));
m_outputTextEdit->setReadOnly(true);
m_questionLabel->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
m_answerButtonBox->setStandardButtons(QDialogButtonBox::No | QDialogButtonBox::Yes);
m_dialogButtonBox->setStandardButtons(QDialogButtonBox::Cancel);
m_formatter->setPlainTextEdit(m_outputTextEdit);
m_formatter->setParent(this);
using namespace Layouting;
Column {
m_outputTextEdit,
Row { m_questionLabel, m_answerButtonBox },
m_progressBar,
m_dialogButtonBox
}.attachTo(this);
setQuestionVisible(false);
setQuestionEnabled(false);
connect(m_answerButtonBox, &QDialogButtonBox::rejected, this, [this] {
emit answerClicked(false);
});
connect(m_answerButtonBox, &QDialogButtonBox::accepted, this, [this] {
emit answerClicked(true);
});
connect(m_dialogButtonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
// GUI tuning
setModal(true);
resize(800, 600);
show();
}
void setQuestionEnabled(bool enable)
{
m_questionLabel->setEnabled(enable);
m_answerButtonBox->setEnabled(enable);
}
void setQuestionVisible(bool visible)
{
m_questionLabel->setVisible(visible);
m_answerButtonBox->setVisible(visible);
}
void appendMessage(const QString &text, OutputFormat format)
{
m_formatter->appendMessage(text, format);
m_outputTextEdit->ensureCursorVisible();
}
void setProgress(int value) { m_progressBar->setValue(value); }
signals:
void answerClicked(bool accepted);
private:
QPlainTextEdit *m_outputTextEdit = nullptr;
QLabel *m_questionLabel = nullptr;
QDialogButtonBox *m_answerButtonBox = nullptr;
QProgressBar *m_progressBar = nullptr;
QDialogButtonBox *m_dialogButtonBox = nullptr;
OutputFormatter *m_formatter = nullptr;
};
const int sdkManagerCmdTimeoutS = 60;
const int sdkManagerOperationTimeoutS = 600;
@@ -645,3 +729,5 @@ void AndroidSdkManagerPrivate::clearPackages()
} // namespace Internal
} // namespace Android
#include "androidsdkmanager.moc"