diff --git a/gnucash/gnome-utils/gnc-main-window.cpp b/gnucash/gnome-utils/gnc-main-window.cpp index e99f9699c6..39fb5f2692 100644 --- a/gnucash/gnome-utils/gnc-main-window.cpp +++ b/gnucash/gnome-utils/gnc-main-window.cpp @@ -487,16 +487,6 @@ static GncDisplayItem gnc_menu_display_items [] = /** The number of display items provided by the main window. */ static guint gnc_menu_n_display_items = G_N_ELEMENTS(gnc_menu_display_items); -/** These are the "important" actions provided by the main window. - * Their labels will appear when the toolbar is set to "Icons and - * important text" (e.g. GTK_TOOLBAR_BOTH_HORIZ) mode. */ -static const gchar *gnc_menu_important_actions[] = -{ - "FileCloseAction", - nullptr, -}; - - /** The following are in the main window so they will always be * present in the menu structure, but they are never sensitive. * These actions should be overridden in child windows where they @@ -4417,8 +4407,6 @@ gnc_main_window_setup_window (GncMainWindow *window) gnc_main_window_menu_item_vis_by_action (window, always_hidden_actions, false); -//FIXMEb gnc_plugin_set_important_actions (priv->action_group, -// gnc_menu_important_actions); // gtk_ui_manager_insert_action_group (window->ui_merge, priv->action_group, 0); diff --git a/gnucash/gnome-utils/gnc-plugin.c b/gnucash/gnome-utils/gnc-plugin.c index ea8e838670..58e70ebefa 100644 --- a/gnucash/gnome-utils/gnc-plugin.c +++ b/gnucash/gnome-utils/gnc-plugin.c @@ -150,14 +150,6 @@ gnc_plugin_add_to_window (GncPlugin *plugin, klass->display_items, klass->n_display_items, klass->ui_updates, klass->ui_filename, plugin); - - if (klass->important_actions) - { - simple_action_group = - gnc_main_window_get_action_group (window, klass->actions_name); -//FIXMEb gnc_plugin_set_important_actions (simple_action_group, -// klass->important_actions); - } } /* @@ -251,30 +243,6 @@ gnc_plugin_init_short_names (GtkWidget *toolbar, } -/** Mark certain actions as "important". This means that their labels - * will appear when the toolbar is set to "Icons and important text" - * (e.g. GTK_TOOLBAR_BOTH_HORIZ) mode. - * - * See gnc-plugin.h for documentation on the function arguments. */ -void -gnc_plugin_set_important_actions (GSimpleActionGroup *simple_action_group, - const gchar **name) -{ - GAction *action; - gint i; - - for (i = 0; name[i]; i++) - { -//FIXMEb action = g_action_map_lookup_action (G_ACTION_MAP(simple_action_group), name[i]); -// g_object_set (G_OBJECT(action), "is_important", TRUE, NULL); - } - - /* If this trips, you've got too many "important" actions. That - * can't *all* be that important, can they? */ - g_assert(i <= 3); -} - - /* Update a property of existing UI actions. This function can * modify actions making them visible, invisible, sensitive, or * insensitive. diff --git a/gnucash/gnome-utils/gnc-plugin.h b/gnucash/gnome-utils/gnc-plugin.h index 727dd5ef5e..8b78489c75 100644 --- a/gnucash/gnome-utils/gnc-plugin.h +++ b/gnucash/gnome-utils/gnc-plugin.h @@ -140,11 +140,6 @@ typedef struct GtkToggleActionEntry *toggle_actions; /** The number of toggle actions in the toggle actions array. */ guint n_toggle_actions; - /** A NULL terminated list of actions that should be considered - * important. In the toolbar, these actions will display the - * action name when the toolbar is in "text beside icons" - * mode. */ - const gchar **important_actions; /** The relative name of the XML file describing the * menu/toolbar action items. */ const gchar *ui_filename; @@ -266,21 +261,6 @@ void gnc_plugin_init_short_names (GtkWidget *toolbar, GncToolBarShortNames *toolbar_labels); -/** Mark certain actions as "important". This means that their labels - * will appear when the toolbar is set to "Icons and important text" - * (e.g. GTK_TOOLBAR_BOTH_HORIZ) mode. - * - * @param action_group The group of all actions associated with a - * plugin or plugin page. All actions to me modified must be in this - * group. - * - * @param name A list of actions names to be marked important. This - * list must be NULL terminated. - */ -void gnc_plugin_set_important_actions (GSimpleActionGroup *simple_action_group, - const gchar **names); - - /** Update a property on a set of existing GtkActions. This function * can be easily used to make a list of actions visible, invisible, * sensitive, or insensitive. diff --git a/gnucash/gnome/gnc-plugin-basic-commands.c b/gnucash/gnome/gnc-plugin-basic-commands.c index 8935a7fabf..ab31edc8b4 100644 --- a/gnucash/gnome/gnc-plugin-basic-commands.c +++ b/gnucash/gnome/gnc-plugin-basic-commands.c @@ -144,15 +144,6 @@ static const gchar *gnc_plugin_load_ui_items [] = NULL, }; -/** These are the "important" actions provided by the basic commands - * plugin. Their labels will appear when the toolbar is set to - * "Icons and important text" (e.g. GTK_TOOLBAR_BOTH_HORIZ) mode. */ -static const gchar *gnc_plugin_important_actions[] = -{ - "FileSaveAction", - NULL, -}; - /** The following items should be made insensitive at startup time. The * sensitivity will be changed by some later event. */ static const gchar *gnc_plugin_initially_insensitive_actions[] = @@ -312,7 +303,6 @@ gnc_plugin_basic_commands_class_init (GncPluginBasicCommandsClass *klass) plugin_class->actions_name = PLUGIN_ACTIONS_NAME; plugin_class->actionsb = gnc_plugin_actions; plugin_class->n_actionsb = gnc_plugin_n_actions; - plugin_class->important_actions = gnc_plugin_important_actions; plugin_class->ui_filename = PLUGIN_UI_FILENAME; plugin_class->ui_updates = gnc_plugin_load_ui_items; } diff --git a/gnucash/gnome/gnc-plugin-page-register.c b/gnucash/gnome/gnc-plugin-page-register.c index 28b242d0a7..527be7b13f 100644 --- a/gnucash/gnome/gnc-plugin-page-register.c +++ b/gnucash/gnome/gnc-plugin-page-register.c @@ -571,15 +571,6 @@ static const gchar *gnc_plugin_load_ui_items [] = NULL, }; -/** These are the "important" actions provided by the register page. - * Their labels will appear when the toolbar is set to "Icons and - * important text" (e.g. GTK_TOOLBAR_BOTH_HORIZ) mode. */ -static const gchar* important_actions[] = -{ - "SplitTransactionAction", - NULL, -}; - /** Actions that require an account to be selected before they are * enabled. */ static const gchar* actions_requiring_account[] = @@ -884,8 +875,6 @@ gnc_plugin_page_register_init (GncPluginPageRegister* plugin_page) gnc_plugin_page_register_n_actions, plugin_page); -//FIXMEb gnc_plugin_set_important_actions (action_group, important_actions); - priv->lines_default = DEFAULT_LINES_AMOUNT; priv->read_only = FALSE; priv->fd.cleared_match = CLEARED_ALL;