mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Rework the way that gnucash remembers menu/toolbar items that need to
be updated when switching between MDI windows. This solve the problem of the gnome MDI code deleting menuitems at will. #96302 Make the UI a bit cleaner when in MDI "top level" mode. Switching windows no longer makes menu/toolbar items appear to change in the "previous" window. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@7398 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
David Hampton
parent
2305d0823d
commit
040f91627b
32
ChangeLog
32
ChangeLog
@ -1,3 +1,35 @@
|
||||
2002-10-27 David Hampton <hampton@employees.org>
|
||||
|
||||
* src/gnome-utils/gnc-mdi-utils.c (various routines): When
|
||||
switching between MDI styles, the gnome MDI code creates and
|
||||
destroys widgets at will. Because of this, remember the list of
|
||||
menu/toolbar *names* to be modified and then look up the widgets
|
||||
each time a change needs to be made to the visibility/sensitivity
|
||||
of the item. #96302
|
||||
(gnc_mdi_child_changed_cb): If the MDI style is "toplevel", then
|
||||
don't update the state of any menu/toolbar items when switching
|
||||
out of a window. Leave them as they were since that window is
|
||||
still visible to the user.
|
||||
|
||||
* src/report/report-gnome/window-report.c
|
||||
(gnc_report_window_load_cb): Don't try to unprotect the #f
|
||||
object. Scheme doesn't normally care, but this will crash if
|
||||
running under gdb.
|
||||
|
||||
2002-10-26 David Hampton <hampton@employees.org>
|
||||
|
||||
* src/app-utils/option-util.c (gnc_commit_option): Use the new
|
||||
function to send an error message to the gui code instead of
|
||||
printing a message on stdout. #96166
|
||||
|
||||
* src/gnome-utils/gnc-currency-edit.c (currency_compare): Sort by
|
||||
currency identifer since it appears first in the display. #96159
|
||||
Change a couple other functions so that the full currency name is
|
||||
always displayed in the widget.
|
||||
|
||||
* src/gnome/druid-hierarchy.c: Replace the commodity editor with a
|
||||
currency selector. #95594
|
||||
|
||||
2002-10-26 Joshua Sled <jsled@asynchronous.org>
|
||||
|
||||
* src/gnome/dialog-sxsincelast.c (sxsincelast_tc_row_sel): Place
|
||||
|
||||
@ -124,6 +124,11 @@ gnc_mdi_file_percentage (const char *message, int percentage)
|
||||
gtk_main_iteration ();
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
GNCMDIChildInfo *mc;
|
||||
gboolean topmost;
|
||||
} gnc_mdi_update_args;
|
||||
|
||||
/**
|
||||
* gnc_mdi_widget_show
|
||||
*
|
||||
@ -133,16 +138,45 @@ gnc_mdi_file_percentage (const char *message, int percentage)
|
||||
* This routine is merely a wrapper around gtk_widget_show/hide so
|
||||
* that those functions can be called on a list of widgets.
|
||||
*/
|
||||
void
|
||||
gnc_mdi_widget_show(gpointer data, gpointer user_data)
|
||||
static void
|
||||
gnc_mdi_menu_widget_show(gpointer data, gpointer user_data)
|
||||
{
|
||||
g_return_if_fail(data != NULL);
|
||||
g_return_if_fail(GTK_IS_WIDGET(data));
|
||||
gchar *path = (gchar *)data;
|
||||
gnc_mdi_update_args *args = (gnc_mdi_update_args *)user_data;
|
||||
GtkWidget *widget;
|
||||
|
||||
if ((gboolean)user_data) {
|
||||
gtk_widget_show(GTK_WIDGET(data));
|
||||
g_return_if_fail(data != NULL);
|
||||
g_return_if_fail(user_data != NULL);
|
||||
|
||||
widget = gnc_mdi_child_find_menu_item(args->mc, path);
|
||||
if (widget == NULL)
|
||||
return;
|
||||
|
||||
if (args->topmost) {
|
||||
gtk_widget_show(widget);
|
||||
} else {
|
||||
gtk_widget_hide(GTK_WIDGET(data));
|
||||
gtk_widget_hide(widget);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
gnc_mdi_toolbar_widget_show(gpointer data, gpointer user_data)
|
||||
{
|
||||
gchar *path = (gchar *)data;
|
||||
gnc_mdi_update_args *args = (gnc_mdi_update_args *)user_data;
|
||||
GtkWidget *widget;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
g_return_if_fail(user_data != NULL);
|
||||
|
||||
widget = gnc_mdi_child_find_toolbar_item(args->mc, path);
|
||||
if (widget == NULL)
|
||||
return;
|
||||
|
||||
if (args->topmost) {
|
||||
gtk_widget_show(widget);
|
||||
} else {
|
||||
gtk_widget_hide(widget);
|
||||
}
|
||||
}
|
||||
|
||||
@ -156,12 +190,37 @@ gnc_mdi_widget_show(gpointer data, gpointer user_data)
|
||||
* so that functions can be called on a list of widgets.
|
||||
*/
|
||||
static void
|
||||
gnc_mdi_widget_sensitive(gpointer data, gpointer user_data)
|
||||
gnc_mdi_menu_widget_sensitive(gpointer data, gpointer user_data)
|
||||
{
|
||||
g_return_if_fail(data != NULL);
|
||||
g_return_if_fail(GTK_IS_WIDGET(data));
|
||||
gchar *path = (gchar *)data;
|
||||
gnc_mdi_update_args *args = (gnc_mdi_update_args *)user_data;
|
||||
GtkWidget *widget;
|
||||
|
||||
gtk_widget_set_sensitive(GTK_WIDGET(data), (gboolean)user_data);
|
||||
g_return_if_fail(data != NULL);
|
||||
g_return_if_fail(user_data != NULL);
|
||||
|
||||
widget = gnc_mdi_child_find_menu_item(args->mc, path);
|
||||
if (widget == NULL)
|
||||
return;
|
||||
|
||||
gtk_widget_set_sensitive(widget, args->topmost);
|
||||
}
|
||||
|
||||
static void
|
||||
gnc_mdi_toolbar_widget_sensitive(gpointer data, gpointer user_data)
|
||||
{
|
||||
gchar *path = (gchar *)data;
|
||||
gnc_mdi_update_args *args = (gnc_mdi_update_args *)user_data;
|
||||
GtkWidget *widget;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
g_return_if_fail(user_data != NULL);
|
||||
|
||||
widget = gnc_mdi_child_find_toolbar_item(args->mc, path);
|
||||
if (widget == NULL)
|
||||
return;
|
||||
|
||||
gtk_widget_set_sensitive(widget, args->topmost);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -179,16 +238,22 @@ gnc_mdi_widget_sensitive(gpointer data, gpointer user_data)
|
||||
static void
|
||||
gnc_mdi_update_widgets(GNCMDIChildInfo *mc, gboolean topmost)
|
||||
{
|
||||
gnc_mdi_update_args args;
|
||||
|
||||
if (mc == NULL) return; /* expected once */
|
||||
|
||||
g_list_foreach(mc->widgets[GNC_AUTO_SHOW], gnc_mdi_widget_show,
|
||||
(gpointer)topmost);
|
||||
g_list_foreach(mc->widgets[GNC_AUTO_HIDE], gnc_mdi_widget_show,
|
||||
(gpointer)!topmost);
|
||||
g_list_foreach(mc->widgets[GNC_AUTO_ENABLE], gnc_mdi_widget_sensitive,
|
||||
(gpointer)topmost);
|
||||
g_list_foreach(mc->widgets[GNC_AUTO_DISABLE], gnc_mdi_widget_sensitive,
|
||||
(gpointer)!topmost);
|
||||
args.mc = mc;
|
||||
args.topmost = topmost;
|
||||
g_list_foreach(mc->menu_names[GNC_AUTO_SHOW], gnc_mdi_menu_widget_show, &args);
|
||||
g_list_foreach(mc->toolbar_names[GNC_AUTO_SHOW], gnc_mdi_toolbar_widget_show, &args);
|
||||
g_list_foreach(mc->menu_names[GNC_AUTO_ENABLE], gnc_mdi_menu_widget_sensitive, &args);
|
||||
g_list_foreach(mc->toolbar_names[GNC_AUTO_ENABLE], gnc_mdi_toolbar_widget_sensitive, &args);
|
||||
|
||||
args.topmost = !topmost;
|
||||
g_list_foreach(mc->menu_names[GNC_AUTO_HIDE], gnc_mdi_menu_widget_show, &args);
|
||||
g_list_foreach(mc->toolbar_names[GNC_AUTO_HIDE], gnc_mdi_toolbar_widget_show, &args);
|
||||
g_list_foreach(mc->menu_names[GNC_AUTO_DISABLE], gnc_mdi_menu_widget_sensitive, &args);
|
||||
g_list_foreach(mc->toolbar_names[GNC_AUTO_DISABLE], gnc_mdi_toolbar_widget_sensitive, &args);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -305,37 +370,25 @@ gnc_mdi_child_auto_menu(GNCMDIChildInfo *mc,
|
||||
GNCMDIAutoType type,
|
||||
gchar *first_path, ...)
|
||||
{
|
||||
GnomeDockItem *di;
|
||||
GtkWidget *menubar;
|
||||
GtkWidget *menu;
|
||||
GtkWidget *menuitem;
|
||||
GList *walker;
|
||||
va_list args;
|
||||
gchar *path;
|
||||
int pos;
|
||||
|
||||
if (mc->app == NULL)
|
||||
return;
|
||||
|
||||
di = gnome_app_get_dock_item_by_name (mc->app, GNOME_APP_MENUBAR_NAME);
|
||||
if (di == NULL)
|
||||
return;
|
||||
|
||||
menubar = gnome_dock_item_get_child (di);
|
||||
if (menubar == NULL)
|
||||
return;
|
||||
|
||||
va_start(args, first_path);
|
||||
for (path = first_path; path != NULL; path = va_arg(args, gchar *)) {
|
||||
menu = gnome_app_find_menu_pos (menubar, path, &pos);
|
||||
if (menu == NULL)
|
||||
for (walker = g_list_first(mc->menu_names[type]);
|
||||
walker;
|
||||
walker = g_list_next(walker)) {
|
||||
if (strcmp(path, walker->data) == 0)
|
||||
break;
|
||||
}
|
||||
if (walker) {
|
||||
/* Found. Don't add again. */
|
||||
continue;
|
||||
}
|
||||
|
||||
menuitem = (GtkWidget*)g_list_nth_data(GTK_MENU_SHELL(menu)->children, pos-1);
|
||||
if (menuitem == NULL)
|
||||
continue;
|
||||
|
||||
if (g_list_index(mc->widgets[type], menuitem) == -1)
|
||||
mc->widgets[type] = g_list_append(mc->widgets[type], menuitem);
|
||||
/* Not found, add it. */
|
||||
mc->menu_names[type] = g_list_append(mc->menu_names[type], path);
|
||||
}
|
||||
va_end(args);
|
||||
}
|
||||
@ -369,45 +422,25 @@ gnc_mdi_child_auto_toolbar(GNCMDIChildInfo *mc,
|
||||
GNCMDIAutoType type,
|
||||
gchar *first_path, ...)
|
||||
{
|
||||
GnomeDockItem *di;
|
||||
GtkToolbar *toolbar;
|
||||
GtkToolbarChild *child;
|
||||
GtkWidget *widget = NULL;
|
||||
gchar *label;
|
||||
gchar *path, *transl;
|
||||
GList *walker;
|
||||
gchar *path;
|
||||
va_list args;
|
||||
int pos;
|
||||
|
||||
if (mc->app == NULL)
|
||||
return;
|
||||
|
||||
di = gnome_app_get_dock_item_by_name (mc->app, GNOME_APP_TOOLBAR_NAME);
|
||||
if (di == NULL)
|
||||
return;
|
||||
|
||||
toolbar = GTK_TOOLBAR(gnome_dock_item_get_child (di));
|
||||
if (toolbar == NULL)
|
||||
return;
|
||||
|
||||
va_start(args, first_path);
|
||||
for (path = first_path; path != NULL; path = va_arg(args, gchar *)) {
|
||||
transl = L_(path);
|
||||
for (pos = 0; pos < toolbar->num_children; pos++) {
|
||||
child = g_list_nth_data(toolbar->children, pos);
|
||||
if ((child == NULL) || (child->label == NULL) || (child->widget == NULL))
|
||||
continue;
|
||||
gtk_label_get(GTK_LABEL(child->label), &label);
|
||||
if (strcasecmp(label, transl) == 0) {
|
||||
widget = child->widget;
|
||||
for (walker = g_list_first(mc->toolbar_names[type]);
|
||||
walker;
|
||||
walker = g_list_next(walker)) {
|
||||
if (strcmp(path, walker->data) == 0)
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (walker) {
|
||||
/* Found. Don't add again. */
|
||||
continue;
|
||||
}
|
||||
|
||||
if (widget == NULL)
|
||||
continue;
|
||||
|
||||
if (g_list_index(mc->widgets[type], widget) == -1)
|
||||
mc->widgets[type] = g_list_append(mc->widgets[type], widget);
|
||||
/* Not found, add it. */
|
||||
mc->toolbar_names[type] = g_list_append(mc->toolbar_names[type], path);
|
||||
}
|
||||
va_end(args);
|
||||
}
|
||||
@ -634,7 +667,8 @@ gnc_mdi_child_changed_cb (GnomeMDI * mdi, GnomeMDIChild * prev_child,
|
||||
if (prev_child)
|
||||
{
|
||||
prevwin = gtk_object_get_user_data (GTK_OBJECT(prev_child));
|
||||
gnc_mdi_update_widgets(prevwin, FALSE);
|
||||
if (mdi->mode != GNOME_MDI_TOPLEVEL)
|
||||
gnc_mdi_update_widgets(prevwin, FALSE);
|
||||
}
|
||||
|
||||
if (mdi && mdi->active_child)
|
||||
@ -838,9 +872,9 @@ gnc_mdi_new (const char *app_name,
|
||||
{
|
||||
GNCMDIInfo * gnc_mdi;
|
||||
|
||||
if (gnc_mdi_current)
|
||||
if (gnc_mdi_current) {
|
||||
return gnc_mdi_current;
|
||||
|
||||
}
|
||||
g_return_val_if_fail (app_name != NULL, NULL);
|
||||
g_return_val_if_fail (title != NULL, NULL);
|
||||
g_return_val_if_fail (can_restore_cb != NULL, NULL);
|
||||
|
||||
@ -95,7 +95,8 @@ struct gnc_mdi_child_info
|
||||
char * title;
|
||||
|
||||
GNCMDIAutoSetup menu_tweaking;
|
||||
GList * widgets[GNC_AUTO_LAST];
|
||||
GList * menu_names[GNC_AUTO_LAST];
|
||||
GList * toolbar_names[GNC_AUTO_LAST];
|
||||
|
||||
GtkCallback dispatch_callback[GNC_DISP_LAST];
|
||||
gpointer dispatch_data[GNC_DISP_LAST];
|
||||
@ -136,7 +137,6 @@ void gnc_mdi_set_dispatch_cb (GNCMDIChildInfo * mc, GNCMDIDispatchType type,
|
||||
gboolean gnc_mdi_get_toolbar_visibility (void);
|
||||
void gnc_mdi_set_toolbar_visibility (gboolean visible);
|
||||
void gnc_mdi_show_toolbar (GNCMDIChildInfo *mc);
|
||||
void gnc_mdi_widget_show(gpointer data, gpointer user_data);
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user