procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed Save As default filenames

This commit is contained in:
John Preston 2015-02-16 17:52:37 +03:00
parent 394170bd4c
commit 840d5eb671
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Telegram/SourceFiles/history.cpp
View File

@ -496,8 +496,9 @@ void VideoSaveLink::doSave(bool forceSavingAs) const {
psOpenFile(already, true); psOpenFile(already, true);
} }
} else { } else {
QDir alreadyDir(already.isEmpty() ? QDir() : QFileInfo(already).dir()); QFileInfo alreadyInfo(already);
QString name = already.isEmpty() ? QString(".mov") : already; QDir alreadyDir(already.isEmpty() ? QDir() : alreadyInfo.dir());
QString name = already.isEmpty() ? QString(".mov") : alreadyInfo.fileName();
QString filename = saveFileName(lang(lng_save_video), qsl("MOV Video (*.mov);;All files (*.*)"), qsl("video"), name, forceSavingAs, alreadyDir); QString filename = saveFileName(lang(lng_save_video), qsl("MOV Video (*.mov);;All files (*.*)"), qsl("video"), name, forceSavingAs, alreadyDir);
if (!filename.isEmpty()) { if (!filename.isEmpty()) {
if (forceSavingAs) { if (forceSavingAs) {
@ -587,9 +588,10 @@ void AudioSaveLink::doSave(bool forceSavingAs) const {
psOpenFile(already, true); psOpenFile(already, true);
} }
} else { } else {
QDir alreadyDir(already.isEmpty() ? QDir() : QFileInfo(already).dir()); QFileInfo alreadyInfo(already);
QDir alreadyDir(already.isEmpty() ? QDir() : alreadyInfo.dir());
bool mp3 = (data->mime == QLatin1String("audio/mp3")); bool mp3 = (data->mime == QLatin1String("audio/mp3"));
QString name = already.isEmpty() ? (mp3 ? qsl(".mp3") : qsl(".ogg")) : already; QString name = already.isEmpty() ? (mp3 ? qsl(".mp3") : qsl(".ogg")) : alreadyInfo.fileName();
QString filename = saveFileName(lang(lng_save_audio), mp3 ? qsl("MP3 Audio (*.mp3);;All files (*.*)") : qsl("OGG Opus Audio (*.ogg);;All files (*.*)"), qsl("audio"), name, forceSavingAs, alreadyDir); QString filename = saveFileName(lang(lng_save_audio), mp3 ? qsl("MP3 Audio (*.mp3);;All files (*.*)") : qsl("OGG Opus Audio (*.ogg);;All files (*.*)"), qsl("audio"), name, forceSavingAs, alreadyDir);
if (!filename.isEmpty()) { if (!filename.isEmpty()) {
if (forceSavingAs) { if (forceSavingAs) {
@ -692,8 +694,9 @@ void DocumentSaveLink::doSave(bool forceSavingAs) const {
psOpenFile(already, true); psOpenFile(already, true);
} }
} else { } else {
QDir alreadyDir(already.isEmpty() ? QDir() : QFileInfo(already).dir()); QFileInfo alreadyInfo(already);
QString name = already.isEmpty() ? data->name : already, filter; QDir alreadyDir(already.isEmpty() ? QDir() : alreadyInfo.dir());
QString name = already.isEmpty() ? data->name : alreadyInfo.fileName(), filter;
MimeType mimeType = mimeTypeForName(data->mime); MimeType mimeType = mimeTypeForName(data->mime);
QStringList p = mimeType.globPatterns(); QStringList p = mimeType.globPatterns();
QString pattern = p.isEmpty() ? QString() : p.front(); QString pattern = p.isEmpty() ? QString() : p.front();