callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

created a model for the EShortcutBar. This will probably have to be moved

Browse Source 
2000-07-16  Damon Chaplin  <damon@helixcode.com>

	* e-shortcuts-view.c (e_shortcuts_view_construct): created a model
	for the EShortcutBar. This will probably have to be moved to support
	multiple views.
	(class_init): #if'd out overriding the class functions. They don't
	exist any more (they are in the model instead).

svn path=/trunk/; revision=4187
This commit is contained in:
Damon Chaplin
2000-07-17 06:24:26 +00:00
committed by Damon Chaplin
parent 4c3eaff412
commit 81531f8286
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shell/ChangeLog
View File

@ -1,3 +1,11 @@
2000-07-16 Damon Chaplin <damon@helixcode.com>
* e-shortcuts-view.c (e_shortcuts_view_construct): created a model
for the EShortcutBar. This will probably have to be moved to support
multiple views.
(class_init): #if'd out overriding the class functions. They don't
exist any more (they are in the model instead).
2000-07-12 Christopher James Lahey <clahey@helixcode.com>
* main.c: Fixed to match gconf API change.

17
shell/e-shortcuts-view.c
View File

@ -109,7 +109,7 @@ load_group (EShortcutsView *shortcuts_view,
}
name = e_folder_get_name (folder);
e_shortcut_bar_add_item (E_SHORTCUT_BAR (shortcuts_view), group_num, uri, name);
e_shortcut_model_add_item (E_SHORTCUT_BAR (shortcuts_view)->model, group_num, -1, uri, name);
}
e_free_string_list (shortcut_list);
@ -132,8 +132,8 @@ load_all_shortcuts (EShortcutsView *shortcuts_view,
const char *group_title;
group_title = (const char *) p->data;
group_num = e_shortcut_bar_add_group (E_SHORTCUT_BAR (shortcuts_view),
group_title);
group_num = e_shortcut_model_add_group (E_SHORTCUT_BAR (shortcuts_view)->model,
-1, group_title);
load_group (shortcuts_view, shortcuts, group_title, group_num);
}
@ -321,8 +321,9 @@ remove_shortcut_cb (GtkWidget *widget,
e_shortcuts_remove_shortcut (shortcuts, menu_data->group_num, menu_data->item_num);
/* FIXME not real model-view. */
e_shortcut_bar_remove_item (E_SHORTCUT_BAR (shortcuts_view),
menu_data->group_num, menu_data->item_num);
e_shortcut_model_remove_item (E_SHORTCUT_BAR (shortcuts_view)->model,
menu_data->group_num,
menu_data->item_num);
}
static GnomeUIInfo shortcut_right_click_menu_uiinfo[] = {
@ -507,11 +508,12 @@ class_init (EShortcutsViewClass *klass)
shortcut_bar_class = E_SHORTCUT_BAR_CLASS (klass);
shortcut_bar_class->selected_item = selected_item;
#if 0
shortcut_bar_class->added_item = added_item;
shortcut_bar_class->removed_item = removed_item;
shortcut_bar_class->added_group = added_group;
shortcut_bar_class->removed_group = removed_group;
#endif
parent_class = gtk_type_class (e_shortcut_bar_get_type ());
signals[ACTIVATE_SHORTCUT] =
@ -550,6 +552,9 @@ e_shortcuts_view_construct (EShortcutsView *shortcuts_view,
priv = shortcuts_view->priv;
e_shortcut_bar_set_model (E_SHORTCUT_BAR (shortcuts_view),
e_shortcut_model_new ());
e_shortcut_bar_set_icon_callback (E_SHORTCUT_BAR (shortcuts_view), icon_callback,
shortcuts);