diff --git a/YACReaderLibrary/images.qrc b/YACReaderLibrary/images.qrc index fec010ca..a9e66602 100644 --- a/YACReaderLibrary/images.qrc +++ b/YACReaderLibrary/images.qrc @@ -50,22 +50,15 @@ ../images/importLibrary.png ../images/importTopCoversDecoration.png ../images/main_toolbar/divider.svg - ../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/menus_icons/editIcon.svg + ../images/menus_icons/exportComicsInfoIcon.svg + ../images/menus_icons/exportLibraryIcon.svg + ../images/menus_icons/importComicsInfoIcon.svg + ../images/menus_icons/importLibraryIcon.svg + ../images/menus_icons/removeLibraryIcon.svg + ../images/menus_icons/updateLibraryIcon.svg + ../images/menus_icons/open_containing_folder.svg + ../images/menus_icons/update_current_folder.svg ../images/new.png ../images/nextCoverPage.png ../images/noLibrariesIcon.png diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index c1dae294..209acbef 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -496,43 +496,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/menus_icons/exportComicsInfoIcon.png")); + exportComicsInfoAction->setIcon(QIcon(":/images/menus_icons/exportComicsInfoIcon.svg")); 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/menus_icons/importComicsInfoIcon.png")); + importComicsInfoAction->setIcon(QIcon(":/images/menus_icons/importComicsInfoIcon.svg")); 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/menus_icons/exportLibraryIcon.png")); + exportLibraryAction->setIcon(QIcon(":/images/menus_icons/exportLibraryIcon.svg")); 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/menus_icons/importLibraryIcon.png")); + importLibraryAction->setIcon(QIcon(":/images/menus_icons/importLibraryIcon.svg")); 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/menus_icons/updateLibraryIcon.png")); + updateLibraryAction->setIcon(QIcon(":/images/menus_icons/updateLibraryIcon.svg")); 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/menus_icons/editIcon.png")); + renameLibraryAction->setIcon(QIcon(":/images/menus_icons/editIcon.svg")); 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/menus_icons/removeLibraryIcon.png")); + removeLibraryAction->setIcon(QIcon(":/images/menus_icons/removeLibraryIcon.svg")); 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.")); @@ -674,7 +674,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/menus_icons/open.png")); + openContainingFolderAction->setIcon(QIcon(":/images/menus_icons/open_containing_folder.svg")); setFolderAsNotCompletedAction = new QAction(this); setFolderAsNotCompletedAction->setText(tr("Set as uncompleted")); @@ -712,7 +712,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/menus_icons/open.png")); + openContainingFolderComicAction->setIcon(QIcon(":/images/menus_icons/open_containing_folder.svg")); resetComicRatingAction = new QAction(this); resetComicRatingAction->setText(tr("Reset comic rating")); @@ -782,12 +782,12 @@ void LibraryWindow::createActions() addAction(quitAction); 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->setData(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->setData(ADD_READING_LIST_ACTION_YL); @@ -1785,10 +1785,10 @@ void LibraryWindow::showGridFoldersContextMenu(QPoint point, Folder folder) auto openContainingFolderAction = new QAction(); 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); - updateFolderAction->setIcon(QIcon(":/images/menus_icons/updateLibraryIcon.png")); + updateFolderAction->setIcon(QIcon(":/images/menus_icons/update_current_folder.svg")); auto setFolderAsNotCompletedAction = new QAction(); setFolderAsNotCompletedAction->setText(tr("Set as uncompleted")); diff --git a/images/menus_icons/editIcon.png b/images/menus_icons/editIcon.png deleted file mode 100644 index 3caf15db..00000000 Binary files a/images/menus_icons/editIcon.png and /dev/null differ diff --git a/images/menus_icons/editIcon.svg b/images/menus_icons/editIcon.svg new file mode 100644 index 00000000..c998c66b Binary files /dev/null and b/images/menus_icons/editIcon.svg differ diff --git a/images/menus_icons/editIcon@2x.png b/images/menus_icons/editIcon@2x.png deleted file mode 100644 index 7be4e0ef..00000000 Binary files a/images/menus_icons/editIcon@2x.png and /dev/null differ diff --git a/images/menus_icons/exportComicsInfoIcon.png b/images/menus_icons/exportComicsInfoIcon.png deleted file mode 100644 index 3857068d..00000000 Binary files a/images/menus_icons/exportComicsInfoIcon.png and /dev/null differ diff --git a/images/menus_icons/exportComicsInfoIcon.svg b/images/menus_icons/exportComicsInfoIcon.svg new file mode 100644 index 00000000..2f2d32a6 Binary files /dev/null and b/images/menus_icons/exportComicsInfoIcon.svg differ diff --git a/images/menus_icons/exportComicsInfoIcon@2x.png b/images/menus_icons/exportComicsInfoIcon@2x.png deleted file mode 100644 index ad192d32..00000000 Binary files a/images/menus_icons/exportComicsInfoIcon@2x.png and /dev/null differ diff --git a/images/menus_icons/exportLibraryIcon.png b/images/menus_icons/exportLibraryIcon.png deleted file mode 100644 index bd45fc2a..00000000 Binary files a/images/menus_icons/exportLibraryIcon.png and /dev/null differ diff --git a/images/menus_icons/exportLibraryIcon.svg b/images/menus_icons/exportLibraryIcon.svg new file mode 100644 index 00000000..e36a771c Binary files /dev/null and b/images/menus_icons/exportLibraryIcon.svg differ diff --git a/images/menus_icons/exportLibraryIcon@2x.png b/images/menus_icons/exportLibraryIcon@2x.png deleted file mode 100644 index 837f3015..00000000 Binary files a/images/menus_icons/exportLibraryIcon@2x.png and /dev/null differ diff --git a/images/menus_icons/importComicsInfoIcon.png b/images/menus_icons/importComicsInfoIcon.png deleted file mode 100644 index 5745fbf2..00000000 Binary files a/images/menus_icons/importComicsInfoIcon.png and /dev/null differ diff --git a/images/menus_icons/importComicsInfoIcon.svg b/images/menus_icons/importComicsInfoIcon.svg new file mode 100644 index 00000000..bb700588 Binary files /dev/null and b/images/menus_icons/importComicsInfoIcon.svg differ diff --git a/images/menus_icons/importComicsInfoIcon@2x.png b/images/menus_icons/importComicsInfoIcon@2x.png deleted file mode 100644 index 50c80c12..00000000 Binary files a/images/menus_icons/importComicsInfoIcon@2x.png and /dev/null differ diff --git a/images/menus_icons/importLibraryIcon.png b/images/menus_icons/importLibraryIcon.png deleted file mode 100644 index f5405865..00000000 Binary files a/images/menus_icons/importLibraryIcon.png and /dev/null differ diff --git a/images/menus_icons/importLibraryIcon.svg b/images/menus_icons/importLibraryIcon.svg new file mode 100644 index 00000000..752ba386 Binary files /dev/null and b/images/menus_icons/importLibraryIcon.svg differ diff --git a/images/menus_icons/importLibraryIcon@2x.png b/images/menus_icons/importLibraryIcon@2x.png deleted file mode 100644 index dec6383a..00000000 Binary files a/images/menus_icons/importLibraryIcon@2x.png and /dev/null differ diff --git a/images/menus_icons/open.png b/images/menus_icons/open.png deleted file mode 100644 index 048f55f3..00000000 Binary files a/images/menus_icons/open.png and /dev/null differ diff --git a/images/menus_icons/open@2x.png b/images/menus_icons/open@2x.png deleted file mode 100644 index d72e19b1..00000000 Binary files a/images/menus_icons/open@2x.png and /dev/null differ diff --git a/images/menus_icons/open_containing_folder.svg b/images/menus_icons/open_containing_folder.svg new file mode 100644 index 00000000..3080991e Binary files /dev/null and b/images/menus_icons/open_containing_folder.svg differ diff --git a/images/menus_icons/removeLibraryIcon.png b/images/menus_icons/removeLibraryIcon.png deleted file mode 100644 index 83f894d7..00000000 Binary files a/images/menus_icons/removeLibraryIcon.png and /dev/null differ diff --git a/images/menus_icons/removeLibraryIcon.svg b/images/menus_icons/removeLibraryIcon.svg new file mode 100644 index 00000000..92821c74 Binary files /dev/null and b/images/menus_icons/removeLibraryIcon.svg differ diff --git a/images/menus_icons/removeLibraryIcon@2x.png b/images/menus_icons/removeLibraryIcon@2x.png deleted file mode 100644 index 23a4c6b6..00000000 Binary files a/images/menus_icons/removeLibraryIcon@2x.png and /dev/null differ diff --git a/images/menus_icons/updateLibraryIcon.png b/images/menus_icons/updateLibraryIcon.png deleted file mode 100644 index 87fd0333..00000000 Binary files a/images/menus_icons/updateLibraryIcon.png and /dev/null differ diff --git a/images/menus_icons/updateLibraryIcon.svg b/images/menus_icons/updateLibraryIcon.svg new file mode 100644 index 00000000..016c9622 Binary files /dev/null and b/images/menus_icons/updateLibraryIcon.svg differ diff --git a/images/menus_icons/updateLibraryIcon@2x.png b/images/menus_icons/updateLibraryIcon@2x.png deleted file mode 100644 index edee9abe..00000000 Binary files a/images/menus_icons/updateLibraryIcon@2x.png and /dev/null differ diff --git a/images/menus_icons/update_current_folder.svg b/images/menus_icons/update_current_folder.svg new file mode 100644 index 00000000..016c9622 Binary files /dev/null and b/images/menus_icons/update_current_folder.svg differ