diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index e80c33fe..2b707b90 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro @@ -40,8 +40,8 @@ win32 { LIBS += -lpoppler-qt5 INCLUDEPATH += ../dependencies/poppler/include/qt5 - #QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL - #QMAKE_LFLAGS_RELEASE += /LTCG + QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL + QMAKE_LFLAGS_RELEASE += /LTCG CONFIG -= embed_manifest_exe } diff --git a/YACReaderLibrary/images.qrc b/YACReaderLibrary/images.qrc index 6e13221c..3eb7b46c 100644 --- a/YACReaderLibrary/images.qrc +++ b/YACReaderLibrary/images.qrc @@ -2,7 +2,6 @@ ../images/accept_shortcut.png ../images/clear_shortcut.png - ../images/comicFolder.png ../images/comic_vine/downArrow.png ../images/comic_vine/nextPage.png ../images/comic_vine/previousPage.png @@ -12,42 +11,40 @@ ../images/comic_vine/rowDown.png ../images/comic_vine/rowUp.png ../images/comic_vine/upArrow.png + ../images/comicFolder.png ../images/comics_view_toolbar/asignNumber.png - ../images/comics_view_toolbar/big_size_grid_zoom.png - ../images/comics_view_toolbar/editComic.png - ../images/comics_view_toolbar/getInfo.png - ../images/comics_view_toolbar/hideComicFlow.png - ../images/comics_view_toolbar/openInYACReader.png - ../images/comics_view_toolbar/selectAll.png - ../images/comics_view_toolbar/setReadButton.png - ../images/comics_view_toolbar/setUnread.png - ../images/comics_view_toolbar/showMarks.png - ../images/comics_view_toolbar/small_size_grid_zoom.png - ../images/comics_view_toolbar/trash.png ../images/comics_view_toolbar/asignNumber@2x.png + ../images/comics_view_toolbar/big_size_grid_zoom.png ../images/comics_view_toolbar/big_size_grid_zoom@2x.png + ../images/comics_view_toolbar/editComic.png ../images/comics_view_toolbar/editComic@2x.png + ../images/comics_view_toolbar/getInfo.png ../images/comics_view_toolbar/getInfo@2x.png + ../images/comics_view_toolbar/hideComicFlow.png ../images/comics_view_toolbar/hideComicFlow@2x.png + ../images/comics_view_toolbar/openInYACReader.png ../images/comics_view_toolbar/openInYACReader@2x.png + ../images/comics_view_toolbar/selectAll.png ../images/comics_view_toolbar/selectAll@2x.png + ../images/comics_view_toolbar/setReadButton.png ../images/comics_view_toolbar/setReadButton@2x.png + ../images/comics_view_toolbar/setUnread.png ../images/comics_view_toolbar/setUnread@2x.png + ../images/comics_view_toolbar/showMarks.png ../images/comics_view_toolbar/showMarks@2x.png + ../images/comics_view_toolbar/small_size_grid_zoom.png ../images/comics_view_toolbar/small_size_grid_zoom@2x.png ../images/comics_view_toolbar/trash.png + ../images/comics_view_toolbar/trash.png ../images/coversPackage.png ../images/db.png ../images/defaultCover.png ../images/edit.png - ../images/editIcon.png ../images/empty_current_readings.png ../images/empty_favorites.png ../images/empty_label.png ../images/exportComicsInfo.png - ../images/exportComicsInfoIcon.png ../images/exportLibrary.png - ../images/exportLibraryIcon.png ../images/f_overlayed.png ../images/f_overlayed_retina.png ../images/find_folder.png @@ -62,14 +59,27 @@ ../images/iconLibrary.png ../images/importBottomCoversDecoration.png ../images/importComicsInfo.png - ../images/importComicsInfoIcon.png - ../images/importLibrary.png - ../images/importLibraryIcon.png - ../images/importLibraryIcon.png - ../images/importTopCoversDecoration.png ../images/importingIcon.png + ../images/importLibrary.png + ../images/importTopCoversDecoration.png ../images/iphoneConfig.png ../images/main_toolbar/divider.png + ../images/menus_icons/editIcon.png + ../images/menus_icons/editIcon@2x.png + ../images/menus_icons/exportComicsInfoIcon.png + ../images/menus_icons/exportComicsInfoIcon@2x.png + ../images/menus_icons/exportLibraryIcon.png + ../images/menus_icons/exportLibraryIcon@2x.png + ../images/menus_icons/importComicsInfoIcon.png + ../images/menus_icons/importComicsInfoIcon@2x.png + ../images/menus_icons/importLibraryIcon.png + ../images/menus_icons/importLibraryIcon@2x.png + ../images/menus_icons/open.png + ../images/menus_icons/open@2x.png + ../images/menus_icons/removeLibraryIcon.png + ../images/menus_icons/removeLibraryIcon@2x.png + ../images/menus_icons/updateLibraryIcon.png + ../images/menus_icons/updateLibraryIcon@2x.png ../images/new.png ../images/nextCoverPage.png ../images/noLibrariesIcon.png @@ -77,12 +87,10 @@ ../images/notCover.png ../images/onStartFlowSelection.png ../images/onStartFlowSelection_es.png - ../images/open.png ../images/openLibrary.png ../images/previousCoverPage.png - ../images/readRibbon.png ../images/readingRibbon.png - ../images/removeLibraryIcon.png + ../images/readRibbon.png ../images/searching_icon.png ../images/serverConfigBackground.png ../images/setRead.png @@ -106,7 +114,6 @@ ../images/sidebar/libraryIconSelected.png ../images/sidebar/libraryOptions.png ../images/sidebar/libraryOptions@2x.png - ../images/updateLibraryIcon.png ../images/updatingIcon.png ../images/useNewFlowButton.png ../images/useOldFlowButton.png diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index 6b27c224..ed13b638 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -504,43 +504,43 @@ void LibraryWindow::createActions() exportComicsInfoAction->setToolTip(tr("Export comics info")); exportComicsInfoAction->setData(EXPORT_COMICS_INFO_ACTION_YL); exportComicsInfoAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(EXPORT_COMICS_INFO_ACTION_YL)); - exportComicsInfoAction->setIcon(QIcon(":/images/exportComicsInfoIcon.png")); + exportComicsInfoAction->setIcon(QIcon(":/images/menus_icons/exportComicsInfoIcon.png")); importComicsInfoAction = new QAction(tr("Import comics info"),this); importComicsInfoAction->setToolTip(tr("Import comics info")); importComicsInfoAction->setData(IMPORT_COMICS_INFO_ACTION_YL); importComicsInfoAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(IMPORT_COMICS_INFO_ACTION_YL)); - importComicsInfoAction->setIcon(QIcon(":/images/importComicsInfoIcon.png")); + importComicsInfoAction->setIcon(QIcon(":/images/menus_icons/importComicsInfoIcon.png")); exportLibraryAction = new QAction(tr("Pack covers"),this); exportLibraryAction->setToolTip(tr("Pack the covers of the selected library")); exportLibraryAction->setData(EXPORT_LIBRARY_ACTION_YL); exportLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(EXPORT_LIBRARY_ACTION_YL)); - exportLibraryAction->setIcon(QIcon(":/images/exportLibraryIcon.png")); + exportLibraryAction->setIcon(QIcon(":/images/menus_icons/exportLibraryIcon.png")); importLibraryAction = new QAction(tr("Unpack covers"),this); importLibraryAction->setToolTip(tr("Unpack a catalog")); importLibraryAction->setData(IMPORT_LIBRARY_ACTION_YL); importLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(IMPORT_LIBRARY_ACTION_YL)); - importLibraryAction->setIcon(QIcon(":/images/importLibraryIcon.png")); + importLibraryAction->setIcon(QIcon(":/images/menus_icons/importLibraryIcon.png")); updateLibraryAction = new QAction(tr("Update library"),this); updateLibraryAction->setToolTip(tr("Update current library")); updateLibraryAction->setData(UPDATE_LIBRARY_ACTION_YL); updateLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(UPDATE_LIBRARY_ACTION_YL)); - updateLibraryAction->setIcon(QIcon(":/images/updateLibraryIcon.png")); + updateLibraryAction->setIcon(QIcon(":/images/menus_icons/updateLibraryIcon.png")); renameLibraryAction = new QAction(tr("Rename library"),this); renameLibraryAction->setToolTip(tr("Rename current library")); renameLibraryAction->setData(RENAME_LIBRARY_ACTION_YL); renameLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(RENAME_LIBRARY_ACTION_YL)); - renameLibraryAction->setIcon(QIcon(":/images/editIcon.png")); + renameLibraryAction->setIcon(QIcon(":/images/menus_icons/editIcon.png")); removeLibraryAction = new QAction(tr("Remove library"),this); removeLibraryAction->setToolTip(tr("Remove current library from your collection")); removeLibraryAction->setData(REMOVE_LIBRARY_ACTION_YL); removeLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(REMOVE_LIBRARY_ACTION_YL)); - removeLibraryAction->setIcon(QIcon(":/images/removeLibraryIcon.png")); + removeLibraryAction->setIcon(QIcon(":/images/menus_icons/removeLibraryIcon.png")); openComicAction = new QAction(tr("Open current comic"),this); openComicAction->setToolTip(tr("Open current comic on YACReader")); @@ -659,7 +659,7 @@ void LibraryWindow::createActions() openContainingFolderAction->setText(tr("Open folder...")); openContainingFolderAction->setData(OPEN_CONTAINING_FOLDER_ACTION_YL); openContainingFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_CONTAINING_FOLDER_ACTION_YL)); - openContainingFolderAction->setIcon(QIcon(":/images/open.png")); + openContainingFolderAction->setIcon(QIcon(":/images/menus_icons/open.png")); setFolderAsNotCompletedAction = new QAction(this); setFolderAsNotCompletedAction->setText(tr("Set as uncompleted")); @@ -685,7 +685,7 @@ void LibraryWindow::createActions() openContainingFolderComicAction->setText(tr("Open containing folder...")); openContainingFolderComicAction->setData(OPEN_CONTAINING_FOLDER_COMIC_ACTION_YL); openContainingFolderComicAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_CONTAINING_FOLDER_COMIC_ACTION_YL)); - openContainingFolderComicAction->setIcon(QIcon(":/images/open.png")); + openContainingFolderComicAction->setIcon(QIcon(":/images/menus_icons/open.png")); resetComicRatingAction = new QAction(this); resetComicRatingAction->setText(tr("Reset comic rating")); @@ -737,12 +737,12 @@ void LibraryWindow::createActions() addAction(showEditShortcutsAction); updateFolderAction = new QAction(tr("Update folder"), this); - updateFolderAction->setIcon(QIcon(":/images/updateLibraryIcon.png")); + updateFolderAction->setIcon(QIcon(":/images/menus_icons/updateLibraryIcon.png")); updateCurrentFolderAction = new QAction(tr("Update current folder"), this); updateCurrentFolderAction->setData(UPDATE_CURRENT_FOLDER_ACTION_YL); updateCurrentFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(UPDATE_CURRENT_FOLDER_ACTION_YL)); - updateCurrentFolderAction->setIcon(QIcon(":/images/updateLibraryIcon.png")); + updateCurrentFolderAction->setIcon(QIcon(":/images/menus_icons/updateLibraryIcon.png")); addReadingListAction = new QAction(tr("Add new reading list"), this); addReadingListAction->setData(ADD_READING_LIST_ACTION_YL); diff --git a/images/editIcon.png b/images/editIcon.png deleted file mode 100644 index a90fbd9d..00000000 Binary files a/images/editIcon.png and /dev/null differ diff --git a/images/exportComicsInfoIcon.png b/images/exportComicsInfoIcon.png deleted file mode 100644 index e1c22eda..00000000 Binary files a/images/exportComicsInfoIcon.png and /dev/null differ diff --git a/images/exportLibraryIcon.png b/images/exportLibraryIcon.png deleted file mode 100644 index d176e495..00000000 Binary files a/images/exportLibraryIcon.png and /dev/null differ diff --git a/images/importComicsInfoIcon.png b/images/importComicsInfoIcon.png deleted file mode 100644 index fbf7c7ee..00000000 Binary files a/images/importComicsInfoIcon.png and /dev/null differ diff --git a/images/importLibraryIcon.png b/images/importLibraryIcon.png deleted file mode 100644 index ea1e0798..00000000 Binary files a/images/importLibraryIcon.png and /dev/null differ diff --git a/images/menus_icons/editIcon.png b/images/menus_icons/editIcon.png new file mode 100644 index 00000000..3caf15db Binary files /dev/null and b/images/menus_icons/editIcon.png differ diff --git a/images/menus_icons/editIcon@2x.png b/images/menus_icons/editIcon@2x.png new file mode 100644 index 00000000..7be4e0ef Binary files /dev/null and b/images/menus_icons/editIcon@2x.png differ diff --git a/images/menus_icons/exportComicsInfoIcon.png b/images/menus_icons/exportComicsInfoIcon.png new file mode 100644 index 00000000..3857068d Binary files /dev/null and b/images/menus_icons/exportComicsInfoIcon.png differ diff --git a/images/menus_icons/exportComicsInfoIcon@2x.png b/images/menus_icons/exportComicsInfoIcon@2x.png new file mode 100644 index 00000000..ad192d32 Binary files /dev/null and b/images/menus_icons/exportComicsInfoIcon@2x.png differ diff --git a/images/menus_icons/exportLibraryIcon.png b/images/menus_icons/exportLibraryIcon.png new file mode 100644 index 00000000..bd45fc2a Binary files /dev/null and b/images/menus_icons/exportLibraryIcon.png differ diff --git a/images/menus_icons/exportLibraryIcon@2x.png b/images/menus_icons/exportLibraryIcon@2x.png new file mode 100644 index 00000000..837f3015 Binary files /dev/null and b/images/menus_icons/exportLibraryIcon@2x.png differ diff --git a/images/menus_icons/importComicsInfoIcon.png b/images/menus_icons/importComicsInfoIcon.png new file mode 100644 index 00000000..5745fbf2 Binary files /dev/null and b/images/menus_icons/importComicsInfoIcon.png differ diff --git a/images/menus_icons/importComicsInfoIcon@2x.png b/images/menus_icons/importComicsInfoIcon@2x.png new file mode 100644 index 00000000..50c80c12 Binary files /dev/null and b/images/menus_icons/importComicsInfoIcon@2x.png differ diff --git a/images/menus_icons/importLibraryIcon.png b/images/menus_icons/importLibraryIcon.png new file mode 100644 index 00000000..f5405865 Binary files /dev/null and b/images/menus_icons/importLibraryIcon.png differ diff --git a/images/menus_icons/importLibraryIcon@2x.png b/images/menus_icons/importLibraryIcon@2x.png new file mode 100644 index 00000000..dec6383a Binary files /dev/null and b/images/menus_icons/importLibraryIcon@2x.png differ diff --git a/images/menus_icons/open.png b/images/menus_icons/open.png new file mode 100644 index 00000000..048f55f3 Binary files /dev/null and b/images/menus_icons/open.png differ diff --git a/images/menus_icons/open@2x.png b/images/menus_icons/open@2x.png new file mode 100644 index 00000000..d72e19b1 Binary files /dev/null and b/images/menus_icons/open@2x.png differ diff --git a/images/menus_icons/removeLibraryIcon.png b/images/menus_icons/removeLibraryIcon.png new file mode 100644 index 00000000..83f894d7 Binary files /dev/null and b/images/menus_icons/removeLibraryIcon.png differ diff --git a/images/menus_icons/removeLibraryIcon@2x.png b/images/menus_icons/removeLibraryIcon@2x.png new file mode 100644 index 00000000..23a4c6b6 Binary files /dev/null and b/images/menus_icons/removeLibraryIcon@2x.png differ diff --git a/images/menus_icons/updateLibraryIcon.png b/images/menus_icons/updateLibraryIcon.png new file mode 100644 index 00000000..87fd0333 Binary files /dev/null and b/images/menus_icons/updateLibraryIcon.png differ diff --git a/images/menus_icons/updateLibraryIcon@2x.png b/images/menus_icons/updateLibraryIcon@2x.png new file mode 100644 index 00000000..edee9abe Binary files /dev/null and b/images/menus_icons/updateLibraryIcon@2x.png differ diff --git a/images/open.png b/images/open.png deleted file mode 100644 index c4b71a29..00000000 Binary files a/images/open.png and /dev/null differ diff --git a/images/removeLibraryIcon.png b/images/removeLibraryIcon.png deleted file mode 100644 index 1e34630c..00000000 Binary files a/images/removeLibraryIcon.png and /dev/null differ diff --git a/images/updateLibraryIcon.png b/images/updateLibraryIcon.png deleted file mode 100644 index ff68a204..00000000 Binary files a/images/updateLibraryIcon.png and /dev/null differ