Index: /trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UINetworkManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UINetworkManager.cpp (revision 87219) +++ /trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UINetworkManager.cpp (revision 87220) @@ -48,12 +48,12 @@ -/** Tree-widget column tags. */ -enum -{ - Column_Name, - Column_IPv4, - Column_IPv6, - Column_DHCP, - Column_Max, +/** Host network tree-widget column indexes. */ +enum HostNetworkColumn +{ + HostNetworkColumn_Name, + HostNetworkColumn_IPv4, + HostNetworkColumn_IPv6, + HostNetworkColumn_DHCP, + HostNetworkColumn_Max, }; @@ -86,11 +86,11 @@ { /* Compose item fields: */ - setText(Column_Name, m_interface.m_strName); - setText(Column_IPv4, m_interface.m_strAddress.isEmpty() ? QString() : - QString("%1/%2").arg(m_interface.m_strAddress).arg(maskToCidr(m_interface.m_strMask))); - setText(Column_IPv6, m_interface.m_strAddress6.isEmpty() || !m_interface.m_fSupportedIPv6 ? QString() : - QString("%1/%2").arg(m_interface.m_strAddress6).arg(m_interface.m_strPrefixLength6.toInt())); - setText(Column_DHCP, tr("Enable", "DHCP Server")); - setCheckState(Column_DHCP, m_dhcpserver.m_fEnabled ? Qt::Checked : Qt::Unchecked); + setText(HostNetworkColumn_Name, m_interface.m_strName); + setText(HostNetworkColumn_IPv4, m_interface.m_strAddress.isEmpty() ? QString() : + QString("%1/%2").arg(m_interface.m_strAddress).arg(maskToCidr(m_interface.m_strMask))); + setText(HostNetworkColumn_IPv6, m_interface.m_strAddress6.isEmpty() || !m_interface.m_fSupportedIPv6 ? QString() : + QString("%1/%2").arg(m_interface.m_strAddress6).arg(m_interface.m_strPrefixLength6.toInt())); + setText(HostNetworkColumn_DHCP, tr("Enable", "DHCP Server")); + setCheckState(HostNetworkColumn_DHCP, m_dhcpserver.m_fEnabled ? Qt::Checked : Qt::Unchecked); /* Compose item tool-tip: */ @@ -151,5 +151,5 @@ /* Assign tool-tip finally: */ - setToolTip(Column_Name, strTable.arg(strToolTip)); + setToolTip(HostNetworkColumn_Name, strTable.arg(strToolTip)); } @@ -302,17 +302,17 @@ /* Create interface: */ CHostNetworkInterface comInterface; - CProgress progress = comHost.CreateHostOnlyNetworkInterface(comInterface); + CProgress comProgress = comHost.CreateHostOnlyNetworkInterface(comInterface); /* Show error message if necessary: */ - if (!comHost.isOk() || progress.isNull()) + if (!comHost.isOk() || comProgress.isNull()) msgCenter().cannotCreateHostNetworkInterface(comHost, this); else { /* Show interface creation progress: */ - msgCenter().showModalProgressDialog(progress, UINetworkManager::tr("Adding network ..."), ":/progress_network_interface_90px.png", this, 0); + msgCenter().showModalProgressDialog(comProgress, UINetworkManager::tr("Adding network ..."), ":/progress_network_interface_90px.png", this, 0); /* Show error message if necessary: */ - if (!progress.isOk() || progress.GetResultCode() != 0) - msgCenter().cannotCreateHostNetworkInterface(progress, this); + if (!comProgress.isOk() || comProgress.GetResultCode() != 0) + msgCenter().cannotCreateHostNetworkInterface(comProgress, this); else { @@ -406,17 +406,17 @@ /* Remove interface finally: */ - CProgress progress = comHost.RemoveHostOnlyNetworkInterface(uInterfaceId); + CProgress comProgress = comHost.RemoveHostOnlyNetworkInterface(uInterfaceId); /* Show error message if necessary: */ - if (!comHost.isOk() || progress.isNull()) + if (!comHost.isOk() || comProgress.isNull()) msgCenter().cannotRemoveHostNetworkInterface(comHost, strInterfaceName, this); else { /* Show interface removal progress: */ - msgCenter().showModalProgressDialog(progress, UINetworkManager::tr("Removing network ..."), ":/progress_network_interface_90px.png", this, 0); + msgCenter().showModalProgressDialog(comProgress, UINetworkManager::tr("Removing network ..."), ":/progress_network_interface_90px.png", this, 0); /* Show error message if necessary: */ - if (!progress.isOk() || progress.GetResultCode() != 0) - return msgCenter().cannotRemoveHostNetworkInterface(progress, strInterfaceName, this); + if (!comProgress.isOk() || comProgress.GetResultCode() != 0) + return msgCenter().cannotRemoveHostNetworkInterface(comProgress, strInterfaceName, this); else { @@ -432,5 +432,5 @@ } -void UINetworkManagerWidget::sltToggleDetailsVisibilityHostNetwork(bool fVisible) +void UINetworkManagerWidget::sltToggleDetailsVisibility(bool fVisible) { /* Save the setting: */ @@ -440,11 +440,5 @@ m_pDetailsWidgetHostNetwork->setVisible(fVisible); /* Notify external listeners: */ - emit sigDetailsVisibilityChangedHostNetwork(fVisible); -} - -void UINetworkManagerWidget::sltRefreshHostNetworks() -{ - // Not implemented. - AssertMsgFailed(("Not implemented!")); + emit sigDetailsVisibilityChanged(fVisible); } @@ -462,16 +456,16 @@ const int iTotal = m_pTreeWidgetHostNetwork->viewport()->width(); /* Look for a minimum width hints for non-important columns: */ - const int iMinWidth1 = qMax(pItemView->sizeHintForColumn(Column_IPv4), pItemHeader->sectionSizeHint(Column_IPv4)); - const int iMinWidth2 = qMax(pItemView->sizeHintForColumn(Column_IPv6), pItemHeader->sectionSizeHint(Column_IPv6)); - const int iMinWidth3 = qMax(pItemView->sizeHintForColumn(Column_DHCP), pItemHeader->sectionSizeHint(Column_DHCP)); + const int iMinWidth1 = qMax(pItemView->sizeHintForColumn(HostNetworkColumn_IPv4), pItemHeader->sectionSizeHint(HostNetworkColumn_IPv4)); + const int iMinWidth2 = qMax(pItemView->sizeHintForColumn(HostNetworkColumn_IPv6), pItemHeader->sectionSizeHint(HostNetworkColumn_IPv6)); + const int iMinWidth3 = qMax(pItemView->sizeHintForColumn(HostNetworkColumn_DHCP), pItemHeader->sectionSizeHint(HostNetworkColumn_DHCP)); /* Propose suitable width hints for non-important columns: */ - const int iWidth1 = iMinWidth1 < iTotal / Column_Max ? iMinWidth1 : iTotal / Column_Max; - const int iWidth2 = iMinWidth2 < iTotal / Column_Max ? iMinWidth2 : iTotal / Column_Max; - const int iWidth3 = iMinWidth3 < iTotal / Column_Max ? iMinWidth3 : iTotal / Column_Max; + const int iWidth1 = iMinWidth1 < iTotal / HostNetworkColumn_Max ? iMinWidth1 : iTotal / HostNetworkColumn_Max; + const int iWidth2 = iMinWidth2 < iTotal / HostNetworkColumn_Max ? iMinWidth2 : iTotal / HostNetworkColumn_Max; + const int iWidth3 = iMinWidth3 < iTotal / HostNetworkColumn_Max ? iMinWidth3 : iTotal / HostNetworkColumn_Max; /* Apply the proposal: */ - m_pTreeWidgetHostNetwork->setColumnWidth(Column_IPv4, iWidth1); - m_pTreeWidgetHostNetwork->setColumnWidth(Column_IPv6, iWidth2); - m_pTreeWidgetHostNetwork->setColumnWidth(Column_DHCP, iWidth3); - m_pTreeWidgetHostNetwork->setColumnWidth(Column_Name, iTotal - iWidth1 - iWidth2 - iWidth3); + m_pTreeWidgetHostNetwork->setColumnWidth(HostNetworkColumn_IPv4, iWidth1); + m_pTreeWidgetHostNetwork->setColumnWidth(HostNetworkColumn_IPv6, iWidth2); + m_pTreeWidgetHostNetwork->setColumnWidth(HostNetworkColumn_DHCP, iWidth3); + m_pTreeWidgetHostNetwork->setColumnWidth(HostNetworkColumn_Name, iTotal - iWidth1 - iWidth2 - iWidth3); } } @@ -488,7 +482,7 @@ /* Make sure dhcp server status changed: */ if ( ( oldData.m_dhcpserver.m_fEnabled - && pChangedItem->checkState(Column_DHCP) == Qt::Checked) + && pChangedItem->checkState(HostNetworkColumn_DHCP) == Qt::Checked) || ( !oldData.m_dhcpserver.m_fEnabled - && pChangedItem->checkState(Column_DHCP) == Qt::Unchecked)) + && pChangedItem->checkState(HostNetworkColumn_DHCP) == Qt::Unchecked)) return; @@ -583,5 +577,5 @@ /* Otherwise => clear details and close the area: */ m_pDetailsWidgetHostNetwork->setData(UIDataHostNetwork()); - sltToggleDetailsVisibilityHostNetwork(false); + sltToggleDetailsVisibility(false); } } @@ -767,7 +761,5 @@ this, &UINetworkManagerWidget::sltRemoveHostNetwork); connect(m_pActionPool->action(UIActionIndexMN_M_Network_T_Details), &QAction::toggled, - this, &UINetworkManagerWidget::sltToggleDetailsVisibilityHostNetwork); - connect(m_pActionPool->action(UIActionIndexMN_M_Network_S_Refresh), &QAction::triggered, - this, &UINetworkManagerWidget::sltRefreshHostNetworks); + this, &UINetworkManagerWidget::sltToggleDetailsVisibility); } @@ -810,6 +802,4 @@ m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Network_S_Remove)); m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Network_T_Details)); -// m_pToolBar->addSeparator(); -// m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Network_S_Refresh)); #ifdef VBOX_WS_MAC @@ -869,7 +859,7 @@ m_pTreeWidgetHostNetwork->setContextMenuPolicy(Qt::CustomContextMenu); m_pTreeWidgetHostNetwork->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - m_pTreeWidgetHostNetwork->setColumnCount(Column_Max); + m_pTreeWidgetHostNetwork->setColumnCount(HostNetworkColumn_Max); m_pTreeWidgetHostNetwork->setSortingEnabled(true); - m_pTreeWidgetHostNetwork->sortByColumn(Column_Name, Qt::AscendingOrder); + m_pTreeWidgetHostNetwork->sortByColumn(HostNetworkColumn_Name, Qt::AscendingOrder); m_pTreeWidgetHostNetwork->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Expanding); connect(m_pTreeWidgetHostNetwork, &QITreeWidget::currentItemChanged, @@ -913,5 +903,5 @@ { m_pActionPool->action(UIActionIndexMN_M_Network_T_Details)->setChecked(gEDataManager->hostNetworkManagerDetailsExpanded()); - sltToggleDetailsVisibilityHostNetwork(m_pActionPool->action(UIActionIndexMN_M_Network_T_Details)->isChecked()); + sltToggleDetailsVisibility(m_pActionPool->action(UIActionIndexMN_M_Network_T_Details)->isChecked()); } } @@ -1138,7 +1128,7 @@ { /* Configure button-box: */ - connect(widget(), &UINetworkManagerWidget::sigDetailsVisibilityChangedHostNetwork, + connect(widget(), &UINetworkManagerWidget::sigDetailsVisibilityChanged, button(ButtonType_Apply), &QPushButton::setVisible); - connect(widget(), &UINetworkManagerWidget::sigDetailsVisibilityChangedHostNetwork, + connect(widget(), &UINetworkManagerWidget::sigDetailsVisibilityChanged, button(ButtonType_Reset), &QPushButton::setVisible); connect(widget(), &UINetworkManagerWidget::sigDetailsDataChangedHostNetwork, Index: /trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UINetworkManager.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UINetworkManager.h (revision 87219) +++ /trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UINetworkManager.h (revision 87220) @@ -51,6 +51,7 @@ signals: - /** Notifies listeners about host network details-widget @a fVisible. */ - void sigDetailsVisibilityChangedHostNetwork(bool fVisible); + /** Notifies listeners about details-widget @a fVisible. */ + void sigDetailsVisibilityChanged(bool fVisible); + /** Notifies listeners about host network details data @a fDiffers. */ void sigDetailsDataChangedHostNetwork(bool fDiffers); @@ -105,8 +106,7 @@ /** Handles command to remove host network. */ void sltRemoveHostNetwork(); - /** Handles command to make host network details @a fVisible. */ - void sltToggleDetailsVisibilityHostNetwork(bool fVisible); - /** Handles command to refresh host networks. */ - void sltRefreshHostNetworks(); + + /** Handles command to make details @a fVisible. */ + void sltToggleDetailsVisibility(bool fVisible); /** @} */