update for tutorials (#2654)

Author: ReimarBauer

mslib/msui/msui.py

@@ -105,6 +105,8 @@ def notify(QObject, QEvent):
     application.setApplicationDisplayName("MSUI")
     application.setAttribute(QtCore.Qt.AA_DisableWindowContextHelpButton)
     mainwindow = MSUIMainWindow(tutorial_mode=tutorial_mode)
+    if tutorial_mode:
+        mainwindow.showFullScreen()
     if version.parse(__version__) >= version.parse('9.0.0') and version.parse(__version__) < version.parse('10.0.0'):
         from mslib.utils.migration.config_before_nine import read_config_file as read_config_file_before_nine
         from mslib.utils.migration.config_before_nine import config_loader as config_loader_before_nine

tutorials/tutorial_hexagoncontrol.py

@@ -45,7 +45,7 @@ def automate_hexagoncontrol():
     # Changing map to Global
     find_and_click_picture('topviewwindow-00-global-cyl.png',
                            "Map change dropdown could not be located on the screen")
-    select_listelement(2)
+    select_listelement(7)
     # Zooming into the map
     zoom_in('topviewwindow-zoom.png', 'Zoom button could not be located on the screen',
             move=(379, 205), dragRel=(70, 75))

tutorials/tutorial_kml.py

@@ -47,7 +47,7 @@ def automate_kml():
 
 def _switch_to_europe_map():
     find_and_click_picture('topviewwindow-00-global-cyl.png', "Map change dropdown could not be located on the screen.")
-    select_listelement(2)
+    select_listelement(7)
     pag.sleep(1)
     create_tutorial_images()
 

tutorials/tutorial_satellitetrack.py

@@ -54,7 +54,7 @@ def automate_rs():
     # Changing map to Global
     find_and_click_picture('topviewwindow-00-global-cyl.png',
                            "Map change dropdown could not be located on the screen")
-    select_listelement(2)
+    select_listelement(7)
 
     # update images
     create_tutorial_images()

tutorials/tutorial_views.py

@@ -140,7 +140,7 @@ def automate_views():
     find_and_click_picture('topviewwindow-00-global-cyl.png',
                            'Projection 00-global-cyl not found',
                            region=topview["os_screen_region"])
-    select_listelement(2)
+    select_listelement(7)
 
     # Zooming into the map
     zoom_in('topviewwindow-zoom.png', 'Zoom button not found',

tutorials/tutorial_waypoints.py

@@ -92,7 +92,7 @@ def automate_waypoints():
     # Changing map to Global
     find_and_click_picture('topviewwindow-00-global-cyl.png',
                            "Map change dropdown could not be located.")
-    select_listelement(2)
+    select_listelement(7)
     pag.sleep(5)
 
     # Zooming into the map

tutorials/utils/__init__.py

@@ -289,6 +289,7 @@ def find_and_click_picture(pic_name, exception_message=None, duration=2, xoffset
 
     :returns: A tuple containing the x and y coordinates of the clicked position.
     """
+    pag.sleep(2)
     x, y = (0, 0)
     message = exception_message if exception_message is not None else f"{pic_name} not found"
     try:
@@ -515,8 +516,6 @@ def msui_full_screen_and_open_first_view(view_cmd='h'):
 
     :return: None
     """
-    hotkey = WIN, 'pageup'
-    pag.hotkey(*hotkey)
     pag.sleep(1)
     if view_cmd is not None:
         pag.hotkey(CTRL, view_cmd)

tutorials/utils/platform_keys.py

@@ -54,5 +54,7 @@ def platform_keys():
         alt = 'alt'
     elif sys.platform == 'darwin':
         enter = 'return'
-        ctrl = 'command'
+        ctrl = 'control'
+        alt = 'option'
+        win = 'command'
     return ctrl, enter, win, alt