diff options
| author | Jihye Won <jihye.won1@samsung.com> | 2015-11-02 18:28:47 +0900 |
|---|---|---|
| committer | SeokYeon Hwang <syeon.hwang@samsung.com> | 2015-11-06 22:19:34 +0900 |
| commit | f47701a21f06447096b09f9e05f7d43843a750ba (patch) | |
| tree | 76bfdd137c4920921d0356e3476ed2ca80bed7a4 /tizen | |
| parent | f2d9f973e7b9794e111294e0f51528cd12599cdd (diff) | |
| download | qemu-f47701a21f06447096b09f9e05f7d43843a750ba.tar.gz qemu-f47701a21f06447096b09f9e05f7d43843a750ba.tar.bz2 qemu-f47701a21f06447096b09f9e05f7d43843a750ba.zip | |
Qt: set new menu icons of Always On Top and Move
As setting two icons of "Always On Top" and "Move" in emulator context menu,
the context menu will look nice.
Specifically, each indentation of the context menu becomes equal in MacOSX.
Also, new icons will help users recognize what does menu mean at a glance.
Change-Id: I0114f9f064f069c1553c0f59983cf8131a6133ad
Signed-off-by: Jihye Won <jihye.won1@samsung.com>
Diffstat (limited to 'tizen')
| -rw-r--r-- | tizen/src/ui/menu/contextmenu.cpp | 4 | ||||
| -rw-r--r-- | tizen/src/ui/resource/icons/alwaysontop.png | bin | 0 -> 3407 bytes | |||
| -rw-r--r-- | tizen/src/ui/resource/icons/move.png | bin | 0 -> 3074 bytes | |||
| -rw-r--r-- | tizen/src/ui/resource/resource.qrc | 2 |
4 files changed, 6 insertions, 0 deletions
diff --git a/tizen/src/ui/menu/contextmenu.cpp b/tizen/src/ui/menu/contextmenu.cpp index d24eac11f0..098e0a7e09 100644 --- a/tizen/src/ui/menu/contextmenu.cpp +++ b/tizen/src/ui/menu/contextmenu.cpp @@ -207,6 +207,9 @@ void ContextMenu::createOnTopItem(QMenu *menu, MenuItem *item) QString menuName = item->getName(); actionTopMost = menu->addAction( menuName.isEmpty() ? MENU_ONTOP_ITEM_TEXT : menuName); +#ifdef CONFIG_DARWIN + actionTopMost->setIcon(QIcon(QPixmap(":/icons/alwaysontop.png"))); +#endif actionTopMost->setCheckable(true); connect(actionTopMost, SIGNAL(triggered(bool)), this, SLOT(slotTopMost(bool))); @@ -231,6 +234,7 @@ void ContextMenu::createMoveItem(QMenu *menu, MenuItem *item) QString menuName = item->getName(); actionMove = menu->addAction( menuName.isEmpty() ? MENU_MOVE_ITEM_TEXT : menuName); + actionMove->setIcon(QIcon(QPixmap(":/icons/move.png"))); connect(actionMove, SIGNAL(triggered()), this, SLOT(slotMove())); /* shortcut */ diff --git a/tizen/src/ui/resource/icons/alwaysontop.png b/tizen/src/ui/resource/icons/alwaysontop.png Binary files differnew file mode 100644 index 0000000000..abbb29df2a --- /dev/null +++ b/tizen/src/ui/resource/icons/alwaysontop.png diff --git a/tizen/src/ui/resource/icons/move.png b/tizen/src/ui/resource/icons/move.png Binary files differnew file mode 100644 index 0000000000..1697b28233 --- /dev/null +++ b/tizen/src/ui/resource/icons/move.png diff --git a/tizen/src/ui/resource/resource.qrc b/tizen/src/ui/resource/resource.qrc index ae4cf03bce..5f009d3405 100644 --- a/tizen/src/ui/resource/resource.qrc +++ b/tizen/src/ui/resource/resource.qrc @@ -48,5 +48,7 @@ <file>icons/save_screenshot_dialog.png</file> <file>icons/copy_screenshot_dialog.png</file> <file>icons/refresh_screenshot_dialog.png</file> + <file>icons/alwaysontop.png</file> + <file>icons/move.png</file> </qresource> </RCC> |
