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

7.0 fields added

Browse Source 
save current page on viewer close
This commit is contained in:
Luis Ángel San Martín
2013-07-20 20:18:59 +02:00
parent 97db3f582a
commit 57d7a8abdc
11 changed files with 141 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
YACReader/main_window_viewer.cpp
View File

@ -54,7 +54,7 @@ public:
#endif
MainWindowViewer::MainWindowViewer()
:QMainWindow(),fullscreen(false),toolbars(true),alwaysOnTop(false),currentDirectory("."),currentDirectoryImgDest(".")
:QMainWindow(),fullscreen(false),toolbars(true),alwaysOnTop(false),currentDirectory("."),currentDirectoryImgDest("."),isClient(false)
{
loadConfiguration();
setupUI();
@ -154,6 +154,7 @@ void MainWindowViewer::setupUI()
if(QCoreApplication::argc() == 2) //only path...
{
isClient = false;
//TODO: new method open(QString)
QString pathFile = QCoreApplication::arguments().at(1);
QFileInfo fi(pathFile);
@ -166,6 +167,7 @@ void MainWindowViewer::setupUI()
}
else if(QCoreApplication::argc() == 5)
{
isClient = true;
QString pathFile = QCoreApplication::arguments().at(1);
currentDirectory = pathFile;
quint64 comicId = QCoreApplication::arguments().at(2).toULongLong();
@ -596,7 +598,7 @@ void MainWindowViewer::open(QString path, ComicDB & comic, QList<ComicDB> & sibl
else
setWindowTitle("YACReader - " + fi.fileName());
viewer->open(path,comic.info.currentPage);
viewer->open(path,comic.info.currentPage-1);
enableActions();
int index = siblings.indexOf(comic);
@ -840,6 +842,15 @@ void MainWindowViewer::newVersion()
void MainWindowViewer::closeEvent ( QCloseEvent * event )
{
YACReaderLocalClient client;
if(isClient)
{
currentComicDB.info.currentPage = viewer->getCurrentPageNumber()+1;
currentComicDB.info.hasBeenOpened = true;
//viewer->getBookmarks();
client.sendComicInfo(0,currentComicDB);
}
viewer->save();
Configuration & conf = Configuration::getConfiguration();
if(!fullscreen && !isMaximized())
@ -980,6 +991,7 @@ void MainWindowViewer::dragEnterEvent(QDragEnterEvent *event)
if (event->mimeData()->hasFormat("text/uri-list"))
{
event->acceptProposedAction();
isClient = false;
}
}

1
YACReader/main_window_viewer.h
View File

@ -121,6 +121,7 @@ class YACReaderSliderAction;
ComicDB currentComicDB;
QList<ComicDB> siblingComics;
bool isClient;
signals:
void closed();
protected:

5
YACReader/viewer.cpp
View File

@ -804,4 +804,9 @@ void Viewer::showIsLastMessage()
unsigned int Viewer::getIndex()
{
return render->getIndex()+1;
}
int Viewer::getCurrentPageNumber()
{
return render->getIndex();
}

1
YACReader/viewer.h
View File

@ -81,6 +81,7 @@ virtual void mouseReleaseEvent ( QMouseEvent * event );
void updateImageOptions();
void showIsCoverMessage();
void showIsLastMessage();
int getCurrentPageNumber();
private:
bool information;

2
YACReader/yacreader_local_client.cpp
View File

@ -73,7 +73,7 @@ bool YACReaderLocalClient::sendComicInfo(quint64 libraryId, ComicDB & comic)
QDataStream out(&block, QIODevice::WriteOnly);
out.setVersion(QDataStream::Qt_4_8);
out << (quint16)0;
out << (quint8)YACReaderIPCMessages::RequestComicInfo;
out << (quint8)YACReaderIPCMessages::SendComicInfo;
out << libraryId;
out << comic;
out.device()->seek(0);