forked from qt-creator/qt-creator
Fixed wrong behavior of "Move Component in Separate File" for qml.
The dialog accepted/rejected value is now checked. Task-number: QTCREATORBUG-14175 Change-Id: I9a39c0cf87b7e11613a333b2d3a63b77e39b6d97 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
@@ -103,7 +103,10 @@ public:
|
|||||||
{
|
{
|
||||||
QString componentName = m_componentName;
|
QString componentName = m_componentName;
|
||||||
QString path = QFileInfo(fileName()).path();
|
QString path = QFileInfo(fileName()).path();
|
||||||
ComponentNameDialog::go(&componentName, &path, Core::ICore::dialogParent());
|
bool confirm = ComponentNameDialog::go(&componentName, &path, Core::ICore::dialogParent());
|
||||||
|
|
||||||
|
if (!confirm)
|
||||||
|
return;
|
||||||
|
|
||||||
if (componentName.isEmpty() || path.isEmpty())
|
if (componentName.isEmpty() || path.isEmpty())
|
||||||
return;
|
return;
|
||||||
|
@@ -54,7 +54,7 @@ ComponentNameDialog::~ComponentNameDialog()
|
|||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ComponentNameDialog::go(QString *proposedName,
|
bool ComponentNameDialog::go(QString *proposedName,
|
||||||
QString *proposedPath,
|
QString *proposedPath,
|
||||||
QWidget *parent)
|
QWidget *parent)
|
||||||
{
|
{
|
||||||
@@ -73,7 +73,10 @@ void ComponentNameDialog::go(QString *proposedName,
|
|||||||
if (QDialog::Accepted == d.exec()) {
|
if (QDialog::Accepted == d.exec()) {
|
||||||
*proposedName = d.ui->componentNameEdit->text();
|
*proposedName = d.ui->componentNameEdit->text();
|
||||||
*proposedPath = d.ui->pathEdit->path();
|
*proposedPath = d.ui->pathEdit->path();
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ComponentNameDialog::choosePath()
|
void ComponentNameDialog::choosePath()
|
||||||
|
@@ -46,7 +46,7 @@ public:
|
|||||||
explicit ComponentNameDialog(QWidget *parent = 0);
|
explicit ComponentNameDialog(QWidget *parent = 0);
|
||||||
~ComponentNameDialog();
|
~ComponentNameDialog();
|
||||||
|
|
||||||
static void go(QString *proposedName, QString *proposedPath, QWidget *parent = 0);
|
static bool go(QString *proposedName, QString *proposedPath, QWidget *parent = 0);
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void choosePath();
|
void choosePath();
|
||||||
|
Reference in New Issue
Block a user