IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move the "Sort By" and "Filter By" menu items to the main window so

Browse Source 
they will always appear in the same place in the menus.  Hide them so
they don't actually appear until a page provides them.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@12204 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
David Hampton 2005-12-30 05:07:14 +00:00
parent 9cab16538f
commit fe80448c99
4 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,12 @@
2005-12-29 David Hampton <hampton@employees.org> 2005-12-29 David Hampton <hampton@employees.org>
* src/gnome-utils/ui/gnc-main-window-ui.xml:
* src/gnome-utils/gnc-main-window.c:
* src/gnome/ui/gnc-plugin-page-register-ui.xml: Move the "Sort By"
and "Filter By" menu items to the main window so they will always
appear in the same place in the menus. Hide them so they don't
actually appear until a page provides them.
* src/engine/gw-engine-spec.scm: Comment out unused function that * src/engine/gw-engine-spec.scm: Comment out unused function that
won't compile with g-wrap 1.9 after the const-ifying of the won't compile with g-wrap 1.9 after the const-ifying of the
account functions. account functions.

16
src/gnome-utils/gnc-main-window.c
View File

@ -244,6 +244,8 @@ static GtkActionEntry gnc_menu_actions [] =
/* View menu */ /* View menu */
{ "ViewSortByAction", NULL, N_("_Sort By..."), NULL, NULL, NULL },
{ "ViewFilterByAction", NULL, N_("_Filter By..."), NULL, NULL, NULL },
{ "ViewRefreshAction", GTK_STOCK_REFRESH, N_("_Refresh"), "<control>r", { "ViewRefreshAction", GTK_STOCK_REFRESH, N_("_Refresh"), "<control>r",
N_("Refresh this window"), N_("Refresh this window"),
G_CALLBACK (gnc_main_window_cmd_view_refresh) }, G_CALLBACK (gnc_main_window_cmd_view_refresh) },
@ -343,6 +345,17 @@ static const gchar *always_insensitive_actions[] = {
}; };
/** The following are in the main window so they will always be
* present in the menu structure, but they are always hidden.
* These actions should be overridden in child windows where they
* have meaning. */
static const gchar *always_hidden_actions[] = {
"ViewSortByAction",
"ViewFilterByAction",
NULL
};
/** If a page is flagged as immutable, then the following actions /** If a page is flagged as immutable, then the following actions
* cannot be performed on that page. */ * cannot be performed on that page. */
static const gchar *immutable_page_actions[] = { static const gchar *immutable_page_actions[] = {
@ -2368,6 +2381,9 @@ gnc_main_window_setup_window (GncMainWindow *window)
gnc_plugin_update_actions(priv->action_group, gnc_plugin_update_actions(priv->action_group,
always_insensitive_actions, always_insensitive_actions,
"sensitive", FALSE); "sensitive", FALSE);
gnc_plugin_update_actions(priv->action_group,
always_hidden_actions,
"visible", FALSE);
gnc_plugin_set_important_actions (priv->action_group, gnc_plugin_set_important_actions (priv->action_group,
gnc_menu_important_actions); gnc_menu_important_actions);
gtk_ui_manager_insert_action_group (window->ui_merge, priv->action_group, 0); gtk_ui_manager_insert_action_group (window->ui_merge, priv->action_group, 0);

2
src/gnome-utils/ui/gnc-main-window-ui.xml
View File

@ -58,7 +58,9 @@
<separator name="ViewSep1"/> <separator name="ViewSep1"/>
<placeholder name="ViewContentPlaceholder"/> <placeholder name="ViewContentPlaceholder"/>
<separator name="ViewSep2"/> <separator name="ViewSep2"/>
<menuitem name="ViewSortBy" action="ViewSortByAction"/>
<placeholder name="ViewSortPlaceholder"/> <placeholder name="ViewSortPlaceholder"/>
<menuitem name="ViewFilterBy" action="ViewFilterByAction"/>
<placeholder name="ViewFilterPlaceholder"/> <placeholder name="ViewFilterPlaceholder"/>
<separator name="ViewSep3"/> <separator name="ViewSep3"/>
<placeholder name="ViewZoomPlaceholder"/> <placeholder name="ViewZoomPlaceholder"/>

4
src/gnome/ui/gnc-plugin-page-register-ui.xml
View File

@ -30,10 +30,6 @@
<separator name="ViewSep44"/> <separator name="ViewSep44"/>
<menuitem name="ViewStyleDoubleLine" action="ViewStyleDoubleLineAction"/> <menuitem name="ViewStyleDoubleLine" action="ViewStyleDoubleLineAction"/>
</placeholder> </placeholder>
<placeholder name="ViewSortPlaceholder">
<menuitem name="ViewSortBy" action="ViewSortByAction"/>
<menuitem name="ViewFilterBy" action="ViewFilterByAction"/>
</placeholder>
</menu> </menu>
<menu name="Actions" action="ActionsAction"> <menu name="Actions" action="ActionsAction">