colin/gnome-calls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main-window: Adapt to View Switcher API Changes

Browse Source 
https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/migrating-libhandy-1-4-to-libadwaita.html#adapt-to-view-switcher-api-changes

Part-of: <https://gitlab.gnome.org/GNOME/calls/-/merge_requests/714>
This commit is contained in:
Anton Lazarev
2023-12-16 13:40:55 -08:00
parent b73016ac8c
commit 1b567131b7
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/calls-main-window.c
View File

@@ -49,7 +49,7 @@ struct _CallsMainWindow {
CallsInAppNotification *in_app_notification; CallsInAppNotification *in_app_notification;
AdwViewSwitcherTitle *title_switcher; AdwViewSwitcherTitle *title_switcher;
GtkStack *main_stack; AdwViewStack *main_stack;
GtkRevealer *permanent_error_revealer; GtkRevealer *permanent_error_revealer;
GtkLabel *permanent_error_label; GtkLabel *permanent_error_label;
@@ -328,7 +328,7 @@ constructed (GObject *object)
{ {
CallsMainWindow *self = CALLS_MAIN_WINDOW (object); CallsMainWindow *self = CALLS_MAIN_WINDOW (object);
GSimpleActionGroup *simple_action_group; GSimpleActionGroup *simple_action_group;
GtkStackPage *page; AdwViewStackPage *page;
GtkWidget *widget; GtkWidget *widget;
CallsHistoryBox *history; CallsHistoryBox *history;
@@ -354,29 +354,29 @@ constructed (GObject *object)
// Add call records // Add call records
history = calls_history_box_new (self->record_store); history = calls_history_box_new (self->record_store);
widget = GTK_WIDGET (history); widget = GTK_WIDGET (history);
gtk_stack_add_titled (self->main_stack, widget, adw_view_stack_add_titled (self->main_stack, widget,
/* Recent as in "Recent calls" (the call history) */ /* Recent as in "Recent calls" (the call history) */
"recent", _("Recent")); "recent", _("Recent"));
page = gtk_stack_get_page (self->main_stack, widget); page = adw_view_stack_get_page (self->main_stack, widget);
gtk_stack_page_set_icon_name (page, "document-open-recent-symbolic"); adw_view_stack_page_set_icon_name (page, "document-open-recent-symbolic");
gtk_widget_set_visible (widget, TRUE); gtk_widget_set_visible (widget, TRUE);
gtk_stack_set_visible_child_name (self->main_stack, "recent"); adw_view_stack_set_visible_child_name (self->main_stack, "recent");
// Add contacts box // Add contacts box
widget = calls_contacts_box_new (); widget = calls_contacts_box_new ();
gtk_stack_add_titled (self->main_stack, widget, adw_view_stack_add_titled (self->main_stack, widget,
"contacts", _("Contacts")); "contacts", _("Contacts"));
page = gtk_stack_get_page (self->main_stack, widget); page = adw_view_stack_get_page (self->main_stack, widget);
gtk_stack_page_set_icon_name (page, "system-users-symbolic"); adw_view_stack_page_set_icon_name (page, "system-users-symbolic");
gtk_widget_set_visible (widget, TRUE); gtk_widget_set_visible (widget, TRUE);
// Add new call box // Add new call box
self->new_call = calls_new_call_box_new (); self->new_call = calls_new_call_box_new ();
widget = GTK_WIDGET (self->new_call); widget = GTK_WIDGET (self->new_call);
gtk_stack_add_titled (self->main_stack, widget, adw_view_stack_add_titled (self->main_stack, widget,
"dial-pad", _("Dial Pad")); "dial-pad", _("Dial Pad"));
page = gtk_stack_get_page (self->main_stack, widget); page = adw_view_stack_get_page (self->main_stack, widget);
gtk_stack_page_set_icon_name (page, "input-dialpad-symbolic"); adw_view_stack_page_set_icon_name (page, "input-dialpad-symbolic");
// Add actions // Add actions
simple_action_group = g_simple_action_group_new (); simple_action_group = g_simple_action_group_new ();

2
src/ui/main-window.ui
View File

@@ -64,7 +64,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkStack" id="main_stack"> <object class="AdwViewStack" id="main_stack">
<property name="vhomogeneous">False</property> <property name="vhomogeneous">False</property>
<property name="hhomogeneous">False</property> <property name="hhomogeneous">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>