Merged muonspin/musrfit:root6 into master
This commit is contained in:
commit
693b99755d
@ -1342,8 +1342,10 @@ void PTextEdit::fileSave()
|
|||||||
fileSaveAs();
|
fileSaveAs();
|
||||||
} else {
|
} else {
|
||||||
QFile file( *fFilenames.find( currentEditor() ) );
|
QFile file( *fFilenames.find( currentEditor() ) );
|
||||||
if ( !file.open( QIODevice::WriteOnly ) )
|
if ( !file.open( QIODevice::WriteOnly ) ) {
|
||||||
|
QMessageBox::critical(this, "**ERROR**", "Couldn't save the file!\nDisk full?\nNo write access?");
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
QTextStream ts( &file );
|
QTextStream ts( &file );
|
||||||
ts << currentEditor()->toPlainText();
|
ts << currentEditor()->toPlainText();
|
||||||
|
|
||||||
@ -1374,7 +1376,6 @@ void PTextEdit::fileSaveAs()
|
|||||||
fFilenames.remove( currentEditor() );
|
fFilenames.remove( currentEditor() );
|
||||||
fFilenames.insert( currentEditor(), fn );
|
fFilenames.insert( currentEditor(), fn );
|
||||||
fileSave();
|
fileSave();
|
||||||
fTabWidget->setTabText(fTabWidget->indexOf( currentEditor() ), QFileInfo(fn).fileName());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fileSystemWatcherActivation(); // delayed activation of fFileSystemWatcherActive
|
fileSystemWatcherActivation(); // delayed activation of fFileSystemWatcherActive
|
||||||
|
Loading…
x
Reference in New Issue
Block a user