Fix Create Desktop Shortcut (#2956)

Author: HelioGuilherme66

CHANGELOG.adoc

@@ -24,6 +24,9 @@ when selecting in Tree shows the filename in StatusBar.
 - Modified import statements to allow running RIDE without Robot Framework installed or versions older than 6.0.
 - On Windows ignore false modification on files when opening Test Suites, causing confirmation dialog.
 
+=== Fixed
+- Fixed Create Desktop Shortcut by pointing executable to ``python -m robotide``.
+
 == https://github.com/robotframework/RIDE/blob/master/doc/releasenotes/ride-2.1.3.rst[2.1.3] - 2025-03-24
 
 === Added

README.adoc

@@ -41,7 +41,7 @@ Likewise, the current version of wxPython, is 4.2.3, but RIDE is known to work w
 
 `pip install -U robotframework-ride`
 
-(3.8 <= python <= 3.13) Install current development version (**2.2dev27**) with:
+(3.8 <= python <= 3.13) Install current development version (**2.2dev28**) with:
 
 `pip install -U https://github.com/robotframework/RIDE/archive/develop.zip`
 

src/robotide/application/CHANGELOG.html

@@ -172,6 +172,7 @@ def set_content(self, html_win, content):
 </ul>
 <p><strong>New Features and Fixes Highlights</strong></p>
 <ul class="simple">
+<li>Fixed Create Desktop Shortcut by pointing executable to <b>python -m robotide</b>.</li>
 <li>Changed arguments parser to allow <b>--version</b> and <b>--help</b> functional in Windows.</li>
 <li>Improved auto-complete in Grid Editor, to allow several matches.</li>
 <li>Fixed white blocks on Tree due to failed animation when test execution is too rapid, causing crash on Windows.</li>
@@ -239,7 +240,7 @@ def set_content(self, html_win, content):
 <pre class="literal-block">python -m robotide.postinstall -install</pre>
 <p>or</p>
 <pre class="literal-block">ride_postinstall.py -install</pre>
-<p>RIDE {VERSION} was released on 20/May/2025.</p>
+<p>RIDE {VERSION} was released on 25/May/2025.</p>
 <!-- <br/>
 <h3>May The Fourth Be With You!</h3>
 <h3>Celebrate the bank holiday, 10th June, Day of Portugal, Portuguese Communities and Camões!!</h3>

src/robotide/application/releasenotes.py

@@ -20,7 +20,7 @@
 	<key>CFBundleExecutable</key>
 	<string>RIDE</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.0b2, (c) 2016- Robot Framework Foundation.</string>
+	<string>2.1.4, (c) 2016- Robot Framework Foundation.</string>
 	<key>CFBundleHelpBookFolder</key>
 	<array>
 		<string>Documentation</string>
@@ -37,17 +37,17 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
-	<string>2.0b2, (c) 2016- Robot Framework Foundation.</string>
+	<string>2.1.4, (c) 2016- Robot Framework Foundation.</string>
 	<key>CFBundleName</key>
 	<string>RIDE</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0b2</string>
+	<string>2.1.4</string>
 	<key>CFBundleSignature</key>
 	<string>RIDE</string>
 	<key>CFBundleVersion</key>
-	<string>2.0b2</string>
+	<string>2.1.4</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>

src/robotide/postinstall/RIDE.app/Contents/Info.plist

@@ -6,4 +6,4 @@ for i in `cat /etc/paths`
     done
 PATH=$PAL
 export $PATH
-/usr/bin/python3 -m robotide.__init__ $* 2> /dev/null &
+/usr/bin/python3 -m robotide $* 2> /dev/null &

src/robotide/postinstall/RIDE.app/Contents/MacOS/RIDE

@@ -122,6 +122,8 @@ def _create_buttons(self, sizer, no_default=False):
         if no_default:
             flags |= wx.NO_DEFAULT
         buttons = self.CreateStdDialogButtonSizer(flags)
+        if not no_default:
+            buttons.SetAffirmativeButton(buttons.GetItemById(wx.OK))
         self.SetBackgroundColour(Colour(self.color_background))
         self.SetForegroundColour(Colour(self.color_foreground))
         for item in self.GetChildren():
@@ -223,7 +225,7 @@ def _create_desktop_shortcut_linux(frame=None):
                 roboticon = join("FIXME: find correct path to: .../site-packages/", "robotide", "widgets", ROBOT_ICO)
         with open(link, "w+") as shortcut:
             shortcut.write(f"#!/usr/bin/env xdg-open\n[Desktop Entry]\n"
-                           f"Exec={sys.executable} -m robotide.__init__\n"
+                           f"Exec={sys.executable} -m robotide\n"
                            f"Comment=A Robot Framework IDE\nGenericName=RIDE\n"
                            f"Icon={roboticon}\n"
                            f"Name=RIDE\nStartupNotify=true\nTerminal=false\n"
@@ -248,7 +250,7 @@ def _create_desktop_shortcut_mac(frame=None):
         app_script = os.path.join(ride_app_module_path, 'Contents', 'MacOS', 'RIDE')
         with open(app_script, 'w+') as shortcut:
             shortcut.write("#!/bin/sh\nPAL=$PATH\nfor i in `cat /etc/paths`\n    do\n        PAL=\"$PAL:$i\"\n"
-                           "    done\nPATH=$PAL\nexport $PATH\n{} -m robotide.__init__ $* 2>"
+                           "    done\nPATH=$PAL\nexport $PATH\n{} -m robotide $* 2>"
                            " /dev/null &\n".format(sys.executable))
         if exists(ride_app_pc_path):
             shutil.rmtree(ride_app_pc_path, True)
@@ -290,7 +292,7 @@ def _create_desktop_shortcut_windows(frame=None):
         shortcut = pythoncom.CoCreateInstance(shell.CLSID_ShellLink, None,
                                               pythoncom.CLSCTX_INPROC_SERVER,
                                               shell.IID_IShellLink)
-        command_args = " -c \"from robotide import main; main()\""
+        command_args = " -m robotide "
         shortcut.SetPath(sys.executable.replace('python.exe', 'pythonw.exe'))
         shortcut.SetArguments(command_args)
         shortcut.SetDescription("Robot Framework testdata editor")

src/robotide/postinstall/__init__.py

@@ -15,4 +15,4 @@
 #
 # Automatically generated by `tasks.py`.
 
-VERSION = 'v2.2dev27'
+VERSION = 'v2.2dev28'

src/robotide/version.py

@@ -46,6 +46,26 @@ def test_missing_wx(self):  # This test passed in PyCharm but not when run in co
                 import robotide
                 print(dir(robotide))
 
+    @pytest.mark.order(2)
+    def test_postinstall_wx(self):  # This test passed in PyCharm but not when run in command line
+        with MonkeyPatch().context() as m:
+            with pytest.raises((ImportError, SystemExit)):  # (ImportError, ModuleNotFoundError, SystemExit)):
+                sys.modules.pop('wx.Color', None)
+                builtins.__import__ = myimport
+                import robotide.postinstall
+                from wx import Colour
+                print(dir(robotide.postinstall), dir(Colour))
+
+    @pytest.mark.order(3)
+    def test_fail_verify(self):
+        with MonkeyPatch().context() as m:
+            with pytest.raises(SystemExit):
+                sys.modules.pop('wx.version', None)
+                builtins.__import__ = myimport
+                from robotide.postinstall import verify_install
+                result = verify_install()
+                assert not result
+
 
 builtins.__import__ = real_import