mirror of
https://github.com/GNS3/gns3-gui.git
synced 2026-08-24 20:27:35 +03:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c776d4ef37 | ||
|
|
38ecc9c4ed | ||
|
|
30e34073c8 | ||
|
|
a403512fa7 | ||
|
|
8a97b300ca | ||
|
|
957c4f5de0 | ||
|
|
a4984a396a |
@@ -1,5 +1,5 @@
|
||||
-rrequirements.txt
|
||||
|
||||
pytest==8.4.2; python_version == '3.9' # version 8.4.2 is the last one supporting Python 3.9
|
||||
pytest==9.0.2; python_version >= '3.10'
|
||||
pytest==9.0.3; python_version >= '3.10'
|
||||
pytest-timeout==2.4.0
|
||||
|
||||
@@ -78,9 +78,14 @@ class VMware(Module):
|
||||
vmrun_path = shutil.which("vmrun")
|
||||
if vmrun_path is None:
|
||||
# look for vmrun.exe using the VMware Workstation directory listed in the registry
|
||||
vmrun_path = VMware._findVmrunRegistry(r"SOFTWARE\Wow6432Node\VMware, Inc.\VMware Workstation")
|
||||
# (native 64-bit key first; VMware Workstation 26H1+ dropped the 32-bit build)
|
||||
vmrun_path = VMware._findVmrunRegistry(r"SOFTWARE\VMware, Inc.\VMware Workstation")
|
||||
if vmrun_path is None:
|
||||
vmrun_path = VMware._findVmrunRegistry(r"SOFTWARE\Wow6432Node\VMware, Inc.\VMware Workstation")
|
||||
if vmrun_path is None:
|
||||
# look for vmrun.exe using the VIX directory listed in the registry
|
||||
vmrun_path = VMware._findVmrunRegistry(r"SOFTWARE\VMware, Inc.\VMware VIX")
|
||||
if vmrun_path is None:
|
||||
vmrun_path = VMware._findVmrunRegistry(r"SOFTWARE\Wow6432Node\VMware, Inc.\VMware VIX")
|
||||
elif sys.platform.startswith("darwin"):
|
||||
vmware_fusion_vmrun_path = None
|
||||
|
||||
@@ -600,7 +600,15 @@ class Project(QtCore.QObject):
|
||||
Delete the project from all servers
|
||||
"""
|
||||
self.project_about_to_close_signal.emit()
|
||||
Controller.instance().delete("/projects/{project_id}".format(project_id=self._id), self._projectClosedCallback, progressText="Delete the project")
|
||||
Controller.instance().delete("/projects/{project_id}".format(project_id=self._id), self._projectDestroyedCallback, progressText="Delete the project")
|
||||
|
||||
def _projectDestroyedCallback(self, result, error=False, server=None, **kwargs):
|
||||
self._projectClosedCallback(result, error=error, server=server, **kwargs)
|
||||
if not error or ("status" in result and result["status"] == 404):
|
||||
# Refresh the controller's project list so a deleted project disappears
|
||||
# immediately from menus such as "recent projects" instead of only
|
||||
# after restarting the GUI.
|
||||
Controller.instance().refreshProjectList()
|
||||
|
||||
def _projectClosedCallback(self, result, error=False, server=None, **kwargs):
|
||||
|
||||
|
||||
Reference in New Issue
Block a user