Skip to content

Commit d4b988f

Browse files
Merge branch 'develop' of github.com:HelioGuilherme66/RIDE into develop
2 parents 29af974 + cbcd470 commit d4b988f

File tree

3 files changed

+25
-14
lines changed

3 files changed

+25
-14
lines changed

src/robotide/application/releasenotes.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,12 @@ def set_content(self, html_win, content):
236236
<pre class="literal-block">python -m robotide.postinstall -install</pre>
237237
<p>or</p>
238238
<pre class="literal-block">ride_postinstall.py -install</pre>
239-
<p>RIDE {VERSION} was released on 02/December/2025.</p>
239+
<p>RIDE {VERSION} was released on 05/December/2025.</p>
240240
<br/>
241+
<!--
241242
<h3>Celebrate the bank holiday, 1st December, Restoration of the Independence of Portugal (from Spain in 1640)!!</h3>
242243
<h3 align='center'>🇵🇹</h3>
243-
<!--
244+
244245
<br/>
245246
<h3>Celebrate the bank holiday, 5th October, Implantation of the Republic in Portugal</h3>
246247
<h4>Happy 115th bithday! Long live the Republic!</h4>

src/robotide/ui/fileexplorerplugin.py

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ def __init__(self, application, controller=None):
7575
# self.font = self.file_explorer.GetFont()
7676
self.font = None
7777
self._popup_creator = PopupCreator()
78-
self.subscribe(self.on_suite_opened, RideOpenSuite, RideSettingsChanged)
7978
self._actions = [
8079
_('Open'),
8180
'---',
@@ -102,7 +101,7 @@ def register_frame(self, parent=None):
102101
register = self._mgr.AddPane
103102

104103
register(self.file_explorer, wx.lib.agw.aui.AuiPaneInfo().Name("file_manager").
105-
Caption(_("Files")).LeftDockable(True).CloseButton(False))
104+
Caption(_("Files")).LeftDockable(True).CloseButton(True))
106105

107106
self._mgr.Update()
108107

@@ -196,6 +195,7 @@ def show_file_explorer(self):
196195
self.file_explorer.Refresh()
197196
self._filetreectrl.SetBackgroundColour(html_background)
198197
self._filetreectrl.SetForegroundColour(html_foreground)
198+
# print(f"DEBUG: FileExplorerPlugin SET FONT treectrl size={self.html_font_size}")
199199
self._filetreectrl.SetFont(self.font)
200200
self._filetreectrl.Fit()
201201
self._filetreectrl.Refresh()
@@ -242,12 +242,6 @@ def update_tree(self):
242242
def show_popup(self):
243243
self._popup_creator.show(self.file_explorer, PopupMenuItems(self, self._actions, self._actions_nt), self._controller)
244244

245-
def on_suite_opened(self, message):
246-
# Update File Explorer tree when suite is opened to use whole pane (when floating).
247-
# Not working
248-
__ = message
249-
wx.CallAfter(self.update_tree)
250-
251245
def on_open(self, event):
252246
# __ = event
253247
# print(f"DEBUG: FileExplorerPlugin call on_open_file={event}\n"
@@ -308,6 +302,7 @@ def __init__(self, parent, plugin, controller=None):
308302
self.Bind(wx.EVT_SIZE, self.on_size)
309303
self.Bind(wx.EVT_TREE_ITEM_RIGHT_CLICK, self.on_right_click)
310304
self.Bind(wx.EVT_KEY_DOWN, self.on_key_press)
305+
PUBLISHER.subscribe(self.on_suite_opened, RideOpenSuite)
311306
PUBLISHER.subscribe(self.on_settings_changed, RideSettingsChanged)
312307
self.SetThemeEnabled(True)
313308
self.SetAutoLayout(True)
@@ -343,8 +338,8 @@ def update_tree(self):
343338
pass
344339
# self.on_size(wx.EVT_SIZE)
345340
self.Refresh()
346-
self.Update()
347341
self.tree_ctrl.Update()
342+
self.Update()
348343

349344
def _apply_settings(self):
350345
apply_to_panels = self._plugin.general_settings['apply to panels']
@@ -380,13 +375,18 @@ def _apply_settings(self):
380375
self.font.SetFaceName(self._plugin.settings['font face'])
381376
self.font.SetPointSize(int(self._plugin.settings['font size']))
382377
self.SetFont(self.font)
378+
tc.SetFont(self.font)
383379
tc.Fit()
384380
tc.Refresh()
385381
tc.Update()
382+
# print(f"DEBUG: FileExplorerPlugin _apply_settings SET FONT treectrl "
383+
# f"size={int(self._plugin.settings['font size'])}")
386384
self.tree_ctrl.SetFont(self.font)
387385
self.tree_ctrl.Fit()
388386
self.tool_bar_txt.SetFont(self.font)
389387
self.tree_ctrl.Refresh()
388+
self.tree_ctrl.Update()
389+
self.Update()
390390

391391
def on_close(self, event):
392392
__ = event
@@ -397,19 +397,27 @@ def on_key_press(self, event):
397397
print(f"DEBUG: FileExplorer on_key_press Skipping {event.KeyCode()}")
398398
event.Skip()
399399

400+
def on_suite_opened(self, message):
401+
# Update File Explorer tree when suite is opened to use whole pane (when floating).
402+
# Not working
403+
__ = message
404+
wx.CallAfter(self.on_size)
405+
400406
def on_size(self, event=None):
401407
if event:
402408
event.Skip()
403409
self.update_tree()
404410
sz = self.GetSize() # + wx.Size(-5, -5)
405411
# print(f"DEBUG: FileExplorer On size refreshing. sz={sz}")
412+
self.tree_ctrl.SetSize(sz)
413+
self.tree_ctrl.Fit()
414+
self.tree_ctrl.Refresh()
406415
tc = self.tree_ctrl.GetTreeCtrl()
407416
tc.SetSize(sz)
408417
tc.Fit()
409418
tc.Refresh()
410-
self.tree_ctrl.Fit()
411-
self.tree_ctrl.Refresh()
412419
self.tree_ctrl.Update()
420+
self.Update()
413421

414422
def on_right_click(self, event):
415423
__ = event
@@ -428,6 +436,7 @@ def on_right_click(self, event):
428436

429437
def on_settings_changed(self, message):
430438
"""Redraw the colors if the color settings are modified"""
439+
# print(f"DEBUG: FileExplorer on_settings_changed ENTER {message.keys}\n")
431440
if message.keys[0] == "General":
432441
if message.keys[-1] == "apply to panels":
433442
self.update_tree()
@@ -445,6 +454,7 @@ def on_settings_changed(self, message):
445454
opened = self._plugin.settings['opened']
446455
if opened:
447456
pane_info.Show(True)
457+
self._apply_settings()
448458
else:
449459
pane_info.Hide()
450460
self._plugin._pane.GetManager().Update()

src/robotide/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
#
1616
# Automatically generated by `tasks.py`.
1717

18-
VERSION = 'v2.2.1dev3'
18+
VERSION = 'v2.2.1dev4'

0 commit comments

Comments
 (0)