contextmenu: change menu icon

Change-Id: Ia4a8fe9c329cc382be65e8119b15627bc4cd13fe
Signed-off-by: jihye <jihye424.kim@samsung.com>

diff --git a/tizen/src/ui/menu/contextmenu.cpp b/tizen/src/ui/menu/contextmenu.cpp
index 0c0c348..e171e80 100644 (file)
--- a/tizen/src/ui/menu/contextmenu.cpp
+++ b/tizen/src/ui/menu/contextmenu.cpp
@@ -213,7 +213,7 @@ void ContextMenu::createInfoItem(QMenu *menu, MenuItem *item)
         menu, QIcon(QPixmap(":/icons/detailed_info.png")),
         menuName.isEmpty() ? vmName : menuName,
         item->getShortcuts().isEmpty()? NULL :
-            new QShortcut(item->getShortcuts().begin().value(), parent),
+        new QShortcut(item->getShortcuts().begin().value(), parent),
         SLOT(slotDetailedInfo()));
 
     actionDetailedInfo->setIconText(menuName.isEmpty() ? QString(DETAILED_INFO_TITLE) : menuName);
@@ -231,8 +231,12 @@ void ContextMenu::createOnTopItem(QMenu *menu, MenuItem *item)
     actionOnTop = menu->addAction(
         menuName.isEmpty() ? MENU_ONTOP_ITEM_TEXT : menuName);
 #ifdef CONFIG_DARWIN
-    actionOnTop->setIcon(QIcon(QPixmap(":/icons/alwaysontop.png")));
+        // add dummy icon
+        QPixmap pix = QPixmap(QSize(16, 16));
+        pix.fill(Qt::transparent);
+        actionOnTop->setIcon(QIcon(pix));
 #endif
+
     actionOnTop->setCheckable(true);
     QObject::connect(actionOnTop, SIGNAL(triggered(bool)), this, SLOT(slotOnTop(bool)));
 
@@ -253,17 +257,11 @@ 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")));
-    QObject::connect(actionMove, SIGNAL(triggered()), this, SLOT(slotMove()));
-
-    /* shortcut */
-    if (item->getShortcuts().isEmpty() == false) {
-        QShortcut *shortcut = new QShortcut(
-            item->getShortcuts().begin().value(), parent);
-        attachShortcut(actionMove, shortcut, SLOT(slotMove()));
-    }
+    actionMove = addGeneralAction(menu, QIcon(QPixmap(":/icons/move.png")),
+        menuName.isEmpty() ? MENU_MOVE_ITEM_TEXT : menuName,
+        item->getShortcuts().isEmpty() ? NULL
+        : new QShortcut(item->getShortcuts().begin().value(), parent),
+        SLOT(slotMove()));
 
     item->setAction(actionMove);
 }
@@ -403,9 +401,17 @@ void ContextMenu::createControllerItem(QMenu *menu, MenuItem *item)
 
     if (conFormList.isEmpty() == false) {
         QString menuName = item->getName();
-        controllerMenu = menu->addMenu(
-            menuName.isEmpty() ? MENU_CONTROLLER_ITEM_TEXT : menuName);
 
+#ifdef CONFIG_DARWIN
+        // add dummy icon
+        QPixmap pix = QPixmap(QSize(16, 16));
+        pix.fill(Qt::transparent);
+        controllerMenu = menu->addMenu(QIcon(pix),
+                    menuName.isEmpty() ? MENU_CONTROLLER_ITEM_TEXT : menuName);
+#else
+        controllerMenu = menu->addMenu(
+                    menuName.isEmpty() ? MENU_CONTROLLER_ITEM_TEXT : menuName);
+#endif
         controllerGroup = new QActionGroup(this);
         controllerMapper = new QSignalMapper(this);
         QObject::connect(controllerMapper, SIGNAL(mapped(int)), this, SLOT(slotController(int)));
@@ -460,7 +466,7 @@ void ContextMenu::createHostKeyboardItem(QMenu *menu, MenuItem *item)
     }
 
     QString menuName = item->getName();
-    QMenu *keyboardMenu = menu->addMenu(QIcon(QPixmap(":/icons/host_keyboard.png")),
+    QMenu *keyboardMenu = menu->addMenu(QIcon(),
         menuName.isEmpty() ? MENU_HOSTKBD_ITEM_TEXT : menuName);
     keyboardGroup = new QActionGroup(this);
 
@@ -556,7 +562,7 @@ void ContextMenu::createSystemResetItem(QMenu *menu, MenuItem *item)
 
     QString menuName = item->getName();
     actionSystemReset = addGeneralAction(
-        menu, QIcon(QPixmap(":/icons/system_reset.png")),
+        menu, QIcon(),
         menuName.isEmpty() ? MENU_FORCECLOSE_ITEM_TEXT : menuName,
         item->getShortcuts().isEmpty()? NULL :
             new QShortcut(item->getShortcuts().begin().value(), parent),
@@ -573,7 +579,7 @@ void ContextMenu::createForceCloseItem(QMenu *menu, MenuItem *item)
 
     QString menuName = item->getName();
     actionForceClose = addGeneralAction(
-        menu, QIcon(QPixmap(":/icons/force_close.png")),
+        menu, QIcon(),
         menuName.isEmpty() ? MENU_FORCECLOSE_ITEM_TEXT : menuName,
         item->getShortcuts().isEmpty()? NULL :
             new QShortcut(item->getShortcuts().begin().value(), parent),
@@ -603,7 +609,19 @@ QAction *ContextMenu::addGeneralAction(QMenu *menu,
     const QIcon &icon, const QString &text, QShortcut *shortcut, const char *slot)
 {
     QAction *action = menu->addAction(text);
+
+#ifdef CONFIG_DARWIN
+    // set dummy icon
+    if (icon.isNull()) {
+        QPixmap pix = QPixmap(QSize(16, 16));
+        pix.fill(Qt::transparent);
+        action->setIcon(QIcon(pix));
+    } else {
+        action->setIcon(icon);
+    }
+#else
     action->setIcon(icon);
+#endif
     QObject::connect(action, SIGNAL(triggered()), this, slot);
 
     attachShortcut(action, shortcut, slot);

diff --git a/tizen/src/ui/resource/icons/about.png b/tizen/src/ui/resource/icons/about.png
index 4f76588..40ce0c8 100644 (file)
Binary files a/tizen/src/ui/resource/icons/about.png and b/tizen/src/ui/resource/icons/about.png differ

diff --git a/tizen/src/ui/resource/icons/advanced.png b/tizen/src/ui/resource/icons/advanced.png
index 14cf9fa..7f974c4 100644 (file)
Binary files a/tizen/src/ui/resource/icons/advanced.png and b/tizen/src/ui/resource/icons/advanced.png differ

diff --git a/tizen/src/ui/resource/icons/alwaysontop.png b/tizen/src/ui/resource/icons/alwaysontop.png
deleted file mode 100644 (file)
index abbb29d..0000000
Binary files a/tizen/src/ui/resource/icons/alwaysontop.png and /dev/null differ

diff --git a/tizen/src/ui/resource/icons/close.png b/tizen/src/ui/resource/icons/close.png
index a1395ce..546ccec 100644 (file)
Binary files a/tizen/src/ui/resource/icons/close.png and b/tizen/src/ui/resource/icons/close.png differ

diff --git a/tizen/src/ui/resource/icons/control_panel.png b/tizen/src/ui/resource/icons/control_panel.png
index 3da7e80..0e1cffb 100644 (file)
Binary files a/tizen/src/ui/resource/icons/control_panel.png and b/tizen/src/ui/resource/icons/control_panel.png differ

diff --git a/tizen/src/ui/resource/icons/detailed_info.png b/tizen/src/ui/resource/icons/detailed_info.png
deleted file mode 100644 (file)
index 149ffa2..0000000
Binary files a/tizen/src/ui/resource/icons/detailed_info.png and /dev/null differ

diff --git a/tizen/src/ui/resource/icons/force_close.png b/tizen/src/ui/resource/icons/force_close.png
deleted file mode 100644 (file)
index a506b4d..0000000
Binary files a/tizen/src/ui/resource/icons/force_close.png and /dev/null differ

diff --git a/tizen/src/ui/resource/icons/host_keyboard.png b/tizen/src/ui/resource/icons/host_keyboard.png
deleted file mode 100644 (file)
index 69a87f3..0000000
Binary files a/tizen/src/ui/resource/icons/host_keyboard.png and /dev/null differ

diff --git a/tizen/src/ui/resource/icons/move.png b/tizen/src/ui/resource/icons/move.png
index 1697b28..fe4a1a5 100644 (file)
Binary files a/tizen/src/ui/resource/icons/move.png and b/tizen/src/ui/resource/icons/move.png differ

diff --git a/tizen/src/ui/resource/icons/rotate.png b/tizen/src/ui/resource/icons/rotate.png
index b2fc00f..2da316d 100644 (file)
Binary files a/tizen/src/ui/resource/icons/rotate.png and b/tizen/src/ui/resource/icons/rotate.png differ

diff --git a/tizen/src/ui/resource/icons/scale.png b/tizen/src/ui/resource/icons/scale.png
index 1f3f872..7a369cf 100644 (file)
Binary files a/tizen/src/ui/resource/icons/scale.png and b/tizen/src/ui/resource/icons/scale.png differ

diff --git a/tizen/src/ui/resource/icons/screen_shot.png b/tizen/src/ui/resource/icons/screen_shot.png
index 74c8515..282b665 100644 (file)
Binary files a/tizen/src/ui/resource/icons/screen_shot.png and b/tizen/src/ui/resource/icons/screen_shot.png differ

diff --git a/tizen/src/ui/resource/icons/shell.png b/tizen/src/ui/resource/icons/shell.png
index e89f1b1..2e25e4f 100644 (file)
Binary files a/tizen/src/ui/resource/icons/shell.png and b/tizen/src/ui/resource/icons/shell.png differ

diff --git a/tizen/src/ui/resource/icons/system_reset.png b/tizen/src/ui/resource/icons/system_reset.png
deleted file mode 100644 (file)
index bb4e7c2..0000000
Binary files a/tizen/src/ui/resource/icons/system_reset.png and /dev/null differ

diff --git a/tizen/src/ui/resource/resource.qrc b/tizen/src/ui/resource/resource.qrc
index 7dce589..2b964a3 100644 (file)
--- a/tizen/src/ui/resource/resource.qrc
+++ b/tizen/src/ui/resource/resource.qrc
@@ -38,18 +38,13 @@
         <file>icons/about.png</file>
         <file>icons/advanced.png</file>
         <file>icons/close.png</file>
-        <file>icons/system_reset.png</file>
-        <file>icons/force_close.png</file>
         <file>icons/rotate.png</file>
         <file>icons/scale.png</file>
         <file>icons/control_panel.png</file>
-        <file>icons/detailed_info.png</file>
         <file>icons/screen_shot.png</file>
-        <file>icons/host_keyboard.png</file>
         <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>