From 482cf3700a1d1df629cc5d8c09a2f2490b3fcd77 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Thu, 19 Dec 2002 22:03:40 +0000 Subject: [With this commit, the shell compiles without deprecated GLib/GTK+ functions, except for a couple of places were we use GtkCList.] * Makefile.am (INCLUDES): Add `-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED'. * evolution-test-component.c (create_new_folder_selector): No gtk_window_set_policy(). * main.c (quit_box_new): gtk_window_set_resizable() instead of gtk_window_set_policy(). (view_map_callback): g_signal_handlers_disconnect_by_func() instead of gtk_signal_disconnect_by_func(). (main): No need to push the GdkRGB visual/cmap anymore. (new_view_created_callback): Likewise. * e-task-widget.c: Renamed member pixmap of ETaskWidgetPrivate to `image'. (init): Updated accordingly. (e_task_widget_construct): Use GtkImage, not GtkPixmap. * e-storage.c (class_init): Converted from gtk_signal_new() to g_signal_new(). * e-storage-set.c (class_init): Converted from gtk_signal_new() to g_signal_new(). * e-storage-set-view.c (setup_folder_properties_items_if_corba_storage_clicked): g_string_append_printf() instead of g_string_sprintfa(). (class_init): Converted from gtk_signal_new() to g_signal_new(). (setup_folder_changed_callbacks): Use e_signal_connect_while_alive() and e_signal_connect_full_while_alive(). * e-splash.c (e_splash_construct): gtk_window_set_resizable() instead of gtk_window_set_policy(). * e-shortcuts.c: Do not #include e-unicode.h. (shortcut_item_update): Use g_path_get_basename() instead of g_basename(). (e_shortcuts_add_default_shortcuts): No need to de-utfize strings. (e_shortcuts_add_default_group): Same here. * e-shortcuts-view.c: Do not #include . (class_init): Converted from gtk_signal_new() to g_signal_new(). (destroy_group_cb): No need to convert the text from UTF8. * e-shell.c (impl_dispose): g_signal_handlers_disconnect_by_func() instead of gtk_signal_disconnect_by_func(). (class_init): Use g_signal_new() instead of gtk_signal_new(). * e-shell-view.c: Do not #include e-unicode.h. Renamed member offline_toggle_pixmap to offline_toggle_image in EShellViewPrivate. (update_folder_title_bar): No need to de-UTF8-ize the title. (cleanup_delayed_selection): g_signal_handlers_disconnect_by_func() instead of gtk_signal_disconnect_by_func(). (ui_engine_add_hint_callback): gtk_label_set_text(), not gtk_label_set(). (class_init): Use g_signal_new() instead of gtk_signal_new(). (update_for_current_uri): No need to convert the title from UTF8. (setup_offline_toggle): Changed to set up a GtkImage, not a GtkPixmap. (update_offline_toggle_status): Accordingly (gtk_image* instead of gtk_pixmap*). (set_current_notebook_page): gtk_notebook_set_current_page(), not gtk_notebook_set_page(). (get_storage_set_path_from_uri): g_ascii_strncasecmp() instead of g_strncasecmp(). (folder_bar_popup_map_callback): Use e_signal_connect_while_alive() instead of gtk_signal_connect_while_alive(). (e_shell_view_construct): Likewise. (display_uri): g_signal_connect_after() instead of gtk_signal_connect_full(). (update_for_current_uri): g_signal_handlers_{block,unblock}_by_func() instead of gtk_signal_handler_{block,unblock}_by_func(). * e-shell-view-menu.c (command_about_box): gtk_window_set_resizable() instead of gtk_window_set_policy(). * e-shell-utils.c (get_mini_name): g_path_get_basename() instead of g_basename(). * e-shell-user-creatable-items-handler.c (append_xml_for_menu_item): g_string_append_printf() instead of g_string_sprintfa(). (create_menu_xml): Likewise. * e-shell-shared-folder-picker-dialog.c: Do not #include e-unicode.h. (progress_bar_timeout_callback): Expect a GtkProgressBar data and just use gtk_progress_bar_pulse(). (create_progress_dialog): gtk_window_set_resizable() instead of gtk_window_set_policy(). No gtk_progress_set_activity_mode(). (setup_server_option_menu): Just use gtk_menu_item_new_with_label() instead of e_utf8_gtk_menu_item_new_with_label(). * e-shell-settings-dialog.c (set_dialog_size): Ported to Pango. * e-shell-offline-sync.c (impl_SyncFolderProgressListener_updateProgress): gtk_progress_set_fraction() instead of gtk_progress_bar_set_percentage(). (sync_folder): Likewise. (setup_dialog): gtk_window_set_resizable() instead of gtk_window_set_policy(). (sync_folder): No gtk_progress_set_activity_mode(). * e-shell-offline-handler.c: #undef {G,GTK}_DISABLE_DEPRECATED here for now (need to port from GtkCList). (class_init): Use g_signal_new() * e-shell-importer.c: #undef {G,GTK}_DISABLE_DEPRECATED here for now (need to port from GtkCList). * e-shell-folder-title-bar.c (create_image_widget_from_xpm): Renamed from create_pixmap_widget_from_xpm(); handle GtkImage instead of GtkPixmap. (new_empty_image_widget): Renamed from new_empty_pixmap_widget(); return a GtkImage instead of a GtkPixmap. (add_navigation_buttons): Updated accordingly; so use GtkImages instead of GtkPixmaps. (e_shell_folder_title_bar_construct): Likewise. (e_shell_folder_title_bar_set_icon): Use gtk_image_* instead of gtk_pixmap_* on the image widgets. (class_init): Converted to use g_signal_new() instead of gtk_signal_new(). (e_shell_folder_title_bar_new): No need for pushing the GdkRGB visual/cmap anymore. * e-shell-folder-selection-dialog.c (check_folder_type_valid): Just use strcmp instead of strcasecmp(). (class_init): g_signal_new() instead of gtk_signal_new(). (e_shell_folder_selection_dialog_construct): Removed call to gtk_window_set_policy(). * e-shell-folder-creation-dialog.c (type_with_display_name_compare_func): Changed to use g_utf8_casefold(). * e-shell-folder-commands.c: Do not #include e-unicode.h. (e_shell_command_rename_folder): g_path_get_dirname() instead of g_dirname(). (folder_selection_dialog_folder_selected_callback): g_path_get_basename() instead of g_basename(). (rename_cb): Likewise. (delete_dialog): Do not convert from UTF8 for display purposes. (e_shell_command_rename_folder): Likewise. * e-shell-about-box.c (timeout_callback): Ported to Pango and use gdk_window_invalidate_rect() instead of gtk_widget_draw(). * e-setup.c (check_evolution_directory): Use gtk_window_set_resizable() instead of gtk_window_set_policy(). * e-local-storage.c: Do not include e-unicode.h. (create_folder): Use g_path_get_basename() instead of g_basename(). (create_folder_directory): Likewise. (remove_folder_directory): Likewise. (append_xfer_item_list): Likewise. * e-local-folder.c (construct_loading_metadata): Use g_path_get_basename() instead of g_basename(). * e-folder-dnd-bridge.c (handle_evolution_path_drag_motion): Use g_path_get_basename() instead of g_basename(). * e-corba-storage-registry.c: G_STRUCT_OFFSET instead of GTK_STRUCT_OFFSET. * e-corba-shortcuts.c: G_STRUCT_OFFSET instead of GTK_STRUCT_OFFSET. * e-component-registry.c (sleep_with_g_main_loop_timeout_callback): g_main_loop_* instead of g_main_*. (sleep_with_g_main_loop): Likewise. * e-activity-handler.c: G_STRUCT_OFFSET instead of GTK_STRUCT_OFFSET. * evolution-wizard.c (evolution_wizard_class_init): g_signal_new() instead of gtk_signal_new(). * evolution-storage-listener.c (class_init): g_signal_new() instead of gtk_signal_new(). * evolution-shell-view.c (class_init): g_signal_new() instead of gtk_signal_new(). * evolution-shell-component-dnd.c: G_STRUCT_OFFSET instead of GTK_STRUCT_OFFSET. * evolution-shell-component.c: G_STRUCT_OFFSET instead of GTK_STRUCT_OFFSET. * evolution-session.c: G_STRUCT_OFFSET instead of GTK_STRUCT_OFFSET. * evolution-folder-selector-button.c: Do not include e-unicode.h. (set_folder): No need to convert from UTF8 to locale encoding anymore. Removed unused variable. * evolution-config-control.c (class_init): Use g_signal_new() instead of gtk_signal_new(). * evolution-activity-client.c (class_init): Use g_signal_new() instead of gtk_signal_new(). * e-folder-list.c: Do not include e-unicode.h. Use E_MAKE_TYPE(). (e_folder_list_get_type): Removed explicit implementation of this. (e_folder_list_set_arg): Removed. (e_folder_list_get_arg): Removed. (e_folder_list_set_property): New. (e_folder_list_get_property): New. (e_folder_list_destroy): Removed. (e_folder_list_dispose): New. (e_folder_list_class_init): Updated accordingly. * e-folder.c (impl_save_info): Use G_OBJECT_TYPE_NAME() instead of gtk_type_name(). (impl_load_info): Likewise. (impl_remove): Likewise. (class_init): Use g_signal_new() instead of gtk_signal_new(). svn path=/trunk/; revision=19170 --- shell/e-shell-folder-title-bar.c | 97 +++++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 46 deletions(-) (limited to 'shell/e-shell-folder-title-bar.c') diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c index 3f20c8b189..b79933b2d6 100644 --- a/shell/e-shell-folder-title-bar.c +++ b/shell/e-shell-folder-title-bar.c @@ -25,7 +25,7 @@ #endif #include -#include +#include #include #include #include @@ -124,7 +124,7 @@ static const char *right_arrow_xpm[] = { /* Utility functions for managing icons and icon widgets. */ static GtkWidget * -create_pixmap_widget_from_xpm (const char **xpm) +create_image_widget_from_xpm (const char **xpm) { GdkPixbuf *pixbuf; GdkPixmap *pixmap; @@ -135,7 +135,7 @@ create_pixmap_widget_from_xpm (const char **xpm) gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, 127); - widget = gtk_pixmap_new (pixmap, mask); + widget = gtk_image_new_from_pixmap (pixmap, mask); gtk_widget_show (widget); return widget; @@ -156,9 +156,9 @@ new_empty_pixbuf (void) } static GtkWidget * -new_empty_pixmap_widget (void) +new_empty_image_widget (void) { - GtkWidget *pixmap_widget; + GtkWidget *image_widget; GdkPixmap *pixmap; GdkBitmap *mask; GdkPixbuf *empty_pixbuf; @@ -166,11 +166,11 @@ new_empty_pixmap_widget (void) empty_pixbuf = new_empty_pixbuf (); gdk_pixbuf_render_pixmap_and_mask (empty_pixbuf, &pixmap, &mask, 127); - pixmap_widget = gtk_pixmap_new (pixmap, mask); + image_widget = gtk_image_new_from_pixmap (pixmap, mask); g_object_unref (empty_pixbuf); - return pixmap_widget; + return image_widget; } @@ -196,14 +196,17 @@ set_title_bar_label_style (GtkWidget *widget) static int get_max_clipped_label_width (EClippedLabel *clipped_label) { - GdkFont *font; + PangoLayout *layout; int width; - font = gtk_style_get_font (GTK_WIDGET (clipped_label)->style); + layout = gtk_widget_create_pango_layout (GTK_WIDGET (clipped_label), + clipped_label->label); - width = gdk_string_width (font, clipped_label->label); + pango_layout_get_pixel_size (layout, &width, NULL); width += 2 * GTK_MISC (clipped_label)->xpad; + g_object_unref (layout); + return width; } @@ -334,8 +337,8 @@ static void add_navigation_buttons (EShellFolderTitleBar *folder_title_bar) { EShellFolderTitleBarPrivate *priv; - GtkWidget *back_pixmap; - GtkWidget *forward_pixmap; + GtkWidget *back_image; + GtkWidget *forward_image; priv = folder_title_bar->priv; @@ -343,8 +346,8 @@ add_navigation_buttons (EShellFolderTitleBar *folder_title_bar) gtk_button_set_relief (GTK_BUTTON (priv->back_button), GTK_RELIEF_NONE); GTK_WIDGET_UNSET_FLAGS (priv->back_button, GTK_CAN_FOCUS); - back_pixmap = create_pixmap_widget_from_xpm (left_arrow_xpm); - gtk_container_add (GTK_CONTAINER (priv->back_button), back_pixmap); + back_image = create_image_widget_from_xpm (left_arrow_xpm); + gtk_container_add (GTK_CONTAINER (priv->back_button), back_image); g_signal_connect (priv->back_button, "clicked", G_CALLBACK (back_button_clicked_callback), folder_title_bar); @@ -353,8 +356,8 @@ add_navigation_buttons (EShellFolderTitleBar *folder_title_bar) gtk_button_set_relief (GTK_BUTTON (priv->forward_button), GTK_RELIEF_NONE); GTK_WIDGET_UNSET_FLAGS (priv->forward_button, GTK_CAN_FOCUS); - forward_pixmap = create_pixmap_widget_from_xpm (right_arrow_xpm); - gtk_container_add (GTK_CONTAINER (priv->forward_button), forward_pixmap); + forward_image = create_image_widget_from_xpm (right_arrow_xpm); + gtk_container_add (GTK_CONTAINER (priv->forward_button), forward_image); g_signal_connect (priv->forward_button, "clicked", G_CALLBACK (forward_button_clicked_callback), folder_title_bar); @@ -471,27 +474,33 @@ class_init (EShellFolderTitleBarClass *klass) parent_class = g_type_class_ref(PARENT_TYPE); - signals[TITLE_TOGGLED] = gtk_signal_new ("title_toggled", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - G_STRUCT_OFFSET (EShellFolderTitleBarClass, title_toggled), - e_shell_marshal_NONE__BOOL, - GTK_TYPE_NONE, 1, - GTK_TYPE_BOOL); - - signals[BACK_CLICKED] = gtk_signal_new ("back_clicked", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - G_STRUCT_OFFSET (EShellFolderTitleBarClass, back_clicked), - e_shell_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); - - signals[FORWARD_CLICKED] = gtk_signal_new ("forward_clicked", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - G_STRUCT_OFFSET (EShellFolderTitleBarClass, forward_clicked), - e_shell_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); + signals[TITLE_TOGGLED] + = g_signal_new ("title_toggled", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (EShellFolderTitleBarClass, title_toggled), + NULL, NULL, + e_shell_marshal_NONE__BOOL, + G_TYPE_NONE, 1, + G_TYPE_BOOLEAN); + + signals[BACK_CLICKED] + = g_signal_new ("back_clicked", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (EShellFolderTitleBarClass, back_clicked), + NULL, NULL, + e_shell_marshal_NONE__NONE, + G_TYPE_NONE, 0); + + signals[FORWARD_CLICKED] + = g_signal_new ("forward_clicked", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (EShellFolderTitleBarClass, forward_clicked), + NULL, NULL, + e_shell_marshal_NONE__NONE, + G_TYPE_NONE, 0); } static void @@ -541,7 +550,7 @@ e_shell_folder_title_bar_construct (EShellFolderTitleBar *folder_title_bar) priv = folder_title_bar->priv; widget = GTK_WIDGET (folder_title_bar); - priv->title_icon = new_empty_pixmap_widget (); + priv->title_icon = new_empty_image_widget (); gtk_misc_set_alignment (GTK_MISC (priv->title_icon), 1.0, .5); gtk_misc_set_padding (GTK_MISC (priv->title_icon), 2, 0); gtk_widget_show (priv->title_icon); @@ -562,7 +571,7 @@ e_shell_folder_title_bar_construct (EShellFolderTitleBar *folder_title_bar) gtk_widget_show (priv->folder_bar_label); set_title_bar_label_style (priv->folder_bar_label); - priv->title_button_icon = new_empty_pixmap_widget (); + priv->title_button_icon = new_empty_image_widget (); gtk_widget_show (priv->title_button_icon); title_button_hbox = gtk_hbox_new (FALSE, 0); @@ -570,7 +579,7 @@ e_shell_folder_title_bar_construct (EShellFolderTitleBar *folder_title_bar) FALSE, TRUE, 2); gtk_box_pack_start (GTK_BOX (title_button_hbox), priv->title_button_label, TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (title_button_hbox), create_pixmap_widget_from_xpm (down_arrow_xpm), + gtk_box_pack_start (GTK_BOX (title_button_hbox), create_image_widget_from_xpm (down_arrow_xpm), FALSE, TRUE, 2); gtk_widget_show (title_button_hbox); @@ -615,13 +624,9 @@ e_shell_folder_title_bar_new (void) { EShellFolderTitleBar *new; - gtk_widget_push_colormap (gdk_rgb_get_cmap ()); - gtk_widget_push_visual (gdk_rgb_get_visual ()); new = g_object_new (e_shell_folder_title_bar_get_type (), NULL); e_shell_folder_title_bar_construct (new); - gtk_widget_pop_visual (); - gtk_widget_pop_colormap (); return GTK_WIDGET (new); } @@ -718,10 +723,10 @@ e_shell_folder_title_bar_set_icon (EShellFolderTitleBar *folder_title_bar, } gdk_pixbuf_render_pixmap_and_mask (priv->icon, &pixmap, &mask, 127); - gtk_pixmap_set (GTK_PIXMAP (priv->title_button_icon), pixmap, mask); + gtk_image_set_from_pixmap (GTK_IMAGE (priv->title_button_icon), pixmap, mask); gdk_pixbuf_render_pixmap_and_mask (priv->icon, &pixmap, &mask, 127); - gtk_pixmap_set (GTK_PIXMAP (priv->title_icon), pixmap, mask); + gtk_image_set_from_pixmap (GTK_IMAGE (priv->title_icon), pixmap, mask); } -- cgit