fixed regression in grid view context menu

This commit is contained in:
Luis Ángel San Martín 2014-10-12 21:16:34 +02:00
parent 96d833641a
commit 964bb377ce
3 changed files with 12 additions and 11 deletions

View File

@ -147,22 +147,23 @@ void GridComicsView::setViewActions(const QList<QAction *> &actions)
ctxt->setContextProperty("openComicAction",actions[0]); ctxt->setContextProperty("openComicAction",actions[0]);
ctxt->setContextProperty("openContainingFolderComicAction",actions[2]); ctxt->setContextProperty("openContainingFolderComicAction",actions[2]);
ctxt->setContextProperty("updateCurrentFolderAction",actions[3]);
ctxt->setContextProperty("resetComicRatingAction",actions[4]); ctxt->setContextProperty("resetComicRatingAction",actions[5]);
ctxt->setContextProperty("editSelectedComicsAction",actions[6]); ctxt->setContextProperty("editSelectedComicsAction",actions[7]);
ctxt->setContextProperty("getInfoAction",actions[7]); ctxt->setContextProperty("getInfoAction",actions[8]);
ctxt->setContextProperty("asignOrderAction",actions[8]); ctxt->setContextProperty("asignOrderAction",actions[9]);
ctxt->setContextProperty("selectAllComicsAction",actions[10]); ctxt->setContextProperty("selectAllComicsAction",actions[11]);
ctxt->setContextProperty("setAsReadAction",actions[12]); ctxt->setContextProperty("setAsReadAction",actions[13]);
ctxt->setContextProperty("setAsNonReadAction",actions[13]); ctxt->setContextProperty("setAsNonReadAction",actions[14]);
ctxt->setContextProperty("showHideMarksAction",actions[14]); ctxt->setContextProperty("showHideMarksAction",actions[15]);
ctxt->setContextProperty("deleteComicsAction",actions[16]); ctxt->setContextProperty("deleteComicsAction",actions[17]);
ctxt->setContextProperty("toggleFullScreenAction",actions[18]); ctxt->setContextProperty("toggleFullScreenAction",actions[19]);
} }
else else
QLOG_ERROR() << "setViewActions invoked with the wrong number of actions"; QLOG_ERROR() << "setViewActions invoked with the wrong number of actions";

View File

@ -2337,7 +2337,6 @@ void LibraryWindow::importLibraryPackage()
void LibraryWindow::updateComicsView(quint64 libraryId, const ComicDB & comic) void LibraryWindow::updateComicsView(quint64 libraryId, const ComicDB & comic)
{ {
QLOG_DEBUG() << "incoming libraryId : " << " current id :" << libraries.getId(selectedLibrary->currentText());
if(libraryId == libraries.getId(selectedLibrary->currentText())) { if(libraryId == libraries.getId(selectedLibrary->currentText())) {
comicsModel->reload(comic); comicsModel->reload(comic);
} }

View File

@ -87,6 +87,7 @@ Rectangle {
MenuItem { text: "Open comic"; enabled: true; iconSource:"qrc:///images/openInYACReader.png"; onTriggered: openComicAction.trigger() } MenuItem { text: "Open comic"; enabled: true; iconSource:"qrc:///images/openInYACReader.png"; onTriggered: openComicAction.trigger() }
MenuSeparator{} MenuSeparator{}
MenuItem { text: "Open containing folder..."; enabled: true; iconSource: "qrc:///images/open.png"; onTriggered: openContainingFolderComicAction.trigger() } MenuItem { text: "Open containing folder..."; enabled: true; iconSource: "qrc:///images/open.png"; onTriggered: openContainingFolderComicAction.trigger() }
MenuItem { text: "Update current folder"; enabled: true; iconSource: "qrc:///images/updateLibraryIcon.png"; onTriggered: updateCurrentFolderAction.trigger() }
MenuSeparator{} MenuSeparator{}
MenuItem { text: "Reset comic rating"; onTriggered: resetComicRatingAction.trigger() } MenuItem { text: "Reset comic rating"; onTriggered: resetComicRatingAction.trigger() }
MenuSeparator{} MenuSeparator{}