Changeset 68285 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 3, 2017 12:42:45 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8900: Selector UI: Update welcome screen (desktop-pane) for the case when no machine exists.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox2.qrc (modified) (1 diff)
• VirtualBox2_hidpi.qrc (modified) (1 diff)
• images/hidpi/welcome_200px_hidpi.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/welcome.png )
• images/welcome_200px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/welcome.png )
• src/selector/UISelectorWindow.cpp (modified) (2 diffs)
• src/selector/UIToolsPaneGlobal.cpp (modified) (1 diff)
• src/selector/UIToolsPaneGlobal.h (modified) (1 diff)
• src/selector/UIToolsPaneMachine.cpp (modified) (6 diffs)
• src/selector/UIToolsPaneMachine.h (modified) (2 diffs)

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

@@ -300 +300 @@
         <file alias="web_camera_unavailable_16px.png">images/web_camera_unavailable_16px.png</file>
         <file alias="web_camera_unavailable_disabled_16px.png">images/web_camera_unavailable_disabled_16px.png</file>
-        <file alias="welcome.png">images/welcome.png</file>
+        <file alias="welcome_200px.png">images/welcome_200px.png</file>
     </qresource>
 </RCC>

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

@@ -294 +294 @@
         <file alias="web_camera_unavailable_16px_hidpi.png">images/hidpi/web_camera_unavailable_16px_hidpi.png</file>
         <file alias="web_camera_unavailable_disabled_16px_hidpi.png">images/hidpi/web_camera_unavailable_disabled_16px_hidpi.png</file>
+        <file alias="welcome_200px_hidpi.png">images/hidpi/welcome_200px_hidpi.png</file>
     </qresource>
 </RCC>

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -272 +272 @@
     updateActionsAppearance();
 
+    /* Update Tools-pane: */
+    m_pPaneToolsMachine->setCurrentItem(pItem);
+
     /* If current item exists & accessible: */
     if (pItem && pItem->accessible())
@@ -306 +309 @@
             /* The VM is inaccessible: */
             m_pPaneToolsMachine->setDetailsError(UIMessageCenter::formatErrorInfo(pItem->accessError()));
-        }
-        else
-        {
-            /* Default HTML support in Qt is terrible so just try to get something really simple: */
-            m_pPaneToolsMachine->setDetailsText(
-                tr("<h3>Welcome to VirtualBox!</h3>"
-                   "<p>The left part of this window is  "
-                   "a list of all virtual machines on your computer. "
-                   "The list is empty now because you haven't created any virtual "
-                   "machines yet."
-                   "<img src=:/welcome.png align=right/></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 the latest information and news.</p>")
-                   .arg(QKeySequence(QKeySequence::HelpContents).toString(QKeySequence::NativeText)));
         }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneGlobal.cpp

@@ -165 +165 @@
         delete pWidget;
     }
-}
-
-void UIToolsPaneGlobal::setDetailsText(const QString &strText)
-{
-    /* Update desktop pane: */
-    AssertPtrReturnVoid(m_pPaneDesktop);
-    m_pPaneDesktop->setToolsPaneText(strText);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneGlobal.h

@@ -71 +71 @@
     void closeTool(ToolTypeGlobal enmType);
 
-    /** Defines @a strText and switches to text details pane. */
-    void setDetailsText(const QString &strText);
     /** Defines @a strError and switches to error details pane. */
     void setDetailsError(const QString &strError);

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneMachine.cpp

@@ -31 +31 @@
 # include "UISnapshotPane.h"
 # include "UIToolsPaneMachine.h"
+# include "UIVMItem.h"
 
 /* Other VBox includes: */
@@ -41 +42 @@
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_pActionPool(pActionPool)
+    , m_pItem(0)
     , m_pLayout(0)
     , m_pPaneDesktop(0)
@@ -171 +173 @@
 }
 
-void UIToolsPaneMachine::setDetailsText(const QString &strText)
-{
-    /* Update desktop pane: */
-    AssertPtrReturnVoid(m_pPaneDesktop);
-    m_pPaneDesktop->setToolsPaneText(strText);
-}
-
 void UIToolsPaneMachine::setDetailsError(const QString &strError)
 {
@@ -185 +180 @@
 }
 
+void UIToolsPaneMachine::setCurrentItem(UIVMItem *pItem)
+{
+    /* Do we need translation after that? */
+    const bool fTranslationRequired =  !pItem && m_pItem
+                                    || pItem && !m_pItem;
+
+    /* Remember new item: */
+    m_pItem = pItem;
+
+    /* Retranslate if necessary: */
+    if (fTranslationRequired)
+        retranslateUi();
+}
+
 void UIToolsPaneMachine::setItems(const QList<UIVMItem*> &items)
 {
@@ -202 +211 @@
 {
     /* Translate Machine Tools welcome screen: */
-    m_pPaneDesktop->setToolsPaneIcon(UIIconPool::iconSet(":/tools_200px.png"));
-    m_pPaneDesktop->setToolsPaneText(
-        tr("<h3>Welcome to VirtualBox!</h3>"
-           "<p>The left part of this window is a list of 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 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 the 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 the latest information and news.</p>")
-           .arg(QKeySequence(QKeySequence::HelpContents).toString(QKeySequence::NativeText)));
+    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 is a list of 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 the latest information and news.</p>")
+               .arg(QKeySequence(QKeySequence::HelpContents).toString(QKeySequence::NativeText)));
+    }
+    else
+    {
+        m_pPaneDesktop->setToolsPaneIcon(UIIconPool::iconSet(":/tools_200px.png"));
+        m_pPaneDesktop->setToolsPaneText(
+            tr("<h3>Welcome to VirtualBox!</h3>"
+               "<p>The left part of this window is a list of 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 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 the 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 the latest information and news.</p>")
+               .arg(QKeySequence(QKeySequence::HelpContents).toString(QKeySequence::NativeText)));
+    }
 
     /* Wipe out the tool descriptions: */
@@ -222 +251 @@
 
     /* Add tool descriptions: */
-    QAction *pAction1 = m_pActionPool->action(UIActionIndexST_M_Tools_M_Machine_Details);
-    m_pPaneDesktop->addToolDescription(pAction1,
-                                       tr("Tool to observe virtual machine (VM) details. "
-                                          "Reflects groups of <u>properties</u> for the currently chosen VM and allows "
-                                          "for basic manipulations on few of them (like the machine storage devices)."));
-    QAction *pAction2 = m_pActionPool->action(UIActionIndexST_M_Tools_M_Machine_Snapshots);
-    m_pPaneDesktop->addToolDescription(pAction2,
-                                       tr("Tool to control virtual machine (VM) snapshots. "
-                                          "Reflects <u>snapshots</u> created for the currently chosen VM and allows "
-                                          "for snapshot manipulations like possibility to <u>create</u>, <u>remove</u>, "
-                                          "<u>restore</u> (make current) and observe their properties. Allows to "
-                                          "<u>edit</u> snapshot attributes like <u>name</u> and <u>description</u>."));
+    if (m_pItem && m_pItem->accessible())
+    {
+        QAction *pAction1 = m_pActionPool->action(UIActionIndexST_M_Tools_M_Machine_Details);
+        m_pPaneDesktop->addToolDescription(pAction1,
+                                           tr("Tool to observe virtual machine (VM) details. "
+                                              "Reflects groups of <u>properties</u> for the currently chosen VM and allows "
+                                              "for basic manipulations on few of them (like the machine storage devices)."));
+        QAction *pAction2 = m_pActionPool->action(UIActionIndexST_M_Tools_M_Machine_Snapshots);
+        m_pPaneDesktop->addToolDescription(pAction2,
+                                           tr("Tool to control virtual machine (VM) snapshots. "
+                                              "Reflects <u>snapshots</u> created for the currently chosen VM and allows "
+                                              "for snapshot manipulations like possibility to <u>create</u>, <u>remove</u>, "
+                                              "<u>restore</u> (make current) and observe their properties. Allows to "
+                                              "<u>edit</u> snapshot attributes like <u>name</u> and <u>description</u>."));
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneMachine.h

@@ -82 +82 @@
     void closeTool(ToolTypeMachine enmType);
 
-    /** Defines @a strText and switches to text details pane. */
-    void setDetailsText(const QString &strText);
     /** Defines @a strError and switches to error details pane. */
     void setDetailsError(const QString &strError);
+
+    /** Defines current machine @a pItem. */
+    void setCurrentItem(UIVMItem *pItem);
 
     /** Defines the machine @a items. */
@@ -110 +111 @@
     UIActionPool *m_pActionPool;
 
+    /** Holds current machine item reference. */
+    UIVMItem *m_pItem;
+
     /** Holds the stacked-layout instance. */
     QStackedLayout *m_pLayout;