suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GUI: improve App::PropertyPath directory selector

Browse Source 
Editing direcotry in lineEdit was open to escaped character problems
i.e. \t or \n which can be pert of notmal directory path were converted
to tab or new line. Also leaving the lineEdit without hitting Enter was
discarding changes.

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
This commit is contained in:
Przemo Firszt 2015-10-20 11:39:21 +01:00 committed by wmayer
parent 15dbd1055a
commit 89b74a5231
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Gui/FileDialog.cpp
View File

@ -534,6 +534,8 @@ FileChooser::FileChooser ( QWidget * parent )
connect(lineEdit, SIGNAL(textChanged(const QString &)),
this, SIGNAL(fileNameChanged(const QString &)));
connect(lineEdit, SIGNAL(editingFinished()), this, SLOT(editingFinished()));
button = new QPushButton(QLatin1String("..."), this);
button->setFixedWidth(2*button->fontMetrics().width(QLatin1String(" ... ")));
@ -561,6 +563,15 @@ QString FileChooser::fileName() const
return lineEdit->text();
}
void FileChooser::editingFinished()
{
QString le_converted = lineEdit->text();
le_converted.replace(QString::fromStdString("\\"), QString::fromStdString("/"));
lineEdit->setText(le_converted);
FileDialog::setWorkingDirectory(le_converted);
fileNameSelected(le_converted);
}
/**
* Sets the file name \a s.
*/

1
src/Gui/FileDialog.h
View File

@ -176,6 +176,7 @@ Q_SIGNALS:
private Q_SLOTS:
void chooseFile();
void editingFinished();
private:
QLineEdit *lineEdit;