Merge pull request #2920 from HelioGuilherme66/dev_windows

HelioGuilherme66 · web-flow · commit 4a93663639ba · 2025-02-13T11:49:27.000Z
Fix scroll bars in Grid Editor
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -10,6 +10,7 @@ and this project adheres to http://semver.org/spec/v2.0.0.html[Semantic Versioni
 
 === Fixed
 
+- Fixed multiple scroll bars in Grid Editor when editing Test Cases or Keywords. This caused bad navigation on cells.
 - Regression fix from v2.1b1 - Fix wrong item selection, like Test Suite, when doing right-click actions in Project Explorer.
   When right clicking over Tree elements, to, for example, expand or select tests, we want to keep the Editor in the same file or position.
 
diff --git a/README.adoc b/README.adoc
@@ -33,14 +33,14 @@ See the https://github.com/robotframework/RIDE/blob/master/doc/releasenotes/ride
 
 **The current development version is based on 2.1,2, supports Python from 3.8 up to 3.13 (28th January 2025).**
 
-Currently, the unit tests are tested on Python 3.10, 3.11 and 3.13 (but 3.12 is the recommended version).
+Currently, the unit tests are tested on Python 3.10, 3.11 and 3.13 (3.13 is the recommended version).
 Likewise, the current version of wxPython, is 4.2.2, but RIDE is known to work with 4.0.7 and 4.1.1 versions.
 
-(3.8 &lt;= python &lt;= 3.12) Install current released version (*2.1.2*) with:
+(3.8 &lt;= python &lt;= 3.13) Install current released version (*2.1.2*) with:
 
 `pip install -U robotframework-ride`
 
-(3.8 &lt;= python &lt;= 3.13) Install current development version (**2.2dev3**) with:
+(3.8 &lt;= python &lt;= 3.13) Install current development version (**2.2dev4**) with:
 
 `pip install -U https://github.com/robotframework/RIDE/archive/develop.zip`
 
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -2,7 +2,7 @@ sonar.projectKey=HelioGuilherme66_RIDE
 sonar.organization=helioguilherme66
 sonar.host.url=https://sonarcloud.io
 sonar.python.version=3.10
-sonar.projectVersion=v2.1
+sonar.projectVersion=v2.1.2
 sonar.sources=src/
 sonar.tests=utest/
 sonar.exclusions=**/lib/robot/**/*
diff --git a/src/robotide/__init__.py b/src/robotide/__init__.py
@@ -136,7 +136,7 @@ def writelines(self, sequence):
             """ Override """
             pass
 
-    if sys.executable.endswith('pythonw.exe'):
+    if sys.executable.endswith('.exe'):
         # In windows, when launching RIDE with pythonw.exe
         # sys.stderr and sys.stdout will be None
         if sys.stderr is None:
diff --git a/src/robotide/application/CHANGELOG.html b/src/robotide/application/CHANGELOG.html
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Changelog</title><link rel="stylesheet" type="text/css" href="docbook-xsl.css" /><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot" /></head><body><div xml:lang="en" class="article" lang="en"><div class="titlepage"><div><div><h2 class="title"><a id="id1337"></a>Changelog</h2></div></div><hr /></div><p>All notable changes to this project will be documented in this file.</p><p>The format is based on <a class="ulink" href="http://keepachangelog.com/en/1.0.0/" target="_top">Keep a Changelog</a>
-and this project adheres to <a class="ulink" href="http://semver.org/spec/v2.0.0.html" target="_top">Semantic Versioning</a>.</p><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_ulink_url_https_github_com_robotframework_ride_unreleased_ulink"></a>1. <a class="ulink" href="https://github.com/robotframework/RIDE" target="_top">Unreleased</a></h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_fixed"></a>1.1. Fixed</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+and this project adheres to <a class="ulink" href="http://semver.org/spec/v2.0.0.html" target="_top">Semantic Versioning</a>.</p><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_ulink_url_https_github_com_robotframework_ride_unreleased_ulink"></a>1. <a class="ulink" href="https://github.com/robotframework/RIDE" target="_top">Unreleased</a></h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_fixed"></a>1.1. Fixed</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+    <li class="listitem">
+    Fixed multiple scroll bars in Grid Editor when editing Test Cases or Keywords. This caused bad navigation on cells.
+</li>
+    <li class="listitem">
 Regression fix from v2.1b1 - Fix wrong item selection, like Test Suite, when doing right-click actions in Project Explorer.
   When right clicking over Tree elements, to, for example, expand or select tests, we want to keep the Editor in the same file or position.
 </li></ul></div></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_ulink_url_https_github_com_robotframework_ride_blob_master_doc_releasenotes_ride_2_1_2_rst_2_1_2_ulink_2025_01_28"></a>2. <a class="ulink" href="https://github.com/robotframework/RIDE/blob/master/doc/releasenotes/ride-2.1.2.rst" target="_top">2.1.2</a> - 2025-01-28</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_fixed_2"></a>2.1. Fixed</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
diff --git a/src/robotide/application/releasenotes.py b/src/robotide/application/releasenotes.py
@@ -151,7 +151,7 @@ def set_content(self, html_win, content):
 <p><a class="reference external" href="https://github.com/robotframework/RIDE/">RIDE (Robot Framework IDE)</a>
  {VERSION} is a new release with some enhancements and bug fixes. The reference for valid arguments is
  <a class="reference external" href="https://robotframework.org/">Robot Framework</a> previous version, which was 7.1.1 
- (currently is 7.2). However, internal library code is originally based on version 3.1.2, but adapted for new versions.</p>
+ (currently is 7.2.2). However, internal library code is originally based on version 3.1.2, but adapted for new versions.</p>
 <ul class="simple">
 <li>This version supports Python 3.8 up to 3.13.</li>
 <li>There are some changes, or known issues:<ul>
@@ -168,6 +168,7 @@ def set_content(self, html_win, content):
 </ul>
 <p><strong>New Features and Fixes Highlights</strong></p>
 <ul class="simple">
+<li>Fixed multiple scroll bars in Grid Editor when editing Test Cases or Keywords. This caused bad navigation on cells.</li>
 <li>Regression fix from v2.1b1 - Fix wrong item selection, like Test Suite, when doing right-click actions in
  Project Explorer.</li>
 </ul>
@@ -224,7 +225,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 30/January/2025.</p>
+<p>RIDE {VERSION} was released on 12/February/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>
diff --git a/src/robotide/application/updatenotifier.py b/src/robotide/application/updatenotifier.py
@@ -13,9 +13,11 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 import builtins
+import os
 import re
 import subprocess
 import sys
+import tempfile
 # Configure wx uversion to allow running test app in __main__
 
 
@@ -27,6 +29,7 @@
 import requests
 import wx
 from wx import Colour
+from os import path
 
 from .. import version
 from ..utils.versioncomparator import cmp_versions, parse_version
@@ -116,7 +119,19 @@ def upgrade_from_dev_dialog(version_installed, notebook, show_no_update=False):
                                         f"{SPC}\n", wx.GetActiveWindow(),  no_default=True):
             return False
         else:
+            import zipfile
+            backup_configobj = tempfile.NamedTemporaryFile(delete=False)
+            config_obj_dir = path.join(path.dirname(__file__), '../preferences/configobj')
+            files = os.listdir(config_obj_dir)
+            with zipfile.ZipFile(backup_configobj.name, 'w') as zzip:
+                for file in files:
+                    file_path = os.path.join(config_obj_dir, file)
+                    zzip.write(file_path)
             do_upgrade(command, notebook)
+            with zipfile.ZipFile(backup_configobj.name, 'r') as zzip:
+                zzip.extractall(config_obj_dir)
+            print(f"DEBUG: updatentivier, {config_obj_dir=} {backup_configobj.name}")
+            os.remove(backup_configobj.name)
             return True
     else:
         if show_no_update:
@@ -174,7 +189,7 @@ def do_upgrade(command, notebook):
 def start_upgraded(message):
     __ = message
     command = sys.executable + " -m robotide.__init__ --noupdatecheck"
-    wx.CallLater(500, subprocess.Popen, command.split(' '), start_new_session=True)
+    wx.CallLater(1000, subprocess.Popen, command.split(' '), start_new_session=True)
     p = psutil.Process()
     result = _askyesno(_("Completed Upgrade"), f"\n{SPC}{_('You should close this RIDE (Process ID = ')}{p.pid}){SPC}"
                                                f"\n{SPC}{_('Do you want to CLOSE RIDE now?')}\n{SPC}",
diff --git a/src/robotide/editor/gridbase.py b/src/robotide/editor/gridbase.py
@@ -62,12 +62,19 @@ def __init__(self, parent, num_rows, num_cols, popup_creator=None):
         self.GetGridRowLabelWindow().SetBackgroundColour(Colour(self.color_secondary_background))
         self.GetGridRowLabelWindow().SetForegroundColour(Colour(self.color_secondary_foreground))
         self._popup_creator = popup_creator or PopupCreator()
+        """
+        DEBUG: This block adds aditional scrollbars in mains Grid Editor, making hard to focus on cells keeping the 
+               row numbers visible.
         if hasattr(parent, 'SetupScrolling'):
-            parent.SetupScrolling()
-        elif hasattr(self, 'SetupScrolling'):
-            self.SetupScrolling()
-        else:
-            print("DEBUG: GridBase init NO SetupScrolling\n")
+            parent.SetupScrolling(scrollToTop=True, scrollIntoView=True)
+            print("DEBUG: GridBase init at PARENT SetupScrolling\n")
+        elif
+        """
+        if hasattr(self, 'SetupScrolling'):
+            self.SetupScrolling(scrollToTop=True, scrollIntoView=True)
+            # print("DEBUG: GridBase init at SELF SetupScrolling\n")
+        # else:
+        #     print("DEBUG: GridBase init NO SetupScrolling\n")
 
     def _bind_to_events(self):
         self.Bind(grid.EVT_GRID_SELECT_CELL, self.on_select_cell)
diff --git a/src/robotide/version.py b/src/robotide/version.py
@@ -15,4 +15,4 @@
 #
 # Automatically generated by `tasks.py`.
 
-VERSION = 'v2.2dev3'
+VERSION = 'v2.2dev4'

Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,4 @@`
`15`	`15`	`#`
`16`	`16`	# Automatically generated by `tasks.py`.
`17`	`17`
`18`		`-VERSION = 'v2.2dev3'`
	`18`	`+VERSION = 'v2.2dev4'`