Skip to content

window: Get rid of the main stack #38

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.

Sign up for GitHub

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

Draft
kra-mo wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

window: Get rid of the main stack #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions openemail/_property.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# SPDX-FileCopyrightText: Copyright 2025 OpenEmail SA
# SPDX-FileContributor: kramo

from collections.abc import Callable
from typing import Any

from gi.repository import Gio, GObject
Expand All @@ -29,6 +30,9 @@ def bind(
target: GObject.Object,
target_property: str | None = None,
/,
transform_to: Callable[..., Any] | None = None,
transform_from: Callable[..., Any] | None = None,
user_data: Any | None = None, # noqa: ANN401
*,
bidirectional: bool = False,
) -> GObject.Binding:
Expand All @@ -42,6 +46,9 @@ def bind(
target_property or source_property,
GObject.BindingFlags.SYNC_CREATE
| (GObject.BindingFlags.BIDIRECTIONAL if bidirectional else 0),
transform_to,
transform_from,
user_data,
)

@staticmethod
Expand Down
98 changes: 50 additions & 48 deletions openemail/gtk/contacts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
from openemail.store import DictStore, People

from .form import Form
from .page import Page

# from .page import Page
from .profile_view import ProfileView

if TYPE_CHECKING:
Expand Down Expand Up @@ -74,50 +75,51 @@ def _show_context_menu(self, _gesture, _n_press: int, x: float, y: float):
self.context_menu.popup()


@Gtk.Template.from_resource(f"{PREFIX}/contacts.ui")
class Contacts(Adw.NavigationPage):
"""A page with the contents of the user's address book."""

__gtype_name__ = __qualname__

page: Page = child

add_contact_dialog: Adw.AlertDialog = child
remove_contact_dialog: Adw.AlertDialog = child
address: Adw.EntryRow = child
address_form: Form = child

counter = Property(int)

def __init__(self, **kwargs: Any):
super().__init__(**kwargs)

self.insert_action_group("contacts", group := Gio.SimpleActionGroup())
group.add_action_entries((
(
"remove",
lambda _action, address, _data: tasks.create(
self._remove_contact(address.get_string())
),
"s",
),
))

async def _remove_contact(self, address: str):
response = await cast("Awaitable[str]", self.remove_contact_dialog.choose(self))
if response == "remove":
await store.address_book.delete(Address(address))

@Gtk.Template.Callback()
def _new_contact(self, *_args):
self.address_form.reset()
self.add_contact_dialog.present(self)

@Gtk.Template.Callback()
def _add_contact(self, *_args):
with suppress(ValueError):
tasks.create(store.address_book.new(Address(self.address.props.text)))

@Gtk.Template.Callback()
def _on_selected(self, selection: Gtk.SingleSelection, *_args):
self.page.split_view.props.show_content = bool(selection.props.selected_item)
#
# @Gtk.Template.from_resource(f"{PREFIX}/contacts.ui")
# class Contacts(Adw.NavigationPage):
# """A page with the contents of the user's address book."""
#
# __gtype_name__ = __qualname__
#
# page: Page = child
#
# add_contact_dialog: Adw.AlertDialog = child
# remove_contact_dialog: Adw.AlertDialog = child
# address: Adw.EntryRow = child
# address_form: Form = child
#
# counter = Property(int)
#
# def __init__(self, **kwargs: Any):
# super().__init__(**kwargs)
#
# self.insert_action_group("contacts", group := Gio.SimpleActionGroup())
# group.add_action_entries((
# (
# "remove",
# lambda _action, address, _data: tasks.create(
# self._remove_contact(address.get_string())
# ),
# "s",
# ),
# ))
#
# async def _remove_contact(self, address: str):
# response = await cast("Awaitable[str]", self.remove_contact_dialog.choose(self))
# if response == "remove":
# await store.address_book.delete(Address(address))
#
# @Gtk.Template.Callback()
# def _new_contact(self, *_args):
# self.address_form.reset()
# self.add_contact_dialog.present(self)
#
# @Gtk.Template.Callback()
# def _add_contact(self, *_args):
# with suppress(ValueError):
# tasks.create(store.address_book.new(Address(self.address.props.text)))
#
# @Gtk.Template.Callback()
# def _on_selected(self, selection: Gtk.SingleSelection, *_args):
# self.page.split_view.props.show_content = bool(selection.props.selected_item)
239 changes: 48 additions & 191 deletions openemail/gtk/messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,17 @@
# SPDX-FileCopyrightText: Copyright 2025 OpenEmail SA
# SPDX-FileContributor: kramo

from typing import Any, override
from typing import Any

from gi.repository import Adw, Gdk, Gio, GLib, GObject, Gtk
from gi.repository import Gdk, Gio, GLib, GObject, Gtk

from openemail import PREFIX, Property, store
from openemail import PREFIX, Property
from openemail.message import Message
from openemail.store import DictStore

from .page import Page
# from .page import Page
from .thread_view import ThreadView

for t in Page, ThreadView:
for t in (ThreadView,):
GObject.type_ensure(t)


Expand Down Expand Up @@ -65,188 +64,46 @@ def _show_context_menu(self, _gesture, _n_press: int, x: float, y: float):
self.context_menu.popup()


class _Messages(Adw.NavigationPage):
counter = Property(int)

_count_unread = False

def __init__(
self,
model: Gio.ListModel,
/,
*,
title: str,
subtitle: str = "",
**kwargs: Any,
):
super().__init__(**kwargs)

self.builder = Gtk.Builder.new_from_resource(f"{PREFIX}/messages.ui")

self.trashed: Gtk.BoolFilter = self._get_object("trashed")
store.settings.connect("changed::trashed-messages", self._on_trash_changed)

self._get_object("sort_model").props.model = model
self.thread_view: ThreadView = self._get_object("thread_view")

self.page: Page = self._get_object("page")
self.page.title = self.props.title = title
self.page.subtitle = subtitle
self.page.model.connect("notify::selected", self._on_selected)

self.props.child = self.page

if not self._count_unread:
return

unread: Gtk.FilterListModel = self._get_object("unread")
unread.bind_property(
"n-items", self, "counter", GObject.BindingFlags.SYNC_CREATE
)

unread_filter = self._get_object("unread_filter")
store.settings.connect(
"changed::unread-messages",
lambda *_: unread_filter.changed(Gtk.FilterChange.DIFFERENT),
)

def _get_object(self, name: str) -> Any: # noqa: ANN401
return self.builder.get_object(name)

def _on_trash_changed(self, *_args):
props.autoselect = (props := self.page.model.props).selected != GLib.MAXUINT
self.trashed.changed(Gtk.FilterChange.DIFFERENT)
props.autoselect = False

def _on_selected(self, selection: Gtk.SingleSelection, *_args):
if (msg := selection.props.selected_item) and not isinstance(msg, Message):
return

self.thread_view.message = msg
if isinstance(msg, Message):
msg.unread = False
self.page.split_view.props.show_content = True


class _Folder(_Messages):
folder: DictStore[str, Message]
title: str
subtitle: str = ""

def __init__(self, **kwargs: Any):
super().__init__(
self.folder,
title=self.title,
subtitle=self.subtitle,
**kwargs,
)

self.page.toolbar_button = self._get_object("toolbar_new")
self.page.empty_page = self._get_object("no_messages")

Property.bind(self.page.model, "selected-item", self.thread_view, "message")
Property.bind(self.folder, "updating", self.page, "loading")


class Inbox(_Folder):
"""A navigation page displaying the user's inbox."""

__gtype_name__ = __qualname__
folder, title = store.inbox, _("Inbox")

_count_unread = True


class Outbox(_Folder):
"""A navigation page displaying the user's outbox."""

__gtype_name__ = __qualname__
folder, title, subtitle = store.outbox, _("Outbox"), _("Can be discarded")


class Sent(_Folder):
"""A navigation page displaying the user's sent messages."""

__gtype_name__ = __qualname__
folder, title, subtitle = store.sent, _("Sent"), _("From this device")


class Drafts(_Messages):
"""A navigation page displaying the user's drafts."""

__gtype_name__ = __qualname__

@override
@Property(int)
def counter(self) -> int:
return len(store.drafts)

def __init__(self, **kwargs: Any):
super().__init__(store.drafts, title=_("Drafts"), **kwargs)

self.page.model.props.can_unselect = True

delete_dialog: Adw.AlertDialog = self._get_object("delete_dialog")
delete_dialog.connect("response::delete", lambda *_: store.drafts.delete_all())

delete_button: Gtk.Button = self._get_object("delete_button")
delete_button.connect("clicked", lambda *_: delete_dialog.present(self))
self.page.toolbar_button = delete_button

self.page.empty_page = self._get_object("no_drafts")
Property.bind(self.page.model, "n-items", delete_button, "sensitive")

store.drafts.connect("items-changed", lambda *_: self.notify("counter"))

def _on_selected(self, selection: Gtk.SingleSelection, *_args):
if isinstance(msg := selection.props.selected_item, Message):
selection.unselect_all()
self.activate_action(
"compose.draft", GLib.Variant.new_string(msg.unique_id)
)


class Trash(_Messages):
"""A navigation page displaying the user's trash folder."""

__gtype_name__ = __qualname__

model = store.flatten(store.inbox, store.sent, store.broadcasts)

_count_unread = True

def __init__(self, **kwargs: Any):
super().__init__(
self.model,
title=_("Trash"),
subtitle=_("On this device"),
**kwargs,
)

self.trashed.props.invert = False

empty_dialog: Adw.AlertDialog = self._get_object("empty_dialog")
empty_dialog.connect("response::empty", lambda *_: store.empty_trash())

empty_button: Gtk.Button = self._get_object("empty_button")
empty_button.connect("clicked", lambda *_: empty_dialog.present(self))
self.page.toolbar_button = empty_button

self.page.empty_page = self._get_object("empty_trash")
Property.bind(self.page.model, "selected-item", self.thread_view, "message")
Property.bind(self.page.model, "n-items", empty_button, "sensitive")

def set_loading(*_args):
self.page.loading = store.inbox.updating or store.broadcasts.updating

store.inbox.connect("notify::updating", set_loading)
store.broadcasts.connect("notify::updating", set_loading)


class Broadcasts(_Folder):
"""A navigation page displaying the user's broadcasts folder."""

__gtype_name__ = __qualname__
folder, title = store.broadcasts, _("Public")

_count_unread = True
# Property.bind(self.folder, "updating", self.page, "loading")

# class Drafts(_Messages):
# def __init__(self, **kwargs: Any):
# self.page.model.props.can_unselect = True
#
# delete_dialog: Adw.AlertDialog = self._get_object("delete_dialog")
# delete_dialog.connect(
# "response::delete", lambda *_: store.drafts.delete_all()
# )
#
# delete_button: Gtk.Button = self._get_object("delete_button")
# delete_button.connect("clicked", lambda *_: delete_dialog.present(self))
# self.page.toolbar_button = delete_button
#
# self.page.empty_page = self._get_object("no_drafts")
# Property.bind(self.page.model, "n-items", delete_button, "sensitive")
#
# def _on_selected(self, selection: Gtk.SingleSelection, *_args):
# if isinstance(msg := selection.props.selected_item, Message):
# selection.unselect_all()
# self.activate_action(
# "compose.draft", GLib.Variant.new_string(msg.unique_id)
# )

# class Trash(_Messages):
# def __init__(self, **kwargs: Any):
# empty_dialog: Adw.AlertDialog = self._get_object("empty_dialog")
# empty_dialog.connect("response::empty", lambda *_: store.empty_trash())
#
# empty_button: Gtk.Button = self._get_object("empty_button")
# empty_button.connect("clicked", lambda *_: empty_dialog.present(self))
# self.page.toolbar_button = empty_button
#
# self.page.empty_page = self._get_object("empty_trash")
# Property.bind(self.page.model, "selected-item", self.thread_view, "message")
# Property.bind(self.page.model, "n-items", empty_button, "sensitive")
#
# def set_loading(*_args):
# self.page.loading = store.inbox.updating or store.broadcasts.updating
#
# store.inbox.connect("notify::updating", set_loading)
# store.broadcasts.connect("notify::updating", set_loading)
Loading