dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 13:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

use _vnote.json instead of .vnote.json as the directory config file

Browse Source
This commit is contained in:
Le Tan 2017-04-25 22:55:59 +08:00
parent 882faeb5eb
commit 2a29456f45
2 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/vconfigmanager.cpp
View File

@ -13,7 +13,8 @@
const QString VConfigManager::orgName = QString("vnote"); const QString VConfigManager::orgName = QString("vnote");
const QString VConfigManager::appName = QString("vnote"); const QString VConfigManager::appName = QString("vnote");
const QString VConfigManager::c_version = QString("1.3"); const QString VConfigManager::c_version = QString("1.3");
const QString VConfigManager::dirConfigFileName = QString(".vnote.json"); const QString VConfigManager::c_obsoleteDirConfigFile = QString(".vnote.json");
const QString VConfigManager::c_dirConfigFile = QString("_vnote.json");
const QString VConfigManager::defaultConfigFilePath = QString(":/resources/vnote.ini"); const QString VConfigManager::defaultConfigFilePath = QString(":/resources/vnote.ini");
const QString VConfigManager::c_styleConfigFolder = QString("styles"); const QString VConfigManager::c_styleConfigFolder = QString("styles");
const QString VConfigManager::c_defaultCssFile = QString(":/resources/styles/default.css"); const QString VConfigManager::c_defaultCssFile = QString(":/resources/styles/default.css");
@ -195,11 +196,27 @@ void VConfigManager::setConfigToSettings(const QString &section, const QString &
qDebug() << "set user config:" << fullKey << value.toString(); qDebug() << "set user config:" << fullKey << value.toString();
} }
QString VConfigManager::fetchDirConfigFilePath(const QString &p_path)
{
QDir dir(p_path);
QString fileName = c_dirConfigFile;
if (dir.exists(c_obsoleteDirConfigFile)) {
V_ASSERT(!dir.exists(c_dirConfigFile));
if (!dir.rename(c_obsoleteDirConfigFile, c_dirConfigFile)) {
fileName = c_obsoleteDirConfigFile;
}
qDebug() << "rename old directory config file:" << fileName;
}
qDebug() << "use directory config file:" << fileName;
return dir.filePath(fileName);
}
QJsonObject VConfigManager::readDirectoryConfig(const QString &path) QJsonObject VConfigManager::readDirectoryConfig(const QString &path)
{ {
QString configFile = QDir(path).filePath(dirConfigFileName); QString configFile = fetchDirConfigFilePath(path);
qDebug() << "read config file:" << configFile;
QFile config(configFile); QFile config(configFile);
if (!config.open(QIODevice::ReadOnly)) { if (!config.open(QIODevice::ReadOnly)) {
qWarning() << "fail to read directory configuration file:" qWarning() << "fail to read directory configuration file:"
@ -213,16 +230,15 @@ QJsonObject VConfigManager::readDirectoryConfig(const QString &path)
bool VConfigManager::directoryConfigExist(const QString &path) bool VConfigManager::directoryConfigExist(const QString &path)
{ {
QString configFile = QDir(path).filePath(dirConfigFileName); QString configFile = fetchDirConfigFilePath(path);
QFile config(configFile); QFile config(configFile);
return config.exists(); return config.exists();
} }
bool VConfigManager::writeDirectoryConfig(const QString &path, const QJsonObject &configJson) bool VConfigManager::writeDirectoryConfig(const QString &path, const QJsonObject &configJson)
{ {
QString configFile = QDir(path).filePath(dirConfigFileName); QString configFile = fetchDirConfigFilePath(path);
qDebug() << "write config file:" << configFile;
QFile config(configFile); QFile config(configFile);
if (!config.open(QIODevice::WriteOnly)) { if (!config.open(QIODevice::WriteOnly)) {
qWarning() << "fail to open directory configuration file for write:" qWarning() << "fail to open directory configuration file for write:"
@ -237,7 +253,7 @@ bool VConfigManager::writeDirectoryConfig(const QString &path, const QJsonObject
bool VConfigManager::deleteDirectoryConfig(const QString &path) bool VConfigManager::deleteDirectoryConfig(const QString &path)
{ {
QString configFile = QDir(path).filePath(dirConfigFileName); QString configFile = fetchDirConfigFilePath(path);
QFile config(configFile); QFile config(configFile);
if (!config.remove()) { if (!config.remove()) {
@ -245,6 +261,7 @@ bool VConfigManager::deleteDirectoryConfig(const QString &path)
<< configFile; << configFile;
return false; return false;
} }
qDebug() << "delete config file:" << configFile; qDebug() << "delete config file:" << configFile;
return true; return true;
} }

13
src/vconfigmanager.h
View File

@ -178,6 +178,10 @@ private:
bool outputDefaultCssStyle() const; bool outputDefaultCssStyle() const;
bool outputDefaultEditorStyle() const; bool outputDefaultEditorStyle() const;
// See if the old c_obsoleteDirConfigFile exists. If so, rename it to
// the new one; if not, use the c_dirConfigFile.
static QString fetchDirConfigFilePath(const QString &p_path);
int m_editorFontSize; int m_editorFontSize;
QFont baseEditFont; QFont baseEditFont;
QPalette baseEditPalette; QPalette baseEditPalette;
@ -251,8 +255,13 @@ private:
// Enable colde block syntax highlight. // Enable colde block syntax highlight.
bool m_enableCodeBlockHighlight; bool m_enableCodeBlockHighlight;
// The name of the config file in each directory // The name of the config file in each directory, obsolete.
static const QString dirConfigFileName; // Use c_dirConfigFile instead.
static const QString c_obsoleteDirConfigFile;
// The name of the config file in each directory.
static const QString c_dirConfigFile;
// The name of the default configuration file // The name of the default configuration file
static const QString defaultConfigFilePath; static const QString defaultConfigFilePath;
// QSettings for the user configuration // QSettings for the user configuration