Merge branch 'gz-sim8' into merge_7_8_20240731

gazebosim · Aug 12, 2024 · 85254b9 · 85254b9
2 parents 408c9d4 + 523b01b
commit 85254b9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/examples/plugin/gui_system_plugin/README.md b/examples/plugin/gui_system_plugin/README.md
@@ -2,10 +2,10 @@
 
 This example shows how to create a GUI system plugin.
 
-Gazebo supports any kind of Gazebo GUI plugin
-(`gz::gui::Plugin`). Gazebo GUI plugins are a special type of Gazebo
-GUI plugin which also have access to entity and component updates coming from
-the server.
+Gazebo supports any kind of GUI plugin
+(`gz-gui` library: `gz::gui::Plugin`). However, GuiSystem plugins
+(`gz-sim` library: `gz::sim::GuiSystem`) are a special type of GUI plugin,
+which also have access to entity and component updates coming from the server.
 
 See `GuiSystemPluginPlugin.hh` for more information.
 

diff --git a/src/gui/plugins/resource_spawner/ResourceSpawner.cc b/src/gui/plugins/resource_spawner/ResourceSpawner.cc
@@ -553,7 +553,7 @@ void ResourceSpawner::OnDownloadFuelResource(const QString &_path,
   // Set the waiting cursor while the resource downloads
   QGuiApplication::setOverrideCursor(Qt::WaitCursor);
   if (this->dataPtr->fuelClient->DownloadModel(
-        common::URI(_path.toStdString()), localPath))
+        common::URI(_path.toStdString(), true), localPath))
   {
     // Successful download, set thumbnail
     std::string thumbnailPath = common::joinPaths(localPath, "thumbnails");
@@ -739,7 +739,7 @@ void ResourceSpawner::RunFetchResourceListThread(const std::string &_owner)
             resource.isFuel = true;
             resource.isDownloaded = false;
             resource.owner = id.Owner();
-            resource.sdfPath = id.UniqueName();
+            resource.sdfPath = id.Url().Str();
 
             QMetaObject::invokeMethod(
                 this, "UpdateOwnerListModel", Qt::QueuedConnection,