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

merged

Browse Source
This commit is contained in:
Luis Ángel San Martín 2015-02-25 17:44:15 +01:00
parent 926dd4c0d5
commit 2c406dab8e
3 changed files with 59 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
YACReader/main_window_viewer.cpp
View File

@ -710,22 +710,31 @@ void MainWindowViewer::open(QString path, qint64 comicId, qint64 libraryId)
optionsDialog->setFilters(currentComicDB.info.brightness, currentComicDB.info.contrast, currentComicDB.info.gamma); optionsDialog->setFilters(currentComicDB.info.brightness, currentComicDB.info.contrast, currentComicDB.info.gamma);
} }
void MainWindowViewer::openComicFromPath(QString pathFile) void MainWindowViewer::openComicFromPath(const QString &pathFile)
{ {
QFileInfo fi(pathFile); openComic(pathFile);
currentDirectory = fi.dir().absolutePath(); isClient = false; //this method is used for direct openings
getSiblingComics(fi.absolutePath(),fi.fileName());
setWindowTitle("YACReader - " + fi.fileName());
enableActions();
viewer->open(pathFile);
isClient = false;
} }
//isClient shouldn't be modified when a siblinig comic is opened
void MainWindowViewer::openSiblingComic(const QString &pathFile)
{
openComic(pathFile);
}
void MainWindowViewer::openComic(const QString &pathFile)
{
QFileInfo fi(pathFile);
currentDirectory = fi.dir().absolutePath();
getSiblingComics(fi.absolutePath(),fi.fileName());
setWindowTitle("YACReader - " + fi.fileName());
enableActions();
viewer->open(fi.absoluteFilePath());
}
void MainWindowViewer::openFolder() void MainWindowViewer::openFolder()
{ {
QFileDialog openDialog; QFileDialog openDialog;
@ -737,7 +746,7 @@ void MainWindowViewer::openFolder()
} }
} }
void MainWindowViewer::openFolderFromPath(QString pathDir) void MainWindowViewer::openFolderFromPath(const QString & pathDir)
{ {
currentDirectory = pathDir; //TODO ?? currentDirectory = pathDir; //TODO ??
QFileInfo fi(pathDir); QFileInfo fi(pathDir);
@ -750,7 +759,7 @@ void MainWindowViewer::openFolderFromPath(QString pathDir)
viewer->open(pathDir); viewer->open(pathDir);
} }
void MainWindowViewer::openFolderFromPath(QString pathDir, QString atFileName) void MainWindowViewer::openFolderFromPath(const QString &pathDir, const QString &atFileName)
{ {
currentDirectory = pathDir; //TODO ?? currentDirectory = pathDir; //TODO ??
QFileInfo fi(pathDir); QFileInfo fi(pathDir);
@ -1230,11 +1239,7 @@ void MainWindowViewer::openPreviousComic()
} }
if(!previousComicPath.isEmpty()) if(!previousComicPath.isEmpty())
{ {
viewer->open(previousComicPath); openSiblingComic(previousComicPath);
QFileInfo fi(previousComicPath);
getSiblingComics(fi.absolutePath(),fi.fileName());
setWindowTitle("YACReader - " + fi.fileName());
} }
} }
@ -1257,11 +1262,7 @@ void MainWindowViewer::openNextComic()
} }
if(!nextComicPath.isEmpty()) if(!nextComicPath.isEmpty())
{ {
viewer->open(nextComicPath); openSiblingComic(nextComicPath);
QFileInfo fi(nextComicPath);
getSiblingComics(fi.absolutePath(),fi.fileName());
setWindowTitle("YACReader - " + fi.fileName());
} }
} }

14
YACReader/main_window_viewer.h
View File

@ -48,9 +48,11 @@ class EditShortcutsDialog;
void newVersion(); void newVersion();
void openPreviousComic(); void openPreviousComic();
void openNextComic(); void openNextComic();
void openComicFromPath(QString pathFile); void openComicFromPath(const QString & pathFile);
void openFolderFromPath(QString pathDir); void openSiblingComic(const QString &pathFile);
void openFolderFromPath(QString pathFile, QString atFileName); void openComic(const QString &pathFile);
void openFolderFromPath(const QString & pathDir);
void openFolderFromPath(const QString & pathFile, const QString & atFileName);
void alwaysOnTopSwitch(); void alwaysOnTopSwitch();
void adjustToFullSizeSwitch(); void adjustToFullSizeSwitch();
void reloadOptions(); void reloadOptions();
@ -68,7 +70,8 @@ class EditShortcutsDialog;
void next(); void next();
void updatePage();*/ void updatePage();*/
private:
private:
//!State //!State
bool fullscreen; bool fullscreen;
bool toolbars; bool toolbars;
@ -162,6 +165,5 @@ signals:
public: public:
MainWindowViewer(); MainWindowViewer();
~MainWindowViewer(); ~MainWindowViewer();
};
};
#endif #endif

44
YACReader/render.cpp
View File

@ -937,25 +937,31 @@ void Render::setNumPages(unsigned int numPages)
void Render::pageRawDataReady(int page) void Render::pageRawDataReady(int page)
{ {
pagesEmited.push_back(page); if (!hasLoadedComic())
if(pageRenders.size()>0) return;
{
for(int i=0;i<pagesEmited.size();i++) pagesEmited.push_back(page);
{ if(pageRenders.size()>0)
pagesReady[pagesEmited.at(i)] = true; {
if(pagesEmited.at(i) == currentIndex) for(int i=0;i<pagesEmited.size();i++)
update(); {
else if(pagesEmited.at(i)>= pagesReady.size())
{ return; //Oooops, something went wrong
if ( ((pagesEmited.at(i) < currentIndex) && (pagesEmited.at(i) > currentIndex-numLeftPages)) ||
((pagesEmited.at(i) > currentIndex) && (pagesEmited.at(i) < currentIndex+numRightPages)) ) pagesReady[pagesEmited.at(i)] = true;
{ if(pagesEmited.at(i) == currentIndex)
fillBuffer(); update();
} else
} {
} if ( ((pagesEmited.at(i) < currentIndex) && (pagesEmited.at(i) > currentIndex-numLeftPages)) ||
pagesEmited.clear(); ((pagesEmited.at(i) > currentIndex) && (pagesEmited.at(i) < currentIndex+numRightPages)) )
} {
fillBuffer();
}
}
}
pagesEmited.clear();
}
} }
//sólo se renderiza la página, si ha habido un cambio de página //sólo se renderiza la página, si ha habido un cambio de página