From: Jihye Won <jihye.won1@samsung.com>
Date: Mon, 2 Nov 2015 09:28:47 +0000 (+0900)
Subject: Qt: set new menu icons of Always On Top and Move
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~40^2~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d083f47442aabfd12e3c41f8f78e5d73afb1a14c;p=sdk%2Femulator%2Fqemu.git

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>
(cherry picked from commit f47701a21f06447096b09f9e05f7d43843a750ba)
---

diff --git a/tizen/src/ui/menu/contextmenu.cpp b/tizen/src/ui/menu/contextmenu.cpp
index 4c939fc666..de60814e3e 100644
--- a/tizen/src/ui/menu/contextmenu.cpp
+++ b/tizen/src/ui/menu/contextmenu.cpp
@@ -216,6 +216,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)));
 
@@ -238,6 +241,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
new file mode 100644
index 0000000000..abbb29df2a
Binary files /dev/null and b/tizen/src/ui/resource/icons/alwaysontop.png differ
diff --git a/tizen/src/ui/resource/icons/move.png b/tizen/src/ui/resource/icons/move.png
new file mode 100644
index 0000000000..1697b28233
Binary files /dev/null and b/tizen/src/ui/resource/icons/move.png differ
diff --git a/tizen/src/ui/resource/resource.qrc b/tizen/src/ui/resource/resource.qrc
index 1cf0b31789..7dce589438 100644
--- a/tizen/src/ui/resource/resource.qrc
+++ b/tizen/src/ui/resource/resource.qrc
@@ -49,5 +49,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>