mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-05 10:40:42 +00:00
Use native File dialog instead of broken Qt ones
This commit is contained in:
parent
7bfb8a6bb3
commit
9dc01b2eaa
@ -174,17 +174,23 @@ void MainWindow::Startup()
|
|||||||
|
|
||||||
void MainWindow::on_action_Import_Data_triggered()
|
void MainWindow::on_action_Import_Data_triggered()
|
||||||
{
|
{
|
||||||
QStringList dirNames;
|
//QStringList dirNames;
|
||||||
|
|
||||||
QFileDialog qfd(this);
|
//QFileDialog qfd(this);
|
||||||
qfd.setFileMode(QFileDialog::Directory);
|
//qfd.setFileMode(QFileDialog::Directory);
|
||||||
qfd.setOption(QFileDialog::ShowDirsOnly,true);
|
//qfd.setOption(QFileDialog::ShowDirsOnly,true);
|
||||||
|
QString dir=QFileDialog::getExistingDirectory(this,"Select a folder to import","",QFileDialog::ShowDirsOnly);
|
||||||
|
|
||||||
if (qfd.exec()) {
|
if (!dir.isEmpty()) {
|
||||||
|
//if (qfd.exec()) {
|
||||||
qprogress->setValue(0);
|
qprogress->setValue(0);
|
||||||
qprogress->show();
|
qprogress->show();
|
||||||
qstatus->setText(tr("Importing Data"));
|
qstatus->setText(tr("Importing Data"));
|
||||||
dirNames=qfd.selectedFiles();
|
int c=profile->Import(dir);
|
||||||
|
if (!c) {
|
||||||
|
QMessageBox::warning(this,"Import Problem","Couldn't Find any Machine Data at this location:\n"+dir,QMessageBox::Ok);
|
||||||
|
}
|
||||||
|
/*dirNames=qfd.selectedFiles();
|
||||||
int c=0,d;
|
int c=0,d;
|
||||||
for (int i=0;i<dirNames.size();i++) {
|
for (int i=0;i<dirNames.size();i++) {
|
||||||
d=profile->Import(dirNames[i]);
|
d=profile->Import(dirNames[i]);
|
||||||
@ -192,7 +198,7 @@ void MainWindow::on_action_Import_Data_triggered()
|
|||||||
QMessageBox::warning(this,"Import Problem","Couldn't Find any Machine Data at this location:\n"+dirNames[i],QMessageBox::Ok);
|
QMessageBox::warning(this,"Import Problem","Couldn't Find any Machine Data at this location:\n"+dirNames[i],QMessageBox::Ok);
|
||||||
}
|
}
|
||||||
c+=d;
|
c+=d;
|
||||||
}
|
}*/
|
||||||
qDebug() << "Finished Importing data" << c;
|
qDebug() << "Finished Importing data" << c;
|
||||||
if (c) {
|
if (c) {
|
||||||
profile->Save();
|
profile->Save();
|
||||||
|
Loading…
Reference in New Issue
Block a user