forked from qt-creator/qt-creator
Android: Hide QDialogButtonBox inside cpp
Change-Id: I0f10933884d3a95e774defe9b1f5125a5b1eee39 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
@@ -139,9 +139,9 @@ AndroidSdkManagerDialog::AndroidSdkManagerDialog(AndroidSdkManager *sdkManager,
|
||||
|
||||
auto expandCheck = new QCheckBox(Tr::tr("Expand All"));
|
||||
|
||||
m_buttonBox = new QDialogButtonBox;
|
||||
m_buttonBox->setStandardButtons(QDialogButtonBox::Apply | QDialogButtonBox::Cancel);
|
||||
m_buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
|
||||
auto buttonBox = new QDialogButtonBox;
|
||||
buttonBox->setStandardButtons(QDialogButtonBox::Apply | QDialogButtonBox::Cancel);
|
||||
buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
|
||||
|
||||
auto proxyModel = new PackageFilterModel(m_sdkModel);
|
||||
packagesView->setModel(proxyModel);
|
||||
@@ -172,11 +172,11 @@ AndroidSdkManagerDialog::AndroidSdkManagerDialog(AndroidSdkManager *sdkManager,
|
||||
optionsButton,
|
||||
}, br,
|
||||
},
|
||||
m_buttonBox,
|
||||
buttonBox,
|
||||
}.attachTo(this);
|
||||
|
||||
connect(m_sdkModel, &AndroidSdkModel::dataChanged, this, [this] {
|
||||
m_buttonBox->button(QDialogButtonBox::Apply)
|
||||
connect(m_sdkModel, &AndroidSdkModel::dataChanged, this, [this, buttonBox] {
|
||||
buttonBox->button(QDialogButtonBox::Apply)
|
||||
->setEnabled(m_sdkModel->installationChange().count());
|
||||
});
|
||||
|
||||
@@ -215,10 +215,10 @@ AndroidSdkManagerDialog::AndroidSdkManagerDialog(AndroidSdkManager *sdkManager,
|
||||
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());
|
||||
});
|
||||
connect(m_buttonBox, &QDialogButtonBox::rejected, this, &AndroidSdkManagerDialog::reject);
|
||||
connect(buttonBox, &QDialogButtonBox::rejected, this, &AndroidSdkManagerDialog::reject);
|
||||
|
||||
connect(optionsButton, &QPushButton::clicked, this, [this] {
|
||||
OptionsDialog dlg(m_sdkManager, this);
|
||||
|
@@ -6,10 +6,6 @@
|
||||
|
||||
#include <QDialog>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QDialogButtonBox;
|
||||
QT_END_NAMESPACE
|
||||
|
||||
namespace Android::Internal {
|
||||
|
||||
class AndroidSdkManager;
|
||||
@@ -23,7 +19,6 @@ public:
|
||||
private:
|
||||
AndroidSdkManager *m_sdkManager = nullptr;
|
||||
AndroidSdkModel *m_sdkModel = nullptr;
|
||||
QDialogButtonBox *m_buttonBox = nullptr;
|
||||
};
|
||||
|
||||
} // Android::Internal
|
||||
|
Reference in New Issue
Block a user