Changeset 12217 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 8, 2008 11:37:21 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: Only return true for isModified if it really is modified (bug #2064).

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxFilePathSelectorWidget.h (modified) (2 diffs)
• src/VBoxFilePathSelectorWidget.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxFilePathSelectorWidget.h

@@ -76 +76 @@
     void copyToClipboard();
     void refreshText();
+    void setPathInternal (const QString &aText);
 
 private:
@@ -94 +95 @@
     bool mIsEditableMode;
     bool mIsMouseAwaited;
+
+    bool mModified;
 };
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxFilePathSelectorWidget.cpp

@@ -64 +64 @@
     , mIsEditableMode (false)
     , mIsMouseAwaited (false)
+    , mModified (false)
 {
     /* Populate items */
@@ -88 +89 @@
     /* Setup connections */
     connect (lineEdit(), SIGNAL (textEdited (const QString &)),
-             this, SLOT (setPath (const QString &)));
+             this, SLOT (setPathInternal (const QString &)));
     connect (this, SIGNAL (activated (int)), this, SLOT (onActivated (int)));
     connect (mCopyAction, SIGNAL (triggered (bool)), this, SLOT (copyToClipboard()));
@@ -133 +134 @@
 bool VBoxFilePathSelectorWidget::isModified() const
 {
-    return true;
+    return mModified;
 }
 
@@ -272 +273 @@
         case ResetId:
         {
-            setPath (QString::null);
+            setPathInternal (QString::null);
             break;
         }
@@ -307 +308 @@
 
     path.remove (QRegExp ("[\\\\/]$"));
-    setPath (path);
+    setPathInternal (path);
 }
 
@@ -459 +460 @@
 }
 
+void VBoxFilePathSelectorWidget::setPathInternal (const QString &aText)
+{
+    QString oldPath = mPath;
+    setPath (aText);
+    if (mPath != oldPath)
+        mModified = true;
+}
+