Changeset 13553 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 24, 2008 12:39:17 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3187: "VDM window doesn't have a WM task entry": fixed issue with missed 32pix icons for VDM, SID, LVD when using task-switch dialog (Alt-Tab) [defect #3187 / comment #8].

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• VirtualBox.qrc (modified) (2 diffs)
• images/description_16px.png (modified) ( previous)
• images/description_disabled_16px.png (modified) ( previous)
• images/diskimage_16px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox4/images/diskim_16px.png )
• images/edit_description_16px.png (modified) ( previous)
• images/edit_description_disabled_16px.png (modified) ( previous)
• src/VBoxConsoleWnd.cpp (modified) (1 diff)
• src/VBoxDiskImageManagerDlg.cpp (modified) (1 diff)
• src/VBoxSelectorWnd.cpp (modified) (2 diffs)
• src/VBoxVMInformationDlg.cpp (modified) (1 diff)
• src/VBoxVMLogViewer.cpp (modified) (1 diff)
• ui/VBoxDiskImageManagerDlg.ui (modified) (1 diff)
• ui/VBoxVMInformationDlg.ui (modified) (1 diff)
• ui/VBoxVMLogViewer.ui (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/VirtualBox.qrc

@@ -131 +131 @@
     <file alias="guesttools_16px.png">images/guesttools_16px.png</file>
     <file alias="guesttools_disabled_16px.png">images/guesttools_disabled_16px.png</file>
-    <file alias="diskim_16px.png">images/diskim_16px.png</file>
+    <file alias="diskimage_16px.png">images/diskimage_16px.png</file>
+    <file alias="diskimage_32px.png">images/diskimage_32px.png</file>
+    <file alias="diskimage_disabled_32px.png">images/diskimage_disabled_32px.png</file>
     <file alias="settings_16px.png">images/settings_16px.png</file>
     <file alias="delete_16px.png">images/delete_16px.png</file>
@@ -244 +246 @@
     <file alias="edit_description_16px.png">images/edit_description_16px.png</file>
     <file alias="edit_description_disabled_16px.png">images/edit_description_disabled_16px.png</file>
+    <file alias="session_info_16px.png">images/session_info_16px.png</file>
+    <file alias="session_info_disabled_16px.png">images/session_info_disabled_16px.png</file>
+    <file alias="session_info_32px.png">images/session_info_32px.png</file>
+    <file alias="session_info_disabled_32px.png">images/session_info_disabled_32px.png</file>
     <file alias="global_settings_16px.png">images/global_settings_16px.png</file>
     <file alias="global_settings_disabled_16px.png">images/global_settings_disabled_16px.png</file>

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp

@@ -231 +231 @@
     vmShowInformationDlgAction = new QAction (this);
     vmShowInformationDlgAction->setIcon (VBoxGlobal::iconSet (
-        ":/description_16px.png", ":/description_disabled_16px.png"));
+        ":/session_info_16px.png", ":/session_info_disabled_16px.png"));
 
     vmDisableMouseIntegrAction = new QAction (this);

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxDiskImageManagerDlg.cpp

@@ -231 +231 @@
     /* Apply UI decorations */
     Ui::VBoxDiskImageManagerDlg::setupUi (this);
+
+    /* Apply window icons */
+    setWindowIcon (vboxGlobal().iconSetFull (QSize (32, 32), QSize (16, 16),
+                                             ":/diskimage_32px.png", ":/diskimage_16px.png"));
 
     mVBox = vboxGlobal().virtualBox();

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxSelectorWnd.cpp

@@ -279 +279 @@
     mBtnEdit->setFocusPolicy (Qt::StrongFocus);
     mBtnEdit->setIcon (VBoxGlobal::iconSet (":/edit_description_16px.png",
-                                               ":/edit_description_disabled_16px.png"));
+                                            ":/edit_description_disabled_16px.png"));
     mBtnEdit->setToolButtonStyle (Qt::ToolButtonTextBesideIcon);
     connect (mBtnEdit, SIGNAL (clicked()), this, SLOT (goToSettings()));
@@ -403 +403 @@
 
     fileDiskMgrAction = new QAction (this);
-    fileDiskMgrAction->setIcon (VBoxGlobal::iconSet (":/diskim_16px.png"));
+    fileDiskMgrAction->setIcon (VBoxGlobal::iconSet (":/diskimage_16px.png"));
     fileSettingsAction = new QAction(this);
     fileSettingsAction->setMenuRole (QAction::PreferencesRole);

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMInformationDlg.cpp

@@ -73 +73 @@
      * which isn't necessary here. */
     setWindowIcon (QIcon());
+#else
+    /* Apply window icons */
+    setWindowIcon (vboxGlobal().iconSetFull (QSize (32, 32), QSize (16, 16),
+                                             ":/session_info_32px.png", ":/session_info_16px.png"));
 #endif
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMLogViewer.cpp

@@ -76 +76 @@
     /* Apply UI decorations */
     Ui::VBoxVMLogViewer::setupUi (this);
+
+    /* Apply window icons */
+    setWindowIcon (vboxGlobal().iconSetFull (QSize (32, 32), QSize (16, 16),
+                                             ":/vm_show_logs_32px.png", ":/show_logs_16px.png"));
 
     /* Enable size grip without using a status bar. */

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxDiskImageManagerDlg.ui

@@ -35 +35 @@
   <property name="windowTitle" >
    <string>Virtual Disk Manager</string>
-  </property>
-  <property name="windowIcon" >
-   <iconset resource="../VirtualBox.qrc" >:/diskim_16px.png</iconset>
   </property>
   <widget class="QWidget" name="mCentralWidget" >

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMInformationDlg.ui

@@ -29 +29 @@
   <property name="windowTitle" >
    <string>VBoxVMInformationDlg</string>
-  </property>
-  <property name="windowIcon" >
-   <iconset resource="../VirtualBox.qrc" >:/description_16px.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget" >

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMLogViewer.ui

@@ -29 +29 @@
   <property name="windowTitle" >
    <string>Log Viewer</string>
-  </property>
-  <property name="windowIcon" >
-   <iconset resource="../VirtualBox.qrc" >:/show_logs_16px.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget" >