Changeset 48497 in vbox

Timestamp:

Sep 16, 2013 4:56:05 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

88993

Message:

FE/Qt: Global properties: Network page: NAT networks tab: Allowing to enable/disable network directly from the network tree.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/global

Files:

• UIGlobalSettingsNetwork.cpp (modified) (9 diffs)
• UIGlobalSettingsNetwork.h (modified) (1 diff)
• UIGlobalSettingsNetwork.ui (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp

@@ -56 +56 @@
     /* API: Update stuff: */
     void updateInfo();
+    void updateData();
 
     /* API: Network item getters: */
@@ -170 +171 @@
 
     /* Item name was not changed: */
+    setCheckState(0, m_data.m_fEnabled ? Qt::Checked : Qt::Unchecked);
     if (m_data.m_strNewName == m_data.m_strName)
     {
         /* Just use the old one: */
-        setText(0, m_data.m_strName);
+        setText(1, m_data.m_strName);
         strToolTip += strHeader.arg(UIGlobalSettingsNetwork::tr("Network Name"), m_data.m_strName);
     }
@@ -182 +184 @@
         const QString oldName = m_data.m_strName;
         const QString newName = m_data.m_strNewName.isEmpty() ? UIGlobalSettingsNetwork::tr("[empty]") : m_data.m_strNewName;
-        setText(0, UIGlobalSettingsNetwork::tr("%1 (renamed from %2)").arg(newName, oldName));
+        setText(1, UIGlobalSettingsNetwork::tr("%1 (renamed from %2)").arg(newName, oldName));
         strToolTip += strHeader.arg(UIGlobalSettingsNetwork::tr("Old Network Name"), m_data.m_strName);
         strToolTip += strHeader.arg(UIGlobalSettingsNetwork::tr("New Network Name"), m_data.m_strNewName);
@@ -198 +200 @@
     /* Assign tool-tip finally: */
     setToolTip(0, strToolTip);
+}
+
+void UIItemNetworkNAT::updateData()
+{
+    /* Update data: */
+    m_data.m_fEnabled = checkState(0) == Qt::Checked;
 }
 
@@ -364 +372 @@
     /* Prepare NAT network tree-widget: */
     {
-        m_pTreeNetworkNAT->header()->hide();
+        m_pTreeNetworkNAT->setColumnCount(2);
+        m_pTreeNetworkNAT->header()->setStretchLastSection(false);
+        m_pTreeNetworkNAT->header()->setResizeMode(0, QHeaderView::ResizeToContents);
+        m_pTreeNetworkNAT->header()->setResizeMode(1, QHeaderView::Stretch);
         m_pTreeNetworkNAT->setContextMenuPolicy(Qt::CustomContextMenu);
         connect(m_pTreeNetworkNAT, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
@@ -372 +383 @@
         connect(m_pTreeNetworkNAT, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)),
                 this, SLOT(sltEditNetworkNAT()));
+        connect(m_pTreeNetworkNAT, SIGNAL(itemChanged(QTreeWidgetItem*, int)),
+                this, SLOT(sltHandleItemChangeNetworkNAT(QTreeWidgetItem*)));
     }
     /* Prepare Host network tree-widget: */
@@ -619 +632 @@
     Ui::UIGlobalSettingsNetwork::retranslateUi(this);
 
-    /* NAT network actions: */
-    {
-        /* Translate text: */
+    /* NAT networks: */
+    {
+        /* Translate tree-widget columns: */
+        m_pTreeNetworkNAT->setHeaderLabels(QStringList()
+                                           << tr("Active", "NAT network")
+                                           << tr("Name"));
+
+        /* Translate action text: */
         m_pActionAddNetworkNAT->setText(tr("&Add NAT network"));
         m_pActionDelNetworkNAT->setText(tr("&Remove NAT network"));
         m_pActionEditNetworkNAT->setText(tr("&Edit NAT network"));
 
-        /* Recompose tool-tips: */
+        /* Recompose action tool-tips: */
         m_pActionAddNetworkNAT->setToolTip(m_pActionAddNetworkNAT->text().remove('&') +
             QString(" (%1)").arg(m_pActionAddNetworkNAT->shortcut().toString()));
@@ -635 +653 @@
     }
 
-    /* Host network actions: */
-    {
-        /* Translate text: */
+    /* Host networks: */
+    {
+        /* Translate action text: */
         m_pActionAddNetworkHost->setText(tr("&Add host-only network"));
         m_pActionDelNetworkHost->setText(tr("&Remove host-only network"));
         m_pActionEditNetworkHost->setText(tr("&Edit host-only network"));
 
-        /* Recompose tool-tips: */
+        /* Recompose action tool-tips: */
         m_pActionAddNetworkHost->setToolTip(m_pActionAddNetworkHost->text().remove('&') +
             QString(" (%1)").arg(m_pActionAddNetworkHost->shortcut().toString()));
@@ -733 +751 @@
         revalidate();
     }
+}
+
+void UIGlobalSettingsNetwork::sltHandleItemChangeNetworkNAT(QTreeWidgetItem *pChangedItem)
+{
+    /* Get network item: */
+    UIItemNetworkNAT *pItem = static_cast<UIItemNetworkNAT*>(pChangedItem);
+    AssertMsg(pItem, ("Changed item should present!\n"));
+
+    /* Update item data: */
+    pItem->updateData();
+    m_fChanged = true;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.h

@@ -161 +161 @@
     void sltDelNetworkNAT();
     void sltEditNetworkNAT();
+    void sltHandleItemChangeNetworkNAT(QTreeWidgetItem *pChangedItem);
     void sltHandleCurrentItemChangeNetworkNAT();
     void sltShowContextMenuNetworkNAT(const QPoint &pos);

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.ui

@@ -49 +49 @@
           <bool>false</bool>
          </property>
-         <column>
-          <property name="text">
-           <string>Name</string>
-          </property>
-         </column>
         </widget>
        </item>