From 2712ef89b2de12fe31dd8a803e34901a77981c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sat, 19 Jul 2014 16:29:19 +0200 Subject: [PATCH] added icons to actions groups (shortcuts) --- YACReader/main_window_viewer.cpp | 10 +++++----- YACReader/yacreader_images.qrc | 8 ++++++++ YACReaderLibrary/images.qrc | 10 +++++++++- YACReaderLibrary/library_window.cpp | 11 ++++++----- images/shortcuts_group_comics.png | Bin 0 -> 276 bytes images/shortcuts_group_folders.png | Bin 0 -> 157 bytes images/shortcuts_group_general.png | Bin 0 -> 319 bytes images/shortcuts_group_libraries.png | Bin 0 -> 164 bytes images/shortcuts_group_mglass.png | Bin 0 -> 351 bytes images/shortcuts_group_page.png | Bin 0 -> 162 bytes images/shortcuts_group_reading.png | Bin 0 -> 179 bytes images/shortcuts_group_visualization.png | Bin 0 -> 320 bytes 12 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 images/shortcuts_group_comics.png create mode 100644 images/shortcuts_group_folders.png create mode 100644 images/shortcuts_group_general.png create mode 100644 images/shortcuts_group_libraries.png create mode 100644 images/shortcuts_group_mglass.png create mode 100644 images/shortcuts_group_page.png create mode 100644 images/shortcuts_group_reading.png create mode 100644 images/shortcuts_group_visualization.png 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 0000000000000000000000000000000000000000..b0c44cd98576820f55508a866011c4043384db2e GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^{2@)Z;PBq3c)UjmAa;4;HBn4T7r-89mOXEAUzvIp^Lv=U^p}z$EmO=LsXbn$q8n z%W14ertu7!{~S7>F{fnBqaJ_fHRHmmzh@_6V=e< z@fIp|@Ujq3*rvET`Oq@SS!MDLI~DX<7iAw=DarL}VdF}U(;P006E-)_NO;7^VZiXG W(cJ%`KX(|=2MnIBelF{r5}E+Dv0@AW literal 0 HcmV?d00001 diff --git a/images/shortcuts_group_folders.png b/images/shortcuts_group_folders.png new file mode 100644 index 0000000000000000000000000000000000000000..968e5a20d07765c0d6ea94fc0c491f82e3aa6a84 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^{2^)r^Ln>}1B}ix-;83!$wf(=?JLmqsxf65FwlEmBJ>EW3 zCOWa9Q)ss1EdB{AzcU;)lUE6Te^Bw&^G0R{MmC0=ZoWM0i}l_>qZmA0{an^LB{Ts5 Dm98>U literal 0 HcmV?d00001 diff --git a/images/shortcuts_group_general.png b/images/shortcuts_group_general.png new file mode 100644 index 0000000000000000000000000000000000000000..81c8317a07480d5b651c0795b06e0b5c49bca34a GIT binary patch literal 319 zcmV-F0l@x=P)StlgkTj<7+q0gR9l>PXL$>o}KMvP_Jhe=qT_A@e-H$#kT7+qQ=l;}u{elSl{B zUHqDaKT)#$118{;%-U!q!*)nAl>|XlYylb6;d_9(07q(6J498Mi{lx*sDKw~q}Ix; z5$CE4kF74MV&tV@tP*^R){7iLIh@=k3(nPO!I*VKC8sKn6&Q2fm47EdFMzu-)^rma zlv1cT3CI^ivyf%mLxW$--&;H<(S^nBrDMHX$_h?P_KyHZB((4LKdD=s002ovPDHLkV1lZ?gg5{I literal 0 HcmV?d00001 diff --git a/images/shortcuts_group_libraries.png b/images/shortcuts_group_libraries.png new file mode 100644 index 0000000000000000000000000000000000000000..7c7f9b197c9502858cb43c32c238142fec67a6b3 GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^{2}1B`jbtXyWkqKmUJ8)}4K|*2==FX2DBlHYV9m zew9C=UbD=M+ivniMziUG_tTR8+82EEF+I!QapiM^mL`wF0S3#*{9Bhv-DLrq$l&Sf K=d#Wzp$PyRxi$0v literal 0 HcmV?d00001 diff --git a/images/shortcuts_group_mglass.png b/images/shortcuts_group_mglass.png new file mode 100644 index 0000000000000000000000000000000000000000..4d1dde7af6b24edca99c84d8ed359037f72a497f GIT binary patch literal 351 zcmV-l0igbgP)dg2b2h;!zYm=v6@7p zU@k4VWR+kyRw%|^S5zapqSUw?j-k|-MuLLZ*cOMX*H6~a`?mORa}`_oMSiSRx?BLU zj8h#o#u8qSwz%NaEkE8i_iq1uW0q9%RpgI>=y3A``ol~3%cZQDx_1bZBB xz?39cDi9?bV5SD!JHP%ODBQsNWP}v{M83h0U002ovPDHLkV1n)zjd=h7 literal 0 HcmV?d00001 diff --git a/images/shortcuts_group_page.png b/images/shortcuts_group_page.png new file mode 100644 index 0000000000000000000000000000000000000000..a482cebbe2339e4c669cad19908bb42ad2cc01bc GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^{2}1B`jbtP%5^uwf(?>c~*q6fq|J}(oMmyftI)XfaWoHy85}S Ib4q9e05~f$rvLx| literal 0 HcmV?d00001 diff --git a/images/shortcuts_group_reading.png b/images/shortcuts_group_reading.png new file mode 100644 index 0000000000000000000000000000000000000000..fd520f183455508a70b05574f69c2f345a2da88a GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^{2}1B`jbtP%5^uwf(k7RCwCNQp*j3KoDiAzz(DY=m3tK z)C$xJ)Doz`SOHi8dg6#3KnG|Cl;C@0HkpjXE0etJ@^;>Q34*1}St8H#GmbqFEBXyQ zfTC%d@kb01oogWalZ?U(0#y76m9SMpIu$?$93?Yt1(fhVOqp>ZG020r1kroErMUOP zwWgJfnXg7ziLe#HApFg=P*S`#(L&R$>#`EoL_&h#_&tTw^y zof&B2)T12;Ge3npsku;?F}O3)Yt`$VvG1L)YVHr?4mW0ybiT_b#$a*#3NQfev`7kg S=w>|t0000