pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1039 from ONLYOFFICE/patch/develop_r3

Browse Source 
Patch/develop
This commit is contained in:
Oleg Kozhukharenko
2023-11-13 11:09:52 +02:00
committed by GitHub
parent 3c35e3da82 a545786af0
commit f654d75b5b
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
win-linux/src/ceditortools.cpp
View File

@ -394,6 +394,9 @@ namespace CEditorTools
AscAppManager::GetFileFormatByExtentionForSave(pSaveData->get_Path());
pSaveData->put_FileType(format > -1 ? format : 0);
#ifdef _WIN32
Utils::addToRecent(_full_path.toStdWString());
#endif
}
}

2
win-linux/src/components/cfiledialog.cpp
View File

@ -250,8 +250,10 @@ QStringList CFileDialogWrapper::modalOpen(const QString& path, const QString& fi
tr("Presentations") + " (*.pptx *.ppt *.odp *.otp *.ppsm *.ppsx *.pps *.potx *.pot *.potm *.fodp *.dps *.dpt *.sxi);;" +
tr("Web Page") + " (*.html *.htm *.mht *.mhtml *.epub);;" +
tr("Text files") + " (*.txt *.csv)";
#ifdef __linux__
_all_sup_files = tr("All supported files") + " " + joinExtentions(_filter_);
_filter_.prepend(_all_sup_files + ";;");
#endif
_filter_.append(";;" + m_mapFilters[AVS_OFFICESTUDIO_FILE_UNKNOWN]);
}
const QString _default_sel_filter = _all_sup_files.isEmpty() ?

2
win-linux/src/components/ctabbar.cpp
View File

@ -1165,7 +1165,7 @@ bool CTabBar::eventFilter(QObject *watched, QEvent *event)
} else
if (mouse_event->button() == Qt::MiddleButton) {
for (int i = 0; i < d->tabList.size(); i++) {
if (d->tabList[i]->close_btn->underMouse()) {
if (d->_tabRect(i).contains(mouse_event->pos())) {
emit tabCloseRequested(i);
return true;
}