Changeset 968 in vbox

Timestamp:

Feb 18, 2007 11:43:54 PM (18 years ago)

Author:

vboxsync

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

18738

Message:

1. Problem reporter methods created for console transient shared folders creation&removing errors displaying.
2. Assert warning fixed (Shared Folders setting dialog).
3. Add share caption moved from shared folder’s open dialog to add new shared folder dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxProblemReporter.h (modified) (1 diff)
• src/VBoxProblemReporter.cpp (modified) (2 diffs)
• ui/VBoxSharedFoldersSettings.ui.h (modified) (11 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h ¶

@@ -188 +188 @@
     void cannotRemoveSharedFolder (QWidget *, const CMachine &,
                                    const QString &, const QString &);
+    void cannotCreateSharedFolder (QWidget *, const CConsole &,
+                                   const QString &, const QString &);
+    void cannotRemoveSharedFolder (QWidget *, const CConsole &,
+                                   const QString &, const QString &);
 
     bool confirmReleaseImage (QWidget*, QString);

trunk/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp ¶

@@ -1153 +1153 @@
     message (aParent, Error,
              tr ("Failed to create a shared folder <b>%1</b> "
-                 "(pointing to <nobr><b>%2</b></nobr>)"
+                 "(pointing to <nobr><b>%2</b></nobr>) "
                  "for the virtual machine <b>%3</b>.")
                  .arg (aName)
@@ -1171 +1171 @@
     message (aParent, Error,
              tr ("Failed to remove the shared folder <b>%1</b> "
-                 "(pointing to <nobr><b>%2</b></nobr>)"
+                 "(pointing to <nobr><b>%2</b></nobr>) "
                  "from the virtual machine <b>%3</b>.")
                  .arg (aName)
                  .arg (aPath)
                  .arg (aMachine.GetName()),
+             formatErrorInfo (errInfo));
+}
+
+void VBoxProblemReporter::cannotCreateSharedFolder (QWidget        *aParent,
+                                                    const CConsole &aConsole,
+                                                    const QString  &aName,
+                                                    const QString  &aPath)
+{
+    /* preserve the current error info before calling the object again */
+    COMErrorInfo errInfo = aConsole.errorInfo();
+
+    message (aParent, Error,
+             tr ("Failed to create a shared folder <b>%1</b> "
+                 "(pointing to <nobr><b>%2</b></nobr>) "
+                 "for the virtual machine <b>%3</b>.")
+                 .arg (aName)
+                 .arg (aPath)
+                 .arg (aConsole.GetMachine().GetName()),
+             formatErrorInfo (errInfo));
+}
+
+void VBoxProblemReporter::cannotRemoveSharedFolder (QWidget        *aParent,
+                                                    const CConsole &aConsole,
+                                                    const QString  &aName,
+                                                    const QString  &aPath)
+{
+    /* preserve the current error info before calling the object again */
+    COMErrorInfo errInfo = aConsole.errorInfo();
+
+    message (aParent, Error,
+             tr ("Failed to remove the shared folder <b>%1</b> "
+                 "(pointing to <nobr><b>%2</b></nobr>) "
+                 "from the virtual machine <b>%3</b>.")
+                 .arg (aName)
+                 .arg (aPath)
+                 .arg (aConsole.GetMachine().GetName()),
              formatErrorInfo (errInfo));
 }

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxSharedFoldersSettings.ui.h ¶

@@ -65 +65 @@
     int rtti() const { return QIRichListItemId; }
 
-    const QString& getText (int aIndex) { return mTextList [aIndex]; }
+    QString getText (int aIndex)
+    {
+        return aIndex >= 0 && aIndex < (int)mTextList.size() ?
+            mTextList [aIndex] : QString::null;
+    }
 
 protected:
@@ -78 +82 @@
     void processColumn (int aColumn, int aWidth)
     {
-        QString oneString = mTextList [aColumn];
-        if (oneString.isEmpty())
+        QString oneString = aColumn >= 0 && aColumn < (int)mTextList.size() ?
+            mTextList [aColumn] : QString::null;
+        if (oneString.isNull())
             return;
         int oldSize = listView()->fontMetrics().width (oneString);
@@ -147 +152 @@
         mLePath (0), mLeName (0)
     {
+        setCaption (tr ("Add Share"));
         QVBoxLayout *mainLayout = new QVBoxLayout (this, 10, 10, "mainLayout");
 
@@ -207 +213 @@
         QFileDialog dlg (QDir::rootDirPath(), QString::null, this);
         dlg.setMode (QFileDialog::DirectoryOnly);
-        dlg.setCaption (tr ("Add Share"));
         if (dlg.exec() == QDialog::Accepted)
         {
@@ -253 +258 @@
     new QIListViewSelectionPreserver (this, listView);
     listView->setShowToolTips (false);
+    listView->setRootIsDecorated (true);
     tbAdd->setIconSet (VBoxGlobal::iconSet ("select_file_16px.png",
                                             "select_file_dis_16px.png"));
@@ -300 +306 @@
             mConsole.RemoveSharedFolder (aName);
             if (!mConsole.isOk())
-                vboxProblem().cannotRemoveSharedFolder (this, mConsole.GetMachine(),
+                vboxProblem().cannotRemoveSharedFolder (this, mConsole,
                                                         aName, aPath);
             break;
@@ -337 +343 @@
             mConsole.CreateSharedFolder (aName, aPath);
             if (!mConsole.isOk())
-                vboxProblem().cannotCreateSharedFolder (this, mConsole.GetMachine(),
+                vboxProblem().cannotCreateSharedFolder (this, mConsole,
                                                         aName, aPath);
             break;
@@ -447 +453 @@
                                            QListViewItem *aRoot)
 {
+    Assert (!aRoot->text (2).isNull());
     SFDialogType type = (SFDialogType)aRoot->text (2).toInt();
-    Assert (type);
 
     /* deleting all existing folders if the list */
@@ -464 +470 @@
         if (iterator->rtti() == VBoxRichListItem::QIRichListItemId)
             item = static_cast<VBoxRichListItem*> (iterator);
-        if (item)
+        if (item && !item->getText (0).isNull() && !item->getText (1).isNull())
             createSharedFolder (item->getText (0), item->getText (1), type);
         else
@@ -513 +519 @@
                       "<nobr>Path:&nbsp;&nbsp;%2</nobr>")
                       .arg (item->getText (0)).arg (item->getText (1));
-    if (!item->getText (0).isEmpty() && !item->getText (1).isEmpty())
+    if (!item->getText (0).isNull() && !item->getText (1).isNull())
         QToolTip::add (listView->viewport(), listView->itemRect (aItem), tip);
     else
@@ -521 +527 @@
 void VBoxSharedFoldersSettings::processCurrentChanged (QListViewItem *aItem)
 {
-    if (aItem && listView->selectedItem() != aItem)
+    if (aItem && aItem->isSelectable() && listView->selectedItem() != aItem)
         listView->setSelected (aItem, true);
     bool removeEnabled = aItem && aItem->parent() &&