Release v2.2.7

https://github.com/advisories/GHSA-qfc5-mcwq-26q8

.github/ISSUE_TEMPLATE/gns3-bug-report.md

@@ -0,0 +1,34 @@
+---
+name: GNS3 bug report
+about: Create a report to help us fix a bug
+title: 'Short description of the bug'
+labels: Bug
+assignees: ''
+
+---
+
+**Before you start**
+Please open an issue only if you suspect there is a bug or any problem with GNS3. Go to https://gns3.com/community for any other questions or for requesting help with GNS3.
+
+You may also post this issue directly on the GNS3 server repository if you know the bug comes from the server: https://github.com/GNS3/gns3-server/issues/new
+
+**Describe the bug**
+Please provide a clear and detailed description of what the bug is.
+
+**GNS3 version and operating system (please complete the following information):**
+ - OS: [e.g. Windows, Linux or macOS]
+ - GNS3 version [e.g. 2.1.14]
+ - Any use of the GNS3 VM or remote server (ESXi, bare metal etc.)
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Screenshots or videos**
+If applicable, add screenshots (e.g. of the topology and/or error message) or links to videos to help explain the problem. This will help us a lot to quickly find the bug and fix it.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/gns3-development.md

@@ -0,0 +1,10 @@
+---
+name: GNS3 development
+about: Any question or discussion regarding GNS3 development
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/gns3-feature-request.md

@@ -0,0 +1,25 @@
+---
+name: GNS3 feature request
+about: Suggest an idea for GNS3
+title: 'Short description of the feature request'
+labels: Enhancement
+assignees: ''
+
+---
+
+**Before you start**
+Please check if a similar feature request has already been submitted.
+
+You may also post this issue directly on the GNS3 server repository if you know the feature request only applies to the server: https://github.com/GNS3/gns3-server/issues/new
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen. If applicable, please provide screenshots
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

CHANGELOG

@@ -1,5 +1,185 @@
 # Change Log
 
+## 2.2.7 07/04/2020
+
+* Fix VNC console template doesn't extract %i (Project UUID). Fixes #2960
+* Fix contextual menu issues. Ref #2955
+
+## 2.2.6 26/03/2020
+
+* Prevent locked drawings to be deleted. Fixes https://github.com/GNS3/gns3-gui/issues/2948
+* Fix issues with empty project variables. Fixes https://github.com/GNS3/gns3-gui/issues/2941
+* Upgrade psutil to version 5.6.6 due to CVE-2019-18874 https://github.com/advisories/GHSA-qfc5-mcwq-26q8
+* Use existing README.txt if existing when exporting portable project. Fixes https://github.com/GNS3/gns3-server/issues/1724
+* Allow creation of a diskless Qemu VMs. Fixes #2939
+* Re-enable "create new version" in appliance wizard. Fixes #2837
+* Fix unable to load project from project library. Fixes #2932
+* Fix some permission denied errors when loading remote project. Ref #2871 Fixes #2901
+* Add 'Royal TS V5' to predefined console list
+* Disallow invalid grid sized. Fixes #2908
+* Check if hostname is blank. Fixes #2924
+* Add nvme disk interface and fix scsi disk interface for Qemu VMs.
+* Add latest Qemu nic models.
+* Upgrade Qt version to 5.14.1. Ref #2778 #2903
+
+## 2.2.5 09/01/2020
+
+* Add gns3-gui.xml and update Linux icons paths & permissions. Ref #2919
+
+## 2.2.4 08/01/2020
+
+* Fix "Console to all nodes" doesn't open cloud objects with console configured. Fixes #2902
+* Change default path for SecureCRT. Fixes #2896
+* Add icons in setup.py Ref #2898
+* Add remote viewer as a VNC console for Linux. Fixes #2913
+
+## 2.2.3 12/11/2019
+
+* Fix issue when binding on 0.0.0.0. Fixes #2892
+* Allow double click on cloud with configured console to open session. Fixes #2894
+* Officially support Python 3.8. Ref https://github.com/GNS3/gns3-gui/issues/2895
+* Set psutil to version 5.6.3 in requirements.txt
+
+## 2.2.2 04/11/2019
+
+* Fix KeyError: 'spice+agent'. Fixes #2890
+* Fix wrong log.error() call when exporting file.
+* Revert "Explicitly cleanup the cache directory."
+* Fix "UnboundLocalError: local variable 'pywintypes' referenced before assignment"
+* Fix GUI uses only telnet console. Fixes #2885
+* Fix missing sys module in sudo.py Fixes #2886
+
+## 2.2.1 01/11/2019
+
+* Check if console_type is None.
+* Explicitly cleanup the cache directory.
+* Get Windows interface from registry if cannot load win32com module.
+* Ignore OSError returned by psutil when bringing console to front.
+* Catch error if NPF or NPCAP service cannot be detected. Ref https://github.com/GNS3/gns3-server/issues/1670
+* Better handling for reading synchronous JSON response from server. Ref #2874
+* Fix JSONDecodeError when getting server version. Fixes #2874
+* Fix FileNotFoundError exceptions when launching SPICE or VNC clients.
+* Fix UnboundLocalError local variable 'win32serviceutil' referenced before assignment
+* 'Fix' tab order in preferences dialog so it follows the layout
+* 'Fix' tab order in edit project dialog so it follows the layout
+* Use compatible shlex_quote to handle case where Windows needs double quotes around file names, not single quotes. Ref https://github.com/GNS3/gns3-gui/issues/2866
+* Use 0.0.0.0 by default for server host. Fixes https://github.com/GNS3/gns3-server/issues/1663
+* Catch IndexError when configuring port names. Fixes #2865
+
+## 2.2.0 30/09/2019
+
+* No changes
+
+## 2.2.0rc5 09/09/2019
+
+* Adjust size for setup dialog and remove question about running the wizard again. Ref #2846
+
+## 2.2.0rc4 30/08/2019
+
+* Fix issue when asking to run the setup wizard again. Ref #2846
+* Remove warning about VirtualBox not supporting nested virtualization. Ref https://github.com/GNS3/gns3-server/issues/1610
+* Ask user if they want to see the wizard again. Ref #2846
+
+## 2.2.0rc3 12/08/2019
+
+* Revert to jsonschema 2.6.0 due to packaging problem.
+
+## 2.2.0rc2 10/08/2019
+
+* Bump jsonschema to version 3.0.2
+* Fix "Unable to change Remote Main Server IP". Fixes #2823
+* Fix "AttributeError: 'QGraphicsTextItem' object has no attribute 'locked'". Fixes #2814
+* Fix a minor typo in the setup wizard
+
+## 2.2.0b4 11/07/2019
+
+* Fix issue preventing to open the QFileDialog in the correct directory.
+* Remove unused edit readme action. Fixes #2816
+* Remove deprecated Qemu parameter to run legacy ASA VMs. Fixes #2827
+* Upload images on remote controller. Fixes #2828
+* Preferences dialog: send API request only if connected to controller
+* Fix AttributeError: 'QGraphicsTextItem' object has no attribute 'locked'. Fixes #2814
+* Fix KeyError: 'chassis' when converting old IOS templates. Fixes #2813
+
+## 2.2.0b3 15/06/2019
+
+* Fix template migration issues from GUI to controller. Fixes https://github.com/GNS3/gns3-gui/issues/2803
+* %guest-cid% variable implementation for Qemu VMs. Fixes https://github.com/GNS3/gns3-gui/issues/2804
+* Increase timeout from 2 to 5 seconds for synchronous check. Ref #2805
+
+## 2.2.0b2 29/05/2019
+
+* Fix KeyError: 'endpoint' issue. Fixes #2802
+* Fix wrong aligment of symbols in saved/exported projects. Fixes #2800
+* Replace urllib.request by Qt implementation for local server synchronous check. Fixes #2793
+* Support snapshots for portable projects. Fixes https://github.com/GNS3/gns3-gui/issues/2792
+* Fix event notification problem for projects and how snapshots are restored.
+* Do not close the nodes dock widget when creating project.
+* Fix no scan for images on remote controller. Fixes #2799
+* Use QNetworkAccessManager to download custom appliance symbols.
+* Experimental auto upgrade should not be available for "frozen" app. Fixes #2797
+* Don't allow link labels to be moved for locked nodes. Fixes #2794
+* Catch more OSError/PermissionError when checking md5 on remote images. Fixes #2582
+* Fix exception when grid size is 0. Fixes #2790
+* Catch PermissionError when scanning local image directories. Fixes #2791
+
+## 2.1.20 29/05/2019
+
+* Fix KeyError: 'endpoint' issue. Fixes #2802
+
+## 2.1.19 28/05/2019
+
+* Fix wrong aligment of symbols in saved/exported projects. Fixes #2800
+* Replace urllib.request by Qt implementation for local server synchronous check. Fixes #2793
+* Set grid's minimum to 5. Fixes #2795
+
+## 2.1.18 22/05/2019
+
+* Fix error in HTTPConnection.request for Python3.6. Fixes #2793
+* Catch more OSError/PermissionError when checking md5 on remote images. Fixes #2582
+* Fix exception when grid size is 0. Fixes #2790
+* Catch PermissionError when scanning local image directories. Fixes #2791
+* Revert "Make sure the latest PyQt5 version 5.12.x is used on Windows." Ref #2778
+
+## 2.2.0b1 21/05/2019
+
+* Change behavior when an IOU license is verified. Fixes https://github.com/GNS3/gns3-server/issues/1555
+* Fix cannot load new profile. Fixes #2784
+* Fix remote packet capture when controller is also remote. Fixes #2785
+* Set console type to "none" by default for Ethernet switches and add a warning if trying to use "telnet". Fixes https://github.com/GNS3/gns3-gui/issues/2776
+* Add tooltip for symbol theme support in general preferences. Fixes #2770
+* Support for persistent docker volumes
+
+## 2.1.17 17/05/2019
+
+* No changes.
+
+## 2.2.0a5 15/04/2019
+
+* Revert "Drop old Qemu support (Windows and macOS) and legacy ASA support." Ref https://github.com/GNS3/gns3-server/issues/1579
+* Do not make NPF or NPCAP service mandatory to start the local server on Windows.
+* Do not try to upload a local image that is already installed on the local server.
+* Back to the major.minor version for config files. Ref https://github.com/GNS3/gns3-gui/issues/2756
+* Some adjustments with compute WebSocket handling. Ref https://github.com/GNS3/gns3-server/issues/1564
+* Fix AttributeError: 'GraphicsView' object has no attribute '_import_config_dir'. Fixes #2768
+* Do not try to lock a SvgIconItem. Fixes #2766
+* Prevent locked nodes to be deleted. Fixes https://github.com/GNS3/gns3-gui/issues/2764
+* Add PuTTY 0.71 and mark GNS3 PuTTY as deprecated. Fixes #2758
+* Fix bug with IOS platform detection. Fixes #2760
+
+## 2.1.16 15/04/2019
+
+* Do not make NPF or NPCAP service mandatory to start the local server on Windows.
+* Fix OverflowError error with progress dialog. Fixes #2767
+* More fixes for stuck progress window. Fixes #2765
+* Fix adding multiple devices - stuck progress window. Fixes #2765
+* Make sure the latest PyQt5 version 5.12.x is used on Windows.
+* Show a warning when a config export is not supported. Ref #2762
+
+## 2.1.15 21/03/2019
+
+* No changes on the GUI.
+
 ## 2.2.0a4 05/04/2019
 
 * Use the full version number for path to config files. Ref https://github.com/GNS3/gns3-gui/issues/2756

Dockerfile

@@ -1,5 +1,5 @@
 # Run tests inside a container
-FROM ubuntu:17.10
+FROM ubuntu:18.04
 
 MAINTAINER GNS3 Team
 

dev-requirements.txt

@@ -1,6 +1,6 @@
 -rrequirements.txt
 
 pep8==1.7.0
-pytest==4.4.0
+pytest==4.4.1
 pytest-pythonpath==0.7.3 # useful for running tests outside tox
 pytest-timeout==1.3.3

gns3/controller.py

@@ -54,8 +54,7 @@ class Controller(QtCore.QObject):
         self._error_dialog = None
         self._display_error = True
         self._projects = []
-        self._controller_websocket = QtWebSockets.QWebSocket()
-        self._project_websocket = QtWebSockets.QWebSocket()
+        self._websocket = QtWebSockets.QWebSocket()
 
         # If we do multiple call in order to download the same symbol we queue them
         self._static_asset_download_queue = {}
@@ -247,12 +246,6 @@ class Controller(QtCore.QObject):
         if self._http_client:
             return self._http_client.createHTTPQuery(method, path, *args, **kwargs)
 
-    def getSynchronous(self, endpoint, timeout=2):
-        return self._http_client.getSynchronous(endpoint, timeout)
-
-    def connectProjectWebSocket(self, path, *args):
-        return self._http_client.connectWebSocket(self._project_websocket, path)
-
     @staticmethod
     def instance():
         """
@@ -427,7 +420,7 @@ class Controller(QtCore.QObject):
                                                                               ignoreErrors=True)
 
         else:
-            self._notification_stream = self._http_client.connectWebSocket(self._controller_websocket, "/notifications/ws")
+            self._notification_stream = self._http_client.connectWebSocket(self._websocket, "/notifications/ws")
             self._notification_stream.textMessageReceived.connect(self._websocket_event_received)
             self._notification_stream.error.connect(self._websocket_error)
 

gns3/crash_report.py

@@ -52,7 +52,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "https://d4962cd8f9ed4259a568b6931d8d2404:4f5cb4bbc93742e89620d4b1522900da@sentry.io/38506"
+    DSN = "https://3ed890e6a3d344c7948646a39047c997:6ed2ebefafb6455cb91d130b70109d7e@o19455.ingest.sentry.io/38506"
     if hasattr(sys, "frozen"):
         cacert = get_resource("cacert.pem")
         if cacert is not None and os.path.isfile(cacert):

gns3/dialogs/appliance_wizard.py

@@ -72,21 +72,19 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
         self.uiCreateVersionPushButton.clicked.connect(self._createVersionPushButtonClickedSlot)
         self.allowCustomFiles.clicked.connect(self._allowCustomFilesChangedSlot)
 
-        #FIXME: deactivate the create version feature (confusing and maybe not necessary, TBD)
-        self.uiCreateVersionPushButton.hide()
-
         # directories where to search for images
         images_directories = list()
-        images_directories.append(os.path.dirname(self._path))
-        download_directory = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.DownloadLocation)
-        if download_directory != "" and download_directory != os.path.dirname(self._path):
-            images_directories.append(download_directory)
 
         for emulator in ("QEMU", "IOU", "DYNAMIPS"):
             emulator_images_dir = ImageManager.instance().getDirectoryForType(emulator)
             if os.path.exists(emulator_images_dir):
                 images_directories.append(emulator_images_dir)
 
+        images_directories.append(os.path.dirname(self._path))
+        download_directory = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.DownloadLocation)
+        if download_directory != "" and download_directory != os.path.dirname(self._path):
+            images_directories.append(download_directory)
+
         # registry to search for images
         self._registry = Registry(images_directories)
         self._registry.image_list_changed_signal.connect(self.images_changed_signal.emit)
@@ -196,7 +194,7 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
                     QtWidgets.QMessageBox.warning(self, "GNS3 VM", "The GNS3 VM is not available, please configure the GNS3 VM before adding a new appliance.")
 
         elif self.page(page_id) == self.uiFilesWizardPage:
-            if self._compute_id != "local":
+            if Controller.instance().isRemote() or self._compute_id != "local":
                 self._registry.getRemoteImageList(self._appliance.emulator(), self._compute_id)
             else:
                 self.images_changed_signal.emit()
@@ -418,7 +416,8 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
                     if img.location == "local":
                         image["status"] = "Found locally"
                     else:
-                        image["status"] = "Found on {}".format(self._compute_id)
+                        compute = ComputeManager.instance().getCompute(self._compute_id)
+                        image["status"] = "Found on {}".format(compute.name())
                     image["md5sum"] = img.md5sum
                     image["filesize"] = img.filesize
                     image["path"] = img.path
@@ -476,7 +475,7 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
         Allow user to create a new version of an appliance
         """
 
-        new_version, ok = QtWidgets.QInputDialog.getText(self, "Creating a new version", "Creating a new version allows to import unknown files to use with this appliance.\nPlease share your experience on the GNS3 community if this version works.\n\nVersion name:", QtWidgets.QLineEdit.Normal)
+        new_version, ok = QtWidgets.QInputDialog.getText(self, "Creating a new version", "Create a new version for this appliance.\nPlease share your experience on the GNS3 community if this version works.\n\nVersion name:", QtWidgets.QLineEdit.Normal)
         if ok:
             try:
                 self._appliance.create_new_version(new_version)
@@ -573,7 +572,7 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
         if "qemu" in appliance_configuration:
             appliance_configuration["qemu"]["path"] = self.uiQemuListComboBox.currentData()
 
-        new_template = ApplianceToTemplate().new_template(appliance_configuration, self._compute_id, self._symbols)
+        new_template = ApplianceToTemplate().new_template(appliance_configuration, self._compute_id, self._symbols, parent=self)
         TemplateManager.instance().createTemplate(Template(new_template), callback=self._templateCreatedCallback)
         return False
 
@@ -614,9 +613,12 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
             return
         for image in appliance_configuration["images"]:
             if image["location"] == "local":
+                if not Controller.instance().isRemote() and self._compute_id == "local" and image["path"].startswith(ImageManager.instance().getDirectory()):
+                    log.debug("{} is already on the local server".format(image["path"]))
+                    return
                 image = Image(self._appliance.emulator(), image["path"], filename=image["filename"])
-                image_upload_manger = ImageUploadManager(image, Controller.instance(), self._compute_id, self._applianceImageUploadedCallback, LocalConfig.instance().directFileUpload())
-                image_upload_manger.upload()
+                image_upload_manager = ImageUploadManager(image, Controller.instance(), self._compute_id, self._applianceImageUploadedCallback, LocalConfig.instance().directFileUpload())
+                image_upload_manager.upload()
                 self._image_uploading_count += 1
 
     def _applianceImageUploadedCallback(self, result, error=False, context=None, **kwargs):

gns3/dialogs/console_command_dialog.py

@@ -44,6 +44,9 @@ class ConsoleCommandDialog(QtWidgets.QDialog, Ui_uiConsoleCommandDialog):
         """
         super().__init__(parent)
         self.setupUi(self)
+        if console_type == "spice+agent":
+            # special case for spice+agent, use the spice console type
+            console_type = "spice"
         self._console_type = console_type
         self._current = current
 
@@ -63,7 +66,7 @@ class ConsoleCommandDialog(QtWidgets.QDialog, Ui_uiConsoleCommandDialog):
         elif self._console_type == "vnc":
             self._consoles = copy.copy(PRECONFIGURED_VNC_CONSOLE_COMMANDS)
             self._consoles.update(self._settings[self._console_type])
-        elif self._console_type.startswith("spice"):
+        elif self._console_type == "spice":
             self._consoles = copy.copy(PRECONFIGURED_SPICE_CONSOLE_COMMANDS)
             self._consoles.update(self._settings[self._console_type])
 
@@ -121,8 +124,8 @@ class ConsoleCommandDialog(QtWidgets.QDialog, Ui_uiConsoleCommandDialog):
         dialog = ConsoleCommandDialog(parent, console_type=console_type, current=current)
         dialog.show()
         if dialog.exec_():
-            return (True, dialog.uiCommandPlainTextEdit.toPlainText().replace("\n", " "))
-        return (False, None)
+            return True, dialog.uiCommandPlainTextEdit.toPlainText().replace("\n", " ")
+        return False, None
 
 
 if __name__ == '__main__':

gns3/dialogs/edit_project_dialog.py

@@ -108,14 +108,19 @@ class EditProjectDialog(QtWidgets.QDialog, Ui_EditProjectDialog):
         """
 
         if result:
-            self._project.setName(self.uiProjectNameLineEdit.text())
-            self._project.setAutoOpen(self.uiProjectAutoOpenCheckBox.isChecked())
-            self._project.setAutoClose(not self.uiProjectAutoCloseCheckBox.isChecked())
-            self._project.setAutoStart(self.uiProjectAutoStartCheckBox.isChecked())
-            self._project.setSceneHeight(self.uiSceneHeightSpinBox.value())
-            self._project.setSceneWidth(self.uiSceneWidthSpinBox.value())
-            self._project.setNodeGridSize(self.uiNodeGridSizeSpinBox.value())
-            self._project.setDrawingGridSize(self.uiDrawingGridSizeSpinBox.value())
-            self._project.setVariables(self._cleanVariables())
-            self._project.update()
+            node_grid_size = self.uiNodeGridSizeSpinBox.value()
+            drawing_grid_size = self.uiDrawingGridSizeSpinBox.value()
+            if node_grid_size % drawing_grid_size != 0:
+                QtWidgets.QMessageBox.critical(self, "Grid sizes", "Invalid grid sizes which will create overlapping lines")
+            else:
+                self._project.setNodeGridSize(node_grid_size)
+                self._project.setDrawingGridSize(drawing_grid_size)
+                self._project.setName(self.uiProjectNameLineEdit.text())
+                self._project.setAutoOpen(self.uiProjectAutoOpenCheckBox.isChecked())
+                self._project.setAutoClose(not self.uiProjectAutoCloseCheckBox.isChecked())
+                self._project.setAutoStart(self.uiProjectAutoStartCheckBox.isChecked())
+                self._project.setSceneHeight(self.uiSceneHeightSpinBox.value())
+                self._project.setSceneWidth(self.uiSceneWidthSpinBox.value())
+                self._project.setVariables(self._cleanVariables())
+                self._project.update()
         super().done(result)

gns3/dialogs/preferences_dialog.py

@@ -128,7 +128,7 @@ class PreferencesDialog(QtWidgets.QDialog, Ui_PreferencesDialog):
 
         # Class name, changed signal
         widget_to_watch = {
-            #QtWidgets.QLineEdit: "textChanged",
+            QtWidgets.QLineEdit: "textChanged",
             QtWidgets.QPlainTextEdit: "textChanged",
             # QtWidgets.QTreeWidget: "itemChanged",
             QtWidgets.QComboBox: "currentIndexChanged",

gns3/dialogs/profile_select.py

@@ -22,6 +22,7 @@ import shutil
 from gns3.qt import QtWidgets
 from gns3.local_config import LocalConfig
 from gns3.ui.profile_select_dialog_ui import Ui_ProfileSelectDialog
+from gns3.version import __version_info__
 
 import logging
 log = logging.getLogger(__name__)
@@ -39,8 +40,8 @@ class ProfileSelectDialog(QtWidgets.QDialog, Ui_ProfileSelectDialog):
             self._main.hide()
             parent = self._main
         super().__init__(parent)
-        self.setupUi(self)
 
+        self.setupUi(self)
         self.uiNewPushButton.clicked.connect(self._newPushButtonSlot)
         self.uiDeletePushButton.clicked.connect(self._deletePushButtonSlot)
 
@@ -48,12 +49,13 @@ class ProfileSelectDialog(QtWidgets.QDialog, Ui_ProfileSelectDialog):
         screen = QtWidgets.QApplication.desktop().screenGeometry()
         self.move(screen.center() - self.rect().center())
 
+        version = "{}.{}".format(__version_info__[0], __version_info__[1])
         if sys.platform.startswith("win"):
             appdata = os.path.expandvars("%APPDATA%")
-            path = os.path.join(appdata, "GNS3")
+            path = os.path.join(appdata, "GNS3", version)
         else:
             home = os.path.expanduser("~")
-            path = os.path.join(home, ".config", "GNS3")
+            path = os.path.join(home, ".config", "GNS3", version)
         self.profiles_path = os.path.join(path, "profiles")
 
         self.uiShowAtStartupCheckBox.setChecked(LocalConfig.instance().multiProfiles())
@@ -65,9 +67,9 @@ class ProfileSelectDialog(QtWidgets.QDialog, Ui_ProfileSelectDialog):
 
         try:
             if os.path.exists(self.profiles_path):
-                for profil in sorted(os.listdir(self.profiles_path)):
-                    if not profil.startswith("."):
-                        self.uiProfileSelectComboBox.addItem(profil)
+                for profile in sorted(os.listdir(self.profiles_path)):
+                    if not profile.startswith("."):
+                        self.uiProfileSelectComboBox.addItem(profile)
         except OSError:
             pass
 
@@ -79,7 +81,7 @@ class ProfileSelectDialog(QtWidgets.QDialog, Ui_ProfileSelectDialog):
         super().accept()
 
     def _newPushButtonSlot(self):
-        profile, ok = QtWidgets.QInputDialog.getText(self.parent(), "New profile", "Profile name:")
+        profile, ok = QtWidgets.QInputDialog.getText(self, "New profile", "Profile name:")
         if ok:
             self.uiProfileSelectComboBox.addItem(profile)
             self.uiProfileSelectComboBox.setCurrentText(profile)
@@ -88,13 +90,13 @@ class ProfileSelectDialog(QtWidgets.QDialog, Ui_ProfileSelectDialog):
     def _deletePushButtonSlot(self):
         profile = self.uiProfileSelectComboBox.currentText()
         if profile == "default":
-            QtWidgets.QMessageBox.critical(self.parentWidget(), "Delete profile", "You can't delete the default profile")
+            QtWidgets.QMessageBox.critical(self, "Delete profile", "The default profile cannot be deleted")
         else:
             try:
                 shutil.rmtree(os.path.join(self.profiles_path, profile))
                 self._refresh()
             except (OSError, PermissionError) as e:
-                QtWidgets.QMessageBox.critical(self.parentWidget(), "Delete profile", str(e))
+                QtWidgets.QMessageBox.critical(self, "Cannot delete profile", str(e))
 
 
 if __name__ == '__main__':

gns3/dialogs/project_export_wizard.py

@@ -16,6 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
+import os
 import datetime
 
 from gns3.qt import QtCore, QtWidgets
@@ -55,7 +56,19 @@ class ExportProjectWizard(QtWidgets.QWizard, Ui_ExportProjectWizard):
         self.helpRequested.connect(self._showHelpSlot)
         self.uiPathBrowserToolButton.clicked.connect(self._pathBrowserSlot)
 
-        readme_text = "Project: '{}' created on {}\nAuthor: John Doe <john.doe@example.com>\n\nNo project description was given".format(self._project.name(), datetime.date.today())
+        # read an existing README.txt file if existing
+        readme_text = None
+        if project.filesDir():
+            readme_path = os.path.join(project.filesDir(), "README.txt")
+            if os.path.exists(readme_path):
+                try:
+                    with open(readme_path, "rb") as file:
+                        readme_text = file.read().decode("utf-8", errors="replace")
+                except OSError as e:
+                    log.warning("could not read {}: {}".format(readme_path, e))
+
+        if readme_text is None:
+            readme_text = "Project: '{}' created on {}\nAuthor: John Doe <john.doe@example.com>\n\nNo project description was given".format(self._project.name(), datetime.date.today())
         self.uiReadmeTextEdit.setPlainText(readme_text)
 
     def _pathBrowserSlot(self):
@@ -119,8 +132,12 @@ class ExportProjectWizard(QtWidgets.QWizard, Ui_ExportProjectWizard):
                 include_images = "yes"
             else:
                 include_images = "no"
+            if self.uiIncludeSnapshotsCheckBox.isChecked():
+                include_snapshots = "yes"
+            else:
+                include_snapshots = "no"
             compression = self.uiCompressionComboBox.currentData()
-            export_worker = ExportProjectWorker(self._project, self._path, include_images, compression)
+            export_worker = ExportProjectWorker(self._project, self._path, include_images, include_snapshots, compression)
             progress_dialog = ProgressDialog(export_worker, "Exporting project", "Exporting portable project files...", "Cancel", parent=self, create_thread=False)
             progress_dialog.show()
             progress_dialog.exec_()

gns3/dialogs/project_welcome_dialog.py

@@ -37,9 +37,7 @@ class ProjectWelcomeDialog(QtWidgets.QDialog, Ui_ProjectWelcomeDialog):
         self.uiOkButton.clicked.connect(self._okButtonClickedSlot)
         self.gridLayout.setAlignment(QtCore.Qt.AlignTop)
         self.label.setOpenExternalLinks(True)
-
         self._variables = self._getVariables(project)
-
         self._loadReadme()
         self._addMisingVariablesEdits()
 
@@ -50,10 +48,11 @@ class ProjectWelcomeDialog(QtWidgets.QDialog, Ui_ProjectWelcomeDialog):
         return variables
 
     def _addMisingVariablesEdits(self):
-        missing = [v for v in self._variables if v.get("value", "").strip() == ""]
+        #TODO: refactor this to use a QListWidget
+        missing = [v for v in self._variables if v.get("name") and v.get("value", "").strip() == ""]
         for i, variable in enumerate(missing, start=0):
             nameLabel = QtWidgets.QLabel()
-            nameLabel.setText(variable.get("name", ""))
+            nameLabel.setText(variable.get("name") + ":")
             self.gridLayout.addWidget(nameLabel, i, 0)
 
             valueEdit = QtWidgets.QLineEdit()
@@ -72,13 +71,13 @@ class ProjectWelcomeDialog(QtWidgets.QDialog, Ui_ProjectWelcomeDialog):
         variable["value"] = text
 
     def _okButtonClickedSlot(self):
-        missing = [v for v in self._variables if v.get("value", "").strip() == ""]
+        missing = [v for v in self._variables if v.get("name") and v.get("value", "").strip() == ""]
         if len(missing) > 0:
-            reply = QtWidgets.QMessageBox.warning(
-                self, 'Missing values',
-                'Are you sure you want to continue without providing missing values?',
-                QtWidgets.QMessageBox.Yes,
-                QtWidgets.QMessageBox.No)
+            reply = QtWidgets.QMessageBox.warning(self,
+                                                  "Missing values",
+                                                  "Are you sure you want to continue without providing missing values?",
+                                                  QtWidgets.QMessageBox.Yes,
+                                                  QtWidgets.QMessageBox.No)
             if reply == QtWidgets.QMessageBox.No:
                 return
 

gns3/dialogs/setup_wizard.py

@@ -43,6 +43,7 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
 
         super().__init__(parent)
         self.setupUi(self)
+        self.adjustSize()
 
         self._gns3_vm_settings = {
             "enable": True,
@@ -83,10 +84,15 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
             if address.protocol() in [QtNetwork.QAbstractSocket.IPv4Protocol, QtNetwork.QAbstractSocket.IPv6Protocol]:
                 address_string = address.toString()
                 if address_string.startswith("169.254") or address_string.startswith("fe80"):
-                    # ignore link-local addresses
+                    # ignore link-local addresses, could not use https://doc.qt.io/qt-5/qhostaddress.html#isLinkLocal
+                    # because it was introduced in Qt 5.11
                     continue
                 self.uiLocalServerHostComboBox.addItem(address_string, address_string)
 
+        self.uiLocalServerHostComboBox.addItem("localhost", "localhost")  # local host
+        self.uiLocalServerHostComboBox.addItem("::", "::")  # all IPv6 addresses
+        self.uiLocalServerHostComboBox.addItem("0.0.0.0", "0.0.0.0")  # all IPv4 addresses
+
         if sys.platform.startswith("darwin"):
             self.uiVMwareBannerButton.setIcon(QtGui.QIcon(":/images/vmware_fusion_banner.png"))
         else:
@@ -141,7 +147,6 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
         Slot to refresh the VirtualBox VMs list.
         """
 
-        QtWidgets.QMessageBox.warning(self, "GNS3 VM on VirtualBox", "VirtualBox doesn't support nested virtualization, this means running Qemu based VM could be very slow")
         download_url = "https://github.com/GNS3/gns3-gui/releases/download/v{version}/GNS3.VM.VirtualBox.{version}.zip".format(version=__version__)
         self.uiGNS3VMDownloadLinkUrlLabel.setText('If you don\'t have the GNS3 Virtual Machine you can <a href="{download_url}">download it here</a>.<br>And import the VM in the virtualization software and hit refresh.'.format(download_url=download_url))
         self.uiVmwareRadioButton.setChecked(False)
@@ -414,11 +419,8 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
             settings["hide_setup_wizard"] = True
         else:
             local_server_settings = LocalServer.instance().localServerSettings()
-            if local_server_settings["host"] is None:
-                local_server_settings["host"] = DEFAULT_LOCAL_SERVER_HOST
-                LocalServer.instance().updateLocalServerSettings(local_server_settings)
-            settings["hide_setup_wizard"] = self.uiShowCheckBox.isChecked()
-
+            LocalServer.instance().updateLocalServerSettings(local_server_settings)
+            settings["hide_setup_wizard"] = not self.uiShowCheckBox.isChecked()
         self.parentWidget().setSettings(settings)
         super().done(result)
 

gns3/graphics_view.py

@@ -49,7 +49,7 @@ from .compute_manager import ComputeManager
 from .utils.get_icon import get_icon
 
 # link items
-from .items.link_item import LinkItem
+from .items.link_item import LinkItem, SvgIconItem
 from .items.ethernet_link_item import EthernetLinkItem
 from .items.serial_link_item import SerialLinkItem
 
@@ -460,25 +460,15 @@ class GraphicsView(QtWidgets.QGraphicsView):
             else:
                 item.setSelected(True)
         elif is_not_link and is_not_logo and event.button() == QtCore.Qt.RightButton and not self._adding_link:
-            if item and not sip.isdeleted(item):
-                # Prevent right clicking on a selected item from de-selecting all other items
-                if not item.isSelected():
-                    if not event.modifiers() & QtCore.Qt.ControlModifier:
-                        for it in self.scene().items():
-                            it.setSelected(False)
-                    item.setSelected(True)
-                    self._showDeviceContextualMenu(QtGui.QCursor.pos())
-                else:
-                    self._showDeviceContextualMenu(QtGui.QCursor.pos())
-            # when more than one item is selected display the contextual menu even if mouse is not above an item
-            elif len(self.scene().selectedItems()) > 1:
-                self._showDeviceContextualMenu(QtGui.QCursor.pos())
+            pass #TODO: remove this without creating a bug...
         elif is_not_link and self._adding_link and event.button() == QtCore.Qt.RightButton:
             # send a escape key to the main window to cancel the link addition
             key = QtGui.QKeyEvent(QtCore.QEvent.KeyPress, QtCore.Qt.Key_Escape, QtCore.Qt.NoModifier)
             QtWidgets.QApplication.sendEvent(self._main_window, key)
         elif item and isinstance(item, NodeItem) and self._adding_link and event.button() == QtCore.Qt.LeftButton:
             self._userNodeLinking(event, item)
+            #context_event = QtGui.QContextMenuEvent(QtGui.QContextMenuEvent.Mouse, event.pos())
+            #QtWidgets.QApplication.sendEvent(self, context_event)
         elif event.button() == QtCore.Qt.LeftButton and self._adding_note:
             pos = self.mapToScene(event.pos())
             note = self.createDrawingItem("text", pos.x(), pos.y(), 2)
@@ -512,6 +502,48 @@ class GraphicsView(QtWidgets.QGraphicsView):
 
         self.toggleUiDeviceMenu()
 
+    def contextMenuEvent(self, event):
+        """
+        Handles all context menu events.
+
+        :param event: QContextMenuEvent instance
+        """
+
+        is_not_link = True
+        is_not_logo = True
+
+        item = self.itemAt(event.pos())
+        if item and sip.isdeleted(item):
+            return
+
+        if item and (isinstance(item, LinkItem) or isinstance(item.parentItem(), LinkItem)):
+            is_not_link = False
+        if item and (isinstance(item, LogoItem) or isinstance(item.parentItem(), LogoItem)):
+            is_not_logo = False
+        else:
+            for it in self.scene().items():
+                if isinstance(it, LinkItem):
+                    it.setHovered(False)
+
+        if is_not_link and is_not_logo and not self._adding_link:
+            if item and not sip.isdeleted(item):
+                # Prevent right clicking on a selected item from de-selecting all other items
+                if not item.isSelected():
+                    if not event.modifiers() & QtCore.Qt.ControlModifier:
+                        for it in self.scene().items():
+                            it.setSelected(False)
+                    item.setSelected(True)
+                    self._showDeviceContextualMenu(event.globalPos())
+                else:
+                    self._showDeviceContextualMenu(event.globalPos())
+            # when more than one item is selected display the contextual menu even if mouse is not above an item
+            elif len(self.scene().selectedItems()) > 1:
+                self._showDeviceContextualMenu(event.globalPos())
+        #elif item and isinstance(item, NodeItem) and self._adding_link:
+        #    self._userNodeLinking(event, item)
+        else:
+            super().contextMenuEvent(event)
+
     def mouseReleaseEvent(self, event):
         """
         Handles all mouse release events.
@@ -627,7 +659,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
         if not self._adding_link:
             if isinstance(item, NodeItem) and item.node().initialized():
                 item.setSelected(True)
-                if item.node().status() == Node.stopped or item.node().isAlwaysOn():
+                if item.node().status() == Node.stopped or item.node().consoleType() == "none":
                     self.configureSlot()
                     return
                 else:
@@ -988,6 +1020,9 @@ class GraphicsView(QtWidgets.QGraphicsView):
             if isinstance(item, NodeItem) and item.node().initialized():
                 new_hostname, ok = QtWidgets.QInputDialog.getText(self, "Change hostname", "Hostname:", QtWidgets.QLineEdit.Normal, item.node().name())
                 if ok:
+                    if not new_hostname.strip():
+                        QtWidgets.QMessageBox.critical(self, "Change hostname", "Hostname cannot be blank")
+                        continue
                     if hasattr(item.node(), "validateHostname"):
                         if not item.node().validateHostname(new_hostname):
                             QtWidgets.QMessageBox.critical(self, "Change hostname", "Invalid name detected for this node: {}".format(new_hostname))
@@ -1054,8 +1089,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
 
         # TightVNC has lack support of IPv6 host at this moment
         if "vncviewer" in node.consoleCommand() and ":" in node.consoleHost():
-            QtWidgets.QMessageBox.warning(
-                self, "TightVNC", "TightVNC (vncviewer) may not start because of lack of IPv6 support.")
+            QtWidgets.QMessageBox.warning(self, "TightVNC", "TightVNC (vncviewer) may not start because of lack of IPv6 support.")
 
         try:
             node.openConsole(aux=aux)
@@ -1096,11 +1130,11 @@ class GraphicsView(QtWidgets.QGraphicsView):
 
     def consoleFromAllItems(self):
         """
-        Console from all scene items, except builtin devices.
+        Console from all scene items with console type different than "none"
         """
 
         items = [item for item in self.scene().items()
-                 if not (isinstance(item, NodeItem) and isinstance(item.node().module(), Builtin))]
+                 if isinstance(item, NodeItem) and item.node().consoleType() != "none"]
         self.consoleFromItems(items)
 
     def consoleActionSlot(self):
@@ -1116,24 +1150,20 @@ class GraphicsView(QtWidgets.QGraphicsView):
         Allow user to use a custom console for this VM
         """
 
-        current_cmd = None
-        console_type = "telnet"
         for item in self.scene().selectedItems():
-            if isinstance(item, NodeItem) and item.node().console() is not None and item.node().initialized() and item.node().status() == Node.started:
+            if isinstance(item, NodeItem) and item.node().console() is not None and item.node().initialized():
                 if item.node().consoleType() not in ("telnet", "serial", "vnc", "spice", "spice+agent"):
                     continue
                 current_cmd = item.node().consoleCommand()
                 console_type = item.node().consoleType()
 
-        (ok, cmd) = ConsoleCommandDialog.getCommand(self, console_type=console_type, current=current_cmd)
-        if ok:
-            for item in self.scene().selectedItems():
-                if isinstance(item, NodeItem) and item.node().console() is not None and item.node().initialized() and item.node().status() == Node.started:
-                    node = item.node()
-                    if node.consoleType() not in ("telnet", "serial", "vnc", "spice", "spice+agent"):
-                        continue
+                (ok, cmd) = ConsoleCommandDialog.getCommand(self, console_type=console_type, current=current_cmd)
+                if ok:
                     try:
-                        node.openConsole(command=cmd)
+                        if item.node().status() != Node.started:
+                            QtWidgets.QMessageBox.warning(self, "Console", "This node must be started before a console can be opened")
+                            continue
+                        item.node().openConsole(command=cmd)
                     except (OSError, ValueError) as e:
                         QtWidgets.QMessageBox.critical(self, "Console", "Cannot start console application: {}".format(e))
 
@@ -1199,12 +1229,12 @@ class GraphicsView(QtWidgets.QGraphicsView):
 
             path, _ = QtWidgets.QFileDialog.getOpenFileName(self,
                                                             "Import {}".format(os.path.basename(config_file)),
-                                                            self._import_config_dir,
+                                                            self._import_config_directory,
                                                             "All files (*.*);;Config files (*.cfg)",
                                                             "Config files (*.cfg)")
             if not path:
                 continue
-            self._import_config_dir = os.path.dirname(path)
+            self._import_config_directory = os.path.dirname(path)
             item.node().importFile(config_file, path)
 
     def editConfigActionSlot(self):
@@ -1485,7 +1515,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
         """
 
         for item in self.scene().selectedItems():
-            if not isinstance(item, LinkItem) and not isinstance(item, LabelItem):
+            if not isinstance(item, LinkItem) and not isinstance(item, LabelItem) and not isinstance(item, SvgIconItem):
                 if item.locked() is True:
                     item.setLocked(False)
                 else:
@@ -1503,7 +1533,14 @@ class GraphicsView(QtWidgets.QGraphicsView):
         selected_nodes = []
         for item in self.scene().selectedItems():
             if isinstance(item, NodeItem):
-                selected_nodes.append(item.node())
+                node = item.node()
+                if node.locked():
+                    QtWidgets.QMessageBox.critical(self, "Delete", "Cannot delete node '{}' because it is locked".format(node.name()))
+                    return
+                selected_nodes.append(node)
+            if isinstance(item, DrawingItem) and item.locked():
+                QtWidgets.QMessageBox.critical(self, "Delete", "Cannot delete drawing because it is locked")
+                return
         if selected_nodes:
             if len(selected_nodes) > 1:
                 question = "Do you want to permanently delete these {} nodes?".format(len(selected_nodes))
@@ -1598,10 +1635,12 @@ class GraphicsView(QtWidgets.QGraphicsView):
     def drawBackground(self, painter, rect):
         super().drawBackground(painter, rect)
         if self._main_window.uiShowGridAction.isChecked():
-            grids = [(self.drawingGridSize(),QtGui.QColor(208, 208, 208)),
-                     (self.nodeGridSize(),QtGui.QColor(190, 190, 190))]
+            grids = [(self.drawingGridSize(), QtGui.QColor(208, 208, 208)),
+                     (self.nodeGridSize(), QtGui.QColor(190, 190, 190))]
             painter.save()
-            for (grid,colour) in grids:
+            for (grid, colour) in grids:
+                if not grid:
+                    continue
                 painter.setPen(QtGui.QPen(colour))
 
                 left = int(rect.left()) - (int(rect.left()) % grid)

gns3/http_client.py

@@ -207,16 +207,16 @@ class HTTPClient(QtCore.QObject):
         Called when a query upload progress
         """
         if not sip_is_deleted(HTTPClient._progress_callback):
-            HTTPClient._progress_callback.progress_signal.emit(query_id, str(sent), str(total))
+            HTTPClient._progress_callback.progress_signal.emit(query_id, str(abs(sent)), str(abs(total)))
 
     def _notify_progress_download(self, query_id, sent, total):
         """
         Called when a query download progress
         """
         if not sip_is_deleted(HTTPClient._progress_callback):
-            # abs() for maxium because sometimes the system send negative
+            # abs() for maximum because sometimes the system send negative
             # values
-            HTTPClient._progress_callback.progress_signal.emit(query_id, str(sent), str(abs(total)))
+            HTTPClient._progress_callback.progress_signal.emit(query_id, str(abs(sent)), str(abs(total)))
 
     @classmethod
     def setProgressCallback(cls, progress_callback):
@@ -470,7 +470,9 @@ class HTTPClient(QtCore.QObject):
         """
         host = self._getHostForQuery()
         request = websocket.request()
-        request.setUrl(QtCore.QUrl("ws://{host}:{port}{prefix}{path}".format(host=host, port=self._port, path=path, prefix=prefix)))
+        ws_url = "ws://{host}:{port}{prefix}{path}".format(host=host, port=self._port, path=path, prefix=prefix)
+        log.debug("Connecting to WebSocket endpoint: {}".format(ws_url))
+        request.setUrl(QtCore.QUrl(ws_url))
         self._addAuth(request)
         websocket.open(request)
         return websocket
@@ -725,47 +727,54 @@ class HTTPClient(QtCore.QObject):
                     e = HttpBadRequest(body)
                 raise e
 
-    def getSynchronous(self, endpoint, timeout=2):
+    def getSynchronous(self, method, endpoint, prefix="/v2", timeout=5):
         """
         Synchronous check if a server is running
 
-        :returns: Tuple (Status code, json of anwser). Status 0 is a non HTTP error
+        :returns: Tuple (Status code, json of answer). Status 0 is a non HTTP error
         """
-        try:
-            url = "{protocol}://{host}:{port}/v2/{endpoint}".format(protocol=self._protocol, host=self._host, port=self._port, endpoint=endpoint)
 
-            if self._user is not None and len(self._user) > 0:
-                log.debug("Synchronous get {} with user '{}'".format(url, self._user))
-                auth_handler = urllib.request.HTTPBasicAuthHandler()
-                auth_handler.add_password(realm="GNS3 server",
-                                          uri=url,
-                                          user=self._user,
-                                          passwd=self._password)
-                opener = urllib.request.build_opener(auth_handler)
-                urllib.request.install_opener(opener)
-            else:
-                log.debug("Synchronous get {} (no authentication)".format(url))
-            response = urllib.request.urlopen(url, timeout=timeout)
-            content_type = response.getheader("CONTENT-TYPE")
-            if response.status == 200:
-                if content_type == "application/json":
-                    content = response.read()
+        host = self._getHostForQuery()
+
+        log.debug("{method} {protocol}://{host}:{port}{prefix}{endpoint}".format(method=method, protocol=self._protocol, host=host, port=self._port, prefix=prefix, endpoint=endpoint))
+        if self._user:
+            url = QtCore.QUrl("{protocol}://{user}@{host}:{port}{prefix}{endpoint}".format(protocol=self._protocol, user=self._user, host=host, port=self._port, prefix=prefix, endpoint=endpoint))
+        else:
+            url = QtCore.QUrl("{protocol}://{host}:{port}{prefix}{endpoint}".format(protocol=self._protocol, host=host, port=self._port, prefix=prefix, endpoint=endpoint))
+
+        request = self._request(url)
+        request = self._addAuth(request)
+        request.setRawHeader(b"User-Agent", "GNS3 QT Client v{version}".format(version=__version__).encode())
+
+        try:
+            response = self._network_manager.sendCustomRequest(request, method.encode())
+        except SystemError as e:
+            log.error("Can't send query: {}".format(str(e)))
+            return
+
+        loop = QtCore.QEventLoop()
+        response.finished.connect(loop.quit)
+
+        if timeout is not None:
+            QtCore.QTimer.singleShot(timeout * 1000, qpartial(self._timeoutSlot, response, timeout))
+
+        if not loop.isRunning():
+            loop.exec_()
+
+        status = response.attribute(QtNetwork.QNetworkRequest.HttpStatusCodeAttribute)
+        if response.error() != QtNetwork.QNetworkReply.NoError:
+            log.debug("Error while connecting to local server {}".format(response.errorString()))
+        else:
+            content_type = response.header(QtNetwork.QNetworkRequest.ContentTypeHeader)
+            if status == 200 and content_type == "application/json":
+                content = bytes(response.readAll())
+                try:
                     json_data = json.loads(content.decode("utf-8"))
-                    return response.status, json_data
-            else:
-                return response.status, None
-        except http.client.InvalidURL as e:
-            log.warning("Invalid local server url: {}".format(e))
-            return 0, None
-        except urllib.error.URLError:
-            # Connection refused. It's a normal behavior if server is not started
-            return 0, None
-        except urllib.error.HTTPError as e:
-            log.debug("Error during get on {}:{}: {}".format(self.host(), self.port(), e))
-            return e.code, None
-        except (OSError, http.client.BadStatusLine, ValueError) as e:
-            log.debug("Error during get on {}:{}: {}".format(self.host(), self.port(), e))
-        return 0, None
+                except (UnicodeEncodeError, ValueError) as e:
+                    log.warning("Could not read JSON data returned from {}: {}".format(url, e))
+                else:
+                    return status, json_data
+        return status, None
 
     @classmethod
     def fromUrl(cls, url, network_manager=None, base_settings=None):

gns3/items/ethernet_link_item.py

@@ -147,6 +147,7 @@ class EthernetLinkItem(LinkItem):
                 self._source_port.setLabel(source_port_label)
 
             if self._draw_port_labels:
+                source_port_label.setFlag(source_port_label.ItemIsMovable, not self._source_item.locked())
                 source_port_label.show()
             else:
                 source_port_label.hide()
@@ -189,6 +190,7 @@ class EthernetLinkItem(LinkItem):
                 self._destination_port.setLabel(destination_port_label)
 
             if self._draw_port_labels:
+                destination_port_label.setFlag(destination_port_label.ItemIsMovable, not self._destination_item.locked())
                 destination_port_label.show()
             else:
                 destination_port_label.hide()

gns3/items/link_item.py

@@ -280,23 +280,31 @@ class LinkItem(QtWidgets.QGraphicsPathItem):
         :param: QGraphicsSceneMouseEvent instance
         """
 
-        if event.button() == QtCore.Qt.RightButton:
-            if self._adding_flag:
-                # send a escape key to the main window to cancel the link addition
-                from ..main_window import MainWindow
-                key = QtGui.QKeyEvent(QtCore.QEvent.KeyPress, QtCore.Qt.Key_Escape, QtCore.Qt.NoModifier)
-                QtWidgets.QApplication.sendEvent(MainWindow.instance(), key)
-                return
+        if event.button() == QtCore.Qt.RightButton and self._adding_flag:
+            # send a escape key to the main window to cancel the link addition
+            from ..main_window import MainWindow
+            key = QtGui.QKeyEvent(QtCore.QEvent.KeyPress, QtCore.Qt.Key_Escape, QtCore.Qt.NoModifier)
+            QtWidgets.QApplication.sendEvent(MainWindow.instance(), key)
+            return
+        else:
+            super().mousePressEvent(event)
 
-            if not sip_is_deleted(self):
-                # create the contextual menu
-                self.setAcceptHoverEvents(False)
-                menu = QtWidgets.QMenu()
-                self.populateLinkContextualMenu(menu)
-                menu.exec_(QtGui.QCursor.pos())
-                self.setAcceptHoverEvents(True)
-                self._hovered = False
-                self.adjust()
+    def contextMenuEvent(self, event):
+        """
+        Handles all context menu events.
+
+        :param event: QContextMenuEvent instance
+        """
+
+        if not sip_is_deleted(self):
+            # create the contextual menu
+            self.setAcceptHoverEvents(False)
+            menu = QtWidgets.QMenu()
+            self.populateLinkContextualMenu(menu)
+            menu.exec_(QtGui.QCursor.pos())
+            self.setAcceptHoverEvents(True)
+            self._hovered = False
+            self.adjust()
 
     def keyPressEvent(self, event):
         """

gns3/items/node_item.py

@@ -103,22 +103,11 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
 
         from ..main_window import MainWindow
         self._main_window = MainWindow.instance()
-        if self._main_window.uiSnapToGridAction.isChecked():
-            self._snapToGrid()
         self._settings = self._main_window.uiGraphicsView.settings()
 
         if node.initialized():
             self.createdSlot(node.id())
 
-    def _snapToGrid(self):
-
-        grid_size = self._main_window.uiGraphicsView.nodeGridSize()
-        mid_x = self.boundingRect().width() / 2
-        x = (grid_size * round((self.x() + mid_x) / grid_size)) - mid_x
-        mid_y = self.boundingRect().height() / 2
-        y = (grid_size * round((self.y() + mid_y) / grid_size)) - mid_y
-        self.setPos(x, y)
-
     def updateNode(self):
         """
         Sync change to the node

gns3/items/serial_link_item.py

@@ -136,6 +136,7 @@ class SerialLinkItem(LinkItem):
                 self._source_port.setLabel(source_port_label)
 
             if self._draw_port_labels:
+                source_port_label.setFlag(source_port_label.ItemIsMovable, not self._source_item.locked())
                 source_port_label.show()
             else:
                 source_port_label.hide()
@@ -167,6 +168,7 @@ class SerialLinkItem(LinkItem):
                 self._destination_port.setLabel(destination_port_label)
 
             if self._draw_port_labels:
+                destination_port_label.setFlag(destination_port_label.ItemIsMovable, not self._destination_item.locked())
                 destination_port_label.show()
             else:
                 destination_port_label.hide()

gns3/link.py

@@ -109,9 +109,9 @@ class Link(QtCore.QObject):
         if self._capturing:
             self._capture_compute_id = result.get("capture_compute_id", None)
             self._capture_file_path = result.get("capture_file_path", None)
-            if self._capture_compute_id and self._capture_compute_id != "local":
-                # We need to stream the pcap file content if the compute is remote
-                if self._capture_file_path is None:
+            if Controller.instance().isRemote() or (self._capture_compute_id and self._capture_compute_id != "local"):
+                # We need to stream the pcap file content if the controller or compute is remote
+                if Controller.instance().isRemote() or self._capture_file_path is None:
                     self._capture_file = QtCore.QTemporaryFile()
                     self._capture_file.open(QtCore.QFile.WriteOnly)
                     self._capture_file.setAutoRemove(True)
@@ -372,7 +372,7 @@ class Link(QtCore.QObject):
 
     def stopCapture(self):
 
-        if self._capture_compute_id and self._capture_compute_id != "local":
+        if Controller.instance().isRemote() or (self._capture_compute_id and self._capture_compute_id != "local"):
             if self._capture_file:
                 self._capture_file.close()
                 self._capture_file = None

gns3/local_config.py

@@ -26,6 +26,8 @@ import psutil
 from .qt import QtCore, QtWidgets
 from .version import __version__, __version_info__
 from .utils import parse_version
+from .local_server_config import LocalServerConfig
+from .settings import LOCAL_SERVER_SETTINGS
 
 import logging
 log = logging.getLogger(__name__)
@@ -93,10 +95,15 @@ class LocalConfig(QtCore.QObject):
                 else:
                     old_config_path = os.path.join(os.path.expanduser("~"), ".config", "GNS3", filename)
 
-                # TODO: migrate versioned config file from a previous version of GNS3 (for instance 2.2.0 -> 2.2.1)
+                # TODO: migrate versioned config file from a previous version of GNS3 (for instance 2.2 -> 2.3) + support profiles
                 if os.path.exists(old_config_path):
                     # migrate post version 2.2.0 configuration file
                     shutil.copyfile(old_config_path, self._config_file)
+                    # reset the local server path and ubridge path
+                    settings = LocalServerConfig.instance().loadSettings("Server", LOCAL_SERVER_SETTINGS)
+                    settings["path"] = ""
+                    settings["ubridge_path"] = ""
+                    LocalServerConfig.instance().saveSettings("Server", settings)
                 else:
                     # create a new config
                     with open(self._config_file, "w", encoding="utf-8") as f:
@@ -131,7 +138,7 @@ class LocalConfig(QtCore.QObject):
         Get the configuration directory
         """
 
-        version = "{}.{}.{}".format(__version_info__[0], __version_info__[1], __version_info__[2])
+        version = "{}.{}".format(__version_info__[0], __version_info__[1])
         if sys.platform.startswith("win"):
             appdata = os.path.expandvars("%APPDATA%")
             path = os.path.join(appdata, "GNS3", version)
@@ -159,7 +166,7 @@ class LocalConfig(QtCore.QObject):
         # In < 1.4 on Mac the config was in a gns3.net directory
         # We have move to same location as Linux
         if sys.platform.startswith("darwin"):
-            version = "{}.{}.{}".format(__version_info__[0], __version_info__[1], __version_info__[2])
+            version = "{}.{}".format(__version_info__[0], __version_info__[1])
             old_path = os.path.join(os.path.expanduser("~"), ".config", "gns3.net")
             new_path = os.path.join(os.path.expanduser("~"), ".config", "GNS3", version)
             if os.path.exists(old_path) and not os.path.exists(new_path):

gns3/local_server.py

@@ -31,12 +31,11 @@ import subprocess
 
 
 from gns3.qt import QtWidgets, QtCore, qslot
-from gns3.settings import LOCAL_SERVER_SETTINGS
+from gns3.settings import LOCAL_SERVER_SETTINGS, DEFAULT_LOCAL_SERVER_HOST
 from gns3.local_config import LocalConfig
 from gns3.local_server_config import LocalServerConfig
 from gns3.utils.wait_for_connection_worker import WaitForConnectionWorker
 from gns3.utils.progress_dialog import ProgressDialog
-from gns3.utils.http import getSynchronous
 from gns3.utils.sudo import sudo
 from gns3.http_client import HTTPClient
 from gns3.controller import Controller
@@ -131,6 +130,7 @@ class LocalServer(QtCore.QObject):
             import win32serviceutil
         except ImportError as e:
             log.error("Could not check if the {} service is running: {}".format(service_name, e))
+            return
 
         try:
             if win32serviceutil.QueryServiceStatus(service_name, None)[1] != win32service.SERVICE_RUNNING:
@@ -246,6 +246,9 @@ class LocalServer(QtCore.QObject):
         """
         Update the local server settings. Keep the key not in new_settings
         """
+
+        if "host" in new_settings and new_settings["host"] is None:
+            new_settings["host"] = DEFAULT_LOCAL_SERVER_HOST
         old_settings = copy.copy(self._settings)
         if not self._settings:
             self._settings = new_settings
@@ -369,13 +372,15 @@ class LocalServer(QtCore.QObject):
 
         self._checkUbridgePermissions()
 
-        if sys.platform.startswith('win'):
-            if not self._checkWindowsService("npf") and not self._checkWindowsService("npcap"):
-                QtWidgets.QMessageBox.critical(self.parent(), "Error", "The NPF or NPCAP service is not installed, please install Winpcap or Npcap and reboot.")
-                return False
+        if sys.platform.startswith("win"):
+            import pywintypes
+            try:
+                if not self._checkWindowsService("npf") and not self._checkWindowsService("npcap"):
+                    log.warning("The NPF or NPCAP service is not installed, please install Winpcap or Npcap and reboot.")
+            except pywintypes.error as e:
+                log.warning("Could not check if the NPF or Npcap service is running: {}".format(e.strerror))
 
         self._port = self._settings["port"]
-
         # check the local server path
         local_server_path = self.localServerPath()
         if not local_server_path:
@@ -516,9 +521,7 @@ class LocalServer(QtCore.QObject):
         :returns: boolean
         """
 
-        status, json_data = getSynchronous(self._settings["protocol"], self._settings["host"], self._port, "version",
-                                           timeout=2, user=self._settings["user"], password=self._settings["password"])
-
+        status, json_data = HTTPClient(self._settings).getSynchronous("GET", "/version")
         if status == 401:  # Auth issue that need to be solved later
             return True
         elif json_data is None:

gns3/main_window.py

@@ -42,7 +42,7 @@ from .dialogs.edit_project_dialog import EditProjectDialog
 from .dialogs.setup_wizard import SetupWizard
 from .settings import GENERAL_SETTINGS
 from .items.node_item import NodeItem
-from .items.link_item import LinkItem
+from .items.link_item import LinkItem, SvgIconItem
 from .items.shape_item import ShapeItem
 from .items.label_item import LabelItem
 from .topology import Topology
@@ -190,7 +190,8 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
             self.uiSnapshotAction,
             self.uiEditProjectAction,
             self.uiDeleteProjectAction,
-            self.uiImportExportConfigsAction
+            self.uiImportExportConfigsAction,
+            self.uiLockAllAction
         ]
 
         # This widgets are not enabled if it's a remote controller (no access to the local file system)
@@ -259,7 +260,6 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         self.uiDrawRectangleAction.triggered.connect(self._drawRectangleActionSlot)
         self.uiDrawEllipseAction.triggered.connect(self._drawEllipseActionSlot)
         self.uiDrawLineAction.triggered.connect(self._drawLineActionSlot)
-        self.uiEditReadmeAction.triggered.connect(self._editReadmeActionSlot)
 
         # help menu connections
         self.uiOnlineHelpAction.triggered.connect(self._onlineHelpActionSlot)
@@ -363,15 +363,16 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         :return: None
         """
 
-        for item in self.uiGraphicsView.items():
-            if not isinstance(item, LinkItem) and not isinstance(item, LabelItem):
-                if self.uiLockAllAction.isChecked() and not item.locked():
-                    item.setLocked(True)
-                elif not self.uiLockAllAction.isChecked() and item.locked():
-                    item.setLocked(False)
-                if item.parentItem() is None:
-                    item.updateNode()
-                item.update()
+        if self.uiGraphicsView.isEnabled():
+            for item in self.uiGraphicsView.items():
+                if not isinstance(item, LinkItem) and not isinstance(item, LabelItem) and not isinstance(item, SvgIconItem):
+                    if self.uiLockAllAction.isChecked() and not item.locked():
+                        item.setLocked(True)
+                    elif not self.uiLockAllAction.isChecked() and item.locked():
+                        item.setLocked(False)
+                    if item.parentItem() is None:
+                        item.updateNode()
+                    item.update()
 
     def analyticsClient(self):
         """
@@ -392,9 +393,6 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         self._project_dialog = ProjectDialog(self)
         self._project_dialog.show()
         create_new_project = self._project_dialog.exec_()
-        # Close the device dock so it repopulates.  Done in case switching between cloud and local.
-        self.uiNodesDockWidget.setVisible(False)
-        self.uiNodesDockWidget.setWindowTitle("")
 
         if create_new_project:
             Topology.instance().createLoadProject(self._project_dialog.getProjectSettings())
@@ -436,7 +434,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
             self._newProjectActionSlot()
         else:
             directory = self._project_dir
-            if self._project_dir and not os.path.exists(self._project_dir):
+            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)",
@@ -1066,12 +1064,6 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
             self._settings["preferences_dialog_geometry"] = bytes(dialog.saveGeometry().toBase64()).decode()
             self.setSettings(self._settings)
 
-    def _editReadmeActionSlot(self):
-        """
-        Slot to edit the README file
-        """
-        Topology.instance().editReadme()
-
     def resizeEvent(self, event):
         self._notif_dialog.resize()
         super().resizeEvent(event)

gns3/modules/builtin/ethernet_switch.py

@@ -38,7 +38,7 @@ class EthernetSwitch(Node):
         # this is an always-on node
         self.setStatus(Node.started)
         self._always_on = True
-        self.settings().update({"ports_mapping": [], "console_type": "telnet"})
+        self.settings().update({"ports_mapping": [], "console_type": "none"})
 
     def info(self):
         """

gns3/modules/builtin/settings.py

@@ -59,7 +59,7 @@ ETHERNET_SWITCH_SETTINGS = {
     "default_name_format": "Switch{0}",
     "symbol": ":/symbols/ethernet_switch.svg",
     "category": Node.switches,
-    "console_type": "telnet",
+    "console_type": "none",
     "ports_mapping": [],
     "node_type": "ethernet_switch"
 }

gns3/modules/docker/docker_vm.py

@@ -51,7 +51,8 @@ class DockerVM(Node):
                               "console_resolution": DOCKER_CONTAINER_SETTINGS["console_resolution"],
                               "console_http_port": DOCKER_CONTAINER_SETTINGS["console_http_port"],
                               "console_http_path": DOCKER_CONTAINER_SETTINGS["console_http_path"],
-                              "extra_hosts": DOCKER_CONTAINER_SETTINGS["extra_hosts"]}
+                              "extra_hosts": DOCKER_CONTAINER_SETTINGS["extra_hosts"],
+                              "extra_volumes": DOCKER_CONTAINER_SETTINGS["extra_volumes"]}
 
         self.settings().update(docker_vm_settings)
 

gns3/modules/docker/pages/docker_vm_configuration_page.py

@@ -103,7 +103,8 @@ class DockerVMConfigurationPage(QtWidgets.QWidget, Ui_dockerVMConfigPageWidget):
         self.uiConsoleResolutionComboBox.setCurrentIndex(self.uiConsoleResolutionComboBox.findText(settings["console_resolution"]))
         self.uiConsoleHttpPortSpinBox.setValue(settings["console_http_port"])
         self.uiHttpConsolePathLineEdit.setText(settings["console_http_path"])
-        self.uiExtraHostsTextEdit.setText(settings["extra_hosts"])
+        self.uiExtraHostsTextEdit.setPlainText(settings["extra_hosts"])
+        self.uiExtraVolumeTextEdit.setPlainText("\n".join(settings["extra_volumes"]))
 
         if not group:
             self.uiNameLineEdit.setText(settings["name"])
@@ -175,6 +176,8 @@ class DockerVMConfigurationPage(QtWidgets.QWidget, Ui_dockerVMConfigPageWidget):
         settings["console_http_port"] = self.uiConsoleHttpPortSpinBox.value()
         settings["console_http_path"] = self.uiHttpConsolePathLineEdit.text()
         settings["extra_hosts"] = self.uiExtraHostsTextEdit.toPlainText()
+        # only tidy input here, validation is performed server side
+        settings["extra_volumes"] = [ y for x in self.uiExtraVolumeTextEdit.toPlainText().split("\n") for y in [ x.strip() ] if y ]
 
         if not group:
             adapters = self.uiAdapterSpinBox.value()

gns3/modules/docker/pages/docker_vm_preferences_page.py

@@ -95,6 +95,9 @@ class DockerVMPreferencesPage(QtWidgets.QWidget, Ui_DockerVMPreferencesPageWidge
         if docker_container["extra_hosts"]:
             QtWidgets.QTreeWidgetItem(section_item, ["Extra hosts:", str(docker_container["extra_hosts"])])
 
+        if docker_container["extra_volumes"]:
+            QtWidgets.QTreeWidgetItem(section_item, ["Extra volumes:", "\n".join(docker_container["extra_volumes"])])
+
         self.uiDockerVMInfoTreeWidget.expandAll()
         self.uiDockerVMInfoTreeWidget.resizeColumnToContents(0)
         self.uiDockerVMInfoTreeWidget.resizeColumnToContents(1)

gns3/modules/docker/settings.py

@@ -43,5 +43,6 @@ DOCKER_CONTAINER_SETTINGS = {
     "console_http_port": 80,
     "console_http_path": "/",
     "extra_hosts": "",
+    "extra_volumes": [],
     "node_type": "docker"
 }

gns3/modules/docker/ui/docker_vm_configuration_page.ui

@@ -297,9 +297,34 @@ one per line)</string>
         </widget>
        </item>
        <item row="0" column="1">
-        <widget class="QTextEdit" name="uiExtraHostsTextEdit"/>
+        <widget class="QPlainTextEdit" name="uiExtraHostsTextEdit">
+         <property name="placeholderText">
+          <string>e.g. router:192.168.0.1</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="uiExtraVolumeLabel">
+         <property name="text">
+          <string>Additional directories to
+make persistent that are
+not included in the image
+VOLUMES config. One
+directory per line.</string>
+         </property>
+        </widget>
        </item>
        <item row="1" column="1">
+        <widget class="QPlainTextEdit" name="uiExtraVolumeTextEdit">
+         <property name="plainText">
+          <string/>
+         </property>
+         <property name="placeholderText">
+          <string>e.g. /etc/sysctl.d</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>

gns3/modules/docker/ui/docker_vm_configuration_page_ui.py

@@ -143,11 +143,18 @@ class Ui_dockerVMConfigPageWidget(object):
         self.uiExtraHostsLabel.setWordWrap(True)
         self.uiExtraHostsLabel.setObjectName("uiExtraHostsLabel")
         self.gridLayout_2.addWidget(self.uiExtraHostsLabel, 0, 0, 1, 1)
-        self.uiExtraHostsTextEdit = QtWidgets.QTextEdit(self.tab_2)
+        self.uiExtraHostsTextEdit = QtWidgets.QPlainTextEdit(self.tab_2)
         self.uiExtraHostsTextEdit.setObjectName("uiExtraHostsTextEdit")
         self.gridLayout_2.addWidget(self.uiExtraHostsTextEdit, 0, 1, 1, 1)
+        self.uiExtraVolumeLabel = QtWidgets.QLabel(self.tab_2)
+        self.uiExtraVolumeLabel.setObjectName("uiExtraVolumeLabel")
+        self.gridLayout_2.addWidget(self.uiExtraVolumeLabel, 1, 0, 1, 1)
+        self.uiExtraVolumeTextEdit = QtWidgets.QPlainTextEdit(self.tab_2)
+        self.uiExtraVolumeTextEdit.setPlainText("")
+        self.uiExtraVolumeTextEdit.setObjectName("uiExtraVolumeTextEdit")
+        self.gridLayout_2.addWidget(self.uiExtraVolumeTextEdit, 1, 1, 1, 1)
         spacerItem = QtWidgets.QSpacerItem(20, 388, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.gridLayout_2.addItem(spacerItem, 1, 1, 1, 1)
+        self.gridLayout_2.addItem(spacerItem, 2, 1, 1, 1)
         self.uiTabWidget.addTab(self.tab_2, "")
         self.tab_3 = QtWidgets.QWidget()
         self.tab_3.setObjectName("tab_3")
@@ -201,6 +208,13 @@ class Ui_dockerVMConfigPageWidget(object):
 "to the /etc/hosts file.\n"
 "(hostname:IP\n"
 "one per line)"))
+        self.uiExtraHostsTextEdit.setPlaceholderText(_translate("dockerVMConfigPageWidget", "e.g. router:192.168.0.1"))
+        self.uiExtraVolumeLabel.setText(_translate("dockerVMConfigPageWidget", "Additional directories to\n"
+"make persistent that are\n"
+"not included in the image\n"
+"VOLUMES config. One\n"
+"directory per line."))
+        self.uiExtraVolumeTextEdit.setPlaceholderText(_translate("dockerVMConfigPageWidget", "e.g. /etc/sysctl.d"))
         self.uiTabWidget.setTabText(self.uiTabWidget.indexOf(self.tab_2), _translate("dockerVMConfigPageWidget", "Advanced"))
         self.uiTabWidget.setTabText(self.uiTabWidget.indexOf(self.tab_3), _translate("dockerVMConfigPageWidget", "Usage"))
 

gns3/modules/dynamips/__init__.py

@@ -130,7 +130,7 @@ class Dynamips(Module):
             for router in self._settings.get("routers"):
                 router_settings = IOS_ROUTER_SETTINGS.copy()
                 router_settings.update(router)
-                if not router_settings.get("chassis"):
+                if router_settings.get("chassis"):
                     del router_settings["chassis"]
                 templates.append(Template(router_settings))
             TemplateManager.instance().updateList(templates)

gns3/modules/dynamips/dialogs/ios_router_wizard.py

@@ -123,7 +123,7 @@ class IOSRouterWizard(VMWithImagesWizard, Ui_IOSRouterWizard):
 
         # try to guess the platform
         image = os.path.basename(self.uiIOSImageLineEdit.text())
-        match = re.match(r"^(c[0-9]+)p?\\-\w+", image.lower())
+        match = re.match(r"^(c[0-9]+)p?-\w+", image.lower())
         if not match:
             QtWidgets.QMessageBox.warning(self, "IOS image", "Could not detect the platform, make sure this is a valid IOS image!")
             return

gns3/modules/dynamips/pages/ios_router_configuration_page.py

@@ -111,7 +111,7 @@ class IOSRouterConfigurationPage(QtWidgets.QWidget, Ui_iosRouterConfigPageWidget
 
         # try to guess the platform
         image = os.path.basename(path)
-        match = re.match(r"^(c[0-9]+)\\-\w+", image)
+        match = re.match(r"^(c[0-9]+)p?-\w+", image)
         if not match:
             QtWidgets.QMessageBox.warning(self, "IOS image", "Could not detect the platform, make sure this is a valid IOS image!")
             return

gns3/modules/iou/pages/iou_preferences_page.py

@@ -98,7 +98,10 @@ class IOUPreferencesPage(QtWidgets.QWidget, Ui_IOUPreferencesPageWidget):
         :param settings: IOU settings
         """
 
-        self.IOULicenceTextEdit.setPlainText(settings["iourc_content"])
+        if settings["iourc_content"]:
+            self.IOULicenceTextEdit.blockSignals(True)
+            self.IOULicenceTextEdit.setPlainText(settings["iourc_content"])
+            self.IOULicenceTextEdit.blockSignals(False)
         self.uiLicensecheckBox.setChecked(settings["license_check"])
 
     def loadPreferences(self):
@@ -106,7 +109,10 @@ class IOUPreferencesPage(QtWidgets.QWidget, Ui_IOUPreferencesPageWidget):
         Loads IOU preferences.
         """
 
-        Controller.instance().get("/iou_license", self._getSettingsCallback)
+        if Controller.instance().connected():
+            Controller.instance().get("/iou_license", self._getSettingsCallback)
+        else:
+            log.error("Cannot load the IOU license in the preferences dialog: not connected to the controller")
 
     @qslot
     def _getSettingsCallback(self, result, error=False, **kwargs):
@@ -115,7 +121,7 @@ class IOUPreferencesPage(QtWidgets.QWidget, Ui_IOUPreferencesPageWidget):
             return
         if error:
             if "message" in result:
-                log.error("Error while getting settings : {}".format(result["message"]))
+                log.error("Error while getting the IOU license information: {}".format(result["message"]))
             return
         self._old_settings = copy.copy(result)
         self._populateWidgets(result)

gns3/modules/iou/ui/iou_preferences_page.ui

@@ -14,6 +14,13 @@
    <string>IOS on UNIX</string>
   </property>
   <layout class="QVBoxLayout">
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>IOU licence (iourc file):</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_5">
      <item>

gns3/modules/iou/ui/iou_preferences_page_ui.py

@@ -1,21 +1,22 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '/Users/noplay/code/gns3/gns3-gui/gns3/modules/iou/ui/iou_preferences_page.ui'
+# Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/iou/ui/iou_preferences_page.ui'
 #
-# Created by: PyQt5 UI code generator 5.7.1
+# Created by: PyQt5 UI code generator 5.9
 #
 # WARNING! All changes made in this file will be lost!
 
 from PyQt5 import QtCore, QtGui, QtWidgets
 
-
 class Ui_IOUPreferencesPageWidget(object):
-
     def setupUi(self, IOUPreferencesPageWidget):
         IOUPreferencesPageWidget.setObjectName("IOUPreferencesPageWidget")
         IOUPreferencesPageWidget.resize(490, 532)
         self.vboxlayout = QtWidgets.QVBoxLayout(IOUPreferencesPageWidget)
         self.vboxlayout.setObjectName("vboxlayout")
+        self.label = QtWidgets.QLabel(IOUPreferencesPageWidget)
+        self.label.setObjectName("label")
+        self.vboxlayout.addWidget(self.label)
         self.horizontalLayout_5 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_5.setObjectName("horizontalLayout_5")
         self.IOULicenceTextEdit = QtWidgets.QPlainTextEdit(IOUPreferencesPageWidget)
@@ -47,7 +48,9 @@ class Ui_IOUPreferencesPageWidget(object):
     def retranslateUi(self, IOUPreferencesPageWidget):
         _translate = QtCore.QCoreApplication.translate
         IOUPreferencesPageWidget.setWindowTitle(_translate("IOUPreferencesPageWidget", "IOS on UNIX"))
+        self.label.setText(_translate("IOUPreferencesPageWidget", "IOU licence (iourc file):"))
         self.IOULicenceTextEdit.setToolTip(_translate("IOUPreferencesPageWidget", "A license is required to run IOU. Copy & paste the content of your iourc file here or use the browse button to select a file. The license will be pushed to remote servers."))
         self.uiIOURCPathToolButton.setText(_translate("IOUPreferencesPageWidget", "&Browse..."))
         self.uiLicensecheckBox.setText(_translate("IOUPreferencesPageWidget", "Check for a valid IOU license key"))
         self.uiRestoreDefaultsPushButton.setText(_translate("IOUPreferencesPageWidget", "Restore defaults"))
+

gns3/modules/module.py

@@ -152,9 +152,14 @@ class Module(QtCore.QObject):
         :param directory: destination directory path
         """
 
+        node_names_cannot_export = []
         for node in self._nodes:
             if hasattr(node, "initialized") and node.initialized():
-                node.exportConfigsToDirectory(directory)
+                if not node.exportConfigsToDirectory(directory):
+                    node_names_cannot_export.append(node.name())
+
+        if node_names_cannot_export:
+            log.warning("Config export is not supported by the following nodes: {}".format(" ".join(node_names_cannot_export)))
 
     def importConfigs(self, directory):
         """

gns3/modules/qemu/dialogs/qemu_vm_wizard.py

@@ -47,10 +47,13 @@ class QemuVMWizard(VMWithImagesWizard, Ui_QemuVMWizard):
 
         # Mandatory fields
         self.uiNameWizardPage.registerField("vm_name*", self.uiNameLineEdit)
-        self.uiDiskWizardPage.registerField("hda_disk_image*", self.uiHdaDiskImageLineEdit)
+        self.uiInitrdKernelImageWizardPage.registerField("initrd*", self.uiInitrdImageLineEdit)
+        self.uiInitrdKernelImageWizardPage.registerField("kernel_image*", self.uiKernelImageLineEdit)
 
         # Fill image combo boxes
         self.addImageSelector(self.uiHdaDiskExistingImageRadioButton, self.uiHdaDiskImageListComboBox, self.uiHdaDiskImageLineEdit, self.uiHdaDiskImageToolButton, QemuVMConfigurationPage.getDiskImage, create_image_wizard=QemuImageWizard, create_button=self.uiHdaDiskImageCreateToolButton, image_suffix="-hda")
+        self.addImageSelector(self.uiLinuxExistingImageRadioButton, self.uiInitrdImageListComboBox, self.uiInitrdImageLineEdit, self.uiInitrdImageToolButton, QemuVMConfigurationPage.getDiskImage)
+        self.addImageSelector(self.uiLinuxExistingImageRadioButton, self.uiKernelImageListComboBox, self.uiKernelImageLineEdit, self.uiKernelImageToolButton, QemuVMConfigurationPage.getDiskImage)
 
     def validateCurrentPage(self):
         """
@@ -61,7 +64,11 @@ class QemuVMWizard(VMWithImagesWizard, Ui_QemuVMWizard):
             return False
 
         if self.currentPage() == self.uiNameWizardPage:
-            self.uiRamSpinBox.setValue(512)
+            if self.uiLegacyASACheckBox.isChecked():
+                QtWidgets.QMessageBox.warning(self, "Legacy ASA VM", "Running ASA (with initrd/kernel) is not recommended and will not work on Windows 10, please use ASAv instead")
+                self.uiRamSpinBox.setValue(1024)
+            else:
+                self.uiRamSpinBox.setValue(256)
 
         if self.currentPage() == self.uiBinaryMemoryWizardPage:
             if not self.uiQemuListComboBox.count():
@@ -81,7 +88,7 @@ class QemuVMWizard(VMWithImagesWizard, Ui_QemuVMWizard):
             if self.uiLocalRadioButton.isChecked() and not ComputeManager.instance().localPlatform().startswith("linux"):
                 QtWidgets.QMessageBox.warning(self, "QEMU on Windows or Mac", "The recommended way to run QEMU on Windows and OSX is to use the GNS3 VM")
 
-        if self.page(page_id) == self.uiDiskWizardPage:
+        if self.page(page_id) in [self.uiDiskWizardPage, self.uiInitrdKernelImageWizardPage]:
             self.loadImagesList("/qemu/images")
         elif self.page(page_id) == self.uiBinaryMemoryWizardPage:
             try:
@@ -109,7 +116,9 @@ class QemuVMWizard(VMWithImagesWizard, Ui_QemuVMWizard):
 
             is_64bit = sys.maxsize > 2 ** 32
             if ComputeManager.instance().localPlatform().startswith("win") and self.uiLocalRadioButton.isChecked():
-                if is_64bit:
+                if self.uiLegacyASACheckBox.isChecked():
+                    search_string = r"qemu-0.13.0\qemu-system-i386w.exe"
+                elif is_64bit:
                     # default is qemu-system-x86_64w.exe on Windows 64-bit with a remote server
                     search_string = "x86_64w.exe"
                 else:
@@ -143,9 +152,47 @@ class QemuVMWizard(VMWithImagesWizard, Ui_QemuVMWizard):
             "qemu_path": qemu_path,
             "compute_id": self._compute_id,
             "category": Node.end_devices,
-            "hda_disk_image": self.uiHdaDiskImageLineEdit.text(),
-            "console_type": console_type,
-            "options": ""
+            "console_type": console_type
         }
 
+        if self.uiHdaDiskImageLineEdit.text().strip():
+            settings["hda_disk_image"] = self.uiHdaDiskImageLineEdit.text().strip()
+
+        if self.uiLegacyASACheckBox.isChecked():
+            # special settings for legacy ASA VM
+            settings["adapters"] = 4
+            settings["initrd"] = self.uiInitrdImageLineEdit.text()
+            settings["kernel_image"] = self.uiKernelImageLineEdit.text()
+            settings["kernel_command_line"] = "ide_generic.probe_mask=0x01 ide_core.chs=0.0:980,16,32 auto nousb console=ttyS0,9600 bigphysarea=65536 ide1=noprobe no-hlt -net nic"
+            settings["options"] = "-no-kvm -icount auto"
+            if not sys.platform.startswith("darwin"):
+                settings["cpu_throttling"] = 80  # limit to 80% CPU usage
+            settings["process_priority"] = "low"
+            settings["symbol"] = ":/symbols/asa.svg"
+            settings["category"] = Node.security_devices
+
+        if "options" not in settings:
+            settings["options"] = ""
+        if self._compute_id == "local" and (sys.platform.startswith("win") and qemu_path.endswith(r"qemu-0.11.0\qemu.exe")) or \
+                (sys.platform.startswith("darwin") and "GNS3.app" in qemu_path):
+            settings["options"] += " -vga none -vnc none"
+            settings["legacy_networking"] = True
+        else:
+            settings["options"] += " -nographic"
+        settings["options"] = settings["options"].strip()
+
         return settings
+
+    def nextId(self):
+        """
+        Wizard rules!
+        """
+
+        current_id = self.currentId()
+        if self.page(current_id) == self.uiDiskWizardPage:
+            if self.uiLegacyASACheckBox.isChecked():
+                return self.uiDiskWizardPage.nextId()
+            return -1
+        elif self.page(current_id) == self.uiInitrdKernelImageWizardPage:
+            return -1
+        return QtWidgets.QWizard.nextId(self)

gns3/modules/qemu/pages/qemu_vm_configuration_page.py

@@ -78,7 +78,7 @@ class QemuVMConfigurationPage(QtWidgets.QWidget, Ui_QemuVMConfigPageWidget):
         self.uiHdcDiskImageResizeToolButton.clicked.connect(self._hdcDiskImageResizeSlot)
         self.uiHddDiskImageResizeToolButton.clicked.connect(self._hddDiskImageResizeSlot)
 
-        disk_interfaces = ["ide", "sata", "scsi", "sd", "mtd", "floppy", "pflash", "virtio", "none"]
+        disk_interfaces = ["ide", "sata", "nvme", "scsi", "sd", "mtd", "floppy", "pflash", "virtio", "none"]
         self.uiHdaDiskInterfaceComboBox.addItems(disk_interfaces)
         self.uiHdbDiskInterfaceComboBox.addItems(disk_interfaces)
         self.uiHdcDiskInterfaceComboBox.addItems(disk_interfaces)
@@ -99,8 +99,13 @@ class QemuVMConfigurationPage(QtWidgets.QWidget, Ui_QemuVMConfigPageWidget):
         for name, option_name in Node.onCloseOptions().items():
             self.uiOnCloseComboBox.addItem(name, option_name)
 
+        # Supported NIC models: e1000, e1000-82544gc, e1000-82545em, e1000e, i82550, i82551, i82557a, i82557b, i82557c, i82558a
+        # i82558b, i82559a, i82559b, i82559c, i82559er, i82562, i82801, ne2k_pci, pcnet, rocker, rtl8139, virtio-net-pci, vmxnet3
         self._legacy_devices = ("e1000", "i82551", "i82557b", "i82559er", "ne2k_pci", "pcnet", "rtl8139", "virtio")
         self._qemu_network_devices = OrderedDict([("e1000", "Intel Gigabit Ethernet"),
+                                                  ("e1000-82544gc", "Intel 82544GC Gigabit Ethernet"),
+                                                  ("e1000-82545em", "Intel 82545EM Gigabit Ethernet"),
+                                                  ("e1000e", "Intel PCIe Gigabit Ethernet"),
                                                   ("i82550", "Intel i82550 Ethernet"),
                                                   ("i82551", "Intel i82551 Ethernet"),
                                                   ("i82557a", "Intel i82557A Ethernet"),
@@ -116,6 +121,7 @@ class QemuVMConfigurationPage(QtWidgets.QWidget, Ui_QemuVMConfigPageWidget):
                                                   ("i82801", "Intel i82801 Ethernet"),
                                                   ("ne2k_pci", "NE2000 Ethernet"),
                                                   ("pcnet", "AMD PCNet Ethernet"),
+                                                  ("rocker", "Rocker L2 switch device"),
                                                   ("rtl8139", "Realtek 8139 Ethernet"),
                                                   ("virtio", "Legacy paravirtualized Network I/O"),
                                                   ("virtio-net-pci", "Paravirtualized Network I/O"),
@@ -391,11 +397,19 @@ class QemuVMConfigurationPage(QtWidgets.QWidget, Ui_QemuVMConfigPageWidget):
 
         try:
             ports = StandardPortNameFactory(adapters, first_port_name, port_name_format, port_segment_size)
-        except (ValueError, KeyError):
+        except (IndexError, ValueError, KeyError):
             QtWidgets.QMessageBox.critical(self, "Invalid format", "Invalid port name format")
             return
 
-        dialog = CustomAdaptersConfigurationDialog(ports, self._custom_adapters, default_adapter, self._qemu_network_devices, base_mac_address, parent=self)
+        if self._settings["legacy_networking"]:
+            network_devices = {}
+            for nic, desc in self._qemu_network_devices.items():
+                if nic in self._legacy_devices:
+                    network_devices[nic] = desc
+        else:
+            network_devices = self._qemu_network_devices
+
+        dialog = CustomAdaptersConfigurationDialog(ports, self._custom_adapters, default_adapter, network_devices, base_mac_address, parent=self)
         dialog.show()
         dialog.exec_()
 
@@ -642,6 +656,7 @@ class QemuVMConfigurationPage(QtWidgets.QWidget, Ui_QemuVMConfigPageWidget):
                     raise ConfigurationError()
 
         settings["adapters"] = adapters
+        settings["legacy_networking"] = self.uiLegacyNetworkingCheckBox.isChecked()
         settings["custom_adapters"] = self._custom_adapters.copy()
         settings["on_close"] = self.uiOnCloseComboBox.itemData(self.uiOnCloseComboBox.currentIndex())
         settings["cpus"] = self.uiCPUSpinBox.value()

gns3/modules/qemu/ui/qemu_vm_configuration_page.ui

@@ -860,6 +860,8 @@
 <li>%vm-id% =VM ID</li>
 <li>%project-id% = project ID</li>
 <li>%project-path% = project path</li>
+<li>%console-port% = console port number</li>
+<li>%guest-cid% = unique ID from 3 to 65535</li>
 </ul>
 &lt;/body&gt;&lt;/html&gt;</string>
             </property>

gns3/modules/qemu/ui/qemu_vm_configuration_page_ui.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/qemu/ui/qemu_vm_configuration_page.ui'
 #
-# Created by: PyQt5 UI code generator 5.11.3
+# Created by: PyQt5 UI code generator 5.9
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -541,6 +541,8 @@ class Ui_QemuVMConfigPageWidget(object):
 "<li>%vm-id% =VM ID</li>\n"
 "<li>%project-id% = project ID</li>\n"
 "<li>%project-path% = project path</li>\n"
+"<li>%console-port% = console port number</li>\n"
+"<li>%guest-cid% = unique ID from 3 to 65535</li>\n"
 "</ul>\n"
 "</body></html>"))
         self.uiBaseVMCheckBox.setText(_translate("QemuVMConfigPageWidget", "Use as a linked base VM"))

gns3/modules/qemu/ui/qemu_vm_wizard.ui

@@ -106,6 +106,13 @@
     <item row="0" column="1">
      <widget class="QLineEdit" name="uiNameLineEdit"/>
     </item>
+    <item row="1" column="0" colspan="2">
+     <widget class="QCheckBox" name="uiLegacyASACheckBox">
+      <property name="text">
+       <string>This is a legacy ASA VM</string>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QWizardPage" name="uiBinaryMemoryWizardPage">
@@ -305,6 +312,114 @@
     </item>
    </layout>
   </widget>
+  <widget class="QWizardPage" name="uiInitrdKernelImageWizardPage">
+   <property name="title">
+    <string>Linux boot specific settings</string>
+   </property>
+   <property name="subTitle">
+    <string>Please choose a initrd and a kernel image.</string>
+   </property>
+   <layout class="QGridLayout" name="gridLayout_4">
+    <item row="0" column="0">
+     <layout class="QHBoxLayout" name="horizontalLayout_7">
+      <item>
+       <widget class="QRadioButton" name="uiLinuxExistingImageRadioButton">
+        <property name="text">
+         <string>Existing image</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="uiNewImageRadioButton_4">
+        <property name="text">
+         <string>New Image</string>
+        </property>
+        <property name="checked">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer_5">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </item>
+    <item row="1" column="0">
+     <layout class="QFormLayout" name="formLayout_2">
+      <property name="fieldGrowthPolicy">
+       <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+      </property>
+      <item row="0" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout_11">
+        <item>
+         <widget class="QComboBox" name="uiInitrdImageListComboBox"/>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="uiInitrdImageLineEdit"/>
+        </item>
+        <item>
+         <widget class="QToolButton" name="uiInitrdImageToolButton">
+          <property name="text">
+           <string>&amp;Browse...</string>
+          </property>
+          <property name="toolButtonStyle">
+           <enum>Qt::ToolButtonTextOnly</enum>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="uiKernelImageLabel">
+        <property name="text">
+         <string>Kernel image (vmlinuz):</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout_14">
+        <item>
+         <widget class="QComboBox" name="uiKernelImageListComboBox"/>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="uiKernelImageLineEdit"/>
+        </item>
+        <item>
+         <widget class="QToolButton" name="uiKernelImageToolButton">
+          <property name="text">
+           <string>&amp;Browse...</string>
+          </property>
+          <property name="toolButtonStyle">
+           <enum>Qt::ToolButtonTextOnly</enum>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="uiInitrdLabel">
+        <property name="text">
+         <string>Initial RAM disk (initrd):</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+   </layout>
+  </widget>
  </widget>
  <tabstops>
   <tabstop>uiNameLineEdit</tabstop>

gns3/modules/qemu/ui/qemu_vm_wizard_ui.py

@@ -60,6 +60,9 @@ class Ui_QemuVMWizard(object):
         self.uiNameLineEdit = QtWidgets.QLineEdit(self.uiNameWizardPage)
         self.uiNameLineEdit.setObjectName("uiNameLineEdit")
         self.gridLayout.addWidget(self.uiNameLineEdit, 0, 1, 1, 1)
+        self.uiLegacyASACheckBox = QtWidgets.QCheckBox(self.uiNameWizardPage)
+        self.uiLegacyASACheckBox.setObjectName("uiLegacyASACheckBox")
+        self.gridLayout.addWidget(self.uiLegacyASACheckBox, 1, 0, 1, 2)
         QemuVMWizard.addPage(self.uiNameWizardPage)
         self.uiBinaryMemoryWizardPage = QtWidgets.QWizardPage()
         self.uiBinaryMemoryWizardPage.setObjectName("uiBinaryMemoryWizardPage")
@@ -146,6 +149,60 @@ class Ui_QemuVMWizard(object):
         self.horizontalLayout_8.addWidget(self.uiHdaDiskImageCreateToolButton)
         self.gridLayout_3.addLayout(self.horizontalLayout_8, 1, 0, 1, 1)
         QemuVMWizard.addPage(self.uiDiskWizardPage)
+        self.uiInitrdKernelImageWizardPage = QtWidgets.QWizardPage()
+        self.uiInitrdKernelImageWizardPage.setObjectName("uiInitrdKernelImageWizardPage")
+        self.gridLayout_4 = QtWidgets.QGridLayout(self.uiInitrdKernelImageWizardPage)
+        self.gridLayout_4.setObjectName("gridLayout_4")
+        self.horizontalLayout_7 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_7.setObjectName("horizontalLayout_7")
+        self.uiLinuxExistingImageRadioButton = QtWidgets.QRadioButton(self.uiInitrdKernelImageWizardPage)
+        self.uiLinuxExistingImageRadioButton.setChecked(True)
+        self.uiLinuxExistingImageRadioButton.setObjectName("uiLinuxExistingImageRadioButton")
+        self.horizontalLayout_7.addWidget(self.uiLinuxExistingImageRadioButton)
+        self.uiNewImageRadioButton_4 = QtWidgets.QRadioButton(self.uiInitrdKernelImageWizardPage)
+        self.uiNewImageRadioButton_4.setChecked(False)
+        self.uiNewImageRadioButton_4.setObjectName("uiNewImageRadioButton_4")
+        self.horizontalLayout_7.addWidget(self.uiNewImageRadioButton_4)
+        spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_7.addItem(spacerItem2)
+        self.gridLayout_4.addLayout(self.horizontalLayout_7, 0, 0, 1, 1)
+        self.formLayout_2 = QtWidgets.QFormLayout()
+        self.formLayout_2.setFieldGrowthPolicy(QtWidgets.QFormLayout.AllNonFixedFieldsGrow)
+        self.formLayout_2.setObjectName("formLayout_2")
+        self.horizontalLayout_11 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_11.setObjectName("horizontalLayout_11")
+        self.uiInitrdImageListComboBox = QtWidgets.QComboBox(self.uiInitrdKernelImageWizardPage)
+        self.uiInitrdImageListComboBox.setObjectName("uiInitrdImageListComboBox")
+        self.horizontalLayout_11.addWidget(self.uiInitrdImageListComboBox)
+        self.uiInitrdImageLineEdit = QtWidgets.QLineEdit(self.uiInitrdKernelImageWizardPage)
+        self.uiInitrdImageLineEdit.setObjectName("uiInitrdImageLineEdit")
+        self.horizontalLayout_11.addWidget(self.uiInitrdImageLineEdit)
+        self.uiInitrdImageToolButton = QtWidgets.QToolButton(self.uiInitrdKernelImageWizardPage)
+        self.uiInitrdImageToolButton.setToolButtonStyle(QtCore.Qt.ToolButtonTextOnly)
+        self.uiInitrdImageToolButton.setObjectName("uiInitrdImageToolButton")
+        self.horizontalLayout_11.addWidget(self.uiInitrdImageToolButton)
+        self.formLayout_2.setLayout(0, QtWidgets.QFormLayout.FieldRole, self.horizontalLayout_11)
+        self.uiKernelImageLabel = QtWidgets.QLabel(self.uiInitrdKernelImageWizardPage)
+        self.uiKernelImageLabel.setObjectName("uiKernelImageLabel")
+        self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.uiKernelImageLabel)
+        self.horizontalLayout_14 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_14.setObjectName("horizontalLayout_14")
+        self.uiKernelImageListComboBox = QtWidgets.QComboBox(self.uiInitrdKernelImageWizardPage)
+        self.uiKernelImageListComboBox.setObjectName("uiKernelImageListComboBox")
+        self.horizontalLayout_14.addWidget(self.uiKernelImageListComboBox)
+        self.uiKernelImageLineEdit = QtWidgets.QLineEdit(self.uiInitrdKernelImageWizardPage)
+        self.uiKernelImageLineEdit.setObjectName("uiKernelImageLineEdit")
+        self.horizontalLayout_14.addWidget(self.uiKernelImageLineEdit)
+        self.uiKernelImageToolButton = QtWidgets.QToolButton(self.uiInitrdKernelImageWizardPage)
+        self.uiKernelImageToolButton.setToolButtonStyle(QtCore.Qt.ToolButtonTextOnly)
+        self.uiKernelImageToolButton.setObjectName("uiKernelImageToolButton")
+        self.horizontalLayout_14.addWidget(self.uiKernelImageToolButton)
+        self.formLayout_2.setLayout(1, QtWidgets.QFormLayout.FieldRole, self.horizontalLayout_14)
+        self.uiInitrdLabel = QtWidgets.QLabel(self.uiInitrdKernelImageWizardPage)
+        self.uiInitrdLabel.setObjectName("uiInitrdLabel")
+        self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.uiInitrdLabel)
+        self.gridLayout_4.addLayout(self.formLayout_2, 1, 0, 1, 1)
+        QemuVMWizard.addPage(self.uiInitrdKernelImageWizardPage)
 
         self.retranslateUi(QemuVMWizard)
         QtCore.QMetaObject.connectSlotsByName(QemuVMWizard)
@@ -168,6 +225,7 @@ class Ui_QemuVMWizard(object):
         self.uiNameWizardPage.setTitle(_translate("QemuVMWizard", "QEMU VM name"))
         self.uiNameWizardPage.setSubTitle(_translate("QemuVMWizard", "Please choose a descriptive name for your new QEMU virtual machine."))
         self.uiNameLabel.setText(_translate("QemuVMWizard", "Name:"))
+        self.uiLegacyASACheckBox.setText(_translate("QemuVMWizard", "This is a legacy ASA VM"))
         self.uiBinaryMemoryWizardPage.setTitle(_translate("QemuVMWizard", "QEMU binary and memory"))
         self.uiBinaryMemoryWizardPage.setSubTitle(_translate("QemuVMWizard", "Please check the Qemu binary is correctly set and the virtual machine has enough memory to work."))
         self.uiQemuListLabel.setText(_translate("QemuVMWizard", "Qemu binary:"))
@@ -188,4 +246,12 @@ class Ui_QemuVMWizard(object):
         self.uiHdaDiskImageLabel.setText(_translate("QemuVMWizard", "Disk image (hda):"))
         self.uiHdaDiskImageToolButton.setText(_translate("QemuVMWizard", "&Browse..."))
         self.uiHdaDiskImageCreateToolButton.setText(_translate("QemuVMWizard", "&Create"))
+        self.uiInitrdKernelImageWizardPage.setTitle(_translate("QemuVMWizard", "Linux boot specific settings"))
+        self.uiInitrdKernelImageWizardPage.setSubTitle(_translate("QemuVMWizard", "Please choose a initrd and a kernel image."))
+        self.uiLinuxExistingImageRadioButton.setText(_translate("QemuVMWizard", "Existing image"))
+        self.uiNewImageRadioButton_4.setText(_translate("QemuVMWizard", "New Image"))
+        self.uiInitrdImageToolButton.setText(_translate("QemuVMWizard", "&Browse..."))
+        self.uiKernelImageLabel.setText(_translate("QemuVMWizard", "Kernel image (vmlinuz):"))
+        self.uiKernelImageToolButton.setText(_translate("QemuVMWizard", "&Browse..."))
+        self.uiInitrdLabel.setText(_translate("QemuVMWizard", "Initial RAM disk (initrd):"))
 

gns3/modules/traceng/traceng_node.py

@@ -72,7 +72,7 @@ class TraceNGNode(Node):
             self._last_destination = destination
             params = {"destination": destination}
             log.debug("{} is starting".format(self.name()))
-            self.controllerHttpPost("/nodes/{node_id}/start".format(node_id=self._node_id), self._startCallback, body=params, timeout=None, progressText="{} is starting".format(self.name()))
+            self.controllerHttpPost("/nodes/{node_id}/start".format(node_id=self._node_id), self._startCallback, body=params, timeout=None, showProgress=False)
 
     def info(self):
         """

gns3/modules/virtualbox/pages/virtualbox_vm_configuration_page.py

@@ -99,7 +99,7 @@ class VirtualBoxVMConfigurationPage(QtWidgets.QWidget, Ui_virtualBoxVMConfigPage
 
         try:
             ports = StandardPortNameFactory(adapters, first_port_name, port_name_format, port_segment_size)
-        except (ValueError, KeyError):
+        except (IndexError, ValueError, KeyError):
             QtWidgets.QMessageBox.critical(self, "Invalid format", "Invalid port name format")
             return
 

gns3/modules/vmware/pages/vmware_vm_configuration_page.py

@@ -99,7 +99,7 @@ class VMwareVMConfigurationPage(QtWidgets.QWidget, Ui_VMwareVMConfigPageWidget):
 
         try:
             ports = StandardPortNameFactory(adapters, first_port_name, port_name_format, port_segment_size)
-        except (ValueError, KeyError):
+        except (IndexError, ValueError, KeyError):
             QtWidgets.QMessageBox.critical(self, "Invalid format", "Invalid port name format")
             return
 

gns3/node.py

@@ -223,7 +223,7 @@ class Node(BaseNode):
             return
 
         log.debug("{} is starting".format(self.name()))
-        self.post("/start", self._startCallback, timeout=None, progressText="{} is starting".format(self.name()))
+        self.post("/start", self._startCallback, timeout=None, showProgress=False)
 
     def _startCallback(self, result, error=False, **kwargs):
         """
@@ -249,7 +249,7 @@ class Node(BaseNode):
             return
 
         log.debug("{} is stopping".format(self.name()))
-        self.post("/stop", self._stopCallback, timeout=None, progressText="{} is stopping".format(self.name()))
+        self.post("/stop", self._stopCallback, timeout=None, showProgress=False)
 
     def _stopCallback(self, result, error=False, **kwargs):
         """
@@ -279,7 +279,7 @@ class Node(BaseNode):
             return
 
         log.debug("{} is being suspended".format(self.name()))
-        self.post("/suspend", self._suspendCallback, timeout=None, progressText="{} is suspending".format(self.name()))
+        self.post("/suspend", self._suspendCallback, timeout=None, showProgress=False)
 
     def _suspendCallback(self, result, error=False, **kwargs):
         """
@@ -301,7 +301,7 @@ class Node(BaseNode):
         """
 
         log.debug("{} is being reloaded".format(self.name()))
-        self.post("/reload", self._reloadCallback, timeout=None, progressText="{} is reloading".format(self.name()))
+        self.post("/reload", self._reloadCallback, timeout=None, showProgress=False)
 
     def _reloadCallback(self, result, error=False, **kwargs):
         """
@@ -455,7 +455,7 @@ class Node(BaseNode):
         if not skip_controller:
             for link in self.links():
                 link.setDeleting()
-            self.controllerHttpDelete("/nodes/{node_id}".format(node_id=self._node_id), self._deleteCallback)
+            self.controllerHttpDelete("/nodes/{node_id}".format(node_id=self._node_id), self._deleteCallback, showProgress=False)
         else:
             self.deleted_signal.emit()
             self._module.removeNode(self)
@@ -485,7 +485,7 @@ class Node(BaseNode):
                   "y": int(y),
                   "z": int(z)}
 
-        self.post("/duplicate", self._duplicateCallback, body=params, timeout=None, progressText="{} is being duplicated".format(self.name()))
+        self.post("/duplicate", self._duplicateCallback, body=params, timeout=None, showProgress=False)
 
     def _duplicateCallback(self, result, error=False, **kwargs):
         """
@@ -628,12 +628,12 @@ class Node(BaseNode):
         from .main_window import MainWindow
         general_settings = MainWindow.instance().settings()
 
-        if console_type != "telnet":
+        if not console_type:
             console_type = self.consoleType()
-            if console_type == "vnc":
-                return general_settings["vnc_console_command"]
-            if console_type.startswith("spice"):
-                return general_settings["spice_console_command"]
+        if console_type == "vnc":
+            return general_settings["vnc_console_command"]
+        elif console_type.startswith("spice"):
+            return general_settings["spice_console_command"]
         return general_settings["telnet_console_command"]
 
     def consoleType(self):
@@ -641,7 +641,7 @@ class Node(BaseNode):
         Get the console type (serial, telnet or VNC)
         """
 
-        console_type = "telnet"
+        console_type = "none"
         if "console_type" in self.settings():
             return self.settings()["console_type"]
         return console_type
@@ -704,10 +704,10 @@ class Node(BaseNode):
             nodeTelnetConsole(self, console_port, command)
         elif console_type == "vnc":
             from .vnc_console import vncConsole
-            vncConsole(self.consoleHost(), console_port, command)
+            vncConsole(self, console_port, command)
         elif console_type.startswith("spice"):
             from .spice_console import spiceConsole
-            spiceConsole(self.consoleHost(), console_port, command)
+            spiceConsole(self, console_port, command)
         elif console_type == "http" or console_type == "https":
             QtGui.QDesktopServices.openUrl(QtCore.QUrl("{console_type}://{host}:{port}{path}".format(console_type=console_type, host=self.consoleHost(), port=console_port, path=self.consoleHttpPath())))
 
@@ -765,7 +765,7 @@ class Node(BaseNode):
                 with open(context["path"], "wb+") as f:
                     f.write(raw_body)
             except OSError as e:
-                log.erro("Can't write %s: %s", context["path"], str(e))
+                log.error("Cannot export file '{}': {}".format(context["path"], e))
 
     def exportConfigsToDirectory(self, directory):
         """
@@ -775,12 +775,13 @@ class Node(BaseNode):
         """
 
         if not hasattr(self, "configFiles"):
-            return
+            return False
         for file in self.configFiles():
             self.get("/files/{file}".format(file=file),
                      self._exportConfigsToDirectoryCallback,
                      context={"directory": directory, "file": file},
                      raw=True)
+        return True
 
     def _exportConfigsToDirectoryCallback(self, result, error=False, raw_body=None, context={}, **kwargs):
         """

gns3/nodes_view.py

@@ -142,19 +142,14 @@ class NodesView(QtWidgets.QTreeWidget):
         # when we're in docked mode, outside main window
         return self.window().parent()
 
-    def mousePressEvent(self, event):
+    def contextMenuEvent(self, event):
         """
-        Handles all mouse press events.
+        Handles all context menu events.
 
-        :param: QMouseEvent instance
+        :param event: QContextMenuEvent instance
         """
 
-        # Check that an item has been selected and right click
-        if event.button() == QtCore.Qt.RightButton:
-            self._showContextualMenu()
-            event.accept()
-            return
-        super().mousePressEvent(event)
+        self._showContextualMenu(event.globalPos())
 
     def mouseMoveEvent(self, event):
         """
@@ -181,7 +176,7 @@ class NodesView(QtWidgets.QTreeWidget):
             drag.exec_(QtCore.Qt.CopyAction)
             event.accept()
 
-    def _showContextualMenu(self):
+    def _showContextualMenu(self, pos):
 
         menu = QtWidgets.QMenu()
         refresh_action = QtWidgets.QAction("Refresh templates", menu)
@@ -207,7 +202,7 @@ class NodesView(QtWidgets.QTreeWidget):
                 delete_action.triggered.connect(qpartial(self._deleteSlot, template))
                 menu.addAction(delete_action)
 
-        menu.exec_(QtGui.QCursor.pos())
+        menu.exec_(pos)
 
     def _configurationSlot(self, template, configuration_page, source):
 

gns3/packet_capture.py

@@ -38,7 +38,7 @@ class PacketCapture:
     def __init__(self):
         self._tail_process = {}
         self._capture_reader_process = {}
-        # Auto start the capture program for th link
+        # Auto start the capture program for this link
         self._autostart = {}
 
         Topology.instance().project_changed_signal.connect(self.killAllCapture)
@@ -47,6 +47,7 @@ class PacketCapture:
         """
         Kill all running captures (for example when change project)
         """
+
         for process in list(self._tail_process.values()):
             try:
                 process.kill()

gns3/pages/general_preferences_page.py

@@ -421,8 +421,6 @@ class GeneralPreferencesPage(QtWidgets.QWidget, Ui_GeneralPreferencesPageWidget)
 
         new_graphics_view_settings = {"scene_width": self.uiSceneWidthSpinBox.value(),
                                       "scene_height": self.uiSceneHeightSpinBox.value(),
-                                      "grid_size": self.uiNodeGridSizeSpinBox.value(),
-                                      "drawing_grid_size": self.uiDrawingGridSizeSpinBox.value(),
                                       "draw_rectangle_selected_item": self.uiRectangleSelectedItemCheckBox.isChecked(),
                                       "draw_link_status_points": self.uiDrawLinkStatusPointsCheckBox.isChecked(),
                                       "show_interface_labels_on_new_project": self.uiShowInterfaceLabelsOnNewProject.isChecked(),
@@ -433,4 +431,12 @@ class GeneralPreferencesPage(QtWidgets.QWidget, Ui_GeneralPreferencesPageWidget)
                                       "default_label_color": self._default_label_color.name(),
                                       "default_note_font": self.uiDefaultNoteStylePlainTextEdit.font().toString(),
                                       "default_note_color": self._default_note_color.name()}
+
+        node_grid_size = self.uiNodeGridSizeSpinBox.value()
+        drawing_grid_size = self.uiDrawingGridSizeSpinBox.value()
+        if node_grid_size % drawing_grid_size != 0:
+            QtWidgets.QMessageBox.critical(self, "Grid sizes", "Invalid grid sizes which will create overlapping lines")
+        else:
+            new_graphics_view_settings["grid_size"] = node_grid_size
+            new_graphics_view_settings["drawing_grid_size"] = drawing_grid_size
         MainWindow.instance().uiGraphicsView.setSettings(new_graphics_view_settings)

gns3/pages/gns3_vm_preferences_page.py

@@ -72,7 +72,11 @@ class GNS3VMPreferencesPage(QtWidgets.QWidget, Ui_GNS3VMPreferencesPageWidget):
         """
         Loads the preference from controller.
         """
-        Controller.instance().get("/gns3vm", self._getSettingsCallback)
+
+        if Controller.instance().connected():
+            Controller.instance().get("/gns3vm", self._getSettingsCallback)
+        else:
+            log.error("Cannot load the GNS3 VM settings in the preferences dialog: not connected to the controller")
 
     @qslot
     def _getSettingsCallback(self, result, error=False, **kwargs):
@@ -81,7 +85,7 @@ class GNS3VMPreferencesPage(QtWidgets.QWidget, Ui_GNS3VMPreferencesPageWidget):
             return
         if error:
             if "message" in result:
-                log.error("Error while getting settings : {}".format(result["message"]))
+                log.error("Error while getting the GNS3 VM settings : {}".format(result["message"]))
             return
         self._old_settings = copy.copy(result)
         self._settings = result

gns3/pages/server_preferences_page.py

@@ -67,6 +67,7 @@ class ServerPreferencesPage(QtWidgets.QWidget, Ui_ServerPreferencesPageWidget):
                     # ignore link-local addresses
                     continue
                 self.uiLocalServerHostComboBox.addItem(address_string, address_string)
+        self.uiLocalServerHostComboBox.addItem("localhost", "localhost")  # local host
         self.uiLocalServerHostComboBox.addItem("::", "::")  # all IPv6 addresses
         self.uiLocalServerHostComboBox.addItem("0.0.0.0", "0.0.0.0")  # all IPv4 addresses
 

gns3/progress.py

@@ -189,7 +189,10 @@ class Progress(QtCore.QObject):
                     # Due to Qt limitations for large numbers (above 32bit int) we calculate "progress" ourselves
                     current, maximum = self._normalize(query['current'], query['maximum'])
                     progress_dialog.setMaximum(maximum)
-                    progress_dialog.setValue(current)
+                    try:
+                        progress_dialog.setValue(current)
+                    except OverflowError:
+                        progress_dialog.setValue(100)
 
                 if text and query["maximum"] > 1000:
                     text += "\n{} / {}".format(human_filesize(query["current"]), human_filesize(query["maximum"]))

gns3/project.py

@@ -17,14 +17,12 @@
 
 import os
 import json
-from .qt import QtCore, qpartial, QtWidgets, QtNetwork, qslot
+from .qt import QtCore, qpartial, QtNetwork, QtWebSockets, qslot
 
 from gns3.controller import Controller
-from gns3.compute_manager import ComputeManager
 from gns3.topology import Topology
 from gns3.local_config import LocalConfig
 from gns3.settings import GRAPHICS_VIEW_SETTINGS
-from gns3.template_manager import TemplateManager
 from gns3.utils import parse_version
 
 import logging
@@ -49,7 +47,6 @@ class Project(QtCore.QObject):
     # Called when project is fully loaded
     project_loaded_signal = QtCore.Signal()
 
-
     def __init__(self):
 
         self._id = None
@@ -84,6 +81,7 @@ class Project(QtCore.QObject):
         # Due to bug in Qt on some version we need a dedicated network manager
         self._notification_network_manager = QtNetwork.QNetworkAccessManager()
         self._notification_stream = None
+        self._websocket = QtWebSockets.QWebSocket()
 
         super().__init__()
 
@@ -485,7 +483,8 @@ class Project(QtCore.QObject):
         if self._closed:
             self._closed = False
             self._closing = False
-            self._startListenNotifications()
+            if not self._notification_stream:
+                self._startListenNotifications()
 
         self.project_updated_signal.emit()
         self.project_loaded_signal.emit()
@@ -521,10 +520,12 @@ class Project(QtCore.QObject):
     def load(self, path=None):
         if not path:
             path = self.path()
-        if path:
+        if not Controller.instance().isRemote() and path:
+            # load a local project from file
             body = {"path": path}
             Controller.instance().post("/projects/load", self._projectOpenCallback, body=body, timeout=None)
         else:
+            # open a local/remote project
             self.post("/open", self._projectOpenCallback, timeout=None)
 
     def _projectOpenCallback(self, result, error=False, **kwargs):
@@ -537,7 +538,8 @@ class Project(QtCore.QObject):
         if self._closed:
             self._closed = False
             self._closing = False
-            self._startListenNotifications()
+            if not self._notification_stream:
+                self._startListenNotifications()
         self.project_updated_signal.emit()
 
         self.get("/nodes", self._listNodesCallback)
@@ -609,7 +611,7 @@ class Project(QtCore.QObject):
             log.debug("Stop listening for notifications from project %s", self._id)
             stream = self._notification_stream
             self._notification_stream = None
-            stream.abort()
+            stream.close()
 
     def _startListenNotifications(self):
         if not Controller.instance().connected():
@@ -627,7 +629,7 @@ class Project(QtCore.QObject):
 
         else:
             path = "/projects/{project_id}/notifications/ws".format(project_id=self._id)
-            self._notification_stream = Controller.instance().connectProjectWebSocket(path)
+            self._notification_stream = Controller.instance().httpClient().connectWebSocket(self._websocket, path)
             self._notification_stream.textMessageReceived.connect(self._websocket_event_received)
             self._notification_stream.error.connect(self._websocket_error)
 
@@ -700,7 +702,7 @@ class Project(QtCore.QObject):
         elif result["action"] == "project.updated":
             self._projectUpdatedCallback(result["event"])
         elif result["action"] == "snapshot.restored":
-            Topology.instance().createLoadProject({"project_id": result["event"]["project_id"]})
+            Topology.instance().restoreSnapshot(result["event"]["project_id"])
         elif result["action"] == "log.error":
             log.error(result["event"]["message"])
         elif result["action"] == "log.warning":

gns3/registry/appliance.py

@@ -119,7 +119,7 @@ class Appliance(collections.Mapping):
         """
         Duplicate a version in order to create a new version
         """
-        if 'versions' not in self._appliance.keys() or len(self._appliance["versions"]) == 0:
+        if 'versions' not in self._appliance.keys() or not self._appliance["versions"]:
             raise ApplianceError("Your appliance file doesn't contain any versions")
 
         ref = self._appliance["versions"][0]

gns3/registry/appliance_to_template.py

@@ -17,10 +17,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import urllib.request
 import shutil
 from ssl import CertificateError
 
+from ..qt import QtCore, QtWidgets, QtNetwork
 from ..controller import Controller
 from .config import Config, ConfigException
 
@@ -33,7 +33,7 @@ class ApplianceToTemplate:
     Appliance installation.
     """
 
-    def new_template(self, appliance_config, server, controller_symbols=None):
+    def new_template(self, appliance_config, server, controller_symbols=None, parent=None):
         """
         Creates a new template from an appliance.
 
@@ -41,6 +41,7 @@ class ApplianceToTemplate:
         :param server
         """
 
+        self._parent = parent
         new_template = {
             "compute_id": server,
             "name": appliance_config["name"]
@@ -195,7 +196,7 @@ class ApplianceToTemplate:
 
         url = "https://raw.githubusercontent.com/GNS3/gns3-registry/master/symbols/{}".format(symbol_id)
         try:
-            urllib.request.urlretrieve(url, path)
+            self._downloadApplianceSymbol(url, path)
             controller = Controller.instance()
             controller.clearStaticCache()
             if controller.isRemote():
@@ -203,3 +204,31 @@ class ApplianceToTemplate:
             return os.path.basename(path)
         except (OSError, CertificateError):
             return None
+
+    def _downloadApplianceSymbol(self, url, path, timeout=30):
+        """
+        Download an appliance symbol in a synchronous way.
+        """
+
+        network_manager = QtNetwork.QNetworkAccessManager()
+        request = QtNetwork.QNetworkRequest(QtCore.QUrl(url))
+        request.setRawHeader(b'User-Agent', b'GNS3 symbol downloader')
+        reply = network_manager.get(request)
+        progress_dialog = QtWidgets.QProgressDialog("Downloading '{}' appliance symbol...".format(os.path.basename(path)), "Cancel", 0, 0, self._parent)
+        progress_dialog.setMinimumDuration(0)
+        reply.finished.connect(progress_dialog.close)
+        QtCore.QTimer.singleShot(timeout * 1000, progress_dialog.close)
+        log.debug("Downloading appliance symbol from '{}'".format(url))
+        progress_dialog.show()
+        progress_dialog.exec_()
+        status = reply.attribute(QtNetwork.QNetworkRequest.HttpStatusCodeAttribute)
+        if reply.error() == QtNetwork.QNetworkReply.NoError and status == 200:
+            try:
+                with open(path, 'wb+') as f:
+                    f.write(reply.readAll())
+            except OSError as e:
+                log.debug("Error while saving appliance symbol to '{}': {}".format(path, e))
+                raise
+            log.debug("Appliance symbol downloaded and saved to '{}'".format(path))
+        else:
+            log.warning("Error when downloading appliance symbol from '{}': {}".format(url, reply.errorString()))

gns3/registry/image.py

@@ -114,16 +114,16 @@ class Image:
             try:
                 if not os.path.isfile(self._path):
                     return None
+                m = hashlib.md5()
+                with open(self._path, "rb") as f:
+                    while True:
+                        buf = f.read(4096)
+                        if not buf:
+                            break
+                        m.update(buf)
             except (OSError, PermissionError) as e:
                 log.debug("Cannot access '{}': {}".format(self._path, e))
                 return None
-            m = hashlib.md5()
-            with open(self._path, "rb") as f:
-                while True:
-                    buf = f.read(4096)
-                    if not buf:
-                        break
-                    m.update(buf)
             self._md5sum = m.hexdigest()
         Image._cache[self._path] = self._md5sum
         return self._md5sum

gns3/registry/registry.py

@@ -89,10 +89,10 @@ class Registry(QtCore.QObject):
         for directory in self._images_dirs:
             log.debug("Search image {} (MD5={} SIZE={}) in '{}'".format(filename, md5sum, size, directory))
             if os.path.exists(directory):
-                for file in os.listdir(directory):
-                    if not file.endswith(".md5sum") and not file.startswith("."):
-                        path = os.path.join(directory, file)
-                        try:
+                try:
+                    for file in os.listdir(directory):
+                        if not file.endswith(".md5sum") and not file.startswith("."):
+                            path = os.path.join(directory, file)
                             if os.path.isfile(path):
                                 if md5sum is None or strict_md5_check is False:
                                     if filename == os.path.basename(path):
@@ -106,7 +106,7 @@ class Registry(QtCore.QObject):
                                         if image.md5sum == md5sum:
                                             log.debug("Found image {} (MD5={}) in {}".format(filename, md5sum, image.path))
                                             return image
-                        except (OSError, PermissionError) as e:
-                            log.error("Cannot scan {}: {}".format(path, e))
+                except (OSError, PermissionError) as e:
+                    log.error("Cannot scan {}: {}".format(path, e))
 
         return None

gns3/schemas/appliance.json

@@ -166,6 +166,13 @@
             "extra_hosts": {
                 "description": "Hosts which will be written to /etc/hosts into container" ,
                 "type": "string"
+            },
+            "extra_volumes": {
+                "description": "Additional directories to make persistent that are not included in the images VOLUME directive" ,
+                "type": "array",
+                "items": {
+                    "type": "string"
+                }
             }
         },
         "required": [
@@ -259,6 +266,9 @@
         "adapter_type": {
           "enum": [
               "e1000",
+              "e1000-82544gc",
+              "e1000-82545em",
+              "e1000e",
               "i82550",
               "i82551",
               "i82557a",
@@ -274,6 +284,7 @@
               "i82801",
               "ne2k_pci",
               "pcnet",
+              "rocker",
               "rtl8139",
               "virtio",
               "virtio-net-pci",
@@ -294,19 +305,19 @@
           "title": "Number of Virtual CPU"
         },
         "hda_disk_interface": {
-            "enum": ["ide", "scsi", "sd", "mtd", "floppy", "pflash", "virtio", "sata"],
+            "enum": ["ide", "sata", "nvme","scsi", "sd", "mtd", "floppy", "pflash", "virtio", "none"],
             "title": "Disk interface for the installed hda_disk_image"
         },
         "hdb_disk_interface": {
-            "enum": ["ide", "scsi", "sd", "mtd", "floppy", "pflash", "virtio", "sata"],
+            "enum": ["ide", "sata", "nvme", "scsi", "sd", "mtd", "floppy", "pflash", "virtio", "none"],
             "title": "Disk interface for the installed hdb_disk_image"
         },
         "hdc_disk_interface": {
-            "enum": ["ide", "scsi", "sd", "mtd", "floppy", "pflash", "virtio", "sata"],
+            "enum": ["ide", "sata", "nvme", "scsi", "sd", "mtd", "floppy", "pflash", "virtio", "none"],
             "title": "Disk interface for the installed hdc_disk_image"
         },
         "hdd_disk_interface": {
-            "enum": ["ide", "scsi", "sd", "mtd", "floppy", "pflash", "virtio", "sata"],
+            "enum": ["ide", "sata", "nvme", "scsi", "sd", "mtd", "floppy", "pflash", "virtio", "none"],
             "title": "Disk interface for the installed hdd_disk_image"
         },
         "arch": {

gns3/settings.py

@@ -40,7 +40,7 @@ DEFAULT_CONFIGS_PATH = os.path.normpath(os.path.expanduser("~/GNS3/configs"))
 # Default appliances location
 DEFAULT_APPLIANCES_PATH = os.path.normpath(os.path.expanduser("~/GNS3/appliances"))
 
-DEFAULT_LOCAL_SERVER_HOST = "127.0.0.1"
+DEFAULT_LOCAL_SERVER_HOST = "localhost"
 DEFAULT_LOCAL_SERVER_PORT = 3080
 DEFAULT_DELAY_CONSOLE_ALL = 500
 
@@ -55,12 +55,14 @@ if sys.platform.startswith("win"):
         # windows 32-bit
         program_files_x86 = program_files = os.environ["PROGRAMFILES"]
 
-    PRECONFIGURED_TELNET_CONSOLE_COMMANDS = {'Putty (included with GNS3)': 'putty.exe -telnet %h %p -wt "%d" -gns3 5 -skin 4',
+    PRECONFIGURED_TELNET_CONSOLE_COMMANDS = {'Putty (normal standalone version)': 'putty_standalone.exe -telnet %h %p -loghost "%d"',
+                                             'Putty (custom deprecated version)': 'putty.exe -telnet %h %p -wt "%d" -gns3 5 -skin 4',
                                              'MobaXterm': r'"{}\Mobatek\MobaXterm Personal Edition\MobaXterm.exe" -newtab "telnet %h %p"'.format(program_files_x86),
-                                             'Royal TS': r'{}\code4ward.net\Royal TS V3\RTS3App.exe /connectadhoc:%h /adhoctype:terminal /p:IsTelnetConnection="true" /p:ConnectionType="telnet;Telnet Connection" /p:Port="%p" /p:Name="%d"'.format(program_files),
+                                             'Royal TS V3': r'{}\code4ward.net\Royal TS V3\RTS3App.exe /connectadhoc:%h /adhoctype:terminal /p:IsTelnetConnection="true" /p:ConnectionType="telnet;Telnet Connection" /p:Port="%p" /p:Name="%d"'.format(program_files),
+                                             'Royal TS V5': r'"{}\Royal TS V5\RoyalTS.exe" /protocol:terminal /using:adhoc /uri:"%h" /property:Port="%p" /property:IsTelnetConnection="true" /property:Name="%d"'.format(program_files_x86),
                                              'SuperPutty': r'SuperPutty.exe -telnet "%h -P %p -wt \"%d\""',
-                                             'SecureCRT': r'"{}\VanDyke Software\SecureCRT\SecureCRT.exe" /N "%d" /T /TELNET %h %p'.format(program_files),
-                                             'SecureCRT (personal profile)': r'"{}\AppData\Local\VanDyke Software\SecureCRT\SecureCRT.exe" /T /N "%d" /TELNET %h %p'.format(userprofile),
+                                             'SecureCRT': r'"{}\VanDyke Software\Clients\SecureCRT.exe" /N "%d" /T /TELNET %h %p'.format(program_files),
+                                             'SecureCRT (personal profile)': r'"{}\AppData\Local\VanDyke Software\Clients\SecureCRT.exe" /T /N "%d" /TELNET %h %p'.format(userprofile),
                                              'TeraTerm Pro': r'"{}\teraterm\ttermpro.exe" /W="%d" /M="ttstart.macro" /T=1 %h %p'.format(program_files_x86),
                                              'Telnet': 'telnet %h %p',
                                              'Xshell 4': r'"{}\NetSarang\Xshell 4\xshell.exe" -url telnet://%h:%p'.format(program_files_x86),
@@ -75,7 +77,7 @@ if sys.platform.startswith("win"):
         DEFAULT_DELAY_CONSOLE_ALL = 1500
     else:
         PRECONFIGURED_TELNET_CONSOLE_COMMANDS["Solar-Putty (included with GNS3 downloaded from gns3.com)"] = 'Solar-PuTTY.exe --telnet --hostname %h --port %p  --name "%d"'
-        DEFAULT_TELNET_CONSOLE_COMMAND = PRECONFIGURED_TELNET_CONSOLE_COMMANDS["Putty (included with GNS3)"]
+        DEFAULT_TELNET_CONSOLE_COMMAND = PRECONFIGURED_TELNET_CONSOLE_COMMANDS["Putty (normal standalone version)"]
 
 elif sys.platform.startswith("darwin"):
     # Mac OS X
@@ -196,7 +198,8 @@ else:
     PRECONFIGURED_VNC_CONSOLE_COMMANDS = {
         'TightVNC': 'vncviewer %h:%p',
         'Vinagre': 'vinagre %h::%p',
-        'gvncviewer': 'gvncviewer %h:%P'
+        'gvncviewer': 'gvncviewer %h:%P',
+        'Remote Viewer': 'remote-viewer vnc://%h:%p'
     }
 
     # default VNC console command on other systems
@@ -329,7 +332,7 @@ GRAPHICS_VIEW_SETTINGS = {
 LOCAL_SERVER_SETTINGS = {
     "path": "gns3server",
     "ubridge_path": "ubridge",
-    "host": None,
+    "host": "localhost",
     "port": DEFAULT_LOCAL_SERVER_PORT,
     "images_path": DEFAULT_IMAGES_PATH,
     "projects_path": DEFAULT_PROJECTS_PATH,

gns3/spice_console.py

@@ -24,23 +24,28 @@ import os
 import shlex
 import subprocess
 
+from .controller import Controller
+
 import logging
 log = logging.getLogger(__name__)
 
 
-def spiceConsole(host, port, command):
+def spiceConsole(node, port, command):
     """
     Start a SPICE console program.
 
-    :param host: host or IP address
+    :param node: Node instance
     :param port: port number
     :param command: command to be executed
     """
 
     if len(command.strip(' ')) == 0:
-        log.warning('SPICE client is not configured')
+        log.error("SPICE client is not configured")
         return
 
+    name = node.name()
+    host = node.consoleHost()
+
     # ipv6 support
     if ":" in host:
         host = "[{}]".format(host)
@@ -48,9 +53,12 @@ def spiceConsole(host, port, command):
     # replace the place-holders by the actual values
     command = command.replace("%h", host)
     command = command.replace("%p", str(port))
+    command = command.replace("%d", name.replace('"', '\\"'))
+    command = command.replace("%i", node.project().id())
+    command = command.replace("%n", str(node.id()))
 
     try:
-        log.info('starting SPICE program "{}"'.format(command))
+        log.debug('starting SPICE program "{}"'.format(command))
         if sys.platform.startswith("win"):
             # use the string on Windows
             subprocess.Popen(command)
@@ -59,5 +67,4 @@ def spiceConsole(host, port, command):
             args = shlex.split(command)
             subprocess.Popen(args, env=os.environ)
     except (OSError, ValueError, subprocess.SubprocessError) as e:
-        log.warning('could not start SPICE program "{}": {}'.format(command, e))
-        raise
+        log.error("Could not start SPICE program with command '{}': {}".format(command, e))

gns3/style.py

@@ -76,7 +76,6 @@ class Style:
         self._mw.uiDrawRectangleAction.setIcon(self._getStyleIcon(":/icons/rectangle.svg", ":/icons/rectangle-hover.svg"))
         self._mw.uiDrawEllipseAction.setIcon(self._getStyleIcon(":/icons/ellipse.svg", ":/icons/ellipse-hover.svg"))
         self._mw.uiDrawLineAction.setIcon(QtGui.QIcon(":/icons/vertically.svg"))
-        self._mw.uiEditReadmeAction.setIcon(QtGui.QIcon(":/icons/edit.svg"))
         self._mw.uiOnlineHelpAction.setIcon(QtGui.QIcon(":/icons/help.svg"))
         self._mw.uiBrowseRoutersAction.setIcon(self._getStyleIcon(":/icons/router.png", ":/icons/router-hover.png"))
         self._mw.uiBrowseSwitchesAction.setIcon(self._getStyleIcon(":/icons/switch.png", ":/icons/switch-hover.png"))
@@ -128,7 +127,6 @@ class Style:
         self._mw.uiDrawRectangleAction.setIcon(self._getStyleIcon(":/classic_icons/rectangle.svg", ":/classic_icons/rectangle-hover.svg"))
         self._mw.uiDrawEllipseAction.setIcon(self._getStyleIcon(":/classic_icons/ellipse.svg", ":/classic_icons/ellipse-hover.svg"))
         self._mw.uiDrawLineAction.setIcon(self._getStyleIcon(":/classic_icons/line.svg", ":/classic_icons/line-hover.svg"))
-        self._mw.uiEditReadmeAction.setIcon(self._getStyleIcon(":/classic_icons/edit.svg", ":/classic_icons/edit-hover.svg"))
         self._mw.uiOnlineHelpAction.setIcon(self._getStyleIcon(":/classic_icons/help.svg", ":/classic_icons/help-hover.svg"))
         self._mw.uiBrowseRoutersAction.setIcon(self._getStyleIcon(":/classic_icons/router.svg", ":/classic_icons/router-hover.svg"))
         self._mw.uiBrowseSwitchesAction.setIcon(self._getStyleIcon(":/classic_icons/switch.svg", ":/classic_icons/switch-hover.svg"))
@@ -190,7 +188,6 @@ class Style:
         self._mw.uiDrawRectangleAction.setIcon(self._getStyleIcon(":/charcoal_icons/rectangle.svg", ":/charcoal_icons/rectangle-hover.svg"))
         self._mw.uiDrawEllipseAction.setIcon(self._getStyleIcon(":/charcoal_icons/ellipse.svg", ":/charcoal_icons/ellipse-hover.svg"))
         self._mw.uiDrawLineAction.setIcon(self._getStyleIcon(":/charcoal_icons/line.svg", ":/charcoal_icons/line-hover.svg"))
-        self._mw.uiEditReadmeAction.setIcon(self._getStyleIcon(":/charcoal_icons/edit.svg", ":/charcoal_icons/edit-hover.svg"))
         self._mw.uiOnlineHelpAction.setIcon(self._getStyleIcon(":/charcoal_icons/help.svg", ":/charcoal_icons/help-hover.svg"))
         self._mw.uiBrowseRoutersAction.setIcon(self._getStyleIcon(":/charcoal_icons/router.svg", ":/charcoal_icons/router-hover.svg"))
         self._mw.uiBrowseSwitchesAction.setIcon(self._getStyleIcon(":/charcoal_icons/switch.svg", ":/charcoal_icons/switch-hover.svg"))

gns3/template.py

@@ -30,6 +30,10 @@ class Template:
             settings["template_id"] = str(uuid.uuid4())
         self._settings = copy.deepcopy(settings)
 
+        # The "appliance_id" setting has been replaced by "template_id" setting in version 2.2
+        if "appliance_id" in self._settings:
+            self._settings["template_id"] = self._settings.pop("appliance_id")
+
         # The "node_type" setting has been replaced by "template_type" setting in version 2.2
         if "node_type" in self._settings:
             self._settings["template_type"] = self._settings.pop("node_type")
@@ -38,6 +42,11 @@ class Template:
         if "server" in self._settings:
             self._settings["compute_id"] = self._settings.pop("server")
 
+        for setting in self._settings.copy():
+            # remove deprecated settings
+            if setting in ["enable_remote_console", "use_ubridge", "acpi_shutdown", "default_symbol", "hover_symbol"]:
+                del self._settings[setting]
+
     def id(self):
         """
         Returns the template ID.

gns3/template_manager.py

@@ -213,6 +213,7 @@ class TemplateManager(QtCore.QObject):
         self._controller.post("/projects/{project_id}/templates/{template_id}".format(project_id=project.id(), template_id=template_id),
                               self._createNodeFromTemplateCallback,
                               params,
+                              showProgress=False,
                               timeout=None)
         return True
 

gns3/topology.py

@@ -109,14 +109,14 @@ class Topology(QtCore.QObject):
 
         return self._project
 
-    def setProject(self, project):
+    def setProject(self, project, snapshot=False):
         """
         Set current project
 
         :param project: Project instance
         """
 
-        if self._project:
+        if self._project and snapshot is False:
             # Assert to detect when we create a new project object for the same project
             assert project is None or (project != self._project and project.id != self._project.id)
             self._project.stopListenNotifications()
@@ -134,7 +134,6 @@ class Topology(QtCore.QObject):
 
         self.project_changed_signal.emit()
 
-
     def _projectUpdatedSlot(self):
         if not self._project or not self._project.filesDir() or not self._project.filename():
             return
@@ -145,7 +144,7 @@ class Topology(QtCore.QObject):
         self._main_window.uiGraphicsView.setDrawingGridSize(self._project.drawingGridSize())
         self._main_window.uiShowGridAction.setChecked(self._project.showGrid())
         self._main_window.showGrid(self._project.showGrid())
-        if os.path.exists(project_file):
+        if not Controller.instance().isRemote() and os.path.exists(project_file):
             self._main_window.updateRecentFileSettings(project_file)
             self._main_window.updateRecentFileActions()
 
@@ -193,6 +192,7 @@ class Topology(QtCore.QObject):
         """
         Create load a project based on settings, not on the .gns3
         """
+
         self.setProject(None)
         from .project import Project
         project = Project()
@@ -215,6 +215,17 @@ class Topology(QtCore.QObject):
             self._main_window.uiStatusBar.showMessage("Project created", 2000)
         return project
 
+    def restoreSnapshot(self, project_id):
+        """
+        Restore a snapshot for a given project.
+        """
+
+        assert self._project.id() == project_id
+        project = self._project
+        self.setProject(project, snapshot=True)
+        project.load()
+        self._main_window.uiStatusBar.showMessage("Snapshot restored", 2000)
+
     def loadProject(self, path):
         """
         Loads a project into GNS3.

gns3/topology_summary_view.py

@@ -267,19 +267,16 @@ class TopologySummaryView(QtWidgets.QTreeWidget):
                         if item.link() == link:
                             view.centerOn(item)
 
-    def mousePressEvent(self, event):
+    def contextMenuEvent(self, event):
         """
-        Handles all mouse press events.
+        Handles all context menu events.
 
-        :param event: QMouseEvent instance
+        :param event: QContextMenuEvent instance
         """
 
-        if event.button() == QtCore.Qt.RightButton:
-            self._showContextualMenu()
-        else:
-            super().mousePressEvent(event)
+        self._showContextualMenu(event.globalPos())
 
-    def _showContextualMenu(self):
+    def _showContextualMenu(self, pos):
         """
         Contextual menu to expand and collapse the tree.
         """
@@ -336,7 +333,7 @@ class TopologySummaryView(QtWidgets.QTreeWidget):
                         item.populateLinkContextualMenu(menu)
                         break
 
-        menu.exec_(QtGui.QCursor.pos())
+        menu.exec_(pos)
 
     @qslot
     def _expandAllSlot(self, *args):

gns3/ui/edit_project_dialog.ui

@@ -67,13 +67,13 @@
        <item row="4" column="1">
         <widget class="QSpinBox" name="uiNodeGridSizeSpinBox">
          <property name="minimum">
-          <number>10</number>
+          <number>5</number>
          </property>
          <property name="maximum">
           <number>150</number>
          </property>
          <property name="singleStep">
-          <number>10</number>
+          <number>5</number>
          </property>
          <property name="value">
           <number>75</number>
@@ -83,13 +83,13 @@
        <item row="5" column="1">
         <widget class="QSpinBox" name="uiDrawingGridSizeSpinBox">
          <property name="minimum">
-          <number>10</number>
+          <number>5</number>
          </property>
          <property name="maximum">
           <number>100</number>
          </property>
          <property name="singleStep">
-          <number>10</number>
+          <number>5</number>
          </property>
          <property name="value">
           <number>25</number>
@@ -179,6 +179,17 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>uiProjectNameLineEdit</tabstop>
+  <tabstop>uiSceneWidthSpinBox</tabstop>
+  <tabstop>uiSceneHeightSpinBox</tabstop>
+  <tabstop>uiNodeGridSizeSpinBox</tabstop>
+  <tabstop>uiDrawingGridSizeSpinBox</tabstop>
+  <tabstop>uiProjectAutoOpenCheckBox</tabstop>
+  <tabstop>uiProjectAutoStartCheckBox</tabstop>
+  <tabstop>uiProjectAutoCloseCheckBox</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>

gns3/ui/edit_project_dialog_ui.py

@@ -37,16 +37,16 @@ class Ui_EditProjectDialog(object):
         self.uiSceneWidthSpinBox.setObjectName("uiSceneWidthSpinBox")
         self.uiGeneralGrid.addWidget(self.uiSceneWidthSpinBox, 2, 1, 1, 1)
         self.uiNodeGridSizeSpinBox = QtWidgets.QSpinBox(self.uiGeneralTab)
-        self.uiNodeGridSizeSpinBox.setMinimum(10)
+        self.uiNodeGridSizeSpinBox.setMinimum(5)
         self.uiNodeGridSizeSpinBox.setMaximum(150)
-        self.uiNodeGridSizeSpinBox.setSingleStep(10)
+        self.uiNodeGridSizeSpinBox.setSingleStep(5)
         self.uiNodeGridSizeSpinBox.setProperty("value", 75)
         self.uiNodeGridSizeSpinBox.setObjectName("uiNodeGridSizeSpinBox")
         self.uiGeneralGrid.addWidget(self.uiNodeGridSizeSpinBox, 4, 1, 1, 1)
         self.uiDrawingGridSizeSpinBox = QtWidgets.QSpinBox(self.uiGeneralTab)
-        self.uiDrawingGridSizeSpinBox.setMinimum(10)
+        self.uiDrawingGridSizeSpinBox.setMinimum(5)
         self.uiDrawingGridSizeSpinBox.setMaximum(100)
-        self.uiDrawingGridSizeSpinBox.setSingleStep(10)
+        self.uiDrawingGridSizeSpinBox.setSingleStep(5)
         self.uiDrawingGridSizeSpinBox.setProperty("value", 25)
         self.uiDrawingGridSizeSpinBox.setObjectName("uiDrawingGridSizeSpinBox")
         self.uiGeneralGrid.addWidget(self.uiDrawingGridSizeSpinBox, 5, 1, 1, 1)

gns3/ui/export_project_wizard.ui

@@ -61,14 +61,24 @@
       </property>
      </widget>
     </item>
-    <item row="2" column="0" colspan="2">
+    <item row="1" column="1" colspan="2">
+     <widget class="QComboBox" name="uiCompressionComboBox"/>
+    </item>
+    <item row="2" column="0" colspan="3">
      <widget class="QCheckBox" name="uiIncludeImagesCheckBox">
       <property name="text">
        <string>Include base images</string>
       </property>
      </widget>
     </item>
-    <item row="3" column="1">
+    <item row="3" column="0" colspan="2">
+     <widget class="QCheckBox" name="uiIncludeSnapshotsCheckBox">
+      <property name="text">
+       <string>Include snapshots</string>
+      </property>
+     </widget>
+    </item>
+    <item row="4" column="2">
      <spacer name="verticalSpacer">
       <property name="orientation">
        <enum>Qt::Vertical</enum>
@@ -81,9 +91,6 @@
       </property>
      </spacer>
     </item>
-    <item row="1" column="1" colspan="2">
-     <widget class="QComboBox" name="uiCompressionComboBox"/>
-    </item>
    </layout>
   </widget>
   <widget class="QWizardPage" name="uiProjectReadmeWizardPage">

gns3/ui/export_project_wizard_ui.py

@@ -38,14 +38,17 @@ class Ui_ExportProjectWizard(object):
         self.uiCompressionLabel = QtWidgets.QLabel(self.uiExportOptionsWizardPage)
         self.uiCompressionLabel.setObjectName("uiCompressionLabel")
         self.gridLayout.addWidget(self.uiCompressionLabel, 1, 0, 1, 1)
-        self.uiIncludeImagesCheckBox = QtWidgets.QCheckBox(self.uiExportOptionsWizardPage)
-        self.uiIncludeImagesCheckBox.setObjectName("uiIncludeImagesCheckBox")
-        self.gridLayout.addWidget(self.uiIncludeImagesCheckBox, 2, 0, 1, 2)
-        spacerItem = QtWidgets.QSpacerItem(20, 247, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.gridLayout.addItem(spacerItem, 3, 1, 1, 1)
         self.uiCompressionComboBox = QtWidgets.QComboBox(self.uiExportOptionsWizardPage)
         self.uiCompressionComboBox.setObjectName("uiCompressionComboBox")
         self.gridLayout.addWidget(self.uiCompressionComboBox, 1, 1, 1, 2)
+        self.uiIncludeImagesCheckBox = QtWidgets.QCheckBox(self.uiExportOptionsWizardPage)
+        self.uiIncludeImagesCheckBox.setObjectName("uiIncludeImagesCheckBox")
+        self.gridLayout.addWidget(self.uiIncludeImagesCheckBox, 2, 0, 1, 3)
+        self.uiIncludeSnapshotsCheckBox = QtWidgets.QCheckBox(self.uiExportOptionsWizardPage)
+        self.uiIncludeSnapshotsCheckBox.setObjectName("uiIncludeSnapshotsCheckBox")
+        self.gridLayout.addWidget(self.uiIncludeSnapshotsCheckBox, 3, 0, 1, 2)
+        spacerItem = QtWidgets.QSpacerItem(20, 247, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.gridLayout.addItem(spacerItem, 4, 2, 1, 1)
         ExportProjectWizard.addPage(self.uiExportOptionsWizardPage)
         self.uiProjectReadmeWizardPage = QtWidgets.QWizardPage()
         self.uiProjectReadmeWizardPage.setObjectName("uiProjectReadmeWizardPage")
@@ -68,6 +71,7 @@ class Ui_ExportProjectWizard(object):
         self.uiPathBrowserToolButton.setText(_translate("ExportProjectWizard", "Browse..."))
         self.uiCompressionLabel.setText(_translate("ExportProjectWizard", "Compression:"))
         self.uiIncludeImagesCheckBox.setText(_translate("ExportProjectWizard", "Include base images"))
+        self.uiIncludeSnapshotsCheckBox.setText(_translate("ExportProjectWizard", "Include snapshots"))
         self.uiProjectReadmeWizardPage.setTitle(_translate("ExportProjectWizard", "Readme file"))
         self.uiProjectReadmeWizardPage.setSubTitle(_translate("ExportProjectWizard", "Write a summary of the project."))
         self.uiReadmeTextEdit.setHtml(_translate("ExportProjectWizard", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"

gns3/ui/general_preferences_page.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>931</width>
-    <height>878</height>
+    <width>941</width>
+    <height>910</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -136,11 +136,15 @@
        <item>
         <widget class="QGroupBox" name="uiSymbolThemeGroupBox">
          <property name="title">
-          <string>Symbol theme</string>
+          <string>Symbol theme for new templates</string>
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout_15">
           <item>
-           <widget class="QComboBox" name="uiSymbolThemeComboBox"/>
+           <widget class="QComboBox" name="uiSymbolThemeComboBox">
+            <property name="toolTip">
+             <string>Symbol theme support only works when adding a new template using the recommended method in the template wizard.</string>
+            </property>
+           </widget>
           </item>
          </layout>
         </widget>
@@ -271,6 +275,9 @@
           </item>
           <item>
            <widget class="QListWidget" name="uiImageDirectoriesListWidget">
+            <property name="focusPolicy">
+             <enum>Qt::ClickFocus</enum>
+            </property>
             <property name="lineWidth">
              <number>0</number>
             </property>
@@ -393,17 +400,7 @@
                </sizepolicy>
               </property>
               <property name="toolTip">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Command line replacements:&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;%h = console IP or hostname&lt;/li&gt;
-&lt;li&gt;%p = console port&lt;/li&gt;
-&lt;li&gt;%P = VNC display&lt;/li&gt;
-&lt;li&gt;%s = path of the serial connection&lt;/li&gt;
-&lt;li&gt;%d = title of the console&lt;/li&gt;
-&lt;li&gt;%i = project UUID&lt;/li&gt;
-&lt;li&gt;%c = server URL&lt;/li&gt;
-&lt;/ul&gt;
-&lt;/body&gt;&lt;/html&gt;</string>
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Command line replacements:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;%h = console IP or hostname&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;%p = console port&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;%d = title of the console&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;%i = project UUID&lt;/li&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;%n = node UUID&lt;/li&gt;&lt;/ul&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;%c = server URL&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
               <property name="readOnly">
                <bool>true</bool>
@@ -504,17 +501,7 @@
                </sizepolicy>
               </property>
               <property name="toolTip">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Command line replacements:&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;%h = console IP or hostname&lt;/li&gt;
-&lt;li&gt;%p = console port&lt;/li&gt;
-&lt;li&gt;%P = VNC display&lt;/li&gt;
-&lt;li&gt;%s = path of the serial connection&lt;/li&gt;
-&lt;li&gt;%d = title of the console&lt;/li&gt;
-&lt;li&gt;%i = project UUID&lt;/li&gt;
-&lt;li&gt;%c = server URL&lt;/li&gt;
-&lt;/ul&gt;
-&lt;/body&gt;&lt;/html&gt;</string>
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Command line replacements:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;%h = console IP or hostname&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;%p = console port&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;%P = VNC display&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;%d = title of the console&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;%i = project UUID&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;%n = node UUID&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
               <property name="readOnly">
                <bool>true</bool>
@@ -583,17 +570,7 @@
                </sizepolicy>
               </property>
               <property name="toolTip">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Command line replacements:&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;%h = console IP or hostname&lt;/li&gt;
-&lt;li&gt;%p = console port&lt;/li&gt;
-&lt;li&gt;%P = VNC display&lt;/li&gt;
-&lt;li&gt;%s = path of the serial connection&lt;/li&gt;
-&lt;li&gt;%d = title of the console&lt;/li&gt;
-&lt;li&gt;%i = project UUID&lt;/li&gt;
-&lt;li&gt;%c = server URL&lt;/li&gt;
-&lt;/ul&gt;
-&lt;/body&gt;&lt;/html&gt;</string>
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Command line replacements:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;%h = console IP or hostname&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;%p = console port&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;%d = title of the console&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;%i = project UUID&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;%n = node UUID&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
               <property name="readOnly">
                <bool>true</bool>
@@ -680,6 +657,9 @@
            <height>50</height>
           </size>
          </property>
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
          <property name="readOnly">
           <bool>true</bool>
          </property>
@@ -726,16 +706,6 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="0">
-        <widget class="QCheckBox" name="uiDrawLinkStatusPointsCheckBox">
-         <property name="text">
-          <string>Draw link status points</string>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
        <item row="12" column="0" colspan="3">
         <layout class="QHBoxLayout" name="horizontalLayout_5">
          <item>
@@ -781,6 +751,9 @@
            <height>50</height>
           </size>
          </property>
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
          <property name="readOnly">
           <bool>true</bool>
          </property>
@@ -797,6 +770,9 @@
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
          <property name="suffix">
           <string> pixels</string>
          </property>
@@ -822,6 +798,9 @@
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
          <property name="suffix">
           <string> pixels</string>
          </property>
@@ -875,14 +854,17 @@
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
          <property name="minimum">
-          <number>10</number>
+          <number>5</number>
          </property>
          <property name="maximum">
           <number>100</number>
          </property>
          <property name="singleStep">
-          <number>10</number>
+          <number>5</number>
          </property>
          <property name="value">
           <number>25</number>
@@ -897,14 +879,17 @@
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
          <property name="minimum">
-          <number>10</number>
+          <number>5</number>
          </property>
          <property name="maximum">
           <number>150</number>
          </property>
          <property name="singleStep">
-          <number>10</number>
+          <number>5</number>
          </property>
          <property name="value">
           <number>75</number>
@@ -941,6 +926,16 @@
          </property>
         </spacer>
        </item>
+       <item row="5" column="0" colspan="2">
+        <widget class="QCheckBox" name="uiDrawLinkStatusPointsCheckBox">
+         <property name="text">
+          <string>Draw link status points</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="uiMiscTab">
@@ -1062,6 +1057,56 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>uiProjectsPathLineEdit</tabstop>
+  <tabstop>uiProjectsPathToolButton</tabstop>
+  <tabstop>uiSymbolsPathLineEdit</tabstop>
+  <tabstop>uiSymbolsPathToolButton</tabstop>
+  <tabstop>uiConfigsPathLineEdit</tabstop>
+  <tabstop>uiConfigsPathToolButton</tabstop>
+  <tabstop>uiAppliancesPathLineEdit</tabstop>
+  <tabstop>uiAppliancesPathToolButton</tabstop>
+  <tabstop>uiStyleComboBox</tabstop>
+  <tabstop>uiSymbolThemeComboBox</tabstop>
+  <tabstop>uiImportConfigurationFilePushButton</tabstop>
+  <tabstop>uiExportConfigurationFilePushButton</tabstop>
+  <tabstop>uiBrowseConfigurationPushButton</tabstop>
+  <tabstop>uiImagesPathLineEdit</tabstop>
+  <tabstop>uiImagesPathToolButton</tabstop>
+  <tabstop>uiImageDirectoriesAddPushButton</tabstop>
+  <tabstop>uiImageDirectoriesDeletePushButton</tabstop>
+  <tabstop>uiTelnetConsoleCommandLineEdit</tabstop>
+  <tabstop>uiTelnetConsolePreconfiguredCommandPushButton</tabstop>
+  <tabstop>uiDelayConsoleAllSpinBox</tabstop>
+  <tabstop>uiVNCConsoleCommandLineEdit</tabstop>
+  <tabstop>uiVNCConsolePreconfiguredCommandPushButton</tabstop>
+  <tabstop>uiSPICEConsoleCommandLineEdit</tabstop>
+  <tabstop>uiSPICEConsolePreconfiguredCommandPushButton</tabstop>
+  <tabstop>uiSceneWidthSpinBox</tabstop>
+  <tabstop>uiSceneHeightSpinBox</tabstop>
+  <tabstop>uiNodeGridSizeSpinBox</tabstop>
+  <tabstop>uiDrawingGridSizeSpinBox</tabstop>
+  <tabstop>uiRectangleSelectedItemCheckBox</tabstop>
+  <tabstop>uiDrawLinkStatusPointsCheckBox</tabstop>
+  <tabstop>uiShowInterfaceLabelsOnNewProject</tabstop>
+  <tabstop>uiShowGridOnNewProject</tabstop>
+  <tabstop>uiSnapToGridOnNewProject</tabstop>
+  <tabstop>uiLimitSizeNodeSymbolCheckBox</tabstop>
+  <tabstop>uiDefaultLabelFontPushButton</tabstop>
+  <tabstop>uiDefaultLabelColorPushButton</tabstop>
+  <tabstop>uiDefaultNoteFontPushButton</tabstop>
+  <tabstop>uiDefaultNoteColorPushButton</tabstop>
+  <tabstop>uiCheckForUpdateCheckBox</tabstop>
+  <tabstop>uiCrashReportCheckBox</tabstop>
+  <tabstop>uiStatsCheckBox</tabstop>
+  <tabstop>uiOverlayNotificationsCheckBox</tabstop>
+  <tabstop>uiExperimentalFeaturesCheckBox</tabstop>
+  <tabstop>uiHdpiCheckBox</tabstop>
+  <tabstop>uiMultiProfilesCheckBox</tabstop>
+  <tabstop>uiDirectFileUpload</tabstop>
+  <tabstop>uiRestoreDefaultsPushButton</tabstop>
+  <tabstop>uiMiscTabWidget</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>

gns3/ui/general_preferences_page_ui.py

@@ -2,16 +2,18 @@
 
 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/ui/general_preferences_page.ui'
 #
-# Created by: PyQt5 UI code generator 5.9
+# Created by: PyQt5 UI code generator 5.13.2
 #
 # WARNING! All changes made in this file will be lost!
 
+
 from PyQt5 import QtCore, QtGui, QtWidgets
 
+
 class Ui_GeneralPreferencesPageWidget(object):
     def setupUi(self, GeneralPreferencesPageWidget):
         GeneralPreferencesPageWidget.setObjectName("GeneralPreferencesPageWidget")
-        GeneralPreferencesPageWidget.resize(931, 878)
+        GeneralPreferencesPageWidget.resize(941, 910)
         self.verticalLayout = QtWidgets.QVBoxLayout(GeneralPreferencesPageWidget)
         self.verticalLayout.setObjectName("verticalLayout")
         self.uiMiscTabWidget = QtWidgets.QTabWidget(GeneralPreferencesPageWidget)
@@ -140,6 +142,7 @@ class Ui_GeneralPreferencesPageWidget(object):
         self.uiImageDirectoriesLabel.setObjectName("uiImageDirectoriesLabel")
         self.verticalLayout_10.addWidget(self.uiImageDirectoriesLabel)
         self.uiImageDirectoriesListWidget = QtWidgets.QListWidget(self.uiLocalBinaryImagePathsGroupBox)
+        self.uiImageDirectoriesListWidget.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.uiImageDirectoriesListWidget.setLineWidth(0)
         self.uiImageDirectoriesListWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
         self.uiImageDirectoriesListWidget.setAlternatingRowColors(False)
@@ -312,6 +315,7 @@ class Ui_GeneralPreferencesPageWidget(object):
         sizePolicy.setHeightForWidth(self.uiDefaultNoteStylePlainTextEdit.sizePolicy().hasHeightForWidth())
         self.uiDefaultNoteStylePlainTextEdit.setSizePolicy(sizePolicy)
         self.uiDefaultNoteStylePlainTextEdit.setMaximumSize(QtCore.QSize(16777215, 50))
+        self.uiDefaultNoteStylePlainTextEdit.setFocusPolicy(QtCore.Qt.NoFocus)
         self.uiDefaultNoteStylePlainTextEdit.setReadOnly(True)
         self.uiDefaultNoteStylePlainTextEdit.setObjectName("uiDefaultNoteStylePlainTextEdit")
         self.gridLayout_3.addWidget(self.uiDefaultNoteStylePlainTextEdit, 14, 0, 1, 3)
@@ -329,10 +333,6 @@ class Ui_GeneralPreferencesPageWidget(object):
         self.uiLimitSizeNodeSymbolCheckBox = QtWidgets.QCheckBox(self.uiSceneTab)
         self.uiLimitSizeNodeSymbolCheckBox.setObjectName("uiLimitSizeNodeSymbolCheckBox")
         self.gridLayout_3.addWidget(self.uiLimitSizeNodeSymbolCheckBox, 9, 0, 1, 2)
-        self.uiDrawLinkStatusPointsCheckBox = QtWidgets.QCheckBox(self.uiSceneTab)
-        self.uiDrawLinkStatusPointsCheckBox.setChecked(True)
-        self.uiDrawLinkStatusPointsCheckBox.setObjectName("uiDrawLinkStatusPointsCheckBox")
-        self.gridLayout_3.addWidget(self.uiDrawLinkStatusPointsCheckBox, 5, 0, 1, 1)
         self.horizontalLayout_5 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_5.setObjectName("horizontalLayout_5")
         self.uiDefaultLabelFontPushButton = QtWidgets.QPushButton(self.uiSceneTab)
@@ -351,6 +351,7 @@ class Ui_GeneralPreferencesPageWidget(object):
         sizePolicy.setHeightForWidth(self.uiDefaultLabelStylePlainTextEdit.sizePolicy().hasHeightForWidth())
         self.uiDefaultLabelStylePlainTextEdit.setSizePolicy(sizePolicy)
         self.uiDefaultLabelStylePlainTextEdit.setMaximumSize(QtCore.QSize(16777215, 50))
+        self.uiDefaultLabelStylePlainTextEdit.setFocusPolicy(QtCore.Qt.NoFocus)
         self.uiDefaultLabelStylePlainTextEdit.setReadOnly(True)
         self.uiDefaultLabelStylePlainTextEdit.setObjectName("uiDefaultLabelStylePlainTextEdit")
         self.gridLayout_3.addWidget(self.uiDefaultLabelStylePlainTextEdit, 11, 0, 1, 3)
@@ -360,6 +361,7 @@ class Ui_GeneralPreferencesPageWidget(object):
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.uiSceneHeightSpinBox.sizePolicy().hasHeightForWidth())
         self.uiSceneHeightSpinBox.setSizePolicy(sizePolicy)
+        self.uiSceneHeightSpinBox.setFocusPolicy(QtCore.Qt.StrongFocus)
         self.uiSceneHeightSpinBox.setMinimum(500)
         self.uiSceneHeightSpinBox.setMaximum(1000000)
         self.uiSceneHeightSpinBox.setSingleStep(100)
@@ -372,6 +374,7 @@ class Ui_GeneralPreferencesPageWidget(object):
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.uiSceneWidthSpinBox.sizePolicy().hasHeightForWidth())
         self.uiSceneWidthSpinBox.setSizePolicy(sizePolicy)
+        self.uiSceneWidthSpinBox.setFocusPolicy(QtCore.Qt.StrongFocus)
         self.uiSceneWidthSpinBox.setMinimum(500)
         self.uiSceneWidthSpinBox.setMaximum(1000000)
         self.uiSceneWidthSpinBox.setSingleStep(100)
@@ -396,9 +399,10 @@ class Ui_GeneralPreferencesPageWidget(object):
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.uiDrawingGridSizeSpinBox.sizePolicy().hasHeightForWidth())
         self.uiDrawingGridSizeSpinBox.setSizePolicy(sizePolicy)
-        self.uiDrawingGridSizeSpinBox.setMinimum(10)
+        self.uiDrawingGridSizeSpinBox.setFocusPolicy(QtCore.Qt.StrongFocus)
+        self.uiDrawingGridSizeSpinBox.setMinimum(5)
         self.uiDrawingGridSizeSpinBox.setMaximum(100)
-        self.uiDrawingGridSizeSpinBox.setSingleStep(10)
+        self.uiDrawingGridSizeSpinBox.setSingleStep(5)
         self.uiDrawingGridSizeSpinBox.setProperty("value", 25)
         self.uiDrawingGridSizeSpinBox.setObjectName("uiDrawingGridSizeSpinBox")
         self.gridLayout_3.addWidget(self.uiDrawingGridSizeSpinBox, 3, 1, 1, 1)
@@ -408,9 +412,10 @@ class Ui_GeneralPreferencesPageWidget(object):
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.uiNodeGridSizeSpinBox.sizePolicy().hasHeightForWidth())
         self.uiNodeGridSizeSpinBox.setSizePolicy(sizePolicy)
-        self.uiNodeGridSizeSpinBox.setMinimum(10)
+        self.uiNodeGridSizeSpinBox.setFocusPolicy(QtCore.Qt.StrongFocus)
+        self.uiNodeGridSizeSpinBox.setMinimum(5)
         self.uiNodeGridSizeSpinBox.setMaximum(150)
-        self.uiNodeGridSizeSpinBox.setSingleStep(10)
+        self.uiNodeGridSizeSpinBox.setSingleStep(5)
         self.uiNodeGridSizeSpinBox.setProperty("value", 75)
         self.uiNodeGridSizeSpinBox.setObjectName("uiNodeGridSizeSpinBox")
         self.gridLayout_3.addWidget(self.uiNodeGridSizeSpinBox, 2, 1, 1, 1)
@@ -423,6 +428,10 @@ class Ui_GeneralPreferencesPageWidget(object):
         self.gridLayout_3.addWidget(self.uiRectangleSelectedItemCheckBox, 4, 0, 1, 3)
         spacerItem9 = QtWidgets.QSpacerItem(20, 5, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
         self.gridLayout_3.addItem(spacerItem9, 16, 0, 1, 1)
+        self.uiDrawLinkStatusPointsCheckBox = QtWidgets.QCheckBox(self.uiSceneTab)
+        self.uiDrawLinkStatusPointsCheckBox.setChecked(True)
+        self.uiDrawLinkStatusPointsCheckBox.setObjectName("uiDrawLinkStatusPointsCheckBox")
+        self.gridLayout_3.addWidget(self.uiDrawLinkStatusPointsCheckBox, 5, 0, 1, 2)
         self.uiMiscTabWidget.addTab(self.uiSceneTab, "")
         self.uiMiscTab = QtWidgets.QWidget()
         self.uiMiscTab.setObjectName("uiMiscTab")
@@ -472,6 +481,53 @@ class Ui_GeneralPreferencesPageWidget(object):
         self.retranslateUi(GeneralPreferencesPageWidget)
         self.uiMiscTabWidget.setCurrentIndex(0)
         QtCore.QMetaObject.connectSlotsByName(GeneralPreferencesPageWidget)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiProjectsPathLineEdit, self.uiProjectsPathToolButton)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiProjectsPathToolButton, self.uiSymbolsPathLineEdit)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiSymbolsPathLineEdit, self.uiSymbolsPathToolButton)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiSymbolsPathToolButton, self.uiConfigsPathLineEdit)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiConfigsPathLineEdit, self.uiConfigsPathToolButton)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiConfigsPathToolButton, self.uiAppliancesPathLineEdit)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiAppliancesPathLineEdit, self.uiAppliancesPathToolButton)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiAppliancesPathToolButton, self.uiStyleComboBox)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiStyleComboBox, self.uiSymbolThemeComboBox)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiSymbolThemeComboBox, self.uiImportConfigurationFilePushButton)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiImportConfigurationFilePushButton, self.uiExportConfigurationFilePushButton)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiExportConfigurationFilePushButton, self.uiBrowseConfigurationPushButton)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiBrowseConfigurationPushButton, self.uiImagesPathLineEdit)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiImagesPathLineEdit, self.uiImagesPathToolButton)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiImagesPathToolButton, self.uiImageDirectoriesAddPushButton)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiImageDirectoriesAddPushButton, self.uiImageDirectoriesDeletePushButton)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiImageDirectoriesDeletePushButton, self.uiTelnetConsoleCommandLineEdit)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiTelnetConsoleCommandLineEdit, self.uiTelnetConsolePreconfiguredCommandPushButton)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiTelnetConsolePreconfiguredCommandPushButton, self.uiDelayConsoleAllSpinBox)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiDelayConsoleAllSpinBox, self.uiVNCConsoleCommandLineEdit)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiVNCConsoleCommandLineEdit, self.uiVNCConsolePreconfiguredCommandPushButton)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiVNCConsolePreconfiguredCommandPushButton, self.uiSPICEConsoleCommandLineEdit)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiSPICEConsoleCommandLineEdit, self.uiSPICEConsolePreconfiguredCommandPushButton)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiSPICEConsolePreconfiguredCommandPushButton, self.uiSceneWidthSpinBox)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiSceneWidthSpinBox, self.uiSceneHeightSpinBox)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiSceneHeightSpinBox, self.uiNodeGridSizeSpinBox)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiNodeGridSizeSpinBox, self.uiDrawingGridSizeSpinBox)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiDrawingGridSizeSpinBox, self.uiRectangleSelectedItemCheckBox)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiRectangleSelectedItemCheckBox, self.uiDrawLinkStatusPointsCheckBox)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiDrawLinkStatusPointsCheckBox, self.uiShowInterfaceLabelsOnNewProject)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiShowInterfaceLabelsOnNewProject, self.uiShowGridOnNewProject)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiShowGridOnNewProject, self.uiSnapToGridOnNewProject)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiSnapToGridOnNewProject, self.uiLimitSizeNodeSymbolCheckBox)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiLimitSizeNodeSymbolCheckBox, self.uiDefaultLabelFontPushButton)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiDefaultLabelFontPushButton, self.uiDefaultLabelColorPushButton)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiDefaultLabelColorPushButton, self.uiDefaultNoteFontPushButton)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiDefaultNoteFontPushButton, self.uiDefaultNoteColorPushButton)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiDefaultNoteColorPushButton, self.uiCheckForUpdateCheckBox)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiCheckForUpdateCheckBox, self.uiCrashReportCheckBox)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiCrashReportCheckBox, self.uiStatsCheckBox)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiStatsCheckBox, self.uiOverlayNotificationsCheckBox)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiOverlayNotificationsCheckBox, self.uiExperimentalFeaturesCheckBox)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiExperimentalFeaturesCheckBox, self.uiHdpiCheckBox)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiHdpiCheckBox, self.uiMultiProfilesCheckBox)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiMultiProfilesCheckBox, self.uiDirectFileUpload)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiDirectFileUpload, self.uiRestoreDefaultsPushButton)
+        GeneralPreferencesPageWidget.setTabOrder(self.uiRestoreDefaultsPushButton, self.uiMiscTabWidget)
 
     def retranslateUi(self, GeneralPreferencesPageWidget):
         _translate = QtCore.QCoreApplication.translate
@@ -488,7 +544,8 @@ class Ui_GeneralPreferencesPageWidget(object):
         self.label_3.setText(_translate("GeneralPreferencesPageWidget", "My custom appliances:"))
         self.uiAppliancesPathToolButton.setText(_translate("GeneralPreferencesPageWidget", "Browse..."))
         self.uiStyleGroupBox.setTitle(_translate("GeneralPreferencesPageWidget", "Interface style"))
-        self.uiSymbolThemeGroupBox.setTitle(_translate("GeneralPreferencesPageWidget", "Symbol theme"))
+        self.uiSymbolThemeGroupBox.setTitle(_translate("GeneralPreferencesPageWidget", "Symbol theme for new templates"))
+        self.uiSymbolThemeComboBox.setToolTip(_translate("GeneralPreferencesPageWidget", "Symbol theme support only works when adding a new template using the recommended method in the template wizard."))
         self.uiConfigurationFileGroupBox.setTitle(_translate("GeneralPreferencesPageWidget", "Configuration file"))
         self.uiImportConfigurationFilePushButton.setText(_translate("GeneralPreferencesPageWidget", "&Import"))
         self.uiExportConfigurationFilePushButton.setText(_translate("GeneralPreferencesPageWidget", "&Export"))
@@ -505,17 +562,7 @@ class Ui_GeneralPreferencesPageWidget(object):
         self.uiMiscTabWidget.setTabText(self.uiMiscTabWidget.indexOf(self.uiImagesTab), _translate("GeneralPreferencesPageWidget", "Binary images"))
         self.uiTelnetConsoleSettingsGroupBox.setTitle(_translate("GeneralPreferencesPageWidget", "Console settings"))
         self.uiTelnetConsoleCommandLabel.setText(_translate("GeneralPreferencesPageWidget", "Console application command for Telnet:"))
-        self.uiTelnetConsoleCommandLineEdit.setToolTip(_translate("GeneralPreferencesPageWidget", "<html><head/><body><p>Command line replacements:</p>\n"
-"<ul>\n"
-"<li>%h = console IP or hostname</li>\n"
-"<li>%p = console port</li>\n"
-"<li>%P = VNC display</li>\n"
-"<li>%s = path of the serial connection</li>\n"
-"<li>%d = title of the console</li>\n"
-"<li>%i = project UUID</li>\n"
-"<li>%c = server URL</li>\n"
-"</ul>\n"
-"</body></html>"))
+        self.uiTelnetConsoleCommandLineEdit.setToolTip(_translate("GeneralPreferencesPageWidget", "<html><head/><body><p>Command line replacements:</p><ul style=\"margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;\"><li style=\" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">%h = console IP or hostname</li><li style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">%p = console port</li><li style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">%d = title of the console</li><li style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">%i = project UUID</li><ul style=\"margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;\"><li style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">%n = node UUID</li></ul><li style=\" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">%c = server URL</li></ul></body></html>"))
         self.uiTelnetConsolePreconfiguredCommandPushButton.setText(_translate("GeneralPreferencesPageWidget", "&Edit"))
         self.uiConsoleMiscGroupBox.setTitle(_translate("GeneralPreferencesPageWidget", "Miscellaneous"))
         self.uiDelayConsoleAllSpinBox.setSuffix(_translate("GeneralPreferencesPageWidget", " ms"))
@@ -523,32 +570,12 @@ class Ui_GeneralPreferencesPageWidget(object):
         self.uiMiscTabWidget.setTabText(self.uiMiscTabWidget.indexOf(self.uiConsoleTab), _translate("GeneralPreferencesPageWidget", "Console applications"))
         self.uiVNCConsoleSettingsGroupBox.setTitle(_translate("GeneralPreferencesPageWidget", "Settings for VNC connections"))
         self.uiVNCConsoleCommandLabel.setText(_translate("GeneralPreferencesPageWidget", "Console application command for VNC:"))
-        self.uiVNCConsoleCommandLineEdit.setToolTip(_translate("GeneralPreferencesPageWidget", "<html><head/><body><p>Command line replacements:</p>\n"
-"<ul>\n"
-"<li>%h = console IP or hostname</li>\n"
-"<li>%p = console port</li>\n"
-"<li>%P = VNC display</li>\n"
-"<li>%s = path of the serial connection</li>\n"
-"<li>%d = title of the console</li>\n"
-"<li>%i = project UUID</li>\n"
-"<li>%c = server URL</li>\n"
-"</ul>\n"
-"</body></html>"))
+        self.uiVNCConsoleCommandLineEdit.setToolTip(_translate("GeneralPreferencesPageWidget", "<html><head/><body><p>Command line replacements:</p><ul style=\"margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;\"><li style=\" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">%h = console IP or hostname</li><li style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">%p = console port</li><li style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">%P = VNC display</li><li style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">%d = title of the console</li><li style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">%i = project UUID</li><li style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">%n = node UUID</li></ul></body></html>"))
         self.uiVNCConsolePreconfiguredCommandPushButton.setText(_translate("GeneralPreferencesPageWidget", "&Edit"))
         self.uiMiscTabWidget.setTabText(self.uiMiscTabWidget.indexOf(self.uiVNCTab), _translate("GeneralPreferencesPageWidget", "VNC"))
         self.uiSPICEConsoleSettingsGroupBox.setTitle(_translate("GeneralPreferencesPageWidget", "Settings for SPICE connections"))
         self.uiSPICEConsoleCommandLabel.setText(_translate("GeneralPreferencesPageWidget", "Console application command for SPICE:"))
-        self.uiSPICEConsoleCommandLineEdit.setToolTip(_translate("GeneralPreferencesPageWidget", "<html><head/><body><p>Command line replacements:</p>\n"
-"<ul>\n"
-"<li>%h = console IP or hostname</li>\n"
-"<li>%p = console port</li>\n"
-"<li>%P = VNC display</li>\n"
-"<li>%s = path of the serial connection</li>\n"
-"<li>%d = title of the console</li>\n"
-"<li>%i = project UUID</li>\n"
-"<li>%c = server URL</li>\n"
-"</ul>\n"
-"</body></html>"))
+        self.uiSPICEConsoleCommandLineEdit.setToolTip(_translate("GeneralPreferencesPageWidget", "<html><head/><body><p>Command line replacements:</p><ul style=\"margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;\"><li style=\" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">%h = console IP or hostname</li><li style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">%p = console port</li><li style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">%d = title of the console</li><li style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">%i = project UUID</li><li style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">%n = node UUID</li></ul><p><br/></p></body></html>"))
         self.uiSPICEConsolePreconfiguredCommandPushButton.setText(_translate("GeneralPreferencesPageWidget", "&Edit"))
         self.uiMiscTabWidget.setTabText(self.uiMiscTabWidget.indexOf(self.uiSPICETab), _translate("GeneralPreferencesPageWidget", "SPICE"))
         self.uiSceneWidthLabel.setText(_translate("GeneralPreferencesPageWidget", "Default width:"))
@@ -559,7 +586,6 @@ class Ui_GeneralPreferencesPageWidget(object):
         self.uiDefaultNoteFontPushButton.setText(_translate("GeneralPreferencesPageWidget", "&Select default font"))
         self.uiDefaultNoteColorPushButton.setText(_translate("GeneralPreferencesPageWidget", "&Select default color"))
         self.uiLimitSizeNodeSymbolCheckBox.setText(_translate("GeneralPreferencesPageWidget", "Limit the size of node symbols"))
-        self.uiDrawLinkStatusPointsCheckBox.setText(_translate("GeneralPreferencesPageWidget", "Draw link status points"))
         self.uiDefaultLabelFontPushButton.setText(_translate("GeneralPreferencesPageWidget", "&Select default font"))
         self.uiDefaultLabelColorPushButton.setText(_translate("GeneralPreferencesPageWidget", "&Select default color"))
         self.uiDefaultLabelStylePlainTextEdit.setPlainText(_translate("GeneralPreferencesPageWidget", "AaBbYyZz"))
@@ -571,6 +597,7 @@ class Ui_GeneralPreferencesPageWidget(object):
         self.uiNodeGridSizeLabel.setText(_translate("GeneralPreferencesPageWidget", "Default node grid size:"))
         self.uiShowGridOnNewProject.setText(_translate("GeneralPreferencesPageWidget", "Show grid on new project"))
         self.uiRectangleSelectedItemCheckBox.setText(_translate("GeneralPreferencesPageWidget", "Draw a rectangle when an item is selected"))
+        self.uiDrawLinkStatusPointsCheckBox.setText(_translate("GeneralPreferencesPageWidget", "Draw link status points"))
         self.uiMiscTabWidget.setTabText(self.uiMiscTabWidget.indexOf(self.uiSceneTab), _translate("GeneralPreferencesPageWidget", "Topology view"))
         self.uiCheckForUpdateCheckBox.setText(_translate("GeneralPreferencesPageWidget", "Automatically check for update"))
         self.uiCrashReportCheckBox.setText(_translate("GeneralPreferencesPageWidget", "Send anonymous crash reports"))
@@ -583,4 +610,3 @@ class Ui_GeneralPreferencesPageWidget(object):
         self.uiDirectFileUpload.setText(_translate("GeneralPreferencesPageWidget", "Upload files directly to computes (experimental)"))
         self.uiMiscTabWidget.setTabText(self.uiMiscTabWidget.indexOf(self.uiMiscTab), _translate("GeneralPreferencesPageWidget", "Miscellaneous"))
         self.uiRestoreDefaultsPushButton.setText(_translate("GeneralPreferencesPageWidget", "Restore defaults"))
-

gns3/ui/gns3_vm_preferences_page.ui

@@ -209,6 +209,18 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>uiEnableVMCheckBox</tabstop>
+  <tabstop>uiGNS3VMEngineComboBox</tabstop>
+  <tabstop>uiVMListComboBox</tabstop>
+  <tabstop>uiRefreshPushButton</tabstop>
+  <tabstop>uiHeadlessCheckBox</tabstop>
+  <tabstop>uiRamSpinBox</tabstop>
+  <tabstop>uiCpuSpinBox</tabstop>
+  <tabstop>uiWhenExitKeepRadioButton</tabstop>
+  <tabstop>uiWhenExitSuspendRadioButton</tabstop>
+  <tabstop>uiWhenExitStopRadioButton</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
  <designerdata>

gns3/ui/main_window.ui

@@ -151,7 +151,6 @@ background-none;
     <addaction name="uiDrawRectangleAction"/>
     <addaction name="uiDrawEllipseAction"/>
     <addaction name="uiDrawLineAction"/>
-    <addaction name="uiEditReadmeAction"/>
    </widget>
    <widget class="QMenu" name="uiDeviceMenu">
     <property name="title">
@@ -1157,15 +1156,6 @@ background-none;
     <string>Import portable project</string>
    </property>
   </action>
-  <action name="uiEditReadmeAction">
-   <property name="icon">
-    <iconset resource="../../resources/resources.qrc">
-     <normaloff>:/icons/edit.svg</normaloff>:/icons/edit.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Edit readme</string>
-   </property>
-  </action>
   <action name="uiAcademyAction">
    <property name="text">
     <string>GNS3 &amp;Academy</string>

gns3/ui/main_window_ui.py

@@ -214,22 +214,22 @@ class Ui_MainWindow(object):
         self.uiOnlineHelpAction.setObjectName("uiOnlineHelpAction")
         self.uiScreenshotAction = QtWidgets.QAction(MainWindow)
         icon4 = QtGui.QIcon()
-        icon4.addPixmap(QtGui.QPixmap(":/icons/camera-photo.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon4.addPixmap(QtGui.QPixmap(":/icons/camera-photo-hover.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon4.addPixmap(QtGui.QPixmap(":/icons/camera-photo.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiScreenshotAction.setIcon(icon4)
         self.uiScreenshotAction.setObjectName("uiScreenshotAction")
         self.uiStartAllAction = QtWidgets.QAction(MainWindow)
         self.uiStartAllAction.setEnabled(True)
         icon5 = QtGui.QIcon()
-        icon5.addPixmap(QtGui.QPixmap(":/icons/start.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon5.addPixmap(QtGui.QPixmap(":/icons/start-hover.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon5.addPixmap(QtGui.QPixmap(":/icons/start.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiStartAllAction.setIcon(icon5)
         self.uiStartAllAction.setObjectName("uiStartAllAction")
         self.uiStopAllAction = QtWidgets.QAction(MainWindow)
         self.uiStopAllAction.setEnabled(True)
         icon6 = QtGui.QIcon()
-        icon6.addPixmap(QtGui.QPixmap(":/icons/stop.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon6.addPixmap(QtGui.QPixmap(":/icons/stop-hover.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon6.addPixmap(QtGui.QPixmap(":/icons/stop.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiStopAllAction.setIcon(icon6)
         self.uiStopAllAction.setObjectName("uiStopAllAction")
         self.uiConsoleAllAction = QtWidgets.QAction(MainWindow)
@@ -243,14 +243,14 @@ class Ui_MainWindow(object):
         self.uiAboutQtAction.setObjectName("uiAboutQtAction")
         self.uiZoomInAction = QtWidgets.QAction(MainWindow)
         icon8 = QtGui.QIcon()
-        icon8.addPixmap(QtGui.QPixmap(":/icons/zoom-in.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon8.addPixmap(QtGui.QPixmap(":/icons/zoom-in-hover.png"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon8.addPixmap(QtGui.QPixmap(":/icons/zoom-in.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiZoomInAction.setIcon(icon8)
         self.uiZoomInAction.setObjectName("uiZoomInAction")
         self.uiZoomOutAction = QtWidgets.QAction(MainWindow)
         icon9 = QtGui.QIcon()
-        icon9.addPixmap(QtGui.QPixmap(":/icons/zoom-out.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon9.addPixmap(QtGui.QPixmap(":/icons/zoom-out-hover.png"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon9.addPixmap(QtGui.QPixmap(":/icons/zoom-out.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiZoomOutAction.setIcon(icon9)
         self.uiZoomOutAction.setObjectName("uiZoomOutAction")
         self.uiZoomResetAction = QtWidgets.QAction(MainWindow)
@@ -267,8 +267,8 @@ class Ui_MainWindow(object):
         self.uiPreferencesAction.setObjectName("uiPreferencesAction")
         self.uiSuspendAllAction = QtWidgets.QAction(MainWindow)
         icon11 = QtGui.QIcon()
-        icon11.addPixmap(QtGui.QPixmap(":/icons/pause.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon11.addPixmap(QtGui.QPixmap(":/icons/pause-hover.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon11.addPixmap(QtGui.QPixmap(":/icons/pause.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiSuspendAllAction.setIcon(icon11)
         self.uiSuspendAllAction.setObjectName("uiSuspendAllAction")
         self.uiAddNoteAction = QtWidgets.QAction(MainWindow)
@@ -296,15 +296,15 @@ class Ui_MainWindow(object):
         self.uiDrawRectangleAction = QtWidgets.QAction(MainWindow)
         self.uiDrawRectangleAction.setCheckable(True)
         icon16 = QtGui.QIcon()
-        icon16.addPixmap(QtGui.QPixmap(":/icons/rectangle.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon16.addPixmap(QtGui.QPixmap(":/icons/rectangle-hover.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon16.addPixmap(QtGui.QPixmap(":/icons/rectangle.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiDrawRectangleAction.setIcon(icon16)
         self.uiDrawRectangleAction.setObjectName("uiDrawRectangleAction")
         self.uiDrawEllipseAction = QtWidgets.QAction(MainWindow)
         self.uiDrawEllipseAction.setCheckable(True)
         icon17 = QtGui.QIcon()
-        icon17.addPixmap(QtGui.QPixmap(":/icons/ellipse.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon17.addPixmap(QtGui.QPixmap(":/icons/ellipse-hover.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon17.addPixmap(QtGui.QPixmap(":/icons/ellipse.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiDrawEllipseAction.setIcon(icon17)
         self.uiDrawEllipseAction.setObjectName("uiDrawEllipseAction")
         self.uiShowPortNamesAction = QtWidgets.QAction(MainWindow)
@@ -346,41 +346,41 @@ class Ui_MainWindow(object):
         self.uiCheckForUpdateAction.setObjectName("uiCheckForUpdateAction")
         self.uiBrowseRoutersAction = QtWidgets.QAction(MainWindow)
         icon23 = QtGui.QIcon()
-        icon23.addPixmap(QtGui.QPixmap(":/icons/router.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon23.addPixmap(QtGui.QPixmap(":/icons/router-hover.png"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon23.addPixmap(QtGui.QPixmap(":/icons/router.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiBrowseRoutersAction.setIcon(icon23)
         self.uiBrowseRoutersAction.setObjectName("uiBrowseRoutersAction")
         self.uiBrowseSwitchesAction = QtWidgets.QAction(MainWindow)
         icon24 = QtGui.QIcon()
-        icon24.addPixmap(QtGui.QPixmap(":/icons/switch.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon24.addPixmap(QtGui.QPixmap(":/icons/switch-hover.png"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon24.addPixmap(QtGui.QPixmap(":/icons/switch.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiBrowseSwitchesAction.setIcon(icon24)
         self.uiBrowseSwitchesAction.setObjectName("uiBrowseSwitchesAction")
         self.uiBrowseEndDevicesAction = QtWidgets.QAction(MainWindow)
         icon25 = QtGui.QIcon()
-        icon25.addPixmap(QtGui.QPixmap(":/icons/PC.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon25.addPixmap(QtGui.QPixmap(":/icons/PC-hover.png"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon25.addPixmap(QtGui.QPixmap(":/icons/PC.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiBrowseEndDevicesAction.setIcon(icon25)
         self.uiBrowseEndDevicesAction.setObjectName("uiBrowseEndDevicesAction")
         self.uiBrowseSecurityDevicesAction = QtWidgets.QAction(MainWindow)
         icon26 = QtGui.QIcon()
-        icon26.addPixmap(QtGui.QPixmap(":/icons/firewall.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon26.addPixmap(QtGui.QPixmap(":/icons/firewall-hover.png"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon26.addPixmap(QtGui.QPixmap(":/icons/firewall.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiBrowseSecurityDevicesAction.setIcon(icon26)
         self.uiBrowseSecurityDevicesAction.setObjectName("uiBrowseSecurityDevicesAction")
         self.uiBrowseAllDevicesAction = QtWidgets.QAction(MainWindow)
         icon27 = QtGui.QIcon()
-        icon27.addPixmap(QtGui.QPixmap(":/icons/browse-all-icons.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon27.addPixmap(QtGui.QPixmap(":/icons/browse-all-icons-hover.png"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon27.addPixmap(QtGui.QPixmap(":/icons/browse-all-icons.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiBrowseAllDevicesAction.setIcon(icon27)
         self.uiBrowseAllDevicesAction.setObjectName("uiBrowseAllDevicesAction")
         self.uiAddLinkAction = QtWidgets.QAction(MainWindow)
         self.uiAddLinkAction.setCheckable(True)
         icon28 = QtGui.QIcon()
-        icon28.addPixmap(QtGui.QPixmap(":/icons/connection-new.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        icon28.addPixmap(QtGui.QPixmap(":/icons/cancel-connection.svg"), QtGui.QIcon.Active, QtGui.QIcon.On)
-        icon28.addPixmap(QtGui.QPixmap(":/icons/cancel-connection.svg"), QtGui.QIcon.Normal, QtGui.QIcon.On)
         icon28.addPixmap(QtGui.QPixmap(":/icons/connection-new-hover.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon28.addPixmap(QtGui.QPixmap(":/icons/connection-new.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon28.addPixmap(QtGui.QPixmap(":/icons/cancel-connection.svg"), QtGui.QIcon.Normal, QtGui.QIcon.On)
+        icon28.addPixmap(QtGui.QPixmap(":/icons/cancel-connection.svg"), QtGui.QIcon.Active, QtGui.QIcon.On)
         self.uiAddLinkAction.setIcon(icon28)
         self.uiAddLinkAction.setObjectName("uiAddLinkAction")
         self.uiFitInViewAction = QtWidgets.QAction(MainWindow)
@@ -407,23 +407,20 @@ class Ui_MainWindow(object):
         icon30.addPixmap(QtGui.QPixmap(":/icons/import.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiImportProjectAction.setIcon(icon30)
         self.uiImportProjectAction.setObjectName("uiImportProjectAction")
-        self.uiEditReadmeAction = QtWidgets.QAction(MainWindow)
-        icon31 = QtGui.QIcon()
-        icon31.addPixmap(QtGui.QPixmap(":/icons/edit.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.uiEditReadmeAction.setIcon(icon31)
-        self.uiEditReadmeAction.setObjectName("uiEditReadmeAction")
         self.uiAcademyAction = QtWidgets.QAction(MainWindow)
         self.uiAcademyAction.setObjectName("uiAcademyAction")
         self.uiDeleteProjectAction = QtWidgets.QAction(MainWindow)
-        icon32 = QtGui.QIcon()
-        icon32.addPixmap(QtGui.QPixmap(":/icons/delete.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.uiDeleteProjectAction.setIcon(icon32)
+        icon31 = QtGui.QIcon()
+        icon31.addPixmap(QtGui.QPixmap(":/icons/delete.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.uiDeleteProjectAction.setIcon(icon31)
         self.uiDeleteProjectAction.setObjectName("uiDeleteProjectAction")
         self.uiShowGridAction = QtWidgets.QAction(MainWindow)
         self.uiShowGridAction.setCheckable(True)
         self.uiShowGridAction.setObjectName("uiShowGridAction")
         self.uiEditProjectAction = QtWidgets.QAction(MainWindow)
-        self.uiEditProjectAction.setIcon(icon31)
+        icon32 = QtGui.QIcon()
+        icon32.addPixmap(QtGui.QPixmap(":/icons/edit.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.uiEditProjectAction.setIcon(icon32)
         self.uiEditProjectAction.setObjectName("uiEditProjectAction")
         self.uiWebInterfaceAction = QtWidgets.QAction(MainWindow)
         self.uiWebInterfaceAction.setObjectName("uiWebInterfaceAction")
@@ -437,10 +434,10 @@ class Ui_MainWindow(object):
         self.uiLockAllAction.setCheckable(True)
         self.uiLockAllAction.setChecked(False)
         icon34 = QtGui.QIcon()
-        icon34.addPixmap(QtGui.QPixmap(":/icons/unlock.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        icon34.addPixmap(QtGui.QPixmap(":/icons/lock.svg"), QtGui.QIcon.Active, QtGui.QIcon.On)
-        icon34.addPixmap(QtGui.QPixmap(":/icons/lock.svg"), QtGui.QIcon.Normal, QtGui.QIcon.On)
         icon34.addPixmap(QtGui.QPixmap(":/icons/unlock.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon34.addPixmap(QtGui.QPixmap(":/icons/unlock.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon34.addPixmap(QtGui.QPixmap(":/icons/lock.svg"), QtGui.QIcon.Normal, QtGui.QIcon.On)
+        icon34.addPixmap(QtGui.QPixmap(":/icons/lock.svg"), QtGui.QIcon.Active, QtGui.QIcon.On)
         self.uiLockAllAction.setIcon(icon34)
         self.uiLockAllAction.setObjectName("uiLockAllAction")
         self.uiWebUIAction = QtWidgets.QAction(MainWindow)
@@ -500,7 +497,6 @@ class Ui_MainWindow(object):
         self.uiAnnotateMenu.addAction(self.uiDrawRectangleAction)
         self.uiAnnotateMenu.addAction(self.uiDrawEllipseAction)
         self.uiAnnotateMenu.addAction(self.uiDrawLineAction)
-        self.uiAnnotateMenu.addAction(self.uiEditReadmeAction)
         self.uiToolsMenu.addAction(self.uiScreenshotAction)
         self.uiToolsMenu.addAction(self.uiImportExportConfigsAction)
         self.uiToolsMenu.addAction(self.uiWebInterfaceAction)
@@ -702,7 +698,6 @@ class Ui_MainWindow(object):
         self.uiDoctorAction.setText(_translate("MainWindow", "GNS3 &Doctor"))
         self.uiExportProjectAction.setText(_translate("MainWindow", "Export portable project"))
         self.uiImportProjectAction.setText(_translate("MainWindow", "Import portable project"))
-        self.uiEditReadmeAction.setText(_translate("MainWindow", "Edit readme"))
         self.uiAcademyAction.setText(_translate("MainWindow", "GNS3 &Academy"))
         self.uiDeleteProjectAction.setText(_translate("MainWindow", "Delete project"))
         self.uiShowGridAction.setText(_translate("MainWindow", "Show the grid"))

gns3/ui/packet_capture_preferences_page.ui

@@ -125,6 +125,14 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>uiPreconfiguredCaptureReaderCommandComboBox</tabstop>
+  <tabstop>uiPreconfiguredCaptureReaderCommandPushButton</tabstop>
+  <tabstop>uiCaptureReaderCommandLineEdit</tabstop>
+  <tabstop>uiAutoStartCheckBox</tabstop>
+  <tabstop>uiCaptureAnalyzerCommandLineEdit</tabstop>
+  <tabstop>uiRestoreDefaultsPushButton</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>

gns3/ui/preferences_dialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>980</width>
-    <height>680</height>
+    <width>680</width>
+    <height>517</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -36,6 +36,9 @@
         <bold>true</bold>
        </font>
       </property>
+      <property name="focusPolicy">
+       <enum>Qt::ClickFocus</enum>
+      </property>
       <property name="indentation">
        <number>10</number>
       </property>
@@ -73,6 +76,9 @@
        </item>
        <item>
         <widget class="QScrollArea" name="scrollArea">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
          <property name="widgetResizable">
           <bool>true</bool>
          </property>
@@ -81,8 +87,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>542</width>
-            <height>559</height>
+            <width>269</width>
+            <height>457</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout">
@@ -103,6 +109,9 @@
        </item>
        <item>
         <widget class="QDialogButtonBox" name="uiButtonBox">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -131,8 +140,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>540</x>
-     <y>571</y>
+     <x>672</x>
+     <y>509</y>
     </hint>
     <hint type="destinationlabel">
      <x>449</x>
@@ -147,8 +156,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>540</x>
-     <y>571</y>
+     <x>672</x>
+     <y>509</y>
     </hint>
     <hint type="destinationlabel">
      <x>449</x>

gns3/ui/project_dialog.ui

@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>520</width>
-    <height>301</height>
+    <width>678</width>
+    <height>367</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -36,16 +36,7 @@
        <string>New project</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_3">
-       <property name="leftMargin">
-        <number>10</number>
-       </property>
-       <property name="topMargin">
-        <number>10</number>
-       </property>
-       <property name="rightMargin">
-        <number>10</number>
-       </property>
-       <property name="bottomMargin">
+       <property name="margin">
         <number>10</number>
        </property>
        <item>
@@ -163,16 +154,7 @@
        <string>Projects library</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_2">
-       <property name="leftMargin">
-        <number>10</number>
-       </property>
-       <property name="topMargin">
-        <number>10</number>
-       </property>
-       <property name="rightMargin">
-        <number>10</number>
-       </property>
-       <property name="bottomMargin">
+       <property name="margin">
         <number>10</number>
        </property>
        <item>
@@ -284,6 +266,19 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>uiProjectTabWidget</tabstop>
+  <tabstop>uiNameLineEdit</tabstop>
+  <tabstop>uiLocationLineEdit</tabstop>
+  <tabstop>uiLocationBrowserToolButton</tabstop>
+  <tabstop>uiOpenProjectPushButton</tabstop>
+  <tabstop>uiRecentProjectsPushButton</tabstop>
+  <tabstop>uiSettingsPushButton</tabstop>
+  <tabstop>uiProjectsTreeWidget</tabstop>
+  <tabstop>uiDeleteProjectButton</tabstop>
+  <tabstop>uiDuplicateProjectPushButton</tabstop>
+  <tabstop>uiRefreshProjectsPushButton</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>

gns3/ui/project_dialog_ui.py

@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '/Users/noplay/code/gns3/gns3-gui/gns3/ui/project_dialog.ui'
+# Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/ui/project_dialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.6
+# Created by: PyQt5 UI code generator 5.13.2
 #
 # WARNING! All changes made in this file will be lost!
 
+
 from PyQt5 import QtCore, QtGui, QtWidgets
 
 
 class Ui_ProjectDialog(object):
-
     def setupUi(self, ProjectDialog):
         ProjectDialog.setObjectName("ProjectDialog")
         ProjectDialog.setWindowModality(QtCore.Qt.ApplicationModal)
@@ -116,7 +116,7 @@ class Ui_ProjectDialog(object):
         self.horizontalLayout.addItem(spacerItem3)
         self.uiButtonBox = QtWidgets.QDialogButtonBox(ProjectDialog)
         self.uiButtonBox.setOrientation(QtCore.Qt.Horizontal)
-        self.uiButtonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel | QtWidgets.QDialogButtonBox.Ok)
+        self.uiButtonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
         self.uiButtonBox.setObjectName("uiButtonBox")
         self.horizontalLayout.addWidget(self.uiButtonBox)
         self.verticalLayout.addLayout(self.horizontalLayout)
@@ -128,6 +128,16 @@ class Ui_ProjectDialog(object):
         self.uiNameLineEdit.returnPressed.connect(ProjectDialog.accept)
         self.uiLocationLineEdit.returnPressed.connect(ProjectDialog.accept)
         QtCore.QMetaObject.connectSlotsByName(ProjectDialog)
+        ProjectDialog.setTabOrder(self.uiProjectTabWidget, self.uiNameLineEdit)
+        ProjectDialog.setTabOrder(self.uiNameLineEdit, self.uiLocationLineEdit)
+        ProjectDialog.setTabOrder(self.uiLocationLineEdit, self.uiLocationBrowserToolButton)
+        ProjectDialog.setTabOrder(self.uiLocationBrowserToolButton, self.uiOpenProjectPushButton)
+        ProjectDialog.setTabOrder(self.uiOpenProjectPushButton, self.uiRecentProjectsPushButton)
+        ProjectDialog.setTabOrder(self.uiRecentProjectsPushButton, self.uiSettingsPushButton)
+        ProjectDialog.setTabOrder(self.uiSettingsPushButton, self.uiProjectsTreeWidget)
+        ProjectDialog.setTabOrder(self.uiProjectsTreeWidget, self.uiDeleteProjectButton)
+        ProjectDialog.setTabOrder(self.uiDeleteProjectButton, self.uiDuplicateProjectPushButton)
+        ProjectDialog.setTabOrder(self.uiDuplicateProjectPushButton, self.uiRefreshProjectsPushButton)
 
     def retranslateUi(self, ProjectDialog):
         _translate = QtCore.QCoreApplication.translate

gns3/ui/project_welcome_dialog.ui

@@ -9,12 +9,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>607</width>
-    <height>308</height>
+    <width>647</width>
+    <height>214</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Welcome</string>
+   <string>Project variables</string>
   </property>
   <property name="modal">
    <bool>true</bool>
@@ -32,7 +32,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Loading.. Please wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please provide the missing values for the project variables:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="textFormat">
       <enum>Qt::RichText</enum>

gns3/ui/project_welcome_dialog_ui.py

@@ -1,18 +1,20 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '/home/dominik/projects/gns3-gui/gns3/ui/project_welcome_dialog.ui'
+# Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/ui/project_welcome_dialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.8.2
+# Created by: PyQt5 UI code generator 5.13.0
 #
 # WARNING! All changes made in this file will be lost!
 
+
 from PyQt5 import QtCore, QtGui, QtWidgets
 
+
 class Ui_ProjectWelcomeDialog(object):
     def setupUi(self, ProjectWelcomeDialog):
         ProjectWelcomeDialog.setObjectName("ProjectWelcomeDialog")
         ProjectWelcomeDialog.setWindowModality(QtCore.Qt.WindowModal)
-        ProjectWelcomeDialog.resize(607, 308)
+        ProjectWelcomeDialog.resize(659, 220)
         ProjectWelcomeDialog.setModal(True)
         self.verticalLayout = QtWidgets.QVBoxLayout(ProjectWelcomeDialog)
         self.verticalLayout.setContentsMargins(-1, -1, 12, -1)
@@ -48,13 +50,14 @@ class Ui_ProjectWelcomeDialog(object):
         self.uiOkButton.setObjectName("uiOkButton")
         self.horizontalLayout.addWidget(self.uiOkButton)
         self.verticalLayout.addLayout(self.horizontalLayout)
+        spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout.addItem(spacerItem1)
 
         self.retranslateUi(ProjectWelcomeDialog)
         QtCore.QMetaObject.connectSlotsByName(ProjectWelcomeDialog)
 
     def retranslateUi(self, ProjectWelcomeDialog):
         _translate = QtCore.QCoreApplication.translate
-        ProjectWelcomeDialog.setWindowTitle(_translate("ProjectWelcomeDialog", "Welcome"))
-        self.label.setText(_translate("ProjectWelcomeDialog", "<html><head/><body><p>Loading.. Please wait.</p></body></html>"))
-
+        ProjectWelcomeDialog.setWindowTitle(_translate("ProjectWelcomeDialog", "Project variables"))
+        self.label.setText(_translate("ProjectWelcomeDialog", "<html><head/><body><p>Please provide the missing values for the project variables:</p></body></html>"))
 from . import resources_rc

gns3/ui/setup_wizard.ui

@@ -6,16 +6,10 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1069</width>
-    <height>615</height>
+    <width>1081</width>
+    <height>534</height>
    </rect>
   </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
   <property name="windowTitle">
    <string>Setup Wizard</string>
   </property>
@@ -83,7 +77,7 @@
        </font>
       </property>
       <property name="toolTip">
-       <string>Eveything that is supported by your system will run on your computer.</string>
+       <string>Everything that is supported by your system will run on your computer.</string>
       </property>
       <property name="text">
        <string>Run appliances on my local computer</string>

gns3/ui/setup_wizard_ui.py

@@ -2,21 +2,18 @@
 
 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/ui/setup_wizard.ui'
 #
-# Created by: PyQt5 UI code generator 5.9
+# Created by: PyQt5 UI code generator 5.13.0
 #
 # WARNING! All changes made in this file will be lost!
 
+
 from PyQt5 import QtCore, QtGui, QtWidgets
 
+
 class Ui_SetupWizard(object):
     def setupUi(self, SetupWizard):
         SetupWizard.setObjectName("SetupWizard")
-        SetupWizard.resize(1069, 615)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(SetupWizard.sizePolicy().hasHeightForWidth())
-        SetupWizard.setSizePolicy(sizePolicy)
+        SetupWizard.resize(1081, 534)
         SetupWizard.setModal(True)
         SetupWizard.setWizardStyle(QtWidgets.QWizard.ModernStyle)
         SetupWizard.setOptions(QtWidgets.QWizard.NoBackButtonOnStartPage)
@@ -247,7 +244,7 @@ class Ui_SetupWizard(object):
         self.uiVMRadioButton.setToolTip(_translate("SetupWizard", "Dynamips, IOU, VPCS and Qemu will use this virtual machine."))
         self.uiVMRadioButton.setText(_translate("SetupWizard", "Run appliances in a virtual machine"))
         self.label.setText(_translate("SetupWizard", "Requires to download and install the GNS3 VM (available for free) "))
-        self.uiLocalRadioButton.setToolTip(_translate("SetupWizard", "Eveything that is supported by your system will run on your computer."))
+        self.uiLocalRadioButton.setToolTip(_translate("SetupWizard", "Everything that is supported by your system will run on your computer."))
         self.uiLocalRadioButton.setText(_translate("SetupWizard", "Run appliances on my local computer"))
         self.uiLocalLabel.setText(_translate("SetupWizard", "A limited number of appliances like the Cisco IOS routers <= C7200 can be run"))
         self.uiRemoteControllerRadioButton.setText(_translate("SetupWizard", "Run appliances on a remote server (advanced usage)"))
@@ -286,5 +283,4 @@ class Ui_SetupWizard(object):
         self.uiSummaryWizardPage.setSubTitle(_translate("SetupWizard", "The server type has been configured, please see the summary of the settings below"))
         self.uiSummaryTreeWidget.headerItem().setText(0, _translate("SetupWizard", "1"))
         self.uiSummaryTreeWidget.headerItem().setText(1, _translate("SetupWizard", "2"))
-
 from . import resources_rc

gns3/update_manager.py

@@ -92,7 +92,7 @@ class UpdateManager(QtCore.QObject):
         self._silent = silent
         self._parent = parent
 
-        if hasattr(sys, "frozen") and LocalConfig.instance().experimental():
+        if not hasattr(sys, "frozen") and LocalConfig.instance().experimental():
             url = 'https://pypi.org/pypi/gns3-gui/json'
             self._get(url, self._pypiReplySlot)
         else:

gns3/utils/__init__.py

@@ -15,6 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import sys
+import shlex
 import importlib
 import hashlib
 import re
@@ -108,3 +110,14 @@ def natural_sort_key(s):
         * pc10
     """
     return [int(text) if text.isdecimal() else text.lower() for text in re.split('([0-9]+)', s)]
+
+
+def shlex_quote(s):
+    """
+    Compatible shlex_quote to handle case where Windows needs double quotes around file names, not single quotes.
+    """
+
+    if sys.platform.startswith("win"):
+        return s if re.match(r'^[-_\w./]+$', s) else '"%s"' % s.replace('"', '\\"')
+    else:
+        return shlex.quote(s)

gns3/utils/bring_to_front.py

@@ -66,7 +66,7 @@ def bring_window_to_front_from_process_name(process_name, title=None):
                     elif title in win32gui.GetWindowText(hwnd):
                         set_foreground_window(hwnd)
                         return True
-        except psutil.Error:
+        except (OSError, psutil.Error):
             continue
     return False
 

gns3/utils/export_project_worker.py

@@ -28,16 +28,17 @@ class ExportProjectWorker(QtCore.QObject):
     finished = QtCore.pyqtSignal()
     updated = QtCore.pyqtSignal(int)
 
-    def __init__(self, project, path, include_images, compression):
+    def __init__(self, project, path, include_images, include_snapshots, compression):
         super().__init__()
         self._project = project
         self._include_images = include_images
+        self._include_snapshots = include_snapshots
         self._path = path
         self._compression = compression
 
     def run(self):
         if self._project:
-            self._project.get("/export?include_images={}&compression={}".format(self._include_images, self._compression),
+            self._project.get("/export?include_images={}&include_snapshots={}&compression={}".format(self._include_images, self._include_snapshots, self._compression),
                               self._exportReceived,
                               downloadProgressCallback=self._downloadFileProgress,
                               timeout=None)

gns3/utils/http.py

@@ -1,74 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (C) 2016 GNS3 Technologies Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import sys
-import ssl
-import http
-import json
-import base64
-import urllib.request
-
-import logging
-log = logging.getLogger(__name__)
-
-
-def getSynchronous(protocol, host, port, endpoint, timeout=2, user=None, password=None):
-    """
-    :returns: Tuple (Status code, json of anwser). Status 0 is a non HTTP error
-    """
-    try:
-        url = "{protocol}://{host}:{port}/v2/{endpoint}".format(protocol=protocol, host=host, port=port, endpoint=endpoint)
-        request = urllib.request.Request(url)
-
-        if user is not None and len(user) > 0:
-            log.debug("Synchronous get {} with user '{}'".format(url, user))
-            base64string = base64.encodebytes('{}:{}'.format(user, password).encode()).replace(b'\n', b'')
-            request.add_header("Authorization", "Basic {}".format(base64string.decode()))
-        else:
-            log.debug("Synchronous get {} (no authentication)".format(url))
-
-        if sys.version_info >= (3, 5):
-            ctx = ssl.create_default_context()
-            ctx.check_hostname = False
-            ctx.verify_mode = ssl.CERT_NONE
-            response = urllib.request.urlopen(request, timeout=timeout, context=ctx)
-        else:
-            response = urllib.request.urlopen(request, timeout=timeout)
-
-        content_type = response.getheader("CONTENT-TYPE")
-        if response.status == 200:
-            if content_type == "application/json":
-                content = response.read()
-                json_data = json.loads(content.decode("utf-8"))
-                return response.status, json_data
-        else:
-            return response.status, None
-    except http.client.InvalidURL as e:
-        log.warning("Invalid local server url: {}".format(e))
-        return 0, None
-    except http.client.UnknownProtocol:
-        log.warning("Unknown server running on {}:{}".format(host, port))
-        return 0, None
-    except urllib.error.URLError:
-        # Connection refused. It's a normal behavior if server is not started
-        return 0, None
-    except urllib.error.HTTPError as e:
-        log.debug("Error during get on {}:{}: {}".format(host, port, e))
-        return e.code, None
-    except (OSError, http.client.BadStatusLine, ValueError, SystemError) as e:
-        log.debug("Error during get on {}:{}: {}".format(host, port, e))
-    return 0, None

gns3/utils/interfaces.py

@@ -80,11 +80,10 @@ def get_windows_interfaces():
     :returns: list of windows interfaces
     """
 
-    import win32com.client
     import pywintypes
-
     interfaces = []
     try:
+        import win32com.client
         locator = win32com.client.Dispatch("WbemScripting.SWbemLocator")
         service = locator.ConnectServer(".", "root\cimv2")
         network_configs = service.InstancesOf("Win32_NetworkAdapterConfiguration")
@@ -109,7 +108,7 @@ def get_windows_interfaces():
                                    "netcard": adapter.name,
                                    "netmask": netmask,
                                    "type": "ethernet"})
-    except (AttributeError, pywintypes.com_error):
+    except (ImportError, AttributeError, pywintypes.com_error):
         log.warning("Could not use the COM service to retrieve interface info, trying using the registry...")
         return _get_windows_interfaces_from_registry()
 

gns3/utils/sudo.py

@@ -97,6 +97,7 @@ def sudo(*commands, parent=None, shell=False):
                     return False
         return True
 
+
 if __name__ == '__main__':
     import sys
     app = QtWidgets.QApplication(sys.argv)

gns3/utils/wait_for_command_worker.py

@@ -21,7 +21,7 @@ Thread to run a command and wait for its completion.
 
 import tempfile
 import subprocess
-import shlex
+from ..utils import shlex_quote
 from ..qt import QtCore
 
 import logging
@@ -63,7 +63,7 @@ class WaitForCommandWorker(QtCore.QObject):
                                                    timeout=self._timeout,
                                                    shell=self._shell)
         except (OSError, subprocess.SubprocessError) as e:
-            command_string = " ".join(shlex.quote(s) for s in self._command)
+            command_string = " ".join(shlex_quote(s) for s in self._command)
             self.error.emit('Could not execute command "{}": {}'.format(command_string, e), True)
             return
         self.finished.emit()

gns3/utils/wait_for_runas_worker.py

@@ -19,7 +19,7 @@
 Thread to run a command with administrator rights on Windows and wait for its completion.
 """
 
-import shlex
+from ..utils import shlex_quote
 from ..qt import QtCore
 
 import logging
@@ -69,7 +69,7 @@ class WaitForRunAsWorker(QtCore.QObject):
                                      lpFile=program,
                                      lpParameters=params)
         except pywintypes.error as e:
-            command_string = " ".join(shlex.quote(s) for s in self._command)
+            command_string = " ".join(shlex_quote(s) for s in self._command)
             self.error.emit('Could not execute command "{}": {}'.format(command_string, e), True)
             return
 

gns3/version.py

@@ -23,9 +23,8 @@
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
 
-__version__ = "2.2.0a4"
-__version_info__ = (2, 2, 0, -99)
-
+__version__ = "2.2.7"
+__version_info__ = (2, 2, 7, 0)
 # If it's a git checkout try to add the commit
 if "dev" in __version__:
     try:

gns3/vnc_console.py

@@ -24,26 +24,34 @@ import os
 import shlex
 import subprocess
 
+from .controller import Controller
+
 import logging
 log = logging.getLogger(__name__)
 
 
-def vncConsole(host, port, command):
+def vncConsole(node, port, command):
     """
     Start a VNC console program.
 
-    :param host: host or IP address
+    :param node: Node instance
     :param port: port number
     """
 
     if len(command.strip(' ')) == 0:
-        log.warning('VNC client is not configured')
+        log.error("VNC client is not configured")
         return
 
+    name = node.name()
+    host = node.consoleHost()
+
     # replace the place-holders by the actual values
     command = command.replace("%h", host)
     command = command.replace("%p", str(port))
     command = command.replace("%P", str(port - 5900))
+    command = command.replace("%d", name.replace('"', '\\"'))
+    command = command.replace("%i", node.project().id())
+    command = command.replace("%n", str(node.id()))
 
     try:
         log.debug('starting VNC program "{}"'.format(command))
@@ -56,4 +64,3 @@ def vncConsole(host, port, command):
             subprocess.Popen(args, env=os.environ)
     except (OSError, ValueError, subprocess.SubprocessError) as e:
         log.error("Could not start VNC program with command '{}': {}".format(command, e))
-        raise

requirements.txt

@@ -1,4 +1,4 @@
 jsonschema==2.6.0  # pyup: ignore
 raven>=5.23.0
-psutil>=2.2.1
+psutil==5.6.6
 distro>=1.3.0

resources/linux/applications/gns3.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Terminal=false
+Exec=gns3 %f
+Name=GNS3
+Comment=GNS3 Graphical Network Simulator
+Icon=gns3
+Categories=Education;Network;
+MimeType=application/x-gns3;application/x-gns3appliance;application/x-gns3project;
+Keywords=simulator;network;netsim;