diff --git a/YACReaderLibrary/images.qrc b/YACReaderLibrary/images.qrc index ad413386..fd05573b 100644 --- a/YACReaderLibrary/images.qrc +++ b/YACReaderLibrary/images.qrc @@ -71,5 +71,7 @@ ../images/shownCovers.png ../images/hiddenCovers.png ../images/trash.png + ../images/setReadButton.png + ../images/openInYACReader.png \ No newline at end of file diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index 001357d9..5ff08bda 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -383,11 +383,11 @@ void LibraryWindow::createActions() openComicAction = new QAction(tr("Open current comic"),this); openComicAction->setToolTip(tr("Open current comic on YACReader")); openComicAction->setShortcut(Qt::Key_Return); - openComicAction->setIcon(QIcon(":/images/icon.png")); + openComicAction->setIcon(QIcon(":/images/openInYACReader.png")); setAsReadAction = new QAction(tr("Set as read"),this); setAsReadAction->setToolTip(tr("Set comic as read")); - setAsReadAction->setIcon(QIcon(":/images/setRead.png")); + setAsReadAction->setIcon(QIcon(":/images/setReadButton.png")); setAsNonReadAction = new QAction(tr("Set as unread"),this); setAsNonReadAction->setToolTip(tr("Set comic as unread")); @@ -607,20 +607,10 @@ void LibraryWindow::createToolBars() editInfoToolBar->addSeparator(); - QToolButton * tb = new QToolButton(); - tb->addAction(setAsReadAction); - tb->addAction(setAllAsReadAction); - tb->setPopupMode(QToolButton::MenuButtonPopup); - tb->setDefaultAction(setAsReadAction); - - QToolButton * tb2 = new QToolButton(); - tb2->addAction(setAsNonReadAction); - tb2->addAction(setAllAsNonReadAction); - tb2->setPopupMode(QToolButton::MenuButtonPopup); - tb2->setDefaultAction(setAsNonReadAction); - - editInfoToolBar->addWidget(tb); - editInfoToolBar->addWidget(tb2); + editInfoToolBar->addAction(setAsReadAction); + editInfoToolBar->addAction(setAllAsReadAction); + editInfoToolBar->addAction(setAsNonReadAction); + editInfoToolBar->addAction(setAllAsNonReadAction); editInfoToolBar->addAction(showHideMarksAction); diff --git a/images/asignNumber.png b/images/asignNumber.png index 0962bc2d..06fe03a1 100644 Binary files a/images/asignNumber.png and b/images/asignNumber.png differ diff --git a/images/editComic.png b/images/editComic.png index 1b9803dd..dccc0238 100644 Binary files a/images/editComic.png and b/images/editComic.png differ diff --git a/images/hideComicFlow.png b/images/hideComicFlow.png index bfab264b..3dd949d2 100644 Binary files a/images/hideComicFlow.png and b/images/hideComicFlow.png differ diff --git a/images/openInYACReader.png b/images/openInYACReader.png new file mode 100644 index 00000000..1341ea0b Binary files /dev/null and b/images/openInYACReader.png differ diff --git a/images/selectAll.png b/images/selectAll.png index 8d4ab94f..d5cc06bf 100644 Binary files a/images/selectAll.png and b/images/selectAll.png differ diff --git a/images/setAllRead.png b/images/setAllRead.png index 747450e6..d96be956 100644 Binary files a/images/setAllRead.png and b/images/setAllRead.png differ diff --git a/images/setAllUnread.png b/images/setAllUnread.png index 9f5efed9..8563e99c 100644 Binary files a/images/setAllUnread.png and b/images/setAllUnread.png differ diff --git a/images/setReadButton.png b/images/setReadButton.png new file mode 100644 index 00000000..829625b9 Binary files /dev/null and b/images/setReadButton.png differ diff --git a/images/setUnread.png b/images/setUnread.png index 1733022a..7f5356db 100644 Binary files a/images/setUnread.png and b/images/setUnread.png differ diff --git a/images/showMarks.png b/images/showMarks.png index 37ad5471..ab71f70c 100644 Binary files a/images/showMarks.png and b/images/showMarks.png differ diff --git a/images/trash.png b/images/trash.png index e4e7b075..e74f21d1 100644 Binary files a/images/trash.png and b/images/trash.png differ