Add file deletion detection, WebKit improvements, and bug fixes

- Add FileExternallyDeletedEvent with UI indicator in tabs for deleted files
- Set minimum height (300px) for editors container
- Add Developer Tools to WebKit context menu
- Fix DnD URI handling when uris list is empty
- Fix buffer replacement using freeze_notify and proper bounds handling
- Move webkit_ui_settings to new path
- Remove <change_me> placeholders from APP_NAME and user config
This commit is contained in:
2026-02-23 00:48:09 -06:00
parent 7c7e88aaed
commit 824dd93696
17 changed files with 123 additions and 27 deletions

View File

@@ -43,7 +43,7 @@ def call_chain_wrapper(fn):
# NOTE: Just reminding myself we can add to builtins two different ways...
# __builtins__.update({"event_system": Builtins()})
builtins.APP_NAME = "<change_me>"
builtins.APP_NAME = "<change_me>".replace("<","").replace(">","")
builtins.keybindings = Keybindings()
builtins.event_system = EventSystem()

View File

@@ -26,6 +26,7 @@ class EditorsContainer(Gtk.Paned):
self.ctx = self.get_style_context()
self.ctx.add_class("paned-editors-container")
self.set_size_request(-1, 300)
self.set_hexpand(True)
self.set_vexpand(True)
self.set_wide_handle(True)

View File

@@ -27,4 +27,5 @@ def execute(
)
view.set_buffer(file.buffer)
update_info_bar_if_focused(view.command, view)

View File

@@ -31,6 +31,8 @@ class TabsController(ControllerBase):
self.update_tab_label(event)
elif isinstance(event, Code_Event_Types.ModifiedChangedEvent):
self.tabs_widget.modified_changed( event.buffer )
elif isinstance(event, Code_Event_Types.FileExternallyDeletedEvent):
self.tabs_widget.externally_deleted( event.buffer )
elif isinstance(event, Code_Event_Types.AddedNewFileEvent):
self.add_tab(event)
elif isinstance(event, Code_Event_Types.PoppedFileEvent):

View File

@@ -26,7 +26,7 @@ class SourceViewDnDMixin:
if info == 80:
uris = data.get_uris()
if not uris: return
if not uris:
uris = data.get_text().split("\n")
self._on_uri_data_received(uris)

View File

@@ -27,6 +27,7 @@ class SourceFile(GtkSource.File):
self.fname: str = "buffer"
self.fpath: str = "buffer"
self.ftype: str = "buffer"
self.was_deleted: bool = False
self.buffer: SourceBuffer = SourceBuffer()
self._set_signals()
@@ -56,16 +57,21 @@ class SourceFile(GtkSource.File):
self.emit(event)
if self.is_deleted():
print("is_deleted")
# event = Event_Factory.create_event("file_deleted", buffer = buffer)
# event.file = self
# self.emit(event)
self.was_deleted = True
event = Event_Factory.create_event(
"file_externally_deleted",
file = self,
buffer = buffer
)
self.emit(event)
return
if self.is_externally_modified():
print("is_externally_modified")
# event = Event_Factory.create_event("file_externally_modified", buffer = buffer)
# event.file = self
# event = Event_Factory.create_event(
# "file_externally_modified",
# file = self,
# buffer = buffer
# )
# self.emit(event)
return
@@ -128,6 +134,12 @@ class SourceFile(GtkSource.File):
f.write(text)
if self.was_deleted:
self.was_deleted = False
# self.set_path(gfile)
self.set_location( None )
self.set_location( gfile )
return gfile
@@ -135,11 +147,22 @@ class SourceFile(GtkSource.File):
if not gfile: return
self.set_path(gfile)
data = gfile.load_bytes()[0].get_data().decode("UTF-8")
text = gfile.load_bytes()[0].get_data().decode("UTF-8")
undo_manager = self.buffer.get_undo_manager()
def move_insert_to_start():
start_itr = self.buffer.get_start_iter()
self.buffer.place_cursor(start_itr)
undo_manager.begin_not_undoable_action()
self.buffer.insert_at_cursor(data)
with self.buffer.freeze_notify():
start_itr, end_itr = self.buffer.get_bounds()
self.buffer.delete(start_itr, end_itr)
self.buffer.insert(start_itr, text, -1)
GLib.idle_add(move_insert_to_start)
undo_manager.end_not_undoable_action()
self.buffer.set_modified(False)

View File

@@ -122,11 +122,19 @@ class TabsWidget(Gtk.Notebook):
if not buffer == tab.file.buffer: continue
ctx = tab.label.get_style_context()
ctx.remove_class("file-deleted")
if buffer.get_modified():
ctx.add_class("file-changed")
else:
ctx.remove_class("file-changed")
def externally_deleted(self, buffer):
for page_widget in self.get_children():
tab = self.get_tab_label(page_widget)
if not buffer == tab.file.buffer: continue
ctx = tab.label.get_style_context()
ctx.add_class("file-deleted")
def close_item(self, menu_item, page_widget):
tab = self.get_tab_label(page_widget)
tab.close_bttn.clicked()

View File

@@ -1,4 +1,5 @@
# Python imports
from pathlib import Path
import json
# Lib imports
@@ -6,10 +7,12 @@ import gi
gi.require_version('Gdk', '3.0')
gi.require_version('WebKit2', '4.0')
from gi.repository import Gdk
from gi.repository import Gtk
from gi.repository import Gio
from gi.repository import WebKit2
# Application imports
from libs.settings.other.webkit_ui_settings import WebkitUISettings
from libs.settings.webkit.webkit_ui_settings import WebkitUISettings
from libs.dto.base_event import BaseEvent
@@ -17,7 +20,9 @@ class WebkitUI(WebKit2.WebView):
def __init__(self):
super(WebkitUI, self).__init__()
self._load_settings()
self._setup_styling()
self._setup_signals()
self._subscribe_to_events()
self._setup_content_manager()
@@ -29,6 +34,9 @@ class WebkitUI(WebKit2.WebView):
self.set_hexpand(True)
self.set_background_color( Gdk.RGBA(0, 0, 0, 0.0) )
def _setup_signals(self):
self.connect("context-menu", self._on_context_menu)
def _subscribe_to_events(self):
event_system.subscribe(f"ui-message", self.ui_message)
@@ -50,6 +58,18 @@ class WebkitUI(WebKit2.WebView):
except Exception as e:
logger.info(e)
def _on_context_menu(self, web_view, context_menu, event, hit_test_result):
action = Gio.SimpleAction.new("Developer Tools", None)
item = WebKit2.ContextMenuItem.new_from_gaction(action, "Developer Tools")
def show_developer_tools(action, parameter):
inspector = self.get_inspector()
inspector.show()
action.connect("activate", show_developer_tools)
context_menu.append(item)
def load_url(self, url: str = ""):
if not url:
url = "https://duckduckgo.com/"
@@ -60,11 +80,21 @@ class WebkitUI(WebKit2.WebView):
if not path:
path = settings_manager.path_manager.get_context_path()
data = None
with open(f"{path}/index.html", "r") as f:
data = f.read()
base_path = Path(path)
index_file = base_path / "index.html"
self.load_html(content = data, base_uri = f"file://{path}")
if not index_file.exists():
raise FileNotFoundError(f"index.html not found in {base_path}")
try:
data = index_file.read_text(encoding = "utf-8")
except Exception as e:
raise RuntimeError(f"Failed to read {index_file}: {e}")
self.load_html(
content = data,
base_uri = index_file.as_uri()
)
def ui_message(self, message, mtype):
command = f"displayMessage('{message}', '{mtype}', '3')"

View File

@@ -6,6 +6,8 @@
from .code_event import CodeEvent
from .register_provider_event import RegisterProviderEvent
from .register_command_event import RegisterCommandEvent
from .file_externally_modified_event import FileExternallyModifiedEvent
from .file_externally_deleted_event import FileExternallyDeletedEvent
from .get_new_command_system_event import GetNewCommandSystemEvent
from .request_completion_event import RequestCompletionEvent

View File

@@ -0,0 +1,13 @@
# Python imports
from dataclasses import dataclass, field
# Lib imports
# Application imports
from .code_event import CodeEvent
@dataclass
class FileExternallyDeletedEvent(CodeEvent):
...

View File

@@ -0,0 +1,13 @@
# Python imports
from dataclasses import dataclass, field
# Lib imports
# Application imports
from .code_event import CodeEvent
@dataclass
class FileExternallyModifiedEvent(CodeEvent):
...

View File

@@ -95,7 +95,7 @@ class WebkitUISettings(WebKit2.Settings):
self.set_property('javascript-can-open-windows-automatically', False)
# Debugging
self.set_property('enable-developer-extras', False)
self.set_property('enable-developer-extras', True)
self.set_property('enable-write-console-messages-to-stdout', False)
self.set_property('draw-compositing-indicators', False)
self.set_property('enable-mock-capture-devices', False)

View File

@@ -3,6 +3,9 @@
<head>
<meta charset="utf-8">
<title>Gtk + HTML + Python App</title>
<!-- <base href="/"> -->
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="resources/css/libs/bootstrap5/bootstrap.min.css">
<link rel="stylesheet" href="resources/css/libs/bootstrap-icons/bootstrap-icons.css">

View File

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB