Changeset 74505 in vbox for trunk

Timestamp:

Sep 27, 2018 3:39:39 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager: Fixing crash while selecting inaccessible VM after r125365.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UIToolPaneGlobal.cpp (modified) (3 diffs)
• UIToolPaneGlobal.h (modified) (1 diff)
• UIToolPaneMachine.cpp (modified) (3 diffs)
• UIToolPaneMachine.h (modified) (1 diff)
• UIWelcomePane.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneGlobal.cpp

@@ -105 +105 @@
                     m_pLayout->addWidget(m_pPaneDesktop);
                     m_pLayout->setCurrentWidget(m_pPaneDesktop);
+
+                    /* Retranslate Desktop pane: */
+                    retranslateDesktopPane();
                 }
                 break;
@@ -189 +192 @@
 void UIToolPaneGlobal::retranslateUi()
 {
-    if (m_pPaneDesktop)
-    {
-        /* Translate Global Tools welcome screen: */
-        m_pPaneDesktop->setToolsPaneIcon(UIIconPool::iconSet(":/tools_banner_global_200px.png"));
-        m_pPaneDesktop->setToolsPaneText(
-            tr("<h3>Welcome to VirtualBox!</h3>"
-               "<p>This window represents a set of global tools "
-               "which are currently opened (or can be opened). "
-               "They are not related to any particular machine but "
-               "to the complete VM collection. For a list of currently "
-               "available tools check the corresponding menu at the right "
-               "side of the main tool bar located at the top of the window. "
-               "This list will be extended with new tools in future releases.</p>"
-               "<p>You can press the <b>%1</b> key to get instant help, or visit "
-               "<a href=https://www.virtualbox.org>www.virtualbox.org</a> "
-               "for more information and latest news.</p>")
-               .arg(QKeySequence(QKeySequence::HelpContents).toString(QKeySequence::NativeText)));
-
-        /* Wipe out the tool descriptions: */
-        m_pPaneDesktop->removeToolDescriptions();
-
-        /* Add tool descriptions: */
-        QAction *pAction1 = m_pActionPool->action(UIActionIndexST_M_Tools_M_Global_S_VirtualMediaManager);
-        m_pPaneDesktop->addToolDescription(pAction1,
-                                           tr("Tool to observe virtual storage media. "
-                                              "Reflects all the chains of virtual disks you have registered "
-                                              "(per each storage type) within your virtual machines and allows for media "
-                                              "operations like copy, remove, release "
-                                              "(detach it from VMs where it is currently attached to) and observe their properties. "
-                                              "Allows to edit medium attributes like type, "
-                                              "location/name, description and size (for dynamical storages "
-                                              "only)."));
-        QAction *pAction2 = m_pActionPool->action(UIActionIndexST_M_Tools_M_Global_S_HostNetworkManager);
-        m_pPaneDesktop->addToolDescription(pAction2,
-                                           tr("Tool to control host-only network interfaces. "
-                                              "Reflects host-only networks, their DHCP servers and allows "
-                                              "for operations on the networks like possibility to create, remove "
-                                              "and observe their properties. Allows to edit various "
-                                              "attributes for host-only interface and corresponding DHCP server."));
-    }
+    retranslateDesktopPane();
 }
 
@@ -254 +218 @@
 }
 
+void UIToolPaneGlobal::retranslateDesktopPane()
+{
+    if (!m_pPaneDesktop)
+        return;
+
+    /* Translate Global Tools welcome screen: */
+    m_pPaneDesktop->setToolsPaneIcon(UIIconPool::iconSet(":/tools_banner_global_200px.png"));
+    m_pPaneDesktop->setToolsPaneText(
+        tr("<h3>Welcome to VirtualBox!</h3>"
+           "<p>This window represents a set of global tools "
+           "which are currently opened (or can be opened). "
+           "They are not related to any particular machine but "
+           "to the complete VM collection. For a list of currently "
+           "available tools check the corresponding menu at the right "
+           "side of the main tool bar located at the top of the window. "
+           "This list will be extended with new tools in future releases.</p>"
+           "<p>You can press the <b>%1</b> key to get instant help, or visit "
+           "<a href=https://www.virtualbox.org>www.virtualbox.org</a> "
+           "for more information and latest news.</p>")
+           .arg(QKeySequence(QKeySequence::HelpContents).toString(QKeySequence::NativeText)));
+
+    /* Wipe out the tool descriptions: */
+    m_pPaneDesktop->removeToolDescriptions();
+
+    /* Add tool descriptions: */
+    QAction *pAction1 = m_pActionPool->action(UIActionIndexST_M_Tools_M_Global_S_VirtualMediaManager);
+    m_pPaneDesktop->addToolDescription(pAction1,
+                                       tr("Tool to observe virtual storage media. "
+                                          "Reflects all the chains of virtual disks you have registered "
+                                          "(per each storage type) within your virtual machines and allows for media "
+                                          "operations like copy, remove, release "
+                                          "(detach it from VMs where it is currently attached to) and observe their properties. "
+                                          "Allows to edit medium attributes like type, "
+                                          "location/name, description and size (for dynamical storages "
+                                          "only)."));
+    QAction *pAction2 = m_pActionPool->action(UIActionIndexST_M_Tools_M_Global_S_HostNetworkManager);
+    m_pPaneDesktop->addToolDescription(pAction2,
+                                       tr("Tool to control host-only network interfaces. "
+                                          "Reflects host-only networks, their DHCP servers and allows "
+                                          "for operations on the networks like possibility to create, remove "
+                                          "and observe their properties. Allows to edit various "
+                                          "attributes for host-only interface and corresponding DHCP server."));
+}

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneGlobal.h

@@ -76 +76 @@
     void cleanup();
 
+    /** Handles translation for Desktop pane. */
+    void retranslateDesktopPane();
+
     /** Holds the action pool reference. */
     UIActionPool *m_pActionPool;

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp

@@ -109 +109 @@
                     m_pLayout->addWidget(m_pPaneDesktop);
                     m_pLayout->setCurrentWidget(m_pPaneDesktop);
+
+                    /* Retranslate Desktop pane: */
+                    retranslateDesktopPane();
                 }
                 break;
@@ -255 +258 @@
 void UIToolPaneMachine::retranslateUi()
 {
-    if (m_pPaneDesktop)
-    {
-        /* Translate Machine Tools welcome screen: */
-        if (!m_pItem || !m_pItem->accessible())
-        {
-            m_pPaneDesktop->setToolsPaneIcon(UIIconPool::iconSet(":/welcome_200px.png"));
-            m_pPaneDesktop->setToolsPaneText(
-                tr("<h3>Welcome to VirtualBox!</h3>"
-                   "<p>The left part of this window lists all virtual "
-                   "machines and virtual machine groups on your computer. "
-                   "The list is empty now because you haven't created any "
-                   "virtual machines yet.</p>"
-                   "<p>In order to create a new virtual machine, press the "
-                   "<b>New</b> button in the main tool bar located at the "
-                   "top of the window.</p>"
-                   "<p>You can press the <b>%1</b> key to get instant help, or visit "
-                   "<a href=https://www.virtualbox.org>www.virtualbox.org</a> "
-                   "for more information and latest news.</p>")
-                   .arg(QKeySequence(QKeySequence::HelpContents).toString(QKeySequence::NativeText)));
-        }
-        else
-        {
-            m_pPaneDesktop->setToolsPaneIcon(UIIconPool::iconSet(":/tools_banner_machine_200px.png"));
-            m_pPaneDesktop->setToolsPaneText(
-                tr("<h3>Welcome to VirtualBox!</h3>"
-                   "<p>The left part of this window lists all virtual "
-                   "machines and virtual machine groups on your computer.</p>"
-                   "<p>The right part of this window represents a set of "
-                   "tools which are currently opened (or can be opened) for "
-                   "the currently chosen machine. For a list of currently "
-                   "available tools check the corresponding menu at the right "
-                   "side of the main tool bar located at the top of the window. "
-                   "This list will be extended with new tools in future releases.</p>"
-                   "<p>You can press the <b>%1</b> key to get instant help, or visit "
-                   "<a href=https://www.virtualbox.org>www.virtualbox.org</a> "
-                   "for more information and latest news.</p>")
-                   .arg(QKeySequence(QKeySequence::HelpContents).toString(QKeySequence::NativeText)));
-        }
-
-        /* Wipe out the tool descriptions: */
-        m_pPaneDesktop->removeToolDescriptions();
-
-        /* Add tool descriptions: */
-        if (m_pItem && m_pItem->accessible())
-        {
-            QAction *pAction1 = m_pActionPool->action(UIActionIndexST_M_Tools_M_Machine_S_Details);
-            m_pPaneDesktop->addToolDescription(pAction1,
-                                               tr("Tool to observe virtual machine (VM) details. "
-                                                  "Reflects groups of properties for the currently chosen VM and allows "
-                                                  "basic operations on certain properties (like the machine storage devices)."));
-            QAction *pAction2 = m_pActionPool->action(UIActionIndexST_M_Tools_M_Machine_S_Snapshots);
-            m_pPaneDesktop->addToolDescription(pAction2,
-                                               tr("Tool to control virtual machine (VM) snapshots. "
-                                                  "Reflects snapshots created for the currently selected VM and allows "
-                                                  "snapshot operations like create, remove, "
-                                                  "restore (make current) and observe their properties. Allows to "
-                                                  "edit snapshot attributes like name and description."));
-            QAction *pAction3 = m_pActionPool->action(UIActionIndexST_M_Tools_M_Machine_S_LogViewer);
-            m_pPaneDesktop->addToolDescription(pAction3,
-                                               tr("Tool to display  virtual machine (VM) logs. "));
-        }
-    }
+    retranslateDesktopPane();
 }
 
@@ -341 +283 @@
     }
 }
+
+void UIToolPaneMachine::retranslateDesktopPane()
+{
+    /* Make sure pane exists: */
+    if (!m_pPaneDesktop)
+        return;
+
+    /* Translate Machine Tools welcome screen: */
+    if (!m_pItem || !m_pItem->accessible())
+    {
+        m_pPaneDesktop->setToolsPaneIcon(UIIconPool::iconSet(":/welcome_200px.png"));
+        m_pPaneDesktop->setToolsPaneText(
+            tr("<h3>Welcome to VirtualBox!</h3>"
+               "<p>The left part of this window lists all virtual "
+               "machines and virtual machine groups on your computer. "
+               "The list is empty now because you haven't created any "
+               "virtual machines yet.</p>"
+               "<p>In order to create a new virtual machine, press the "
+               "<b>New</b> button in the main tool bar located at the "
+               "top of the window.</p>"
+               "<p>You can press the <b>%1</b> key to get instant help, or visit "
+               "<a href=https://www.virtualbox.org>www.virtualbox.org</a> "
+               "for more information and latest news.</p>")
+               .arg(QKeySequence(QKeySequence::HelpContents).toString(QKeySequence::NativeText)));
+    }
+    else
+    {
+        m_pPaneDesktop->setToolsPaneIcon(UIIconPool::iconSet(":/tools_banner_machine_200px.png"));
+        m_pPaneDesktop->setToolsPaneText(
+            tr("<h3>Welcome to VirtualBox!</h3>"
+               "<p>The left part of this window lists all virtual "
+               "machines and virtual machine groups on your computer.</p>"
+               "<p>The right part of this window represents a set of "
+               "tools which are currently opened (or can be opened) for "
+               "the currently chosen machine. For a list of currently "
+               "available tools check the corresponding menu at the right "
+               "side of the main tool bar located at the top of the window. "
+               "This list will be extended with new tools in future releases.</p>"
+               "<p>You can press the <b>%1</b> key to get instant help, or visit "
+               "<a href=https://www.virtualbox.org>www.virtualbox.org</a> "
+               "for more information and latest news.</p>")
+               .arg(QKeySequence(QKeySequence::HelpContents).toString(QKeySequence::NativeText)));
+    }
+
+    /* Wipe out the tool descriptions: */
+    m_pPaneDesktop->removeToolDescriptions();
+
+    /* Add tool descriptions: */
+    if (m_pItem && m_pItem->accessible())
+    {
+        QAction *pAction1 = m_pActionPool->action(UIActionIndexST_M_Tools_M_Machine_S_Details);
+        m_pPaneDesktop->addToolDescription(pAction1,
+                                           tr("Tool to observe virtual machine (VM) details. "
+                                              "Reflects groups of properties for the currently chosen VM and allows "
+                                              "basic operations on certain properties (like the machine storage devices)."));
+        QAction *pAction2 = m_pActionPool->action(UIActionIndexST_M_Tools_M_Machine_S_Snapshots);
+        m_pPaneDesktop->addToolDescription(pAction2,
+                                           tr("Tool to control virtual machine (VM) snapshots. "
+                                              "Reflects snapshots created for the currently selected VM and allows "
+                                              "snapshot operations like create, remove, "
+                                              "restore (make current) and observe their properties. Allows to "
+                                              "edit snapshot attributes like name and description."));
+        QAction *pAction3 = m_pActionPool->action(UIActionIndexST_M_Tools_M_Machine_S_LogViewer);
+        m_pPaneDesktop->addToolDescription(pAction3,
+                                           tr("Tool to display  virtual machine (VM) logs. "));
+    }
+}

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.h

@@ -97 +97 @@
     void cleanup();
 
+    /** Handles translation for Desktop pane. */
+    void retranslateDesktopPane();
+
     /** Holds the action pool reference. */
     UIActionPool *m_pActionPool;

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIWelcomePane.cpp

@@ -796 +796 @@
     const QSize firstOne = aSizes.isEmpty() ? QSize(200, 200) : aSizes.first();
     const double dRatio = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize) / 32;
-    m_pLabelToolsPaneIcon->setPixmap(m_icon.pixmap(window()->windowHandle(), QSize(firstOne.width() * dRatio, firstOne.height() * dRatio)));
+    if (!m_icon.isNull())
+        m_pLabelToolsPaneIcon->setPixmap(m_icon.pixmap(window()->windowHandle(), QSize(firstOne.width() * dRatio, firstOne.height() * dRatio)));
 }