Resolved issue #397. Display the currently open measurement file name in the top menu of Valentina
--HG-- branch : feature
This commit is contained in:
parent
80ff422a39
commit
1d9af2dcc0
|
@ -359,6 +359,14 @@ bool MainWindow::LoadMeasurements(const QString &path)
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
QString shownName = strippedName(curFile);
|
||||||
|
if (curFile.isEmpty())
|
||||||
|
{
|
||||||
|
shownName = tr("untitled.val");
|
||||||
|
}
|
||||||
|
shownName += "[*]";
|
||||||
|
shownName += " [" + strippedName(path) + "[*]]";
|
||||||
|
setWindowTitle(shownName);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1195,6 +1203,14 @@ void MainWindow::UnloadMeasurements()
|
||||||
ui->actionShowM->setEnabled(false);
|
ui->actionShowM->setEnabled(false);
|
||||||
ui->actionUnloadMeasurements->setDisabled(true);
|
ui->actionUnloadMeasurements->setDisabled(true);
|
||||||
helpLabel->setText(tr("Measurements unloaded"));
|
helpLabel->setText(tr("Measurements unloaded"));
|
||||||
|
|
||||||
|
QString shownName = strippedName(curFile);
|
||||||
|
if (curFile.isEmpty())
|
||||||
|
{
|
||||||
|
shownName = tr("untitled.val");
|
||||||
|
}
|
||||||
|
shownName += "[*]";
|
||||||
|
setWindowTitle(shownName);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -2855,6 +2871,12 @@ void MainWindow::setCurrentFile(const QString &fileName)
|
||||||
settings->SetRestoreFileList(restoreFiles);
|
settings->SetRestoreFileList(restoreFiles);
|
||||||
}
|
}
|
||||||
shownName+="[*]";
|
shownName+="[*]";
|
||||||
|
|
||||||
|
QString path = AbsoluteMPath(fileName, doc->MPath());
|
||||||
|
if(not path.isEmpty())
|
||||||
|
{
|
||||||
|
shownName += " [" + strippedName(path) + "[*]]";
|
||||||
|
}
|
||||||
setWindowTitle(shownName);
|
setWindowTitle(shownName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user