Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc fix #2887

Merged
merged 3 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Likewise, the current version of wxPython, is 4.2.2, but RIDE is known to work w

`pip install -U robotframework-ride`

(3.8 <= python <= 3.12) Install current development version (**2.1dev80**) with:
(3.8 <= python <= 3.12) Install current development version (**2.1dev81**) with:

`pip install -U https://github.com/robotframework/RIDE/archive/master.zip`

Expand Down
2 changes: 1 addition & 1 deletion src/robotide/application/releasenotes.py
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ def set_content(self, html_win, content):
<pre class="literal-block">
python -m robotide.postinstall -install
</pre>
<p>RIDE {VERSION} was released on 16/September/2024.</p>
<p>RIDE {VERSION} was released on 20/September/2024.</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>
Expand Down
3 changes: 1 addition & 2 deletions src/robotide/editor/editors.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@ def __init__(self, plugin, parent, controller, tree):
self._editors = []
self._last_shown_tooltip = None
self._reset_last_show_tooltip()
if context.IS_LINUX:
self.SetupScrolling() # Only Linux users will need to use the workaround to restore Grid scroll bars
self._populate()
self.plugin.subscribe(self._settings_changed, RideItemSettingsChanged)

Expand Down Expand Up @@ -314,6 +312,7 @@ class _FileEditor(_RobotTableEditor):

def __init__(self, *args):
_RobotTableEditor.__init__(self, *args)
self.SetupScrolling()
self.plugin.subscribe(
self._update_source_and_name, RideFileNameChanged)

Expand Down
1 change: 1 addition & 0 deletions src/robotide/editor/gridbase.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ 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()
parent.SetupScrolling()

def _bind_to_events(self):
self.Bind(grid.EVT_GRID_SELECT_CELL, self.on_select_cell)
Expand Down
3 changes: 2 additions & 1 deletion src/robotide/lib/compat/pygments/robotframework.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ def __init__(self, **options):
set_lang = shared_memory.ShareableList(name="language")
if not self.language:
# DEBUG self.new_lang = Language.from_name('en')
self.new_lang = Language.from_name(set_lang[0].replace('_', '-'))
shared_lang = set_lang[0].replace('_', '-') or 'en'
self.new_lang = Language.from_name(shared_lang)
else:
self.new_lang = Language.from_name(self.language[0].replace('_', '-')) # DEBUG: We consider a single language
# print(f"DEBUG: robotframework.py after RobotFrameworkLexer _init_ mimetypes={self.mimetypes}\n"
Expand Down
2 changes: 1 addition & 1 deletion src/robotide/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
#
# Automatically generated by `tasks.py`.

VERSION = 'v2.1dev80'
VERSION = 'v2.1dev81'
Loading