Skip to content

Commit

Permalink
Merge pull request #3699 from GNS3/release/v2.2.53
Browse files Browse the repository at this point in the history
Release v2.2.53
  • Loading branch information
grossmj authored Jan 21, 2025
2 parents e17e7fc + 342ca95 commit b9a5918
Show file tree
Hide file tree
Showing 15 changed files with 29 additions and 23 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## 2.2.53 21/01/2025

* Update file browser filters for all files and IOU images
* Upgrade dependencies
* Fix Linux Mint default terminal configuration

## 2.2.52 02/12/2024

* Add iol extension filter. Ref #3664
Expand Down
2 changes: 1 addition & 1 deletion gns3/crash_report.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class CrashReport:
Report crash to a third party service
"""

DSN = "https://8a3db3ada69cd1c9817eafd87b400846@o19455.ingest.us.sentry.io/38506"
DSN = "https://3ab14deb02a197dfb74396582e088adf@o19455.ingest.us.sentry.io/38506"
_instance = None

def __init__(self):
Expand Down
2 changes: 1 addition & 1 deletion gns3/dialogs/symbol_selection_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ def getSymbol(self):
def _symbolBrowserSlot(self):

# supported image file formats
file_formats = "Image files (*.svg *.bmp *.jpeg *.jpg *.pbm *.pgm *.png *.ppm *.xbm *.xpm *.gif);;All files (*.*)"
file_formats = "Image files (*.svg *.bmp *.jpeg *.jpg *.pbm *.pgm *.png *.ppm *.xbm *.xpm *.gif);;All files (*)"
path, _ = QtWidgets.QFileDialog.getOpenFileName(self, "Image", SymbolSelectionDialog._symbols_dir, file_formats)
if not path:
return
Expand Down
4 changes: 2 additions & 2 deletions gns3/graphics_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -1255,7 +1255,7 @@ def importConfigActionSlot(self):
path, _ = QtWidgets.QFileDialog.getOpenFileName(self,
"Import {}".format(os.path.basename(config_file)),
self._import_config_directory,
"All files (*.*);;Config files (*.cfg)",
"All files (*);;Config files (*.cfg)",
"Config files (*.cfg)")
if not path:
continue
Expand Down Expand Up @@ -1302,7 +1302,7 @@ def exportConfigActionSlot(self):

for item in items:
for config_file in item.node().configFiles():
path, ok = QtWidgets.QFileDialog.getSaveFileName(self, "Export file", os.path.join(self._export_config_directory, item.node().name() + "_" + os.path.basename(config_file)), "All files (*.*);;Config files (*.cfg)")
path, ok = QtWidgets.QFileDialog.getSaveFileName(self, "Export file", os.path.join(self._export_config_directory, item.node().name() + "_" + os.path.basename(config_file)), "All files (*);;Config files (*.cfg)")
if not path:
continue
self._export_config_directory = os.path.dirname(path)
Expand Down
8 changes: 4 additions & 4 deletions gns3/main_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ def openApplianceActionSlot(self, *args):
if not os.path.exists(self._appliance_dir):
directory = Topology.instance().projectsDirPath()
path, _ = QtWidgets.QFileDialog.getOpenFileName(self, "Import appliance", directory,
"All files (*.*);;GNS3 Appliance (*.gns3appliance *.gns3a)",
"All files (*);;GNS3 Appliance (*.gns3appliance *.gns3a)",
"GNS3 Appliance (*.gns3appliance *.gns3a)")
if path:
self.loadPath(path)
Expand All @@ -447,7 +447,7 @@ def openProjectActionSlot(self):
if self._project_dir is None or not os.path.exists(self._project_dir):
directory = Topology.instance().projectsDirPath()
path, _ = QtWidgets.QFileDialog.getOpenFileName(self, "Open project", directory,
"All files (*.*);;GNS3 Project (*.gns3);;GNS3 Portable Project (*.gns3project *.gns3p);;NET files (*.net)",
"All files (*);;GNS3 Project (*.gns3);;GNS3 Portable Project (*.gns3project *.gns3p);;NET files (*.net)",
"GNS3 Project (*.gns3)")
if path:
self.loadPath(path)
Expand Down Expand Up @@ -920,7 +920,7 @@ def _insertImageActionSlot(self):
Slot called when inserting an image on the scene.
"""
# supported image file formats
file_formats = "Image files (*.svg *.bmp *.jpeg *.jpg *.gif *.pbm *.pgm *.png *.ppm *.xbm *.xpm);;All files (*.*)"
file_formats = "Image files (*.svg *.bmp *.jpeg *.jpg *.gif *.pbm *.pgm *.png *.ppm *.xbm *.xpm);;All files (*)"

path, _ = QtWidgets.QFileDialog.getOpenFileName(self, "Image", self._pictures_dir, file_formats)
if not path:
Expand Down Expand Up @@ -1449,7 +1449,7 @@ def _importProjectActionSlot(self):
if not os.path.exists(directory):
directory = Topology.instance().projectsDirPath()
path, _ = QtWidgets.QFileDialog.getOpenFileName(self, "Open portable project", directory,
"All files (*.*);;GNS3 Portable Project (*.gns3project *.gns3p)",
"All files (*);;GNS3 Portable Project (*.gns3project *.gns3p)",
"GNS3 Portable Project (*.gns3project *.gns3p)")
if path:
Topology.instance().importProject(path)
Expand Down
2 changes: 1 addition & 1 deletion gns3/modules/dynamips/pages/dynamips_preferences_page.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def _dynamipsPathBrowserSlot(self):

file_filter = ""
if sys.platform.startswith("win"):
file_filter = "Executable (*.exe);;All files (*.*)"
file_filter = "Executable (*.exe);;All files (*)"

dynamips_path = shutil.which("dynamips")
if sys.platform.startswith("darwin") and dynamips_path is None:
Expand Down
2 changes: 1 addition & 1 deletion gns3/modules/dynamips/pages/ios_router_preferences_page.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ def getIOSImage(cls, parent, server):
path, _ = QtWidgets.QFileDialog.getOpenFileName(parent,
"Select an IOS image",
cls._default_images_dir,
"All files (*.*);;IOS image (*.bin *.image)",
"All files (*);;IOS image (*.bin *.image)",
"IOS image (*.bin *.image)")

if not path:
Expand Down
4 changes: 2 additions & 2 deletions gns3/modules/iou/pages/iou_device_preferences_page.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,8 @@ def getIOUImage(cls, parent, server):
path, _ = QtWidgets.QFileDialog.getOpenFileName(parent,
"Select an IOU image",
cls._default_images_dir,
"All file (*);;IOU image (*.bin *.image *.iol)",
"IOU image (*.bin *.image *.iol)")
"All file (*);;IOU image (x86_64* i86bi* *.bin *.image *.iol)",
"IOU image (x86_64* i86bi* *.bin *.image *.iol)")

if not path:
return
Expand Down
2 changes: 1 addition & 1 deletion gns3/modules/traceng/pages/traceng_preferences_page.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def _tracengPathBrowserSlot(self):

filter = ""
if sys.platform.startswith("win"):
filter = "Executable (*.exe);;All files (*.*)"
filter = "Executable (*.exe);;All files (*)"
traceng_path = shutil.which("traceng")
path, _ = QtWidgets.QFileDialog.getOpenFileName(self, "Select TraceNG", traceng_path, filter)
if not path:
Expand Down
2 changes: 1 addition & 1 deletion gns3/modules/vpcs/pages/vpcs_preferences_page.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def _vpcsPathBrowserSlot(self):

filter = ""
if sys.platform.startswith("win"):
filter = "Executable (*.exe);;All files (*.*)"
filter = "Executable (*.exe);;All files (*)"
vpcs_path = shutil.which("vpcs")
path, _ = QtWidgets.QFileDialog.getOpenFileName(self, "Select VPCS", vpcs_path, filter)
if not path:
Expand Down
4 changes: 2 additions & 2 deletions gns3/pages/general_preferences_page.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def _importConfigurationFileSlot(self):
configuration_file_path = LocalConfig.instance().configFilePath()
directory = os.path.dirname(configuration_file_path)

path, _ = QtWidgets.QFileDialog.getOpenFileName(self, "Import configuration file", directory, "Configuration file (*.ini *.conf);;All files (*.*)")
path, _ = QtWidgets.QFileDialog.getOpenFileName(self, "Import configuration file", directory, "Configuration file (*.ini *.conf);;All files (*)")
if not path:
return

Expand Down Expand Up @@ -240,7 +240,7 @@ def _exportConfigurationFileSlot(self):
configuration_file_path = LocalConfig.instance().configFilePath()
directory = os.path.dirname(configuration_file_path)

path, _ = QtWidgets.QFileDialog.getSaveFileName(self, "Export configuration file", directory, "Configuration file (*.ini *.conf);;All files (*.*)")
path, _ = QtWidgets.QFileDialog.getSaveFileName(self, "Export configuration file", directory, "Configuration file (*.ini *.conf);;All files (*)")
if not path:
return

Expand Down
4 changes: 2 additions & 2 deletions gns3/pages/server_preferences_page.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def _localServerBrowserSlot(self):

filter = ""
if sys.platform.startswith("win"):
filter = "Executable (*.exe);;All files (*.*)"
filter = "Executable (*.exe);;All files (*)"
server_path = shutil.which("gns3server")
path, _ = QtWidgets.QFileDialog.getOpenFileName(self, "Select the local server", server_path, filter)
if not path:
Expand All @@ -121,7 +121,7 @@ def _ubridgeBrowserSlot(self):

filter = ""
if sys.platform.startswith("win"):
filter = "Executable (*.exe);;All files (*.*)"
filter = "Executable (*.exe);;All files (*)"

ubridge_path = shutil.which("ubridge")
path, _ = QtWidgets.QFileDialog.getOpenFileName(self, "Select ubridge executable", ubridge_path, filter)
Expand Down
2 changes: 1 addition & 1 deletion gns3/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@

if sys.platform.startswith("linux"):
distro_name = distro.name()
if distro_name == "Debian" or distro_name == "Ubuntu" or distro_name == "LinuxMint":
if distro_name == "Debian" or distro_name == "Ubuntu" or distro_name == "Linux Mint":
if shutil.which("mate-terminal"):
DEFAULT_TELNET_CONSOLE_COMMAND = PRECONFIGURED_TELNET_CONSOLE_COMMANDS["Mate Terminal"]
else:
Expand Down
4 changes: 2 additions & 2 deletions gns3/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
# or negative for a release candidate or beta (after the base version
# number has been incremented)

__version__ = "2.2.52"
__version_info__ = (2, 2, 52, 0)
__version__ = "2.2.53"
__version_info__ = (2, 2, 53, 0)

if "dev" in __version__:
try:
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
jsonschema>=4.23,<4.24
sentry-sdk>=2.17,<2.18 # optional dependency
psutil>=6.1.0
sentry-sdk>=2.19.2,<2.20 # optional dependency
psutil>=6.1.1
distro>=1.9.0
truststore>=0.10.0; python_version >= '3.10'
importlib-resources>=1.3; python_version < '3.9'

0 comments on commit b9a5918

Please sign in to comment.