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

Fixed wrong behavior of "Move Component in Separate File" for qml.

Browse Source 
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:
Marco Benelli
2015-03-23 15:53:23 +01:00
parent 7aa8ae54ae
commit a212b1f745
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
View File

@@ -103,7 +103,10 @@ public:
{
QString componentName = m_componentName;
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())
return;

5
src/plugins/qmljseditor/qmljscomponentnamedialog.cpp
View File

@@ -54,7 +54,7 @@ ComponentNameDialog::~ComponentNameDialog()
delete ui;
}
void ComponentNameDialog::go(QString *proposedName,
bool ComponentNameDialog::go(QString *proposedName,
QString *proposedPath,
QWidget *parent)
{
@@ -73,7 +73,10 @@ void ComponentNameDialog::go(QString *proposedName,
if (QDialog::Accepted == d.exec()) {
*proposedName = d.ui->componentNameEdit->text();
*proposedPath = d.ui->pathEdit->path();
return true;
}
return false;
}
void ComponentNameDialog::choosePath()

2
src/plugins/qmljseditor/qmljscomponentnamedialog.h
View File

@@ -46,7 +46,7 @@ public:
explicit ComponentNameDialog(QWidget *parent = 0);
~ComponentNameDialog();
static void go(QString *proposedName, QString *proposedPath, QWidget *parent = 0);
static bool go(QString *proposedName, QString *proposedPath, QWidget *parent = 0);
public slots:
void choosePath();