Release v2.2.8

This reverts commit 0c4367d77e.

CHANGELOG

@@ -1,5 +1,20 @@
 # Change Log
 
+## 2.2.8 07/05/2020
+
+* Default port set to 80 for server running in the GNS3 VM. Fixes #1737
+* Make the Web UI the default page. Ref https://github.com/GNS3/gns3-server/issues/1737
+* Fix "export portable project forgets contents of README". Fixes #1724
+* Activate unified title and toolbar on MacOS. Fixes #2968
+* Confirmation dialog for "console connect to all nodes". Fixes #2971
+* Add "Resume all suspended links". Fixes #2858
+* Revert "Change default path for SecureCRT. Fixes #2896"
+* Remove @property from ConfigurationDialog(). Fixes #2819 #2965
+* Use Environmental Markers to force jsonschema version. Fixes https://github.com/GNS3/gns3-gui/issues/2849 Version 3.2.0 with Python >= 3.8 Version 2.6.0 with Python < 3.8
+* Use Environmental Markers to force jsonschema version 2.6.0 on Windows/macOS. Ref https://github.com/GNS3/gns3-gui/issues/2849
+* Remove preferences dialog geometry restoration. Fixes #2807
+* Fix unable to configure custom adapters for Qemu VMs. Fixes #2961
+
 ## 2.2.7 07/04/2020
 
 * Fix VNC console template doesn't extract %i (Project UUID). Fixes #2960

gns3/crash_report.py

@@ -52,7 +52,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "https://3ed890e6a3d344c7948646a39047c997:6ed2ebefafb6455cb91d130b70109d7e@o19455.ingest.sentry.io/38506"
+    DSN = "https://1a584cd17857429aaabb6f72686f3465:b3363c8eaccd43b2918032fa11c09a46@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/configuration_dialog.py

@@ -49,7 +49,6 @@ class ConfigurationDialog(QtWidgets.QDialog, Ui_configurationDialog):
         self._settings = settings
         self._configuration_page = configuration_page
 
-    @property
     def settings(self):
         return self._settings
 

gns3/dialogs/project_export_wizard.py

@@ -55,21 +55,19 @@ class ExportProjectWizard(QtWidgets.QWizard, Ui_ExportProjectWizard):
         self.uiCompressionComboBox.setCurrentIndex(1)
         self.helpRequested.connect(self._showHelpSlot)
         self.uiPathBrowserToolButton.clicked.connect(self._pathBrowserSlot)
+        self._loadReadme()
 
-        # 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))
+    def _loadReadme(self):
 
-        if readme_text is None:
+        self._project.get("/files/README.txt", self._loadedReadme)
+
+    def _loadedReadme(self, result, error=False, raw_body=None, context={}, **kwargs):
+
+        if not error:
+            self.uiReadmeTextEdit.setPlainText(raw_body.decode("utf-8", errors="replace"))
+        else:
             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)
+            self.uiReadmeTextEdit.setPlainText(readme_text)
 
     def _pathBrowserSlot(self):
 

gns3/dialogs/setup_wizard.py

@@ -52,7 +52,8 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
             "engine": "vmware",
             "vcpus": 1,
             "ram": 2048,
-            "vmname": "GNS3 VM"
+            "vmname": "GNS3 VM",
+            "port": 80
         }
 
         self.setWizardStyle(QtWidgets.QWizard.ModernStyle)

gns3/graphics_view.py

@@ -1135,6 +1135,16 @@ class GraphicsView(QtWidgets.QGraphicsView):
 
         items = [item for item in self.scene().items()
                  if isinstance(item, NodeItem) and item.node().consoleType() != "none"]
+        nb_items = len(items)
+        if nb_items > 10:
+            proceed = QtWidgets.QMessageBox.question(self,
+                                                     "Console to all nodes",
+                                                     "You are about to open console windows to {} nodes. Are you sure?".format(nb_items),
+                                                     QtWidgets.QMessageBox.Yes,
+                                                     QtWidgets.QMessageBox.No)
+
+            if proceed == QtWidgets.QMessageBox.No:
+                return
         self.consoleFromItems(items)
 
     def consoleActionSlot(self):

gns3/main_window.py

@@ -84,6 +84,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         self._settings = {}
 
         self.setupUi(self)
+        self.setUnifiedTitleAndToolBarOnMac(True)
 
         self._notif_dialog = NotifDialog(self)
         # Setup logger
@@ -240,7 +241,6 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         self.uiLockAllAction.triggered.connect(self._lockActionSlot)
 
         # tool menu connections
-        self.uiWebInterfaceAction.triggered.connect(self._openLightWebInterfaceActionSlot)
         self.uiWebUIAction.triggered.connect(self._openWebInterfaceActionSlot)
 
         # control menu connections
@@ -322,10 +322,6 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         LocalConfig.instance().saveSectionSettings(self.__class__.__name__, self._settings)
         self.settings_updated_signal.emit()
 
-    def _openLightWebInterfaceActionSlot(self):
-        if Controller.instance().connected():
-            QtGui.QDesktopServices.openUrl(QtCore.QUrl(Controller.instance().httpClient().fullUrl()))
-
     def _openWebInterfaceActionSlot(self):
         if Controller.instance().connected():
             base_url = Controller.instance().httpClient().fullUrl()
@@ -1058,11 +1054,11 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
 
         with Progress.instance().context(min_duration=0):
             dialog = PreferencesDialog(self)
-            dialog.restoreGeometry(QtCore.QByteArray().fromBase64(self._settings["preferences_dialog_geometry"].encode()))
+            #dialog.restoreGeometry(QtCore.QByteArray().fromBase64(self._settings["preferences_dialog_geometry"].encode()))
             dialog.show()
             dialog.exec_()
-            self._settings["preferences_dialog_geometry"] = bytes(dialog.saveGeometry().toBase64()).decode()
-            self.setSettings(self._settings)
+            #self._settings["preferences_dialog_geometry"] = bytes(dialog.saveGeometry().toBase64()).decode()
+            #self.setSettings(self._settings)
 
     def resizeEvent(self, event):
         self._notif_dialog.resize()

gns3/modules/iou/pages/iou_device_preferences_page.py

@@ -210,7 +210,7 @@ class IOUDevicePreferencesPage(QtWidgets.QWidget, Ui_IOUDevicePreferencesPageWid
                     del self._iou_devices[key]
                     item.setText(0, iou_device["name"])
                     item.setData(0, QtCore.Qt.UserRole, new_key)
-                self._refreshInfo(dialog.settings)
+                self._refreshInfo(dialog.settings())
 
     def _iouDeviceDeleteSlot(self):
         """

gns3/modules/qemu/pages/qemu_vm_configuration_page.py

@@ -401,7 +401,7 @@ class QemuVMConfigurationPage(QtWidgets.QWidget, Ui_QemuVMConfigPageWidget):
             QtWidgets.QMessageBox.critical(self, "Invalid format", "Invalid port name format")
             return
 
-        if self._settings["legacy_networking"]:
+        if self.uiLegacyNetworkingCheckBox.isChecked():
             network_devices = {}
             for nic, desc in self._qemu_network_devices.items():
                 if nic in self._legacy_devices:

gns3/pages/gns3_vm_preferences_page.py

@@ -66,6 +66,12 @@ class GNS3VMPreferencesPage(QtWidgets.QWidget, Ui_GNS3VMPreferencesPageWidget):
         self.uiRamLabel.setVisible(engine["support_ram"])
         self.uiRamSpinBox.setVisible(engine["support_ram"])
         self.uiCpuSpinBox.setVisible(engine["support_ram"])
+        if engine_id == "remote":
+            self.uiPortLabel.setVisible(False)
+            self.uiPortSpinBox.setVisible(False)
+        else:
+            self.uiPortLabel.setVisible(True)
+            self.uiPortSpinBox.setVisible(True)
         self._refreshVMSlot(ignore_error=True)
 
     def loadPreferences(self):
@@ -91,6 +97,7 @@ class GNS3VMPreferencesPage(QtWidgets.QWidget, Ui_GNS3VMPreferencesPageWidget):
         self._settings = result
         self.uiRamSpinBox.setValue(self._settings["ram"])
         self.uiCpuSpinBox.setValue(self._settings["vcpus"])
+        self.uiPortSpinBox.setValue(self._settings.get("port", 3080))
         self.uiEnableVMCheckBox.setChecked(self._settings["enable"])
         if self._settings["when_exit"] == "keep":
             self.uiWhenExitKeepRadioButton.setChecked(True)
@@ -168,7 +175,8 @@ class GNS3VMPreferencesPage(QtWidgets.QWidget, Ui_GNS3VMPreferencesPageWidget):
             "when_exit": when_exit,
             "engine": self.uiGNS3VMEngineComboBox.currentData(),
             "ram": self.uiRamSpinBox.value(),
-            "vcpus": self.uiCpuSpinBox.value()
+            "vcpus": self.uiCpuSpinBox.value(),
+            "port": self.uiPortSpinBox.value()
         }
         if self._old_settings != settings:
             Controller.instance().put("/gns3vm", self._saveSettingsCallback, settings, timeout=60 * 5)

gns3/settings.py

@@ -61,8 +61,8 @@ if sys.platform.startswith("win"):
                                              '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\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),
+                                             '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),
                                              '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),
@@ -295,7 +295,7 @@ GENERAL_SETTINGS = {
     "recent_projects": [],
     "geometry": "",
     "state": "",
-    "preferences_dialog_geometry": "",
+    #"preferences_dialog_geometry": "",
     "debug_level": 0,
     "multi_profiles": False,
     "hdpi": not sys.platform.startswith("linux"),

gns3/topology_summary_view.py

@@ -319,6 +319,11 @@ class TopologySummaryView(QtWidgets.QTreeWidget):
         reset_all_filters.triggered.connect(self._resetAllFiltersSlot)
         menu.addAction(reset_all_filters)
 
+        resume_suspended_links = QtWidgets.QAction("Resume all suspended links", menu)
+        resume_suspended_links.setIcon(get_icon("start.svg"))
+        resume_suspended_links.triggered.connect(self._resumeAllLinksSlot)
+        menu.addAction(resume_suspended_links)
+
         current_item = self.currentItem()
         from .main_window import MainWindow
         view = MainWindow.instance().uiGraphicsView
@@ -400,3 +405,13 @@ class TopologySummaryView(QtWidgets.QTreeWidget):
                 filters = {}
                 link.setFilters(filters)
                 link.update()
+
+    @qslot
+    def _resumeAllLinksSlot(self, *args):
+        """
+        Resume all suspended links.
+        """
+
+        for link in self._topology.links():
+            if link.suspended():
+                link.toggleSuspend()

gns3/ui/gns3_vm_preferences_page.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>494</width>
-    <height>585</height>
+    <width>467</width>
+    <height>657</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -191,6 +191,26 @@
         </property>
        </widget>
       </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="uiPortLabel">
+        <property name="text">
+         <string>Port:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QSpinBox" name="uiPortSpinBox">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>65635</number>
+        </property>
+        <property name="value">
+         <number>80</number>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>

gns3/ui/gns3_vm_preferences_page_ui.py

@@ -2,16 +2,18 @@
 
 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/ui/gns3_vm_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_GNS3VMPreferencesPageWidget(object):
     def setupUi(self, GNS3VMPreferencesPageWidget):
         GNS3VMPreferencesPageWidget.setObjectName("GNS3VMPreferencesPageWidget")
-        GNS3VMPreferencesPageWidget.resize(494, 585)
+        GNS3VMPreferencesPageWidget.resize(467, 657)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -102,12 +104,30 @@ class Ui_GNS3VMPreferencesPageWidget(object):
         self.uiCpuLabel = QtWidgets.QLabel(self.uiGNS3VMSettingsGroupBox)
         self.uiCpuLabel.setObjectName("uiCpuLabel")
         self.gridLayout.addWidget(self.uiCpuLabel, 5, 0, 1, 1)
+        self.uiPortLabel = QtWidgets.QLabel(self.uiGNS3VMSettingsGroupBox)
+        self.uiPortLabel.setObjectName("uiPortLabel")
+        self.gridLayout.addWidget(self.uiPortLabel, 2, 0, 1, 1)
+        self.uiPortSpinBox = QtWidgets.QSpinBox(self.uiGNS3VMSettingsGroupBox)
+        self.uiPortSpinBox.setMinimum(1)
+        self.uiPortSpinBox.setMaximum(65635)
+        self.uiPortSpinBox.setProperty("value", 80)
+        self.uiPortSpinBox.setObjectName("uiPortSpinBox")
+        self.gridLayout.addWidget(self.uiPortSpinBox, 2, 1, 1, 1)
         self.verticalLayout.addWidget(self.uiGNS3VMSettingsGroupBox)
         spacerItem = QtWidgets.QSpacerItem(10, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
         self.verticalLayout.addItem(spacerItem)
 
         self.retranslateUi(GNS3VMPreferencesPageWidget)
         QtCore.QMetaObject.connectSlotsByName(GNS3VMPreferencesPageWidget)
+        GNS3VMPreferencesPageWidget.setTabOrder(self.uiEnableVMCheckBox, self.uiGNS3VMEngineComboBox)
+        GNS3VMPreferencesPageWidget.setTabOrder(self.uiGNS3VMEngineComboBox, self.uiVMListComboBox)
+        GNS3VMPreferencesPageWidget.setTabOrder(self.uiVMListComboBox, self.uiRefreshPushButton)
+        GNS3VMPreferencesPageWidget.setTabOrder(self.uiRefreshPushButton, self.uiHeadlessCheckBox)
+        GNS3VMPreferencesPageWidget.setTabOrder(self.uiHeadlessCheckBox, self.uiRamSpinBox)
+        GNS3VMPreferencesPageWidget.setTabOrder(self.uiRamSpinBox, self.uiCpuSpinBox)
+        GNS3VMPreferencesPageWidget.setTabOrder(self.uiCpuSpinBox, self.uiWhenExitKeepRadioButton)
+        GNS3VMPreferencesPageWidget.setTabOrder(self.uiWhenExitKeepRadioButton, self.uiWhenExitSuspendRadioButton)
+        GNS3VMPreferencesPageWidget.setTabOrder(self.uiWhenExitSuspendRadioButton, self.uiWhenExitStopRadioButton)
 
     def retranslateUi(self, GNS3VMPreferencesPageWidget):
         _translate = QtCore.QCoreApplication.translate
@@ -126,4 +146,4 @@ class Ui_GNS3VMPreferencesPageWidget(object):
         self.uiRamLabel.setText(_translate("GNS3VMPreferencesPageWidget", "RAM:"))
         self.uiRamSpinBox.setSuffix(_translate("GNS3VMPreferencesPageWidget", " MB"))
         self.uiCpuLabel.setText(_translate("GNS3VMPreferencesPageWidget", "vCPUs:"))
-
+        self.uiPortLabel.setText(_translate("GNS3VMPreferencesPageWidget", "Port:"))

gns3/ui/main_window.ui

@@ -62,7 +62,7 @@ background-none;
      <x>0</x>
      <y>0</y>
      <width>986</width>
-     <height>40</height>
+     <height>42</height>
     </rect>
    </property>
    <widget class="QMenu" name="uiEditMenu">
@@ -163,7 +163,6 @@ background-none;
     </property>
     <addaction name="uiScreenshotAction"/>
     <addaction name="uiImportExportConfigsAction"/>
-    <addaction name="uiWebInterfaceAction"/>
     <addaction name="uiWebUIAction"/>
    </widget>
    <addaction name="uiFileMenu"/>
@@ -1187,11 +1186,6 @@ background-none;
     <string>Edit project</string>
    </property>
   </action>
-  <action name="uiWebInterfaceAction">
-   <property name="text">
-    <string>Light Web interface</string>
-   </property>
-  </action>
   <action name="uiDrawLineAction">
    <property name="checkable">
     <bool>true</bool>
@@ -1227,7 +1221,7 @@ background-none;
   </action>
   <action name="uiWebUIAction">
    <property name="text">
-    <string>WebUI - topology preview</string>
+    <string>Web UI - beta</string>
    </property>
   </action>
   <action name="uiNewTemplateAction">

gns3/ui/main_window_ui.py

@@ -2,12 +2,14 @@
 
 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/ui/main_window.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_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")
@@ -46,7 +48,7 @@ class Ui_MainWindow(object):
         self.gridlayout.addWidget(self.uiGraphicsView, 0, 0, 1, 1)
         MainWindow.setCentralWidget(self.uiCentralWidget)
         self.uiMenuBar = QtWidgets.QMenuBar(MainWindow)
-        self.uiMenuBar.setGeometry(QtCore.QRect(0, 0, 986, 40))
+        self.uiMenuBar.setGeometry(QtCore.QRect(0, 0, 986, 42))
         self.uiMenuBar.setObjectName("uiMenuBar")
         self.uiEditMenu = QtWidgets.QMenu(self.uiMenuBar)
         self.uiEditMenu.setObjectName("uiEditMenu")
@@ -214,22 +216,22 @@ class Ui_MainWindow(object):
         self.uiOnlineHelpAction.setObjectName("uiOnlineHelpAction")
         self.uiScreenshotAction = QtWidgets.QAction(MainWindow)
         icon4 = QtGui.QIcon()
-        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)
+        icon4.addPixmap(QtGui.QPixmap(":/icons/camera-photo-hover.svg"), QtGui.QIcon.Active, 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-hover.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
         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)
         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-hover.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
         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)
         self.uiStopAllAction.setIcon(icon6)
         self.uiStopAllAction.setObjectName("uiStopAllAction")
         self.uiConsoleAllAction = QtWidgets.QAction(MainWindow)
@@ -243,14 +245,14 @@ class Ui_MainWindow(object):
         self.uiAboutQtAction.setObjectName("uiAboutQtAction")
         self.uiZoomInAction = QtWidgets.QAction(MainWindow)
         icon8 = QtGui.QIcon()
-        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)
+        icon8.addPixmap(QtGui.QPixmap(":/icons/zoom-in-hover.png"), QtGui.QIcon.Active, 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-hover.png"), QtGui.QIcon.Active, QtGui.QIcon.Off)
         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)
         self.uiZoomOutAction.setIcon(icon9)
         self.uiZoomOutAction.setObjectName("uiZoomOutAction")
         self.uiZoomResetAction = QtWidgets.QAction(MainWindow)
@@ -267,8 +269,8 @@ class Ui_MainWindow(object):
         self.uiPreferencesAction.setObjectName("uiPreferencesAction")
         self.uiSuspendAllAction = QtWidgets.QAction(MainWindow)
         icon11 = QtGui.QIcon()
-        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)
+        icon11.addPixmap(QtGui.QPixmap(":/icons/pause-hover.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
         self.uiSuspendAllAction.setIcon(icon11)
         self.uiSuspendAllAction.setObjectName("uiSuspendAllAction")
         self.uiAddNoteAction = QtWidgets.QAction(MainWindow)
@@ -296,15 +298,15 @@ class Ui_MainWindow(object):
         self.uiDrawRectangleAction = QtWidgets.QAction(MainWindow)
         self.uiDrawRectangleAction.setCheckable(True)
         icon16 = QtGui.QIcon()
-        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)
+        icon16.addPixmap(QtGui.QPixmap(":/icons/rectangle-hover.svg"), QtGui.QIcon.Active, 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-hover.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
         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)
         self.uiDrawEllipseAction.setIcon(icon17)
         self.uiDrawEllipseAction.setObjectName("uiDrawEllipseAction")
         self.uiShowPortNamesAction = QtWidgets.QAction(MainWindow)
@@ -346,40 +348,40 @@ class Ui_MainWindow(object):
         self.uiCheckForUpdateAction.setObjectName("uiCheckForUpdateAction")
         self.uiBrowseRoutersAction = QtWidgets.QAction(MainWindow)
         icon23 = QtGui.QIcon()
-        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)
+        icon23.addPixmap(QtGui.QPixmap(":/icons/router-hover.png"), QtGui.QIcon.Active, 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-hover.png"), QtGui.QIcon.Active, QtGui.QIcon.Off)
         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)
         self.uiBrowseSwitchesAction.setIcon(icon24)
         self.uiBrowseSwitchesAction.setObjectName("uiBrowseSwitchesAction")
         self.uiBrowseEndDevicesAction = QtWidgets.QAction(MainWindow)
         icon25 = QtGui.QIcon()
-        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)
+        icon25.addPixmap(QtGui.QPixmap(":/icons/PC-hover.png"), QtGui.QIcon.Active, 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-hover.png"), QtGui.QIcon.Active, QtGui.QIcon.Off)
         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)
         self.uiBrowseSecurityDevicesAction.setIcon(icon26)
         self.uiBrowseSecurityDevicesAction.setObjectName("uiBrowseSecurityDevicesAction")
         self.uiBrowseAllDevicesAction = QtWidgets.QAction(MainWindow)
         icon27 = QtGui.QIcon()
-        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)
+        icon27.addPixmap(QtGui.QPixmap(":/icons/browse-all-icons-hover.png"), QtGui.QIcon.Active, 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-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/connection-new-hover.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
         icon28.addPixmap(QtGui.QPixmap(":/icons/cancel-connection.svg"), QtGui.QIcon.Active, QtGui.QIcon.On)
         self.uiAddLinkAction.setIcon(icon28)
         self.uiAddLinkAction.setObjectName("uiAddLinkAction")
@@ -422,8 +424,6 @@ class Ui_MainWindow(object):
         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")
         self.uiDrawLineAction = QtWidgets.QAction(MainWindow)
         self.uiDrawLineAction.setCheckable(True)
         icon33 = QtGui.QIcon()
@@ -434,9 +434,9 @@ class Ui_MainWindow(object):
         self.uiLockAllAction.setCheckable(True)
         self.uiLockAllAction.setChecked(False)
         icon34 = QtGui.QIcon()
-        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/unlock.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
         icon34.addPixmap(QtGui.QPixmap(":/icons/lock.svg"), QtGui.QIcon.Active, QtGui.QIcon.On)
         self.uiLockAllAction.setIcon(icon34)
         self.uiLockAllAction.setObjectName("uiLockAllAction")
@@ -499,7 +499,6 @@ class Ui_MainWindow(object):
         self.uiAnnotateMenu.addAction(self.uiDrawLineAction)
         self.uiToolsMenu.addAction(self.uiScreenshotAction)
         self.uiToolsMenu.addAction(self.uiImportExportConfigsAction)
-        self.uiToolsMenu.addAction(self.uiWebInterfaceAction)
         self.uiToolsMenu.addAction(self.uiWebUIAction)
         self.uiMenuBar.addAction(self.uiFileMenu.menuAction())
         self.uiMenuBar.addAction(self.uiEditMenu.menuAction())
@@ -702,13 +701,11 @@ class Ui_MainWindow(object):
         self.uiDeleteProjectAction.setText(_translate("MainWindow", "Delete project"))
         self.uiShowGridAction.setText(_translate("MainWindow", "Show the grid"))
         self.uiEditProjectAction.setText(_translate("MainWindow", "Edit project"))
-        self.uiWebInterfaceAction.setText(_translate("MainWindow", "Light Web interface"))
         self.uiDrawLineAction.setText(_translate("MainWindow", "Drawn line"))
         self.uiLockAllAction.setText(_translate("MainWindow", "Lock or unlock all items"))
         self.uiLockAllAction.setToolTip(_translate("MainWindow", "Lock or unlock all items"))
-        self.uiWebUIAction.setText(_translate("MainWindow", "WebUI - topology preview"))
+        self.uiWebUIAction.setText(_translate("MainWindow", "Web UI - beta"))
         self.uiNewTemplateAction.setText(_translate("MainWindow", "New template"))
-
 from ..compute_summary_view import ComputeSummaryView
 from ..console_view import ConsoleView
 from ..graphics_view import GraphicsView

gns3/version.py

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

requirements.txt

@@ -1,4 +1,5 @@
-jsonschema==2.6.0  # pyup: ignore
+jsonschema==3.2.0; python_version >= '3.8'  # pyup: ignore
+jsonschema==2.6.0; python_version < '3.8'  # pyup: ignore
 raven>=5.23.0
 psutil==5.6.6
-distro>=1.3.0
+distro>=1.3.0