diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp index e262d31b..e77ded8e 100644 --- a/YACReader/main_window_viewer.cpp +++ b/YACReader/main_window_viewer.cpp @@ -983,7 +983,7 @@ void MainWindowViewer::setUpShortcutsManagement() //actions holder QObject * orphanActions = new QObject; - editShortcutsDialog->addActionsGroup(tr("Comics"),QIcon(":/images/openInYACReader.png"), + editShortcutsDialog->addActionsGroup(tr("Comics"),QIcon(":/images/shortcuts_group_comics.png"), QList() << openAction << openFolderAction @@ -1000,7 +1000,7 @@ void MainWindowViewer::setUpShortcutsManagement() toggleToolbarsAction->setData(TOGGLE_TOOL_BARS_ACTION_Y); toggleToolbarsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(TOGGLE_TOOL_BARS_ACTION_Y)); - editShortcutsDialog->addActionsGroup(tr("General"),QIcon(), + editShortcutsDialog->addActionsGroup(tr("General"),QIcon(":/images/shortcuts_group_general.png"), QList() << optionsAction << helpAboutAction @@ -1030,7 +1030,7 @@ void MainWindowViewer::setUpShortcutsManagement() zoomOutMglassAction->setData(ZOOM_OUT_MGLASS_ACTION_Y); zoomOutMglassAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ZOOM_OUT_MGLASS_ACTION_Y)); - editShortcutsDialog->addActionsGroup(tr("Magnifiying glass"),QIcon(), + editShortcutsDialog->addActionsGroup(tr("Magnifiying glass"),QIcon(":/images/shortcuts_group_mglass.png"), QList() << showMagnifyingGlassAction << sizeUpMglassAction @@ -1043,7 +1043,7 @@ void MainWindowViewer::setUpShortcutsManagement() toggleFitToScreenAction->setData(CHANGE_FIT_ACTION_Y); toggleFitToScreenAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(CHANGE_FIT_ACTION_Y)); - editShortcutsDialog->addActionsGroup(tr("Page adjustement"),QIcon(), + editShortcutsDialog->addActionsGroup(tr("Page adjustement"),QIcon(":/images/shortcuts_group_page.png"), QList() << adjustHeightAction << adjustWidthAction @@ -1085,7 +1085,7 @@ void MainWindowViewer::setUpShortcutsManagement() goToLastPageAction->setData(GO_TO_LAST_PAGE_ACTION_Y); goToLastPageAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(GO_TO_LAST_PAGE_ACTION_Y)); - editShortcutsDialog->addActionsGroup(tr("Reading"),QIcon(), + editShortcutsDialog->addActionsGroup(tr("Reading"),QIcon(":/images/shortcuts_group_reading.png"), QList() << nextAction << prevAction diff --git a/YACReader/yacreader_images.qrc b/YACReader/yacreader_images.qrc index def5653a..ca8f9714 100644 --- a/YACReader/yacreader_images.qrc +++ b/YACReader/yacreader_images.qrc @@ -75,5 +75,13 @@ ../images/speaker.png ../images/clear_shortcut.png ../images/accept_shortcut.png + ../images/shortcuts_group_comics.png + ../images/shortcuts_group_folders.png + ../images/shortcuts_group_general.png + ../images/shortcuts_group_libraries.png + ../images/shortcuts_group_mglass.png + ../images/shortcuts_group_page.png + ../images/shortcuts_group_reading.png + ../images/shortcuts_group_visualization.png diff --git a/YACReaderLibrary/images.qrc b/YACReaderLibrary/images.qrc index d6551235..750630a2 100644 --- a/YACReaderLibrary/images.qrc +++ b/YACReaderLibrary/images.qrc @@ -77,7 +77,7 @@ ../images/social_dialog/shadow.png ../images/social_dialog/twitter.png ../images/social_dialog/separator.png--> - ../images/main_toolbar/divider.png + ../images/main_toolbar/divider.png ../images/collapsed_branch_osx.png ../images/expanded_branch_osx.png ../images/folder_macosx.png @@ -102,6 +102,14 @@ ../images/find_folder.png ../images/clear_shortcut.png ../images/accept_shortcut.png + ../images/shortcuts_group_comics.png + ../images/shortcuts_group_folders.png + ../images/shortcuts_group_general.png + ../images/shortcuts_group_libraries.png + ../images/shortcuts_group_mglass.png + ../images/shortcuts_group_page.png + ../images/shortcuts_group_reading.png + ../images/shortcuts_group_visualization.png diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index 65ccb6da..0d2e9a42 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -297,7 +297,8 @@ void LibraryWindow::doDialogs() void LibraryWindow::setUpShortcutsManagement() { - editShortcutsDialog->addActionsGroup("Comics",QIcon(":/images/openInYACReader.png"), + + editShortcutsDialog->addActionsGroup("Comics",QIcon(":/images/shortcuts_group_comics.png"), QList() << openComicAction << setAsReadAction @@ -310,7 +311,7 @@ void LibraryWindow::setUpShortcutsManagement() << deleteComicsAction << getInfoAction); - editShortcutsDialog->addActionsGroup("Folders",QIcon(), + editShortcutsDialog->addActionsGroup("Folders",QIcon(":/images/shortcuts_group_folders.png"), QList() << setRootIndexAction << expandAllNodesAction @@ -321,7 +322,7 @@ void LibraryWindow::setUpShortcutsManagement() << setFolderAsReadAction << setFolderAsUnreadAction); - editShortcutsDialog->addActionsGroup("General",QIcon(), + editShortcutsDialog->addActionsGroup("General",QIcon(":/images/shortcuts_group_general.png"), QList() << backAction << forwardAction @@ -330,7 +331,7 @@ void LibraryWindow::setUpShortcutsManagement() << serverConfigAction << showEditShortcutsAction); - editShortcutsDialog->addActionsGroup("Libraries",QIcon(), + editShortcutsDialog->addActionsGroup("Libraries",QIcon(":/images/shortcuts_group_libraries.png"), QList() << createLibraryAction << openLibraryAction @@ -342,7 +343,7 @@ void LibraryWindow::setUpShortcutsManagement() << renameLibraryAction << removeLibraryAction); - editShortcutsDialog->addActionsGroup("Visualization",QIcon(), + editShortcutsDialog->addActionsGroup("Visualization",QIcon(":/images/shortcuts_group_visualization.png"), QList() << showHideMarksAction << toggleFullScreenAction diff --git a/images/shortcuts_group_comics.png b/images/shortcuts_group_comics.png new file mode 100644 index 00000000..b0c44cd9 Binary files /dev/null and b/images/shortcuts_group_comics.png differ diff --git a/images/shortcuts_group_folders.png b/images/shortcuts_group_folders.png new file mode 100644 index 00000000..968e5a20 Binary files /dev/null and b/images/shortcuts_group_folders.png differ diff --git a/images/shortcuts_group_general.png b/images/shortcuts_group_general.png new file mode 100644 index 00000000..81c8317a Binary files /dev/null and b/images/shortcuts_group_general.png differ diff --git a/images/shortcuts_group_libraries.png b/images/shortcuts_group_libraries.png new file mode 100644 index 00000000..7c7f9b19 Binary files /dev/null and b/images/shortcuts_group_libraries.png differ diff --git a/images/shortcuts_group_mglass.png b/images/shortcuts_group_mglass.png new file mode 100644 index 00000000..4d1dde7a Binary files /dev/null and b/images/shortcuts_group_mglass.png differ diff --git a/images/shortcuts_group_page.png b/images/shortcuts_group_page.png new file mode 100644 index 00000000..a482cebb Binary files /dev/null and b/images/shortcuts_group_page.png differ diff --git a/images/shortcuts_group_reading.png b/images/shortcuts_group_reading.png new file mode 100644 index 00000000..fd520f18 Binary files /dev/null and b/images/shortcuts_group_reading.png differ diff --git a/images/shortcuts_group_visualization.png b/images/shortcuts_group_visualization.png new file mode 100644 index 00000000..927418a9 Binary files /dev/null and b/images/shortcuts_group_visualization.png differ