feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Save mime settings changes directly on apply

Browse Source 
The only time it actually changes.

Change-Id: I78e6e9d61a3dfbd19bd4b422d6696df75dfd50a4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2024-07-26 11:42:43 +02:00
parent ffae39f425
commit 3859b2d8f2
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/coreplugin/mimetypesettings.cpp
View File

@@ -252,7 +252,7 @@ bool MimeFilterModel::filterAcceptsRow(int source_row, const QModelIndex &source
const QChar kSemiColon(QLatin1Char(';')); const QChar kSemiColon(QLatin1Char(';'));
class MimeTypeSettingsPage final : public QObject, public IOptionsPage class MimeTypeSettingsPage final : public IOptionsPage
{ {
public: public:
MimeTypeSettingsPage(); MimeTypeSettingsPage();
@@ -283,6 +283,7 @@ public:
Core::Internal::setUserPreferredEditorTypes(d->m_model.m_userDefault); Core::Internal::setUserPreferredEditorTypes(d->m_model.m_userDefault);
d->m_pendingModifiedMimeTypes.clear(); d->m_pendingModifiedMimeTypes.clear();
d->m_model.load(); d->m_model.load();
d->writeUserModifiedMimeTypes();
} }
void finish() final void finish() final
@@ -748,8 +749,6 @@ MimeTypeSettingsPage::MimeTypeSettingsPage()
m_filterModel.setSourceModel(&m_model); m_filterModel.setSourceModel(&m_model);
m_filterModel.setFilterKeyColumn(-1); m_filterModel.setFilterKeyColumn(-1);
m_filterModel.setFilterCaseSensitivity(Qt::CaseInsensitive); m_filterModel.setFilterCaseSensitivity(Qt::CaseInsensitive);
connect(ICore::instance(), &ICore::saveSettingsRequested,
this, &MimeTypeSettingsPage::writeUserModifiedMimeTypes);
m_userModifiedMimeTypes = readUserModifiedMimeTypes(); m_userModifiedMimeTypes = readUserModifiedMimeTypes();
Utils::addMimeInitializer([this] { registerUserModifiedMimeTypes(m_userModifiedMimeTypes); }); Utils::addMimeInitializer([this] { registerUserModifiedMimeTypes(m_userModifiedMimeTypes); });