Update debugger UI to auto-refresh the directory listing

debugger/QT/SkDebuggerGUI.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDebuggerGUI.h"
 #include "SkPicture.h"
 #include <QListWidgetItem>
@@ skipping 38 matching lines @@
     , fMenuView(this)
     , fLoading(false)
 {
     setupUi(this);
     fListWidget.setSelectionMode(QAbstractItemView::ExtendedSelection);
     connect(&fListWidget, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this,
             SLOT(updateDrawCommandInfo()));
     connect(&fActionOpen, SIGNAL(triggered()), this, SLOT(openFile()));
     connect(&fActionDirectory, SIGNAL(triggered()), this, SLOT(toggleDirectory()));
     connect(&fDirectoryWidget, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(loadFile(QListWidgetItem *)));
+    connect(&fDirectoryWatcher, SIGNAL(directoryChanged(QString)), this, SLOT(populateDirectoryWidget()));
     connect(&fActionDelete, SIGNAL(triggered()), this, SLOT(actionDelete()));
     connect(&fListWidget, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(toggleBreakpoint()));
     connect(&fActionRewind, SIGNAL(triggered()), this, SLOT(actionRewind()));
     connect(&fActionPlay, SIGNAL(triggered()), this, SLOT(actionPlay()));
     connect(&fActionStepBack, SIGNAL(triggered()), this, SLOT(actionStepBack()));
     connect(&fActionStepForward, SIGNAL(triggered()), this, SLOT(actionStepForward()));
     connect(&fActionBreakpoint, SIGNAL(triggered()), this, SLOT(actionBreakpoints()));
     connect(&fActionInspector, SIGNAL(triggered()), this, SLOT(actionInspector()));
     connect(&fActionSettings, SIGNAL(triggered()), this, SLOT(actionSettings()));
     connect(&fFilter, SIGNAL(activated(QString)), this, SLOT(toggleFilter(QString)));
@@ skipping 209 matching lines @@
 
 void SkDebuggerGUI::saveToFile(const SkString& filename) {
     SkFILEWStream file(filename.c_str());
     SkAutoTUnref<SkPicture> copy(fDebugger.copyPicture());
 
     sk_tool_utils::PngPixelSerializer serializer;
     copy->serialize(&file, &serializer);
 }
 
 void SkDebuggerGUI::loadFile(QListWidgetItem *item) {
-    if (fDirectoryWidgetActive) {
-        fFileName = fPath.toAscii().data();
-        // don't add a '/' to files in the local directory
-        if (fFileName.size() > 0) {
-            fFileName.append("/");
-        }
-        fFileName.append(item->text().toAscii().data());
+    if (item == nullptr) {
+        return;
+    }
+
+    SkString fileName(fPath.toAscii().data());
+    // don't add a '/' to files in the local directory
+    if (fileName.size() > 0) {
+        fileName.append("/");
+    }
+    fileName.append(item->text().toAscii().data());
+
+    if (!fileName.equals(fFileName)) {
+        fFileName = fileName;
         loadPicture(fFileName);
     }
 }
 
 void SkDebuggerGUI::openFile() {
     QString temp = QFileDialog::getOpenFileName(this, tr("Open File"), "",
             tr("Files (*.*)"));
     openFile(temp);
 }
 
 void SkDebuggerGUI::openFile(const QString &filename) {
-    fDirectoryWidgetActive = false;
     if (!filename.isEmpty()) {
         QFileInfo pathInfo(filename);
         loadPicture(SkString(filename.toAscii().data()));
         setupDirectoryWidget(pathInfo.path());
     }
-    fDirectoryWidgetActive = true;
 }
 
 void SkDebuggerGUI::pauseDrawing(bool isPaused) {
     fPausedRow = fListWidget.currentRow();
     this->updateDrawCommandInfo();
 }
 
 void SkDebuggerGUI::updateDrawCommandInfo() {
     int currentRow = -1;
     if (!fLoading) {
@@ skipping 250 matching lines @@
     fToolBar.addAction(&fActionPlay);
     fToolBar.addSeparator();
     fToolBar.addAction(&fActionInspector);
     fToolBar.addAction(&fActionSettings);
 
     fToolBar.addSeparator();
     fToolBar.addWidget(&fSpacer);
     fToolBar.addWidget(&fFilter);
     fToolBar.addAction(&fActionCancel);
 
-    // TODO(chudy): Remove static call.
-    fDirectoryWidgetActive = false;
     fFileName = "";
     setupDirectoryWidget("");
-    fDirectoryWidgetActive = true;
 
     // Menu Bar
     fMenuFile.setTitle("File");
     fMenuFile.addAction(&fActionOpen);
     fMenuFile.addAction(&fActionSave);
     fMenuFile.addAction(&fActionSaveAs);
     fMenuFile.addAction(&fActionClose);
 
     fMenuEdit.setTitle("Edit");
     fMenuEdit.addAction(&fActionDelete);
@@ skipping 28 matching lines @@
     fMenuBar.addAction(fMenuView.menuAction());
     fMenuBar.addAction(fMenuNavigate.menuAction());
     fMenuBar.addAction(fMenuWindows.menuAction());
 
     SkDebuggerGUI->setMenuBar(&fMenuBar);
     QMetaObject::connectSlotsByName(SkDebuggerGUI);
 }
 
 void SkDebuggerGUI::setupDirectoryWidget(const QString& path) {
     fPath = path;
-    QDir dir(path);
-    QRegExp r(".skp");
-    fDirectoryWidget.clear();
-    const QStringList files = dir.entryList();
-    foreach (QString f, files) {
-        if (f.contains(r))
-            fDirectoryWidget.addItem(f);
+    populateDirectoryWidget();
+
+    // clear the existing watched directory and setup a new directory to watch
+    if (!fDirectoryWatcher.directories().empty()) {
+        fDirectoryWatcher.removePaths(fDirectoryWatcher.directories());
+    }
+    if (!path.isEmpty()) {
+        fDirectoryWatcher.addPath(fPath);
     }
 }
 
+void SkDebuggerGUI::populateDirectoryWidget() {
+    QDir dir(fPath);
+    QRegExp r(".skp");
+    const QStringList files = dir.entryList();
+
+    // check if a file has been removed
+    for (int i = fDirectoryWidget.count() - 1; i >= 0; i--) {
+        QListWidgetItem* item = fDirectoryWidget.item(i);
+        if (!files.contains(item->text())) {
+            fDirectoryWidget.removeItemWidget(item);
+            delete item;
+        }
+    }
+
+    // add any new files
+    foreach (QString f, files) {
+        if (f.contains(r) && fDirectoryWidget.findItems(f, Qt::MatchExactly).size() == 0) {
+            fDirectoryWidget.addItem(f);
+        }
+    }
+}
+
 void SkDebuggerGUI::loadPicture(const SkString& fileName) {
     fFileName = fileName;
     fLoading = true;
     SkAutoTDelete<SkStream> stream(new SkFILEStream(fileName.c_str()));
 
     SkPicture* picture = SkPicture::CreateFromStream(stream);
 
     if (nullptr == picture) {
         QMessageBox::critical(this, "Error loading file", "Couldn't read file, sorry.");
         return;
@@ skipping 113 matching lines @@
         fCanvasWidget.drawTo(fPausedRow);
     } else {
         fCanvasWidget.drawTo(fListWidget.currentRow());
     }
 }
 
 void SkDebuggerGUI::updateHit(int newHit) {
     fCommandHitBox.setText(QString::number(newHit));
 }