Index: /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc (revision 68284) +++ /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc (revision 68285) @@ -300,5 +300,5 @@ images/web_camera_unavailable_16px.png images/web_camera_unavailable_disabled_16px.png - images/welcome.png + images/welcome_200px.png Index: /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_hidpi.qrc =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_hidpi.qrc (revision 68284) +++ /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_hidpi.qrc (revision 68285) @@ -294,4 +294,5 @@ images/hidpi/web_camera_unavailable_16px_hidpi.png images/hidpi/web_camera_unavailable_disabled_16px_hidpi.png + images/hidpi/welcome_200px_hidpi.png Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (revision 68284) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (revision 68285) @@ -272,4 +272,7 @@ updateActionsAppearance(); + /* Update Tools-pane: */ + m_pPaneToolsMachine->setCurrentItem(pItem); + /* If current item exists & accessible: */ if (pItem && pItem->accessible()) @@ -306,23 +309,4 @@ /* 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("

Welcome to VirtualBox!

" - "

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." - "

" - "

In order to create a new virtual machine, press the " - "New button in the main tool bar located " - "at the top of the window.

" - "

You can press the %1 key to get instant help, " - "or visit " - "www.virtualbox.org " - "for the latest information and news.

") - .arg(QKeySequence(QKeySequence::HelpContents).toString(QKeySequence::NativeText))); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneGlobal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneGlobal.cpp (revision 68284) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneGlobal.cpp (revision 68285) @@ -165,11 +165,4 @@ delete pWidget; } -} - -void UIToolsPaneGlobal::setDetailsText(const QString &strText) -{ - /* Update desktop pane: */ - AssertPtrReturnVoid(m_pPaneDesktop); - m_pPaneDesktop->setToolsPaneText(strText); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneGlobal.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneGlobal.h (revision 68284) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneGlobal.h (revision 68285) @@ -71,6 +71,4 @@ 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); Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneMachine.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneMachine.cpp (revision 68284) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneMachine.cpp (revision 68285) @@ -31,4 +31,5 @@ # include "UISnapshotPane.h" # include "UIToolsPaneMachine.h" +# include "UIVMItem.h" /* Other VBox includes: */ @@ -41,4 +42,5 @@ : QIWithRetranslateUI(pParent) , m_pActionPool(pActionPool) + , m_pItem(0) , m_pLayout(0) , m_pPaneDesktop(0) @@ -171,11 +173,4 @@ } -void UIToolsPaneMachine::setDetailsText(const QString &strText) -{ - /* Update desktop pane: */ - AssertPtrReturnVoid(m_pPaneDesktop); - m_pPaneDesktop->setToolsPaneText(strText); -} - void UIToolsPaneMachine::setDetailsError(const QString &strError) { @@ -185,4 +180,18 @@ } +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 &items) { @@ -202,19 +211,39 @@ { /* Translate Machine Tools welcome screen: */ - m_pPaneDesktop->setToolsPaneIcon(UIIconPool::iconSet(":/tools_200px.png")); - m_pPaneDesktop->setToolsPaneText( - tr("

Welcome to VirtualBox!

" - "

The left part of this window is a list of all virtual " - "machines and virtual machine groups on your computer.

" - "

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.

" - "

You can press the %1 key to get instant help, or visit " - "www.virtualbox.org " - "for the latest information and news.

") - .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("

Welcome to VirtualBox!

" + "

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.

" + "

In order to create a new virtual machine, press the " + "New button in the main tool bar located at the " + "top of the window.

" + "

You can press the %1 key to get instant help, or visit " + "www.virtualbox.org " + "for the latest information and news.

") + .arg(QKeySequence(QKeySequence::HelpContents).toString(QKeySequence::NativeText))); + } + else + { + m_pPaneDesktop->setToolsPaneIcon(UIIconPool::iconSet(":/tools_200px.png")); + m_pPaneDesktop->setToolsPaneText( + tr("

Welcome to VirtualBox!

" + "

The left part of this window is a list of all virtual " + "machines and virtual machine groups on your computer.

" + "

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.

" + "

You can press the %1 key to get instant help, or visit " + "www.virtualbox.org " + "for the latest information and news.

") + .arg(QKeySequence(QKeySequence::HelpContents).toString(QKeySequence::NativeText))); + } /* Wipe out the tool descriptions: */ @@ -222,16 +251,19 @@ /* 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 properties 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 snapshots created for the currently chosen VM and allows " - "for snapshot manipulations like possibility to create, remove, " - "restore (make current) and observe their properties. Allows to " - "edit snapshot attributes like name and description.")); + 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 properties 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 snapshots created for the currently chosen VM and allows " + "for snapshot manipulations like possibility to create, remove, " + "restore (make current) and observe their properties. Allows to " + "edit snapshot attributes like name and description.")); + } } Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneMachine.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneMachine.h (revision 68284) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneMachine.h (revision 68285) @@ -82,8 +82,9 @@ 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,4 +111,7 @@ UIActionPool *m_pActionPool; + /** Holds current machine item reference. */ + UIVMItem *m_pItem; + /** Holds the stacked-layout instance. */ QStackedLayout *m_pLayout;