Changeset 30204 in vbox

Timestamp:

Jun 15, 2010 3:26:28 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

62684

Message:

FE/Qt4: add default cancel icon

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIIconPool.cpp (modified) (1 diff)
• globals/UIIconPool.h (modified) (1 diff)
• widgets/VBoxSpecialControls.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp

@@ -156 +156 @@
             break;
         }
+        case DialogCancelIcon:
+        {
+            icon = pStyle->standardIcon(QStyle::SP_DialogCancelButton, 0, pWidget);
+            if (icon.isNull())
+                icon = iconSet(":/delete_16px.png",
+                               ":/delete_dis_16px.png");
+            break;
+        }
         case ArrowBackIcon:
         {

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.h

@@ -34 +34 @@
         MessageBoxWarningIcon,
         MessageBoxCriticalIcon,
+        DialogCancelIcon,
         ArrowBackIcon,
         ArrowForwardIcon

trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxSpecialControls.cpp

@@ -119 +119 @@
     setFocusPolicy (Qt::TabFocus);
     setShortcut (QKeySequence (Qt::Key_Escape));
-    QIcon cancelIcon = style()->standardIcon (QStyle::SP_DialogCancelButton);
-    if (cancelIcon.isNull())
-        cancelIcon = UIIconPool::iconSet(":/delete_16px.png",
-                                         ":/delete_dis_16px.png");
-    setIcon (cancelIcon);
+    setIcon(UIIconPool::defaultIcon(UIIconPool::DialogCancelIcon));
 }