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

Android: Hide QDialogButtonBox inside cpp

Browse Source 
Change-Id: I0f10933884d3a95e774defe9b1f5125a5b1eee39
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-05-03 17:27:20 +02:00
parent f5511bcd26
commit 1de932437a
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,9 +139,9 @@ AndroidSdkManagerDialog::AndroidSdkManagerDialog(AndroidSdkManager *sdkManager,
auto expandCheck = new QCheckBox(Tr::tr("Expand All")); auto expandCheck = new QCheckBox(Tr::tr("Expand All"));
m_buttonBox = new QDialogButtonBox; auto buttonBox = new QDialogButtonBox;
m_buttonBox->setStandardButtons(QDialogButtonBox::Apply | QDialogButtonBox::Cancel); buttonBox->setStandardButtons(QDialogButtonBox::Apply | QDialogButtonBox::Cancel);
m_buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false); buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
auto proxyModel = new PackageFilterModel(m_sdkModel); auto proxyModel = new PackageFilterModel(m_sdkModel);
packagesView->setModel(proxyModel); packagesView->setModel(proxyModel);
@@ -172,11 +172,11 @@ AndroidSdkManagerDialog::AndroidSdkManagerDialog(AndroidSdkManager *sdkManager,
optionsButton, optionsButton,
}, br, }, br,
}, },
m_buttonBox, buttonBox,
}.attachTo(this); }.attachTo(this);
connect(m_sdkModel, &AndroidSdkModel::dataChanged, this, [this] { connect(m_sdkModel, &AndroidSdkModel::dataChanged, this, [this, buttonBox] {
m_buttonBox->button(QDialogButtonBox::Apply) buttonBox->button(QDialogButtonBox::Apply)
->setEnabled(m_sdkModel->installationChange().count()); ->setEnabled(m_sdkModel->installationChange().count());
}); });
@@ -215,10 +215,10 @@ AndroidSdkManagerDialog::AndroidSdkManagerDialog(AndroidSdkManager *sdkManager,
expandCheck->setChecked(!text.isEmpty()); expandCheck->setChecked(!text.isEmpty());
}); });
connect(m_buttonBox->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, this, [this] { connect(buttonBox->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, this, [this] {
m_sdkManager->runInstallationChange(m_sdkModel->installationChange()); m_sdkManager->runInstallationChange(m_sdkModel->installationChange());
}); });
connect(m_buttonBox, &QDialogButtonBox::rejected, this, &AndroidSdkManagerDialog::reject); connect(buttonBox, &QDialogButtonBox::rejected, this, &AndroidSdkManagerDialog::reject);
connect(optionsButton, &QPushButton::clicked, this, [this] { connect(optionsButton, &QPushButton::clicked, this, [this] {
OptionsDialog dlg(m_sdkManager, this); OptionsDialog dlg(m_sdkManager, this);

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

@@ -6,10 +6,6 @@
#include <QDialog> #include <QDialog>
QT_BEGIN_NAMESPACE
class QDialogButtonBox;
QT_END_NAMESPACE
namespace Android::Internal { namespace Android::Internal {
class AndroidSdkManager; class AndroidSdkManager;
@@ -23,7 +19,6 @@ public:
private: private:
AndroidSdkManager *m_sdkManager = nullptr; AndroidSdkManager *m_sdkManager = nullptr;
AndroidSdkModel *m_sdkModel = nullptr; AndroidSdkModel *m_sdkModel = nullptr;
QDialogButtonBox *m_buttonBox = nullptr;
}; };
} // Android::Internal } // Android::Internal