From 385ba85d425e59a0a254abef620a90bd563cdeb8 Mon Sep 17 00:00:00 2001 From: Jason Leach Date: Fri, 3 Aug 2001 23:08:38 +0000 Subject: [Removing Evolution::LocalStorage interface, abstracting the unread counts 2001-08-03 Jason Leach [Removing Evolution::LocalStorage interface, abstracting the unread counts from a folder's name, also abstract unread counts from a shortcut's name. Fixes #4489 and #5497] * e-shortcuts.c (shortcut_item_new): Take an unread_count argument now. (shortcut_item_update): Ditto. * e-shortcuts-view-model.c (get_name_with_unread): Get a string containing a shortcut name and it's unread, because these are abstracted now. (load_group_into_model): Use the above function to make shortcuts that have unread counts. * e-storage-set-view.c (update_folder_with_unread_hash): Keep a hash of folder names with unread counts, because the folder name and it's unread count are to be separated, only the ETree is supposed to present it as one string. * e-shell-view.c: Renamed EShellView::view_title_bar to folder_title_bar, to closer match the * e-shell-view-menu.c (new_shortcut_dialog_folder_selected_cb): Make a shortcut with the unread count. * e-shell-folder-commands.c (e_shell_command_add_to_shortcut_bar): Make a shortcut with the unread count. * e-local-storage.c: Updated for API changes. * e-folder.c (e_folder_get_unread_count): New function, does what it says. (e_folder_set_unread_count): Ditto. * e-corba-storage.c (impl_StorageListener_new_folder): Renamed to match the IDL function name. (impl_StorageListener_update_folder): Ditto. (impl_StorageListener_removed_folder): Ditto. * Evolution-Storage.idl (struct Folder): Replace the boolean highlighted with a long unread_count. (updateFolder): Brought in from the now dead Evolution::LocalStorage. * Evolution-Shell.idl (getLocalStorage): Return a Storage instead of a LocalStorage. * Evolution-LocalStorage.idl: Removed, no longer needed, only used function, updateFolder, has been moved into Evolution::Storage interface. * evolution-local-storage.[ch]: Ditto. * evolution-storage.c (impl_Storage_updateFolder): Implementation of the updateFolder taken from ::LocalStorage. (class_init): New "update_folder" signal, taken from evolution-local-storage.c too. (evolution_storage_update_folder): Take an @unread_count int instead of a @highlighted boolean. (evolution_storage_new_folder): Same for here. (evolution_storage_update_folder_by_uri): And here. * evolution-storage-listener.h: "update_folder" signal no longer sends a @highlighted boolean. 2001-08-03 Jason Leach * e-shell-view-menu.c (update_offline_menu_item): Use Jakub's new "Work Online" icon and fix a typo. svn path=/trunk/; revision=11633 --- shell/e-shell-view-menu.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'shell/e-shell-view-menu.c') diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c index 9e19ac310f..0a5c769bca 100644 --- a/shell/e-shell-view-menu.c +++ b/shell/e-shell-view-menu.c @@ -377,7 +377,7 @@ command_rename_folder (BonoboUIComponent *uih, EShellView *shell_view; shell_view = E_SHELL_VIEW (data); - e_shell_command_rename_folder (e_shell_view_get_shell (shell_view), shell_view); +/* e_shell_command_rename_folder (e_shell_view_get_shell (shell_view), shell_view); */ } static void @@ -562,7 +562,7 @@ new_shortcut_dialog_folder_selected_cb (EShellFolderSelectionDialog *folder_sele evolution_uri = g_strconcat (E_SHELL_URI_PREFIX, path, NULL); /* FIXME: I shouldn't have to set the type here. Maybe. */ - e_shortcuts_add_shortcut (shortcuts, group_num, -1, evolution_uri, NULL, e_folder_get_type_string (folder)); + e_shortcuts_add_shortcut (shortcuts, group_num, -1, evolution_uri, NULL, e_folder_get_unread_count (folder), e_folder_get_type_string (folder)); g_free (evolution_uri); @@ -651,6 +651,19 @@ static EPixmap pixmaps [] = { E_PIXMAP ("/menu/File/Folder/Folder", "folder.xpm"), E_PIXMAP ("/menu/File/FileImporter", "import.xpm"), E_PIXMAP ("/menu/File/ToggleOffline", "work_offline.xpm"), + + E_PIXMAP_END +}; + +static EPixmap offline_pixmaps [] = { + E_PIXMAP ("/menu/File/ToggleOffline", "work_offline.xpm"), + + E_PIXMAP_END +}; + +static EPixmap online_pixmaps [] = { + E_PIXMAP ("/menu/File/ToggleOffline", "work_online-16.png"), + E_PIXMAP_END }; @@ -691,8 +704,9 @@ update_offline_menu_item (EShellView *shell_view, "/menu/File/ToggleOffline", "verb", "WorkOnline", NULL); bonobo_ui_component_set_prop (ui_component, - "/commands/WorkOnline", + "/commands/ToggleOffline", "sensitive", "1", NULL); + e_pixmaps_update (ui_component, online_pixmaps); break; case E_SHELL_LINE_STATUS_ONLINE: @@ -705,6 +719,7 @@ update_offline_menu_item (EShellView *shell_view, bonobo_ui_component_set_prop (ui_component, "/commands/ToggleOffline", "sensitive", "1", NULL); + e_pixmaps_update (ui_component, offline_pixmaps); break; case E_SHELL_LINE_STATUS_GOING_OFFLINE: @@ -717,6 +732,7 @@ update_offline_menu_item (EShellView *shell_view, bonobo_ui_component_set_prop (ui_component, "/commands/ToggleOffline", "sensitive", "0", NULL); + e_pixmaps_update (ui_component, offline_pixmaps); break; default: -- cgit v1.2.3