diff options
author | Felipe Kinoshita <kinofhek@gmail.com> | 2023-03-03 18:15:07 -0300 |
---|---|---|
committer | Felipe Kinoshita <kinofhek@gmail.com> | 2023-03-03 19:14:09 -0300 |
commit | 2805b414f88108bba589026c482aa9ed8dfa96cd (patch) | |
tree | dca664611f176ff9430456de2d1fea9cf4ea3d8a | |
parent | 69728fc814b983bc4b149904fea95ba5745da536 (diff) | |
download | gnome-calendar-2805b414f88108bba589026c482aa9ed8dfa96cd.tar.gz |
general: Use gtk_widget_set_visible
A lot of places were using gtk_widget_show/gtk_widget_hide, but those
methods are deprecated since Gtk 4.10.
Let's use gtk_widget_set_visible instead.
-rw-r--r-- | src/gui/calendar-management/gcal-calendar-management-dialog.c | 2 | ||||
-rw-r--r-- | src/gui/calendar-management/gcal-file-chooser-button.c | 2 | ||||
-rw-r--r-- | src/gui/event-editor/gcal-date-chooser.c | 2 | ||||
-rw-r--r-- | src/gui/event-editor/gcal-event-editor-dialog.c | 2 | ||||
-rw-r--r-- | src/gui/event-editor/gcal-multi-choice.c | 6 | ||||
-rw-r--r-- | src/gui/event-editor/gcal-schedule-section.c | 6 | ||||
-rw-r--r-- | src/gui/gcal-application.c | 2 | ||||
-rw-r--r-- | src/gui/gcal-event-popover.c | 4 | ||||
-rw-r--r-- | src/gui/gcal-quick-add-popover.c | 4 | ||||
-rw-r--r-- | src/gui/gcal-search-hit-row.c | 2 | ||||
-rw-r--r-- | src/gui/gcal-window.c | 30 | ||||
-rw-r--r-- | src/gui/importer/gcal-import-dialog.c | 4 | ||||
-rw-r--r-- | src/gui/views/gcal-month-popover.c | 4 | ||||
-rw-r--r-- | src/gui/views/gcal-week-header.c | 4 | ||||
-rw-r--r-- | src/utils/gcal-utils.c | 2 |
15 files changed, 44 insertions, 32 deletions
diff --git a/src/gui/calendar-management/gcal-calendar-management-dialog.c b/src/gui/calendar-management/gcal-calendar-management-dialog.c index fc11f384..dadb1a2d 100644 --- a/src/gui/calendar-management/gcal-calendar-management-dialog.c +++ b/src/gui/calendar-management/gcal-calendar-management-dialog.c @@ -144,7 +144,7 @@ setup_context (GcalCalendarManagementDialog *self) page = g_object_new (pages[i].gtype, "context", self->context, NULL); - gtk_widget_show (GTK_WIDGET (page)); + gtk_widget_set_visible (GTK_WIDGET (page), TRUE); gtk_stack_add_titled (GTK_STACK (self->stack), GTK_WIDGET (page), diff --git a/src/gui/calendar-management/gcal-file-chooser-button.c b/src/gui/calendar-management/gcal-file-chooser-button.c index bad14f57..6723a00d 100644 --- a/src/gui/calendar-management/gcal-file-chooser-button.c +++ b/src/gui/calendar-management/gcal-file-chooser-button.c @@ -75,7 +75,7 @@ on_filechooser_dialog_response_cb (GtkFileChooser *filechooser, gcal_file_chooser_button_set_file (self, file); } - gtk_widget_hide (GTK_WIDGET (filechooser)); + gtk_widget_set_visible (GTK_WIDGET (filechooser), FALSE); } static void ensure_filechooser (GcalFileChooserButton *self) diff --git a/src/gui/event-editor/gcal-date-chooser.c b/src/gui/event-editor/gcal-date-chooser.c index af12b6bd..4815d831 100644 --- a/src/gui/event-editor/gcal-date-chooser.c +++ b/src/gui/event-editor/gcal-date-chooser.c @@ -955,7 +955,7 @@ gcal_date_chooser_init (GcalDateChooser *self) gtk_grid_attach (GTK_GRID (self->grid), self->rows[row], -1, row, 1, 1); self->week[row] = adw_bin_new (); - gtk_widget_hide (self->week[row]); + gtk_widget_set_visible (self->week[row], FALSE); gtk_widget_add_css_class (self->week[row], "current-week"); gtk_grid_attach (GTK_GRID (self->grid), self->week[row], -1, row, 8, 1); diff --git a/src/gui/event-editor/gcal-event-editor-dialog.c b/src/gui/event-editor/gcal-event-editor-dialog.c index 7057e19b..e53e1aa7 100644 --- a/src/gui/event-editor/gcal-event-editor-dialog.c +++ b/src/gui/event-editor/gcal-event-editor-dialog.c @@ -204,7 +204,7 @@ static void clear_and_hide_dialog (GcalEventEditorDialog *self) { gcal_event_editor_dialog_set_event (self, NULL, FALSE); - gtk_widget_hide (GTK_WIDGET (self)); + gtk_widget_set_visible (GTK_WIDGET (self), FALSE); } static void diff --git a/src/gui/event-editor/gcal-multi-choice.c b/src/gui/event-editor/gcal-multi-choice.c index 9a4e271e..8d59efe9 100644 --- a/src/gui/event-editor/gcal-multi-choice.c +++ b/src/gui/event-editor/gcal-multi-choice.c @@ -398,7 +398,7 @@ gcal_multi_choice_state_flags_changed (GtkWidget *widget, if (!gtk_widget_is_sensitive (widget)) { if (self->popover) - gtk_widget_hide (self->popover); + gtk_widget_set_visible (self->popover, FALSE); } } @@ -572,7 +572,7 @@ gcal_multi_choice_set_choices (GcalMultiChoice *self, for (i = 0; i < self->n_choices; i++) { self->choices[i] = gtk_label_new (choices[i]); - gtk_widget_show (self->choices[i]); + gtk_widget_set_visible (self->choices[i], TRUE); gtk_stack_add_named (GTK_STACK (self->stack), self->choices[i], choices[i]); @@ -609,7 +609,7 @@ gcal_multi_choice_set_popover (GcalMultiChoice *self, if (self->popover) { if (gtk_widget_get_visible (self->popover)) - gtk_widget_hide (self->popover); + gtk_widget_set_visible (self->popover, FALSE); g_signal_handlers_disconnect_by_func (self->popover, menu_deactivate_cb, diff --git a/src/gui/event-editor/gcal-schedule-section.c b/src/gui/event-editor/gcal-schedule-section.c index 6a051909..5c631fc5 100644 --- a/src/gui/event-editor/gcal-schedule-section.c +++ b/src/gui/event-editor/gcal-schedule-section.c @@ -467,12 +467,12 @@ gcal_schedule_section_set_event (GcalEventEditorSection *section, if (frequency == GCAL_RECURRENCE_NO_REPEAT) { - gtk_widget_hide (self->repeat_duration_combo); + gtk_widget_set_visible (self->repeat_duration_combo, FALSE); } else { - gtk_widget_show (self->repeat_duration_combo); - gtk_widget_show (self->repeat_duration_combo); + gtk_widget_set_visible (self->repeat_duration_combo, TRUE); + gtk_widget_set_visible (self->repeat_duration_combo, TRUE); } switch (limit_type) diff --git a/src/gui/gcal-application.c b/src/gui/gcal-application.c index 055dbc7a..eae16ba6 100644 --- a/src/gui/gcal-application.c +++ b/src/gui/gcal-application.c @@ -279,7 +279,7 @@ gcal_application_activate (GApplication *application) NULL); g_object_add_weak_pointer (G_OBJECT (self->window), (gpointer*) &self->window); - gtk_widget_show (self->window); + gtk_widget_set_visible (self->window, TRUE); } gtk_window_present (GTK_WINDOW (self->window)); diff --git a/src/gui/gcal-event-popover.c b/src/gui/gcal-event-popover.c index b225de0f..314a98c0 100644 --- a/src/gui/gcal-event-popover.c +++ b/src/gui/gcal-event-popover.c @@ -424,7 +424,7 @@ add_meeting (GcalEventPopover *self, g_signal_connect (row, "join-meeting", G_CALLBACK (on_join_meeting_cb), self); gtk_list_box_append (self->meetings_listbox, row); - gtk_widget_show (GTK_WIDGET (self->meetings_listbox)); + gtk_widget_set_visible (GTK_WIDGET (self->meetings_listbox), TRUE); } static void @@ -524,7 +524,7 @@ on_join_meeting_cb (GcalMeetingRow *meeting_row, gtk_show_uri (window, url, GDK_CURRENT_TIME); /* For some reason, gtk_popover_popdown() crashes when called here */ - gtk_widget_hide (GTK_WIDGET (self)); + gtk_widget_set_visible (GTK_WIDGET (self), FALSE); } static void diff --git a/src/gui/gcal-quick-add-popover.c b/src/gui/gcal-quick-add-popover.c index 0db1301e..e26583c9 100644 --- a/src/gui/gcal-quick-add-popover.c +++ b/src/gui/gcal-quick-add-popover.c @@ -100,7 +100,7 @@ create_calendar_row (GcalManager *manager, /* Selected icon */ selected_icon = gtk_image_new_from_icon_name ("emblem-ok-symbolic"); - gtk_widget_hide (selected_icon); + gtk_widget_set_visible (selected_icon, FALSE); gtk_box_append (GTK_BOX (box), selected_icon); /* The row itself */ @@ -687,7 +687,7 @@ edit_or_create_event (GcalQuickAddPopover *self, else g_signal_emit (self, signals[EDIT_EVENT], 0, event); - gtk_widget_hide (GTK_WIDGET (self)); + gtk_widget_set_visible (GTK_WIDGET (self), FALSE); g_clear_pointer (&date_start, g_date_time_unref); g_clear_pointer (&date_end, g_date_time_unref); diff --git a/src/gui/gcal-search-hit-row.c b/src/gui/gcal-search-hit-row.c index b6f5d6f7..6819a270 100644 --- a/src/gui/gcal-search-hit-row.c +++ b/src/gui/gcal-search-hit-row.c @@ -72,7 +72,7 @@ update_search_hit (GcalSearchHitRow *self) } else { - gtk_widget_hide (self->separator); + gtk_widget_set_visible (self->separator, FALSE); } } diff --git a/src/gui/gcal-window.c b/src/gui/gcal-window.c index a281b38a..baf10c18 100644 --- a/src/gui/gcal-window.c +++ b/src/gui/gcal-window.c @@ -311,6 +311,17 @@ load_css_providers (GcalWindow *self) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION + 1); } +static void +show_widget (GtkWidget *widget) +{ + gtk_widget_set_visible (widget, TRUE); +} + +static void +hide_widget (GtkWidget *widget) +{ + gtk_widget_set_visible (widget, FALSE); +} /* * Callbacks @@ -323,7 +334,7 @@ on_show_calendars_action_activated (GSimpleAction *action, { GcalWindow *window = GCAL_WINDOW (user_data); - gtk_widget_show (window->calendar_management_dialog); + gtk_widget_set_visible (window->calendar_management_dialog, TRUE); } static void @@ -395,7 +406,7 @@ on_window_new_event_cb (GSimpleAction *action, event = gcal_event_new (default_calendar, comp, NULL); gcal_event_editor_dialog_set_event (self->event_editor, event, TRUE); - gtk_widget_show (GTK_WIDGET (self->event_editor)); + gtk_widget_set_visible (GTK_WIDGET (self->event_editor), TRUE); } static void @@ -464,7 +475,8 @@ on_window_undo_delete_event_cb (GSimpleAction *action, widgets = gcal_view_get_children_by_uuid (GCAL_VIEW (self->views[self->active_view]), modifier, gcal_event_get_uid (event)); - g_list_foreach (widgets, (GFunc) gtk_widget_show, NULL); + + g_list_foreach (widgets, (GFunc) show_widget, NULL); g_clear_object (&self->delete_event_toast); @@ -590,7 +602,7 @@ edit_event (GcalQuickAddPopover *popover, GcalWindow *window) { gcal_event_editor_dialog_set_event (window->event_editor, event, TRUE); - gtk_widget_show (GTK_WIDGET (window->event_editor)); + gtk_widget_set_visible (GTK_WIDGET (window->event_editor), TRUE); } static void @@ -611,7 +623,7 @@ create_event_detailed_cb (GcalView *view, event = gcal_event_new (default_calendar, comp, NULL); gcal_event_editor_dialog_set_event (window->event_editor, event, TRUE); - gtk_widget_show (GTK_WIDGET (window->event_editor)); + gtk_widget_set_visible (GTK_WIDGET (window->event_editor), TRUE); g_clear_object (&comp); } @@ -715,9 +727,9 @@ on_event_editor_dialog_remove_event_cb (GcalEventEditorDialog *edit_dialog, agenda_view_widgets = gcal_view_get_children_by_uuid (GCAL_VIEW (self->agenda_view), modifier, gcal_event_get_uid (event)); date_chooser_widgets = gcal_view_get_children_by_uuid (GCAL_VIEW (self->date_chooser), modifier, gcal_event_get_uid (event)); - g_list_foreach (widgets, (GFunc) gtk_widget_hide, NULL); - g_list_foreach (agenda_view_widgets, (GFunc) gtk_widget_hide, NULL); - g_list_foreach (date_chooser_widgets, (GFunc) gtk_widget_hide, NULL); + g_list_foreach (widgets, (GFunc) hide_widget, NULL); + g_list_foreach (agenda_view_widgets, (GFunc) hide_widget, NULL); + g_list_foreach (date_chooser_widgets, (GFunc) hide_widget, NULL); GCAL_EXIT; } @@ -871,7 +883,7 @@ gcal_window_set_property (GObject *object, { case PROP_ACTIVE_VIEW: self->active_view = g_value_get_enum (value); - gtk_widget_show (self->views[self->active_view]); + gtk_widget_set_visible (self->views[self->active_view], TRUE); adw_view_stack_set_visible_child (self->views_stack, self->views[self->active_view]); break; diff --git a/src/gui/importer/gcal-import-dialog.c b/src/gui/importer/gcal-import-dialog.c index 3647107a..a1da8092 100644 --- a/src/gui/importer/gcal-import-dialog.c +++ b/src/gui/importer/gcal-import-dialog.c @@ -158,7 +158,7 @@ setup_files (GcalImportDialog *self, adw_preferences_page_add (self->preferences_page, group); self->rows = g_list_prepend (self->rows, row); - gtk_widget_hide (self->placeholder_spinner); + gtk_widget_set_visible (self->placeholder_spinner, FALSE); } GCAL_EXIT; @@ -399,7 +399,7 @@ on_import_row_file_loaded_cb (GcalImportFileRow *row, self->n_events); gtk_window_set_title (GTK_WINDOW (self), title); - gtk_widget_show (GTK_WIDGET (row)); + gtk_widget_set_visible (GTK_WIDGET (row), TRUE); GCAL_EXIT; } diff --git a/src/gui/views/gcal-month-popover.c b/src/gui/views/gcal-month-popover.c index 42795e45..67153a40 100644 --- a/src/gui/views/gcal-month-popover.c +++ b/src/gui/views/gcal-month-popover.c @@ -207,7 +207,7 @@ on_animation_done_cb (AdwAnimation *animation, GcalMonthPopover *self) { if (adw_animation_get_value (animation) == 0.0) - gtk_widget_hide (GTK_WIDGET (self)); + gtk_widget_set_visible (GTK_WIDGET (self), FALSE); } static void @@ -425,7 +425,7 @@ gcal_month_popover_popup (GcalMonthPopover *self) GCAL_ENTRY; - gtk_widget_show (GTK_WIDGET (self)); + gtk_widget_set_visible (GTK_WIDGET (self), TRUE); adw_timed_animation_set_reverse (ADW_TIMED_ANIMATION (self->animation), FALSE); adw_timed_animation_set_easing (ADW_TIMED_ANIMATION (self->animation), ADW_EASE_OUT_EXPO); diff --git a/src/gui/views/gcal-week-header.c b/src/gui/views/gcal-week-header.c index 139053eb..b7e64ee5 100644 --- a/src/gui/views/gcal-week-header.c +++ b/src/gui/views/gcal-week-header.c @@ -764,7 +764,7 @@ apply_overflow_at_weekday (GcalWeekHeader *self, child = gtk_grid_get_child_at (self->grid, weekday, 3); split_event_widget_at_column (self, child, weekday); - gtk_widget_hide (child); + gtk_widget_set_visible (child, FALSE); } static void @@ -1129,7 +1129,7 @@ header_expand (GcalWeekHeader *self) } else { - gtk_widget_show (child); + gtk_widget_set_visible (child, TRUE); } child = next; diff --git a/src/utils/gcal-utils.c b/src/utils/gcal-utils.c index f4183317..7f4b0f9a 100644 --- a/src/utils/gcal-utils.c +++ b/src/utils/gcal-utils.c @@ -753,7 +753,7 @@ fix_popover_menu_icons (GtkPopover *popover) { gtk_widget_add_css_class (child2, "calendar-color-image"); gtk_widget_set_margin_end (child2, 12); - gtk_widget_show (child2); + gtk_widget_set_visible (child2, TRUE); break; } } |