Changeset 72101 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 4, 2018 8:04:48 AM (7 years ago)

Author:

vboxsync

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

122493

Message:

FE/Qt bugref:6769 Change the item delegate to UIFilePathSelector in 'Appliance Settings' view in import dialogs

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp

@@ -37 +37 @@
 # include "UIApplianceEditorWidget.h"
 # include "UIConverter.h"
+# include "UIFilePathSelector.h"
 # include "UIIconPool.h"
 # include "UILineTextEdit.h"
@@ -665 +666 @@
             case KVirtualSystemDescriptionType_HardDiskImage:
             {
-                /* disabled for now
                    UIFilePathSelector *pFileChooser = new UIFilePathSelector(pParent);
-                   pFileChooser->setMode(UIFilePathSelector::Mode_File);
+                   pFileChooser->setMode(UIFilePathSelector::Mode_File_Save);
                    pFileChooser->setResetEnabled(false);
-                   */
-                QLineEdit *pLineEdit = new QLineEdit(pParent);
-                pEditor = pLineEdit;
+                   pEditor = pFileChooser;
                 break;
             }
@@ -753 +751 @@
         case KVirtualSystemDescriptionType_HardDiskImage:
         {
-            /* disabled for now
-               if (UIFilePathSelector *pFileChooser = qobject_cast<UIFilePathSelector*>(pEditor))
-               {
-               pFileChooser->setPath(m_strConfigValue);
-               }
-               */
-            if (QLineEdit *pLineEdit = qobject_cast<QLineEdit*>(pEditor))
-            {
-                pLineEdit->setText(m_strConfigValue);
+            if (UIFilePathSelector *pFileChooser = qobject_cast<UIFilePathSelector*>(pEditor))
+            {
+                pFileChooser->setPath(m_strConfigValue);
                 fDone = true;
             }
@@ -886 +878 @@
         case KVirtualSystemDescriptionType_HardDiskImage:
         {
-            /* disabled for now
-               if (UIFilePathSelector *pFileChooser = qobject_cast<UIFilePathSelector*>(pEditor))
-               {
-               m_strConfigValue = pFileChooser->path();
-               }
-               */
-            if (QLineEdit *pLineEdit = qobject_cast<QLineEdit*>(pEditor))
-            {
-                m_strConfigValue = pLineEdit->text();
+            if (UIFilePathSelector *pFileChooser = qobject_cast<UIFilePathSelector*>(pEditor))
+            {
+                m_strConfigValue = pFileChooser->path();
                 fDone = true;
             }
@@ -1140 +1126 @@
     QWidget *pEditor = pItem->createEditor(pParent, styleOption, index);
 
+    if (!pEditor)
+        return QItemDelegate::createEditor(pParent, styleOption, index);
+
     /* Allow UILineTextEdit to commit data early: */
-    if (pEditor && qobject_cast<UILineTextEdit*>(pEditor))
+    if (qobject_cast<UILineTextEdit*>(pEditor))
         connect(pEditor, SIGNAL(sigFinished(QWidget*)), this, SIGNAL(commitData(QWidget*)));
 
-    if (pEditor == 0)
-        return QItemDelegate::createEditor(pParent, styleOption, index);
-    else
-        return pEditor;
+    return pEditor;
 }
 
@@ -1443 +1429 @@
     }
 }
-