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 classic comics view table header status

Browse Source
This commit is contained in:
Luis Ángel San Martín 2015-05-30 19:58:38 +02:00
parent 03be5914da
commit e05d2e2a99
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
YACReaderLibrary/classic_comics_view.cpp
View File

@ -60,10 +60,8 @@ ClassicComicsView::ClassicComicsView(QWidget *parent)
tableView->setContextMenuPolicy(Qt::CustomContextMenu); tableView->setContextMenuPolicy(Qt::CustomContextMenu);
//config-------------------------------------------------- //config--------------------------------------------------
settingsMutex.lock();
if(settings->contains(COMICS_VIEW_HEADERS)) if(settings->contains(COMICS_VIEW_HEADERS))
tableView->horizontalHeader()->restoreState(settings->value(COMICS_VIEW_HEADERS).toByteArray()); tableView->horizontalHeader()->restoreState(settings->value(COMICS_VIEW_HEADERS).toByteArray());
settingsMutex.unlock();
//connections--------------------------------------------- //connections---------------------------------------------
connect(tableView, SIGNAL(clicked(QModelIndex)), this, SLOT(centerComicFlow(QModelIndex))); connect(tableView, SIGNAL(clicked(QModelIndex)), this, SLOT(centerComicFlow(QModelIndex)));
@ -84,10 +82,9 @@ ClassicComicsView::ClassicComicsView(QWidget *parent)
sVertical->setCollapsible(1,false); sVertical->setCollapsible(1,false);
#endif #endif
settingsMutex.lock();
if(settings->contains(COMICS_VIEW_FLOW_SPLITTER_STATUS)) if(settings->contains(COMICS_VIEW_FLOW_SPLITTER_STATUS))
sVertical->restoreState(settings->value(COMICS_VIEW_FLOW_SPLITTER_STATUS).toByteArray()); sVertical->restoreState(settings->value(COMICS_VIEW_FLOW_SPLITTER_STATUS).toByteArray());
settingsMutex.unlock();
} }
void ClassicComicsView::setToolBar(QToolBar *toolBar) void ClassicComicsView::setToolBar(QToolBar *toolBar)
@ -123,9 +120,8 @@ void ClassicComicsView::setModel(ComicModel *model)
tableView->horizontalHeader()->setMovable(true); tableView->horizontalHeader()->setMovable(true);
#endif #endif
//TODO parametrizar la configuración de las columnas //TODO parametrizar la configuración de las columnas
settingsMutex.lock(); /*if(!settings->contains(COMICS_VIEW_HEADERS))
if(!settings->contains(COMICS_VIEW_HEADERS)) {*/
{
for(int i = 0;i<tableView->horizontalHeader()->count();i++) for(int i = 0;i<tableView->horizontalHeader()->count();i++)
tableView->horizontalHeader()->hideSection(i); tableView->horizontalHeader()->hideSection(i);
@ -137,27 +133,24 @@ void ClassicComicsView::setModel(ComicModel *model)
tableView->horizontalHeader()->showSection(ComicModel::ReadColumn); tableView->horizontalHeader()->showSection(ComicModel::ReadColumn);
tableView->horizontalHeader()->showSection(ComicModel::CurrentPage); tableView->horizontalHeader()->showSection(ComicModel::CurrentPage);
tableView->horizontalHeader()->showSection(ComicModel::Rating); tableView->horizontalHeader()->showSection(ComicModel::Rating);
} //}
settingsMutex.unlock();
//debido a un bug, qt4 no es capaz de ajustar el ancho teniendo en cuenta todas la filas (no sólo las visibles) //debido a un bug, qt4 no es capaz de ajustar el ancho teniendo en cuenta todas la filas (no sólo las visibles)
//así que se ecala la primera vez y después se deja el control al usuario. //así que se ecala la primera vez y después se deja el control al usuario.
settingsMutex.lock(); //if(!settings->contains(COMICS_VIEW_HEADERS))
if(!settings->contains(COMICS_VIEW_HEADERS))
tableView->resizeColumnsToContents();
settingsMutex.unlock();
tableView->horizontalHeader()->setStretchLastSection(true);
QStringList paths = model->getPaths(model->getCurrentPath());//TODO ComicsView: get currentpath from somewhere currentPath()); QStringList paths = model->getPaths(model->getCurrentPath());//TODO ComicsView: get currentpath from somewhere currentPath());
comicFlow->setImagePaths(paths); comicFlow->setImagePaths(paths);
comicFlow->setMarks(model->getReadList()); comicFlow->setMarks(model->getReadList());
//comicFlow->setFocus(Qt::OtherFocusReason); //comicFlow->setFocus(Qt::OtherFocusReason);
settingsMutex.lock();
if(settings->contains(COMICS_VIEW_HEADERS)) if(settings->contains(COMICS_VIEW_HEADERS))
tableView->horizontalHeader()->restoreState(settings->value(COMICS_VIEW_HEADERS).toByteArray()); tableView->horizontalHeader()->restoreState(settings->value(COMICS_VIEW_HEADERS).toByteArray());
settingsMutex.unlock();
tableView->resizeColumnsToContents();
tableView->horizontalHeader()->setStretchLastSection(true);
} }
} }
@ -274,9 +267,7 @@ void ClassicComicsView::updateTableView(int i)
void ClassicComicsView::saveTableHeadersStatus() void ClassicComicsView::saveTableHeadersStatus()
{ {
settingsMutex.lock();
settings->setValue(COMICS_VIEW_HEADERS,tableView->horizontalHeader()->saveState()); settings->setValue(COMICS_VIEW_HEADERS,tableView->horizontalHeader()->saveState());
settingsMutex.unlock();
} }
void ClassicComicsView::saveSplitterStatus() void ClassicComicsView::saveSplitterStatus()