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

Timestamp:

Mar 25, 2019 9:27:48 AM (6 years ago)

Author:

vboxsync

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

129553

Message:

FE/Qt: bugref:6699. Getting rid of the small dialog during new folder creation

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICustomFileSystemModel.cpp (modified) (1 diff)
• globals/UICustomFileSystemModel.h (modified) (1 diff)
• guestctrl/UIFileManagerTable.cpp (modified) (2 diffs)
• guestctrl/UIFileManagerTable.h (modified) (1 diff)
• medium/viso/UIVisoContentBrowser.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICustomFileSystemModel.cpp

@@ -90 +90 @@
 }
 
-QList<const UICustomFileSystemItem*> UICustomFileSystemItem::children() const
-{
-    QList<const UICustomFileSystemItem*> childList;
+QList<UICustomFileSystemItem*> UICustomFileSystemItem::children() const
+{
+    QList<UICustomFileSystemItem*> childList;
     foreach (UICustomFileSystemItem *child, m_childItems)
         childList << child;

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICustomFileSystemModel.h

@@ -58 +58 @@
     UICustomFileSystemItem *child(const QString &path) const;
     int childCount() const;
-    QList<const UICustomFileSystemItem*> children() const;
+    QList<UICustomFileSystemItem*> children() const;
     /** Removes the item from the list of children and !!DELETES!! the item. */
     void removeChild(UICustomFileSystemItem *pItem);

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.cpp

@@ -787 +787 @@
     if (!currentIndex.isValid())
         return;
-    UICustomFileSystemItem *item = static_cast<UICustomFileSystemItem*>(currentIndex.internalPointer());
-    if (!item)
-        return;
-
-    QString newDirectoryName = getNewDirectoryName();
-    if (newDirectoryName.isEmpty())
-        return;
-
-    if (createDirectory(item->path(), newDirectoryName))
-    {
-        /** @todo instead of refreshing here (an overkill) just add the
-           rows and update the tabel view: */
-        sltRefresh();
-    }
+    UICustomFileSystemItem *parentFolderItem = static_cast<UICustomFileSystemItem*>(currentIndex.internalPointer());
+    if (!parentFolderItem)
+        return;
+
+    QString newDirectoryName(UICustomFileSystemModel::tr("NewDirectory"));
+
+    if (!createDirectory(parentFolderItem->path(), newDirectoryName))
+        return;
+
+    /* Refesh the current directory so that we correctly populate the child list of parentFolderItem: */
+    /** @todo instead of refreshing here (an overkill) just add the
+        rows and update the tabel view: */
+    sltRefresh();
+
+    /* Now we try to edit the newly created item thereby enabling the user to rename the new item: */
+    QList<UICustomFileSystemItem*> content = parentFolderItem->children();
+    UICustomFileSystemItem* newItem = 0;
+    /* Search the new item: */
+    foreach (UICustomFileSystemItem* childItem, content)
+    {
+
+        if (childItem && newDirectoryName == childItem->name())
+            newItem = childItem;
+    }
+
+    if (!newItem)
+        return;
+    QModelIndex newItemIndex = m_pProxyModel->mapFromSource(m_pModel->index(newItem));
+    if (!newItemIndex.isValid())
+        return;
+    m_pView->edit(newItemIndex);
 }
 
@@ -1037 +1054 @@
 }
 
-
-QString UIFileManagerTable::getNewDirectoryName()
-{
-    UIStringInputDialog *dialog = new UIStringInputDialog();
-    if (dialog->execute())
-    {
-        QString strDialog = dialog->getString();
-        delete dialog;
-        return strDialog;
-    }
-    delete dialog;
-    return QString();
-}
-
 QString UIFileManagerTable::currentDirectoryPath() const
 {

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.h

@@ -267 +267 @@
     /** Returns the UICustomFileSystemItem for path / which is a direct (and single) child of m_pRootItem */
     UICustomFileSystemItem *getStartDirectoryItem();
-    /** Shows a modal dialog with a line edit for user to enter a new directory name and return the entered string*/
-    QString         getNewDirectoryName();
     void            deSelectUpDirectoryItem();
     void            setSelectionForAll(QItemSelectionModel::SelectionFlags flags);

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoContentBrowser.cpp

@@ -284 +284 @@
 
     /*  Check to see if we already have a directory named strNewDirectoryName: */
-    const QList<const UICustomFileSystemItem*> children = pParentItem->children();
+    const QList<UICustomFileSystemItem*> children = pParentItem->children();
     foreach (const UICustomFileSystemItem *item, children)
     {
@@ -678 +678 @@
     if (!pItem || !pItem->parentItem())
         return;
-    QList<const UICustomFileSystemItem*> children = pItem->parentItem()->children();
+    QList<UICustomFileSystemItem*> children = pItem->parentItem()->children();
     bool bDuplicate = false;
     foreach (const UICustomFileSystemItem *item, children)