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

[win-nix] fix bug 65377

Browse Source
This commit is contained in:
maxkadushkin
2023-12-06 23:44:40 +03:00
parent 782f5cc3c3
commit 4ec7b4aed0
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
win-linux/src/cthemes.cpp
View File

@ -78,6 +78,11 @@ namespace NSTheme {
};
}
auto getUserThemesPath() -> QString
{
return Utils::getAppCommonPath() + "/uithemes";
}
/*
* CThemePrivate
*/
@ -200,7 +205,7 @@ public:
QString file_path = search_user_theme({Utils::getAppCommonPath() + "/uithemes",
qApp->applicationDirPath() + "/uithemes"}, user_theme);
if ( !file_path.isEmpty() || !current->fromFile(file_path) ) {
if ( file_path.isEmpty() || !current->fromFile(file_path) ) {
user_theme = THEME_ID_SYSTEM;
}
} else
@ -570,17 +575,23 @@ auto CThemes::addLocalTheme(const QJsonObject& jsonobj, const QString& filepath)
{
if ( m_priv->validateTheme(jsonobj) ) {
if ( !filepath.isEmpty() ) {
const QString dest_dir = Utils::getAppCommonPath() + "/uithemes";
if ( QDir(dest_dir).mkpath(".") )
if (!QFile::copy(filepath, dest_dir + "/" + QFileInfo(filepath).fileName()))
const QString dest_dir = getUserThemesPath();
if ( QDir(dest_dir).mkpath(".") ) {
QString dest_file_path = dest_dir + "/" + QFileInfo(filepath).fileName();
if ( QFile::exists(dest_file_path) )
QFile::remove(dest_file_path);
if (!QFile::copy(filepath, dest_file_path))
return false;
else {
QByteArray data = QJsonDocument(jsonobj).toJson(QJsonDocument::Compact);
// m_priv->local_themes[jsonobj.value("id").toString()] = std::make_pair("", data);
m_priv->local_themes[jsonobj.value("id").toString()] = std::make_pair(dest_file_path, data);
return true;
}
}
}
QByteArray data = QJsonDocument(jsonobj).toJson(QJsonDocument::Compact);
m_priv->local_themes[jsonobj.value("id").toString()] = std::make_pair("", data);
// m_priv->local_themes[jsonobj.value("id").toString()] = std::make_pair(fileName, data);
return true;
}
return false;