From 8b1b227abd0c3a1a32a1c37c5d3ec50d73ed60c9 Mon Sep 17 00:00:00 2001 From: zhuyaliang Date: Tue, 7 Feb 2023 20:49:48 +0800 Subject: logview: Replace deprecated functions fix compilation warnings --- logview/data/logview-toolbar.xml | 324 +++++++++++++++++++++++++++++++++++---- logview/src/logview-findbar.c | 3 +- logview/src/logview-log.c | 101 ++++++------ logview/src/logview-window.c | 322 +++++++++++++++++++++----------------- 4 files changed, 520 insertions(+), 230 deletions(-) diff --git a/logview/data/logview-toolbar.xml b/logview/data/logview-toolbar.xml index 2ee639d8..fa8d7b03 100644 --- a/logview/data/logview-toolbar.xml +++ b/logview/data/logview-toolbar.xml @@ -1,33 +1,291 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + True + False + document-open + + + True + False + window-close + + + True + False + application-exit + + + True + False + edit-copy + + + True + False + edit-find + + + True + False + zoom-in + + + True + False + zoom-out + + + True + False + zoom-original + + + True + False + help-browser + + + True + False + help-about + + + 1 + + + The menubar + + + + + 1 + _File + 1 + + + + + 1 + _Open... + Open a log from file + 1 + menu_icon_open + win.OpenLog + + + + + 1 + _Close + Close this log + 1 + menu_icon_close + win.CloseLog + + + + + 1 + + + + + 1 + _Quit + Quit the log viewer + 1 + menu_icon_quit + win.Quit + + + + + + + + + 1 + _Edit + 1 + + + + + 1 + _Copy + Copy the selection + 1 + menu_icon_copy + win.Copy + + + + + 1 + Select _All + Select the entire log + 1 + win.SelectAll + + + + + + + + + 1 + _View + 1 + + + + + 1 + _Statusbar + Show Status Bar + 1 + win.ShowStatusBar + + + + + 1 + Side _Pane + Show Side Pane + 1 + win.ShowSidebar + + + + + 1 + 0 + + + + + 1 + _Find... + Find a word or phrase in the log + 1 + menu_icon_find + win.Search + + + + + 1 + 0 + + + + + 1 + Zoom _In + Bigger text size + 1 + menu_icon_in + win.ViewZoomIn + + + + + 1 + Zoom _Out + Smaller text size + 1 + menu_icon_out + win.ViewZoomOut + + + + + 1 + _Normal Size + Normal text size + 1 + menu_icon_normal + win.ViewZoom100 + + + + + + + + + 1 + _Filters + 1 + + + + + 1 + Show matches only + Only show lines that match one of the given filters + 1 + win.FilterMatchOnly + + + + + 1 + Manage Filters + Manage filters + 1 + win.FilterManage + + + + + 1 + Filter Items + + 1 + + + + + + + + + + + + + 1 + _Help + 1 + + + + + 1 + _Contents + Open the help contents for the log viewer + 1 + menu_icon_help + win.HelpContents + + + + + 1 + _About + Show the about dialog for the log viewer + 1 + menu_icon_about + win.AboutAction + + + + + + + + diff --git a/logview/src/logview-findbar.c b/logview/src/logview-findbar.c index 1ea4a05b..33ea4958 100644 --- a/logview/src/logview-findbar.c +++ b/logview/src/logview-findbar.c @@ -197,7 +197,8 @@ logview_findbar_init (LogviewFindbar *findbar) gtk_widget_show_all (GTK_WIDGET (priv->forward_button)); /* clear button */ - priv->clear_button = gtk_tool_button_new_from_stock ("gtk-clear"); + w = gtk_image_new_from_icon_name ("edit-clear-all", GTK_ICON_SIZE_BUTTON); + priv->clear_button = gtk_tool_button_new (w, NULL); gtk_tool_item_set_tooltip_text (priv->clear_button, _("Clear the search string")); gtk_toolbar_insert (gtoolbar, priv->clear_button, -1); diff --git a/logview/src/logview-log.c b/logview/src/logview-log.c index 6ff92904..1e236c52 100644 --- a/logview/src/logview-log.c +++ b/logview/src/logview-log.c @@ -64,17 +64,14 @@ struct _LogviewLogPrivate { typedef struct { LogviewLog *log; - GError *err; LogviewCreateCallback callback; gpointer user_data; } LoadJob; typedef struct { LogviewLog *log; - GError *err; const char **lines; GSList *new_days; - GCancellable *cancellable; LogviewNewLinesCallback callback; gpointer user_data; } NewLinesJob; @@ -237,34 +234,35 @@ add_new_days_to_cache (LogviewLog *log, const char **new_lines, guint lines_offs return new_days; } -static gboolean -new_lines_job_done (gpointer data) +static void +new_lines_job_done (GObject *source_object, + GAsyncResult *res, + gpointer user_data) { - NewLinesJob *job = data; + NewLinesJob *job = user_data; + g_autoptr(GError) error = NULL; + gboolean ret; - if (job->err) { - job->callback (job->log, NULL, NULL, job->err, job->user_data); - g_error_free (job->err); + ret = g_task_propagate_boolean (G_TASK (res), &error); + if (!ret) { + job->callback (job->log, NULL, NULL, error, job->user_data); } else { - job->callback (job->log, job->lines, job->new_days, job->err, job->user_data); + job->callback (job->log, job->lines, job->new_days, error, job->user_data); } - g_clear_object (&job->cancellable); - g_slist_free_full (job->new_days, (GDestroyNotify) logview_utils_day_free); /* drop the reference we acquired before */ g_object_unref (job->log); g_slice_free (NewLinesJob, job); - - return FALSE; } -static gboolean -do_read_new_lines (GIOSchedulerJob *io_job, - GCancellable *cancellable, - gpointer user_data) +static void +do_read_new_lines (GTask *task, + gpointer source_object, + gpointer user_data, + GCancellable *cancellable) { /* this runs in a separate thread */ NewLinesJob *job = user_data; @@ -287,7 +285,7 @@ do_read_new_lines (GIOSchedulerJob *io_job, g_ptr_array_remove_index (lines, lines->len - 1); while ((line = g_data_input_stream_read_line (log->priv->stream, NULL, - job->cancellable, &err)) != NULL) + cancellable, &err)) != NULL) { g_ptr_array_add (lines, (gpointer) line); } @@ -296,8 +294,7 @@ do_read_new_lines (GIOSchedulerJob *io_job, g_ptr_array_add (lines, NULL); if (err) { - job->err = err; - goto out; + g_task_return_error (task, err); } log->priv->has_new_lines = FALSE; @@ -309,23 +306,23 @@ do_read_new_lines (GIOSchedulerJob *io_job, job->new_days = add_new_days_to_cache (log, job->lines, log->priv->lines_no); log->priv->lines_no = (lines->len - 1); -out: - g_io_scheduler_job_send_to_mainloop_async (io_job, - new_lines_job_done, - job, NULL); - return FALSE; + g_task_return_boolean (task, TRUE); } -static gboolean -log_load_done (gpointer user_data) +static void +log_load_done (GObject *source_object, + GAsyncResult *res, + gpointer user_data) { LoadJob *job = user_data; + g_autoptr(GError) error = NULL; + gboolean ret; - if (job->err) { - /* the callback will have NULL as log, and the error set */ + ret = g_task_propagate_boolean (G_TASK (res), &error); + + if (!ret) { g_object_unref (job->log); - job->callback (NULL, job->err, job->user_data); - g_error_free (job->err); + job->callback (NULL, error, job->user_data); } else { job->callback (job->log, NULL, job->user_data); setup_file_monitor (job->log); @@ -333,7 +330,6 @@ log_load_done (gpointer user_data) g_slice_free (LoadJob, job); - return FALSE; } #ifdef HAVE_ZLIB @@ -592,11 +588,11 @@ create_zlib_error (void) } #endif /* HAVE_ZLIB */ - -static gboolean -log_load (GIOSchedulerJob *io_job, - GCancellable *cancellable, - gpointer user_data) +static void +log_load (GTask *task, + gpointer source_object, + gpointer user_data, + GCancellable *cancellable) { /* this runs in a separate i/o thread */ LoadJob *job = user_data; @@ -772,13 +768,10 @@ log_load (GIOSchedulerJob *io_job, out: if (err) { - job->err = err; + g_task_return_error (task, err); } - g_io_scheduler_job_send_to_mainloop_async (io_job, - log_load_done, - job, NULL); - return FALSE; + g_task_return_boolean (task, TRUE); } static void @@ -786,17 +779,17 @@ log_setup_load (LogviewLog *log, LogviewCreateCallback callback, gpointer user_data) { LoadJob *job; + GTask *task; job = g_slice_new0 (LoadJob); job->callback = callback; job->user_data = user_data; job->log = log; - job->err = NULL; - /* push the loading job into another thread */ - g_io_scheduler_push_job (log_load, - job, - NULL, 0, NULL); + task = g_task_new (log, NULL, log_load_done, job); + g_task_set_task_data (task, job, NULL); + g_task_run_in_thread (task, log_load); + g_object_unref (task); } /* public methods */ @@ -808,22 +801,20 @@ logview_log_read_new_lines (LogviewLog *log, gpointer user_data) { NewLinesJob *job; + GTask *task; /* initialize the job struct with sensible values */ job = g_slice_new0 (NewLinesJob); job->callback = callback; job->user_data = user_data; - job->cancellable = (cancellable != NULL) ? g_object_ref (cancellable) : NULL; job->log = g_object_ref (log); - job->err = NULL; job->lines = NULL; job->new_days = NULL; - /* push the fetching job into another thread */ - g_io_scheduler_push_job (do_read_new_lines, - job, - NULL, 0, - job->cancellable); + task = g_task_new (log, cancellable, new_lines_job_done, job); + g_task_set_task_data (task, job, NULL); + g_task_run_in_thread (task, do_read_new_lines); + g_object_unref (task); } void diff --git a/logview/src/logview-window.c b/logview/src/logview-window.c index dac3d507..1933e5a3 100644 --- a/logview/src/logview-window.c +++ b/logview/src/logview-window.c @@ -43,9 +43,9 @@ #define SEARCH_END_MARK "lw-search-end-mark" struct _LogviewWindowPrivate { - GtkUIManager *ui_manager; - GtkActionGroup *action_group; - GtkActionGroup *filter_action_group; + GtkBuilder *ui_manager; + GActionGroup *action_group; + GActionGroup *filter_action_group; GtkWidget *find_bar; GtkWidget *loglist; @@ -72,7 +72,6 @@ struct _LogviewWindowPrivate { GCancellable *read_cancellable; - guint filter_merge_id; GList *active_filters; gboolean matches_only; }; @@ -197,6 +196,18 @@ _gtk_text_buffer_apply_tag_to_rectangle (GtkTextBuffer *buffer, int line_start, } } +static void +activate_toggle (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) +{ + GVariant *state; + + state = g_action_get_state (G_ACTION (action)); + g_action_change_state (G_ACTION (action), g_variant_new_boolean (!g_variant_get_boolean (state))); + g_variant_unref (state); +} + static void logview_update_statusbar (LogviewWindow *logview, LogviewLog *active) { @@ -316,8 +327,12 @@ out: } static void -logview_open_log (GtkAction *action, LogviewWindow *logview) +logview_open_log (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) + { + LogviewWindow *logview = user_data; static GtkWidget *chooser = NULL; char *active; @@ -345,18 +360,24 @@ logview_open_log (GtkAction *action, LogviewWindow *logview) } static void -logview_close_log (GtkAction *action, LogviewWindow *logview) +logview_close_log (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) { + LogviewWindow *logview = user_data; + findbar_close_cb (LOGVIEW_FINDBAR (logview->priv->find_bar), logview); logview_manager_close_active_log (logview->priv->manager); } static void -logview_help (GtkAction *action, GtkWidget *parent_window) +logview_help (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) { GError *error = NULL; - gtk_show_uri_on_window (GTK_WINDOW (parent_window), + gtk_show_uri_on_window (GTK_WINDOW (user_data), "help:mate-system-log", gtk_get_current_event_time (), &error); @@ -367,29 +388,44 @@ logview_help (GtkAction *action, GtkWidget *parent_window) } static void -logview_bigger_text (GtkAction *action, LogviewWindow *logview) +logview_bigger_text (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) { + LogviewWindow *logview = user_data; + logview->priv->fontsize = MIN (logview->priv->fontsize + 1, 24); logview_set_fontsize (logview, TRUE); } static void -logview_smaller_text (GtkAction *action, LogviewWindow *logview) +logview_smaller_text (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) { + LogviewWindow *logview = user_data; + logview->priv->fontsize = MAX (logview->priv->fontsize-1, 6); logview_set_fontsize (logview, TRUE); } static void -logview_normal_text (GtkAction *action, LogviewWindow *logview) +logview_normal_text (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) { + LogviewWindow *logview = user_data; + logview->priv->fontsize = logview->priv->original_fontsize; logview_set_fontsize (logview, TRUE); } static void -logview_select_all (GtkAction *action, LogviewWindow *logview) +logview_select_all (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) { + LogviewWindow *logview = user_data; GtkTextIter start, end; GtkTextBuffer *buffer; @@ -402,8 +438,11 @@ logview_select_all (GtkAction *action, LogviewWindow *logview) } static void -logview_copy (GtkAction *action, LogviewWindow *logview) +logview_copy (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) { + LogviewWindow *logview = user_data; GtkTextBuffer *buffer; GtkClipboard *clipboard; @@ -564,8 +603,12 @@ findbar_text_changed_cb (LogviewFindbar *findbar, } static void -logview_search (GtkAction *action, LogviewWindow *logview) +logview_search (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) { + LogviewWindow *logview = user_data; + logview_findbar_open (LOGVIEW_FINDBAR (logview->priv->find_bar)); } @@ -632,15 +675,14 @@ filter_remove (LogviewWindow *logview, LogviewFilter *filter) } static void -on_filter_toggled (GtkToggleAction *action, LogviewWindow *logview) +on_filter_toggled (GtkCheckMenuItem *item, LogviewWindow *logview) { LogviewWindowPrivate *priv = logview_window_get_instance_private (logview); const gchar* name; LogviewFilter *filter; - name = gtk_action_get_name (GTK_ACTION (action)); - - if (gtk_toggle_action_get_active (action)) { + name = gtk_menu_item_get_label (GTK_MENU_ITEM (item)); + if (gtk_check_menu_item_get_active (item)) { priv->active_filters = g_list_append (priv->active_filters, logview_prefs_get_filter (priv->prefs, name)); @@ -653,76 +695,66 @@ on_filter_toggled (GtkToggleAction *action, LogviewWindow *logview) filter_remove (logview, filter); } } +static void remove_all_widget (GtkWidget *widget, gpointer filter_menu) +{ + gtk_container_remove (GTK_CONTAINER (filter_menu), widget); +} -#define FILTER_PLACEHOLDER "/LogviewMenu/FilterMenu/PlaceholderFilters" static void update_filter_menu (LogviewWindow *window) { LogviewWindowPrivate *priv; - GtkUIManager* ui; - GList *actions, *l; - guint id; + GtkWidget *filter_menu; + char **actions; + int i = 0; + GList *l; GList *filters; GtkTextTagTable *table; GtkTextTag *tag; - GtkToggleAction *action; + GSimpleAction *action; gchar* name; priv = logview_window_get_instance_private (window); - ui = priv->ui_manager; g_return_if_fail (priv->filter_action_group != NULL); table = priv->tag_table; - if (priv->filter_merge_id != 0) { - gtk_ui_manager_remove_ui (ui, - priv->filter_merge_id); - } - - actions = gtk_action_group_list_actions (priv->filter_action_group); + actions = g_action_group_list_actions (priv->filter_action_group); + filter_menu = (GtkWidget *)gtk_builder_get_object (priv->ui_manager, "filter_menu"); - for (l = actions; l != NULL; l = g_list_next (l)) { - tag = gtk_text_tag_table_lookup (table, gtk_action_get_name (GTK_ACTION (l->data))); + while (actions[i] != NULL) { + tag = gtk_text_tag_table_lookup (table, actions[i]); gtk_text_tag_table_remove (table, tag); - - g_signal_handlers_disconnect_by_func (GTK_ACTION (l->data), - G_CALLBACK (on_filter_toggled), - window); - gtk_action_group_remove_action (priv->filter_action_group, - GTK_ACTION (l->data)); + g_action_map_remove_action (G_ACTION_MAP (priv->filter_action_group), actions[i]); + i++; } - g_list_free (actions); - + g_strfreev (actions); + gtk_container_foreach (GTK_CONTAINER (filter_menu), remove_all_widget, filter_menu); filters = logview_prefs_get_filters (logview_prefs_get ()); - id = (g_list_length (filters) > 0) ? gtk_ui_manager_new_merge_id (ui) : 0; - for (l = filters; l != NULL; l = g_list_next (l)) { g_object_get (l->data, "name", &name, NULL); + GtkWidget *item; + item = gtk_check_menu_item_new_with_label (name); + gtk_container_add (GTK_CONTAINER (filter_menu), item); + gtk_widget_show_all (filter_menu); + action = g_simple_action_new (name, NULL);; + g_action_map_add_action (G_ACTION_MAP (priv->filter_action_group), G_ACTION (action)); + gtk_text_tag_table_add (table, + logview_filter_get_tag (LOGVIEW_FILTER (l->data))); - action = gtk_toggle_action_new (name, name, NULL, NULL); - gtk_action_group_add_action (priv->filter_action_group, - GTK_ACTION (action)); - - g_signal_connect (action, + g_signal_connect (item, "toggled", G_CALLBACK (on_filter_toggled), window); - - gtk_ui_manager_add_ui (ui, id, FILTER_PLACEHOLDER, - name, name, GTK_UI_MANAGER_MENUITEM, FALSE); - gtk_text_tag_table_add (table, - logview_filter_get_tag (LOGVIEW_FILTER (l->data))); - g_object_unref (action); g_free(name); } g_list_free (filters); - priv->filter_merge_id = id; } static void @@ -737,7 +769,9 @@ on_logview_filter_manager_response (GtkDialog *dialog, } static void -logview_manage_filters (GtkAction *action, LogviewWindow *logview) +logview_manage_filters (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) { GtkWidget *manager; @@ -745,15 +779,17 @@ logview_manage_filters (GtkAction *action, LogviewWindow *logview) g_signal_connect (manager, "response", G_CALLBACK (on_logview_filter_manager_response), - logview); + user_data); gtk_window_set_transient_for (GTK_WINDOW (manager), - GTK_WINDOW (logview)); + GTK_WINDOW (user_data)); gtk_widget_show (GTK_WIDGET (manager)); } static void -logview_about (GtkWidget *widget, GtkWidget *window) +logview_about (GSimpleAction *action, + GVariant *parameter, + gpointer window) { g_return_if_fail (GTK_IS_WINDOW (window)); @@ -789,8 +825,12 @@ logview_about (GtkWidget *widget, GtkWidget *window) } static void -logview_toggle_statusbar (GtkAction *action, LogviewWindow *logview) +logview_toggle_statusbar (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) { + LogviewWindow *logview = user_data; + if (gtk_widget_get_visible (logview->priv->statusbar)) gtk_widget_hide (logview->priv->statusbar); else @@ -798,8 +838,12 @@ logview_toggle_statusbar (GtkAction *action, LogviewWindow *logview) } static void -logview_toggle_sidebar (GtkAction *action, LogviewWindow *logview) +logview_toggle_sidebar (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) { + LogviewWindow *logview = user_data; + if (gtk_widget_get_visible (logview->priv->sidebar)) gtk_widget_hide (logview->priv->sidebar); else @@ -807,60 +851,64 @@ logview_toggle_sidebar (GtkAction *action, LogviewWindow *logview) } static void -logview_toggle_match_filters (GtkToggleAction *action, LogviewWindow *logview) +logview_toggle_match_filters (GSimpleAction *action, + GVariant *state, + gpointer user_data) { - logview->priv->matches_only = gtk_toggle_action_get_active (action); + + LogviewWindow *logview = user_data; + + logview->priv->matches_only = g_variant_get_boolean (state); + g_simple_action_set_state (action, state); filter_buffer (logview, 0); } +static void +logview_quit (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) +{ + gtk_widget_destroy (GTK_WIDGET (user_data)); + gtk_main_quit (); +} + /* GObject functions */ /* Menus */ - -static GtkActionEntry entries[] = { - { "FileMenu", NULL, N_("_File"), NULL, NULL, NULL }, - { "EditMenu", NULL, N_("_Edit"), NULL, NULL, NULL }, - { "ViewMenu", NULL, N_("_View"), NULL, NULL, NULL }, - { "FilterMenu", NULL, N_("_Filters"), NULL, NULL, NULL }, - { "HelpMenu", NULL, N_("_Help"), NULL, NULL, NULL }, - - { "OpenLog", "document-open", N_("_Open..."), "O", N_("Open a log from file"), - G_CALLBACK (logview_open_log) }, - { "CloseLog", "window-close", N_("_Close"), "W", N_("Close this log"), - G_CALLBACK (logview_close_log) }, - { "Quit", "application-exit", N_("_Quit"), "Q", N_("Quit the log viewer"), - G_CALLBACK (gtk_main_quit) }, - - { "Copy", "edit-copy", N_("_Copy"), "C", N_("Copy the selection"), - G_CALLBACK (logview_copy) }, - { "SelectAll", NULL, N_("Select _All"), "A", N_("Select the entire log"), - G_CALLBACK (logview_select_all) }, - { "Search", "edit-find", N_("_Find..."), "F", N_("Find a word or phrase in the log"), - G_CALLBACK (logview_search) }, - - { "ViewZoomIn", "zoom-in", N_("Zoom _In"), "plus", N_("Bigger text size"), - G_CALLBACK (logview_bigger_text)}, - { "ViewZoomOut", "zoom-out", N_("Zoom _Out"), "minus", N_("Smaller text size"), - G_CALLBACK (logview_smaller_text)}, - { "ViewZoom100", "zoom-original", N_("_Normal Size"), "0", N_("Normal text size"), - G_CALLBACK (logview_normal_text)}, - - { "FilterManage", NULL, N_("Manage Filters"), NULL, N_("Manage filters"), - G_CALLBACK (logview_manage_filters)}, - - { "HelpContents", "help-browser", N_("_Contents"), "F1", N_("Open the help contents for the log viewer"), - G_CALLBACK (logview_help) }, - { "AboutAction", "help-about", N_("_About"), NULL, N_("Show the about dialog for the log viewer"), - G_CALLBACK (logview_about) }, +static GActionEntry win_entries[] = { + { "OpenLog", logview_open_log, NULL, NULL, NULL}, + { "CloseLog", logview_close_log, NULL, NULL, NULL}, + { "Quit", logview_quit, NULL, NULL, NULL }, + { "Copy", logview_copy, NULL, NULL, NULL }, + { "SelectAll", logview_select_all, NULL, NULL, NULL }, + { "ShowStatusBar", logview_toggle_statusbar, NULL, "true", NULL}, + { "ShowSidebar", logview_toggle_sidebar, NULL, "true", NULL}, + { "Search", logview_search, NULL, NULL, NULL}, + { "ViewZoomIn", logview_bigger_text, NULL, NULL, NULL}, + { "ViewZoomOut", logview_smaller_text, NULL, NULL, NULL}, + { "ViewZoom100", logview_normal_text, NULL, NULL, NULL}, + { "FilterManage", logview_manage_filters, NULL, "false", NULL}, + { "FilterMatchOnly", activate_toggle, NULL, "false", logview_toggle_match_filters}, + { "HelpContents", logview_help, NULL, NULL, NULL }, + { "AboutAction", logview_about, NULL, NULL, NULL }, }; -static GtkToggleActionEntry toggle_entries[] = { - { "ShowStatusBar", NULL, N_("_Statusbar"), NULL, N_("Show Status Bar"), - G_CALLBACK (logview_toggle_statusbar), TRUE }, - { "ShowSidebar", NULL, N_("Side _Pane"), "F9", N_("Show Side Pane"), - G_CALLBACK (logview_toggle_sidebar), TRUE }, - { "FilterMatchOnly", NULL, N_("Show matches only"), NULL, N_("Only show lines that match one of the given filters"), - G_CALLBACK (logview_toggle_match_filters), FALSE} +static const struct { + guint keyval; + GdkModifierType modifier; + const gchar *widget_id; +} menu_keybindings [] = { + { GDK_KEY_O, GDK_CONTROL_MASK, "open_item" }, + { GDK_KEY_W, GDK_CONTROL_MASK, "close_item" }, + { GDK_KEY_Q, GDK_CONTROL_MASK, "quit_item" }, + { GDK_KEY_C, GDK_CONTROL_MASK, "copy_item" }, + { GDK_KEY_A, GDK_CONTROL_MASK, "select_item" }, + { GDK_KEY_F9, 0, "side_item" }, + { GDK_KEY_F, GDK_CONTROL_MASK, "find_item" }, + { GDK_KEY_plus, GDK_CONTROL_MASK, "in_item" }, + { GDK_KEY_minus, GDK_CONTROL_MASK, "out_item" }, + { GDK_KEY_0, GDK_CONTROL_MASK, "normal_item" }, + { GDK_KEY_F1, 0, "help_item" } }; static gboolean @@ -1124,16 +1172,6 @@ font_changed_cb (LogviewPrefs *prefs, logview_set_font (window, font_name); } -static void -tearoff_changed_cb (LogviewPrefs *prefs, - gboolean have_tearoffs, - gpointer user_data) -{ - LogviewWindow *window = user_data; - - gtk_ui_manager_set_add_tearoffs (window->priv->ui_manager, have_tearoffs); -} - static const struct { guint keyval; GdkModifierType modifier; @@ -1151,7 +1189,7 @@ key_press_event_cb (GtkWidget *widget, { LogviewWindow *window = user_data; guint modifier = event->state & gtk_accelerator_get_default_mod_mask (); - GtkAction *action; + GAction *action; int i; /* handle accelerators that we want bound, but aren't associated with @@ -1159,10 +1197,9 @@ key_press_event_cb (GtkWidget *widget, for (i = 0; i < G_N_ELEMENTS (extra_keybindings); i++) { if (event->keyval == extra_keybindings[i].keyval && modifier == extra_keybindings[i].modifier) { - - action = gtk_action_group_get_action (window->priv->action_group, + action = g_action_map_lookup_action (G_ACTION_MAP (window->priv->action_group), extra_keybindings[i].action); - gtk_action_activate (action); + g_action_activate (action, NULL); return TRUE; } } @@ -1274,16 +1311,17 @@ logview_window_finalize (GObject *object) static void logview_window_init (LogviewWindow *logview) { - GtkActionGroup *action_group; + GActionGroup *action_group; GtkAccelGroup *accel_group; GError *error = NULL; - GtkWidget *hpaned, *main_view, *vbox, *w; + GtkWidget *hpaned, *main_view, *vbox, *w, *item; PangoContext *context; PangoFontDescription *fontdesc; gchar *monospace_font_name; LogviewWindowPrivate *priv; int width, height; gboolean res; + int i; GtkStyleContext *s_context; @@ -1302,21 +1340,21 @@ logview_window_init (LogviewWindow *logview) gtk_container_add (GTK_CONTAINER (logview), vbox); /* create menus */ - action_group = gtk_action_group_new ("LogviewMenuActions"); - gtk_action_group_set_translation_domain (action_group, NULL); - gtk_action_group_add_actions (action_group, entries, G_N_ELEMENTS (entries), logview); - gtk_action_group_add_toggle_actions (action_group, toggle_entries, G_N_ELEMENTS (toggle_entries), logview); + action_group = (GActionGroup*)g_simple_action_group_new (); + g_action_map_add_action_entries (G_ACTION_MAP (action_group), + win_entries, G_N_ELEMENTS (win_entries), + logview); priv->action_group = action_group; - priv->ui_manager = gtk_ui_manager_new (); + priv->ui_manager = gtk_builder_new (); - gtk_ui_manager_insert_action_group (priv->ui_manager, action_group, 0); - accel_group = gtk_ui_manager_get_accel_group (priv->ui_manager); + gtk_widget_insert_action_group (GTK_WIDGET (logview), "win", action_group); + accel_group = gtk_accel_group_new (); gtk_window_add_accel_group (GTK_WINDOW (logview), accel_group); - res = gtk_ui_manager_add_ui_from_resource (priv->ui_manager, - "/org/mate/system-log/logview-toolbar.xml", - &error); + res = gtk_builder_add_from_resource (priv->ui_manager, + "/org/mate/system-log/logview-toolbar.xml", + &error); if (res == FALSE) { priv->ui_manager = NULL; @@ -1325,13 +1363,18 @@ logview_window_init (LogviewWindow *logview) return; } - gtk_ui_manager_set_add_tearoffs (priv->ui_manager, - logview_prefs_get_have_tearoff (priv->prefs)); - - w = gtk_ui_manager_get_widget (priv->ui_manager, "/LogviewMenu"); + w = (GtkWidget *)gtk_builder_get_object (priv->ui_manager, "logmenubar"); gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0); gtk_widget_show (w); + for (i = 0; i < G_N_ELEMENTS (menu_keybindings); i++) + { + item = (GtkWidget*)gtk_builder_get_object (priv->ui_manager, menu_keybindings[i].widget_id); + gtk_widget_add_accelerator (item, "activate", accel_group, + menu_keybindings[i].keyval, + menu_keybindings[i].modifier, + GTK_ACCEL_VISIBLE); + } /* panes */ hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0); @@ -1405,7 +1448,7 @@ logview_window_init (LogviewWindow *logview) if (priv->fontsize <= 0) { /* restore the default */ - logview_normal_text (NULL, logview); + logview_normal_text (NULL, NULL, logview); } else { logview_set_fontsize (logview, FALSE); } @@ -1441,8 +1484,6 @@ logview_window_init (LogviewWindow *logview) G_CALLBACK (window_size_changed_cb), logview); g_signal_connect (priv->prefs, "system-font-changed", G_CALLBACK (font_changed_cb), logview); - g_signal_connect (priv->prefs, "have-tearoff-changed", - G_CALLBACK (tearoff_changed_cb), logview); g_signal_connect (priv->manager, "active-changed", G_CALLBACK (active_log_changed_cb), logview); g_signal_connect (logview, "key-press-event", @@ -1457,9 +1498,8 @@ logview_window_init (LogviewWindow *logview) gtk_widget_show (priv->statusbar); /* Filter menu */ - priv->filter_action_group = gtk_action_group_new ("ActionGroupFilter"); - gtk_ui_manager_insert_action_group (priv->ui_manager, priv->filter_action_group, - 1); + priv->filter_action_group = (GActionGroup*)g_simple_action_group_new (); + gtk_widget_insert_action_group (GTK_WIDGET (logview), "filter", priv->filter_action_group); priv->active_filters = NULL; update_filter_menu (logview); -- cgit v1.2.1