diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp index a35b5246..67f545e5 100644 --- a/YACReader/main_window_viewer.cpp +++ b/YACReader/main_window_viewer.cpp @@ -1162,7 +1162,7 @@ void MainWindowViewer::setUpShortcutsManagement() QList allActions; QList tmpList; - editShortcutsDialog->addActionsGroup(tr("Comics"), QIcon(":/images/shortcuts_group_comics.svg"), + editShortcutsDialog->addActionsGroup(tr("Comics"), QIcon(":/images/shortcuts/shortcuts_group_comics.svg"), tmpList = { openAction, openLatestComicAction, openFolderAction, @@ -1178,7 +1178,7 @@ void MainWindowViewer::setUpShortcutsManagement() auto *const toggleToolbarsAction = addActionWithShortcut(tr("Hide/show toolbar"), TOGGLE_TOOL_BARS_ACTION_Y); connect(toggleToolbarsAction, &QAction::triggered, this, &MainWindowViewer::toggleToolBars); - editShortcutsDialog->addActionsGroup(tr("General"), QIcon(":/images/shortcuts_group_general.svg"), + editShortcutsDialog->addActionsGroup(tr("General"), QIcon(":/images/shortcuts/shortcuts_group_general.svg"), tmpList = QList() << optionsAction << helpAboutAction @@ -1216,7 +1216,7 @@ void MainWindowViewer::setUpShortcutsManagement() zoomInMglassAction, zoomOutMglassAction, resetMglassAction }; - editShortcutsDialog->addActionsGroup(tr("Magnifiying glass"), QIcon(":/images/shortcuts_group_mglass.svg"), + editShortcutsDialog->addActionsGroup(tr("Magnifiying glass"), QIcon(":/images/shortcuts/shortcuts_group_mglass.svg"), tmpList = QList() << showMagnifyingGlassAction << mglassActions); @@ -1227,7 +1227,7 @@ void MainWindowViewer::setUpShortcutsManagement() CHANGE_FIT_ACTION_Y); connect(toggleFitToScreenAction, &QAction::triggered, this, &MainWindowViewer::toggleWidthHeight); - editShortcutsDialog->addActionsGroup(tr("Page adjustement"), QIcon(":/images/shortcuts_group_page.svg"), + editShortcutsDialog->addActionsGroup(tr("Page adjustement"), QIcon(":/images/shortcuts/shortcuts_group_page.svg"), tmpList = QList() << adjustHeightAction << adjustWidthAction @@ -1304,7 +1304,7 @@ void MainWindowViewer::setUpShortcutsManagement() offsetDoublePageToTheLeft, offsetDoublePageToTheRight }; - editShortcutsDialog->addActionsGroup(tr("Reading"), QIcon(":/images/shortcuts_group_reading.svg"), + editShortcutsDialog->addActionsGroup(tr("Reading"), QIcon(":/images/shortcuts/shortcuts_group_reading.svg"), tmpList = QList() << goToPageOnTheRightAction << goToPageOnTheLeftAction diff --git a/YACReader/yacreader_images.qrc b/YACReader/yacreader_images.qrc index ac17f295..3a145e43 100644 --- a/YACReader/yacreader_images.qrc +++ b/YACReader/yacreader_images.qrc @@ -21,14 +21,14 @@ ../images/speaker.png ../images/clear_shortcut.svg ../images/accept_shortcut.svg - ../images/shortcuts_group_comics.svg - ../images/shortcuts_group_folders.svg - ../images/shortcuts_group_general.svg - ../images/shortcuts_group_libraries.svg - ../images/shortcuts_group_mglass.svg - ../images/shortcuts_group_page.svg - ../images/shortcuts_group_reading.svg - ../images/shortcuts_group_visualization.svg + ../images/shortcuts/shortcuts_group_comics.svg + ../images/shortcuts/shortcuts_group_folders.svg + ../images/shortcuts/shortcuts_group_general.svg + ../images/shortcuts/shortcuts_group_libraries.svg + ../images/shortcuts/shortcuts_group_mglass.svg + ../images/shortcuts/shortcuts_group_page.svg + ../images/shortcuts/shortcuts_group_reading.svg + ../images/shortcuts/shortcuts_group_visualization.svg ../images/custom_dialog/custom_close_button.svg ../images/whats_new/whatsnew_header.svg ../images/viewer_toolbar/bookmark.svg diff --git a/YACReaderLibrary/images.qrc b/YACReaderLibrary/images.qrc index ae8add4a..17516208 100644 --- a/YACReaderLibrary/images.qrc +++ b/YACReaderLibrary/images.qrc @@ -74,14 +74,14 @@ ../images/resetCover.svg ../images/searching_icon.png ../images/serverConfigBackground.png - ../images/shortcuts_group_comics.svg - ../images/shortcuts_group_folders.svg - ../images/shortcuts_group_general.svg - ../images/shortcuts_group_libraries.svg - ../images/shortcuts_group_mglass.svg - ../images/shortcuts_group_page.svg - ../images/shortcuts_group_reading.svg - ../images/shortcuts_group_visualization.svg + ../images/shortcuts/shortcuts_group_comics.svg + ../images/shortcuts/shortcuts_group_folders.svg + ../images/shortcuts/shortcuts_group_general.svg + ../images/shortcuts/shortcuts_group_libraries.svg + ../images/shortcuts/shortcuts_group_mglass.svg + ../images/shortcuts/shortcuts_group_page.svg + ../images/shortcuts/shortcuts_group_reading.svg + ../images/shortcuts/shortcuts_group_visualization.svg ../images/shownCovers.png ../images/sidebar/branch-closed.svg ../images/sidebar/branch-open.svg diff --git a/YACReaderLibrary/library_window_actions.cpp b/YACReaderLibrary/library_window_actions.cpp index ad49d1e7..011321e6 100644 --- a/YACReaderLibrary/library_window_actions.cpp +++ b/YACReaderLibrary/library_window_actions.cpp @@ -613,7 +613,7 @@ void LibraryWindowActions::setUpShortcutsManagement(EditShortcutsDialog *editSho QList allActions; QList tmpList; - editShortcutsDialog->addActionsGroup("Comics", QIcon(":/images/shortcuts_group_comics.svg"), + editShortcutsDialog->addActionsGroup("Comics", QIcon(":/images/shortcuts/shortcuts_group_comics.svg"), tmpList = QList() << openComicAction << saveCoversToAction @@ -632,7 +632,7 @@ void LibraryWindowActions::setUpShortcutsManagement(EditShortcutsDialog *editSho allActions << tmpList; - editShortcutsDialog->addActionsGroup("Folders", QIcon(":/images/shortcuts_group_folders.svg"), + editShortcutsDialog->addActionsGroup("Folders", QIcon(":/images/shortcuts/shortcuts_group_folders.svg"), tmpList = QList() << addFolderAction << deleteFolderAction @@ -652,7 +652,7 @@ void LibraryWindowActions::setUpShortcutsManagement(EditShortcutsDialog *editSho << deleteCustomFolderCoverAction); allActions << tmpList; - editShortcutsDialog->addActionsGroup("Lists", QIcon(":/images/shortcuts_group_folders.svg"), // TODO change icon + editShortcutsDialog->addActionsGroup("Lists", QIcon(":/images/shortcuts/shortcuts_group_folders.svg"), // TODO change icon tmpList = QList() << addReadingListAction << deleteReadingListAction @@ -660,7 +660,7 @@ void LibraryWindowActions::setUpShortcutsManagement(EditShortcutsDialog *editSho << renameListAction); allActions << tmpList; - editShortcutsDialog->addActionsGroup("General", QIcon(":/images/shortcuts_group_general.svg"), + editShortcutsDialog->addActionsGroup("General", QIcon(":/images/shortcuts/shortcuts_group_general.svg"), tmpList = QList() << backAction << forwardAction @@ -674,7 +674,7 @@ void LibraryWindowActions::setUpShortcutsManagement(EditShortcutsDialog *editSho allActions << tmpList; - editShortcutsDialog->addActionsGroup("Libraries", QIcon(":/images/shortcuts_group_libraries.svg"), + editShortcutsDialog->addActionsGroup("Libraries", QIcon(":/images/shortcuts/shortcuts_group_libraries.svg"), tmpList = QList() << createLibraryAction << openLibraryAction @@ -690,7 +690,7 @@ void LibraryWindowActions::setUpShortcutsManagement(EditShortcutsDialog *editSho allActions << tmpList; - editShortcutsDialog->addActionsGroup("Visualization", QIcon(":/images/shortcuts_group_visualization.svg"), + editShortcutsDialog->addActionsGroup("Visualization", QIcon(":/images/shortcuts/shortcuts_group_visualization.svg"), tmpList = QList() << showHideMarksAction << toogleShowRecentIndicatorAction diff --git a/images/shortcuts_group_comics.svg b/images/shortcuts/shortcuts_group_comics.svg similarity index 100% rename from images/shortcuts_group_comics.svg rename to images/shortcuts/shortcuts_group_comics.svg diff --git a/images/shortcuts_group_folders.svg b/images/shortcuts/shortcuts_group_folders.svg similarity index 100% rename from images/shortcuts_group_folders.svg rename to images/shortcuts/shortcuts_group_folders.svg diff --git a/images/shortcuts_group_general.svg b/images/shortcuts/shortcuts_group_general.svg similarity index 100% rename from images/shortcuts_group_general.svg rename to images/shortcuts/shortcuts_group_general.svg diff --git a/images/shortcuts_group_libraries.svg b/images/shortcuts/shortcuts_group_libraries.svg similarity index 100% rename from images/shortcuts_group_libraries.svg rename to images/shortcuts/shortcuts_group_libraries.svg diff --git a/images/shortcuts_group_mglass.svg b/images/shortcuts/shortcuts_group_mglass.svg similarity index 100% rename from images/shortcuts_group_mglass.svg rename to images/shortcuts/shortcuts_group_mglass.svg diff --git a/images/shortcuts_group_page.svg b/images/shortcuts/shortcuts_group_page.svg similarity index 100% rename from images/shortcuts_group_page.svg rename to images/shortcuts/shortcuts_group_page.svg diff --git a/images/shortcuts_group_reading.svg b/images/shortcuts/shortcuts_group_reading.svg similarity index 100% rename from images/shortcuts_group_reading.svg rename to images/shortcuts/shortcuts_group_reading.svg diff --git a/images/shortcuts_group_visualization.svg b/images/shortcuts/shortcuts_group_visualization.svg similarity index 100% rename from images/shortcuts_group_visualization.svg rename to images/shortcuts/shortcuts_group_visualization.svg