Merge branch 'master' into copy_paste

GNS3 · Jul 26, 2024 · fcfa9d5 · fcfa9d5
2 parents a7c567d + 133732b
commit fcfa9d5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/gns3/ui/main_window.ui b/gns3/ui/main_window.ui
@@ -1147,6 +1147,9 @@ background-none;
    <property name="text">
     <string>Fit in view</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+1</string>
+   </property>
   </action>
   <action name="uiActionFullscreen">
    <property name="text">

diff --git a/gns3/ui/main_window_ui.py b/gns3/ui/main_window_ui.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/ui/main_window.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.9
+# Created by: PyQt5 UI code generator 5.15.6
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.
@@ -702,6 +702,7 @@ def retranslateUi(self, MainWindow):
         self.uiAddLinkAction.setToolTip(_translate("MainWindow", "Add a link"))
         self.uiAddLinkAction.setStatusTip(_translate("MainWindow", "Add a link"))
         self.uiFitInViewAction.setText(_translate("MainWindow", "Fit in view"))
+        self.uiFitInViewAction.setShortcut(_translate("MainWindow", "Ctrl+1"))
         self.uiActionFullscreen.setText(_translate("MainWindow", "Fullscreen"))
         self.uiActionFullscreen.setShortcut(_translate("MainWindow", "Ctrl+F"))
         self.uiSetupWizard.setText(_translate("MainWindow", "&Setup Wizard"))