mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-05-28 03:10:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #343 from YACReader/use_svg_assets

Browse Source 
Use SVG assets (I)
This commit is contained in:
Luis Ángel San Martín 2022-10-23 17:46:53 +02:00 committed by GitHub
commit d61d72428e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
318 changed files with 393 additions and 453 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
YACReader/YACReader.pro
View File

@ -171,11 +171,7 @@ include(../compressed_archive/libarchive/libarchive-wrapper.pri)
include(../shortcuts_management/shortcuts_management.pri) include(../shortcuts_management/shortcuts_management.pri)
RESOURCES += yacreader_images.qrc \ RESOURCES += yacreader_images.qrc \
yacreader_files.qrc yacreader_files.qrc
win32:RESOURCES += yacreader_images_win.qrc
unix:!macx:RESOURCES += yacreader_images_win.qrc
macx:RESOURCES += yacreader_images_osx.qrc
include(../third_party/QsLog/QsLog.pri) include(../third_party/QsLog/QsLog.pri)

183
YACReader/main_window_viewer.cpp
View File

@ -36,41 +36,6 @@
#include <QDate> #include <QDate>
#include <QMenuBar> #include <QMenuBar>
/* TODO remove, no longer used
#ifdef Q_OS_MAC
class MacToolBarSeparator : public QWidget
{
public:
MacToolBarSeparator(QWidget * parent =0)
:QWidget(parent)
{
setFixedWidth(2);
}
void paintEvent(QPaintEvent *event)
{
Q_UNUSED(event);
QPainter painter(this);
QLinearGradient lG(0,0,0,height());
lG.setColorAt(0,QColor(128,128,128,0));
lG.setColorAt(0.5,QColor(128,128,128,255));
lG.setColorAt(1,QColor(128,128,128,0));
painter.fillRect(0,0,1,height(),lG);
QLinearGradient lG2(1,0,1,height());
lG2.setColorAt(0,QColor(220,220,220,0));
lG2.setColorAt(0.5,QColor(220,220,220,255));
lG2.setColorAt(1,QColor(220,220,220,0));
painter.fillRect(1,0,1,height(),lG2);
}
};
#endif*/
MainWindowViewer::MainWindowViewer() MainWindowViewer::MainWindowViewer()
: QMainWindow(), fullscreen(false), toolbars(true), currentDirectory("."), currentDirectoryImgDest("."), isClient(false) : QMainWindow(), fullscreen(false), toolbars(true), currentDirectory("."), currentDirectoryImgDest("."), isClient(false)
{ {
@ -217,7 +182,7 @@ void MainWindowViewer::setupUI()
void MainWindowViewer::createActions() void MainWindowViewer::createActions()
{ {
openAction = new QAction(tr("&Open"), this); openAction = new QAction(tr("&Open"), this);
openAction->setIcon(QIcon(":/images/viewer_toolbar/open.png")); openAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/open")));
openAction->setToolTip(tr("Open a comic")); openAction->setToolTip(tr("Open a comic"));
openAction->setData(OPEN_ACTION_Y); openAction->setData(OPEN_ACTION_Y);
openAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_ACTION_Y)); openAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_ACTION_Y));
@ -244,7 +209,7 @@ void MainWindowViewer::createActions()
#endif #endif
openFolderAction = new QAction(tr("Open Folder"), this); openFolderAction = new QAction(tr("Open Folder"), this);
openFolderAction->setIcon(QIcon(":/images/viewer_toolbar/openFolder.png")); openFolderAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/openFolder")));
openFolderAction->setToolTip(tr("Open image folder")); openFolderAction->setToolTip(tr("Open image folder"));
openFolderAction->setData(OPEN_FOLDER_ACTION_Y); openFolderAction->setData(OPEN_FOLDER_ACTION_Y);
openFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_FOLDER_ACTION_Y)); openFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_FOLDER_ACTION_Y));
@ -268,28 +233,28 @@ void MainWindowViewer::createActions()
connect(clearRecentFilesAction, &QAction::triggered, this, &MainWindowViewer::clearRecentFiles); connect(clearRecentFilesAction, &QAction::triggered, this, &MainWindowViewer::clearRecentFiles);
saveImageAction = new QAction(tr("Save"), this); saveImageAction = new QAction(tr("Save"), this);
saveImageAction->setIcon(QIcon(":/images/viewer_toolbar/save.png")); saveImageAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/save")));
saveImageAction->setToolTip(tr("Save current page")); saveImageAction->setToolTip(tr("Save current page"));
saveImageAction->setData(SAVE_IMAGE_ACTION_Y); saveImageAction->setData(SAVE_IMAGE_ACTION_Y);
saveImageAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SAVE_IMAGE_ACTION_Y)); saveImageAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SAVE_IMAGE_ACTION_Y));
connect(saveImageAction, &QAction::triggered, this, &MainWindowViewer::saveImage); connect(saveImageAction, &QAction::triggered, this, &MainWindowViewer::saveImage);
openComicOnTheLeftAction = new QAction(tr("Previous Comic"), this); openComicOnTheLeftAction = new QAction(tr("Previous Comic"), this);
openComicOnTheLeftAction->setIcon(QIcon(":/images/viewer_toolbar/openPrevious.png")); openComicOnTheLeftAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/openPrevious")));
openComicOnTheLeftAction->setToolTip(tr("Open previous comic")); openComicOnTheLeftAction->setToolTip(tr("Open previous comic"));
openComicOnTheLeftAction->setData(OPEN_PREVIOUS_COMIC_ACTION_Y); openComicOnTheLeftAction->setData(OPEN_PREVIOUS_COMIC_ACTION_Y);
openComicOnTheLeftAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_PREVIOUS_COMIC_ACTION_Y)); openComicOnTheLeftAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_PREVIOUS_COMIC_ACTION_Y));
connect(openComicOnTheLeftAction, &QAction::triggered, this, &MainWindowViewer::openLeftComic); connect(openComicOnTheLeftAction, &QAction::triggered, this, &MainWindowViewer::openLeftComic);
openComicOnTheRightAction = new QAction(tr("Next Comic"), this); openComicOnTheRightAction = new QAction(tr("Next Comic"), this);
openComicOnTheRightAction->setIcon(QIcon(":/images/viewer_toolbar/openNext.png")); openComicOnTheRightAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/openNext")));
openComicOnTheRightAction->setToolTip(tr("Open next comic")); openComicOnTheRightAction->setToolTip(tr("Open next comic"));
openComicOnTheRightAction->setData(OPEN_NEXT_COMIC_ACTION_Y); openComicOnTheRightAction->setData(OPEN_NEXT_COMIC_ACTION_Y);
openComicOnTheRightAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_NEXT_COMIC_ACTION_Y)); openComicOnTheRightAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_NEXT_COMIC_ACTION_Y));
connect(openComicOnTheRightAction, &QAction::triggered, this, &MainWindowViewer::openRightComic); connect(openComicOnTheRightAction, &QAction::triggered, this, &MainWindowViewer::openRightComic);
goToPageOnTheLeftAction = new QAction(tr("&Previous"), this); goToPageOnTheLeftAction = new QAction(tr("&Previous"), this);
goToPageOnTheLeftAction->setIcon(QIcon(":/images/viewer_toolbar/previous.png")); goToPageOnTheLeftAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/previous")));
goToPageOnTheLeftAction->setShortcutContext(Qt::WidgetShortcut); goToPageOnTheLeftAction->setShortcutContext(Qt::WidgetShortcut);
goToPageOnTheLeftAction->setToolTip(tr("Go to previous page")); goToPageOnTheLeftAction->setToolTip(tr("Go to previous page"));
goToPageOnTheLeftAction->setData(PREV_ACTION_Y); goToPageOnTheLeftAction->setData(PREV_ACTION_Y);
@ -297,7 +262,7 @@ void MainWindowViewer::createActions()
connect(goToPageOnTheLeftAction, &QAction::triggered, viewer, &Viewer::left); connect(goToPageOnTheLeftAction, &QAction::triggered, viewer, &Viewer::left);
goToPageOnTheRightAction = new QAction(tr("&Next"), this); goToPageOnTheRightAction = new QAction(tr("&Next"), this);
goToPageOnTheRightAction->setIcon(QIcon(":/images/viewer_toolbar/next.png")); goToPageOnTheRightAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/next")));
goToPageOnTheRightAction->setShortcutContext(Qt::WidgetShortcut); goToPageOnTheRightAction->setShortcutContext(Qt::WidgetShortcut);
goToPageOnTheRightAction->setToolTip(tr("Go to next page")); goToPageOnTheRightAction->setToolTip(tr("Go to next page"));
goToPageOnTheRightAction->setData(NEXT_ACTION_Y); goToPageOnTheRightAction->setData(NEXT_ACTION_Y);
@ -305,27 +270,27 @@ void MainWindowViewer::createActions()
connect(goToPageOnTheRightAction, &QAction::triggered, viewer, &Viewer::right); connect(goToPageOnTheRightAction, &QAction::triggered, viewer, &Viewer::right);
adjustHeightAction = new QAction(tr("Fit Height"), this); adjustHeightAction = new QAction(tr("Fit Height"), this);
adjustHeightAction->setIcon(QIcon(":/images/viewer_toolbar/toHeight.png")); adjustHeightAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/toHeight")));
// adjustWidth->setCheckable(true); // adjustWidth->setCheckable(true);
adjustHeightAction->setToolTip(tr("Fit image to height")); adjustHeightAction->setToolTip(tr("Fit image to height"));
// adjustWidth->setIcon(QIcon(":/images/fitWidth.png")); // adjustWidth->setIcon(QIcon(":/images/fitWidth.svg"));
adjustHeightAction->setData(ADJUST_HEIGHT_ACTION_Y); adjustHeightAction->setData(ADJUST_HEIGHT_ACTION_Y);
adjustHeightAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADJUST_HEIGHT_ACTION_Y)); adjustHeightAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADJUST_HEIGHT_ACTION_Y));
adjustHeightAction->setCheckable(true); adjustHeightAction->setCheckable(true);
connect(adjustHeightAction, &QAction::triggered, this, &MainWindowViewer::fitToHeight); connect(adjustHeightAction, &QAction::triggered, this, &MainWindowViewer::fitToHeight);
adjustWidthAction = new QAction(tr("Fit Width"), this); adjustWidthAction = new QAction(tr("Fit Width"), this);
adjustWidthAction->setIcon(QIcon(":/images/viewer_toolbar/toWidth.png")); adjustWidthAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/toWidth")));
// adjustWidth->setCheckable(true); // adjustWidth->setCheckable(true);
adjustWidthAction->setToolTip(tr("Fit image to width")); adjustWidthAction->setToolTip(tr("Fit image to width"));
// adjustWidth->setIcon(QIcon(":/images/fitWidth.png")); // adjustWidth->setIcon(QIcon(":/images/fitWidth.svg"));
adjustWidthAction->setData(ADJUST_WIDTH_ACTION_Y); adjustWidthAction->setData(ADJUST_WIDTH_ACTION_Y);
adjustWidthAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADJUST_WIDTH_ACTION_Y)); adjustWidthAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADJUST_WIDTH_ACTION_Y));
adjustWidthAction->setCheckable(true); adjustWidthAction->setCheckable(true);
connect(adjustWidthAction, &QAction::triggered, this, &MainWindowViewer::fitToWidth); connect(adjustWidthAction, &QAction::triggered, this, &MainWindowViewer::fitToWidth);
adjustToFullSizeAction = new QAction(tr("Show full size"), this); adjustToFullSizeAction = new QAction(tr("Show full size"), this);
adjustToFullSizeAction->setIcon(QIcon(":/images/viewer_toolbar/full.png")); adjustToFullSizeAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/full")));
adjustToFullSizeAction->setCheckable(false); adjustToFullSizeAction->setCheckable(false);
adjustToFullSizeAction->setData(ADJUST_TO_FULL_SIZE_ACTION_Y); adjustToFullSizeAction->setData(ADJUST_TO_FULL_SIZE_ACTION_Y);
adjustToFullSizeAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADJUST_TO_FULL_SIZE_ACTION_Y)); adjustToFullSizeAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADJUST_TO_FULL_SIZE_ACTION_Y));
@ -333,7 +298,7 @@ void MainWindowViewer::createActions()
connect(adjustToFullSizeAction, &QAction::triggered, this, &MainWindowViewer::adjustToFullSizeSwitch); connect(adjustToFullSizeAction, &QAction::triggered, this, &MainWindowViewer::adjustToFullSizeSwitch);
fitToPageAction = new QAction(tr("Fit to page"), this); fitToPageAction = new QAction(tr("Fit to page"), this);
fitToPageAction->setIcon(QIcon(":/images/viewer_toolbar/fitToPage.png")); fitToPageAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/fitToPage")));
fitToPageAction->setData(FIT_TO_PAGE_ACTION_Y); fitToPageAction->setData(FIT_TO_PAGE_ACTION_Y);
fitToPageAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(FIT_TO_PAGE_ACTION_Y)); fitToPageAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(FIT_TO_PAGE_ACTION_Y));
fitToPageAction->setCheckable(true); fitToPageAction->setCheckable(true);
@ -369,7 +334,7 @@ void MainWindowViewer::createActions()
connect(resetZoomAction, &QAction::triggered, this, &MainWindowViewer::resetZoomLevel); connect(resetZoomAction, &QAction::triggered, this, &MainWindowViewer::resetZoomLevel);
showZoomSliderlAction = new QAction(tr("Show zoom slider"), this); showZoomSliderlAction = new QAction(tr("Show zoom slider"), this);
showZoomSliderlAction->setIcon(QIcon(":/images/viewer_toolbar/zoom.png")); showZoomSliderlAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/zoom")));
increasePageZoomAction = new QAction(tr("Zoom+"), this); increasePageZoomAction = new QAction(tr("Zoom+"), this);
increasePageZoomAction->setData(ZOOM_PLUS_ACTION_Y); increasePageZoomAction->setData(ZOOM_PLUS_ACTION_Y);
@ -382,20 +347,20 @@ void MainWindowViewer::createActions()
connect(decreasePageZoomAction, &QAction::triggered, this, &MainWindowViewer::decreasePageZoomLevel); connect(decreasePageZoomAction, &QAction::triggered, this, &MainWindowViewer::decreasePageZoomLevel);
leftRotationAction = new QAction(tr("Rotate image to the left"), this); leftRotationAction = new QAction(tr("Rotate image to the left"), this);
leftRotationAction->setIcon(QIcon(":/images/viewer_toolbar/rotateL.png")); leftRotationAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/rotateL")));
leftRotationAction->setData(LEFT_ROTATION_ACTION_Y); leftRotationAction->setData(LEFT_ROTATION_ACTION_Y);
leftRotationAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(LEFT_ROTATION_ACTION_Y)); leftRotationAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(LEFT_ROTATION_ACTION_Y));
connect(leftRotationAction, &QAction::triggered, viewer, &Viewer::rotateLeft); connect(leftRotationAction, &QAction::triggered, viewer, &Viewer::rotateLeft);
rightRotationAction = new QAction(tr("Rotate image to the right"), this); rightRotationAction = new QAction(tr("Rotate image to the right"), this);
rightRotationAction->setIcon(QIcon(":/images/viewer_toolbar/rotateR.png")); rightRotationAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/rotateR")));
rightRotationAction->setData(RIGHT_ROTATION_ACTION_Y); rightRotationAction->setData(RIGHT_ROTATION_ACTION_Y);
rightRotationAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(RIGHT_ROTATION_ACTION_Y)); rightRotationAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(RIGHT_ROTATION_ACTION_Y));
connect(rightRotationAction, &QAction::triggered, viewer, &Viewer::rotateRight); connect(rightRotationAction, &QAction::triggered, viewer, &Viewer::rotateRight);
doublePageAction = new QAction(tr("Double page mode"), this); doublePageAction = new QAction(tr("Double page mode"), this);
doublePageAction->setToolTip(tr("Switch to double page mode")); doublePageAction->setToolTip(tr("Switch to double page mode"));
doublePageAction->setIcon(QIcon(":/images/viewer_toolbar/doublePage.png")); doublePageAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/doublePage")));
doublePageAction->setCheckable(true); doublePageAction->setCheckable(true);
doublePageAction->setChecked(Configuration::getConfiguration().getDoublePage()); doublePageAction->setChecked(Configuration::getConfiguration().getDoublePage());
doublePageAction->setData(DOUBLE_PAGE_ACTION_Y); doublePageAction->setData(DOUBLE_PAGE_ACTION_Y);
@ -405,7 +370,7 @@ void MainWindowViewer::createActions()
// inversed pictures mode // inversed pictures mode
doubleMangaPageAction = new QAction(tr("Double page manga mode"), this); doubleMangaPageAction = new QAction(tr("Double page manga mode"), this);
doubleMangaPageAction->setToolTip(tr("Reverse reading order in double page mode")); doubleMangaPageAction->setToolTip(tr("Reverse reading order in double page mode"));
doubleMangaPageAction->setIcon(QIcon(":/images/viewer_toolbar/doubleMangaPage.png")); doubleMangaPageAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/doubleMangaPage")));
doubleMangaPageAction->setCheckable(true); doubleMangaPageAction->setCheckable(true);
doubleMangaPageAction->setChecked(Configuration::getConfiguration().getDoubleMangaPage()); doubleMangaPageAction->setChecked(Configuration::getConfiguration().getDoubleMangaPage());
doubleMangaPageAction->setData(DOUBLE_MANGA_PAGE_ACTION_Y); doubleMangaPageAction->setData(DOUBLE_MANGA_PAGE_ACTION_Y);
@ -414,7 +379,7 @@ void MainWindowViewer::createActions()
connect(doubleMangaPageAction, &QAction::triggered, this, &MainWindowViewer::doubleMangaPageSwitch); connect(doubleMangaPageAction, &QAction::triggered, this, &MainWindowViewer::doubleMangaPageSwitch);
goToPageAction = new QAction(tr("Go To"), this); goToPageAction = new QAction(tr("Go To"), this);
goToPageAction->setIcon(QIcon(":/images/viewer_toolbar/goto.png")); goToPageAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/goto")));
goToPageAction->setToolTip(tr("Go to page ...")); goToPageAction->setToolTip(tr("Go to page ..."));
goToPageAction->setData(GO_TO_PAGE_ACTION_Y); goToPageAction->setData(GO_TO_PAGE_ACTION_Y);
goToPageAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(GO_TO_PAGE_ACTION_Y)); goToPageAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(GO_TO_PAGE_ACTION_Y));
@ -424,20 +389,20 @@ void MainWindowViewer::createActions()
optionsAction->setToolTip(tr("YACReader options")); optionsAction->setToolTip(tr("YACReader options"));
optionsAction->setData(OPTIONS_ACTION_Y); optionsAction->setData(OPTIONS_ACTION_Y);
optionsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPTIONS_ACTION_Y)); optionsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPTIONS_ACTION_Y));
optionsAction->setIcon(QIcon(":/images/viewer_toolbar/options.png")); optionsAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/options")));
connect(optionsAction, &QAction::triggered, optionsDialog, &OptionsDialog::show); connect(optionsAction, &QAction::triggered, optionsDialog, &OptionsDialog::show);
helpAboutAction = new QAction(tr("Help"), this); helpAboutAction = new QAction(tr("Help"), this);
helpAboutAction->setToolTip(tr("Help, About YACReader")); helpAboutAction->setToolTip(tr("Help, About YACReader"));
helpAboutAction->setIcon(QIcon(":/images/viewer_toolbar/help.png")); helpAboutAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/help")));
helpAboutAction->setData(HELP_ABOUT_ACTION_Y); helpAboutAction->setData(HELP_ABOUT_ACTION_Y);
helpAboutAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(HELP_ABOUT_ACTION_Y)); helpAboutAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(HELP_ABOUT_ACTION_Y));
connect(helpAboutAction, &QAction::triggered, had, &QWidget::show); connect(helpAboutAction, &QAction::triggered, had, &QWidget::show);
showMagnifyingGlassAction = new QAction(tr("Magnifying glass"), this); showMagnifyingGlassAction = new QAction(tr("Magnifying glass"), this);
showMagnifyingGlassAction->setToolTip(tr("Switch Magnifying glass")); showMagnifyingGlassAction->setToolTip(tr("Switch Magnifying glass"));
showMagnifyingGlassAction->setIcon(QIcon(":/images/viewer_toolbar/magnifyingGlass.png")); showMagnifyingGlassAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/magnifyingGlass")));
showMagnifyingGlassAction->setCheckable(true); showMagnifyingGlassAction->setCheckable(true);
showMagnifyingGlassAction->setData(SHOW_MAGNIFYING_GLASS_ACTION_Y); showMagnifyingGlassAction->setData(SHOW_MAGNIFYING_GLASS_ACTION_Y);
showMagnifyingGlassAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_MAGNIFYING_GLASS_ACTION_Y)); showMagnifyingGlassAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_MAGNIFYING_GLASS_ACTION_Y));
@ -445,7 +410,7 @@ void MainWindowViewer::createActions()
setBookmarkAction = new QAction(tr("Set bookmark"), this); setBookmarkAction = new QAction(tr("Set bookmark"), this);
setBookmarkAction->setToolTip(tr("Set a bookmark on the current page")); setBookmarkAction->setToolTip(tr("Set a bookmark on the current page"));
setBookmarkAction->setIcon(QIcon(":/images/viewer_toolbar/bookmark.png")); setBookmarkAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/bookmark")));
setBookmarkAction->setCheckable(true); setBookmarkAction->setCheckable(true);
setBookmarkAction->setData(SET_BOOKMARK_ACTION_Y); setBookmarkAction->setData(SET_BOOKMARK_ACTION_Y);
setBookmarkAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SET_BOOKMARK_ACTION_Y)); setBookmarkAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SET_BOOKMARK_ACTION_Y));
@ -455,39 +420,38 @@ void MainWindowViewer::createActions()
showBookmarksAction = new QAction(tr("Show bookmarks"), this); showBookmarksAction = new QAction(tr("Show bookmarks"), this);
showBookmarksAction->setToolTip(tr("Show the bookmarks of the current comic")); showBookmarksAction->setToolTip(tr("Show the bookmarks of the current comic"));
showBookmarksAction->setIcon(QIcon(":/images/viewer_toolbar/showBookmarks.png")); showBookmarksAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/showBookmarks")));
showBookmarksAction->setData(SHOW_BOOKMARKS_ACTION_Y); showBookmarksAction->setData(SHOW_BOOKMARKS_ACTION_Y);
showBookmarksAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_BOOKMARKS_ACTION_Y)); showBookmarksAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_BOOKMARKS_ACTION_Y));
connect(showBookmarksAction, &QAction::triggered, viewer->getBookmarksDialog(), &QWidget::show); connect(showBookmarksAction, &QAction::triggered, viewer->getBookmarksDialog(), &QWidget::show);
showShorcutsAction = new QAction(tr("Show keyboard shortcuts"), this); showShorcutsAction = new QAction(tr("Show keyboard shortcuts"), this);
showShorcutsAction->setIcon(QIcon(":/images/viewer_toolbar/shortcuts.png")); showShorcutsAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/shortcuts")));
showShorcutsAction->setData(SHOW_SHORCUTS_ACTION_Y); showShorcutsAction->setData(SHOW_SHORCUTS_ACTION_Y);
showShorcutsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_SHORCUTS_ACTION_Y)); showShorcutsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_SHORCUTS_ACTION_Y));
// connect(showShorcutsAction, SIGNAL(triggered()),shortcutsDialog,SLOT(show()));
connect(showShorcutsAction, &QAction::triggered, editShortcutsDialog, &QWidget::show); connect(showShorcutsAction, &QAction::triggered, editShortcutsDialog, &QWidget::show);
showInfoAction = new QAction(tr("Show Info"), this); showInfoAction = new QAction(tr("Show Info"), this);
showInfoAction->setIcon(QIcon(":/images/viewer_toolbar/info.png")); showInfoAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/info")));
showInfoAction->setData(SHOW_INFO_ACTION_Y); showInfoAction->setData(SHOW_INFO_ACTION_Y);
showInfoAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_INFO_ACTION_Y)); showInfoAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_INFO_ACTION_Y));
connect(showInfoAction, &QAction::triggered, viewer, &Viewer::informationSwitch); connect(showInfoAction, &QAction::triggered, viewer, &Viewer::informationSwitch);
closeAction = new QAction(tr("Close"), this); closeAction = new QAction(tr("Close"), this);
closeAction->setIcon(QIcon(":/images/viewer_toolbar/close.png")); closeAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/close")));
closeAction->setData(CLOSE_ACTION_Y); closeAction->setData(CLOSE_ACTION_Y);
closeAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(CLOSE_ACTION_Y)); closeAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(CLOSE_ACTION_Y));
connect(closeAction, &QAction::triggered, this, &QWidget::close); connect(closeAction, &QAction::triggered, this, &QWidget::close);
showDictionaryAction = new QAction(tr("Show Dictionary"), this); showDictionaryAction = new QAction(tr("Show Dictionary"), this);
showDictionaryAction->setIcon(QIcon(":/images/viewer_toolbar/translator.png")); showDictionaryAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/translator")));
// showDictionaryAction->setCheckable(true); // showDictionaryAction->setCheckable(true);
showDictionaryAction->setData(SHOW_DICTIONARY_ACTION_Y); showDictionaryAction->setData(SHOW_DICTIONARY_ACTION_Y);
showDictionaryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_DICTIONARY_ACTION_Y)); showDictionaryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_DICTIONARY_ACTION_Y));
connect(showDictionaryAction, &QAction::triggered, viewer, &Viewer::translatorSwitch); connect(showDictionaryAction, &QAction::triggered, viewer, &Viewer::translatorSwitch);
showFlowAction = new QAction(tr("Show go to flow"), this); showFlowAction = new QAction(tr("Show go to flow"), this);
showFlowAction->setIcon(QIcon(":/images/viewer_toolbar/flow.png")); showFlowAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/flow")));
showFlowAction->setData(SHOW_FLOW_ACTION_Y); showFlowAction->setData(SHOW_FLOW_ACTION_Y);
showFlowAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_FLOW_ACTION_Y)); showFlowAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_FLOW_ACTION_Y));
connect(showFlowAction, &QAction::triggered, viewer, &Viewer::goToFlowSwitch); connect(showFlowAction, &QAction::triggered, viewer, &Viewer::goToFlowSwitch);
@ -511,20 +475,21 @@ void MainWindowViewer::createToolBars()
{ {
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
comicToolBar = new YACReaderMacOSXToolbar(this); comicToolBar = new YACReaderMacOSXToolbar(this);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
comicToolBar->setIconSize(QSize(18, 18));
#endif
#else #else
comicToolBar = addToolBar(tr("&File")); comicToolBar = addToolBar(tr("&File"));
#endif #endif
#ifdef Q_OS_MAC #ifndef Q_OS_MAC
// comicToolBar->setIconSize(QSize(16,16));
#else
comicToolBar->setIconSize(QSize(18, 18));
comicToolBar->setStyleSheet("QToolBar{border:none;}"); comicToolBar->setStyleSheet("QToolBar{border:none;}");
comicToolBar->setIconSize(QSize(18, 18));
#endif #endif
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
comicToolBar->addAction(openAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/open")), openAction));
comicToolBar->addAction(openFolderAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/openFolder")), openFolderAction));
#else #else
auto recentmenu = new QMenu(tr("Open recent")); auto recentmenu = new QMenu(tr("Open recent"));
recentmenu->addActions(recentFilesActionList); recentmenu->addActions(recentFilesActionList);
@ -533,61 +498,72 @@ void MainWindowViewer::createToolBars()
refreshRecentFilesActionList(); refreshRecentFilesActionList();
auto tb = new QToolButton(); auto tb = new QToolButton();
tb->addAction(openAction); auto open = actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/open")), openAction);
tb->addAction(openLatestComicAction); tb->addAction(open);
tb->addAction(openFolderAction); tb->addAction(actionWithCustomIcon(QIcon(), openLatestComicAction));
tb->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/openFolder")), openFolderAction));
tb->addAction(recentmenu->menuAction()); tb->addAction(recentmenu->menuAction());
tb->setPopupMode(QToolButton::MenuButtonPopup); tb->setPopupMode(QToolButton::MenuButtonPopup);
tb->setDefaultAction(openAction); tb->setDefaultAction(open);
comicToolBar->addWidget(tb); comicToolBar->addWidget(tb);
#endif #endif
comicToolBar->addAction(saveImageAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/save")), saveImageAction));
comicToolBar->addAction(openComicOnTheLeftAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/openPrevious")), openComicOnTheLeftAction));
comicToolBar->addAction(openComicOnTheRightAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/openNext")), openComicOnTheRightAction));
comicToolBar->addSeparator(); comicToolBar->addSeparator();
comicToolBar->addAction(goToPageOnTheLeftAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/previous")), goToPageOnTheLeftAction));
comicToolBar->addAction(goToPageOnTheRightAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/next")), goToPageOnTheRightAction));
comicToolBar->addAction(goToPageAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/goto")), goToPageAction));
comicToolBar->addSeparator(); comicToolBar->addSeparator();
comicToolBar->addAction(adjustWidthAction); auto adjustToWidthTBAction = actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/toWidth")), adjustWidthAction);
comicToolBar->addAction(adjustHeightAction); comicToolBar->addAction(adjustToWidthTBAction);
auto adjustToHeightTBAction = actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/toHeight")), adjustHeightAction);
comicToolBar->addAction(adjustToHeightTBAction);
auto adjustToFullSizeTBAction = actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/full")), adjustToFullSizeAction);
comicToolBar->addAction(adjustToFullSizeAction); comicToolBar->addAction(adjustToFullSizeAction);
comicToolBar->addAction(fitToPageAction); auto fitToPageTBAction = actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/fitToPage")), fitToPageAction);
comicToolBar->addAction(fitToPageTBAction);
auto fitModes = new QActionGroup(this);
fitModes->addAction(adjustToWidthTBAction);
fitModes->addAction(adjustToHeightTBAction);
fitModes->addAction(adjustToFullSizeTBAction);
fitModes->addAction(fitToPageTBAction);
zoomSliderAction = new YACReaderSlider(this); zoomSliderAction = new YACReaderSlider(this);
zoomSliderAction->hide(); zoomSliderAction->hide();
comicToolBar->addAction(showZoomSliderlAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/zoom")), showZoomSliderlAction));
connect(showZoomSliderlAction, &QAction::triggered, this, &MainWindowViewer::toggleFitToWidthSlider); connect(showZoomSliderlAction, &QAction::triggered, this, &MainWindowViewer::toggleFitToWidthSlider);
connect(zoomSliderAction, &YACReaderSlider::zoomRatioChanged, viewer, &Viewer::updateZoomRatio); connect(zoomSliderAction, &YACReaderSlider::zoomRatioChanged, viewer, &Viewer::updateZoomRatio);
connect(viewer, &Viewer::zoomUpdated, zoomSliderAction, &YACReaderSlider::updateZoomRatio); connect(viewer, &Viewer::zoomUpdated, zoomSliderAction, &YACReaderSlider::updateZoomRatio);
comicToolBar->addAction(leftRotationAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/rotateL")), leftRotationAction));
comicToolBar->addAction(rightRotationAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/rotateR")), rightRotationAction));
comicToolBar->addAction(doublePageAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/doublePage")), doublePageAction));
comicToolBar->addAction(doubleMangaPageAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/doubleMangaPage")), doubleMangaPageAction));
comicToolBar->addSeparator(); comicToolBar->addSeparator();
comicToolBar->addAction(showMagnifyingGlassAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/magnifyingGlass")), showMagnifyingGlassAction));
comicToolBar->addSeparator(); comicToolBar->addSeparator();
comicToolBar->addAction(setBookmarkAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/bookmark")), setBookmarkAction));
comicToolBar->addAction(showBookmarksAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/showBookmarks")), showBookmarksAction));
comicToolBar->addSeparator(); comicToolBar->addSeparator();
comicToolBar->addAction(showDictionaryAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/translator")), showDictionaryAction));
comicToolBar->addAction(showFlowAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/flow")), showFlowAction));
comicToolBar->addAction(showInfoAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/info")), showInfoAction));
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
comicToolBar->addStretch(); comicToolBar->addStretch();
@ -595,10 +571,9 @@ void MainWindowViewer::createToolBars()
comicToolBar->addWidget(new YACReaderToolBarStretch()); comicToolBar->addWidget(new YACReaderToolBarStretch());
#endif #endif
comicToolBar->addAction(showShorcutsAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/shortcuts")), showShorcutsAction));
comicToolBar->addAction(optionsAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/options")), optionsAction));
comicToolBar->addAction(helpAboutAction); comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/help")), helpAboutAction));
// comicToolBar->addAction(closeAction);
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
comicToolBar->setMovable(false); comicToolBar->setMovable(false);
@ -1156,7 +1131,7 @@ void MainWindowViewer::setUpShortcutsManagement()
QList<QAction *> allActions; QList<QAction *> allActions;
QList<QAction *> tmpList; QList<QAction *> tmpList;
editShortcutsDialog->addActionsGroup(tr("Comics"), QIcon(":/images/shortcuts_group_comics.png"), editShortcutsDialog->addActionsGroup(tr("Comics"), QIcon(":/images/shortcuts_group_comics.svg"),
tmpList = { openAction, tmpList = { openAction,
openLatestComicAction, openLatestComicAction,
openFolderAction, openFolderAction,
@ -1172,7 +1147,7 @@ void MainWindowViewer::setUpShortcutsManagement()
auto *const toggleToolbarsAction = addActionWithShortcut(tr("Hide/show toolbar"), TOGGLE_TOOL_BARS_ACTION_Y); auto *const toggleToolbarsAction = addActionWithShortcut(tr("Hide/show toolbar"), TOGGLE_TOOL_BARS_ACTION_Y);
connect(toggleToolbarsAction, &QAction::triggered, this, &MainWindowViewer::toggleToolBars); connect(toggleToolbarsAction, &QAction::triggered, this, &MainWindowViewer::toggleToolBars);
editShortcutsDialog->addActionsGroup(tr("General"), QIcon(":/images/shortcuts_group_general.png"), editShortcutsDialog->addActionsGroup(tr("General"), QIcon(":/images/shortcuts_group_general.svg"),
tmpList = QList<QAction *>() tmpList = QList<QAction *>()
<< optionsAction << optionsAction
<< helpAboutAction << helpAboutAction
@ -1206,7 +1181,7 @@ void MainWindowViewer::setUpShortcutsManagement()
mglassActions = { sizeUpMglassAction, sizeDownMglassAction, mglassActions = { sizeUpMglassAction, sizeDownMglassAction,
zoomInMglassAction, zoomOutMglassAction }; zoomInMglassAction, zoomOutMglassAction };
editShortcutsDialog->addActionsGroup(tr("Magnifiying glass"), QIcon(":/images/shortcuts_group_mglass.png"), editShortcutsDialog->addActionsGroup(tr("Magnifiying glass"), QIcon(":/images/shortcuts_group_mglass.svg"),
tmpList = QList<QAction *>() tmpList = QList<QAction *>()
<< showMagnifyingGlassAction << showMagnifyingGlassAction
<< mglassActions); << mglassActions);
@ -1217,7 +1192,7 @@ void MainWindowViewer::setUpShortcutsManagement()
CHANGE_FIT_ACTION_Y); CHANGE_FIT_ACTION_Y);
connect(toggleFitToScreenAction, &QAction::triggered, this, &MainWindowViewer::toggleWidthHeight); connect(toggleFitToScreenAction, &QAction::triggered, this, &MainWindowViewer::toggleWidthHeight);
editShortcutsDialog->addActionsGroup(tr("Page adjustement"), QIcon(":/images/shortcuts_group_page.png"), editShortcutsDialog->addActionsGroup(tr("Page adjustement"), QIcon(":/images/shortcuts_group_page.svg"),
tmpList = QList<QAction *>() tmpList = QList<QAction *>()
<< adjustHeightAction << adjustHeightAction
<< adjustWidthAction << adjustWidthAction
@ -1287,7 +1262,7 @@ void MainWindowViewer::setUpShortcutsManagement()
goToFirstPageAction, goToFirstPageAction,
goToLastPageAction }; goToLastPageAction };
editShortcutsDialog->addActionsGroup(tr("Reading"), QIcon(":/images/shortcuts_group_reading.png"), editShortcutsDialog->addActionsGroup(tr("Reading"), QIcon(":/images/shortcuts_group_reading.svg"),
tmpList = QList<QAction *>() tmpList = QList<QAction *>()
<< goToPageOnTheRightAction << goToPageOnTheRightAction
<< goToPageOnTheLeftAction << goToPageOnTheLeftAction

2
YACReader/translator.cpp
View File

@ -57,7 +57,7 @@ YACReaderTranslator::YACReaderTranslator(Viewer *parent)
// TITLE BAR // TITLE BAR
auto titleBar = new QHBoxLayout(); auto titleBar = new QHBoxLayout();
auto close = new QPushButton(QIcon(QPixmap(":/images/close.png")), ""); auto close = new QPushButton(QIcon(":/images/close.svg"), "");
close->setFlat(true); close->setFlat(true);
auto title = new QLabel(tr("YACReader translator")); auto title = new QLabel(tr("YACReader translator"));
title->setStyleSheet("QLabel {font-size:18px; font-family:Arial; color:white;}"); title->setStyleSheet("QLabel {font-size:18px; font-family:Arial; color:white;}");

76
YACReader/yacreader_images.qrc
View File

@ -9,7 +9,7 @@
<file>../images/flow4.png</file> <file>../images/flow4.png</file>
<file>../images/flow5.png</file> <file>../images/flow5.png</file>
<file>../images/notCover.png</file> <file>../images/notCover.png</file>
<file>../images/close.png</file> <file>../images/close.svg</file>
<file>../images/up.png</file> <file>../images/up.png</file>
<file>../images/down.png</file> <file>../images/down.png</file>
<file>../images/imgCenterSlide.png</file> <file>../images/imgCenterSlide.png</file>
@ -21,17 +21,71 @@
<file>../images/dropDownArrow.png</file> <file>../images/dropDownArrow.png</file>
<file>../images/translatorSearch.png</file> <file>../images/translatorSearch.png</file>
<file>../images/speaker.png</file> <file>../images/speaker.png</file>
<file>../images/clear_shortcut.png</file> <file>../images/clear_shortcut.svg</file>
<file>../images/accept_shortcut.png</file> <file>../images/accept_shortcut.svg</file>
<file>../images/shortcuts_group_comics.png</file> <file>../images/shortcuts_group_comics.svg</file>
<file>../images/shortcuts_group_folders.png</file> <file>../images/shortcuts_group_folders.svg</file>
<file>../images/shortcuts_group_general.png</file> <file>../images/shortcuts_group_general.svg</file>
<file>../images/shortcuts_group_libraries.png</file> <file>../images/shortcuts_group_libraries.svg</file>
<file>../images/shortcuts_group_mglass.png</file> <file>../images/shortcuts_group_mglass.svg</file>
<file>../images/shortcuts_group_page.png</file> <file>../images/shortcuts_group_page.svg</file>
<file>../images/shortcuts_group_reading.png</file> <file>../images/shortcuts_group_reading.svg</file>
<file>../images/shortcuts_group_visualization.png</file> <file>../images/shortcuts_group_visualization.svg</file>
<file>../images/custom_dialog/custom_close_button.svg</file> <file>../images/custom_dialog/custom_close_button.svg</file>
<file>../images/whats_new/whatsnew_header.svg</file> <file>../images/whats_new/whatsnew_header.svg</file>
<file>../images/viewer_toolbar/bookmark.svg</file>
<file>../images/viewer_toolbar/close.svg</file>
<file>../images/viewer_toolbar/doublePage.svg</file>
<file>../images/viewer_toolbar/doubleMangaPage.svg</file>
<file>../images/viewer_toolbar/fitToPage.svg</file>
<file>../images/viewer_toolbar/flow.svg</file>
<file>../images/viewer_toolbar/full.svg</file>
<file>../images/viewer_toolbar/goto.svg</file>
<file>../images/viewer_toolbar/help.svg</file>
<file>../images/viewer_toolbar/info.svg</file>
<file>../images/viewer_toolbar/magnifyingGlass.svg</file>
<file>../images/viewer_toolbar/next.svg</file>
<file>../images/viewer_toolbar/open.svg</file>
<file>../images/viewer_toolbar/openFolder.svg</file>
<file>../images/viewer_toolbar/openNext.svg</file>
<file>../images/viewer_toolbar/openPrevious.svg</file>
<file>../images/viewer_toolbar/options.svg</file>
<file>../images/viewer_toolbar/previous.svg</file>
<file>../images/viewer_toolbar/rotateL.svg</file>
<file>../images/viewer_toolbar/rotateR.svg</file>
<file>../images/viewer_toolbar/save.svg</file>
<file>../images/viewer_toolbar/shortcuts.svg</file>
<file>../images/viewer_toolbar/showBookmarks.svg</file>
<file>../images/viewer_toolbar/toHeight.svg</file>
<file>../images/viewer_toolbar/toWidth.svg</file>
<file>../images/viewer_toolbar/translator.svg</file>
<file>../images/viewer_toolbar/zoom.svg</file>
<file>../images/viewer_toolbar/bookmark_18x18.svg</file>
<file>../images/viewer_toolbar/close_18x18.svg</file>
<file>../images/viewer_toolbar/doublePage_18x18.svg</file>
<file>../images/viewer_toolbar/doubleMangaPage_18x18.svg</file>
<file>../images/viewer_toolbar/fitToPage_18x18.svg</file>
<file>../images/viewer_toolbar/flow_18x18.svg</file>
<file>../images/viewer_toolbar/full_18x18.svg</file>
<file>../images/viewer_toolbar/goto_18x18.svg</file>
<file>../images/viewer_toolbar/help_18x18.svg</file>
<file>../images/viewer_toolbar/info_18x18.svg</file>
<file>../images/viewer_toolbar/magnifyingGlass_18x18.svg</file>
<file>../images/viewer_toolbar/next_18x18.svg</file>
<file>../images/viewer_toolbar/open_18x18.svg</file>
<file>../images/viewer_toolbar/openFolder_18x18.svg</file>
<file>../images/viewer_toolbar/openNext_18x18.svg</file>
<file>../images/viewer_toolbar/openPrevious_18x18.svg</file>
<file>../images/viewer_toolbar/options_18x18.svg</file>
<file>../images/viewer_toolbar/previous_18x18.svg</file>
<file>../images/viewer_toolbar/rotateL_18x18.svg</file>
<file>../images/viewer_toolbar/rotateR_18x18.svg</file>
<file>../images/viewer_toolbar/save_18x18.svg</file>
<file>../images/viewer_toolbar/shortcuts_18x18.svg</file>
<file>../images/viewer_toolbar/showBookmarks_18x18.svg</file>
<file>../images/viewer_toolbar/toHeight_18x18.svg</file>
<file>../images/viewer_toolbar/toWidth_18x18.svg</file>
<file>../images/viewer_toolbar/translator_18x18.svg</file>
<file>../images/viewer_toolbar/zoom_18x18.svg</file>
</qresource> </qresource>
</RCC> </RCC>

61
YACReader/yacreader_images_osx.qrc
View File

@ -1,61 +0,0 @@
<RCC>
<qresource prefix="/" >
<file alias="images/viewer_toolbar/bookmark.png">../images/viewer_toolbar/bookmark_osx.png</file>
<file alias="images/viewer_toolbar/bookmark@2x.png">../images/viewer_toolbar/bookmark_osx@2x.png</file>
<file alias="images/viewer_toolbar/close.png">../images/viewer_toolbar/close_osx.png</file>
<file alias="images/viewer_toolbar/close@2x.png">../images/viewer_toolbar/close_osx@2x.png</file>
<file alias="images/viewer_toolbar/doubleMangaPage.png">../images/viewer_toolbar/doubleMangaPage_osx.png</file>
<file alias="images/viewer_toolbar/doubleMangaPage@2x.png">../images/viewer_toolbar/doubleMangaPage_osx@2x.png</file>
<file alias="images/viewer_toolbar/doublePage.png">../images/viewer_toolbar/doublePage_osx.png</file>
<file alias="images/viewer_toolbar/doublePage@2x.png">../images/viewer_toolbar/doublePage_osx@2x.png</file>
<file alias="images/viewer_toolbar/fitToPage.png">../images/viewer_toolbar/fitToPage_osx.png</file>
<file alias="images/viewer_toolbar/fitToPage@2x.png">../images/viewer_toolbar/fitToPage_osx@2x.png</file>
<file alias="images/viewer_toolbar/flow.png">../images/viewer_toolbar/flow_osx.png</file>
<file alias="images/viewer_toolbar/flow@2x.png">../images/viewer_toolbar/flow_osx@2x.png</file>
<file alias="images/viewer_toolbar/full.png">../images/viewer_toolbar/full_osx.png</file>
<file alias="images/viewer_toolbar/full@2x.png">../images/viewer_toolbar/full_osx@2x.png</file>
<file alias="images/viewer_toolbar/goto.png">../images/viewer_toolbar/goto_osx.png</file>
<file alias="images/viewer_toolbar/goto@2x.png">../images/viewer_toolbar/goto_osx@2x.png</file>
<file alias="images/viewer_toolbar/help.png">../images/viewer_toolbar/help_osx.png</file>
<file alias="images/viewer_toolbar/help@2x.png">../images/viewer_toolbar/help_osx@2x.png</file>
<file alias="images/viewer_toolbar/info.png">../images/viewer_toolbar/info_osx.png</file>
<file alias="images/viewer_toolbar/info@2x.png">../images/viewer_toolbar/info_osx@2x.png</file>
<file alias="images/viewer_toolbar/magnifyingGlass.png">../images/viewer_toolbar/magnifyingGlass_osx.png</file>
<file alias="images/viewer_toolbar/magnifyingGlass@2x.png">../images/viewer_toolbar/magnifyingGlass_osx@2x.png</file>
<file alias="images/viewer_toolbar/next.png">../images/viewer_toolbar/next_osx.png</file>
<file alias="images/viewer_toolbar/next@2x.png">../images/viewer_toolbar/next_osx@2x.png</file>
<file alias="images/viewer_toolbar/open.png">../images/viewer_toolbar/open_osx.png</file>
<file alias="images/viewer_toolbar/open@2x.png">../images/viewer_toolbar/open_osx@2x.png</file>
<file alias="images/viewer_toolbar/openFolder.png">../images/viewer_toolbar/openFolder_osx.png</file>
<file alias="images/viewer_toolbar/openFolder@2x.png">../images/viewer_toolbar/openFolder_osx@2x.png</file>
<file alias="images/viewer_toolbar/openNext.png">../images/viewer_toolbar/openNext_osx.png</file>
<file alias="images/viewer_toolbar/openNext@2x.png">../images/viewer_toolbar/openNext_osx@2x.png</file>
<file alias="images/viewer_toolbar/openPrevious.png">../images/viewer_toolbar/openPrevious_osx.png</file>
<file alias="images/viewer_toolbar/openPrevious@2x.png">../images/viewer_toolbar/openPrevious_osx@2x.png</file>
<file alias="images/viewer_toolbar/options.png">../images/viewer_toolbar/options_osx.png</file>
<file alias="images/viewer_toolbar/options@2x.png">../images/viewer_toolbar/options_osx@2x.png</file>
<file alias="images/viewer_toolbar/previous.png">../images/viewer_toolbar/previous_osx.png</file>
<file alias="images/viewer_toolbar/previous@2x.png">../images/viewer_toolbar/previous_osx@2x.png</file>
<file alias="images/viewer_toolbar/rotateL.png">../images/viewer_toolbar/rotateL_osx.png</file>
<file alias="images/viewer_toolbar/rotateL@2x.png">../images/viewer_toolbar/rotateL_osx@2x.png</file>
<file alias="images/viewer_toolbar/rotateR.png">../images/viewer_toolbar/rotateR_osx.png</file>
<file alias="images/viewer_toolbar/rotateR@2x.png">../images/viewer_toolbar/rotateR_osx@2x.png</file>
<file alias="images/viewer_toolbar/save.png">../images/viewer_toolbar/save_osx.png</file>
<file alias="images/viewer_toolbar/save@2x.png">../images/viewer_toolbar/save_osx@2x.png</file>
<file alias="images/viewer_toolbar/shortcuts.png">../images/viewer_toolbar/shortcuts_osx.png</file>
<file alias="images/viewer_toolbar/shortcuts@2x.png">../images/viewer_toolbar/shortcuts_osx@2x.png</file>
<file alias="images/viewer_toolbar/showBookmarks.png">../images/viewer_toolbar/showBookmarks_osx.png</file>
<file alias="images/viewer_toolbar/showBookmarks@2x.png">../images/viewer_toolbar/showBookmarks_osx@2x.png</file>
<file alias="images/viewer_toolbar/toHeight.png">../images/viewer_toolbar/toHeight_osx.png</file>
<file alias="images/viewer_toolbar/toHeight@2x.png">../images/viewer_toolbar/toHeight_osx@2x.png</file>
<file alias="images/viewer_toolbar/toWidth.png">../images/viewer_toolbar/toWidth_osx.png</file>
<file alias="images/viewer_toolbar/toWidth@2x.png">../images/viewer_toolbar/toWidth_osx@2x.png</file>
<file alias="images/viewer_toolbar/toWidthSlider.png">../images/viewer_toolbar/toWidthSlider_osx.png</file>
<file alias="images/viewer_toolbar/toWidthSlider@2x.png">../images/viewer_toolbar/toWidthSlider_osx@2x.png</file>
<file alias="images/viewer_toolbar/translator.png">../images/viewer_toolbar/translator_osx.png</file>
<file alias="images/viewer_toolbar/translator@2x.png">../images/viewer_toolbar/translator_osx@2x.png</file>
<file alias="images/viewer_toolbar/zoom.png">../images/viewer_toolbar/zoom_osx.png</file>
<file alias="images/viewer_toolbar/zoom@2x.png">../images/viewer_toolbar/zoom_osx@2x.png</file>
</qresource>
</RCC>

31
YACReader/yacreader_images_win.qrc
View File

@ -1,31 +0,0 @@
<RCC>
<qresource prefix="/" >
<file>../images/viewer_toolbar/bookmark.png</file>
<file>../images/viewer_toolbar/close.png</file>
<file>../images/viewer_toolbar/doublePage.png</file>
<file>../images/viewer_toolbar/doubleMangaPage.png</file>
<file>../images/viewer_toolbar/fitToPage.png</file>
<file>../images/viewer_toolbar/flow.png</file>
<file>../images/viewer_toolbar/full.png</file>
<file>../images/viewer_toolbar/goto.png</file>
<file>../images/viewer_toolbar/help.png</file>
<file>../images/viewer_toolbar/info.png</file>
<file>../images/viewer_toolbar/magnifyingGlass.png</file>
<file>../images/viewer_toolbar/next.png</file>
<file>../images/viewer_toolbar/open.png</file>
<file>../images/viewer_toolbar/openFolder.png</file>
<file>../images/viewer_toolbar/openNext.png</file>
<file>../images/viewer_toolbar/openPrevious.png</file>
<file>../images/viewer_toolbar/options.png</file>
<file>../images/viewer_toolbar/previous.png</file>
<file>../images/viewer_toolbar/rotateL.png</file>
<file>../images/viewer_toolbar/rotateR.png</file>
<file>../images/viewer_toolbar/save.png</file>
<file>../images/viewer_toolbar/shortcuts.png</file>
<file>../images/viewer_toolbar/showBookmarks.png</file>
<file>../images/viewer_toolbar/toHeight.png</file>
<file>../images/viewer_toolbar/toWidth.png</file>
<file>../images/viewer_toolbar/translator.png</file>
<file>../images/viewer_toolbar/zoom.png</file>
</qresource>
</RCC>

24
YACReaderLibrary/add_label_dialog.cpp
View File

@ -11,18 +11,18 @@ AddLabelDialog::AddLabelDialog(QWidget *parent)
layout->addWidget(new QLabel(tr("Choose a color:"))); layout->addWidget(new QLabel(tr("Choose a color:")));
layout->addWidget(list = new QListWidget()); layout->addWidget(list = new QListWidget());
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_red.png"), tr("red"))); list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_red.svg"), tr("red")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_orange.png"), tr("orange"))); list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_orange.svg"), tr("orange")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_yellow.png"), tr("yellow"))); list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_yellow.svg"), tr("yellow")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_green.png"), tr("green"))); list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_green.svg"), tr("green")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_cyan.png"), tr("cyan"))); list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_cyan.svg"), tr("cyan")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_blue.png"), tr("blue"))); list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_blue.svg"), tr("blue")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_violet.png"), tr("violet"))); list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_violet.svg"), tr("violet")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_purple.png"), tr("purple"))); list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_purple.svg"), tr("purple")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_pink.png"), tr("pink"))); list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_pink.svg"), tr("pink")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_white.png"), tr("white"))); list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_white.svg"), tr("white")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_light.png"), tr("light"))); list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_light.svg"), tr("light")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_dark.png"), tr("dark"))); list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_dark.svg"), tr("dark")));
QColor backgroundColor = this->palette().window().color(); QColor backgroundColor = this->palette().window().color();
list->setStyleSheet(QString("QListWidget {border : none; background-color: rgb(%1,%2,%3);}").arg(backgroundColor.red()).arg(backgroundColor.green()).arg(backgroundColor.blue())); list->setStyleSheet(QString("QListWidget {border : none; background-color: rgb(%1,%2,%3);}").arg(backgroundColor.red()).arg(backgroundColor.green()).arg(backgroundColor.blue()));

6
YACReaderLibrary/db/folder_model.cpp
View File

@ -54,7 +54,7 @@ void drawMacOSXFinishedFolderIcon()
#define ROOT 1 #define ROOT 1
FolderModel::FolderModel(QObject *parent) FolderModel::FolderModel(QObject *parent)
: QAbstractItemModel(parent), isSubfolder(false), rootItem(nullptr) : QAbstractItemModel(parent), isSubfolder(false), rootItem(nullptr), folderIcon(YACReader::noHighlightedIcon(":/images/sidebar/folder.svg")), folderFinishedIcon(YACReader::noHighlightedIcon(":/images/sidebar/folder_finished.svg"))
{ {
} }
@ -138,9 +138,9 @@ QVariant FolderModel::data(const QModelIndex &index, int role) const
} }
#else #else
if (item->data(FolderModel::Finished).toBool()) if (item->data(FolderModel::Finished).toBool())
return QVariant(YACReader::noHighlightedIcon(":/images/sidebar/folder_finished.png")); return QVariant(folderFinishedIcon);
else else
return QVariant(YACReader::noHighlightedIcon(":/images/sidebar/folder.png")); return QVariant(folderIcon);
#endif #endif
} }

4
YACReaderLibrary/db/folder_model.h
View File

@ -8,6 +8,7 @@
#include <QSqlQuery> #include <QSqlQuery>
#include <QSqlDatabase> #include <QSqlDatabase>
#include <QUrl> #include <QUrl>
#include <QIcon>
#include "folder.h" #include "folder.h"
#include "folder_query_result_processor.h" #include "folder_query_result_processor.h"
@ -117,6 +118,9 @@ private:
QMap<unsigned long long int, FolderItem *> items; // relación entre folders QMap<unsigned long long int, FolderItem *> items; // relación entre folders
QString _databasePath; QString _databasePath;
QIcon folderIcon;
QIcon folderFinishedIcon;
}; };
#endif #endif

10
YACReaderLibrary/db/reading_list_item.cpp
View File

@ -36,7 +36,7 @@ QIcon SpecialListItem::getIcon() const
{ {
if (itemData.count() > Id) { if (itemData.count() > Id) {
QString id = itemData.at(Id).toString(); QString id = itemData.at(Id).toString();
return YACReader::noHighlightedIcon(QString(":/images/lists/default_%1.png").arg(id)); return YACReader::noHighlightedIcon(QString(":/images/lists/default_%1.svg").arg(id));
} }
QLOG_WARN() << "Icon for SpecialListItem not available"; QLOG_WARN() << "Icon for SpecialListItem not available";
@ -76,7 +76,7 @@ QIcon LabelItem::getIcon() const
{ {
if (itemData.count() > Color) { if (itemData.count() > Color) {
QString color = itemData.at(Color).toString(); QString color = itemData.at(Color).toString();
return YACReader::noHighlightedIcon(QString(":/images/lists/label_%1.png").arg(color).toLower()); return YACReader::noHighlightedIcon(QString(":/images/lists/label_%1.svg").arg(color).toLower());
} }
QLOG_WARN() << "Icon for label item not available"; QLOG_WARN() << "Icon for label item not available";
@ -127,19 +127,19 @@ qulonglong LabelItem::getId() const
//------------------------------------------------------ //------------------------------------------------------
ReadingListItem::ReadingListItem(const QList<QVariant> &data, ReadingListItem *p) ReadingListItem::ReadingListItem(const QList<QVariant> &data, ReadingListItem *p)
: ListItem(data), parent(p) : ListItem(data), parent(p), list(YACReader::noHighlightedIcon(":/images/lists/list.svg")), folder(YACReader::noHighlightedIcon(":/images/sidebar/folder.svg"))
{ {
} }
QIcon ReadingListItem::getIcon() const QIcon ReadingListItem::getIcon() const
{ {
if (parent->getId() == 0) if (parent->getId() == 0)
return YACReader::noHighlightedIcon(":/images/lists/list.png"); // top level list return list; // top level list
else else
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
return QFileIconProvider().icon(QFileIconProvider::Folder); return QFileIconProvider().icon(QFileIconProvider::Folder);
#else #else
return YACReader::noHighlightedIcon(":/images/sidebar/folder.png"); // sublist return folder; // sublist
#endif #endif
} }

3
YACReaderLibrary/db/reading_list_item.h
View File

@ -82,6 +82,9 @@ public:
private: private:
QList<ReadingListItem *> childItems; QList<ReadingListItem *> childItems;
QIcon list;
QIcon folder;
enum DataIndexes { enum DataIndexes {
Name, Name,
Id, Id,

4
YACReaderLibrary/folder_content_view.cpp
View File

@ -45,11 +45,11 @@ FolderContentView::FolderContentView(QWidget *parent)
auto horizontalLayout = new QHBoxLayout(); auto horizontalLayout = new QHBoxLayout();
QLabel *smallLabel = new QLabel(); QLabel *smallLabel = new QLabel();
smallLabel->setPixmap(QPixmap(":/images/comics_view_toolbar/small_size_grid_zoom.png")); smallLabel->setPixmap(hdpiPixmap(":/images/comics_view_toolbar/small_size_grid_zoom.svg", QSize(18, 18)));
horizontalLayout->addWidget(smallLabel); horizontalLayout->addWidget(smallLabel);
horizontalLayout->addWidget(coverSizeSlider, 0, Qt::AlignVCenter); horizontalLayout->addWidget(coverSizeSlider, 0, Qt::AlignVCenter);
QLabel *bigLabel = new QLabel(); QLabel *bigLabel = new QLabel();
bigLabel->setPixmap(QPixmap(":/images/comics_view_toolbar/big_size_grid_zoom.png")); bigLabel->setPixmap(hdpiPixmap(":/images/comics_view_toolbar/big_size_grid_zoom.svg", QSize(18, 18)));
horizontalLayout->addWidget(bigLabel); horizontalLayout->addWidget(bigLabel);
horizontalLayout->addSpacing(10); horizontalLayout->addSpacing(10);
horizontalLayout->setContentsMargins(0, 0, 0, 0); horizontalLayout->setContentsMargins(0, 0, 0, 0);

8
YACReaderLibrary/grid_comics_view.cpp
View File

@ -145,7 +145,7 @@ GridComicsView::GridComicsView(QWidget *parent)
QQmlProperty(infoContainer, "width").write(settings->value(COMICS_GRID_INFO_WIDTH, 350)); QQmlProperty(infoContainer, "width").write(settings->value(COMICS_GRID_INFO_WIDTH, 350));
showInfoAction = new QAction(tr("Show info"), this); showInfoAction = new QAction(tr("Show info"), this);
showInfoAction->setIcon(QIcon(":/images/comics_view_toolbar/show_comic_info.png")); showInfoAction->setIcon(QIcon(":/images/comics_view_toolbar/show_comic_info.svg"));
showInfoAction->setCheckable(true); showInfoAction->setCheckable(true);
showInfoAction->setChecked(showInfo); showInfoAction->setChecked(showInfo);
connect(showInfoAction, &QAction::toggled, this, &GridComicsView::showInfo); connect(showInfoAction, &QAction::toggled, this, &GridComicsView::showInfo);
@ -179,11 +179,11 @@ void GridComicsView::createCoverSizeSliderWidget()
auto horizontalLayout = new QHBoxLayout(); auto horizontalLayout = new QHBoxLayout();
QLabel *smallLabel = new QLabel(); QLabel *smallLabel = new QLabel();
smallLabel->setPixmap(QPixmap(":/images/comics_view_toolbar/small_size_grid_zoom.png")); smallLabel->setPixmap(hdpiPixmap(":/images/comics_view_toolbar/small_size_grid_zoom.svg", QSize(18, 18)));
horizontalLayout->addWidget(smallLabel); horizontalLayout->addWidget(smallLabel);
horizontalLayout->addWidget(coverSizeSlider, 0, Qt::AlignVCenter); horizontalLayout->addWidget(coverSizeSlider, 0, Qt::AlignVCenter);
QLabel *bigLabel = new QLabel(); QLabel *bigLabel = new QLabel();
bigLabel->setPixmap(QPixmap(":/images/comics_view_toolbar/big_size_grid_zoom.png")); bigLabel->setPixmap(hdpiPixmap(":/images/comics_view_toolbar/big_size_grid_zoom.svg", QSize(18, 18)));
horizontalLayout->addWidget(bigLabel); horizontalLayout->addWidget(bigLabel);
horizontalLayout->addSpacing(10); horizontalLayout->addSpacing(10);
horizontalLayout->setContentsMargins(0, 0, 0, 0); horizontalLayout->setContentsMargins(0, 0, 0, 0);
@ -499,7 +499,7 @@ void GridComicsView::startDrag()
{ {
auto drag = new QDrag(this); auto drag = new QDrag(this);
drag->setMimeData(model->mimeData(selectionHelper->selectedRows())); drag->setMimeData(model->mimeData(selectionHelper->selectedRows()));
drag->setPixmap(QPixmap(":/images/comics_view_toolbar/openInYACReader.png")); // TODO add better image drag->setPixmap(hdpiPixmap(":/images/comics_view_toolbar/openInYACReader.svg", QSize(18, 18))); // TODO add better image
/*Qt::DropAction dropAction =*/drag->exec(Qt::CopyAction | Qt::MoveAction, Qt::CopyAction); /*Qt::DropAction dropAction =*/drag->exec(Qt::CopyAction | Qt::MoveAction, Qt::CopyAction);
} }

121
YACReaderLibrary/images.qrc
View File

@ -1,7 +1,7 @@
<RCC> <RCC>
<qresource prefix="/"> <qresource prefix="/">
<file>../images/accept_shortcut.png</file> <file>../images/accept_shortcut.svg</file>
<file>../images/clear_shortcut.png</file> <file>../images/clear_shortcut.svg</file>
<file>../images/comic_vine/downArrow.png</file> <file>../images/comic_vine/downArrow.png</file>
<file>../images/comic_vine/nextPage.png</file> <file>../images/comic_vine/nextPage.png</file>
<file>../images/comic_vine/previousPage.png</file> <file>../images/comic_vine/previousPage.png</file>
@ -10,36 +10,21 @@
<file>../images/comic_vine/rowDown.png</file> <file>../images/comic_vine/rowDown.png</file>
<file>../images/comic_vine/rowUp.png</file> <file>../images/comic_vine/rowUp.png</file>
<file>../images/comic_vine/upArrow.png</file> <file>../images/comic_vine/upArrow.png</file>
<file>../images/comics_view_toolbar/asignNumber.png</file> <file>../images/comics_view_toolbar/asignNumber.svg</file>
<file>../images/comics_view_toolbar/asignNumber@2x.png</file> <file>../images/comics_view_toolbar/big_size_grid_zoom.svg</file>
<file>../images/comics_view_toolbar/big_size_grid_zoom.png</file> <file>../images/comics_view_toolbar/editComic.svg</file>
<file>../images/comics_view_toolbar/big_size_grid_zoom@2x.png</file> <file>../images/comics_view_toolbar/getInfo.svg</file>
<file>../images/comics_view_toolbar/editComic.png</file> <file>../images/comics_view_toolbar/hideComicFlow.svg</file>
<file>../images/comics_view_toolbar/editComic@2x.png</file> <file>../images/comics_view_toolbar/openInYACReader.svg</file>
<file>../images/comics_view_toolbar/getInfo.png</file> <file>../images/comics_view_toolbar/selectAll.svg</file>
<file>../images/comics_view_toolbar/getInfo@2x.png</file> <file>../images/comics_view_toolbar/setReadButton.svg</file>
<file>../images/comics_view_toolbar/hideComicFlow.png</file> <file>../images/comics_view_toolbar/setUnread.svg</file>
<file>../images/comics_view_toolbar/hideComicFlow@2x.png</file> <file>../images/comics_view_toolbar/showMarks.svg</file>
<file>../images/comics_view_toolbar/openInYACReader.png</file> <file>../images/comics_view_toolbar/small_size_grid_zoom.svg</file>
<file>../images/comics_view_toolbar/openInYACReader@2x.png</file> <file>../images/comics_view_toolbar/trash.svg</file>
<file>../images/comics_view_toolbar/selectAll.png</file> <file>../images/comics_view_toolbar/show_comic_info.svg</file>
<file>../images/comics_view_toolbar/selectAll@2x.png</file> <file>../images/comics_view_toolbar/setManga.svg</file>
<file>../images/comics_view_toolbar/setReadButton.png</file> <file>../images/comics_view_toolbar/setNormal.svg</file>
<file>../images/comics_view_toolbar/setReadButton@2x.png</file>
<file>../images/comics_view_toolbar/setUnread.png</file>
<file>../images/comics_view_toolbar/setUnread@2x.png</file>
<file>../images/comics_view_toolbar/showMarks.png</file>
<file>../images/comics_view_toolbar/showMarks@2x.png</file>
<file>../images/comics_view_toolbar/small_size_grid_zoom.png</file>
<file>../images/comics_view_toolbar/small_size_grid_zoom@2x.png</file>
<file>../images/comics_view_toolbar/trash.png</file>
<file>../images/comics_view_toolbar/trash@2x.png</file>
<file>../images/comics_view_toolbar/show_comic_info.png</file>
<file>../images/comics_view_toolbar/show_comic_info@2x.png</file>
<file>../images/comics_view_toolbar/setManga.png</file>
<file>../images/comics_view_toolbar/setManga@2x.png</file>
<file>../images/comics_view_toolbar/setNormal.png</file>
<file>../images/comics_view_toolbar/setNormal@2x.png</file>
<file>../images/defaultCover.png</file> <file>../images/defaultCover.png</file>
<file>../images/edit.png</file> <file>../images/edit.png</file>
<file>../images/empty_current_readings.png</file> <file>../images/empty_current_readings.png</file>
@ -64,23 +49,16 @@
<file>../images/importingIcon.png</file> <file>../images/importingIcon.png</file>
<file>../images/importLibrary.png</file> <file>../images/importLibrary.png</file>
<file>../images/importTopCoversDecoration.png</file> <file>../images/importTopCoversDecoration.png</file>
<file>../images/main_toolbar/divider.png</file> <file>../images/main_toolbar/divider.svg</file>
<file>../images/menus_icons/editIcon.png</file> <file>../images/menus_icons/editIcon.svg</file>
<file>../images/menus_icons/editIcon@2x.png</file> <file>../images/menus_icons/exportComicsInfoIcon.svg</file>
<file>../images/menus_icons/exportComicsInfoIcon.png</file> <file>../images/menus_icons/exportLibraryIcon.svg</file>
<file>../images/menus_icons/exportComicsInfoIcon@2x.png</file> <file>../images/menus_icons/importComicsInfoIcon.svg</file>
<file>../images/menus_icons/exportLibraryIcon.png</file> <file>../images/menus_icons/importLibraryIcon.svg</file>
<file>../images/menus_icons/exportLibraryIcon@2x.png</file> <file>../images/menus_icons/removeLibraryIcon.svg</file>
<file>../images/menus_icons/importComicsInfoIcon.png</file> <file>../images/menus_icons/updateLibraryIcon.svg</file>
<file>../images/menus_icons/importComicsInfoIcon@2x.png</file> <file>../images/menus_icons/open_containing_folder.svg</file>
<file>../images/menus_icons/importLibraryIcon.png</file> <file>../images/menus_icons/update_current_folder.svg</file>
<file>../images/menus_icons/importLibraryIcon@2x.png</file>
<file>../images/menus_icons/open.png</file>
<file>../images/menus_icons/open@2x.png</file>
<file>../images/menus_icons/removeLibraryIcon.png</file>
<file>../images/menus_icons/removeLibraryIcon@2x.png</file>
<file>../images/menus_icons/updateLibraryIcon.png</file>
<file>../images/menus_icons/updateLibraryIcon@2x.png</file>
<file>../images/new.png</file> <file>../images/new.png</file>
<file>../images/nextCoverPage.png</file> <file>../images/nextCoverPage.png</file>
<file>../images/noLibrariesIcon.png</file> <file>../images/noLibrariesIcon.png</file>
@ -92,28 +70,43 @@
<file>../images/readRibbon.png</file> <file>../images/readRibbon.png</file>
<file>../images/searching_icon.png</file> <file>../images/searching_icon.png</file>
<file>../images/serverConfigBackground.png</file> <file>../images/serverConfigBackground.png</file>
<file>../images/shortcuts_group_comics.png</file> <file>../images/shortcuts_group_comics.svg</file>
<file>../images/shortcuts_group_folders.png</file> <file>../images/shortcuts_group_folders.svg</file>
<file>../images/shortcuts_group_general.png</file> <file>../images/shortcuts_group_general.svg</file>
<file>../images/shortcuts_group_libraries.png</file> <file>../images/shortcuts_group_libraries.svg</file>
<file>../images/shortcuts_group_mglass.png</file> <file>../images/shortcuts_group_mglass.svg</file>
<file>../images/shortcuts_group_page.png</file> <file>../images/shortcuts_group_page.svg</file>
<file>../images/shortcuts_group_reading.png</file> <file>../images/shortcuts_group_reading.svg</file>
<file>../images/shortcuts_group_visualization.png</file> <file>../images/shortcuts_group_visualization.svg</file>
<file>../images/shownCovers.png</file> <file>../images/shownCovers.png</file>
<file>../images/sidebar/branch-closed.png</file> <file>../images/sidebar/branch-closed.svg</file>
<file>../images/sidebar/branch-open.png</file> <file>../images/sidebar/branch-open.svg</file>
<file>../images/sidebar/collapsed_branch_osx.png</file> <file>../images/sidebar/collapsed_branch_osx.png</file>
<file>../images/sidebar/collapsed_branch_selected.png</file> <file>../images/sidebar/collapsed_branch_selected.png</file>
<file>../images/sidebar/expanded_branch_osx.png</file> <file>../images/sidebar/expanded_branch_osx.png</file>
<file>../images/sidebar/expanded_branch_selected.png</file> <file>../images/sidebar/expanded_branch_selected.png</file>
<file>../images/sidebar/folder.png</file> <file>../images/sidebar/folder.svg</file>
<file>../images/sidebar/folder_finished.png</file> <file>../images/sidebar/folder_finished.svg</file>
<file>../images/sidebar/libraryIconSelected.png</file> <file>../images/sidebar/libraryIconSelected.svg</file>
<file>../images/sidebar/libraryOptions.png</file> <file>../images/sidebar/libraryOptions.svg</file>
<file>../images/sidebar/libraryOptions@2x.png</file>
<file>../images/updatingIcon.png</file> <file>../images/updatingIcon.png</file>
<file>../images/custom_dialog/custom_close_button.svg</file> <file>../images/custom_dialog/custom_close_button.svg</file>
<file>../images/whats_new/whatsnew_header.svg</file> <file>../images/whats_new/whatsnew_header.svg</file>
<file>../images/lists/default_0.svg</file>
<file>../images/lists/default_1.svg</file>
<file>../images/lists/label_blue.svg</file>
<file>../images/lists/label_cyan.svg</file>
<file>../images/lists/label_dark.svg</file>
<file>../images/lists/label_green.svg</file>
<file>../images/lists/label_light.svg</file>
<file>../images/lists/label_orange.svg</file>
<file>../images/lists/label_pink.svg</file>
<file>../images/lists/label_purple.svg</file>
<file>../images/lists/label_red.svg</file>
<file>../images/lists/label_violet.svg</file>
<file>../images/lists/label_white.svg</file>
<file>../images/lists/label_yellow.svg</file>
<file>../images/lists/list.svg</file>
</qresource> </qresource>
</RCC> </RCC>

30
YACReaderLibrary/images_osx.qrc
View File

@ -23,37 +23,7 @@
<file>../images/iconSearch@2x.png</file> <file>../images/iconSearch@2x.png</file>
<file>../images/clearSearch.png</file> <file>../images/clearSearch.png</file>
<file>../images/clearSearch@2x.png</file> <file>../images/clearSearch@2x.png</file>
<file alias="images/lists/default_0.png">../images/lists/default_0_osx.png</file>
<file alias="images/lists/default_1.png">../images/lists/default_1_osx.png</file>
<file alias="images/lists/label_blue.png">../images/lists/label_blue_osx.png</file>
<file alias="images/lists/label_cyan.png">../images/lists/label_cyan_osx.png</file>
<file alias="images/lists/label_dark.png">../images/lists/label_dark_osx.png</file>
<file alias="images/lists/label_green.png">../images/lists/label_green_osx.png</file>
<file alias="images/lists/label_light.png">../images/lists/label_light_osx.png</file>
<file alias="images/lists/label_orange.png">../images/lists/label_orange_osx.png</file>
<file alias="images/lists/label_pink.png">../images/lists/label_pink_osx.png</file>
<file alias="images/lists/label_purple.png">../images/lists/label_purple_osx.png</file>
<file alias="images/lists/label_red.png">../images/lists/label_red_osx.png</file>
<file alias="images/lists/label_violet.png">../images/lists/label_violet_osx.png</file>
<file alias="images/lists/label_white.png">../images/lists/label_white_osx.png</file>
<file alias="images/lists/label_yellow.png">../images/lists/label_yellow_osx.png</file>
<file alias="images/lists/list.png">../images/lists/list_osx.png</file>
<file alias="images/empty_reading_list.png">../images/empty_reading_list_osx.png</file> <file alias="images/empty_reading_list.png">../images/empty_reading_list_osx.png</file>
<file alias="images/lists/default_0@2x.png">../images/lists/default_0_osx@2x.png</file>
<file alias="images/lists/default_1@2x.png">../images/lists/default_1_osx@2x.png</file>
<file alias="images/lists/label_blue@2x.png">../images/lists/label_blue_osx@2x.png</file>
<file alias="images/lists/label_cyan@2x.png">../images/lists/label_cyan_osx@2x.png</file>
<file alias="images/lists/label_dark@2x.png">../images/lists/label_dark_osx@2x.png</file>
<file alias="images/lists/label_green@2x.png">../images/lists/label_green_osx@2x.png</file>
<file alias="images/lists/label_light@2x.png">../images/lists/label_light_osx@2x.png</file>
<file alias="images/lists/label_orange@2x.png">../images/lists/label_orange_osx@2x.png</file>
<file alias="images/lists/label_pink@2x.png">../images/lists/label_pink_osx@2x.png</file>
<file alias="images/lists/label_purple@2x.png">../images/lists/label_purple_osx@2x.png</file>
<file alias="images/lists/label_red@2x.png">../images/lists/label_red_osx@2x.png</file>
<file alias="images/lists/label_violet@2x.png">../images/lists/label_violet_osx@2x.png</file>
<file alias="images/lists/label_white@2x.png">../images/lists/label_white_osx@2x.png</file>
<file alias="images/lists/label_yellow@2x.png">../images/lists/label_yellow_osx@2x.png</file>
<file alias="images/lists/list@2x.png">../images/lists/list_osx@2x.png</file>
<file alias="images/sidebar/libraryIcon.png">../images/sidebar/libraryIcon_osx.png</file> <file alias="images/sidebar/libraryIcon.png">../images/sidebar/libraryIcon_osx.png</file>
<file alias="images/sidebar/setRoot.png">../images/sidebar/setRoot_osx.png</file> <file alias="images/sidebar/setRoot.png">../images/sidebar/setRoot_osx.png</file>
<file alias="images/sidebar/expand.png">../images/sidebar/expand_osx.png</file> <file alias="images/sidebar/expand.png">../images/sidebar/expand_osx.png</file>

59
YACReaderLibrary/images_win.qrc
View File

@ -1,47 +1,32 @@
<RCC> <RCC>
<qresource prefix="/"> <qresource prefix="/">
<file>../images/main_toolbar/back.png</file> <file>../images/main_toolbar/back.svg</file>
<file>../images/main_toolbar/back_disabled.png</file> <file>../images/main_toolbar/back_disabled.png</file>
<file>../images/main_toolbar/forward.png</file> <file>../images/main_toolbar/forward.svg</file>
<file>../images/main_toolbar/forward_disabled.png</file> <file>../images/main_toolbar/forward_disabled.png</file>
<file>../images/main_toolbar/settings.png</file> <file>../images/main_toolbar/settings.svg</file>
<file>../images/main_toolbar/server.png</file> <file>../images/main_toolbar/server.svg</file>
<file>../images/main_toolbar/help.png</file> <file>../images/main_toolbar/help.svg</file>
<file>../images/main_toolbar/fullscreen.png</file> <file>../images/main_toolbar/fullscreen.svg</file>
<file>../images/sidebar/libraryIcon.png</file> <file>../images/main_toolbar/flow.svg</file>
<file>../images/sidebar/setRoot.png</file> <file>../images/main_toolbar/grid.svg</file>
<file>../images/sidebar/expand.png</file> <file>../images/main_toolbar/info.svg</file>
<file>../images/sidebar/colapse.png</file> <file>../images/sidebar/libraryIcon.svg</file>
<file>../images/sidebar/newLibraryIcon.png</file> <file>../images/sidebar/setRoot.svg</file>
<file>../images/sidebar/openLibraryIcon.png</file> <file>../images/sidebar/expand.svg</file>
<file>../images/main_toolbar/flow.png</file> <file>../images/sidebar/colapse.svg</file>
<file>../images/main_toolbar/grid.png</file> <file>../images/sidebar/newLibraryIcon.svg</file>
<file>../images/main_toolbar/info.png</file> <file>../images/sidebar/openLibraryIcon.svg</file>
<file>../images/sidebar/addNew_sidebar.svg</file>
<file>../images/sidebar/delete_sidebar.svg</file>
<file>../images/sidebar/addLabelIcon.svg</file>
<file>../images/sidebar/renameListIcon.svg</file>
<file>../images/empty_folder.png</file> <file>../images/empty_folder.png</file>
<file>../images/empty_search.png</file> <file>../images/empty_search.png</file>
<file>../images/sidebar/addNew_sidebar.png</file> <file alias="images/iconSearch.svg">../images/iconSearchNew.svg</file>
<file>../images/sidebar/delete_sidebar.png</file> <file alias="images/clearSearch.svg">../images/clearSearchNew.svg</file>
<file alias="images/iconSearch.png">../images/iconSearchNew.png</file>
<file alias="images/clearSearch.png">../images/clearSearchNew.png</file>
<file>../images/sidebar/addLabelIcon.png</file>
<file>../images/sidebar/renameListIcon.png</file>
<file>../images/lists/default_0.png</file>
<file>../images/lists/default_1.png</file>
<file>../images/lists/label_blue.png</file>
<file>../images/lists/label_cyan.png</file>
<file>../images/lists/label_dark.png</file>
<file>../images/lists/label_green.png</file>
<file>../images/lists/label_light.png</file>
<file>../images/lists/label_orange.png</file>
<file>../images/lists/label_pink.png</file>
<file>../images/lists/label_purple.png</file>
<file>../images/lists/label_red.png</file>
<file>../images/lists/label_violet.png</file>
<file>../images/lists/label_white.png</file>
<file>../images/lists/label_yellow.png</file>
<file>../images/lists/list.png</file>
<file>../images/empty_reading_list.png</file> <file>../images/empty_reading_list.png</file>
<file>../images/viewer_toolbar/close.png</file> <file>../images/viewer_toolbar/close.svg</file>
<file>icon.ico</file> <file>icon.ico</file>
</qresource> </qresource>
</RCC> </RCC>

106
YACReaderLibrary/library_window.cpp
View File

@ -361,7 +361,7 @@ void LibraryWindow::setUpShortcutsManagement()
QList<QAction *> allActions; QList<QAction *> allActions;
QList<QAction *> tmpList; QList<QAction *> tmpList;
editShortcutsDialog->addActionsGroup("Comics", QIcon(":/images/shortcuts_group_comics.png"), editShortcutsDialog->addActionsGroup("Comics", QIcon(":/images/shortcuts_group_comics.svg"),
tmpList = QList<QAction *>() tmpList = QList<QAction *>()
<< openComicAction << openComicAction
<< saveCoversToAction << saveCoversToAction
@ -379,7 +379,7 @@ void LibraryWindow::setUpShortcutsManagement()
allActions << tmpList; allActions << tmpList;
editShortcutsDialog->addActionsGroup("Folders", QIcon(":/images/shortcuts_group_folders.png"), editShortcutsDialog->addActionsGroup("Folders", QIcon(":/images/shortcuts_group_folders.svg"),
tmpList = QList<QAction *>() tmpList = QList<QAction *>()
<< addFolderAction << addFolderAction
<< deleteFolderAction << deleteFolderAction
@ -396,7 +396,7 @@ void LibraryWindow::setUpShortcutsManagement()
<< updateCurrentFolderAction); << updateCurrentFolderAction);
allActions << tmpList; allActions << tmpList;
editShortcutsDialog->addActionsGroup("Lists", QIcon(":/images/shortcuts_group_folders.png"), // TODO change icon editShortcutsDialog->addActionsGroup("Lists", QIcon(":/images/shortcuts_group_folders.svg"), // TODO change icon
tmpList = QList<QAction *>() tmpList = QList<QAction *>()
<< addReadingListAction << addReadingListAction
<< deleteReadingListAction << deleteReadingListAction
@ -404,7 +404,7 @@ void LibraryWindow::setUpShortcutsManagement()
<< renameListAction); << renameListAction);
allActions << tmpList; allActions << tmpList;
editShortcutsDialog->addActionsGroup("General", QIcon(":/images/shortcuts_group_general.png"), editShortcutsDialog->addActionsGroup("General", QIcon(":/images/shortcuts_group_general.svg"),
tmpList = QList<QAction *>() tmpList = QList<QAction *>()
<< backAction << backAction
<< forwardAction << forwardAction
@ -418,7 +418,7 @@ void LibraryWindow::setUpShortcutsManagement()
allActions << tmpList; allActions << tmpList;
editShortcutsDialog->addActionsGroup("Libraries", QIcon(":/images/shortcuts_group_libraries.png"), editShortcutsDialog->addActionsGroup("Libraries", QIcon(":/images/shortcuts_group_libraries.svg"),
tmpList = QList<QAction *>() tmpList = QList<QAction *>()
<< createLibraryAction << createLibraryAction
<< openLibraryAction << openLibraryAction
@ -433,7 +433,7 @@ void LibraryWindow::setUpShortcutsManagement()
allActions << tmpList; allActions << tmpList;
editShortcutsDialog->addActionsGroup("Visualization", QIcon(":/images/shortcuts_group_visualization.png"), editShortcutsDialog->addActionsGroup("Visualization", QIcon(":/images/shortcuts_group_visualization.svg"),
tmpList = QList<QAction *>() tmpList = QList<QAction *>()
<< showHideMarksAction << showHideMarksAction
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
@ -464,7 +464,7 @@ void LibraryWindow::createActions()
{ {
backAction = new QAction(this); backAction = new QAction(this);
QIcon icoBackButton; QIcon icoBackButton;
icoBackButton.addFile(":/images/main_toolbar/back.png", QSize(), QIcon::Normal); icoBackButton.addFile(addExtensionToIconPath(":/images/main_toolbar/back"), QSize(), QIcon::Normal);
// icoBackButton.addPixmap(QPixmap(":/images/main_toolbar/back_disabled.png"), QIcon::Disabled); // icoBackButton.addPixmap(QPixmap(":/images/main_toolbar/back_disabled.png"), QIcon::Disabled);
backAction->setData(BACK_ACTION_YL); backAction->setData(BACK_ACTION_YL);
backAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(BACK_ACTION_YL)); backAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(BACK_ACTION_YL));
@ -473,7 +473,7 @@ void LibraryWindow::createActions()
forwardAction = new QAction(this); forwardAction = new QAction(this);
QIcon icoFordwardButton; QIcon icoFordwardButton;
icoFordwardButton.addFile(":/images/main_toolbar/forward.png", QSize(), QIcon::Normal); icoFordwardButton.addFile(addExtensionToIconPath(":/images/main_toolbar/forward"), QSize(), QIcon::Normal);
// icoFordwardButton.addPixmap(QPixmap(":/images/main_toolbar/forward_disabled.png"), QIcon::Disabled); // icoFordwardButton.addPixmap(QPixmap(":/images/main_toolbar/forward_disabled.png"), QIcon::Disabled);
forwardAction->setData(FORWARD_ACTION_YL); forwardAction->setData(FORWARD_ACTION_YL);
forwardAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(FORWARD_ACTION_YL)); forwardAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(FORWARD_ACTION_YL));
@ -484,55 +484,55 @@ void LibraryWindow::createActions()
createLibraryAction->setToolTip(tr("Create a new library")); createLibraryAction->setToolTip(tr("Create a new library"));
createLibraryAction->setData(CREATE_LIBRARY_ACTION_YL); createLibraryAction->setData(CREATE_LIBRARY_ACTION_YL);
createLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(CREATE_LIBRARY_ACTION_YL)); createLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(CREATE_LIBRARY_ACTION_YL));
createLibraryAction->setIcon(QIcon(":/images/sidebar/newLibraryIcon.png")); createLibraryAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/newLibraryIcon")));
openLibraryAction = new QAction(this); openLibraryAction = new QAction(this);
openLibraryAction->setToolTip(tr("Open an existing library")); openLibraryAction->setToolTip(tr("Open an existing library"));
openLibraryAction->setData(OPEN_LIBRARY_ACTION_YL); openLibraryAction->setData(OPEN_LIBRARY_ACTION_YL);
openLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_LIBRARY_ACTION_YL)); openLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_LIBRARY_ACTION_YL));
openLibraryAction->setIcon(QIcon(":/images/sidebar/openLibraryIcon.png")); openLibraryAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/openLibraryIcon")));
exportComicsInfoAction = new QAction(tr("Export comics info"), this); exportComicsInfoAction = new QAction(tr("Export comics info"), this);
exportComicsInfoAction->setToolTip(tr("Export comics info")); exportComicsInfoAction->setToolTip(tr("Export comics info"));
exportComicsInfoAction->setData(EXPORT_COMICS_INFO_ACTION_YL); exportComicsInfoAction->setData(EXPORT_COMICS_INFO_ACTION_YL);
exportComicsInfoAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(EXPORT_COMICS_INFO_ACTION_YL)); exportComicsInfoAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(EXPORT_COMICS_INFO_ACTION_YL));
exportComicsInfoAction->setIcon(QIcon(":/images/menus_icons/exportComicsInfoIcon.png")); exportComicsInfoAction->setIcon(QIcon(":/images/menus_icons/exportComicsInfoIcon.svg"));
importComicsInfoAction = new QAction(tr("Import comics info"), this); importComicsInfoAction = new QAction(tr("Import comics info"), this);
importComicsInfoAction->setToolTip(tr("Import comics info")); importComicsInfoAction->setToolTip(tr("Import comics info"));
importComicsInfoAction->setData(IMPORT_COMICS_INFO_ACTION_YL); importComicsInfoAction->setData(IMPORT_COMICS_INFO_ACTION_YL);
importComicsInfoAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(IMPORT_COMICS_INFO_ACTION_YL)); importComicsInfoAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(IMPORT_COMICS_INFO_ACTION_YL));
importComicsInfoAction->setIcon(QIcon(":/images/menus_icons/importComicsInfoIcon.png")); importComicsInfoAction->setIcon(QIcon(":/images/menus_icons/importComicsInfoIcon.svg"));
exportLibraryAction = new QAction(tr("Pack covers"), this); exportLibraryAction = new QAction(tr("Pack covers"), this);
exportLibraryAction->setToolTip(tr("Pack the covers of the selected library")); exportLibraryAction->setToolTip(tr("Pack the covers of the selected library"));
exportLibraryAction->setData(EXPORT_LIBRARY_ACTION_YL); exportLibraryAction->setData(EXPORT_LIBRARY_ACTION_YL);
exportLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(EXPORT_LIBRARY_ACTION_YL)); exportLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(EXPORT_LIBRARY_ACTION_YL));
exportLibraryAction->setIcon(QIcon(":/images/menus_icons/exportLibraryIcon.png")); exportLibraryAction->setIcon(QIcon(":/images/menus_icons/exportLibraryIcon.svg"));
importLibraryAction = new QAction(tr("Unpack covers"), this); importLibraryAction = new QAction(tr("Unpack covers"), this);
importLibraryAction->setToolTip(tr("Unpack a catalog")); importLibraryAction->setToolTip(tr("Unpack a catalog"));
importLibraryAction->setData(IMPORT_LIBRARY_ACTION_YL); importLibraryAction->setData(IMPORT_LIBRARY_ACTION_YL);
importLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(IMPORT_LIBRARY_ACTION_YL)); importLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(IMPORT_LIBRARY_ACTION_YL));
importLibraryAction->setIcon(QIcon(":/images/menus_icons/importLibraryIcon.png")); importLibraryAction->setIcon(QIcon(":/images/menus_icons/importLibraryIcon.svg"));
updateLibraryAction = new QAction(tr("Update library"), this); updateLibraryAction = new QAction(tr("Update library"), this);
updateLibraryAction->setToolTip(tr("Update current library")); updateLibraryAction->setToolTip(tr("Update current library"));
updateLibraryAction->setData(UPDATE_LIBRARY_ACTION_YL); updateLibraryAction->setData(UPDATE_LIBRARY_ACTION_YL);
updateLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(UPDATE_LIBRARY_ACTION_YL)); updateLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(UPDATE_LIBRARY_ACTION_YL));
updateLibraryAction->setIcon(QIcon(":/images/menus_icons/updateLibraryIcon.png")); updateLibraryAction->setIcon(QIcon(":/images/menus_icons/updateLibraryIcon.svg"));
renameLibraryAction = new QAction(tr("Rename library"), this); renameLibraryAction = new QAction(tr("Rename library"), this);
renameLibraryAction->setToolTip(tr("Rename current library")); renameLibraryAction->setToolTip(tr("Rename current library"));
renameLibraryAction->setData(RENAME_LIBRARY_ACTION_YL); renameLibraryAction->setData(RENAME_LIBRARY_ACTION_YL);
renameLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(RENAME_LIBRARY_ACTION_YL)); renameLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(RENAME_LIBRARY_ACTION_YL));
renameLibraryAction->setIcon(QIcon(":/images/menus_icons/editIcon.png")); renameLibraryAction->setIcon(QIcon(":/images/menus_icons/editIcon.svg"));
removeLibraryAction = new QAction(tr("Remove library"), this); removeLibraryAction = new QAction(tr("Remove library"), this);
removeLibraryAction->setToolTip(tr("Remove current library from your collection")); removeLibraryAction->setToolTip(tr("Remove current library from your collection"));
removeLibraryAction->setData(REMOVE_LIBRARY_ACTION_YL); removeLibraryAction->setData(REMOVE_LIBRARY_ACTION_YL);
removeLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(REMOVE_LIBRARY_ACTION_YL)); removeLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(REMOVE_LIBRARY_ACTION_YL));
removeLibraryAction->setIcon(QIcon(":/images/menus_icons/removeLibraryIcon.png")); removeLibraryAction->setIcon(QIcon(":/images/menus_icons/removeLibraryIcon.svg"));
rescanLibraryForXMLInfoAction = new QAction(tr("Rescan library for XML info"), this); rescanLibraryForXMLInfoAction = new QAction(tr("Rescan library for XML info"), this);
rescanLibraryForXMLInfoAction->setToolTip(tr("Tries to find XML info embedded in comic files. You only need to do this if the library was created with 9.8.2 or earlier versions or if you are using third party software to embed XML info in the files.")); rescanLibraryForXMLInfoAction->setToolTip(tr("Tries to find XML info embedded in comic files. You only need to do this if the library was created with 9.8.2 or earlier versions or if you are using third party software to embed XML info in the files."));
@ -543,7 +543,7 @@ void LibraryWindow::createActions()
openComicAction->setToolTip(tr("Open current comic on YACReader")); openComicAction->setToolTip(tr("Open current comic on YACReader"));
openComicAction->setData(OPEN_COMIC_ACTION_YL); openComicAction->setData(OPEN_COMIC_ACTION_YL);
openComicAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_COMIC_ACTION_YL)); openComicAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_COMIC_ACTION_YL));
openComicAction->setIcon(QIcon(":/images/comics_view_toolbar/openInYACReader.png")); openComicAction->setIcon(QIcon(":/images/comics_view_toolbar/openInYACReader.svg"));
saveCoversToAction = new QAction(tr("Save selected covers to..."), this); saveCoversToAction = new QAction(tr("Save selected covers to..."), this);
saveCoversToAction->setToolTip(tr("Save covers of the selected comics as JPG files")); saveCoversToAction->setToolTip(tr("Save covers of the selected comics as JPG files"));
@ -554,25 +554,25 @@ void LibraryWindow::createActions()
setAsReadAction->setToolTip(tr("Set comic as read")); setAsReadAction->setToolTip(tr("Set comic as read"));
setAsReadAction->setData(SET_AS_READ_ACTION_YL); setAsReadAction->setData(SET_AS_READ_ACTION_YL);
setAsReadAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SET_AS_READ_ACTION_YL)); setAsReadAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SET_AS_READ_ACTION_YL));
setAsReadAction->setIcon(QIcon(":/images/comics_view_toolbar/setReadButton.png")); setAsReadAction->setIcon(QIcon(":/images/comics_view_toolbar/setReadButton.svg"));
setAsNonReadAction = new QAction(tr("Set as unread"), this); setAsNonReadAction = new QAction(tr("Set as unread"), this);
setAsNonReadAction->setToolTip(tr("Set comic as unread")); setAsNonReadAction->setToolTip(tr("Set comic as unread"));
setAsNonReadAction->setData(SET_AS_NON_READ_ACTION_YL); setAsNonReadAction->setData(SET_AS_NON_READ_ACTION_YL);
setAsNonReadAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SET_AS_NON_READ_ACTION_YL)); setAsNonReadAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SET_AS_NON_READ_ACTION_YL));
setAsNonReadAction->setIcon(QIcon(":/images/comics_view_toolbar/setUnread.png")); setAsNonReadAction->setIcon(QIcon(":/images/comics_view_toolbar/setUnread.svg"));
setMangaAction = new QAction(tr("Set as manga"), this); setMangaAction = new QAction(tr("Set as manga"), this);
setMangaAction->setToolTip(tr("Set issue as manga")); setMangaAction->setToolTip(tr("Set issue as manga"));
setMangaAction->setData(SET_AS_MANGA_ACTION_YL); setMangaAction->setData(SET_AS_MANGA_ACTION_YL);
setMangaAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SET_AS_MANGA_ACTION_YL)); setMangaAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SET_AS_MANGA_ACTION_YL));
setMangaAction->setIcon(QIcon(":/images/comics_view_toolbar/setManga.png")); setMangaAction->setIcon(QIcon(":/images/comics_view_toolbar/setManga.svg"));
setNormalAction = new QAction(tr("Set as normal"), this); setNormalAction = new QAction(tr("Set as normal"), this);
setNormalAction->setToolTip(tr("Set issue as normal")); setNormalAction->setToolTip(tr("Set issue as normal"));
setNormalAction->setData(SET_AS_NORMAL_ACTION_YL); setNormalAction->setData(SET_AS_NORMAL_ACTION_YL);
setNormalAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SET_AS_NORMAL_ACTION_YL)); setNormalAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SET_AS_NORMAL_ACTION_YL));
setNormalAction->setIcon(QIcon(":/images/comics_view_toolbar/setNormal.png")); setNormalAction->setIcon(QIcon(":/images/comics_view_toolbar/setNormal.svg"));
/*setAllAsReadAction = new QAction(tr("Set all as read"),this); /*setAllAsReadAction = new QAction(tr("Set all as read"),this);
setAllAsReadAction->setToolTip(tr("Set all comics as read")); setAllAsReadAction->setToolTip(tr("Set all comics as read"));
@ -587,7 +587,7 @@ void LibraryWindow::createActions()
showHideMarksAction->setData(SHOW_HIDE_MARKS_ACTION_YL); showHideMarksAction->setData(SHOW_HIDE_MARKS_ACTION_YL);
showHideMarksAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_HIDE_MARKS_ACTION_YL)); showHideMarksAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_HIDE_MARKS_ACTION_YL));
showHideMarksAction->setCheckable(true); showHideMarksAction->setCheckable(true);
showHideMarksAction->setIcon(QIcon(":/images/comics_view_toolbar/showMarks.png")); showHideMarksAction->setIcon(QIcon(":/images/comics_view_toolbar/showMarks.svg"));
showHideMarksAction->setChecked(true); showHideMarksAction->setChecked(true);
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
toggleFullScreenAction = new QAction(tr("Fullscreen mode on/off"), this); toggleFullScreenAction = new QAction(tr("Fullscreen mode on/off"), this);
@ -595,7 +595,7 @@ void LibraryWindow::createActions()
toggleFullScreenAction->setData(TOGGLE_FULL_SCREEN_ACTION_YL); toggleFullScreenAction->setData(TOGGLE_FULL_SCREEN_ACTION_YL);
toggleFullScreenAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(TOGGLE_FULL_SCREEN_ACTION_YL)); toggleFullScreenAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(TOGGLE_FULL_SCREEN_ACTION_YL));
QIcon icoFullscreenButton; QIcon icoFullscreenButton;
icoFullscreenButton.addPixmap(QPixmap(":/images/main_toolbar/fullscreen.png"), QIcon::Normal); icoFullscreenButton.addFile(addExtensionToIconPath(":/images/main_toolbar/fullscreen"), QSize(), QIcon::Normal);
toggleFullScreenAction->setIcon(icoFullscreenButton); toggleFullScreenAction->setIcon(icoFullscreenButton);
#endif #endif
helpAboutAction = new QAction(this); helpAboutAction = new QAction(this);
@ -603,45 +603,45 @@ void LibraryWindow::createActions()
helpAboutAction->setData(HELP_ABOUT_ACTION_YL); helpAboutAction->setData(HELP_ABOUT_ACTION_YL);
helpAboutAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(HELP_ABOUT_ACTION_YL)); helpAboutAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(HELP_ABOUT_ACTION_YL));
QIcon icoHelpButton; QIcon icoHelpButton;
icoHelpButton.addFile(":/images/main_toolbar/help.png", QSize(), QIcon::Normal); icoHelpButton.addFile(addExtensionToIconPath(":/images/main_toolbar/help"), QSize(), QIcon::Normal);
helpAboutAction->setIcon(icoHelpButton); helpAboutAction->setIcon(icoHelpButton);
addFolderAction = new QAction(tr("Add new folder"), this); addFolderAction = new QAction(tr("Add new folder"), this);
addFolderAction->setData(ADD_FOLDER_ACTION_YL); addFolderAction->setData(ADD_FOLDER_ACTION_YL);
addFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADD_FOLDER_ACTION_YL)); addFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADD_FOLDER_ACTION_YL));
addFolderAction->setToolTip(tr("Add new folder to the current library")); addFolderAction->setToolTip(tr("Add new folder to the current library"));
addFolderAction->setIcon(QIcon(":/images/sidebar/addNew_sidebar.png")); addFolderAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/addNew_sidebar")));
deleteFolderAction = new QAction(tr("Delete folder"), this); deleteFolderAction = new QAction(tr("Delete folder"), this);
deleteFolderAction->setData(REMOVE_FOLDER_ACTION_YL); deleteFolderAction->setData(REMOVE_FOLDER_ACTION_YL);
deleteFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(REMOVE_FOLDER_ACTION_YL)); deleteFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(REMOVE_FOLDER_ACTION_YL));
deleteFolderAction->setToolTip(tr("Delete current folder from disk")); deleteFolderAction->setToolTip(tr("Delete current folder from disk"));
deleteFolderAction->setIcon(QIcon(":/images/sidebar/delete_sidebar.png")); deleteFolderAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/delete_sidebar")));
setRootIndexAction = new QAction(this); setRootIndexAction = new QAction(this);
setRootIndexAction->setData(SET_ROOT_INDEX_ACTION_YL); setRootIndexAction->setData(SET_ROOT_INDEX_ACTION_YL);
setRootIndexAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SET_ROOT_INDEX_ACTION_YL)); setRootIndexAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SET_ROOT_INDEX_ACTION_YL));
setRootIndexAction->setToolTip(tr("Select root node")); setRootIndexAction->setToolTip(tr("Select root node"));
setRootIndexAction->setIcon(QIcon(":/images/sidebar/setRoot.png")); setRootIndexAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/setRoot")));
expandAllNodesAction = new QAction(this); expandAllNodesAction = new QAction(this);
expandAllNodesAction->setToolTip(tr("Expand all nodes")); expandAllNodesAction->setToolTip(tr("Expand all nodes"));
expandAllNodesAction->setData(EXPAND_ALL_NODES_ACTION_YL); expandAllNodesAction->setData(EXPAND_ALL_NODES_ACTION_YL);
expandAllNodesAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(EXPAND_ALL_NODES_ACTION_YL)); expandAllNodesAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(EXPAND_ALL_NODES_ACTION_YL));
expandAllNodesAction->setIcon(QIcon(":/images/sidebar/expand.png")); expandAllNodesAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/expand")));
colapseAllNodesAction = new QAction(this); colapseAllNodesAction = new QAction(this);
colapseAllNodesAction->setToolTip(tr("Collapse all nodes")); colapseAllNodesAction->setToolTip(tr("Collapse all nodes"));
colapseAllNodesAction->setData(COLAPSE_ALL_NODES_ACTION_YL); colapseAllNodesAction->setData(COLAPSE_ALL_NODES_ACTION_YL);
colapseAllNodesAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(COLAPSE_ALL_NODES_ACTION_YL)); colapseAllNodesAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(COLAPSE_ALL_NODES_ACTION_YL));
colapseAllNodesAction->setIcon(QIcon(":/images/sidebar/colapse.png")); colapseAllNodesAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/colapse")));
optionsAction = new QAction(this); optionsAction = new QAction(this);
optionsAction->setToolTip(tr("Show options dialog")); optionsAction->setToolTip(tr("Show options dialog"));
optionsAction->setData(OPTIONS_ACTION_YL); optionsAction->setData(OPTIONS_ACTION_YL);
optionsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPTIONS_ACTION_YL)); optionsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPTIONS_ACTION_YL));
QIcon icoSettingsButton; QIcon icoSettingsButton;
icoSettingsButton.addFile(":/images/main_toolbar/settings.png", QSize(), QIcon::Normal); icoSettingsButton.addFile(addExtensionToIconPath(":/images/main_toolbar/settings"), QSize(), QIcon::Normal);
optionsAction->setIcon(icoSettingsButton); optionsAction->setIcon(icoSettingsButton);
serverConfigAction = new QAction(this); serverConfigAction = new QAction(this);
@ -649,7 +649,7 @@ void LibraryWindow::createActions()
serverConfigAction->setData(SERVER_CONFIG_ACTION_YL); serverConfigAction->setData(SERVER_CONFIG_ACTION_YL);
serverConfigAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SERVER_CONFIG_ACTION_YL)); serverConfigAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SERVER_CONFIG_ACTION_YL));
QIcon icoServerButton; QIcon icoServerButton;
icoServerButton.addFile(":/images/main_toolbar/server.png", QSize(), QIcon::Normal); icoServerButton.addFile(addExtensionToIconPath(":/images/main_toolbar/server"), QSize(), QIcon::Normal);
serverConfigAction->setIcon(icoServerButton); serverConfigAction->setIcon(icoServerButton);
toggleComicsViewAction = new QAction(tr("Change between comics views"), this); toggleComicsViewAction = new QAction(tr("Change between comics views"), this);
@ -657,11 +657,11 @@ void LibraryWindow::createActions()
QIcon icoViewsButton; QIcon icoViewsButton;
if (!settings->contains(COMICS_VIEW_STATUS) || settings->value(COMICS_VIEW_STATUS) == Flow) if (!settings->contains(COMICS_VIEW_STATUS) || settings->value(COMICS_VIEW_STATUS) == Flow)
icoViewsButton.addFile(":/images/main_toolbar/grid.png", QSize(), QIcon::Normal); icoViewsButton.addFile(addExtensionToIconPath(":/images/main_toolbar/grid"), QSize(), QIcon::Normal);
else if (settings->value(COMICS_VIEW_STATUS) == Grid) else if (settings->value(COMICS_VIEW_STATUS) == Grid)
icoViewsButton.addFile(":/images/main_toolbar/info.png", QSize(), QIcon::Normal); icoViewsButton.addFile(addExtensionToIconPath(":/images/main_toolbar/info"), QSize(), QIcon::Normal);
else else
icoViewsButton.addFile(":/images/main_toolbar/flow.png", QSize(), QIcon::Normal); icoViewsButton.addFile(addExtensionToIconPath(":/images/main_toolbar/flow"), QSize(), QIcon::Normal);
toggleComicsViewAction->setData(TOGGLE_COMICS_VIEW_ACTION_YL); toggleComicsViewAction->setData(TOGGLE_COMICS_VIEW_ACTION_YL);
toggleComicsViewAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(TOGGLE_COMICS_VIEW_ACTION_YL)); toggleComicsViewAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(TOGGLE_COMICS_VIEW_ACTION_YL));
@ -674,7 +674,7 @@ void LibraryWindow::createActions()
openContainingFolderAction->setText(tr("Open folder...")); openContainingFolderAction->setText(tr("Open folder..."));
openContainingFolderAction->setData(OPEN_CONTAINING_FOLDER_ACTION_YL); openContainingFolderAction->setData(OPEN_CONTAINING_FOLDER_ACTION_YL);
openContainingFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_CONTAINING_FOLDER_ACTION_YL)); openContainingFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_CONTAINING_FOLDER_ACTION_YL));
openContainingFolderAction->setIcon(QIcon(":/images/menus_icons/open.png")); openContainingFolderAction->setIcon(QIcon(":/images/menus_icons/open_containing_folder.svg"));
setFolderAsNotCompletedAction = new QAction(this); setFolderAsNotCompletedAction = new QAction(this);
setFolderAsNotCompletedAction->setText(tr("Set as uncompleted")); setFolderAsNotCompletedAction->setText(tr("Set as uncompleted"));
@ -712,7 +712,7 @@ void LibraryWindow::createActions()
openContainingFolderComicAction->setText(tr("Open containing folder...")); openContainingFolderComicAction->setText(tr("Open containing folder..."));
openContainingFolderComicAction->setData(OPEN_CONTAINING_FOLDER_COMIC_ACTION_YL); openContainingFolderComicAction->setData(OPEN_CONTAINING_FOLDER_COMIC_ACTION_YL);
openContainingFolderComicAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_CONTAINING_FOLDER_COMIC_ACTION_YL)); openContainingFolderComicAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_CONTAINING_FOLDER_COMIC_ACTION_YL));
openContainingFolderComicAction->setIcon(QIcon(":/images/menus_icons/open.png")); openContainingFolderComicAction->setIcon(QIcon(":/images/menus_icons/open_containing_folder.svg"));
resetComicRatingAction = new QAction(this); resetComicRatingAction = new QAction(this);
resetComicRatingAction->setText(tr("Reset comic rating")); resetComicRatingAction->setText(tr("Reset comic rating"));
@ -724,19 +724,19 @@ void LibraryWindow::createActions()
selectAllComicsAction->setText(tr("Select all comics")); selectAllComicsAction->setText(tr("Select all comics"));
selectAllComicsAction->setData(SELECT_ALL_COMICS_ACTION_YL); selectAllComicsAction->setData(SELECT_ALL_COMICS_ACTION_YL);
selectAllComicsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SELECT_ALL_COMICS_ACTION_YL)); selectAllComicsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SELECT_ALL_COMICS_ACTION_YL));
selectAllComicsAction->setIcon(QIcon(":/images/comics_view_toolbar/selectAll.png")); selectAllComicsAction->setIcon(QIcon(":/images/comics_view_toolbar/selectAll.svg"));
editSelectedComicsAction = new QAction(this); editSelectedComicsAction = new QAction(this);
editSelectedComicsAction->setText(tr("Edit")); editSelectedComicsAction->setText(tr("Edit"));
editSelectedComicsAction->setData(EDIT_SELECTED_COMICS_ACTION_YL); editSelectedComicsAction->setData(EDIT_SELECTED_COMICS_ACTION_YL);
editSelectedComicsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(EDIT_SELECTED_COMICS_ACTION_YL)); editSelectedComicsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(EDIT_SELECTED_COMICS_ACTION_YL));
editSelectedComicsAction->setIcon(QIcon(":/images/comics_view_toolbar/editComic.png")); editSelectedComicsAction->setIcon(QIcon(":/images/comics_view_toolbar/editComic.svg"));
asignOrderAction = new QAction(this); asignOrderAction = new QAction(this);
asignOrderAction->setText(tr("Assign current order to comics")); asignOrderAction->setText(tr("Assign current order to comics"));
asignOrderAction->setData(ASIGN_ORDER_ACTION_YL); asignOrderAction->setData(ASIGN_ORDER_ACTION_YL);
asignOrderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ASIGN_ORDER_ACTION_YL)); asignOrderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ASIGN_ORDER_ACTION_YL));
asignOrderAction->setIcon(QIcon(":/images/comics_view_toolbar/asignNumber.png")); asignOrderAction->setIcon(QIcon(":/images/comics_view_toolbar/asignNumber.svg"));
forceCoverExtractedAction = new QAction(this); forceCoverExtractedAction = new QAction(this);
forceCoverExtractedAction->setText(tr("Update cover")); forceCoverExtractedAction->setText(tr("Update cover"));
@ -748,13 +748,13 @@ void LibraryWindow::createActions()
deleteComicsAction->setText(tr("Delete selected comics")); deleteComicsAction->setText(tr("Delete selected comics"));
deleteComicsAction->setData(DELETE_COMICS_ACTION_YL); deleteComicsAction->setData(DELETE_COMICS_ACTION_YL);
deleteComicsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(DELETE_COMICS_ACTION_YL)); deleteComicsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(DELETE_COMICS_ACTION_YL));
deleteComicsAction->setIcon(QIcon(":/images/comics_view_toolbar/trash.png")); deleteComicsAction->setIcon(QIcon(":/images/comics_view_toolbar/trash.svg"));
getInfoAction = new QAction(this); getInfoAction = new QAction(this);
getInfoAction->setData(GET_INFO_ACTION_YL); getInfoAction->setData(GET_INFO_ACTION_YL);
getInfoAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(GET_INFO_ACTION_YL)); getInfoAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(GET_INFO_ACTION_YL));
getInfoAction->setText(tr("Download tags from Comic Vine")); getInfoAction->setText(tr("Download tags from Comic Vine"));
getInfoAction->setIcon(QIcon(":/images/comics_view_toolbar/getInfo.png")); getInfoAction->setIcon(QIcon(":/images/comics_view_toolbar/getInfo.svg"));
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
focusSearchLineAction = new QAction(tr("Focus search line"), this); focusSearchLineAction = new QAction(tr("Focus search line"), this);
@ -775,43 +775,43 @@ void LibraryWindow::createActions()
addAction(showEditShortcutsAction); addAction(showEditShortcutsAction);
quitAction = new QAction(tr("&Quit"), this); quitAction = new QAction(tr("&Quit"), this);
quitAction->setIcon(QIcon(":/images/viewer_toolbar/close.png")); quitAction->setIcon(QIcon(":/images/viewer_toolbar/close.svg"));
quitAction->setData(QUIT_ACTION_YL); quitAction->setData(QUIT_ACTION_YL);
quitAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(QUIT_ACTION_YL)); quitAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(QUIT_ACTION_YL));
// TODO: is `quitAction->setMenuRole(QAction::QuitRole);` useful on macOS? // TODO: is `quitAction->setMenuRole(QAction::QuitRole);` useful on macOS?
addAction(quitAction); addAction(quitAction);
updateFolderAction = new QAction(tr("Update folder"), this); updateFolderAction = new QAction(tr("Update folder"), this);
updateFolderAction->setIcon(QIcon(":/images/menus_icons/updateLibraryIcon.png")); updateFolderAction->setIcon(QIcon(":/images/menus_icons/update_current_folder.svg"));
updateCurrentFolderAction = new QAction(tr("Update current folder"), this); updateCurrentFolderAction = new QAction(tr("Update current folder"), this);
updateCurrentFolderAction->setData(UPDATE_CURRENT_FOLDER_ACTION_YL); updateCurrentFolderAction->setData(UPDATE_CURRENT_FOLDER_ACTION_YL);
updateCurrentFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(UPDATE_CURRENT_FOLDER_ACTION_YL)); updateCurrentFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(UPDATE_CURRENT_FOLDER_ACTION_YL));
updateCurrentFolderAction->setIcon(QIcon(":/images/menus_icons/updateLibraryIcon.png")); updateCurrentFolderAction->setIcon(QIcon(":/images/menus_icons/update_current_folder.svg"));
addReadingListAction = new QAction(tr("Add new reading list"), this); addReadingListAction = new QAction(tr("Add new reading list"), this);
addReadingListAction->setData(ADD_READING_LIST_ACTION_YL); addReadingListAction->setData(ADD_READING_LIST_ACTION_YL);
addReadingListAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADD_READING_LIST_ACTION_YL)); addReadingListAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADD_READING_LIST_ACTION_YL));
addReadingListAction->setToolTip(tr("Add a new reading list to the current library")); addReadingListAction->setToolTip(tr("Add a new reading list to the current library"));
addReadingListAction->setIcon(QIcon(":/images/sidebar/addNew_sidebar.png")); addReadingListAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/addNew_sidebar")));
deleteReadingListAction = new QAction(tr("Remove reading list"), this); deleteReadingListAction = new QAction(tr("Remove reading list"), this);
deleteReadingListAction->setData(REMOVE_READING_LIST_ACTION_YL); deleteReadingListAction->setData(REMOVE_READING_LIST_ACTION_YL);
deleteReadingListAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(REMOVE_READING_LIST_ACTION_YL)); deleteReadingListAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(REMOVE_READING_LIST_ACTION_YL));
deleteReadingListAction->setToolTip(tr("Remove current reading list from the library")); deleteReadingListAction->setToolTip(tr("Remove current reading list from the library"));
deleteReadingListAction->setIcon(QIcon(":/images/sidebar/delete_sidebar.png")); deleteReadingListAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/delete_sidebar")));
addLabelAction = new QAction(tr("Add new label"), this); addLabelAction = new QAction(tr("Add new label"), this);
addLabelAction->setData(ADD_LABEL_ACTION_YL); addLabelAction->setData(ADD_LABEL_ACTION_YL);
addLabelAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADD_LABEL_ACTION_YL)); addLabelAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADD_LABEL_ACTION_YL));
addLabelAction->setToolTip(tr("Add a new label to this library")); addLabelAction->setToolTip(tr("Add a new label to this library"));
addLabelAction->setIcon(QIcon(":/images/sidebar/addLabelIcon.png")); addLabelAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/addLabelIcon")));
renameListAction = new QAction(tr("Rename selected list"), this); renameListAction = new QAction(tr("Rename selected list"), this);
renameListAction->setData(RENAME_LIST_ACTION_YL); renameListAction->setData(RENAME_LIST_ACTION_YL);
renameListAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(RENAME_LIST_ACTION_YL)); renameListAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(RENAME_LIST_ACTION_YL));
renameListAction->setToolTip(tr("Rename any selected labels or lists")); renameListAction->setToolTip(tr("Rename any selected labels or lists"));
renameListAction->setIcon(QIcon(":/images/sidebar/renameListIcon.png")); renameListAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/renameListIcon")));
//-- //--
addToMenuAction = new QAction(tr("Add to..."), this); addToMenuAction = new QAction(tr("Add to..."), this);
@ -820,7 +820,7 @@ void LibraryWindow::createActions()
addToFavoritesAction->setData(ADD_TO_FAVORITES_ACTION_YL); addToFavoritesAction->setData(ADD_TO_FAVORITES_ACTION_YL);
addToFavoritesAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADD_TO_FAVORITES_ACTION_YL)); addToFavoritesAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADD_TO_FAVORITES_ACTION_YL));
addToFavoritesAction->setToolTip(tr("Add selected comics to favorites list")); addToFavoritesAction->setToolTip(tr("Add selected comics to favorites list"));
addToFavoritesAction->setIcon(QIcon(":/images/lists/default_1.png")); addToFavoritesAction->setIcon(QIcon(":/images/lists/default_1.svg"));
// actions not asigned to any widget // actions not asigned to any widget
this->addAction(saveCoversToAction); this->addAction(saveCoversToAction);
@ -1785,10 +1785,10 @@ void LibraryWindow::showGridFoldersContextMenu(QPoint point, Folder folder)
auto openContainingFolderAction = new QAction(); auto openContainingFolderAction = new QAction();
openContainingFolderAction->setText(tr("Open folder...")); openContainingFolderAction->setText(tr("Open folder..."));
openContainingFolderAction->setIcon(QIcon(":/images/menus_icons/open.png")); openContainingFolderAction->setIcon(QIcon(":/images/menus_icons/open_containing_folder.svg"));
auto updateFolderAction = new QAction(tr("Update folder"), this); auto updateFolderAction = new QAction(tr("Update folder"), this);
updateFolderAction->setIcon(QIcon(":/images/menus_icons/updateLibraryIcon.png")); updateFolderAction->setIcon(QIcon(":/images/menus_icons/update_current_folder.svg"));
auto setFolderAsNotCompletedAction = new QAction(); auto setFolderAsNotCompletedAction = new QAction();
setFolderAsNotCompletedAction->setText(tr("Set as uncompleted")); setFolderAsNotCompletedAction->setText(tr("Set as uncompleted"));
@ -1868,7 +1868,7 @@ void LibraryWindow::showContinueReadingContextMenu(QPoint point, ComicDB comic)
auto setAsUnReadAction = new QAction(); auto setAsUnReadAction = new QAction();
setAsUnReadAction->setText(tr("Set as unread")); setAsUnReadAction->setText(tr("Set as unread"));
setAsUnReadAction->setIcon(QIcon(":/images/comics_view_toolbar/setUnread.png")); setAsUnReadAction->setIcon(QIcon(":/images/comics_view_toolbar/setUnread.svg"));
menu.addAction(setAsUnReadAction); menu.addAction(setAsUnReadAction);

6
YACReaderLibrary/yacreader_content_views_manager.cpp
View File

@ -210,7 +210,7 @@ void YACReaderContentViewsManager::_toggleComicsView()
switch (comicsViewStatus) { switch (comicsViewStatus) {
case Flow: { case Flow: {
QIcon icoViewsButton; QIcon icoViewsButton;
icoViewsButton.addFile(":/images/main_toolbar/info.png", QSize(), QIcon::Normal); icoViewsButton.addFile(addExtensionToIconPath(":/images/main_toolbar/info"), QSize(), QIcon::Normal);
libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton); libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton);
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton); libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);
@ -227,7 +227,7 @@ void YACReaderContentViewsManager::_toggleComicsView()
case Grid: { case Grid: {
QIcon icoViewsButton; QIcon icoViewsButton;
icoViewsButton.addFile(":/images/main_toolbar/flow.png", QSize(), QIcon::Normal); icoViewsButton.addFile(addExtensionToIconPath(":/images/main_toolbar/flow"), QSize(), QIcon::Normal);
libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton); libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton);
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton); libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);
@ -243,7 +243,7 @@ void YACReaderContentViewsManager::_toggleComicsView()
case Info: { case Info: {
QIcon icoViewsButton; QIcon icoViewsButton;
icoViewsButton.addFile(":/images/main_toolbar/grid.png", QSize(), QIcon::Normal); icoViewsButton.addFile(addExtensionToIconPath(":/images/main_toolbar/grid"), QSize(), QIcon::Normal);
libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton); libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton);
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton); libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);

2
YACReaderLibrary/yacreader_main_toolbar.cpp
View File

@ -116,7 +116,7 @@ void YACReaderMainToolBar::resizeEvent(QResizeEvent *event)
void YACReaderMainToolBar::addDivider() void YACReaderMainToolBar::addDivider()
{ {
QPixmap img(":/images/main_toolbar/divider.png"); QPixmap img(":/images/main_toolbar/divider.svg");
QLabel *divider = new QLabel(); QLabel *divider = new QLabel();
divider->setPixmap(img); divider->setPixmap(img);

54
common/yacreader_global_gui.cpp
View File

@ -21,9 +21,10 @@ QAction *YACReader::createSeparator()
QIcon YACReader::noHighlightedIcon(const QString &path) QIcon YACReader::noHighlightedIcon(const QString &path)
{ {
QPixmap p(path); QPixmap sp(path);
QPixmap p = hdpiPixmap(path, sp.size());
QIcon icon; //(path); QIcon icon;
icon.addFile(path, p.size(), QIcon::Normal); icon.addFile(path, p.size(), QIcon::Normal);
icon.addFile(path, p.size(), QIcon::Selected); icon.addFile(path, p.size(), QIcon::Selected);
return icon; return icon;
@ -49,3 +50,52 @@ QList<qulonglong> YACReader::mimeDataToComicsIds(const QMimeData *data)
in >> comicIds; // deserialize the list of indentifiers in >> comicIds; // deserialize the list of indentifiers
return comicIds; return comicIds;
} }
// TODO some SVG assets are missing in macos (WIP)
// we need two sets of icons, one for the toolbar and one for the context menu because of this bug (QTBUG-96553): https://bugreports.qt.io/browse/QTBUG-96553
QString YACReader::addExtensionToIconPath(const QString &path)
{
#ifdef YACREADER_LIBRARY
#ifdef Q_OS_MAC
return path + ".png";
#else
return path + ".svg";
#endif
#else
return path + ".svg";
#endif
}
QString YACReader::addExtensionToIconPathInToolbar(const QString &path)
{
return path + "_18x18.svg";
}
QAction *YACReader::actionWithCustomIcon(const QIcon &icon, QAction *action)
{
auto a = new QAction(icon, action->text());
a->setEnabled(action->isEnabled());
a->setCheckable(action->isCheckable());
a->setChecked(action->isChecked());
QObject::connect(a, &QAction::triggered, action, &QAction::triggered);
QObject::connect(action, &QAction::changed, action, [=]() {
a->setEnabled(action->isEnabled());
a->setCheckable(action->isCheckable());
a->setChecked(action->isChecked());
});
QObject::connect(a, &QAction::toggled, action, &QAction::setChecked);
QObject::connect(action, &QAction::toggled, a, &QAction::setChecked);
return a;
}
QPixmap YACReader::hdpiPixmap(const QString &file, QSize size)
{
return QIcon(file).pixmap(size);
}

4
common/yacreader_global_gui.h
View File

@ -110,6 +110,10 @@ QAction *createSeparator();
QIcon noHighlightedIcon(const QString &path); QIcon noHighlightedIcon(const QString &path);
void colorize(QImage &img, QColor &col); void colorize(QImage &img, QColor &col);
QList<qulonglong> mimeDataToComicsIds(const QMimeData *data); QList<qulonglong> mimeDataToComicsIds(const QMimeData *data);
QString addExtensionToIconPath(const QString &path);
QString addExtensionToIconPathInToolbar(const QString &path);
QAction *actionWithCustomIcon(const QIcon &icon, QAction *action);
QPixmap hdpiPixmap(const QString &file, QSize size);
} }
#endif #endif

22
custom_widgets/yacreader_library_item_widget.cpp
View File

@ -1,10 +1,14 @@
#include "yacreader_library_item_widget.h" #include "yacreader_library_item_widget.h"
#include "yacreader_global_gui.h"
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QLabel> #include <QLabel>
#include <QToolButton> #include <QToolButton>
#include <QMouseEvent> #include <QMouseEvent>
using namespace YACReader;
YACReaderLibraryItemWidget::YACReaderLibraryItemWidget(QString n /*ame*/, QString p /*ath*/, QWidget *parent) YACReaderLibraryItemWidget::YACReaderLibraryItemWidget(QString n /*ame*/, QString p /*ath*/, QWidget *parent)
: QWidget(parent), name(n), path(p), isSelected(false) : QWidget(parent), name(n), path(p), isSelected(false)
{ {
@ -14,7 +18,7 @@ YACReaderLibraryItemWidget::YACReaderLibraryItemWidget(QString n /*ame*/, QStrin
// installEventFilter(this); // installEventFilter(this);
QPixmap iconPixmap(":/images/sidebar/libraryIcon.png"); QPixmap iconPixmap = hdpiPixmap(addExtensionToIconPath(":/images/sidebar/libraryIcon"), QSize(16, 16));
icon = new QLabel(this); icon = new QLabel(this);
icon->setPixmap(iconPixmap); icon->setPixmap(iconPixmap);
@ -22,17 +26,7 @@ YACReaderLibraryItemWidget::YACReaderLibraryItemWidget(QString n /*ame*/, QStrin
options = new QToolButton(this); options = new QToolButton(this);
// TODO fix this crazy hack for having a propper retina icon for the options, this is still a problem in 2022 QPixmap iconOptionsPixmap = hdpiPixmap(":/images/sidebar/libraryOptions.svg", QSize(8, 8));
// 1.- QPixmap won't pick the right @2x asset
// 2.- Using QToolButton::setIcon(QIcon(":/images/sidebar/libraryOptions.png")) will pick the right asset and then QToolButton will fail to set the right image size, it will use a image size twice bigger
// 3.- Using a QAction + QToolButton doesn't fix the problem either
// 4.- SVG support is also buggy QTBUG-96553
QString sourceOptionsImage;
if (devicePixelRatioF() > 1)
sourceOptionsImage = ":/images/sidebar/libraryOptions@2x.png";
else
sourceOptionsImage = ":/images/sidebar/libraryOptions.png";
QPixmap iconOptionsPixmap(sourceOptionsImage);
iconOptionsPixmap.setDevicePixelRatio(devicePixelRatioF()); iconOptionsPixmap.setDevicePixelRatio(devicePixelRatioF());
QLabel *helperLabel = new QLabel(options); QLabel *helperLabel = new QLabel(options);
helperLabel->move(4, 3); helperLabel->move(4, 3);
@ -131,7 +125,7 @@ void YACReaderLibraryItemWidget::deselect()
setStyleSheet(styleSheet); setStyleSheet(styleSheet);
#endif #endif
QPixmap iconPixmap(":/images/sidebar/libraryIcon.png"); QPixmap iconPixmap = hdpiPixmap(addExtensionToIconPath(":/images/sidebar/libraryIcon"), QSize(16, 16));
icon->setPixmap(iconPixmap); icon->setPixmap(iconPixmap);
/*up->setHidden(true); /*up->setHidden(true);
@ -153,7 +147,7 @@ void YACReaderLibraryItemWidget::select()
options->setHidden(false); options->setHidden(false);
QPixmap iconPixmap(":/images/sidebar/libraryIconSelected.png"); QPixmap iconPixmap = hdpiPixmap(":/images/sidebar/libraryIconSelected.svg", QSize(16, 16));
icon->setPixmap(iconPixmap); icon->setPixmap(iconPixmap);
isSelected = true; isSelected = true;

6
custom_widgets/yacreader_search_line_edit.cpp
View File

@ -1,4 +1,5 @@
#include "yacreader_search_line_edit.h" #include "yacreader_search_line_edit.h"
#include "yacreader_global_gui.h"
#include <QToolButton> #include <QToolButton>
#include <QStyle> #include <QStyle>
@ -12,6 +13,7 @@ YACReaderSearchLineEdit::YACReaderSearchLineEdit(QWidget *parent)
clearButton = new QToolButton(this); clearButton = new QToolButton(this);
searchLabel = new QLabel(this); searchLabel = new QLabel(this);
#ifdef Q_OS_MAC
QPixmap clearIcon; QPixmap clearIcon;
QPixmap searchIcon; QPixmap searchIcon;
@ -29,6 +31,10 @@ YACReaderSearchLineEdit::YACReaderSearchLineEdit(QWidget *parent)
clearIcon.load(":/images/clearSearch.png"); clearIcon.load(":/images/clearSearch.png");
searchIcon.load(":/images/iconSearch.png"); searchIcon.load(":/images/iconSearch.png");
} }
#else
QPixmap clearIcon = YACReader::hdpiPixmap(":/images/clearSearch.svg", QSize(15, 15));
QPixmap searchIcon = YACReader::hdpiPixmap(":/images/iconSearch.svg", QSize(15, 15));
#endif
searchLabel->setStyleSheet("QLabel { border: none; padding: 0px; }"); searchLabel->setStyleSheet("QLabel { border: none; padding: 0px; }");
searchLabel->setPixmap(searchIcon); searchLabel->setPixmap(searchIcon);

3
custom_widgets/yacreader_table_view.cpp
View File

@ -13,6 +13,7 @@
#include "QsLog.h" #include "QsLog.h"
#include "comic_item.h" #include "comic_item.h"
#include "yacreader_global_gui.h"
YACReaderTableView::YACReaderTableView(QWidget *parent) YACReaderTableView::YACReaderTableView(QWidget *parent)
: QTableView(parent), showDelete(false), editing(false), myeditor(0) : QTableView(parent), showDelete(false), editing(false), myeditor(0)
@ -146,7 +147,7 @@ void YACReaderTableView::performDrag()
QLOG_DEBUG() << "performDrag"; QLOG_DEBUG() << "performDrag";
QDrag *drag = new QDrag(this); QDrag *drag = new QDrag(this);
drag->setMimeData(model()->mimeData(selectionModel()->selectedRows())); drag->setMimeData(model()->mimeData(selectionModel()->selectedRows()));
drag->setPixmap(QPixmap(":/images/comics_view_toolbar/openInYACReader.png")); // TODO add better image drag->setPixmap(YACReader::hdpiPixmap(":/images/comics_view_toolbar/openInYACReader.svg", QSize(18, 18))); // TODO add better image
/*Qt::DropAction dropAction =*/drag->exec(Qt::CopyAction | Qt::MoveAction, Qt::CopyAction); /*Qt::DropAction dropAction =*/drag->exec(Qt::CopyAction | Qt::MoveAction, Qt::CopyAction);
} }

4
custom_widgets/yacreader_treeview.cpp
View File

@ -44,10 +44,10 @@ YACReaderTreeView::YACReaderTreeView(QWidget *parent)
"QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {background: none; }" "QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {background: none; }"
"QTreeView::branch:has-children:!has-siblings:closed,QTreeView::branch:closed:has-children:has-siblings {border-image: none;image: url(':/images/sidebar/branch-closed.png');}" "QTreeView::branch:has-children:!has-siblings:closed,QTreeView::branch:closed:has-children:has-siblings {border-image: none;image: url(':/images/sidebar/branch-closed.svg');}"
"QTreeView::branch:has-children:selected:!has-siblings:closed,QTreeView::branch:closed:selected:has-children:has-siblings {border-image: none;image: url(':/images/sidebar/collapsed_branch_selected.png');}" "QTreeView::branch:has-children:selected:!has-siblings:closed,QTreeView::branch:closed:selected:has-children:has-siblings {border-image: none;image: url(':/images/sidebar/collapsed_branch_selected.png');}"
"QTreeView::branch:open:has-children:!has-siblings,QTreeView::branch:open:has-children:has-siblings {border-image: none;image: url(':/images/sidebar/branch-open.png');}" "QTreeView::branch:open:has-children:!has-siblings,QTreeView::branch:open:has-children:has-siblings {border-image: none;image: url(':/images/sidebar/branch-open.svg');}"
"QTreeView::branch:open:has-children:selected:!has-siblings,QTreeView::branch:open:has-children:selected:has-siblings {border-image: none;image: url(':/images/sidebar/expanded_branch_selected.png');}"); "QTreeView::branch:open:has-children:selected:!has-siblings,QTreeView::branch:open:has-children:selected:has-siblings {border-image: none;image: url(':/images/sidebar/expanded_branch_selected.png');}");
#endif #endif
} }

BIN
images/accept_shortcut.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 293 B

BIN
images/clearSearchNew.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 235 B

BIN
images/clearSearchNew.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 301 B

BIN
images/clear_shortcut.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 649 B

BIN
images/close.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 215 B

BIN
images/close.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 317 B

BIN
images/comics_view_toolbar/asignNumber.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 251 B

BIN
images/comics_view_toolbar/asignNumber.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 435 B

BIN
images/comics_view_toolbar/asignNumber@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 353 B

BIN
images/comics_view_toolbar/big_size_grid_zoom.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 164 B

BIN
images/comics_view_toolbar/big_size_grid_zoom.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 450 B

BIN
images/comics_view_toolbar/big_size_grid_zoom@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 201 B

BIN
images/comics_view_toolbar/editComic.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 289 B

BIN
images/comics_view_toolbar/editComic.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 801 B

BIN
images/comics_view_toolbar/editComic@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 415 B

BIN
images/comics_view_toolbar/getInfo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 302 B

BIN
images/comics_view_toolbar/getInfo.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 621 B

BIN
images/comics_view_toolbar/getInfo@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 473 B

BIN
images/comics_view_toolbar/hideComicFlow.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 254 B

BIN
images/comics_view_toolbar/hideComicFlow.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 308 B

BIN
images/comics_view_toolbar/hideComicFlow@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 402 B

BIN
images/comics_view_toolbar/openInYACReader.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 312 B

BIN
images/comics_view_toolbar/openInYACReader.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 356 B

BIN
images/comics_view_toolbar/openInYACReader@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 488 B

BIN
images/comics_view_toolbar/selectAll.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 237 B

BIN
images/comics_view_toolbar/selectAll.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 421 B

BIN
images/comics_view_toolbar/selectAll@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 328 B

BIN
images/comics_view_toolbar/setAllRead.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 255 B

BIN
images/comics_view_toolbar/setAllUnread.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 299 B

BIN
images/comics_view_toolbar/setManga.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 217 B

BIN
images/comics_view_toolbar/setManga.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 338 B

BIN
images/comics_view_toolbar/setManga@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 334 B

BIN
images/comics_view_toolbar/setNormal.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 205 B

BIN
images/comics_view_toolbar/setNormal.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 347 B

BIN
images/comics_view_toolbar/setNormal@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 315 B

BIN
images/comics_view_toolbar/setReadButton.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 268 B

BIN
images/comics_view_toolbar/setReadButton.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 281 B

BIN
images/comics_view_toolbar/setReadButton@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 383 B

BIN
images/comics_view_toolbar/setUnread.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 329 B

BIN
images/comics_view_toolbar/setUnread.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 344 B

BIN
images/comics_view_toolbar/setUnread@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 507 B

BIN
images/comics_view_toolbar/showMarks.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 316 B

BIN
images/comics_view_toolbar/showMarks.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 561 B

BIN
images/comics_view_toolbar/showMarks@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 519 B

BIN
images/comics_view_toolbar/show_comic_info.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 133 B

BIN
images/comics_view_toolbar/show_comic_info.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 364 B

BIN
images/comics_view_toolbar/show_comic_info@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 154 B

BIN
images/comics_view_toolbar/small_size_grid_zoom.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 164 B

BIN
images/comics_view_toolbar/small_size_grid_zoom.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 591 B

BIN
images/comics_view_toolbar/small_size_grid_zoom@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 201 B

BIN
images/comics_view_toolbar/trash.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 209 B

BIN
images/comics_view_toolbar/trash.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 442 B

BIN
images/comics_view_toolbar/trash@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 253 B

BIN
images/iconSearchNew.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 382 B

BIN
images/iconSearchNew.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 450 B

BIN
images/lists/default_0.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 233 B

BIN
images/lists/default_0.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 332 B

BIN
images/lists/default_0_osx.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 242 B

BIN
images/lists/default_0_osx@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 413 B

BIN
images/lists/default_1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 383 B

BIN
images/lists/default_1.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 580 B

BIN
images/lists/default_1_osx.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 384 B

BIN
images/lists/default_1_osx@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 577 B

BIN
images/lists/label_blue.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 253 B

BIN
images/lists/label_blue.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 277 B

BIN
images/lists/label_blue_osx.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 253 B

BIN
images/lists/label_blue_osx@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 410 B

BIN
images/lists/label_cyan.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 250 B

BIN
images/lists/label_cyan.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 277 B

BIN
images/lists/label_cyan_osx.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 250 B

BIN
images/lists/label_cyan_osx@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 419 B

BIN
images/lists/label_dark.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 243 B

BIN
images/lists/label_dark.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 277 B

BIN
images/lists/label_dark_osx.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 243 B

BIN
images/lists/label_dark_osx@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 406 B

Some files were not shown because too many files have changed in this diff Show More