Merge remote-tracking branch 'graffy76/master'
Marc Zinnschlag
11 years ago
commit
21142711f0
@ -1,342 +0,0 @@
|
||||
#include <QFile>
|
||||
#include <QTextCodec>
|
||||
#include <QMessageBox>
|
||||
#include <QDebug>
|
||||
#include <QList>
|
||||
|
||||
#include "setting.hpp"
|
||||
#include "settingmanager.hpp"
|
||||
|
||||
CSMSettings::SettingManager::SettingManager(QObject *parent) :
|
||||
QObject(parent)
|
||||
{
|
||||
mReadWriteMessage = QObject::tr("<br><b>Could not open or create file for \
|
||||
writing</b><br><br> Please make sure you have the right\
|
||||
permissions and try again.<br>");
|
||||
|
||||
mReadOnlyMessage = QObject::tr("<br><b>Could not open file for \
|
||||
reading</b><br><br> Please make sure you have the \
|
||||
right permissions and try again.<br>");
|
||||
|
||||
}
|
||||
|
||||
void CSMSettings::SettingManager::dumpModel()
|
||||
{
|
||||
foreach (Setting *setting, mSettings)
|
||||
{
|
||||
if (setting->proxyLists().isEmpty())
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
CSMSettings::Setting *CSMSettings::SettingManager::createSetting
|
||||
(CSMSettings::SettingType typ, const QString &page, const QString &name)
|
||||
{
|
||||
//get list of all settings for the current setting name
|
||||
if (findSetting (page, name))
|
||||
{
|
||||
qWarning() << "Duplicate declaration encountered: "
|
||||
<< (name + '.' + page);
|
||||
return 0;
|
||||
}
|
||||
|
||||
Setting *setting = new Setting (typ, name, page);
|
||||
|
||||
|
||||
//add declaration to the model
|
||||
mSettings.append (setting);
|
||||
|
||||
return setting;
|
||||
}
|
||||
|
||||
CSMSettings::DefinitionPageMap
|
||||
CSMSettings::SettingManager::readFilestream (QTextStream *stream)
|
||||
{
|
||||
//regEx's for page names and keys / values
|
||||
QRegExp pageRegEx ("^\\[([^]]+)\\]");
|
||||
QRegExp keyRegEx ("^([^=]+)\\s*=\\s*(.+)$");
|
||||
|
||||
QString currPage = "Unassigned";
|
||||
|
||||
DefinitionPageMap pageMap;
|
||||
|
||||
if (!stream)
|
||||
{
|
||||
displayFileErrorMessage(mReadWriteMessage, false);
|
||||
return pageMap;
|
||||
}
|
||||
|
||||
if (stream->atEnd())
|
||||
return pageMap;
|
||||
|
||||
DefinitionMap *settingMap = new DefinitionMap();
|
||||
pageMap[currPage] = settingMap;
|
||||
|
||||
while (!stream->atEnd())
|
||||
{
|
||||
QString line = stream->readLine().simplified();
|
||||
|
||||
if (line.isEmpty() || line.startsWith("#"))
|
||||
continue;
|
||||
|
||||
//page name found
|
||||
if (pageRegEx.exactMatch(line))
|
||||
{
|
||||
currPage = pageRegEx.cap(1).simplified().trimmed();
|
||||
settingMap = new DefinitionMap();
|
||||
pageMap[currPage] = settingMap;
|
||||
continue;
|
||||
}
|
||||
|
||||
//setting definition found
|
||||
if ( (keyRegEx.indexIn(line) != -1))
|
||||
{
|
||||
QString settingName = keyRegEx.cap(1).simplified();
|
||||
QString settingValue = keyRegEx.cap(2).simplified();
|
||||
|
||||
if (!settingMap->contains (settingName))
|
||||
settingMap->insert (settingName, new QStringList());
|
||||
|
||||
settingMap->value(settingName)->append(settingValue);
|
||||
}
|
||||
}
|
||||
|
||||
//return empty map if no settings were ever added to
|
||||
if (pageMap.size() == 1)
|
||||
{
|
||||
QString pageKey = pageMap.keys().at(0);
|
||||
if (pageMap[pageKey]->size() == 0)
|
||||
pageMap.clear();
|
||||
}
|
||||
|
||||
return pageMap;
|
||||
}
|
||||
|
||||
bool CSMSettings::SettingManager::writeFilestream(QTextStream *stream,
|
||||
const QMap <QString, QStringList > &settingListMap)
|
||||
{
|
||||
if (!stream)
|
||||
{
|
||||
displayFileErrorMessage(mReadWriteMessage, false);
|
||||
return false;
|
||||
}
|
||||
//disabled after rolling selector class into view. Need to
|
||||
//iterate views to get setting definitions before writing to file
|
||||
|
||||
QStringList sectionKeys;
|
||||
|
||||
foreach (const QString &key, settingListMap.keys())
|
||||
{
|
||||
QStringList names = key.split('.');
|
||||
QString section = names.at(0);
|
||||
|
||||
if (!sectionKeys.contains(section))
|
||||
if (!settingListMap.value(key).isEmpty())
|
||||
sectionKeys.append (section);
|
||||
}
|
||||
|
||||
foreach (const QString §ion, sectionKeys)
|
||||
{
|
||||
*stream << '[' << section << "]\n";
|
||||
foreach (const QString &key, settingListMap.keys())
|
||||
{
|
||||
QStringList names = key.split('.');
|
||||
|
||||
if (names.at(0) != section)
|
||||
continue;
|
||||
|
||||
QStringList list = settingListMap.value(key);
|
||||
|
||||
if (list.isEmpty())
|
||||
continue;
|
||||
|
||||
QString name = names.at(1);
|
||||
|
||||
foreach (const QString value, list)
|
||||
{
|
||||
if (value.isEmpty())
|
||||
continue;
|
||||
|
||||
*stream << name << " = " << value << '\n';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
destroyStream (stream);
|
||||
return true;
|
||||
}
|
||||
|
||||
void CSMSettings::SettingManager::mergeSettings(DefinitionPageMap &destMap, DefinitionPageMap &srcMap)
|
||||
{
|
||||
if (srcMap.isEmpty())
|
||||
return;
|
||||
|
||||
foreach (const QString &pageKey, srcMap.keys())
|
||||
{
|
||||
DefinitionMap *srcSetting = srcMap.value(pageKey);
|
||||
//Unique Page:
|
||||
//insertfrom the source map
|
||||
if (!destMap.keys().contains (pageKey))
|
||||
{
|
||||
destMap.insert (pageKey, srcSetting);
|
||||
continue;
|
||||
}
|
||||
|
||||
DefinitionMap *destSetting = destMap.value(pageKey);
|
||||
|
||||
//Duplicate Page:
|
||||
//iterate the settings in the source and check for duplicates in the
|
||||
//destination
|
||||
foreach (const QString &srcKey, srcSetting->keys())
|
||||
{
|
||||
//insert into destination if unique
|
||||
if (!destSetting->keys().contains (srcKey))
|
||||
destSetting->insert(srcKey, srcSetting->value (srcKey));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
QTextStream *CSMSettings::SettingManager::openFilestream (const QString &filePath,
|
||||
bool isReadOnly) const
|
||||
{
|
||||
QIODevice::OpenMode openFlags = QIODevice::Text;
|
||||
|
||||
if (isReadOnly)
|
||||
openFlags = QIODevice::ReadOnly | openFlags;
|
||||
else
|
||||
openFlags = QIODevice::ReadWrite | QIODevice::Truncate | openFlags;
|
||||
|
||||
QFile *file = new QFile(filePath);
|
||||
QTextStream *stream = 0;
|
||||
|
||||
if (file->open(openFlags))
|
||||
stream = new QTextStream(file);
|
||||
|
||||
if (stream)
|
||||
stream->setCodec(QTextCodec::codecForName("UTF-8"));
|
||||
|
||||
return stream;
|
||||
}
|
||||
|
||||
void CSMSettings::SettingManager::destroyStream(QTextStream *stream) const
|
||||
{
|
||||
stream->device()->close();
|
||||
|
||||
delete stream;
|
||||
}
|
||||
|
||||
void CSMSettings::SettingManager::displayFileErrorMessage(const QString &message,
|
||||
bool isReadOnly) const
|
||||
{
|
||||
// File cannot be opened or created
|
||||
QMessageBox msgBox;
|
||||
msgBox.setWindowTitle(QObject::tr("OpenCS configuration file I/O error"));
|
||||
msgBox.setIcon(QMessageBox::Critical);
|
||||
msgBox.setStandardButtons(QMessageBox::Ok);
|
||||
|
||||
if (!isReadOnly)
|
||||
msgBox.setText (mReadWriteMessage + message);
|
||||
else
|
||||
msgBox.setText (message);
|
||||
|
||||
msgBox.exec();
|
||||
}
|
||||
|
||||
void CSMSettings::SettingManager::addDefinitions (DefinitionPageMap &pageMap)
|
||||
{
|
||||
foreach (QString pageName, pageMap.keys())
|
||||
{
|
||||
DefinitionMap *settingMap = pageMap.value (pageName);
|
||||
|
||||
foreach (QString settingName, (*settingMap).keys())
|
||||
{
|
||||
QStringList *values = settingMap->value (settingName);
|
||||
Setting *setting = findSetting (pageName, settingName);
|
||||
|
||||
if (!setting)
|
||||
{
|
||||
qWarning() << "Found definitions for undeclared setting "
|
||||
<< pageName << "." << settingName;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (values->size() == 0)
|
||||
values->append (setting->defaultValues());
|
||||
|
||||
setting->setDefinedValues (*values);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
QList <CSMSettings::Setting *> CSMSettings::SettingManager::findSettings
|
||||
(const QStringList &list)
|
||||
{
|
||||
QList <CSMSettings::Setting *> settings;
|
||||
|
||||
foreach (const QString &value, list)
|
||||
{
|
||||
QStringList names = value.split(".", QString::SkipEmptyParts);
|
||||
|
||||
if (names.size() != 2)
|
||||
continue;
|
||||
|
||||
Setting *setting = findSetting (names.at(0), names.at(1));
|
||||
|
||||
if (!setting)
|
||||
continue;
|
||||
|
||||
settings.append (setting);
|
||||
}
|
||||
|
||||
return settings;
|
||||
}
|
||||
|
||||
|
||||
CSMSettings::Setting *CSMSettings::SettingManager::findSetting
|
||||
(const QString &pageName, const QString &settingName)
|
||||
{
|
||||
foreach (Setting *setting, mSettings)
|
||||
{
|
||||
if (setting->name() == settingName)
|
||||
{
|
||||
if (setting->page() == pageName)
|
||||
return setting;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
QList <CSMSettings::Setting *> CSMSettings::SettingManager::findSettings
|
||||
(const QString &pageName)
|
||||
{
|
||||
QList <CSMSettings::Setting *> settings;
|
||||
|
||||
foreach (Setting *setting, mSettings)
|
||||
{
|
||||
if (setting->page() == pageName)
|
||||
settings.append (setting);
|
||||
}
|
||||
return settings;
|
||||
}
|
||||
|
||||
CSMSettings::SettingPageMap CSMSettings::SettingManager::settingPageMap() const
|
||||
{
|
||||
SettingPageMap pageMap;
|
||||
|
||||
foreach (Setting *setting, mSettings)
|
||||
pageMap[setting->page()].append (setting);
|
||||
|
||||
return pageMap;
|
||||
}
|
||||
|
||||
void CSMSettings::SettingManager::updateUserSetting(const QString &settingKey,
|
||||
const QStringList &list)
|
||||
{
|
||||
QStringList names = settingKey.split('.');
|
||||
|
||||
Setting *setting = findSetting (names.at(0), names.at(1));
|
||||
|
||||
setting->setDefinedValues (list);
|
||||
|
||||
emit userSettingUpdated (settingKey, list);
|
||||
}
|
||||
@ -1,84 +0,0 @@
|
||||
#ifndef CSMSETTINGS_SETTINGMANAGER_HPP
|
||||
#define CSMSETTINGS_SETTINGMANAGER_HPP
|
||||
|
||||
#include <QObject>
|
||||
#include <QMap>
|
||||
#include <QStringList>
|
||||
#include <QTextStream>
|
||||
|
||||
#include "support.hpp"
|
||||
#include "setting.hpp"
|
||||
|
||||
namespace CSMSettings
|
||||
{
|
||||
|
||||
typedef QMap <QString, QStringList *> DefinitionMap;
|
||||
typedef QMap <QString, DefinitionMap *> DefinitionPageMap;
|
||||
|
||||
typedef QMap <QString, QList <Setting *> > SettingPageMap;
|
||||
|
||||
class SettingManager : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
QString mReadOnlyMessage;
|
||||
QString mReadWriteMessage;
|
||||
QList <Setting *> mSettings;
|
||||
|
||||
public:
|
||||
explicit SettingManager(QObject *parent = 0);
|
||||
|
||||
///retrieve a setting object from a given page and setting name
|
||||
Setting *findSetting
|
||||
(const QString &pageName, const QString &settingName);
|
||||
|
||||
///retrieve all settings for a specified page
|
||||
QList <Setting *> findSettings (const QString &pageName);
|
||||
|
||||
///retrieve all settings named in the attached list.
|
||||
///Setting names are specified in "PageName.SettingName" format.
|
||||
QList <Setting *> findSettings (const QStringList &list);
|
||||
|
||||
///Retreive a map of the settings, keyed by page name
|
||||
SettingPageMap settingPageMap() const;
|
||||
|
||||
protected:
|
||||
|
||||
///add a new setting to the model and return it
|
||||
Setting *createSetting (CSMSettings::SettingType typ,
|
||||
const QString &page, const QString &name);
|
||||
|
||||
///add definitions to the settings specified in the page map
|
||||
void addDefinitions (DefinitionPageMap &pageMap);
|
||||
|
||||
///read setting definitions from file
|
||||
DefinitionPageMap readFilestream(QTextStream *stream);
|
||||
|
||||
///write setting definitions to file
|
||||
bool writeFilestream (QTextStream *stream,
|
||||
const QMap <QString, QStringList > &settingMap);
|
||||
|
||||
///merge PageMaps of settings when loading from multiple files
|
||||
void mergeSettings (DefinitionPageMap &destMap, DefinitionPageMap &srcMap);
|
||||
|
||||
QTextStream *openFilestream (const QString &filePath,
|
||||
bool isReadOnly) const;
|
||||
|
||||
void destroyStream(QTextStream *stream) const;
|
||||
|
||||
void displayFileErrorMessage(const QString &message,
|
||||
bool isReadOnly) const;
|
||||
|
||||
QList <Setting *> settings() const { return mSettings; }
|
||||
void dumpModel();
|
||||
|
||||
signals:
|
||||
|
||||
void userSettingUpdated (const QString &, const QStringList &);
|
||||
|
||||
public slots:
|
||||
|
||||
void updateUserSetting (const QString &, const QStringList &);
|
||||
};
|
||||
}
|
||||
#endif // CSMSETTINGS_SETTINGMANAGER_HPP
|
||||
@ -1,5 +0,0 @@
|
||||
[Editor]
|
||||
Record Status Display = Icon and Text
|
||||
[Window Size]
|
||||
Width = 640
|
||||
Height = 480
|
||||
@ -0,0 +1,7 @@
|
||||
[Display%20Format]
|
||||
Record%20Status%20Display=Icon Only
|
||||
Referenceable%20ID%20Type%20Display=Text Only
|
||||
|
||||
[Window%20Size]
|
||||
Height=900
|
||||
Width=1440
|
||||
Loading…
Reference in New Issue