1.7.0c
This commit is contained in:
parent
083e0c36a9
commit
b38a89f360
|
@ -959,7 +959,7 @@ bool CSbieView::MoveItem(const QString& Name, const QString& To, int pos)
|
|||
return From != To;
|
||||
}
|
||||
|
||||
QString CSbieView::AddNewBox()
|
||||
QString CSbieView::AddNewBox(bool bAlowTemp)
|
||||
{
|
||||
QString BoxName;
|
||||
|
||||
|
@ -971,7 +971,7 @@ QString CSbieView::AddNewBox()
|
|||
BoxName = NewBoxWindow.m_Name;
|
||||
}
|
||||
else
|
||||
BoxName = CNewBoxWizard::CreateNewBox(this);
|
||||
BoxName = CNewBoxWizard::CreateNewBox(bAlowTemp, this);
|
||||
|
||||
if (!BoxName.isEmpty()) {
|
||||
theAPI->ReloadBoxes();
|
||||
|
|
|
@ -22,7 +22,7 @@ public:
|
|||
|
||||
//virtual void UpdateRunMenu();
|
||||
|
||||
virtual QString AddNewBox();
|
||||
virtual QString AddNewBox(bool bAlowTemp = false);
|
||||
virtual QString AddNewGroup();
|
||||
virtual bool TestNameAndWarn(const QString& Name);
|
||||
virtual void SelectBox(const QString& Name);
|
||||
|
|
|
@ -184,7 +184,7 @@ void CSelectBoxWindow::OnRun()
|
|||
}
|
||||
else if (ui.radBoxedNew->isChecked())
|
||||
{
|
||||
BoxName = theGUI->GetBoxView()->AddNewBox();
|
||||
BoxName = theGUI->GetBoxView()->AddNewBox(true);
|
||||
if (BoxName.isEmpty()) {
|
||||
close();
|
||||
return;
|
||||
|
|
|
@ -10,10 +10,10 @@
|
|||
#include "../Views/SbieView.h"
|
||||
|
||||
|
||||
CNewBoxWizard::CNewBoxWizard(QWidget *parent)
|
||||
CNewBoxWizard::CNewBoxWizard(bool bAlowTemp, QWidget *parent)
|
||||
: QWizard(parent)
|
||||
{
|
||||
setPage(Page_Type, new CBoxTypePage);
|
||||
setPage(Page_Type, new CBoxTypePage(bAlowTemp));
|
||||
setPage(Page_Files, new CFilesPage);
|
||||
setPage(Page_Advanced, new CAdvancedPage);
|
||||
setPage(Page_Summary, new CSummaryPage);
|
||||
|
@ -34,9 +34,9 @@ void CNewBoxWizard::showHelp()
|
|||
|
||||
}
|
||||
|
||||
QString CNewBoxWizard::CreateNewBox(QWidget* pParent)
|
||||
QString CNewBoxWizard::CreateNewBox(bool bAlowTemp, QWidget* pParent)
|
||||
{
|
||||
CNewBoxWizard wizard(pParent);
|
||||
CNewBoxWizard wizard(bAlowTemp, pParent);
|
||||
if (!wizard.exec())
|
||||
return QString();
|
||||
|
||||
|
@ -135,7 +135,7 @@ QString CNewBoxWizard::GetDefaultLocation()
|
|||
// CBoxTypePage
|
||||
//
|
||||
|
||||
CBoxTypePage::CBoxTypePage(QWidget *parent)
|
||||
CBoxTypePage::CBoxTypePage(bool bAlowTemp, QWidget *parent)
|
||||
: QWizardPage(parent)
|
||||
{
|
||||
setTitle(tr("Create new Sandbox"));
|
||||
|
@ -200,6 +200,7 @@ CBoxTypePage::CBoxTypePage(QWidget *parent)
|
|||
QCheckBox* pTemp = new QCheckBox(tr("Remove after use"));
|
||||
pTemp->setToolTip(tr("After the last process in the box terminates, all data in the box will be deleted and the box itself will be removed."));
|
||||
layout->addWidget(pTemp, row, 0, 1, 2);
|
||||
pTemp->setVisible(bAlowTemp);
|
||||
registerField("autoRemove", pTemp);
|
||||
|
||||
m_pAdvanced = new QCheckBox(tr("Configure advanced options"));
|
||||
|
|
|
@ -17,9 +17,9 @@ class CNewBoxWizard : public QWizard
|
|||
public:
|
||||
enum { Page_Type, Page_Files, Page_Advanced, Page_Summary };
|
||||
|
||||
CNewBoxWizard(QWidget *parent = nullptr);
|
||||
CNewBoxWizard(bool bAlowTemp, QWidget *parent = nullptr);
|
||||
|
||||
static QString CreateNewBox(QWidget* pParent = NULL);
|
||||
static QString CreateNewBox(bool bAlowTemp, QWidget* pParent = NULL);
|
||||
|
||||
QString GetDefaultLocation();
|
||||
|
||||
|
@ -45,7 +45,7 @@ class CBoxTypePage : public QWizardPage
|
|||
Q_OBJECT
|
||||
|
||||
public:
|
||||
CBoxTypePage(QWidget *parent = nullptr);
|
||||
CBoxTypePage(bool bAlowTemp, QWidget *parent = nullptr);
|
||||
|
||||
int nextId() const override;
|
||||
bool isComplete() const override;
|
||||
|
|
Loading…
Reference in New Issue