pygpt-net 2.4.38__py3-none-any.whl → 2.4.39__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- CHANGELOG.md +6 -0
- README.md +7 -1
- pygpt_net/CHANGELOG.txt +6 -0
- pygpt_net/__init__.py +2 -2
- pygpt_net/controller/__init__.py +3 -1
- pygpt_net/controller/calendar/__init__.py +3 -1
- pygpt_net/controller/chat/render.py +8 -5
- pygpt_net/controller/ctx/__init__.py +32 -24
- pygpt_net/controller/ctx/common.py +3 -2
- pygpt_net/controller/dialogs/confirm.py +2 -2
- pygpt_net/controller/lang/custom.py +2 -7
- pygpt_net/controller/lang/mapping.py +2 -2
- pygpt_net/controller/layout.py +2 -2
- pygpt_net/controller/notepad.py +8 -5
- pygpt_net/controller/ui/tabs.py +201 -58
- pygpt_net/core/ctx/__init__.py +11 -1
- pygpt_net/core/ctx/container.py +16 -9
- pygpt_net/core/ctx/output.py +86 -67
- pygpt_net/core/debug/tabs.py +3 -2
- pygpt_net/core/filesystem/url.py +7 -3
- pygpt_net/core/render/base.py +14 -3
- pygpt_net/core/render/markdown/renderer.py +3 -1
- pygpt_net/core/render/plain/renderer.py +3 -3
- pygpt_net/core/render/web/body.py +9 -3
- pygpt_net/core/render/web/renderer.py +7 -5
- pygpt_net/core/tabs/__init__.py +180 -71
- pygpt_net/core/tabs/tab.py +13 -4
- pygpt_net/data/config/config.json +11 -5
- pygpt_net/data/config/models.json +3 -3
- pygpt_net/data/config/modes.json +3 -3
- pygpt_net/data/locale/locale.de.ini +3 -0
- pygpt_net/data/locale/locale.en.ini +3 -0
- pygpt_net/data/locale/locale.es.ini +3 -0
- pygpt_net/data/locale/locale.fr.ini +3 -0
- pygpt_net/data/locale/locale.it.ini +3 -0
- pygpt_net/data/locale/locale.pl.ini +4 -1
- pygpt_net/data/locale/locale.uk.ini +3 -0
- pygpt_net/data/locale/locale.zh.ini +3 -0
- pygpt_net/plugin/audio_input/simple.py +4 -2
- pygpt_net/provider/core/config/patch.py +8 -1
- pygpt_net/provider/core/ctx/base.py +4 -1
- pygpt_net/provider/core/ctx/db_sqlite/__init__.py +10 -1
- pygpt_net/provider/core/ctx/db_sqlite/storage.py +22 -1
- pygpt_net/ui/layout/chat/input.py +10 -18
- pygpt_net/ui/layout/chat/output.py +26 -44
- pygpt_net/ui/layout/toolbox/footer.py +18 -2
- pygpt_net/ui/widget/tabs/layout.py +195 -0
- pygpt_net/ui/widget/tabs/output.py +124 -35
- pygpt_net/ui/widget/textarea/html.py +11 -1
- pygpt_net/ui/widget/textarea/output.py +10 -1
- pygpt_net/ui/widget/textarea/web.py +49 -9
- {pygpt_net-2.4.38.dist-info → pygpt_net-2.4.39.dist-info}/METADATA +8 -2
- {pygpt_net-2.4.38.dist-info → pygpt_net-2.4.39.dist-info}/RECORD +56 -55
- {pygpt_net-2.4.38.dist-info → pygpt_net-2.4.39.dist-info}/LICENSE +0 -0
- {pygpt_net-2.4.38.dist-info → pygpt_net-2.4.39.dist-info}/WHEEL +0 -0
- {pygpt_net-2.4.38.dist-info → pygpt_net-2.4.39.dist-info}/entry_points.txt +0 -0
CHANGELOG.md
CHANGED
@@ -1,5 +1,11 @@
|
|
1
1
|
# CHANGELOG
|
2
2
|
|
3
|
+
## 2.4.39 (2024-12-09)
|
4
|
+
|
5
|
+
- Added "Split Screen" mode (accessible via the switch in the bottom-right corner of the screen), which allows you to work in two windows simultaneously. It is currently experimental (beta). Future updates will include Code Interpreter and Canvas running in tabs.
|
6
|
+
|
7
|
+
- Fixed: Language switch.
|
8
|
+
|
3
9
|
## 2.4.38 (2024-12-08)
|
4
10
|
|
5
11
|
- Added the ability to select a style for chat display between: Blocks, ChatGPT-like, and ChatGPT-like Wide. New option in the menu: Config -> Theme -> Style...
|
README.md
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
[](https://snapcraft.io/pygpt)
|
4
4
|
|
5
|
-
Release: **2.4.
|
5
|
+
Release: **2.4.39** | build: **2024.12.09** | Python: **>=3.10, <3.12**
|
6
6
|
|
7
7
|
> Official website: https://pygpt.net | Documentation: https://pygpt.readthedocs.io
|
8
8
|
>
|
@@ -3873,6 +3873,12 @@ may consume additional tokens that are not displayed in the main window.
|
|
3873
3873
|
|
3874
3874
|
## Recent changes:
|
3875
3875
|
|
3876
|
+
**2.4.39 (2024-12-09)**
|
3877
|
+
|
3878
|
+
- Added "Split Screen" mode (accessible via the switch in the bottom-right corner of the screen), which allows you to work in two windows simultaneously. It is currently experimental (beta). Future updates will include Code Interpreter and Canvas running in tabs.
|
3879
|
+
|
3880
|
+
- Fixed: Language switch.
|
3881
|
+
|
3876
3882
|
**2.4.38 (2024-12-08)**
|
3877
3883
|
|
3878
3884
|
- Added the ability to select a style for chat display between: Blocks, ChatGPT-like, and ChatGPT-like Wide. New option in the menu: Config -> Theme -> Style...
|
pygpt_net/CHANGELOG.txt
CHANGED
@@ -1,3 +1,9 @@
|
|
1
|
+
2.4.39 (2024-12-09)
|
2
|
+
|
3
|
+
- Added "Split Screen" mode (accessible via the switch in the bottom-right corner of the screen), which allows you to work in two windows simultaneously. It is currently experimental (beta). Future updates will include Code Interpreter and Canvas running in tabs.
|
4
|
+
|
5
|
+
- Fixed: Language switch.
|
6
|
+
|
1
7
|
2.4.38 (2024-12-08)
|
2
8
|
|
3
9
|
- Added the ability to select a style for chat display between: Blocks, ChatGPT-like, and ChatGPT-like Wide. New option in the menu: Config -> Theme -> Style...
|
pygpt_net/__init__.py
CHANGED
@@ -13,8 +13,8 @@ __author__ = "Marcin Szczygliński"
|
|
13
13
|
__copyright__ = "Copyright 2024, Marcin Szczygliński"
|
14
14
|
__credits__ = ["Marcin Szczygliński"]
|
15
15
|
__license__ = "MIT"
|
16
|
-
__version__ = "2.4.
|
17
|
-
__build__ = "2024.12.
|
16
|
+
__version__ = "2.4.39"
|
17
|
+
__build__ = "2024.12.09"
|
18
18
|
__maintainer__ = "Marcin Szczygliński"
|
19
19
|
__github__ = "https://github.com/szczyglis-dev/py-gpt"
|
20
20
|
__website__ = "https://pygpt.net"
|
pygpt_net/controller/__init__.py
CHANGED
@@ -6,7 +6,7 @@
|
|
6
6
|
# GitHub: https://github.com/szczyglis-dev/py-gpt #
|
7
7
|
# MIT License #
|
8
8
|
# Created By : Marcin Szczygliński #
|
9
|
-
# Updated Date: 2024.
|
9
|
+
# Updated Date: 2024.12.09 00:00:00 #
|
10
10
|
# ================================================== #
|
11
11
|
|
12
12
|
from pygpt_net.controller.access import Access
|
@@ -116,6 +116,7 @@ class Controller:
|
|
116
116
|
self.calendar.setup() # after everything is loaded
|
117
117
|
self.painter.setup() # load previous image if exists
|
118
118
|
self.debug.post_setup() # post setup debug after all loaded
|
119
|
+
self.ui.tabs.restore_data() # restore opened tabs data
|
119
120
|
|
120
121
|
# show license terms dialog
|
121
122
|
if not self.window.core.config.get('license.accepted'):
|
@@ -168,6 +169,7 @@ class Controller:
|
|
168
169
|
# post-reload
|
169
170
|
self.ui.tabs.reload_after()
|
170
171
|
self.ctx.reload_after()
|
172
|
+
self.ui.tabs.restore_data() # restore opened tabs data
|
171
173
|
self.kernel.restart()
|
172
174
|
|
173
175
|
self.reloading = False # unlock
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# GitHub: https://github.com/szczyglis-dev/py-gpt #
|
7
7
|
# MIT License #
|
8
8
|
# Created By : Marcin Szczygliński #
|
9
|
-
# Updated Date: 2024.
|
9
|
+
# Updated Date: 2024.12.09 00:00:00 #
|
10
10
|
# ================================================== #
|
11
11
|
|
12
12
|
from pygpt_net.core.tabs.tab import Tab
|
@@ -48,6 +48,8 @@ class Calendar:
|
|
48
48
|
|
49
49
|
:param all: reload all notes
|
50
50
|
"""
|
51
|
+
if not self.is_loaded():
|
52
|
+
return
|
51
53
|
year = self.window.ui.calendar['select'].currentYear
|
52
54
|
month = self.window.ui.calendar['select'].currentMonth
|
53
55
|
self.on_page_changed(year, month, all=all) # load notes for current month
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# GitHub: https://github.com/szczyglis-dev/py-gpt #
|
7
7
|
# MIT License #
|
8
8
|
# Created By : Marcin Szczygliński #
|
9
|
-
# Updated Date: 2024.
|
9
|
+
# Updated Date: 2024.12.09 03:00:00 #
|
10
10
|
# ================================================== #
|
11
11
|
|
12
12
|
from PySide6.QtCore import Slot, QTimer
|
@@ -16,6 +16,7 @@ from pygpt_net.core.render.base import BaseRenderer
|
|
16
16
|
from pygpt_net.core.render.markdown.renderer import Renderer as MarkdownRenderer
|
17
17
|
from pygpt_net.core.render.plain.renderer import Renderer as PlainTextRenderer
|
18
18
|
from pygpt_net.core.render.web.renderer import Renderer as WebRenderer
|
19
|
+
from pygpt_net.core.tabs import Tab
|
19
20
|
from pygpt_net.core.text.utils import output_html2text, output_clean_html
|
20
21
|
from pygpt_net.item.ctx import CtxItem, CtxMeta
|
21
22
|
|
@@ -67,6 +68,7 @@ class Render:
|
|
67
68
|
append = data.get("append", False)
|
68
69
|
footer = data.get("footer", False)
|
69
70
|
initialized = data.get("initialized", False)
|
71
|
+
tab = data.get("tab")
|
70
72
|
|
71
73
|
if name == RenderEvent.BEGIN:
|
72
74
|
self.begin(meta, ctx, stream)
|
@@ -87,7 +89,7 @@ class Render:
|
|
87
89
|
self.stream_end(meta, ctx)
|
88
90
|
|
89
91
|
elif name == RenderEvent.ON_PAGE_LOAD:
|
90
|
-
self.on_page_loaded(meta)
|
92
|
+
self.on_page_loaded(meta, tab)
|
91
93
|
elif name ==RenderEvent.ON_THEME_CHANGE:
|
92
94
|
self.on_theme_change()
|
93
95
|
elif name == RenderEvent.ON_LOAD:
|
@@ -375,13 +377,14 @@ class Render:
|
|
375
377
|
self.instance().on_reply_submit(ctx)
|
376
378
|
self.update()
|
377
379
|
|
378
|
-
def on_page_loaded(self, meta: CtxMeta):
|
380
|
+
def on_page_loaded(self, meta: CtxMeta, tab: Tab = None):
|
379
381
|
"""
|
380
382
|
On page loaded callback
|
381
383
|
|
382
384
|
:param meta: context meta
|
385
|
+
:param tab: Tab
|
383
386
|
"""
|
384
|
-
self.instance().on_page_loaded(meta)
|
387
|
+
self.instance().on_page_loaded(meta, tab)
|
385
388
|
self.update()
|
386
389
|
|
387
390
|
def on_theme_change(self):
|
@@ -491,7 +494,7 @@ class Render:
|
|
491
494
|
if plain:
|
492
495
|
self.window.controller.theme.markdown.clear()
|
493
496
|
for pid in self.window.ui.nodes['output_plain']:
|
494
|
-
if self.window.ui.nodes['
|
497
|
+
if self.window.ui.nodes['output_plain'][pid] is not None:
|
495
498
|
self.window.ui.nodes['output'][pid].setVisible(False)
|
496
499
|
self.window.ui.nodes['output_plain'][pid].setVisible(True)
|
497
500
|
else:
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# GitHub: https://github.com/szczyglis-dev/py-gpt #
|
7
7
|
# MIT License #
|
8
8
|
# Created By : Marcin Szczygliński #
|
9
|
-
# Updated Date: 2024.
|
9
|
+
# Updated Date: 2024.12.09 00:00:00 #
|
10
10
|
# ================================================== #
|
11
11
|
|
12
12
|
from PySide6.QtCore import QModelIndex
|
@@ -60,20 +60,6 @@ class Ctx:
|
|
60
60
|
# if no ctx then get first ctx
|
61
61
|
self.window.core.ctx.set_current(self.window.core.ctx.get_first())
|
62
62
|
|
63
|
-
# restore previous ctx
|
64
|
-
# 1) try to load from tabs data - if not exists, load from current
|
65
|
-
tab = self.window.core.tabs.get_first_by_type(Tab.TAB_CHAT)
|
66
|
-
loaded = False
|
67
|
-
if tab is not None:
|
68
|
-
meta_id = tab.data_id
|
69
|
-
if meta_id is not None:
|
70
|
-
self.load(meta_id)
|
71
|
-
loaded = True
|
72
|
-
|
73
|
-
# 2) load from current if not loaded yet
|
74
|
-
if not loaded:
|
75
|
-
self.load(self.window.core.ctx.get_current())
|
76
|
-
|
77
63
|
# restore search string if exists
|
78
64
|
if self.window.core.config.has("ctx.search.string"):
|
79
65
|
string = self.window.core.config.get("ctx.search.string")
|
@@ -144,6 +130,19 @@ class Ctx:
|
|
144
130
|
# update additional context attachments
|
145
131
|
self.window.controller.chat.attachment.update()
|
146
132
|
|
133
|
+
def select_on_list_only(self, id: int):
|
134
|
+
"""
|
135
|
+
Select ctx by id only on list
|
136
|
+
|
137
|
+
:param id: context meta id
|
138
|
+
"""
|
139
|
+
self.window.core.ctx.select(id, restore_model=True)
|
140
|
+
self.window.core.ctx.set_current(id)
|
141
|
+
self.update_list(True)
|
142
|
+
self.select_by_current()
|
143
|
+
self.reload_config(all=False)
|
144
|
+
self.update()
|
145
|
+
|
147
146
|
def select_by_idx(self, idx: int):
|
148
147
|
"""
|
149
148
|
Select ctx by index
|
@@ -348,6 +347,21 @@ class Ctx:
|
|
348
347
|
event = RenderEvent(RenderEvent.ON_LOAD, data)
|
349
348
|
self.window.dispatch(event)
|
350
349
|
|
350
|
+
self.reload_config()
|
351
|
+
|
352
|
+
# reload ctx list and select current ctx on list, without reloading all
|
353
|
+
self.update(reload=False, all=True)
|
354
|
+
|
355
|
+
# update tab title
|
356
|
+
if meta is not None:
|
357
|
+
self.window.controller.ui.tabs.update_title_current(meta.name)
|
358
|
+
|
359
|
+
def reload_config(self, all: bool = True):
|
360
|
+
"""
|
361
|
+
Reload config
|
362
|
+
|
363
|
+
:param all: reload all
|
364
|
+
"""
|
351
365
|
# get current settings stored in ctx
|
352
366
|
thread = self.window.core.ctx.get_thread()
|
353
367
|
mode = self.window.core.ctx.get_mode()
|
@@ -358,8 +372,9 @@ class Ctx:
|
|
358
372
|
# restore thread from ctx
|
359
373
|
self.window.core.config.set('assistant_thread', thread)
|
360
374
|
|
361
|
-
|
362
|
-
|
375
|
+
if all:
|
376
|
+
# clear before output and append ctx to output
|
377
|
+
self.refresh_output()
|
363
378
|
|
364
379
|
# switch mode to ctx mode
|
365
380
|
if mode is not None:
|
@@ -384,16 +399,9 @@ class Ctx:
|
|
384
399
|
if model is not None and self.window.core.models.has_model(mode, model):
|
385
400
|
self.window.controller.model.set(mode, model)
|
386
401
|
|
387
|
-
# reload ctx list and select current ctx on list, without reloading all
|
388
|
-
self.update(reload=False, all=True)
|
389
|
-
|
390
402
|
# update current ctx label in UI
|
391
403
|
self.common.update_label(mode, assistant_id)
|
392
404
|
|
393
|
-
# update tab title
|
394
|
-
if meta is not None:
|
395
|
-
self.window.controller.ui.tabs.update_title_current(meta.name)
|
396
|
-
|
397
405
|
def update_ctx(self):
|
398
406
|
"""Update current ctx mode if allowed"""
|
399
407
|
mode = self.window.core.config.get('mode')
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# GitHub: https://github.com/szczyglis-dev/py-gpt #
|
7
7
|
# MIT License #
|
8
8
|
# Created By : Marcin Szczygliński #
|
9
|
-
# Updated Date: 2024.
|
9
|
+
# Updated Date: 2024.12.09 00:00:00 #
|
10
10
|
# ================================================== #
|
11
11
|
|
12
12
|
from PySide6.QtWidgets import QApplication
|
@@ -91,10 +91,11 @@ class Common:
|
|
91
91
|
|
92
92
|
def focus_chat(self):
|
93
93
|
"""Focus chat"""
|
94
|
+
tabs = self.window.ui.layout.get_active_tabs()
|
94
95
|
if self.window.controller.ui.tabs.get_current_type() != Tab.TAB_CHAT:
|
95
96
|
idx = self.window.core.tabs.get_min_idx_by_type(Tab.TAB_CHAT)
|
96
97
|
if idx is not None:
|
97
|
-
|
98
|
+
tabs.setCurrentIndex(idx)
|
98
99
|
|
99
100
|
def restore_display_filter(self):
|
100
101
|
"""Restore display filter"""
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# GitHub: https://github.com/szczyglis-dev/py-gpt #
|
7
7
|
# MIT License #
|
8
8
|
# Created By : Marcin Szczygliński #
|
9
|
-
# Updated Date: 2024.
|
9
|
+
# Updated Date: 2024.12.09 03:00:00 #
|
10
10
|
# ================================================== #
|
11
11
|
|
12
12
|
class Confirm:
|
@@ -154,7 +154,7 @@ class Confirm:
|
|
154
154
|
|
155
155
|
# tab close all
|
156
156
|
elif type == 'tab.close_all':
|
157
|
-
self.window.controller.ui.tabs.close_all(id, True) # by type
|
157
|
+
self.window.controller.ui.tabs.close_all(id, 0, True) # by type
|
158
158
|
|
159
159
|
# editor
|
160
160
|
elif type == 'editor.changed.clear':
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# GitHub: https://github.com/szczyglis-dev/py-gpt #
|
7
7
|
# MIT License #
|
8
8
|
# Created By : Marcin Szczygliński #
|
9
|
-
# Updated Date: 2024.
|
9
|
+
# Updated Date: 2024.12.09 00:00:00 #
|
10
10
|
# ================================================== #
|
11
11
|
|
12
12
|
from PySide6.QtCore import Qt
|
@@ -37,12 +37,7 @@ class Custom:
|
|
37
37
|
|
38
38
|
def apply(self):
|
39
39
|
"""Apply custom mappings"""
|
40
|
-
|
41
|
-
# self.window.ui.tabs['output'].setTabText(0, trans('output.tab.chat'))
|
42
|
-
# self.window.ui.tabs['output'].setTabText(1, trans('output.tab.files'))
|
43
|
-
# self.window.ui.tabs['output'].setTabText(2, trans('output.tab.calendar'))
|
44
|
-
# self.window.ui.tabs['output'].setTabText(3, trans('output.tab.painter'))
|
45
|
-
|
40
|
+
|
46
41
|
# tool: indexer
|
47
42
|
self.window.ui.tabs['tool.indexer'].setTabText(0, trans('tool.indexer.tab.files'))
|
48
43
|
self.window.ui.tabs['tool.indexer'].setTabText(1, trans('tool.indexer.tab.web'))
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# GitHub: https://github.com/szczyglis-dev/py-gpt #
|
7
7
|
# MIT License #
|
8
8
|
# Created By : Marcin Szczygliński #
|
9
|
-
# Updated Date: 2024.12.
|
9
|
+
# Updated Date: 2024.12.09 03:00:00 #
|
10
10
|
# ================================================== #
|
11
11
|
|
12
12
|
from pygpt_net.utils import trans
|
@@ -332,6 +332,7 @@ class Mapping:
|
|
332
332
|
menu_title['theme.light'] = 'menu.theme.light'
|
333
333
|
menu_title['theme.syntax'] = 'menu.theme.syntax'
|
334
334
|
menu_title['theme.density'] = 'menu.theme.density'
|
335
|
+
menu_title['theme.style'] = 'menu.theme.style'
|
335
336
|
menu_title['menu.plugins'] = 'menu.plugins'
|
336
337
|
menu_title['menu.plugins.presets'] = 'menu.plugins.presets'
|
337
338
|
menu_title['menu.about'] = 'menu.info'
|
@@ -357,7 +358,6 @@ class Mapping:
|
|
357
358
|
menu_text['config.profile.new'] = 'menu.config.profile.new'
|
358
359
|
menu_text['config.save'] = 'menu.config.save'
|
359
360
|
menu_text['theme.tooltips'] = 'menu.theme.tooltips'
|
360
|
-
menu_text['theme.style'] = 'menu.theme.style'
|
361
361
|
menu_text['theme.settings'] = 'menu.theme.settings'
|
362
362
|
menu_text['plugins.presets.new'] = 'menu.plugins.presets.new'
|
363
363
|
menu_text['plugins.presets.edit'] = 'menu.plugins.presets.edit'
|
pygpt_net/controller/layout.py
CHANGED
@@ -6,7 +6,7 @@
|
|
6
6
|
# GitHub: https://github.com/szczyglis-dev/py-gpt #
|
7
7
|
# MIT License #
|
8
8
|
# Created By : Marcin Szczygliński #
|
9
|
-
# Updated Date: 2024.
|
9
|
+
# Updated Date: 2024.12.09 03:00:00 #
|
10
10
|
# ================================================== #
|
11
11
|
|
12
12
|
import os
|
@@ -26,7 +26,7 @@ class Layout:
|
|
26
26
|
"""
|
27
27
|
self.window = window
|
28
28
|
# self.splitters = ["main", "main.output", "toolbox", "toolbox.mode", "toolbox.presets"]
|
29
|
-
self.splitters = ["main", "main.output", "toolbox", "toolbox.mode", "calendar", "interpreter", "interpreter.columns"]
|
29
|
+
self.splitters = ["main", "main.output", "toolbox", "toolbox.mode", "calendar", "interpreter", "interpreter.columns", "columns"]
|
30
30
|
self.text_nodes = ["input"]
|
31
31
|
|
32
32
|
def setup(self):
|
pygpt_net/controller/notepad.py
CHANGED
@@ -6,7 +6,7 @@
|
|
6
6
|
# GitHub: https://github.com/szczyglis-dev/py-gpt #
|
7
7
|
# MIT License #
|
8
8
|
# Created By : Marcin Szczygliński #
|
9
|
-
# Updated Date: 2024.
|
9
|
+
# Updated Date: 2024.12.09 00:00:00 #
|
10
10
|
# ================================================== #
|
11
11
|
|
12
12
|
from PySide6.QtGui import QTextCursor
|
@@ -183,10 +183,11 @@ class Notepad:
|
|
183
183
|
return
|
184
184
|
|
185
185
|
# switch to first notepad tab if current tab is not notepad
|
186
|
+
tabs = self.window.ui.layout.get_active_tabs()
|
186
187
|
if self.window.controller.ui.tabs.get_current_type() != Tab.TAB_NOTEPAD:
|
187
188
|
idx = self.window.core.tabs.get_min_idx_by_type(Tab.TAB_NOTEPAD)
|
188
189
|
if idx is not None:
|
189
|
-
|
190
|
+
tabs.setCurrentIndex(idx)
|
190
191
|
|
191
192
|
self.window.activateWindow() # focus
|
192
193
|
|
@@ -209,11 +210,12 @@ class Notepad:
|
|
209
210
|
"""
|
210
211
|
if idx is None:
|
211
212
|
idx = self.get_first_notepad_tab_idx()
|
213
|
+
tabs = self.window.ui.layout.get_active_tabs()
|
212
214
|
tab = self.window.core.tabs.get_tab_by_index(idx)
|
213
215
|
if tab is not None:
|
214
|
-
|
216
|
+
tabs.setCurrentIndex(idx)
|
215
217
|
else:
|
216
|
-
|
218
|
+
tabs.setCurrentIndex(self.get_first_notepad_tab_idx())
|
217
219
|
|
218
220
|
def get_first_notepad_tab_idx(self) -> int:
|
219
221
|
"""
|
@@ -257,11 +259,12 @@ class Notepad:
|
|
257
259
|
return True
|
258
260
|
return False
|
259
261
|
|
260
|
-
def on_open(self, tab_idx: int):
|
262
|
+
def on_open(self, tab_idx: int, column_idx: int = 0):
|
261
263
|
"""
|
262
264
|
On open notepad tab
|
263
265
|
|
264
266
|
:param tab_idx: current tab idx
|
267
|
+
:param column_idx: column idx
|
265
268
|
"""
|
266
269
|
tab = self.window.controller.ui.tabs.get_current_tab()
|
267
270
|
if tab is None:
|