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

This again :/, fixing this needs a separated feature branch and long debuging session.

Browse Source
This commit is contained in:
Luis Ángel San Martín 2016-04-12 23:01:39 +02:00
parent 939a52dd6e
commit 4fcd7225da
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
YACReaderLibrary/grid_comics_view.cpp
View File

@ -157,8 +157,6 @@ void GridComicsView::setToolBar(QToolBar *toolBar)
void GridComicsView::setModel(ComicModel *model) void GridComicsView::setModel(ComicModel *model)
{ {
BOOL setModel = model != this->model;
if(model == NULL) if(model == NULL)
return; return;
@ -171,8 +169,7 @@ void GridComicsView::setModel(ComicModel *model)
_selectionModel = new QItemSelectionModel(model); _selectionModel = new QItemSelectionModel(model);
if(setModel) ctxt->setContextProperty("comicsList", model);
ctxt->setContextProperty("comicsList", model);
ctxt->setContextProperty("comicsSelection", _selectionModel); ctxt->setContextProperty("comicsSelection", _selectionModel);
ctxt->setContextProperty("contextMenuHelper",this); ctxt->setContextProperty("contextMenuHelper",this);
ctxt->setContextProperty("comicsSelectionHelper", this); ctxt->setContextProperty("comicsSelectionHelper", this);

9
YACReaderLibrary/info_comics_view.cpp
View File

@ -48,8 +48,6 @@ void InfoComicsView::setToolBar(QToolBar *toolBar)
void InfoComicsView::setModel(ComicModel *model) void InfoComicsView::setModel(ComicModel *model)
{ {
BOOL setModel = model != this->model;
if(model == NULL) if(model == NULL)
return; return;
@ -62,12 +60,7 @@ void InfoComicsView::setModel(ComicModel *model)
_selectionModel = new QItemSelectionModel(model);*/ _selectionModel = new QItemSelectionModel(model);*/
//TODO fix crash in the following line on comics views switch ctxt->setContextProperty("comicsList", model);
int row = currentIndex().row();
if(setModel)
ctxt->setContextProperty("comicsList", model);
ctxt->setContextProperty("backgroundImage", this->model->data(this->model->index(0, 0), ComicModel::CoverPathRole)); ctxt->setContextProperty("backgroundImage", this->model->data(this->model->index(0, 0), ComicModel::CoverPathRole));
/*ctxt->setContextProperty("comicsSelection", _selectionModel); /*ctxt->setContextProperty("comicsSelection", _selectionModel);

1
YACReaderLibrary/library_window.cpp
View File

@ -1267,6 +1267,7 @@ void LibraryWindow::loadLibrary(const QString & name)
void LibraryWindow::loadCoversFromCurrentModel() void LibraryWindow::loadCoversFromCurrentModel()
{ {
comicsViewsManager->comicsView->setModel(new ComicModel()); //TODO fix this
comicsViewsManager->comicsView->setModel(comicsModel); comicsViewsManager->comicsView->setModel(comicsModel);
} }