mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed settings path for server config

Browse Source
This commit is contained in:
Luis Ángel San Martín 2015-12-13 21:46:37 +01:00
parent 7153f65406
commit 45fcaa8b2f
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
YACReaderLibrary/headless/console_ui_library_creator.cpp
View File

@ -3,7 +3,7 @@
#include <iostream> #include <iostream>
#include "library_creator.h" #include "library_creator.h"
#include "yacreader_libraries.h"
ConsoleUILibraryCreator::ConsoleUILibraryCreator(QObject *parent) : ConsoleUILibraryCreator::ConsoleUILibraryCreator(QObject *parent) :
@ -29,6 +29,12 @@ void ConsoleUILibraryCreator::createLibrary(const QString & name, const QString
libraryCreator->start(); libraryCreator->start();
eventLoop.exec(); eventLoop.exec();
//TODO, at some point some checking is needed for avoiding duplicated libraries
YACReaderLibraries yacreaderLibraries;
yacreaderLibraries.load();
yacreaderLibraries.addLibrary(name, path);
yacreaderLibraries.save();
} }
void ConsoleUILibraryCreator::updateLibrary(const QString & path) void ConsoleUILibraryCreator::updateLibrary(const QString & path)

4
YACReaderLibrary/headless/main.cpp
View File

@ -226,12 +226,10 @@ int main( int argc, char ** argv )
viewerTranslator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix); viewerTranslator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix);
#endif #endif
app->installTranslator(&viewerTranslator); app->installTranslator(&viewerTranslator);
app->setApplicationName("YACReaderLibrary");
qRegisterMetaType<ComicDB>("ComicDB"); qRegisterMetaType<ComicDB>("ComicDB");
QSettings * settings = new QSettings(YACReader::getSettingsPath()+"/"+QCoreApplication::applicationName()+".ini",QSettings::IniFormat);
QSettings * settings = new QSettings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat); //TODO unificar la creaci�n del fichero de config con el servidor
settings->beginGroup("libraryConfig"); settings->beginGroup("libraryConfig");
//server //server

1
YACReaderLibrary/main.cpp
View File

@ -187,7 +187,6 @@ int main( int argc, char ** argv )
viewerTranslator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix); viewerTranslator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix);
#endif #endif
app.installTranslator(&viewerTranslator); app.installTranslator(&viewerTranslator);
app.setApplicationName("YACReaderLibrary");
qRegisterMetaType<ComicDB>("ComicDB"); qRegisterMetaType<ComicDB>("ComicDB");

3
YACReaderLibrary/server/startup.cpp
View File

@ -27,8 +27,7 @@
void Startup::start() { void Startup::start() {
// Initialize the core application // Initialize the core application
QCoreApplication* app = QCoreApplication::instance(); QCoreApplication* app = QCoreApplication::instance();
app->setApplicationName(APPNAME);
app->setOrganizationName(ORGANISATION);
QString configFileName=YACReader::getSettingsPath()+"/"+QCoreApplication::applicationName()+".ini"; QString configFileName=YACReader::getSettingsPath()+"/"+QCoreApplication::applicationName()+".ini";
// Configure logging into files // Configure logging into files

4
YACReaderLibrary/yacreader_libraries.cpp
View File

@ -102,7 +102,7 @@ void YACReaderLibraries::addLibrary(const QString &name, const QString &path)
void YACReaderLibraries::load() void YACReaderLibraries::load()
{ {
QSettings settings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat); QSettings settings(YACReader::getSettingsPath()+"/"+QCoreApplication::applicationName()+".ini",QSettings::IniFormat);
if(settings.value(LIBRARIES).isValid()) if(settings.value(LIBRARIES).isValid())
{ {
@ -136,7 +136,7 @@ void YACReaderLibraries::load()
bool YACReaderLibraries::save() bool YACReaderLibraries::save()
{ {
QSettings settings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat); QSettings settings(YACReader::getSettingsPath()+"/"+QCoreApplication::applicationName()+".ini",QSettings::IniFormat);
QByteArray data; QByteArray data;
QDataStream out(&data, QIODevice::WriteOnly); QDataStream out(&data, QIODevice::WriteOnly);