mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-25 00:15:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Luis Ángel San Martín
2013-11-24 18:48:59 +01:00
parent 8b2967c1a3 4c5f224d52
commit d18a96901b
17 changed files with 118 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
YACReader/YACReader.pri
View File

@ -81,7 +81,8 @@ HEADERS += $$PWD/../common/comic.h \
$$PWD/../common/folder.h \
$$PWD/../common/library_item.h \
$$PWD/yacreader_local_client.h \
$$PWD/../common/http_worker.h
$$PWD/../common/http_worker.h \
$$PWD/../common/exit_check.h \
SOURCES += $$PWD/../common/comic.cpp \
$$PWD/configuration.cpp \
@ -113,8 +114,9 @@ SOURCES += $$PWD/../common/comic.cpp \
$$PWD/../common/folder.cpp \
$$PWD/../common/library_item.cpp \
$$PWD/yacreader_local_client.cpp \
$$PWD/../common/http_worker.cpp \
$$PWD/../common/yacreader_global.cpp \
$$PWD/../common/http_worker.cpp \
$$PWD/../common/yacreader_global.cpp \
$$PWD/../common/exit_check.cpp \
include($$PWD/../custom_widgets/custom_widgets_yacreader.pri)
include($$PWD/../compressed_archive/wrapper.pri)

62
YACReader/configuration.cpp
View File

@ -7,6 +7,8 @@
#include <QStringList>
#include <QMessageBox>
#include "yacreader_global.h"
Configuration::Configuration()
{
//read configuration
@ -77,7 +79,7 @@ void Configuration::load(const QString & path)
alwaysOnTop = false;
//load from file
QFile f(QCoreApplication::applicationDirPath()+path);
QFile f(YACReader::getSettingsPath()+path);
f.open(QIODevice::ReadOnly);
QTextStream txtS(&f);
QString content = txtS.readAll();
@ -158,61 +160,3 @@ void Configuration::load(const QString & path)
i++;
}
}
void Configuration::save()
{
QFile f(QCoreApplication::applicationDirPath()+"/YACReader.conf");
if(!f.open(QIODevice::WriteOnly))
{
QMessageBox::critical(NULL,tr("Saving config file...."),tr("There was a problem saving YACReader configuration. Please, check if you have enough permissions in the YACReader root folder."));
}
else
{
QTextStream txtS(&f);
txtS << PATH << "\n";
txtS << defaultPath << "\n";
txtS << MAG_GLASS_SIZE << "\n";
txtS << magnifyingGlassSize.width() <<","<< magnifyingGlassSize.height() << "\n";
txtS << ZOOM_LEVEL << "\n";
txtS << zoomLevel << "\n";
txtS << SLIDE_SIZE << "\n";
txtS << gotoSlideSize.height() << "\n";
txtS << FIT << "\n";
txtS << (int)adjustToWidth << "\n";
txtS << FLOW_TYPE << "\n";
txtS << (int)flowType << "\n";
txtS << FULLSCREEN << "\n";
txtS << (int)fullScreen << "\n";
txtS << FIT_TO_WIDTH_RATIO << "\n";
txtS << fitToWidthRatio << "\n";
txtS << Y_WINDOW_POS << "\n";
txtS << windowPos.x() << "," << windowPos.y() << "\n";
txtS << Y_WINDOW_SIZE << "\n";
txtS << windowSize.width() << "," << windowSize.height() << "\n";
txtS << MAXIMIZED << "\n";
txtS << (int)maximized << "\n";
txtS << DOUBLE_PAGE << "\n";
txtS << (int)doublePage << "\n";
txtS << ADJUST_TO_FULL_SIZE << "\n";
txtS << (int) adjustToFullSize << "\n";
txtS << BACKGROUND_COLOR << "\n";
txtS << backgroundColor.red() << "," << backgroundColor.green() << "," << backgroundColor.blue() << "\n";
txtS << ALWAYS_ON_TOP << "\n";
txtS << (int)alwaysOnTop << "\n";
}
}

3
YACReader/configuration.h
View File

@ -89,9 +89,6 @@ using namespace YACReader;
void setLastVersionCheck(const QDate & date){ settings->setValue(LAST_VERSION_CHECK,date);}
int getNumDaysBetweenVersionChecks() {return settings->value(NUM_DAYS_BETWEEN_VERSION_CHECKS,1).toInt();}
void setNumDaysBetweenVersionChecks(int days) {return settings->setValue(NUM_DAYS_BETWEEN_VERSION_CHECKS,days);}
void save();
};
#endif

6
YACReader/main.cpp
View File

@ -11,7 +11,7 @@
#include <QTranslator>
#include "main_window_viewer.h"
#include "configuration.h"
#include "exit_check.h"
#if defined(WIN32) && defined(_DEBUG)
@ -43,7 +43,9 @@ int main(int argc, char * argv[])
int ret = app.exec();
Configuration::getConfiguration().save();
//Configuration::getConfiguration().save();
YACReader::exitCheck(ret);
return ret;
}

4
YACReader/main_window_viewer.cpp
View File

@ -1008,7 +1008,7 @@ void MainWindowViewer::getSiblingComics(QString path,QString currentComic)
int index = list.indexOf(currentComic);
if(index == -1) //comic not found
{
QFile f(QCoreApplication::applicationDirPath()+"/errorLog.txt");
/*QFile f(QCoreApplication::applicationDirPath()+"/errorLog.txt");
if(!f.open(QIODevice::WriteOnly))
{
QMessageBox::critical(NULL,tr("Saving error log file...."),tr("There was a problem saving YACReader error log file. Please, check if you have enough permissions in the YACReader root folder."));
@ -1025,7 +1025,7 @@ void MainWindowViewer::getSiblingComics(QString path,QString currentComic)
txtS << s << '\n';
}
f.close();
}
}*/
}
previousComicPath = nextComicPath = "";