Changeset 86038 in vbox for trunk

Timestamp:

Sep 7, 2020 11:18:55 AM (5 years ago)

Author:

vboxsync

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

140248

Message:

FE/Qt: bugref:9812: Global preferences / Network page: Forgot something in r140220.

Location:

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

Files:

• UIGlobalSettingsNetwork.cpp (modified) (5 diffs)
• UIGlobalSettingsNetwork.h (modified) (1 diff)

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

@@ -222 +222 @@
     , m_pTreeWidgetNATNetwork(0)
     , m_pToolbarNATNetwork(0)
-    , m_pActionAddNATNetwork(0)
-    , m_pActionRemoveNATNetwork(0)
-    , m_pActionEditNATNetwork(0)
+    , m_pActionAdd(0)
+    , m_pActionRemove(0)
+    , m_pActionEdit(0)
 {
     /* Prepare: */
@@ -359 +359 @@
 
     /* Translate action text: */
-    m_pActionAddNATNetwork->setText(tr("Add NAT Network"));
-    m_pActionRemoveNATNetwork->setText(tr("Remove NAT Network"));
-    m_pActionEditNATNetwork->setText(tr("Edit NAT Network"));
-
-    m_pActionAddNATNetwork->setWhatsThis(tr("Adds new NAT network."));
-    m_pActionRemoveNATNetwork->setWhatsThis(tr("Removes selected NAT network."));
-    m_pActionEditNATNetwork->setWhatsThis(tr("Edits selected NAT network."));
-
-    m_pActionAddNATNetwork->setToolTip(m_pActionAddNATNetwork->whatsThis());
-    m_pActionRemoveNATNetwork->setToolTip(m_pActionRemoveNATNetwork->whatsThis());
-    m_pActionEditNATNetwork->setToolTip(m_pActionEditNATNetwork->whatsThis());
+    m_pActionAdd->setText(tr("Add NAT Network"));
+    m_pActionRemove->setText(tr("Remove NAT Network"));
+    m_pActionEdit->setText(tr("Edit NAT Network"));
+
+    m_pActionAdd->setWhatsThis(tr("Adds new NAT network."));
+    m_pActionRemove->setWhatsThis(tr("Removes selected NAT network."));
+    m_pActionEdit->setWhatsThis(tr("Edits selected NAT network."));
+
+    m_pActionAdd->setToolTip(m_pActionAdd->whatsThis());
+    m_pActionRemove->setToolTip(m_pActionRemove->whatsThis());
+    m_pActionEdit->setToolTip(m_pActionEdit->whatsThis());
 }
 
@@ -465 +465 @@
 
     /* Update availability: */
-    m_pActionRemoveNATNetwork->setEnabled(pItem);
-    m_pActionEditNATNetwork->setEnabled(pItem);
+    m_pActionRemove->setEnabled(pItem);
+    m_pActionEdit->setEnabled(pItem);
 }
 
@@ -475 +475 @@
     if (m_pTreeWidgetNATNetwork->itemAt(position))
     {
-        menu.addAction(m_pActionEditNATNetwork);
-        menu.addAction(m_pActionRemoveNATNetwork);
+        menu.addAction(m_pActionEdit);
+        menu.addAction(m_pActionRemove);
     }
     else
     {
-        menu.addAction(m_pActionAddNATNetwork);
+        menu.addAction(m_pActionAdd);
     }
     /* And show it: */
@@ -559 +559 @@
 
         /* Prepare 'add NAT network' action: */
-        m_pActionAddNATNetwork = m_pToolbarNATNetwork->addAction(UIIconPool::iconSet(":/host_iface_add_16px.png",
-                                                                                     ":/host_iface_add_disabled_16px.png"),
-                                                                 QString(), this, SLOT(sltAddNATNetwork()));
-        if (m_pActionAddNATNetwork)
-            m_pActionAddNATNetwork->setShortcuts(QList<QKeySequence>() << QKeySequence("Ins") << QKeySequence("Ctrl+N"));
+        m_pActionAdd = m_pToolbarNATNetwork->addAction(UIIconPool::iconSet(":/host_iface_add_16px.png",
+                                                                           ":/host_iface_add_disabled_16px.png"),
+                                                       QString(), this, SLOT(sltAddNATNetwork()));
+        if (m_pActionAdd)
+            m_pActionAdd->setShortcuts(QList<QKeySequence>() << QKeySequence("Ins") << QKeySequence("Ctrl+N"));
 
         /* Prepare 'remove NAT network' action: */
-        m_pActionRemoveNATNetwork = m_pToolbarNATNetwork->addAction(UIIconPool::iconSet(":/host_iface_remove_16px.png",
-                                                                                        ":/host_iface_remove_disabled_16px.png"),
-                                                                    QString(), this, SLOT(sltRemoveNATNetwork()));
-        if (m_pActionRemoveNATNetwork)
-            m_pActionRemoveNATNetwork->setShortcuts(QList<QKeySequence>() << QKeySequence("Del") << QKeySequence("Ctrl+R"));
+        m_pActionRemove = m_pToolbarNATNetwork->addAction(UIIconPool::iconSet(":/host_iface_remove_16px.png",
+                                                                              ":/host_iface_remove_disabled_16px.png"),
+                                                          QString(), this, SLOT(sltRemoveNATNetwork()));
+        if (m_pActionRemove)
+            m_pActionRemove->setShortcuts(QList<QKeySequence>() << QKeySequence("Del") << QKeySequence("Ctrl+R"));
 
         /* Prepare 'edit NAT network' action: */
-        m_pActionEditNATNetwork = m_pToolbarNATNetwork->addAction(UIIconPool::iconSet(":/host_iface_edit_16px.png",
-                                                                                      ":/host_iface_edit_disabled_16px.png"),
-                                                                  QString(), this, SLOT(sltEditNATNetwork()));
-        if (m_pActionEditNATNetwork)
-            m_pActionEditNATNetwork->setShortcuts(QList<QKeySequence>() << QKeySequence("Space") << QKeySequence("F2"));
+        m_pActionEdit = m_pToolbarNATNetwork->addAction(UIIconPool::iconSet(":/host_iface_edit_16px.png",
+                                                                            ":/host_iface_edit_disabled_16px.png"),
+                                                        QString(), this, SLOT(sltEditNATNetwork()));
+        if (m_pActionEdit)
+            m_pActionEdit->setShortcuts(QList<QKeySequence>() << QKeySequence("Space") << QKeySequence("F2"));
 
         m_pLayoutNATNetwork->addWidget(m_pToolbarNATNetwork);

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

@@ -141 +141 @@
         UIToolBar        *m_pToolbarNATNetwork;
         /** Holds the 'add NAT network' action instance. */
-        QAction          *m_pActionAddNATNetwork;
+        QAction          *m_pActionAdd;
         /** Holds the 'remove NAT network' action instance. */
-        QAction          *m_pActionRemoveNATNetwork;
+        QAction          *m_pActionRemove;
         /** Holds the 'edit NAT network' action instance. */
-        QAction          *m_pActionEditNATNetwork;
+        QAction          *m_pActionEdit;
     /** @} */
 };