Changeset 74928 in vbox

Timestamp:

Oct 18, 2018 4:46:59 PM (6 years ago)

Author:

vboxsync

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

125937

Message:

FE/Qt: bugref:9230: Cloud Profile Manager: Support for profile name changes; Possiblity to add new profile directly from details widget.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/cloud

Files:

• UICloudProfileDetailsWidget.cpp (modified) (7 diffs)
• UICloudProfileDetailsWidget.h (modified) (4 diffs)
• UICloudProfileManager.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileDetailsWidget.cpp

@@ -21 +21 @@
 
 /* Qt includes: */
+# include <QGridLayout>
 # include <QHeaderView>
+# include <QLabel>
+# include <QLineEdit>
 # include <QPushButton>
 # include <QTableWidget>
@@ -54 +57 @@
     /* Load data: */
     loadData();
+
+    /* Translate linked widgets: */
+    retranslateEditor();
+    retranslateButtons();
 }
 
@@ -60 +67 @@
     /// @todo add description tool-tips
 
+    /* Translate name-editor label: */
+    m_pLabelName->setText(tr("Name:"));
+    /* Translate name-editor: */
+    retranslateEditor();
+
+    /* Translate table-widget label: */
+    m_pLabelTableWidget->setText(tr("Properties:"));
     /* Translate table-widget: */
     m_pTableWidget->setToolTip(tr("Contains cloud profile settings"));
 
+    /* Translate buttons: */
+    retranslateButtons();
+
+    /* Retranslate validation: */
+    retranslateValidation();
+
+    /* Update table tool-tips: */
+    updateTableToolTips();
+}
+
+void UICloudProfileDetailsWidget::retranslateEditor()
+{
+    /* Translate placeholders: */
+    m_pEditorName->setPlaceholderText(  m_oldData.m_strName.isNull()
+                                      ? tr("Enter a name for the new profile...")
+                                      : tr("Enter a name for this profile..."));
+}
+
+void UICloudProfileDetailsWidget::retranslateButtons()
+{
     /* Translate button-box: */
     if (m_pButtonBox)
     {
+        /* Common: 'Reset' button: */
         m_pButtonBox->button(QDialogButtonBox::Cancel)->setText(tr("Reset"));
-        m_pButtonBox->button(QDialogButtonBox::Ok)->setText(tr("Apply"));
+        m_pButtonBox->button(QDialogButtonBox::Cancel)->setStatusTip(tr("Reset changes in current profile details"));
         m_pButtonBox->button(QDialogButtonBox::Cancel)->setShortcut(Qt::Key_Escape);
-        m_pButtonBox->button(QDialogButtonBox::Ok)->setShortcut(QString("Ctrl+Return"));
-        m_pButtonBox->button(QDialogButtonBox::Cancel)->setStatusTip(tr("Reset changes in current profile details"));
-        m_pButtonBox->button(QDialogButtonBox::Ok)->setStatusTip(tr("Apply changes in current profile details"));
         m_pButtonBox->button(QDialogButtonBox::Cancel)->
             setToolTip(tr("Reset Changes (%1)").arg(m_pButtonBox->button(QDialogButtonBox::Cancel)->shortcut().toString()));
-        m_pButtonBox->button(QDialogButtonBox::Ok)->
-            setToolTip(tr("Apply Changes (%1)").arg(m_pButtonBox->button(QDialogButtonBox::Ok)->shortcut().toString()));
-    }
-
-    /* Retranslate validation: */
-    retranslateValidation();
-
-    /* Update table tool-tips: */
-    updateTableToolTips();
+
+        if (m_oldData.m_strName.isNull())
+        {
+            /* Provider: 'Add' button: */
+            m_pButtonBox->button(QDialogButtonBox::Ok)->setText(tr("Add"));
+            m_pButtonBox->button(QDialogButtonBox::Ok)->setStatusTip(tr("Add a new profile with following name"));
+            m_pButtonBox->button(QDialogButtonBox::Ok)->setShortcut(QString("Ctrl+Return"));
+            m_pButtonBox->button(QDialogButtonBox::Ok)->
+                setToolTip(tr("Add Profile (%1)").arg(m_pButtonBox->button(QDialogButtonBox::Ok)->shortcut().toString()));
+        }
+        else
+        {
+            /* Profile: 'Apply' button: */
+            m_pButtonBox->button(QDialogButtonBox::Ok)->setText(tr("Apply"));
+            m_pButtonBox->button(QDialogButtonBox::Ok)->setStatusTip(tr("Apply changes in current profile details"));
+            m_pButtonBox->button(QDialogButtonBox::Ok)->setShortcut(QString("Ctrl+Return"));
+            m_pButtonBox->button(QDialogButtonBox::Ok)->
+                setToolTip(tr("Apply Changes (%1)").arg(m_pButtonBox->button(QDialogButtonBox::Ok)->shortcut().toString()));
+        }
+    }
+}
+
+void UICloudProfileDetailsWidget::sltNameChanged(const QString &strName)
+{
+    /* Push changes back: */
+    m_newData.m_strName = strName;
+
+    /* Revalidate: */
+    revalidate(m_pEditorName);
+    /* Update button states: */
+    updateButtonStates();
 }
 
@@ -142 +196 @@
 {
     /* Create layout: */
-    QVBoxLayout *pLayout = new QVBoxLayout(this);
+    QGridLayout *pLayout = new QGridLayout(this);
     if (pLayout)
     {
-        /* Configure layout: */
-        pLayout->setContentsMargins(0, 0, 0, 0);
+        if (m_enmEmbedding == EmbedTo_Dialog)
+        {
+            pLayout->setContentsMargins(0, 0, 0, 0);
+#ifdef VBOX_WS_MAC
+            pLayout->setSpacing(10);
+#else
+            pLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2);
+#endif
+        }
+
+        /* Create name editor: */
+        m_pEditorName = new QLineEdit;
+        if (m_pEditorName)
+        {
+            connect(m_pEditorName, &QLineEdit::textChanged, this, &UICloudProfileDetailsWidget::sltNameChanged);
+
+            /* Add into layout: */
+            pLayout->addWidget(m_pEditorName, 0, 1);
+        }
+        /* Create name label: */
+        m_pLabelName = new QLabel;
+        if (m_pLabelName)
+        {
+            m_pLabelName->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+            m_pLabelName->setBuddy(m_pEditorName);
+
+            /* Add into layout: */
+            pLayout->addWidget(m_pLabelName, 0, 0);
+        }
 
         /* Create tab-widget: */
@@ -159 +240 @@
 
             /* Add into layout: */
-            pLayout->addWidget(m_pTableWidget);
+            pLayout->addWidget(m_pTableWidget, 1, 1);
+        }
+        /* Create tab-widget label: */
+        m_pLabelTableWidget = new QLabel;
+        if (m_pLabelTableWidget)
+        {
+            m_pLabelTableWidget->setAlignment(Qt::AlignRight | Qt::AlignTop);
+            m_pLabelTableWidget->setBuddy(m_pTableWidget);
+
+            /* Add into layout: */
+            pLayout->addWidget(m_pLabelTableWidget, 1, 0);
         }
 
@@ -184 +275 @@
 
                 /* Add into layout: */
-                pLayout->addLayout(pButtonBoxLayout);
+                pLayout->addLayout(pButtonBoxLayout, 2, 0, 1, 2);
             }
         }
@@ -194 +285 @@
     /* Clear table initially: */
     m_pTableWidget->clear();
+
+    /* Fill name editor: */
+    m_pEditorName->setText(m_oldData.m_strName);
 
     /* Configure table: */

trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileDetailsWidget.h

@@ -29 +29 @@
 /* Forward declarations: */
 class QAbstractButton;
+class QLabel;
+class QLineEdit;
 class QTableWidget;
 class QTableWidgetItem;
@@ -122 +124 @@
     /** Handles translation event. */
     virtual void retranslateUi() /* override */;
+    /** Handles editor translation. */
+    void retranslateEditor();
+    /** Handles buttons translation. */
+    void retranslateButtons();
 
 private slots:
@@ -127 +133 @@
     /** @name Change handling stuff.
       * @{ */
+        /** Handles name change. */
+        void sltNameChanged(const QString &strName);
         /** Handles table change. */
         void sltTableChanged(QTableWidgetItem *pItem);
@@ -178 +186 @@
     /** @} */
 
-    /** @name Interface variables.
-      * @{ */
-        /** Holds the automatic interface configuration button. */
+    /** @name Widget variables.
+      * @{ */
+        /** Holds the name label instance. */
+        QLabel    *m_pLabelName;
+        /** Holds the name editor instance. */
+        QLineEdit *m_pEditorName;
+
+        /** Holds the table-widget label instance. */
+        QLabel       *m_pLabelTableWidget;
+        /** Holds the table-widget instance. */
         QTableWidget *m_pTableWidget;
 

trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileManager.cpp

@@ -187 +187 @@
 void UICloudProfileManagerWidget::sltApplyCloudProfileDetailsChanges()
 {
+    /* Is can be that there is provider item, not profile item currently selected.
+     * In such case we are not applying parameters, we are creating new one profile. */
+    UIItemCloudProvider *pMaybeProviderItem = static_cast<UIItemCloudProvider*>(m_pTreeWidget->currentItem());
+    if (pMaybeProviderItem)
+        return sltAddCloudProfile();
+
     /* Get profile item: */
     UIItemCloudProfile *pProfileItem = static_cast<UIItemCloudProfile*>(m_pTreeWidget->currentItem());
@@ -224 +230 @@
             else
             {
-                /* Iterate through old/new data: */
-                foreach (const QString &strKey, oldData.m_data.keys())
+                /* Set profile name, if necessary: */
+                if (newData.m_strName != oldData.m_strName)
+                    comCloudProfile.SetName(newData.m_strName);
+                /* Show error message if necessary: */
+                if (!comCloudProfile.isOk())
+                    msgCenter().cannotAssignCloudProfileParameter(comCloudProfile, this);
+                else
                 {
-                    /* Get values: */
-                    const QString strOldValue = oldData.m_data.value(strKey).first;
-                    const QString strNewValue = newData.m_data.value(strKey).first;
-                    if (strNewValue != strOldValue)
+                    /* Iterate through old/new data: */
+                    foreach (const QString &strKey, oldData.m_data.keys())
                     {
-                        /* Apply property: */
-                        comCloudProfile.SetProperty(strKey, strNewValue);
-                        /* Show error message if necessary: */
-                        if (!comCloudProfile.isOk())
+                        /* Get values: */
+                        const QString strOldValue = oldData.m_data.value(strKey).first;
+                        const QString strNewValue = newData.m_data.value(strKey).first;
+                        if (strNewValue != strOldValue)
                         {
-                            msgCenter().cannotAssignCloudProfileParameter(comCloudProfile, this);
-                            break;
+                            /* Apply property: */
+                            comCloudProfile.SetProperty(strKey, strNewValue);
+                            /* Show error message if necessary: */
+                            if (!comCloudProfile.isOk())
+                            {
+                                msgCenter().cannotAssignCloudProfileParameter(comCloudProfile, this);
+                                break;
+                            }
                         }
                     }
@@ -271 +286 @@
     AssertMsgReturnVoid(pProviderItem, ("Current item must not be null!\n"));
 
-    /* Acquire profile name first of all: */
-    QString strProfileName;
-    QPointer<QInputDialog> pDialog = new QInputDialog(this);
-    pDialog->setInputMode(QInputDialog::TextInput);
-    pDialog->setWindowIcon(UIIconPool::iconSet(":/cloud_profile_add_16px.png"));
-    pDialog->setWindowTitle(tr("Add Profile"));
-    pDialog->setLabelText(tr("Name:"));
-    bool fCancelled = false;
-    if (pDialog->exec() == QDialog::Accepted)
-        strProfileName = pDialog->textValue();
-    else
-        fCancelled = true;
-    delete pDialog;
-    if (fCancelled)
-        return;
+    /* Acquire profile name if not proposed by details widget: */
+    QString strProfileName = m_pDetailsWidget->data().m_strName;
+    if (strProfileName.isNull())
+    {
+        QPointer<QInputDialog> pDialog = new QInputDialog(this);
+        pDialog->setInputMode(QInputDialog::TextInput);
+        pDialog->setWindowIcon(UIIconPool::iconSet(":/cloud_profile_add_16px.png"));
+        pDialog->setWindowTitle(tr("Add Profile"));
+        pDialog->setLabelText(tr("Name:"));
+        bool fCancelled = false;
+        if (pDialog->exec() == QDialog::Accepted)
+            strProfileName = pDialog->textValue();
+        else
+            fCancelled = true;
+        delete pDialog;
+        if (fCancelled)
+            return;
+    }
 
     /* Get VirtualBox for further activities: */
@@ -465 +483 @@
     m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add)->setEnabled(!pItem || pItemProvider);
     m_pActionPool->action(UIActionIndexST_M_Cloud_S_Remove)->setEnabled(pItemProfile);
-    m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details)->setEnabled(pItemProfile);
+    m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details)->setEnabled(pItemProfile || pItemProvider);
     m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import)->setEnabled(!pItem || pItemProvider);
 
@@ -500 +518 @@
     {
         menu.addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add));
+        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details));
         menu.addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import));
     }