diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2007-11-15 06:04:21 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-11-15 06:04:21 +0800 |
| commit | 9e4fcb29cf7f05c18f7fd34e318f9e795fa32e91 (patch) | |
| tree | 2e1e96f33404781354c422a7e9beaf458ebeb655 /widgets | |
| parent | 7e8f8bb9e5167b0219b48ab3e8062080d3740b0a (diff) | |
| download | gsoc2013-evolution-9e4fcb29cf7f05c18f7fd34e318f9e795fa32e91.tar gsoc2013-evolution-9e4fcb29cf7f05c18f7fd34e318f9e795fa32e91.tar.gz gsoc2013-evolution-9e4fcb29cf7f05c18f7fd34e318f9e795fa32e91.tar.bz2 gsoc2013-evolution-9e4fcb29cf7f05c18f7fd34e318f9e795fa32e91.tar.lz gsoc2013-evolution-9e4fcb29cf7f05c18f7fd34e318f9e795fa32e91.tar.xz gsoc2013-evolution-9e4fcb29cf7f05c18f7fd34e318f9e795fa32e91.tar.zst gsoc2013-evolution-9e4fcb29cf7f05c18f7fd34e318f9e795fa32e91.zip | |
** Remove trailing whitespace from source code.
2007-11-14 Matthew Barnes <mbarnes@redhat.com>
** Remove trailing whitespace from source code.
svn path=/trunk/; revision=34537
Diffstat (limited to 'widgets')
226 files changed, 2602 insertions, 2602 deletions
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index 48bf09a1b0..e1a75412bb 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -112,7 +112,7 @@ static void set_map_timezone (ETimezoneDialog *etd, icaltimezone *zone); static void on_combo_changed (GtkEditable *entry, ETimezoneDialog *etd); -static void map_destroy_cb (gpointer data, +static void map_destroy_cb (gpointer data, GObject *where_object_was); G_DEFINE_TYPE (ETimezoneDialog, e_timezone_dialog, G_TYPE_OBJECT) @@ -311,7 +311,7 @@ get_local_offset (void) time_t now = time(NULL), t_gmt, t_local; struct tm gmt, local; int diff; - + gmtime_r (&now, &gmt); localtime_r (&now, &local); t_gmt = mktime (&gmt); @@ -326,7 +326,7 @@ static icaltimezone* get_local_timezone(void) { icaltimezone *zone; - + tzset(); zone = icaltimezone_get_builtin_timezone_from_offset (-timezone, tzname[0]); @@ -420,13 +420,13 @@ zone_display_name_with_offset (icaltimezone *zone) int offset; char buffer [100]; time_t now = time(NULL); - + gmtime_r ((const time_t *) &now, &local); tt = tm_to_icaltimetype (&local, TRUE); offset = icaltimezone_get_utc_offset(zone, &tt, NULL); format_utc_offset (offset, buffer); - + display_name = icaltimezone_get_display_name (zone); if (icaltimezone_get_builtin_timezone (display_name)) display_name = _(display_name); @@ -438,7 +438,7 @@ static const char * zone_display_name (icaltimezone *zone) { const char *display_name; - + display_name = icaltimezone_get_display_name (zone); if (icaltimezone_get_builtin_timezone (display_name)) display_name = _(display_name); @@ -479,7 +479,7 @@ on_map_motion (GtkWidget *widget, GdkEventMotion *event, gpointer data) double longitude, latitude; icaltimezone *new_zone; char *display=NULL; - + etd = E_TIMEZONE_DIALOG (data); priv = etd->priv; @@ -503,7 +503,7 @@ on_map_motion (GtkWidget *widget, GdkEventMotion *event, gpointer data) gtk_label_set_text (GTK_LABEL (priv->preview_label), display); g_free (display); - + return TRUE; } @@ -543,7 +543,7 @@ on_map_visibility_changed (GtkWidget *w, GdkEventVisibility *event, { ETimezoneDialog *etd; ETimezoneDialogPrivate *priv; - + etd = E_TIMEZONE_DIALOG (data); priv = etd->priv; @@ -570,31 +570,31 @@ on_map_button_pressed (GtkWidget *w, GdkEventButton *event, gpointer data) ETimezoneDialog *etd; ETimezoneDialogPrivate *priv; double longitude, latitude; - + etd = E_TIMEZONE_DIALOG (data); priv = etd->priv; e_map_window_to_world (priv->map, (double) event->x, (double) event->y, &longitude, &latitude); - + if (event->button != 1) { e_map_zoom_out (priv->map); } else { if (e_map_get_magnification (priv->map) <= 1.0) e_map_zoom_to_location (priv->map, longitude, latitude); - + if (priv->point_selected) e_map_point_set_color_rgba (priv->map, priv->point_selected, E_TIMEZONE_DIALOG_MAP_POINT_NORMAL_RGBA); priv->point_selected = priv->point_hover; - + priv->zone = get_zone_from_point (etd, priv->point_selected); gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->timezone_combo)->entry), zone_display_name (priv->zone)); } - + return TRUE; } @@ -673,7 +673,7 @@ e_timezone_dialog_set_timezone (ETimezoneDialog *etd, { ETimezoneDialogPrivate *priv; char *display = NULL; - + g_return_if_fail (E_IS_TIMEZONE_DIALOG (etd)); if (!zone) { @@ -684,7 +684,7 @@ e_timezone_dialog_set_timezone (ETimezoneDialog *etd, if (zone) display = zone_display_name_with_offset(zone); - + priv = etd->priv; priv->zone = zone; @@ -796,7 +796,7 @@ e_timezone_dialog_reparent (ETimezoneDialog *etd, static void map_destroy_cb(gpointer data, GObject *where_object_was) { - + ETimezoneDialogPrivate *priv = data; if (priv->timeout_id) { g_source_remove(priv->timeout_id); diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c index 7b286daa30..08db6c9402 100644 --- a/widgets/menus/gal-define-views-dialog.c +++ b/widgets/menus/gal-define-views-dialog.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-define-views-dialog.c * Copyright 2000, 2001, Ximian, Inc. * @@ -73,7 +73,7 @@ gal_define_views_dialog_class_init (GalDefineViewsDialogClass *klass) object_class->get_property = gal_define_views_dialog_get_property; object_class->dispose = gal_define_views_dialog_dispose; - g_object_class_install_property (object_class, PROP_COLLECTION, + g_object_class_install_property (object_class, PROP_COLLECTION, g_param_spec_object ("collection", _("Collection"), /*_( */"XXX blurb" /*)*/, @@ -109,7 +109,7 @@ gdvd_button_new_dialog_callback (GtkWidget *widget, int id, GalDefineViewsDialog gtk_list_store_append (GTK_LIST_STORE (dialog->model), &iter); gtk_list_store_set (GTK_LIST_STORE (dialog->model), &iter, COL_GALVIEW_NAME, name, - COL_GALVIEW_DATA, item, + COL_GALVIEW_DATA, item, -1); gal_view_edit (view, GTK_WINDOW (dialog)); @@ -168,7 +168,7 @@ gdvd_button_delete_callback(GtkWidget *widget, GalDefineViewsDialog *dialog) gal_view_collection_delete_view (dialog->collection, row); path = gtk_tree_model_get_path (dialog->model, &iter); gtk_list_store_remove (GTK_LIST_STORE (dialog->model), &iter); - + if (gtk_tree_path_prev (path)) { gtk_tree_model_get_iter (dialog->model, &iter, path); } else { @@ -201,7 +201,7 @@ gdvd_button_copy_callback(GtkWidget *widget, GalDefineViewsDialog *dialog) } #endif - + static void gdvd_cursor_changed_callback (GtkWidget *widget, GalDefineViewsDialog *dialog) { @@ -237,7 +237,7 @@ static void dialog_response (GalDefineViewsDialog *dialog, int response_id, gpointer data) { gal_view_collection_save (dialog->collection); -} +} static void gal_define_views_dialog_init (GalDefineViewsDialog *dialog) @@ -321,7 +321,7 @@ gal_define_views_dialog_set_collection(GalDefineViewsDialog *dialog, /* hide built in views */ /*if (item->built_in == 1) continue;*/ - + char *title = NULL; title = e_str_without_underscores (item->title); @@ -348,7 +348,7 @@ gal_define_views_dialog_set_collection(GalDefineViewsDialog *dialog, COL_GALVIEW_NAME, _("Name"), renderer, "text", COL_GALVIEW_NAME, NULL); - + /* set sort column */ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (dialog->model), COL_GALVIEW_NAME, GTK_SORT_ASCENDING); @@ -394,7 +394,7 @@ gal_define_views_dialog_set_property (GObject *object, guint prop_id, const GVal GalDefineViewsDialog *dialog; dialog = GAL_DEFINE_VIEWS_DIALOG (object); - + switch (prop_id){ case PROP_COLLECTION: if (g_value_get_object (value)) diff --git a/widgets/menus/gal-define-views-dialog.h b/widgets/menus/gal-define-views-dialog.h index 2978c997ad..e353886d21 100644 --- a/widgets/menus/gal-define-views-dialog.h +++ b/widgets/menus/gal-define-views-dialog.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-define-views-dialog.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c index 55435876b4..09bedf2381 100644 --- a/widgets/menus/gal-define-views-model.c +++ b/widgets/menus/gal-define-views-model.c @@ -174,14 +174,14 @@ gal_define_views_model_class_init (GalDefineViewsModelClass *klass) object_class->set_property = gal_define_views_model_set_property; object_class->get_property = gal_define_views_model_get_property; - g_object_class_install_property (object_class, PROP_EDITABLE, + g_object_class_install_property (object_class, PROP_EDITABLE, g_param_spec_boolean ("editable", _("Editable"), /*_( */"XXX blurb" /*)*/, FALSE, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_COLLECTION, + g_object_class_install_property (object_class, PROP_COLLECTION, g_param_spec_object ("collection", _("Collection"), /*_( */"XXX blurb" /*)*/, diff --git a/widgets/menus/gal-define-views-model.h b/widgets/menus/gal-define-views-model.h index 75a2cb75cb..339439680d 100644 --- a/widgets/menus/gal-define-views-model.h +++ b/widgets/menus/gal-define-views-model.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-define-views-model.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c index 728ed5544c..f286ee445d 100644 --- a/widgets/menus/gal-view-collection.c +++ b/widgets/menus/gal-view-collection.c @@ -395,7 +395,7 @@ load_single_dir (GalViewCollection *collection, xmlNode *child; char *filename = g_build_filename(dir, "galview.xml", NULL); char *default_view; - + if (g_file_test (filename, G_FILE_TEST_IS_REGULAR)) { #ifdef G_OS_WIN32 gchar *locale_filename = g_win32_locale_filename_from_utf8 (filename); @@ -406,7 +406,7 @@ load_single_dir (GalViewCollection *collection, doc = xmlParseFile (filename); #endif } - + if (!doc) { g_free (filename); return; diff --git a/widgets/menus/gal-view-collection.h b/widgets/menus/gal-view-collection.h index a74d6fa869..d5a1e493ef 100644 --- a/widgets/menus/gal-view-collection.h +++ b/widgets/menus/gal-view-collection.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-view-collection.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/menus/gal-view-etable.c b/widgets/menus/gal-view-etable.c index d27cbdbae1..de58cf91e9 100644 --- a/widgets/menus/gal-view-etable.c +++ b/widgets/menus/gal-view-etable.c @@ -87,7 +87,7 @@ gal_view_etable_edit (GalView *view, GtkWindow *parent) G_CALLBACK(config_changed), view); } -static void +static void gal_view_etable_load (GalView *view, const char *filename) { diff --git a/widgets/menus/gal-view-etable.h b/widgets/menus/gal-view-etable.h index e44f09ae33..83d1259fca 100644 --- a/widgets/menus/gal-view-etable.h +++ b/widgets/menus/gal-view-etable.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-view-etable.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/menus/gal-view-factory-etable.h b/widgets/menus/gal-view-factory-etable.h index 6bce7d7fd3..2535ef01b4 100644 --- a/widgets/menus/gal-view-factory-etable.h +++ b/widgets/menus/gal-view-factory-etable.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-view-factory-etable.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/menus/gal-view-factory.c b/widgets/menus/gal-view-factory.c index b570e3491b..e1fd210bd2 100644 --- a/widgets/menus/gal-view-factory.c +++ b/widgets/menus/gal-view-factory.c @@ -92,8 +92,8 @@ gal_view_factory_get_type_code (GalViewFactory *factory) static void gal_view_factory_class_init (GalViewFactoryClass *klass) { - klass->get_title = NULL; - klass->new_view = NULL; + klass->get_title = NULL; + klass->new_view = NULL; } static void diff --git a/widgets/menus/gal-view-factory.h b/widgets/menus/gal-view-factory.h index de119f1596..939917d488 100644 --- a/widgets/menus/gal-view-factory.h +++ b/widgets/menus/gal-view-factory.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-view-factory.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c index 50428b80fc..1a3b917c28 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.c +++ b/widgets/menus/gal-view-instance-save-as-dialog.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-define-views-dialog.c * Copyright 2000, 2001, Ximian, Inc. * @@ -117,7 +117,7 @@ gal_view_instance_save_as_dialog_set_property (GObject *object, guint prop_id, c GalViewInstanceSaveAsDialog *dialog; dialog = GAL_VIEW_INSTANCE_SAVE_AS_DIALOG (object); - + switch (prop_id){ case PROP_INSTANCE: if (g_value_get_object (value)) @@ -174,7 +174,7 @@ gal_view_instance_save_as_dialog_class_init (GalViewInstanceSaveAsDialogClass *k object_class->get_property = gal_view_instance_save_as_dialog_get_property; object_class->dispose = gal_view_instance_save_as_dialog_dispose; - g_object_class_install_property (object_class, PROP_INSTANCE, + g_object_class_install_property (object_class, PROP_INSTANCE, g_param_spec_object ("instance", _("Instance"), /*_( */"XXX blurb" /*)*/, @@ -223,7 +223,7 @@ gal_view_instance_save_as_dialog_init (GalViewInstanceSaveAsDialog *dialog) gal_view_instance_save_as_dialog_set_instance (dialog, dialog->instance); gtk_widget_show_all (table); } - + gvisad_setup_radio_buttons (dialog); gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, TRUE, FALSE); gtk_window_set_title (GTK_WINDOW (dialog), _("Save Current View")); diff --git a/widgets/menus/gal-view-instance-save-as-dialog.h b/widgets/menus/gal-view-instance-save-as-dialog.h index c2fda0996b..5808d9840c 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.h +++ b/widgets/menus/gal-view-instance-save-as-dialog.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-define-views-dialog.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c index 0cb8b0934e..fbdcf608cc 100644 --- a/widgets/menus/gal-view-instance.c +++ b/widgets/menus/gal-view-instance.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-view-instance.c * Copyright 2000, 2001, Ximian, Inc. * @@ -243,7 +243,7 @@ load_current_view (GalViewInstance *instance) xmlDoc *doc = NULL; xmlNode *root; GalView *view = NULL; - + if (g_file_test (instance->current_view_filename, G_FILE_TEST_IS_REGULAR)) { #ifdef G_OS_WIN32 gchar *locale_filename = g_win32_locale_filename_from_utf8 (instance->current_view_filename); @@ -254,7 +254,7 @@ load_current_view (GalViewInstance *instance) doc = xmlParseFile(instance->current_view_filename); #endif } - + if (doc == NULL) { instance->current_id = g_strdup (gal_view_instance_get_default_view (instance)); @@ -303,9 +303,9 @@ load_current_view (GalViewInstance *instance) * gal_view_instance_new: * @collection: This %GalViewCollection should be loaded before being passed to this function. * @instance_id: Which instance of this type of object is this (for most of evo, this is the folder id.) - * + * * Create a new %GalViewInstance. - * + * * Return value: The new %GalViewInstance. **/ GalViewInstance * @@ -466,7 +466,7 @@ gal_view_instance_exists (GalViewInstance *instance) return TRUE; else return FALSE; - + } typedef struct { @@ -492,7 +492,7 @@ add_popup_radio_item (EPopupMenu *menu_item, gpointer closure, gboolean value) { - EPopupMenu menu_item_struct = + EPopupMenu menu_item_struct = E_POPUP_RADIO_ITEM_CC (title, fn, closure, @@ -509,7 +509,7 @@ add_popup_menu_item (EPopupMenu *menu_item, GCallback fn, gpointer closure) { - EPopupMenu menu_item_struct = + EPopupMenu menu_item_struct = E_POPUP_ITEM_CC (title, fn, closure, @@ -598,7 +598,7 @@ gal_view_instance_free_popup_menu (GalViewInstance *instance, EPopupMenu *menu) { int i; /* This depends on the first non-custom closure to be a separator or a terminator. */ - for (i = 0; menu[i].name && *(menu[i].name); i++) { + for (i = 0; menu[i].name && *(menu[i].name); i++) { g_object_unref (((ListenerClosure *)(menu[i].closure))->instance); g_free (menu[i].closure); } diff --git a/widgets/menus/gal-view-instance.h b/widgets/menus/gal-view-instance.h index 1d1c6a3310..f1ebf1cdfa 100644 --- a/widgets/menus/gal-view-instance.h +++ b/widgets/menus/gal-view-instance.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-view-instance.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c index 26b592fa98..d2b9929a2a 100644 --- a/widgets/menus/gal-view-menus.c +++ b/widgets/menus/gal-view-menus.c @@ -99,7 +99,7 @@ remove_instance (GalViewMenus *gvm) if (gvm->priv->instance) { if (gvm->priv->instance_changed_id != 0) g_signal_handler_disconnect (gvm->priv->instance, gvm->priv->instance_changed_id); - + if (gvm->priv->instance->collection && gvm->priv->collection_changed_id != 0) g_signal_handler_disconnect (gvm->priv->instance->collection, gvm->priv->collection_changed_id); } @@ -154,7 +154,7 @@ gal_view_menus_finalize (GObject *object) if (gvm->priv->component) bonobo_object_unref (gvm->priv->component); - + if (gvm->priv->define_views_dialog) g_object_weak_unref (G_OBJECT (gvm->priv->define_views_dialog), clear_define_views_dialog, gvm); @@ -285,7 +285,7 @@ build_menus(GalViewMenus *menus) place = bonobo_ui_node_new_child(submenu, "placeholder"); bonobo_ui_node_set_attr(place, "name", "ViewBegin"); - + submenu = bonobo_ui_node_new_child(place, "submenu"); bonobo_ui_node_set_attr(submenu, "name", "CurrentView"); bonobo_ui_node_set_attr(submenu, "_label", N_("C_urrent View")); @@ -302,7 +302,7 @@ build_menus(GalViewMenus *menus) ListenerClosure *closure; char *label; char *tip; - + menuitem = bonobo_ui_node_new_child(submenu, "menuitem"); bonobo_ui_node_set_attr(menuitem, "name", item->id); bonobo_ui_node_set_attr(menuitem, "id", item->id); @@ -343,7 +343,7 @@ build_menus(GalViewMenus *menus) menuitem = bonobo_ui_node_new_child(submenu, "separator"); bonobo_ui_node_set_attr(menuitem, "name", "GalView:first_sep"); bonobo_ui_node_set_attr(menuitem, "f", ""); - + menuitem = bonobo_ui_node_new_child(submenu, "menuitem"); bonobo_ui_node_set_attr(menuitem, "name", "custom_view"); @@ -366,7 +366,7 @@ build_menus(GalViewMenus *menus) command = bonobo_ui_node_new_child(commands, "cmd"); bonobo_ui_node_set_attr(command, "name", "SaveCurrentView"); - bonobo_ui_node_set_attr(command, "_tip", N_("Save current custom view")); + bonobo_ui_node_set_attr(command, "_tip", N_("Save current custom view")); } menuitem = bonobo_ui_node_new_child(submenu, "separator"); @@ -380,7 +380,7 @@ build_menus(GalViewMenus *menus) command = bonobo_ui_node_new_child(commands, "cmd"); bonobo_ui_node_set_attr(command, "name", "DefineViews"); - bonobo_ui_node_set_attr(command, "_tip", N_("Create or edit views")); + bonobo_ui_node_set_attr(command, "_tip", N_("Create or edit views")); } xml = bonobo_ui_node_to_string(root, TRUE); diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c index 89ead8d7b9..b87d1064f9 100644 --- a/widgets/menus/gal-view-new-dialog.c +++ b/widgets/menus/gal-view-new-dialog.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-view-new-dialog.c * Copyright 2000, 2001, Ximian, Inc. * @@ -60,14 +60,14 @@ gal_view_new_dialog_class_init (GalViewNewDialogClass *klass) object_class->get_property = gal_view_new_dialog_get_property; object_class->dispose = gal_view_new_dialog_dispose; - g_object_class_install_property (object_class, PROP_NAME, + g_object_class_install_property (object_class, PROP_NAME, g_param_spec_string ("name", _("Name"), /*_( */"XXX blurb" /*)*/, NULL, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_FACTORY, + g_object_class_install_property (object_class, PROP_FACTORY, g_param_spec_object ("factory", _("Factory"), /*_( */"XXX blurb" /*)*/, @@ -114,7 +114,7 @@ static void gal_view_new_dialog_dispose (GObject *object) { GalViewNewDialog *gal_view_new_dialog = GAL_VIEW_NEW_DIALOG(object); - + if (gal_view_new_dialog->gui) g_object_unref(gal_view_new_dialog->gui); gal_view_new_dialog->gui = NULL; @@ -137,7 +137,7 @@ sensitize_ok_response (GalViewNewDialog *dialog) { gboolean ok = TRUE; const char *text; - + text = gtk_entry_get_text (GTK_ENTRY (dialog->entry)); if (!text || !text[0]) ok = FALSE; @@ -244,7 +244,7 @@ gal_view_new_dialog_set_property (GObject *object, guint prop_id, const GValue * GtkWidget *entry; dialog = GAL_VIEW_NEW_DIALOG (object); - + switch (prop_id){ case PROP_NAME: entry = glade_xml_get_widget(dialog->gui, "entry-name"); diff --git a/widgets/menus/gal-view-new-dialog.h b/widgets/menus/gal-view-new-dialog.h index 6aceb28031..3d898d45cd 100644 --- a/widgets/menus/gal-view-new-dialog.h +++ b/widgets/menus/gal-view-new-dialog.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-view-new-dialog.h * Copyright 2000, 2001, Ximian, Inc. * @@ -54,7 +54,7 @@ typedef struct _GalViewNewDialogClass GalViewNewDialogClass; struct _GalViewNewDialog { GtkDialog parent; - + /* item specific fields */ GladeXML *gui; diff --git a/widgets/menus/gal-view.c b/widgets/menus/gal-view.c index 4a2403eedb..66d7d3ffa6 100644 --- a/widgets/menus/gal-view.c +++ b/widgets/menus/gal-view.c @@ -63,7 +63,7 @@ gal_view_edit (GalView *view, * @view: The view to load to * @filename: The file to load from */ -void +void gal_view_load (GalView *view, const char *filename) { @@ -179,10 +179,10 @@ gal_view_class_init (GalViewClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - klass->edit = NULL; - klass->load = NULL; - klass->save = NULL; - klass->get_title = NULL; + klass->edit = NULL; + klass->load = NULL; + klass->save = NULL; + klass->get_title = NULL; klass->clone = NULL; klass->changed = NULL; diff --git a/widgets/menus/gal-view.h b/widgets/menus/gal-view.h index 428053fa57..bad347e824 100644 --- a/widgets/menus/gal-view.h +++ b/widgets/menus/gal-view.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-view.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c index c324268db4..b9351878a6 100644 --- a/widgets/misc/e-activity-handler.c +++ b/widgets/misc/e-activity-handler.c @@ -246,7 +246,7 @@ static void e_activity_handler_class_init (EActivityHandlerClass *activity_handler_class) { GObjectClass *object_class = (GObjectClass *) activity_handler_class; - + object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; } diff --git a/widgets/misc/e-attachment-bar.c b/widgets/misc/e-attachment-bar.c index 0525887cc4..192fba56e0 100644 --- a/widgets/misc/e-attachment-bar.c +++ b/widgets/misc/e-attachment-bar.c @@ -70,7 +70,7 @@ static GnomeIconListClass *parent_class = NULL; struct _EAttachmentBarPrivate { GtkWidget *attach; /* attachment file dialogue, if active */ - + gboolean batch_unref; GPtrArray *attachments; char *path; @@ -92,7 +92,7 @@ static char * size_to_string (gulong size) { char *size_string; - + /* FIXME: The following should probably go into a separate module, as we might have to do the same thing in other places as well. Also, I am not sure this will be OK for all the languages. */ @@ -109,7 +109,7 @@ attachment_destroy (EAttachmentBar *bar, EAttachment *attachment) { if (bar->priv->batch_unref) return; - + if (g_ptr_array_remove (bar->priv->attachments, attachment)) { update (bar); g_signal_emit (bar, signals[CHANGED], 0); @@ -127,13 +127,13 @@ static void add_common (EAttachmentBar *bar, EAttachment *attachment) { g_return_if_fail (attachment != NULL); - + g_ptr_array_add (bar->priv->attachments, attachment); g_object_weak_ref ((GObject *) attachment, (GWeakNotify) attachment_destroy, bar); g_signal_connect (attachment, "changed", G_CALLBACK (attachment_changed_cb), bar); - + update (bar); - + g_signal_emit (bar, signals[CHANGED], 0); } @@ -148,9 +148,9 @@ add_from_file (EAttachmentBar *bar, const char *file_name, const char *dispositi { EAttachment *attachment; CamelException ex; - + camel_exception_init (&ex); - + if ((attachment = e_attachment_new (file_name, disposition, &ex))) { add_common (bar, attachment); } else { @@ -170,7 +170,7 @@ calculate_height_width(EAttachmentBar *bar, int *new_width, int *new_height) int width, height, icon_width; PangoFontMetrics *metrics; PangoContext *context; - + context = gtk_widget_get_pango_context ((GtkWidget *) bar); metrics = pango_context_get_metrics (context, ((GtkWidget *) bar)->style->font_desc, pango_context_get_language (context)); width = PANGO_PIXELS (pango_font_metrics_get_approximate_char_width (metrics)) * 15; @@ -205,20 +205,20 @@ e_attachment_bar_create_attachment_cache (EAttachment *attachment) GdkPixbufLoader *loader; gboolean error = TRUE; GdkPixbuf *pixbuf; - + wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (attachment->body)); mstream = (CamelStreamMem *) camel_stream_mem_new (); - + camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) mstream); - + /* Stream image into pixbuf loader */ loader = gdk_pixbuf_loader_new (); error = !gdk_pixbuf_loader_write (loader, mstream->buffer->data, mstream->buffer->len, NULL); gdk_pixbuf_loader_close (loader, NULL); - + if (!error) { int ratio, width, height; - + /* Shrink pixbuf */ pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); width = gdk_pixbuf_get_width (pixbuf); @@ -240,7 +240,7 @@ e_attachment_bar_create_attachment_cache (EAttachment *attachment) width = 1; } } - + attachment->pixbuf_cache = gdk_pixbuf_scale_simple (pixbuf, width,height,GDK_INTERP_BILINEAR); pixbuf = attachment->pixbuf_cache; g_object_ref(pixbuf); @@ -248,7 +248,7 @@ e_attachment_bar_create_attachment_cache (EAttachment *attachment) attachment->pixbuf_cache = NULL; g_warning ("GdkPixbufLoader Error"); } - + /* Destroy everything */ g_object_unref (loader); camel_object_unref (mstream); @@ -262,14 +262,14 @@ update (EAttachmentBar *bar) GnomeIconList *icon_list; int bar_width, bar_height; int i; - + priv = bar->priv; icon_list = GNOME_ICON_LIST (bar); - + gnome_icon_list_freeze (icon_list); - + gnome_icon_list_clear (icon_list); - + /* FIXME could be faster, but we don't care. */ for (i = 0; i < priv->attachments->len; i++) { EAttachment *attachment; @@ -277,9 +277,9 @@ update (EAttachmentBar *bar) char *size_string, *label; GdkPixbuf *pixbuf = NULL; const char *desc; - + attachment = priv->attachments->pdata[i]; - + if (!attachment->is_available_local || !attachment->body) { if ((pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG))) { attachment->index = gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, ""); @@ -287,9 +287,9 @@ update (EAttachmentBar *bar) } continue; } - + content_type = camel_mime_part_get_content_type (attachment->body); - /* Get the image out of the attachment + /* Get the image out of the attachment and create a thumbnail for it */ if ((pixbuf = attachment->pixbuf_cache)) { g_object_ref(pixbuf); @@ -298,20 +298,20 @@ update (EAttachmentBar *bar) CamelStreamMem *mstream; GdkPixbufLoader *loader; gboolean error = TRUE; - + wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (attachment->body)); mstream = (CamelStreamMem *) camel_stream_mem_new (); - + camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) mstream); - + /* Stream image into pixbuf loader */ loader = gdk_pixbuf_loader_new (); error = !gdk_pixbuf_loader_write (loader, mstream->buffer->data, mstream->buffer->len, NULL); gdk_pixbuf_loader_close (loader, NULL); - + if (!error) { int ratio, width, height; - + /* Shrink pixbuf */ pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); width = gdk_pixbuf_get_width (pixbuf); @@ -333,7 +333,7 @@ update (EAttachmentBar *bar) width = 1; } } - + attachment->pixbuf_cache = gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_BILINEAR); pixbuf = attachment->pixbuf_cache; @@ -342,32 +342,32 @@ update (EAttachmentBar *bar) pixbuf = NULL; g_warning ("GdkPixbufLoader Error"); } - + /* Destroy everything */ g_object_unref (loader); camel_object_unref (mstream); } - + desc = camel_mime_part_get_description (attachment->body); if (!desc || *desc == '\0') { if (attachment->file_name) desc = attachment->file_name; - else + else desc = camel_mime_part_get_filename (attachment->body); } - + if (!desc) desc = _("attachment"); - + if (attachment->size && (size_string = size_to_string (attachment->size))) { label = g_strdup_printf ("%s (%s)", desc, size_string); g_free (size_string); } else label = g_strdup (desc); - + if (pixbuf == NULL) { char *mime_type; - + mime_type = camel_content_type_simple (content_type); pixbuf = e_icon_for_mime_type (mime_type, 48); if (pixbuf == NULL) { @@ -376,60 +376,60 @@ update (EAttachmentBar *bar) } g_free (mime_type); } - + if (pixbuf) { GdkPixbuf *pixbuf_orig = pixbuf; pixbuf = gdk_pixbuf_add_alpha (pixbuf_orig, TRUE, 255, 255, 255); - + /* gdk_pixbuf_add_alpha returns a newly allocated pixbuf, - free the original one. + free the original one. */ g_object_unref (pixbuf_orig); - + /* In case of a attachment bar, in a signed/encrypted part, display the status as a emblem*/ if (attachment->sign) { /* Show the signature status at the right-bottom.*/ GdkPixbuf *sign = NULL; int x, y; - + if (attachment->sign == CAMEL_CIPHER_VALIDITY_SIGN_BAD) sign = e_icon_factory_get_icon ("stock_signature-bad", E_ICON_SIZE_MENU); else if (attachment->sign == CAMEL_CIPHER_VALIDITY_SIGN_GOOD) sign = e_icon_factory_get_icon ("stock_signature-ok", E_ICON_SIZE_MENU); else sign = e_icon_factory_get_icon ("stock_signature", E_ICON_SIZE_MENU); - + x = gdk_pixbuf_get_width (pixbuf) - 17; y = gdk_pixbuf_get_height (pixbuf) - 17; - + gdk_pixbuf_copy_area (sign, 0, 0, 16, 16, pixbuf, x, y); g_object_unref (sign); } - + if (attachment->encrypt) { /* Show the encryption status at the top left.*/ GdkPixbuf *encrypt = e_icon_factory_get_icon ("stock_lock-ok", E_ICON_SIZE_MENU); - + gdk_pixbuf_copy_area (encrypt, 0, 0, 16, 16, pixbuf, 1, 1); g_object_unref (encrypt); } - + gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, label); g_object_unref (pixbuf); } - + g_free (label); } - + gnome_icon_list_thaw (icon_list); - + /* Resize */ if (bar->expand) { gtk_widget_get_size_request ((GtkWidget *) bar, &bar_width, &bar_height); - + if (bar->priv->attachments->len) { int per_col, rows, height, width; - + calculate_height_width(bar, &width, &height); per_col = bar_width / width; per_col = (per_col ? per_col : 1); @@ -450,19 +450,19 @@ update_remote_file (EAttachment *attachment, EAttachmentBar *bar) update (bar); return; } - + base = g_path_get_basename(attachment->file_name); msg = g_strdup_printf("%s (%d%%)", base, attachment->percentage); g_free(base); icon_list = GNOME_ICON_LIST (bar); - + gnome_icon_list_freeze (icon_list); item = gnome_icon_list_get_icon_text_item (icon_list, attachment->index); if (!item->is_text_allocated) g_free (item->text); - + gnome_icon_text_item_configure (item, item->x, item->y, item->width, item->fontname, msg, item->is_editable, TRUE); gnome_icon_list_thaw (icon_list); @@ -478,12 +478,12 @@ e_attachment_bar_remove_selected (EAttachmentBar *bar) GPtrArray *temp_arr; g_return_if_fail (E_IS_ATTACHMENT_BAR (bar)); - + priv = bar->priv; - + if (!(items = gnome_icon_list_get_selection ((GnomeIconList *) bar))) return; - + temp_arr = g_ptr_array_new (); while (items != NULL) { if ((id = GPOINTER_TO_INT (items->data) - nrem) < priv->attachments->len) { @@ -492,19 +492,19 @@ e_attachment_bar_remove_selected (EAttachmentBar *bar) g_ptr_array_remove_index (priv->attachments, id); nrem++; } - + items = items->next; } g_ptr_array_foreach (temp_arr, (GFunc)g_object_unref, NULL); g_ptr_array_free (temp_arr, TRUE); - + update (bar); g_signal_emit (bar, signals[CHANGED], 0); - + id++; - + if ((left = gnome_icon_list_get_num_icons ((GnomeIconList *) bar)) > 0) gnome_icon_list_focus_icon ((GnomeIconList *) bar, left > id ? id : left - 1); } @@ -528,18 +528,18 @@ e_attachment_bar_edit_selected (EAttachmentBar *bar) EAttachment *attachment; GList *items; int id; - + g_return_if_fail (E_IS_ATTACHMENT_BAR (bar)); - + priv = bar->priv; - + items = gnome_icon_list_get_selection ((GnomeIconList *) bar); while (items != NULL) { if ((id = GPOINTER_TO_INT (items->data)) < priv->attachments->len) { attachment = priv->attachments->pdata[id]; e_attachment_edit (attachment, GTK_WIDGET (bar)); } - + items = items->next; } } @@ -548,7 +548,7 @@ GtkWidget ** e_attachment_bar_get_selector(EAttachmentBar *bar) { g_return_val_if_fail (E_IS_ATTACHMENT_BAR (bar), NULL); - + return &bar->priv->attach; } @@ -568,25 +568,25 @@ e_attachment_bar_get_selected (EAttachmentBar *bar) EAttachment *attachment; GList *items; int id; - + g_return_val_if_fail (E_IS_ATTACHMENT_BAR (bar), NULL); - + priv = bar->priv; - + items = gnome_icon_list_get_selection ((GnomeIconList *) bar); - + while (items != NULL) { if ((id = GPOINTER_TO_INT (items->data)) < priv->attachments->len) { attachment = priv->attachments->pdata[id]; attachments = g_slist_prepend (attachments, attachment); g_object_ref (attachment); } - + items = items->next; } - + attachments = g_slist_reverse (attachments); - + return attachments; } @@ -606,18 +606,18 @@ e_attachment_bar_get_attachment (EAttachmentBar *bar, int id) struct _EAttachmentBarPrivate *priv; EAttachment *attachment; GSList *attachments; - + g_return_val_if_fail (E_IS_ATTACHMENT_BAR (bar), NULL); - + priv = bar->priv; - + if (id == -1 || id > priv->attachments->len) return e_attachment_bar_get_selected (bar); - + attachment = priv->attachments->pdata[id]; attachments = g_slist_prepend (NULL, attachment); g_object_ref (attachment); - + return attachments; } @@ -635,11 +635,11 @@ e_attachment_bar_get_all_attachments (EAttachmentBar *bar) GSList *attachments = NULL; EAttachment *attachment; int i; - + g_return_val_if_fail (E_IS_ATTACHMENT_BAR (bar), NULL); - + priv = bar->priv; - + for (i = priv->attachments->len - 1; i >= 0; i--) { attachment = priv->attachments->pdata[i]; if (attachment->is_available_local) { @@ -647,7 +647,7 @@ e_attachment_bar_get_all_attachments (EAttachmentBar *bar) g_object_ref (attachment); } } - + return attachments; } @@ -659,17 +659,17 @@ e_attachment_bar_get_parts (EAttachmentBar *bar) EAttachment *attachment; GSList *parts = NULL; int i; - + g_return_val_if_fail (E_IS_ATTACHMENT_BAR (bar), NULL); - + priv = bar->priv; - + for (i = 0; i < priv->attachments->len; i++) { attachment = priv->attachments->pdata[i]; if (attachment->is_available_local) parts = g_slist_prepend (parts, attachment->body); } - + return parts; } @@ -682,7 +682,7 @@ destroy (GtkObject *object) struct _EAttachmentBarPrivate *priv = bar->priv; EAttachment *attachment; int i; - + if ((priv = bar->priv)) { priv->batch_unref = TRUE; for (i = 0; i < priv->attachments->len; i++) { @@ -691,17 +691,17 @@ destroy (GtkObject *object) g_object_unref (attachment); } g_ptr_array_free (priv->attachments, TRUE); - + if (priv->attach) gtk_widget_destroy (priv->attach); - + if (priv->path) g_free (priv->path); - + g_free (priv); bar->priv = NULL; } - + if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL) (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } @@ -713,10 +713,10 @@ temp_save_part (CamelMimePart *part, gboolean readonly) char *tmpdir, *path, *mfilename = NULL, *utf8_mfilename = NULL; CamelStream *stream; CamelDataWrapper *wrapper; - + if (!(tmpdir = e_mkdtemp ("evolution-tmp-XXXXXX"))) return NULL; - + if (!(filename = camel_mime_part_get_filename (part))) { /* This is the default filename used for temporary file creation */ filename = _("Unknown"); @@ -727,17 +727,17 @@ temp_save_part (CamelMimePart *part, gboolean readonly) g_free (utf8_mfilename); filename = (const char *) mfilename; } - + path = g_build_filename (tmpdir, filename, NULL); g_free (tmpdir); g_free (mfilename); - + wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part)); if (readonly) stream = camel_stream_fs_new_with_name (path, O_RDWR|O_CREAT|O_TRUNC, 0444); - else + else stream = camel_stream_fs_new_with_name (path, O_RDWR|O_CREAT|O_TRUNC, 0644); - + if (!stream) { /* TODO handle error conditions */ g_message ("DEBUG: could not open the file to write\n"); @@ -768,48 +768,48 @@ eab_drag_data_get(EAttachmentBar *bar, GdkDragContext *drag, GtkSelectionData *d int len, n, i = 0; CamelURL *url; GList *items; - + if (info) return; - + items = gnome_icon_list_get_selection (GNOME_ICON_LIST (bar)); len = g_list_length (items); - + uris = g_malloc0 (sizeof (char *) * (len + 1)); - + for ( ; items != NULL; items = items->next) { if (!((n = GPOINTER_TO_INT (items->data)) < priv->attachments->len)) continue; - + attachment = priv->attachments->pdata[n]; - + if (!attachment->is_available_local) continue; - + if (attachment->store_uri) { uris[i++] = attachment->store_uri; continue; } - + /* If we are not able to save, ignore it */ if (!(path = temp_save_part (attachment->body, FALSE))) continue; - + url = camel_url_new ("file://", NULL); camel_url_set_path (url, path); attachment->store_uri = camel_url_to_string (url, 0); camel_url_free (url); g_free (path); - + uris[i++] = attachment->store_uri; } - + uris[i] = NULL; - + gtk_selection_data_set_uris (data, uris); - + g_free (uris); - + return; } @@ -821,7 +821,7 @@ eab_button_release_event(EAttachmentBar *bar, GdkEventButton *event, gpointer du int length; GtkTargetEntry drag_types[] = { { "text/uri-list", 0, 0 }, - }; + }; if (event && event->button == 1) { selected = gnome_icon_list_get_selection(icon_list); @@ -844,20 +844,20 @@ eab_button_press_event(EAttachmentBar *bar, GdkEventButton *event, gpointer dumm gboolean take_selected = FALSE; GtkTargetEntry drag_types[] = { { "text/uri-list", 0, 0 }, - }; + }; selected = gnome_icon_list_get_selection(icon_list); length = g_list_length (selected); if (event) { icon_number = gnome_icon_list_get_icon_at(icon_list, event->x, event->y); - if (icon_number < 0) { + if (icon_number < 0) { /* When nothing is selected, deselect all */ gnome_icon_list_unselect_all (icon_list); length = 0; selected = NULL; } - + if (event->button == 1) { /* If something is selected, then allow drag or else help to select */ if (length) @@ -866,27 +866,27 @@ eab_button_press_event(EAttachmentBar *bar, GdkEventButton *event, gpointer dumm gtk_drag_source_unset((GtkWidget *)bar); return FALSE; } - + /* If not r-click dont progress any more.*/ if (event->button != 3) return FALSE; - + /* When a r-click on something, if it is in the already selected list, consider a r-click of multiple things - * or deselect all and select only this for r-click + * or deselect all and select only this for r-click */ if (icon_number >= 0) { for (tmp = selected; tmp; tmp = tmp->next) { if (GPOINTER_TO_INT(tmp->data) == icon_number) take_selected = TRUE; } - + if (!take_selected) { gnome_icon_list_unselect_all(icon_list); gnome_icon_list_select_icon(icon_list, icon_number); } } } - + return FALSE; } @@ -899,15 +899,15 @@ eab_icon_clicked_cb (EAttachmentBar *bar, GdkEvent *event, gpointer *dummy) CamelURL *url; char *path; GSList *p; - + if (E_IS_ATTACHMENT_BAR (bar) && event->type == GDK_2BUTTON_PRESS) { p = e_attachment_bar_get_selected (bar); if (p && p->next == NULL) { attachment = p->data; - + /* Check if the file is stored already */ if (!attachment->store_uri) { - path = temp_save_part (attachment->body, TRUE); + path = temp_save_part (attachment->body, TRUE); url = camel_url_new ("file://", NULL); camel_url_set_path (url, path); attachment->store_uri = camel_url_to_string (url, 0); @@ -922,10 +922,10 @@ eab_icon_clicked_cb (EAttachmentBar *bar, GdkEvent *event, gpointer *dummy) g_error_free (error); error = NULL; } - + ret = TRUE; } - + if (p) { g_slist_foreach (p, (GFunc) g_object_unref, NULL); g_slist_free (p); @@ -941,15 +941,15 @@ static void class_init (EAttachmentBarClass *klass) { GtkObjectClass *object_class; - + object_class = GTK_OBJECT_CLASS (klass); - + parent_class = g_type_class_ref (gnome_icon_list_get_type ()); - + object_class->destroy = destroy; - + /* Setup signals. */ - + signals[CHANGED] = g_signal_new ("changed", E_TYPE_ATTACHMENT_BAR, @@ -964,14 +964,14 @@ static void init (EAttachmentBar *bar) { struct _EAttachmentBarPrivate *priv; - + priv = g_new (struct _EAttachmentBarPrivate, 1); - + priv->attach = NULL; priv->batch_unref = FALSE; priv->attachments = g_ptr_array_new (); priv->path = NULL; - + bar->priv = priv; bar->expand = FALSE; } @@ -981,7 +981,7 @@ GType e_attachment_bar_get_type (void) { static GType type = 0; - + if (type == 0) { static const GTypeInfo info = { sizeof (EAttachmentBarClass), @@ -992,10 +992,10 @@ e_attachment_bar_get_type (void) 0, (GInstanceInitFunc) init, }; - + type = g_type_register_static (GNOME_TYPE_ICON_LIST, "EAttachmentBar", &info, 0); } - + return type; } @@ -1005,19 +1005,19 @@ e_attachment_bar_new (GtkAdjustment *adj) EAttachmentBar *new; GnomeIconList *icon_list; int icon_width, window_height; - + new = g_object_new (e_attachment_bar_get_type (), NULL); - + icon_list = GNOME_ICON_LIST (new); - + calculate_height_width (new, &icon_width, &window_height); - + gnome_icon_list_construct (icon_list, icon_width, adj, 0); - + gtk_widget_set_size_request (GTK_WIDGET (new), icon_width * 4, window_height); GTK_WIDGET_SET_FLAGS (new, GTK_CAN_FOCUS); - + gnome_icon_list_set_separators (icon_list, ICON_SEPARATORS); gnome_icon_list_set_row_spacing (icon_list, ICON_ROW_SPACING); gnome_icon_list_set_col_spacing (icon_list, ICON_COL_SPACING); @@ -1025,14 +1025,14 @@ e_attachment_bar_new (GtkAdjustment *adj) gnome_icon_list_set_text_spacing (icon_list, ICON_TEXT_SPACING); gnome_icon_list_set_selection_mode (icon_list, GTK_SELECTION_MULTIPLE); - atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (new)), + atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (new)), _("Attachment Bar")); - + g_signal_connect (new, "button_release_event", G_CALLBACK(eab_button_release_event), NULL); g_signal_connect (new, "button_press_event", G_CALLBACK(eab_button_press_event), NULL); g_signal_connect (new, "drag-data-get", G_CALLBACK(eab_drag_data_get), NULL); g_signal_connect (icon_list, "event", G_CALLBACK (eab_icon_clicked_cb), NULL); - + return GTK_WIDGET (new); } @@ -1042,10 +1042,10 @@ get_default_charset (void) GConfClient *gconf; const char *locale; char *charset; - + gconf = gconf_client_get_default (); charset = gconf_client_get_string (gconf, "/apps/evolution/mail/composer/charset", NULL); - + if (!charset || charset[0] == '\0') { g_free (charset); charset = gconf_client_get_string (gconf, "/apps/evolution/mail/format/charset", NULL); @@ -1054,12 +1054,12 @@ get_default_charset (void) charset = NULL; } } - + g_object_unref (gconf); - + if (!charset && (locale = e_iconv_locale_charset ())) charset = g_strdup (locale); - + return charset ? charset : g_strdup ("us-ascii"); } @@ -1070,13 +1070,13 @@ attach_to_multipart (CamelMultipart *multipart, { CamelContentType *content_type; CamelDataWrapper *content; - + if (!attachment->body) return; content_type = camel_mime_part_get_content_type (attachment->body); content = camel_medium_get_content_object (CAMEL_MEDIUM (attachment->body)); - + if (!CAMEL_IS_MULTIPART (content)) { if (camel_content_type_is (content_type, "text", "*")) { CamelTransferEncoding encoding; @@ -1086,21 +1086,21 @@ attach_to_multipart (CamelMultipart *multipart, const char *charset; char *buf = NULL; char *type; - + charset = camel_content_type_param (content_type, "charset"); - + stream = camel_stream_null_new (); filter_stream = camel_stream_filter_new_with_stream (stream); bestenc = camel_mime_filter_bestenc_new (CAMEL_BESTENC_GET_ENCODING); camel_stream_filter_add (filter_stream, CAMEL_MIME_FILTER (bestenc)); camel_object_unref (stream); - + camel_data_wrapper_decode_to_stream (content, CAMEL_STREAM (filter_stream)); camel_object_unref (filter_stream); - + encoding = camel_mime_filter_bestenc_get_best_encoding (bestenc, CAMEL_BESTENC_8BIT); camel_mime_part_set_encoding (attachment->body, encoding); - + if (encoding == CAMEL_TRANSFER_ENCODING_7BIT) { /* the text fits within us-ascii so this is safe */ /* FIXME: check that this isn't iso-2022-jp? */ @@ -1108,12 +1108,12 @@ attach_to_multipart (CamelMultipart *multipart, } else if (!charset) { if (!default_charset) default_charset = buf = get_default_charset (); - + /* FIXME: We should really check that this fits within the default_charset and if not find one that does and/or allow the user to specify? */ } - + if (!charset) { /* looks kinda nasty, but this is how ya have to do it */ camel_content_type_set_param (content_type, "charset", default_charset); @@ -1122,13 +1122,13 @@ attach_to_multipart (CamelMultipart *multipart, g_free (type); g_free (buf); } - + camel_object_unref (bestenc); } else if (!CAMEL_IS_MIME_MESSAGE (content)) { camel_mime_part_set_encoding (attachment->body, CAMEL_TRANSFER_ENCODING_BASE64); } } - + camel_multipart_add_part (multipart, attachment->body); } @@ -1138,12 +1138,12 @@ e_attachment_bar_to_multipart (EAttachmentBar *bar, CamelMultipart *multipart, c struct _EAttachmentBarPrivate *priv; EAttachment *attachment; int i; - + g_return_if_fail (E_IS_ATTACHMENT_BAR (bar)); g_return_if_fail (CAMEL_IS_MULTIPART (multipart)); - + priv = bar->priv; - + for (i = 0; i < priv->attachments->len; i++) { attachment = priv->attachments->pdata[i]; if (attachment->is_available_local) @@ -1156,7 +1156,7 @@ guint e_attachment_bar_get_num_attachments (EAttachmentBar *bar) { g_return_val_if_fail (E_IS_ATTACHMENT_BAR (bar), 0); - + return bar->priv->attachments->len; } @@ -1166,7 +1166,7 @@ e_attachment_bar_attach (EAttachmentBar *bar, const char *file_name, const char { g_return_if_fail (E_IS_ATTACHMENT_BAR (bar)); g_return_if_fail (file_name != NULL && disposition != NULL); - + add_from_file (bar, file_name, disposition); } @@ -1174,27 +1174,27 @@ void e_attachment_bar_add_attachment (EAttachmentBar *bar, EAttachment *attachment) { g_return_if_fail (E_IS_ATTACHMENT_BAR (bar)); - + add_common (bar, attachment); } -int +int e_attachment_bar_get_download_count (EAttachmentBar *bar) { struct _EAttachmentBarPrivate *priv; EAttachment *attachment; int i, n = 0; - + g_return_val_if_fail (E_IS_ATTACHMENT_BAR (bar), 0); - + priv = bar->priv; - + for (i = 0; i < priv->attachments->len; i++) { attachment = priv->attachments->pdata[i]; if (!attachment->is_available_local) n++; } - + return n; } @@ -1204,9 +1204,9 @@ e_attachment_bar_attach_remote_file (EAttachmentBar *bar, const char *url, const EAttachment *attachment; CamelException ex; GtkWindow *parent; - + g_return_if_fail (E_IS_ATTACHMENT_BAR (bar)); - + if (!bar->priv->path) bar->priv->path = e_mkdtemp ("attach-XXXXXX"); @@ -1226,6 +1226,6 @@ void e_attachment_bar_attach_mime_part (EAttachmentBar *bar, CamelMimePart *part) { g_return_if_fail (E_IS_ATTACHMENT_BAR (bar)); - + add_from_mime_part (bar, part); } diff --git a/widgets/misc/e-attachment-bar.h b/widgets/misc/e-attachment-bar.h index 7c87c1287d..84b1331b3b 100644 --- a/widgets/misc/e-attachment-bar.h +++ b/widgets/misc/e-attachment-bar.h @@ -52,13 +52,13 @@ typedef struct _EAttachmentBarClass EAttachmentBarClass; struct _EAttachmentBar { GnomeIconList parent; gboolean expand; - + struct _EAttachmentBarPrivate *priv; }; struct _EAttachmentBarClass { GnomeIconListClass parent_class; - + void (* changed) (EAttachmentBar *bar); }; diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index d9ec749ebc..8aff418feb 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -86,12 +86,12 @@ finalise (GObject *object) { EAttachment *attachment = (EAttachment *) object; GtkWidget *dialog; - + if (attachment->editor_gui != NULL) { dialog = glade_xml_get_widget (attachment->editor_gui, "dialog"); g_signal_emit_by_name (dialog, "response", GTK_RESPONSE_CLOSE); } - + if (attachment->is_available_local) { camel_object_unref (attachment->body); if (attachment->pixbuf_cache != NULL) @@ -101,10 +101,10 @@ finalise (GObject *object) gnome_vfs_async_cancel(attachment->handle); g_free (attachment->description); } - + g_free (attachment->file_name); g_free (attachment->store_uri); - + G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -128,14 +128,14 @@ static void class_init (EAttachmentClass *klass) { GObjectClass *object_class; - + object_class = (GObjectClass*) klass; parent_class = g_type_class_ref (G_TYPE_OBJECT); - + object_class->finalize = finalise; klass->changed = real_changed; klass->update = real_update_attachment; - + signals[CHANGED] = g_signal_new ("changed", E_TYPE_ATTACHMENT, G_SIGNAL_RUN_FIRST, @@ -152,7 +152,7 @@ class_init (EAttachmentClass *klass) NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - + } static void @@ -176,7 +176,7 @@ GType e_attachment_get_type (void) { static GType type = 0; - + if (type == 0) { static const GTypeInfo info = { sizeof (EAttachmentClass), @@ -189,10 +189,10 @@ e_attachment_get_type (void) 0, (GInstanceInitFunc) init, }; - + type = g_type_register_static (G_TYPE_OBJECT, "EAttachment", &info, 0); } - + return type; } @@ -240,7 +240,7 @@ attachment_guess_mime_type (const char *file_name) type = g_strdup (gnome_vfs_file_info_get_mime_type (info)); - if (type && strcmp (type, "text/directory") == 0 && + if (type && strcmp (type, "text/directory") == 0 && file_ext_is (file_name, ".vcf") && g_file_get_contents (file_name, &content, NULL, NULL) && content) { @@ -283,16 +283,16 @@ e_attachment_new (const char *file_name, const char *disposition, CamelException char *mime_type; char *filename; CamelURL *url; - + g_return_val_if_fail (file_name != NULL, NULL); - + if (g_stat (file_name, &statbuf) < 0) { camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot attach file %s: %s"), file_name, g_strerror (errno)); return NULL; } - + /* return if it's not a regular file */ if (!S_ISREG (statbuf.st_mode)) { camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, @@ -300,21 +300,21 @@ e_attachment_new (const char *file_name, const char *disposition, CamelException file_name); return NULL; } - + if (!(stream = camel_stream_fs_new_with_name (file_name, O_RDONLY, 0))) { camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot attach file %s: %s"), file_name, g_strerror (errno)); return NULL; } - + if ((mime_type = attachment_guess_mime_type (file_name))) { if (!g_ascii_strcasecmp (mime_type, "message/rfc822")) { wrapper = (CamelDataWrapper *) camel_mime_message_new (); } else { wrapper = camel_data_wrapper_new (); } - + camel_data_wrapper_construct_from_stream (wrapper, stream); camel_data_wrapper_set_mime_type (wrapper, mime_type); g_free (mime_type); @@ -323,17 +323,17 @@ e_attachment_new (const char *file_name, const char *disposition, CamelException camel_data_wrapper_construct_from_stream (wrapper, stream); camel_data_wrapper_set_mime_type (wrapper, "application/octet-stream"); } - + camel_object_unref (stream); - + part = camel_mime_part_new (); camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper); camel_object_unref (wrapper); - + camel_mime_part_set_disposition (part, disposition); filename = g_path_get_basename (file_name); camel_mime_part_set_filename (part, filename); - + #if 0 /* Note: Outlook 2002 is broken with respect to Content-Ids on non-multipart/related parts, so as an interoperability @@ -344,7 +344,7 @@ e_attachment_new (const char *file_name, const char *disposition, CamelException camel_mime_part_set_content_id (part, content_id); g_free (content_id); #endif - + new = g_object_new (E_TYPE_ATTACHMENT, NULL); new->editor_gui = NULL; new->body = part; @@ -353,12 +353,12 @@ e_attachment_new (const char *file_name, const char *disposition, CamelException new->handle = NULL; new->is_available_local = TRUE; new->file_name = filename; - + url = camel_url_new ("file://", NULL); camel_url_set_path (url, file_name); new->store_uri = camel_url_to_string (url, 0); camel_url_free (url); - + return new; } @@ -384,16 +384,16 @@ async_progress_update_cb (GnomeVFSAsyncHandle *handle, download_info->attachment->percentage = 0; g_signal_emit (download_info->attachment, signals[UPDATE], 0); } - + if (info->phase == GNOME_VFS_XFER_PHASE_COMPLETED) { CamelException ex; - + if (!info->file_size) { if (info->vfs_status == GNOME_VFS_OK) info->vfs_status = GNOME_VFS_ERROR_EOF; goto error_msg; } - + download_info->attachment->handle = NULL; camel_exception_init (&ex); e_attachment_build_remote_file (download_info->file_name, download_info->attachment, "attachment", &ex); @@ -430,21 +430,21 @@ async_progress_update_cb (GnomeVFSAsyncHandle *handle, static void download_to_local_path (GnomeVFSURI *source_uri, GnomeVFSURI *target_uri, DownloadInfo *download_info) - + { GList *source_uri_list; GList *target_uri_list; - + source_uri_list = g_list_append (NULL, source_uri); target_uri_list = g_list_append (NULL, target_uri); - + /* Callback info */ gnome_vfs_async_xfer (&download_info->attachment->handle, /* handle_return */ source_uri_list, /* source_uri_list */ target_uri_list, /* target_uri_list */ GNOME_VFS_XFER_DEFAULT, /* xfer_options */ - GNOME_VFS_XFER_ERROR_MODE_ABORT, /* error_mode */ - GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE, /* overwrite_mode */ + GNOME_VFS_XFER_ERROR_MODE_ABORT, /* error_mode */ + GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE, /* overwrite_mode */ GNOME_VFS_PRIORITY_DEFAULT, /* priority */ (GnomeVFSAsyncXferProgressCallback) async_progress_update_cb, download_info, /* update_callback_data */ @@ -459,13 +459,13 @@ e_attachment_new_remote_file (GtkWindow *error_dlg_parent, const char *uri, cons DownloadInfo *download_info; CamelURL *url; char *base; - + g_return_val_if_fail (uri != NULL, NULL); - + url = camel_url_new (uri, NULL); base = g_path_get_basename (url->path); camel_url_free (url); - + new = g_object_new (E_TYPE_ATTACHMENT, NULL); new->editor_gui = NULL; new->body = NULL; @@ -475,16 +475,16 @@ e_attachment_new_remote_file (GtkWindow *error_dlg_parent, const char *uri, cons new->is_available_local = FALSE; new->percentage = 0; new->file_name = g_build_filename (path, base, NULL); - + g_free (base); - + download_info = g_new (DownloadInfo, 1); download_info->attachment = new; download_info->file_name = g_strdup (new->file_name); download_info->uri = g_strdup (uri); download_info->parent = error_dlg_parent; download_to_local_path (gnome_vfs_uri_new (uri), gnome_vfs_uri_new (new->file_name), download_info); - + return new; } @@ -499,9 +499,9 @@ e_attachment_build_remote_file (const char *file_name, EAttachment *attachment, char *mime_type; char *filename; CamelURL *url; - + g_return_if_fail (file_name != NULL); - + if (g_stat (file_name, &statbuf) == -1) { camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot attach file %s: %s"), @@ -509,7 +509,7 @@ e_attachment_build_remote_file (const char *file_name, EAttachment *attachment, g_message ("Cannot attach file %s: %s\n", file_name, g_strerror (errno)); return; } - + /* return if it's not a regular file */ if (!S_ISREG (statbuf.st_mode)) { camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, @@ -518,21 +518,21 @@ e_attachment_build_remote_file (const char *file_name, EAttachment *attachment, g_message ("Cannot attach file %s: not a regular file", file_name); return; } - + if (!(stream = camel_stream_fs_new_with_name (file_name, O_RDONLY, 0))) { camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot attach file %s: %s"), file_name, g_strerror (errno)); return; } - + if ((mime_type = attachment_guess_mime_type (file_name))) { if (!g_ascii_strcasecmp (mime_type, "message/rfc822")) { wrapper = (CamelDataWrapper *) camel_mime_message_new (); } else { wrapper = camel_data_wrapper_new (); } - + camel_data_wrapper_construct_from_stream (wrapper, stream); camel_data_wrapper_set_mime_type (wrapper, mime_type); g_free (mime_type); @@ -541,9 +541,9 @@ e_attachment_build_remote_file (const char *file_name, EAttachment *attachment, camel_data_wrapper_construct_from_stream (wrapper, stream); camel_data_wrapper_set_mime_type (wrapper, "application/octet-stream"); } - + camel_object_unref (stream); - + part = camel_mime_part_new (); camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper); camel_object_unref (wrapper); @@ -552,12 +552,12 @@ e_attachment_build_remote_file (const char *file_name, EAttachment *attachment, camel_mime_part_set_disposition (part, "inline"); else camel_mime_part_set_disposition (part, "attachment"); - + if (!attachment->file_name) filename = g_path_get_basename (file_name); else filename = g_path_get_basename (attachment->file_name); - + camel_mime_part_set_filename (part, filename); if (attachment->description) { @@ -565,14 +565,14 @@ e_attachment_build_remote_file (const char *file_name, EAttachment *attachment, g_free (attachment->description); attachment->description = NULL; } - + attachment->editor_gui = NULL; attachment->body = part; attachment->size = statbuf.st_size; attachment->guessed_type = TRUE; g_free (attachment->file_name); attachment->file_name = filename; - + url = camel_url_new ("file://", NULL); camel_url_set_path (url, file_name); attachment->store_uri = camel_url_to_string (url, 0); @@ -584,16 +584,16 @@ e_attachment_build_remote_file (const char *file_name, EAttachment *attachment, /** * e_attachment_new_from_mime_part: * @part: a CamelMimePart - * + * * Return value: a new EAttachment based on the mime part **/ EAttachment * e_attachment_new_from_mime_part (CamelMimePart *part) { EAttachment *new; - + g_return_val_if_fail (CAMEL_IS_MIME_PART (part), NULL); - + new = g_object_new (E_TYPE_ATTACHMENT, NULL); new->editor_gui = NULL; camel_object_ref (part); @@ -602,7 +602,7 @@ e_attachment_new_from_mime_part (CamelMimePart *part) new->is_available_local = TRUE; new->size = 0; new->file_name = g_strdup (camel_mime_part_get_filename(part)); - + return new; } @@ -634,7 +634,7 @@ static void set_entry (GladeXML *xml, const char *widget_name, const char *value) { GtkEntry *entry; - + entry = GTK_ENTRY (glade_xml_get_widget (xml, widget_name)); if (entry == NULL) g_warning ("Entry for `%s' not found.", widget_name); @@ -647,7 +647,7 @@ connect_widget (GladeXML *gui, const char *name, const char *signal_name, GCallback func, gpointer data) { GtkWidget *widget; - + widget = glade_xml_get_widget (gui, name); g_signal_connect (widget, signal_name, func, data); } @@ -657,14 +657,14 @@ close_cb (GtkWidget *widget, gpointer data) { EAttachment *attachment; DialogData *dialog_data; - + dialog_data = (DialogData *) data; attachment = dialog_data->attachment; - + gtk_widget_destroy (dialog_data->dialog); g_object_unref (attachment->editor_gui); attachment->editor_gui = NULL; - + destroy_dialog_data (dialog_data); } @@ -674,16 +674,16 @@ ok_cb (GtkWidget *widget, gpointer data) DialogData *dialog_data; EAttachment *attachment; const char *str; - + dialog_data = (DialogData *) data; attachment = dialog_data->attachment; - + str = gtk_entry_get_text (dialog_data->file_name_entry); if (attachment->is_available_local) camel_mime_part_set_filename (attachment->body, str); g_free (attachment->file_name); attachment->file_name = g_strdup (str); - + str = gtk_entry_get_text (dialog_data->description_entry); if (attachment->is_available_local) { camel_mime_part_set_description (attachment->body, str); @@ -691,13 +691,13 @@ ok_cb (GtkWidget *widget, gpointer data) g_free (attachment->description); attachment->description = g_strdup (str); } - + str = gtk_entry_get_text (dialog_data->mime_type_entry); if (attachment->is_available_local) { camel_mime_part_set_content_type (attachment->body, str); camel_data_wrapper_set_mime_type(camel_medium_get_content_object(CAMEL_MEDIUM (attachment->body)), str); } - + if (attachment->is_available_local) { switch (gtk_toggle_button_get_active (dialog_data->disposition_checkbox)) { case 0: @@ -713,7 +713,7 @@ ok_cb (GtkWidget *widget, gpointer data) } else { attachment->disposition = gtk_toggle_button_get_active (dialog_data->disposition_checkbox); } - + changed (attachment); close_cb (widget, data); } @@ -737,29 +737,29 @@ e_attachment_edit (EAttachment *attachment, GtkWidget *parent) GtkWidget *window; char *type; char *filename; - + g_return_if_fail (E_IS_ATTACHMENT (attachment)); - + if (attachment->editor_gui != NULL) { window = glade_xml_get_widget (attachment->editor_gui, "dialog"); gdk_window_show (window->window); return; } - + filename = g_build_filename (EVOLUTION_GLADEDIR, "e-attachment.glade", NULL); editor_gui = glade_xml_new (filename, NULL, NULL); g_free (filename); - + if (editor_gui == NULL) { g_warning ("Cannot load `e-attachment.glade'"); return; } - + attachment->editor_gui = editor_gui; - + gtk_window_set_transient_for (GTK_WINDOW (glade_xml_get_widget (editor_gui, "dialog")), GTK_WINDOW (gtk_widget_get_toplevel (parent))); - + dialog_data = g_new (DialogData, 1); dialog_data->attachment = attachment; dialog_data->dialog = glade_xml_get_widget (editor_gui, "dialog"); @@ -767,7 +767,7 @@ e_attachment_edit (EAttachment *attachment, GtkWidget *parent) dialog_data->description_entry = GTK_ENTRY (glade_xml_get_widget (editor_gui, "description_entry")); dialog_data->mime_type_entry = GTK_ENTRY (glade_xml_get_widget (editor_gui, "mime_type_entry")); dialog_data->disposition_checkbox = GTK_TOGGLE_BUTTON (glade_xml_get_widget (editor_gui, "disposition_checkbox")); - + if (attachment->is_available_local && attachment->body) { set_entry (editor_gui, "file_name_entry", camel_mime_part_get_filename (attachment->body)); set_entry (editor_gui, "description_entry", camel_mime_part_get_description (attachment->body)); @@ -775,7 +775,7 @@ e_attachment_edit (EAttachment *attachment, GtkWidget *parent) type = camel_content_type_simple (content_type); set_entry (editor_gui, "mime_type_entry", type); g_free (type); - + disposition = camel_mime_part_get_disposition (attachment->body); gtk_toggle_button_set_active (dialog_data->disposition_checkbox, disposition && !g_ascii_strcasecmp (disposition, "inline")); @@ -788,12 +788,12 @@ e_attachment_edit (EAttachment *attachment, GtkWidget *parent) } else { set_entry (editor_gui, "mime_type_entry", ""); } - + gtk_toggle_button_set_active (dialog_data->disposition_checkbox, attachment->disposition); } - + connect_widget (editor_gui, "dialog", "response", (GCallback)response_cb, dialog_data); - + /* make sure that when the parent gets hidden/closed that our windows also close */ parent = gtk_widget_get_toplevel (parent); gtk_signal_connect_while_alive (GTK_OBJECT (parent), "destroy", (GCallback) close_cb, dialog_data, diff --git a/widgets/misc/e-attachment.h b/widgets/misc/e-attachment.h index 478dc07d22..3b03a0aa72 100644 --- a/widgets/misc/e-attachment.h +++ b/widgets/misc/e-attachment.h @@ -58,7 +58,7 @@ struct _EAttachment { gulong size; GdkPixbuf *pixbuf_cache; - + GnomeVFSAsyncHandle *handle; gboolean is_available_local; int percentage; diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index cb4c35695c..7cbfc2f958 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -1,14 +1,14 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Author : +/* + * Author : * Damon Chaplin <damon@ximian.com> * Bolian Yin <bolian.yin@sun.com> * * Copyright 2000, Ximian, Inc. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, @@ -389,7 +389,7 @@ e_calendar_item_init (ECalendarItem *calitem) calitem->move_selection_when_moving = TRUE; calitem->preserve_day_when_moving = FALSE; calitem->display_popup = TRUE; - + calitem->x1 = 0.0; calitem->y1 = 0.0; calitem->x2 = 0.0; @@ -548,7 +548,7 @@ e_calendar_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) item = GNOME_CANVAS_ITEM (o); calitem = E_CALENDAR_ITEM (o); - + switch (arg_id){ case ARG_YEAR: ivalue = GTK_VALUE_INT (*arg); @@ -971,11 +971,11 @@ layout_set_day_text (ECalendarItem *calitem, PangoLayout *layout, int day_index) /* we use strlen because we actually want to count bytes */ if (day_index == 6) - char_size = strlen (day); + char_size = strlen (day); else char_size = strlen (day) - strlen (g_utf8_find_next_char (day, NULL)); - pango_layout_set_text (layout, day, char_size); + pango_layout_set_text (layout, day, char_size); } static void @@ -1543,7 +1543,7 @@ e_calendar_item_draw (GnomeCanvasItem *canvas_item, gdk_cairo_set_source_color (cr, &base); cairo_rectangle (cr, calitem->x1 - x, calitem->y1 - y, calitem->x2 - calitem->x1 + 1, - calitem->y2 - calitem->y1 + 1); + calitem->y2 - calitem->y1 + 1); cairo_fill (cr); cairo_restore (cr); @@ -1618,11 +1618,11 @@ layout_set_day_text (ECalendarItem *calitem, PangoLayout *layout, int day_index) /* we use strlen because we actually want to count bytes */ if (day_index == 6) - char_size = strlen (day); + char_size = strlen (day); else char_size = strlen (day) - strlen (g_utf8_find_next_char (day, NULL)); - pango_layout_set_text (layout, day, char_size); + pango_layout_set_text (layout, day, char_size); } static void @@ -1992,7 +1992,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem *calitem, pango_layout_set_text (layout, buffer, num_chars); cairo_translate (cr, text_x, text_y); pango_cairo_update_layout (cr, layout); - pango_cairo_show_layout (cr, layout); + pango_cairo_show_layout (cr, layout); cairo_restore (cr); } @@ -2077,7 +2077,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem *calitem, gdk_cairo_set_source_color (cr, box_color); cairo_rectangle (cr, day_x , day_y, calitem->cell_width - 1, - calitem->cell_height - 1); + calitem->cell_height - 1); cairo_stroke (cr); cairo_restore (cr); } @@ -2098,7 +2098,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem *calitem, digit = day_num % 10; day_x -= calitem->digit_widths[digit]; buffer[num_chars++] = digit + '0'; - + cairo_save (cr); if (fg_color) { gdk_cairo_set_source_color (cr, fg_color); @@ -2118,7 +2118,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem *calitem, pango_cairo_show_layout (cr, layout); cairo_restore (cr); } - + /* See if we've reached the end of a month. */ if (day_num == days_in_month[mon]) { month_offset++; @@ -2150,7 +2150,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem *calitem, gdk_gc_set_foreground (fg_gc, &style->fg[GTK_STATE_NORMAL]); g_object_unref (layout); - + pango_font_metrics_unref (font_metrics); cairo_destroy (cr); } @@ -2165,35 +2165,35 @@ e_calendar_item_get_week_number (ECalendarItem *calitem, GDate date; guint weekday, yearday; int offset, week_num; - + /* FIXME: check what happens at year boundaries. */ - + g_date_clear (&date, 1); g_date_set_dmy (&date, day, month + 1, year); - + /* This results in a value of 0 (Monday) - 6 (Sunday). (or -1 on error - oops!!) */ weekday = g_date_get_weekday (&date) - 1; - + /* Calculate the offset from the start of the week. */ offset = (calitem->week_start_day + 7 - weekday) % 7; - + /* Calculate the day of the year, from 0 to 365. */ yearday = g_date_get_day_of_year (&date) - 1; - + /* If the week starts on or after 29th December, it is week 1 of the next year, since there are 4 days in the next year. */ g_date_subtract_days (&date, offset); if (g_date_get_month (&date) == 12 && g_date_get_day (&date) >= 29) return 1; - + /* Calculate the week number, from 0. */ week_num = (yearday - offset) / 7; - + /* If the first week starts on or after Jan 5th, then we need to add 1 since the previous week will really be the first week. */ if ((yearday - offset) % 7 >= 4) week_num++; - + /* Add 1 so week numbers are from 1 to 53. */ return week_num + 1; } @@ -2549,7 +2549,7 @@ e_calendar_item_button_press (ECalendarItem *calitem, &all_week)) return FALSE; - if (event->button.button == 3 && day == -1 + if (event->button.button == 3 && day == -1 && e_calendar_item_get_display_popup (calitem)) { e_calendar_item_show_popup_menu (calitem, (GdkEventButton*) event, @@ -3077,7 +3077,7 @@ e_calendar_item_set_first_month(ECalendarItem *calitem, gint selected_day; struct tm tmp_tm = { 0 }; - old_days_in_selection = e_calendar_item_get_inclusive_days (calitem, calitem->selection_start_month_offset, calitem->selection_start_day, + old_days_in_selection = e_calendar_item_get_inclusive_days (calitem, calitem->selection_start_month_offset, calitem->selection_start_day, calitem->selection_end_month_offset, calitem->selection_end_day); /* Calculate the currently selected day */ @@ -3086,9 +3086,9 @@ e_calendar_item_set_first_month(ECalendarItem *calitem, tmp_tm.tm_mday = calitem->selection_start_day; tmp_tm.tm_isdst = -1; mktime (&tmp_tm); - + selected_day = (tmp_tm.tm_wday + 6) % 7; - + /* Make sure the selection will be displayed. */ if (calitem->selection_start_month_offset < 0 || calitem->selection_start_month_offset >= num_months) { @@ -3137,7 +3137,7 @@ e_calendar_item_get_max_days_sel (ECalendarItem *calitem) /* Set the maximum number of days selectable */ -void +void e_calendar_item_set_max_days_sel (ECalendarItem *calitem, gint days) { @@ -3147,7 +3147,7 @@ e_calendar_item_set_max_days_sel (ECalendarItem *calitem, /* Get the maximum number of days before whole weeks are selected */ -gint +gint e_calendar_item_get_days_start_week_sel(ECalendarItem *calitem) { return calitem->days_to_start_week_selection; @@ -3155,21 +3155,21 @@ e_calendar_item_get_days_start_week_sel(ECalendarItem *calitem) /* Set the maximum number of days before whole weeks are selected */ -void +void e_calendar_item_set_days_start_week_sel(ECalendarItem *calitem, gint days) { calitem->days_to_start_week_selection = days; } -gboolean +gboolean e_calendar_item_get_display_popup (ECalendarItem *calitem) { return calitem->display_popup; } -void +void e_calendar_item_set_display_popup (ECalendarItem *calitem, gboolean display) { @@ -3609,7 +3609,7 @@ e_calendar_item_set_selection_if_emission (ECalendarItem *calitem, gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem)); } -void +void e_calendar_item_style_set (GtkWidget *widget, ECalendarItem *calitem) { calitem->colors[E_CALENDAR_ITEM_COLOR_TODAY_BOX] = widget->style->bg[GTK_STATE_SELECTED]; @@ -3671,13 +3671,13 @@ e_calendar_item_ensure_days_visible (ECalendarItem *calitem, calitem->month += (months_shown - 1); e_calendar_item_normalize_date (calitem, &calitem->year, &calitem->month); - + e_calendar_item_get_month_info (calitem, 0, 0, &first_day_offset, &days_in_month, &days_in_prev_month); - if (end_day >= E_CALENDAR_ROWS_PER_MONTH * E_CALENDAR_COLS_PER_MONTH - + if (end_day >= E_CALENDAR_ROWS_PER_MONTH * E_CALENDAR_COLS_PER_MONTH - first_day_offset - days_in_month) { need_update = TRUE; diff --git a/widgets/misc/e-calendar-item.h b/widgets/misc/e-calendar-item.h index a538395736..efd6d60a73 100644 --- a/widgets/misc/e-calendar-item.h +++ b/widgets/misc/e-calendar-item.h @@ -1,13 +1,13 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Author : +/* + * Author : * Damon Chaplin <damon@ximian.com> * * Copyright 2000, Ximian, Inc. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, @@ -78,7 +78,7 @@ typedef enum E_CALENDAR_ITEM_COLOR_SELECTION_BG_FOCUSED, E_CALENDAR_ITEM_COLOR_SELECTION_BG, E_CALENDAR_ITEM_COLOR_PREV_OR_NEXT_MONTH_FG, - + E_CALENDAR_ITEM_COLOR_LAST } ECalendarItemColors; @@ -168,7 +168,7 @@ struct _ECalendarItem be changed when the user explicitly selects a day. */ gboolean move_selection_when_moving; - /* Whether the selection day is preserved when we move back/forward + /* Whether the selection day is preserved when we move back/forward one month. Used for the work week and week view. */ gboolean preserve_day_when_moving; diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h index 061fb2f8ce..3afff4bd52 100644 --- a/widgets/misc/e-calendar.h +++ b/widgets/misc/e-calendar.h @@ -1,13 +1,13 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Author : +/* + * Author : * Damon Chaplin <damon@ximian.com> * * Copyright 2000, Ximian, Inc. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c index 441973e6e9..54f35653da 100644 --- a/widgets/misc/e-canvas-background.c +++ b/widgets/misc/e-canvas-background.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-canvas-background.c - background color for canvas. * Copyright 2001, Ximian, Inc. * @@ -96,7 +96,7 @@ ecb_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y /* Wrong BBox's are the source of redraw nightmares */ gnome_canvas_item_i2c_affine (GNOME_CANVAS_ITEM (ecb), i2c); - + i1.x = ecb->priv->x1; i1.y = ecb->priv->y1; i2.x = ecb->priv->x2; @@ -336,7 +336,7 @@ static void ecb_realize (GnomeCanvasItem *item) { ECanvasBackground *ecb = E_CANVAS_BACKGROUND (item); - + if (GNOME_CANVAS_ITEM_CLASS (ecb_parent_class)->realize) GNOME_CANVAS_ITEM_CLASS (ecb_parent_class)->realize (item); @@ -346,7 +346,7 @@ ecb_realize (GnomeCanvasItem *item) gdk_gc_set_foreground (ecb->priv->gc, &ecb->priv->color); set_stipple (ecb, NULL, FALSE); - + ecb->priv->needs_redraw = 1; gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (ecb)); } @@ -370,7 +370,7 @@ ecb_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int x1, x2, y1, y2; double i2c [6]; ArtPoint upper_left, lower_right, ecb_base_point; - + /* * Find out our real position after grouping */ @@ -423,7 +423,7 @@ static void ecb_style_set (ECanvasBackground *ecb, GtkStyle *previous_style) { GnomeCanvasItem *item = GNOME_CANVAS_ITEM (ecb); - + if (GTK_WIDGET_REALIZED (item->canvas)) { gdk_gc_set_foreground (ecb->priv->gc, >K_WIDGET(item->canvas)->style->base[GTK_STATE_NORMAL]); gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (ecb)); @@ -435,7 +435,7 @@ ecb_class_init (ECanvasBackgroundClass *ecb_class) { GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS (ecb_class); GObjectClass *object_class = G_OBJECT_CLASS (ecb_class); - + object_class->dispose = ecb_dispose; object_class->set_property = ecb_set_property; object_class->get_property = ecb_get_property; diff --git a/widgets/misc/e-canvas-background.h b/widgets/misc/e-canvas-background.h index eceeede97a..94da38baf9 100644 --- a/widgets/misc/e-canvas-background.h +++ b/widgets/misc/e-canvas-background.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-canvas-background.h - background color for canvas. * Copyright 2001, Ximian, Inc. * diff --git a/widgets/misc/e-canvas-utils.c b/widgets/misc/e-canvas-utils.c index 1477bbccd7..d4ee0a1c36 100644 --- a/widgets/misc/e-canvas-utils.c +++ b/widgets/misc/e-canvas-utils.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-canvas-utils.c * Copyright 2000, 2001, Ximian, Inc. * @@ -69,7 +69,7 @@ e_canvas_show_area (GnomeCanvas *canvas, double x1, double y1, double x2, double { GtkAdjustment *h, *v; int dx = 0, dy = 0; - + g_return_if_fail (canvas != NULL); g_return_if_fail (GNOME_IS_CANVAS (canvas)); @@ -89,7 +89,7 @@ e_canvas_item_show_area (GnomeCanvasItem *item, double x1, double y1, double x2, { g_return_if_fail (item != NULL); g_return_if_fail (GNOME_IS_CANVAS_ITEM (item)); - + gnome_canvas_item_i2w(item, &x1, &y1); gnome_canvas_item_i2w(item, &x2, &y2); @@ -102,7 +102,7 @@ e_canvas_area_shown (GnomeCanvas *canvas, double x1, double y1, double x2, doubl { GtkAdjustment *h, *v; int dx = 0, dy = 0; - + g_return_val_if_fail (canvas != NULL, FALSE); g_return_val_if_fail (GNOME_IS_CANVAS (canvas), FALSE); @@ -123,7 +123,7 @@ e_canvas_item_area_shown (GnomeCanvasItem *item, double x1, double y1, double x2 { g_return_val_if_fail (item != NULL, FALSE); g_return_val_if_fail (GNOME_IS_CANVAS_ITEM (item), FALSE); - + gnome_canvas_item_i2w(item, &x1, &y1); gnome_canvas_item_i2w(item, &x2, &y2); @@ -153,10 +153,10 @@ void e_canvas_item_show_area_delayed (GnomeCanvasItem *item, double x1, double y1, double x2, double y2, gint delay) { DoubsAndCanvas *dac; - + g_return_if_fail (item != NULL); g_return_if_fail (GNOME_IS_CANVAS_ITEM (item)); - + gnome_canvas_item_i2w(item, &x1, &y1); gnome_canvas_item_i2w(item, &x2, &y2); diff --git a/widgets/misc/e-canvas-utils.h b/widgets/misc/e-canvas-utils.h index 258890cbd8..d13cd35c5f 100644 --- a/widgets/misc/e-canvas-utils.h +++ b/widgets/misc/e-canvas-utils.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * Copyright 2000, 2001, Ximian, Inc. * * Authors: diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c index b524daf3fb..1a7b4f8221 100644 --- a/widgets/misc/e-canvas-vbox.c +++ b/widgets/misc/e-canvas-vbox.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-canvas-vbox.c * Copyright 2000, 2001, Ximian, Inc. * @@ -72,15 +72,15 @@ e_canvas_vbox_class_init (ECanvasVboxClass *klass) klass->add_item = e_canvas_vbox_real_add_item; klass->add_item_start = e_canvas_vbox_real_add_item_start; - + object_class->set_property = e_canvas_vbox_set_property; object_class->get_property = e_canvas_vbox_get_property; object_class->dispose = e_canvas_vbox_dispose; - + /* GnomeCanvasItem method overrides */ item_class->event = e_canvas_vbox_event; item_class->realize = e_canvas_vbox_realize; - + g_object_class_install_property (object_class, PROP_WIDTH, g_param_spec_double ("width", _( "Width" ), @@ -128,7 +128,7 @@ e_canvas_vbox_set_property (GObject *object, guint prop_id, const GValue *value, item = GNOME_CANVAS_ITEM (object); e_canvas_vbox = E_CANVAS_VBOX (object); - + switch (prop_id){ case PROP_WIDTH: case PROP_MINIMUM_WIDTH: @@ -233,7 +233,7 @@ e_canvas_vbox_event (GnomeCanvasItem *item, GdkEvent *event) return GNOME_CANVAS_ITEM_CLASS (e_canvas_vbox_parent_class)->event (item, event); } return return_val; - + } static void @@ -241,7 +241,7 @@ e_canvas_vbox_realize (GnomeCanvasItem *item) { if (GNOME_CANVAS_ITEM_CLASS(e_canvas_vbox_parent_class)->realize) (* GNOME_CANVAS_ITEM_CLASS(e_canvas_vbox_parent_class)->realize) (item); - + e_canvas_vbox_resize_children(item); e_canvas_item_request_reflow(item); } @@ -332,7 +332,7 @@ e_canvas_vbox_reflow( GnomeCanvasItem *item, int flags ) if (max_width < item_width) max_width = item_width; list = g_list_next(list); - + for( ; list; list = g_list_next(list)) { running_height += e_canvas_vbox->spacing; @@ -349,7 +349,7 @@ e_canvas_vbox_reflow( GnomeCanvasItem *item, int flags ) if (max_width < item_width) max_width = item_width; } - + } e_canvas_vbox->height = running_height; e_canvas_vbox->width = max_width; @@ -372,4 +372,4 @@ e_canvas_vbox_add_item_start(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item) if (E_CANVAS_VBOX_CLASS(GTK_OBJECT_GET_CLASS(e_canvas_vbox))->add_item_start) (E_CANVAS_VBOX_CLASS(GTK_OBJECT_GET_CLASS(e_canvas_vbox))->add_item_start) (e_canvas_vbox, item); } - + diff --git a/widgets/misc/e-canvas-vbox.h b/widgets/misc/e-canvas-vbox.h index ffd7cdbccf..d78d358095 100644 --- a/widgets/misc/e-canvas-vbox.h +++ b/widgets/misc/e-canvas-vbox.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-canvas-vbox.h * Copyright 2000, 2001, Ximian, Inc. * @@ -75,7 +75,7 @@ struct _ECanvasVboxClass void (* add_item_start) (ECanvasVbox *CanvasVbox, GnomeCanvasItem *item); }; -/* +/* * To be added to a CanvasVbox, an item must have the argument "width" as * a Read/Write argument and "height" as a Read Only argument. It * should also do an ECanvas parent CanvasVbox request if its size diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c index 387f89730b..55b19ad2a3 100644 --- a/widgets/misc/e-canvas.c +++ b/widgets/misc/e-canvas.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-canvas.c * Copyright 2000, 2001, Ximian, Inc. * @@ -276,7 +276,7 @@ e_canvas_key (GtkWidget *widget, GdkEventKey *event) g_return_val_if_fail (event != NULL, FALSE); canvas = GNOME_CANVAS (widget); - + full_event.key = *event; return emit_event (canvas, &full_event); diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h index 410037baf4..de0f0f361c 100644 --- a/widgets/misc/e-canvas.h +++ b/widgets/misc/e-canvas.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-canvas.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c index 1dbe9ee01f..2b716e4622 100644 --- a/widgets/misc/e-cell-date-edit.c +++ b/widgets/misc/e-cell-date-edit.c @@ -174,7 +174,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde) gtk_window_set_policy (GTK_WINDOW (ecde->popup_window), TRUE, TRUE, FALSE); - + frame = gtk_frame_new (NULL); gtk_container_add (GTK_CONTAINER (ecde->popup_window), frame); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT); @@ -349,7 +349,7 @@ e_cell_date_edit_set_arg (GtkObject *o, gboolean bvalue; ecde = E_CELL_DATE_EDIT (o); - + switch (arg_id){ case ARG_SHOW_TIME: bvalue = GTK_VALUE_BOOL (*arg); @@ -572,7 +572,7 @@ e_cell_date_edit_get_popup_pos (ECellDateEdit *ecde, GtkRequisition popup_requisition; gint avail_height, screen_width, column_width, row_height; double x1, y1, wx, wy; - + gdk_window_get_origin (canvas->window, x, y); x1 = e_table_header_col_diff (eti->header, 0, view_col + 1); @@ -591,7 +591,7 @@ e_cell_date_edit_get_popup_pos (ECellDateEdit *ecde, x1 = wx; y1 = wy; - + *x += x1; /* The ETable positions don't include the grid lines, I think, so we add 1. */ @@ -604,9 +604,9 @@ e_cell_date_edit_get_popup_pos (ECellDateEdit *ecde, /* We'll use the entire screen width if needed, but we save space for the vertical scrollbar in case we need to show that. */ screen_width = gdk_screen_width (); - + gtk_widget_size_request (ecde->popup_window, &popup_requisition); - + /* Calculate the desired width. */ *width = popup_requisition.width; diff --git a/widgets/misc/e-cell-percent.c b/widgets/misc/e-cell-percent.c index 57679fd589..f8336812b4 100644 --- a/widgets/misc/e-cell-percent.c +++ b/widgets/misc/e-cell-percent.c @@ -116,7 +116,7 @@ ecp_set_value (ECellText *cell, ETableModel *model, int col, int row, } static void -e_cell_percent_class_init (ECellPercentClass *ecpc) +e_cell_percent_class_init (ECellPercentClass *ecpc) { ECellTextClass *ectc = (ECellTextClass *) ecpc; @@ -140,7 +140,7 @@ e_cell_percent_init (ECellPercent *ecp) * interpreted as being an int. * * See ECellText for other features. - * + * * Returns: an ECell object that can be used to render numbers. */ ECell * @@ -149,6 +149,6 @@ e_cell_percent_new (const char *fontname, GtkJustification justify) ECellPercent *ecn = g_object_new (E_CELL_PERCENT_TYPE, NULL); e_cell_text_construct (E_CELL_TEXT(ecn), fontname, justify); - + return (ECell *) ecn; } diff --git a/widgets/misc/e-cell-renderer-combo.c b/widgets/misc/e-cell-renderer-combo.c index 9bc0200662..e1d7ea0034 100644 --- a/widgets/misc/e-cell-renderer-combo.c +++ b/widgets/misc/e-cell-renderer-combo.c @@ -6,7 +6,7 @@ * Copyright (C) 2003 Ximian Inc. * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public + * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, @@ -53,7 +53,7 @@ ecrc_editing_done (GtkCellEditable *editable, ECellRendererCombo *cell) return; new_text = e_combo_cell_editable_get_text (E_COMBO_CELL_EDITABLE (editable)); - + g_signal_emit_by_name (cell, "edited", cell->priv->path, new_text); g_free (cell->priv->path); cell->priv->path = NULL; @@ -84,7 +84,7 @@ ecrc_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, c } static void -ecrc_get_size (GtkCellRenderer *cell, GtkWidget *widget, GdkRectangle *cell_area, +ecrc_get_size (GtkCellRenderer *cell, GtkWidget *widget, GdkRectangle *cell_area, gint *x_offset, gint *y_offset, gint *width, gint *height) { GtkWidget *btn; @@ -158,7 +158,7 @@ e_cell_renderer_combo_class_init (ECellRendererComboClass *class) { GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class); GObjectClass *obj_class = G_OBJECT_CLASS (class); - + obj_class->get_property = ecrc_get_prop; obj_class->set_property = ecrc_set_prop; obj_class->finalize = ecrc_finalize; diff --git a/widgets/misc/e-cell-renderer-combo.h b/widgets/misc/e-cell-renderer-combo.h index 86fdc7cb6e..6b4b161c29 100644 --- a/widgets/misc/e-cell-renderer-combo.h +++ b/widgets/misc/e-cell-renderer-combo.h @@ -6,7 +6,7 @@ * Copyright (C) 2003 Ximian Inc. * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public + * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c index 2f1a6d1e17..3254c9d42f 100644 --- a/widgets/misc/e-charset-picker.c +++ b/widgets/misc/e-charset-picker.c @@ -138,7 +138,7 @@ add_charset (GtkWidget *menu, ECharset *charset, gboolean free_name) { GtkWidget *item; char *label; - + if (charset->subclass) { label = g_strdup_printf ("%s, %s (%s)", _(classnames[charset->class]), @@ -151,26 +151,26 @@ add_charset (GtkWidget *menu, ECharset *charset, gboolean free_name) } else { label = g_strdup (charset->name); } - + item = gtk_menu_item_new_with_label (label); g_object_set_data_full ((GObject *) item, "charset", charset->name, free_name ? g_free : NULL); g_free (label); - + gtk_widget_show (item); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); g_signal_connect (item, "activate", G_CALLBACK (activate), menu); - + return item; } static gboolean -add_other_charset (GtkWidget *menu, GtkWidget *other, const char *new_charset) +add_other_charset (GtkWidget *menu, GtkWidget *other, const char *new_charset) { ECharset charset = { NULL, E_CHARSET_UNKNOWN, NULL }; GtkWidget *item; iconv_t ic; - + ic = iconv_open ("UTF-8", new_charset); if (ic == (iconv_t)-1) { GtkWidget *window = gtk_widget_get_ancestor (other, GTK_TYPE_WINDOW); @@ -179,25 +179,25 @@ add_other_charset (GtkWidget *menu, GtkWidget *other, const char *new_charset) return FALSE; } iconv_close (ic); - + /* Temporarily remove the "Other..." item */ g_object_ref (other); gtk_container_remove (GTK_CONTAINER (menu), other); - + /* Create new menu item */ charset.name = g_strdup (new_charset); item = add_charset (menu, &charset, TRUE); - + /* And re-add "Other..." */ gtk_menu_shell_append (GTK_MENU_SHELL (menu), other); g_object_unref (other); - + g_object_set_data_full ((GObject *) menu, "other_charset", g_strdup (new_charset), g_free); - + g_object_set_data ((GObject *) menu, "activated_item", item); select_item (GTK_MENU_SHELL (menu), item); - + return TRUE; } @@ -257,7 +257,7 @@ activate_other (GtkWidget *item, gpointer menu) gtk_entry_set_text (GTK_ENTRY (entry), old_charset); g_signal_connect (entry, "activate", G_CALLBACK (activate_entry), dialog); - + gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 0); gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 12); @@ -305,18 +305,18 @@ e_charset_picker_new (const char *default_charset) GtkWidget *menu, *item; int def, i; const char *locale_charset; - + g_get_charset (&locale_charset); if (!g_ascii_strcasecmp (locale_charset, "US-ASCII")) locale_charset = "iso-8859-1"; - + if (!default_charset) default_charset = locale_charset; for (def = 0; def < num_charsets; def++) { if (!g_ascii_strcasecmp (charsets[def].name, default_charset)) break; } - + menu = gtk_menu_new (); for (i = 0; i < num_charsets; i++) { item = add_charset (menu, &charsets[i], FALSE); @@ -325,13 +325,13 @@ e_charset_picker_new (const char *default_charset) select_item (GTK_MENU_SHELL (menu), item); } } - + /* do the Unknown/Other section */ gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_menu_item_new ()); - + if (def == num_charsets) { ECharset other = { NULL, E_CHARSET_UNKNOWN, NULL }; - + /* Add an entry for @default_charset */ other.name = g_strdup (default_charset); item = add_charset (menu, &other, TRUE); @@ -341,13 +341,13 @@ e_charset_picker_new (const char *default_charset) g_strdup (default_charset), g_free); def++; } - + item = gtk_menu_item_new_with_label (_("Other...")); g_signal_connect (item, "activate", G_CALLBACK (activate_other), menu); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - + gtk_widget_show_all (menu); - + return menu; } @@ -365,10 +365,10 @@ e_charset_picker_get_charset (GtkWidget *menu) char *charset; g_return_val_if_fail (GTK_IS_MENU (menu), NULL); - + item = gtk_menu_get_active (GTK_MENU (menu)); charset = g_object_get_data ((GObject *) item, "charset"); - + return g_strdup (charset); } @@ -471,18 +471,18 @@ e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path, const char *locale_charset; GString *menuitems; int def, i; - + g_get_charset (&locale_charset); if (!g_ascii_strcasecmp (locale_charset, "US-ASCII")) locale_charset = "iso-8859-1"; - + if (!default_charset) default_charset = locale_charset; for (def = 0; def < num_charsets; def++) { if (!g_ascii_strcasecmp (charsets[def].name, default_charset)) break; } - + label = g_strdup (_("Ch_aracter Encoding")); encoded_label = bonobo_ui_util_encode_str (label); menuitems = g_string_new (""); @@ -490,19 +490,19 @@ e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path, encoded_label); g_free (encoded_label); g_free (label); - + for (i = 0; i < num_charsets; i++) { char *command; char *charset_name, *u; - + /* escape _'s in the charset name so that it doesn't become an underline in a GtkLabel */ if ((u = strchr (charsets[i].name, '_'))) { int extra = 1; char *s, *d; - + while ((u = strchr (u + 1, '_'))) extra++; - + d = charset_name = g_alloca (strlen (charsets[i].name) + extra + 1); s = charsets[i].name; while (*s != '\0') { @@ -514,7 +514,7 @@ e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path, } else { charset_name = charsets[i].name; } - + if (charsets[i].subclass) { label = g_strdup_printf ("%s, %s (%s)", _(classnames[charsets[i].class]), @@ -527,39 +527,39 @@ e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path, } else { label = g_strdup (charset_name); } - + encoded_label = bonobo_ui_util_encode_str (label); g_free (label); - + command = g_strdup_printf ("<cmd name=\"Charset-%s\" label=\"%s\" type=\"radio\"" " group=\"charset_picker\" state=\"%d\"/>\n", charsets[i].name, encoded_label, i == def); - + bonobo_ui_component_set (uic, "/commands", command, NULL); g_free (command); - + g_string_append_printf (menuitems, " <menuitem name=\"Charset-%s\" verb=\"\"/>\n", charsets[i].name); - + g_free (encoded_label); - + label = g_strdup_printf ("Charset-%s", charsets[i].name); bonobo_ui_component_add_listener (uic, label, cb, user_data); g_free (label); } - + if (def == num_charsets) { char *command; char *charset_name, *u; - + /* escape _'s in the charset name so that it doesn't become an underline in a GtkLabel */ if ((u = strchr (default_charset, '_'))) { int extra = 1; char *s, *d; - + while ((u = strchr (u + 1, '_'))) extra++; - + d = charset_name = g_alloca (strlen (default_charset) + extra + 1); s = (char *) default_charset; while (*s != '\0') { @@ -571,31 +571,31 @@ e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path, } else { charset_name = (char *) default_charset; } - + label = g_strdup (charset_name); encoded_label = bonobo_ui_util_encode_str (label); g_free (label); - + command = g_strdup_printf ("<cmd name=\"Charset-%s\" label=\"%s\" type=\"radio\"" " group=\"charset_picker\" state=\"1\"/>\n", default_charset, encoded_label); - + bonobo_ui_component_set (uic, "/commands", command, NULL); g_free (command); - + g_string_append (menuitems, " <separator/>\n"); g_string_append_printf (menuitems, " <menuitem name=\"Charset-%s\" verb=\"\"/>\n", default_charset); - + g_free (encoded_label); - + label = g_strdup_printf ("Charset-%s", default_charset); bonobo_ui_component_add_listener (uic, label, cb, user_data); g_free (label); } - + g_string_append (menuitems, "</submenu>\n"); - + bonobo_ui_component_set (uic, path, menuitems->str, NULL); g_string_free (menuitems, TRUE); } diff --git a/widgets/misc/e-colors.h b/widgets/misc/e-colors.h index 863d816940..6427b62480 100644 --- a/widgets/misc/e-colors.h +++ b/widgets/misc/e-colors.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-colors.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/misc/e-combo-button.c b/widgets/misc/e-combo-button.c index a079729c13..5b732e1299 100644 --- a/widgets/misc/e-combo-button.c +++ b/widgets/misc/e-combo-button.c @@ -130,7 +130,7 @@ paint (EComboButton *combo_button, "focus-line-width", &focus_width, "focus-padding", &focus_pad, "interior-focus", &interior_focus, - NULL); + NULL); if (GTK_WIDGET_HAS_DEFAULT (widget) && GTK_BUTTON (widget)->relief == GTK_RELIEF_NORMAL) @@ -154,14 +154,14 @@ paint (EComboButton *combo_button, GTK_WIDGET_STATE (widget), shadow_type, area, widget, "button", x, y, separator_x, height); - + if (width - separator_x > 0) gtk_paint_box (widget->style, widget->window, GTK_WIDGET_STATE (widget), shadow_type, area, widget, "button", separator_x, y, width - separator_x, height); } - + if (GTK_WIDGET_HAS_FOCUS (widget)) { if (interior_focus) { x += widget->style->xthickness + focus_pad; @@ -254,7 +254,7 @@ impl_destroy (GtkObject *object) gtk_widget_destroy (priv->arrow_image); priv->arrow_image = NULL; } - + if (priv->icon != NULL) { g_object_unref (priv->icon); priv->icon = NULL; @@ -263,7 +263,7 @@ impl_destroy (GtkObject *object) g_free (priv); combo_button->priv = NULL; } - + (* GTK_OBJECT_CLASS (e_combo_button_parent_class)->destroy) (object); } @@ -304,11 +304,11 @@ impl_button_press_event (GtkWidget *widget, combo_button = E_COMBO_BUTTON (widget); priv = combo_button->priv; - if (event->type == GDK_BUTTON_PRESS && + if (event->type == GDK_BUTTON_PRESS && (event->button == 1 || event->button == 3)) { GTK_BUTTON (widget)->button_down = TRUE; - if (event->button == 3 || + if (event->button == 3 || event->x >= priv->arrow_image->allocation.x) { /* User clicked on the right side: pop up the menu. */ gtk_button_pressed (GTK_BUTTON (widget)); @@ -355,7 +355,7 @@ impl_expose_event (GtkWidget *widget, return FALSE; bin = GTK_BIN (widget); - + paint (E_COMBO_BUTTON (widget), &event->area); child_event = *event; @@ -446,7 +446,7 @@ e_combo_button_init (EComboButton *combo_button) priv = g_new (EComboButtonPrivate, 1); combo_button->priv = priv; - + priv->icon = NULL; priv->menu = NULL; priv->menu_popped_up = FALSE; @@ -457,7 +457,7 @@ void e_combo_button_pack_hbox (EComboButton *combo_button) { EComboButtonPrivate *priv; - + priv = combo_button->priv; if(priv->is_already_packed){ @@ -481,9 +481,9 @@ e_combo_button_pack_hbox (EComboButton *combo_button) gtk_box_pack_end (GTK_BOX (priv->hbox), priv->arrow_image, TRUE, TRUE, GTK_WIDGET (combo_button)->style->xthickness); gtk_widget_show (priv->arrow_image); - + gtk_widget_show (priv->hbox); - + priv->is_already_packed = TRUE; } @@ -491,9 +491,9 @@ void e_combo_button_pack_vbox (EComboButton *combo_button) { EComboButtonPrivate *priv; - + priv = combo_button->priv; - + if(priv->is_already_packed){ gtk_widget_destroy (priv->hbox); } @@ -504,7 +504,7 @@ e_combo_button_pack_vbox (EComboButton *combo_button) priv->vbox = gtk_vbox_new (FALSE, 0); gtk_widget_show (priv->vbox); - + priv->icon_image = e_icon_factory_get_image (NULL, E_ICON_SIZE_MENU); gtk_box_pack_start (GTK_BOX (priv->vbox), priv->icon_image, TRUE, TRUE, 0); gtk_widget_show (priv->icon_image); @@ -515,14 +515,14 @@ e_combo_button_pack_vbox (EComboButton *combo_button) gtk_widget_show (priv->label); gtk_box_pack_start (GTK_BOX(priv->hbox),priv->vbox, TRUE, TRUE, 0); - + priv->arrow_image = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE); gtk_box_pack_end (GTK_BOX (priv->hbox), priv->arrow_image, TRUE, TRUE, GTK_WIDGET (combo_button)->style->xthickness); gtk_widget_show (priv->arrow_image); - + gtk_widget_show (priv->hbox); - + priv->is_already_packed = TRUE; } diff --git a/widgets/misc/e-combo-cell-editable.c b/widgets/misc/e-combo-cell-editable.c index 9e7794ca9f..c83525118a 100644 --- a/widgets/misc/e-combo-cell-editable.c +++ b/widgets/misc/e-combo-cell-editable.c @@ -6,7 +6,7 @@ * Copyright (C) 2003 Ximian Inc. * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public + * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, @@ -58,7 +58,7 @@ kill_popup (EComboCellEditable *ecce) gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (ecce)); gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (ecce)); } - + static gboolean popup_key_press_cb (GtkWidget *widget, GdkEventKey *event, EComboCellEditable *ecce) { @@ -90,19 +90,19 @@ popup_button_press_cb (GtkWidget *widget, GdkEventButton *event, EComboCellEdita if (event->button != 1) return FALSE; - + gdk_window_get_root_origin (widget->window, &win_x, &win_y); alloc = ecce->priv->popup->allocation; rel_x = event->x_root - win_x - alloc.x; rel_y = event->y_root - win_y - alloc.y; - + if (rel_x > 0 && rel_x < alloc.width && rel_y > 0 && rel_y < alloc.height) return FALSE; - + ecce->priv->cancelled = TRUE; kill_popup (ecce); - + return FALSE; } @@ -112,8 +112,8 @@ tree_button_release_cb (GtkWidget *widget, GdkEventButton *event, EComboCellEdit kill_popup (ecce); return TRUE; } - -static void + +static void selection_changed_cb (GtkTreeSelection *selection, EComboCellEditable *ecce) { GtkTreeModel *model; @@ -122,7 +122,7 @@ selection_changed_cb (GtkTreeSelection *selection, EComboCellEditable *ecce) if (!gtk_tree_selection_get_selected (selection, &model, &iter)) return; - + gtk_tree_model_get (model, &iter, 0, &text, -1); e_combo_cell_editable_set_text (ecce, text); g_free (text); @@ -138,7 +138,7 @@ build_popup (EComboCellEditable *ecce) GList *l; ecce->priv->popup = gtk_window_new (GTK_WINDOW_POPUP); - + g_signal_connect (ecce->priv->popup, "button-press-event", G_CALLBACK (popup_button_press_cb), ecce); g_signal_connect (ecce->priv->popup, "key-press-event", G_CALLBACK (popup_key_press_cb), ecce); @@ -154,11 +154,11 @@ build_popup (EComboCellEditable *ecce) gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, l->data, -1); } - + gtk_tree_view_set_model (ecce->priv->tree_view, model); g_object_unref (model); gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (ecce->priv->tree_view)); - + gtk_tree_view_set_headers_visible (ecce->priv->tree_view, FALSE); gtk_tree_view_insert_column_with_attributes (ecce->priv->tree_view, 0, NULL, @@ -171,7 +171,7 @@ build_popup (EComboCellEditable *ecce) selection = gtk_tree_view_get_selection (ecce->priv->tree_view); gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); g_signal_connect (selection, "changed", G_CALLBACK (selection_changed_cb), ecce); - + gtk_widget_show (GTK_WIDGET (ecce->priv->tree_view)); } @@ -188,14 +188,14 @@ lookup_row (GList *list, const gchar *text) return result; } -static void +static void set_cursor (GtkTreeView *tree_view, gint index) { GtkTreePath *path = gtk_tree_path_new (); gtk_tree_path_append_index (path, index); gtk_tree_view_set_cursor (tree_view, path, NULL, FALSE); - + gtk_tree_path_free (path); } @@ -207,13 +207,13 @@ grab_popup (GdkWindow *popup) } static void -position_popup (EComboCellEditable *ecce, gint x, gint y, gint offset) +position_popup (EComboCellEditable *ecce, gint x, gint y, gint offset) { GtkRequisition req; gtk_widget_realize (ecce->priv->popup); gtk_widget_size_request (ecce->priv->popup, &req); - + if (req.height > gdk_screen_height () - y) { y -= (offset + req.height); if (y < 0) @@ -321,7 +321,7 @@ ecce_init (EComboCellEditable *ecce) box = gtk_hbox_new (FALSE, 0); gtk_widget_show (box); gtk_container_add (GTK_CONTAINER (ecce), box); - + ecce->priv = g_new0 (EComboCellEditablePriv, 1); entry = gtk_entry_new (); @@ -354,9 +354,9 @@ ecce_class_init (GObjectClass *klass) GtkWidgetClass *widget_class = (GtkWidgetClass *)klass; klass->finalize = ecce_finalize; - + widget_class->grab_focus = ecce_grab_focus; - + parent_class = GTK_EVENT_BOX_CLASS (g_type_class_peek_parent (klass)); } @@ -364,7 +364,7 @@ GType e_combo_cell_editable_get_type (void) { static GType ecce_type = 0; - + if (!ecce_type) { static const GTypeInfo ecce_info = { sizeof (EComboCellEditableClass), @@ -380,15 +380,15 @@ e_combo_cell_editable_get_type (void) static const GInterfaceInfo cell_editable_info = { (GInterfaceInitFunc) ecce_cell_editable_init, - NULL, - NULL + NULL, + NULL }; - + ecce_type = g_type_register_static (GTK_TYPE_EVENT_BOX, "EComboCellEditable", &ecce_info, 0); - + g_type_add_interface_static (ecce_type, GTK_TYPE_CELL_EDITABLE, &cell_editable_info); } - + return ecce_type; } diff --git a/widgets/misc/e-combo-cell-editable.h b/widgets/misc/e-combo-cell-editable.h index d8d5a1cd68..7d3b4d731b 100644 --- a/widgets/misc/e-combo-cell-editable.h +++ b/widgets/misc/e-combo-cell-editable.h @@ -6,7 +6,7 @@ * Copyright (C) 2003 Ximian Inc. * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public + * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, diff --git a/widgets/misc/e-config-page.h b/widgets/misc/e-config-page.h index 8f231198fa..812f357fe2 100644 --- a/widgets/misc/e-config-page.h +++ b/widgets/misc/e-config-page.h @@ -53,7 +53,7 @@ struct _EConfigPage { struct _EConfigPageClass { GtkEventBoxClass parent_class; - + }; diff --git a/widgets/misc/e-cursors.h b/widgets/misc/e-cursors.h index 159c22bb42..115b6fbc26 100644 --- a/widgets/misc/e-cursors.h +++ b/widgets/misc/e-cursors.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-cursors.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index ec6ec6fbbf..206f1d7211 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -70,7 +70,7 @@ struct _EDateEditPrivate { GtkWidget *date_entry; GtkWidget *date_button; - + GtkWidget *space; GtkWidget *time_combo; @@ -241,7 +241,7 @@ e_date_edit_get_type (void) date_edit_type = g_type_register_static (GTK_TYPE_HBOX, "EDateEdit", &date_edit_info, 0); } - + return date_edit_type; } @@ -308,7 +308,7 @@ e_date_edit_init (EDateEdit *dedit) * * Description: Creates a new #EDateEdit widget which can be used * to provide an easy to use way for entering dates and times. - * + * * Returns: a new #EDateEdit widget. */ GtkWidget * @@ -344,7 +344,7 @@ create_children (EDateEdit *dedit) atk_object_set_name (a11y, _("Date")); gtk_box_pack_start (GTK_BOX (dedit), priv->date_entry, FALSE, TRUE, 0); gtk_widget_set_size_request (priv->date_entry, 100, -1); - + g_signal_connect (priv->date_entry, "key_press_event", G_CALLBACK (on_date_entry_key_press), dedit); @@ -388,7 +388,7 @@ create_children (EDateEdit *dedit) time_store = gtk_list_store_new (1, G_TYPE_STRING); priv->time_combo = gtk_combo_box_entry_new_with_model (GTK_TREE_MODEL (time_store), 0); g_object_unref (time_store); - + /* We need to make sure labels are right-aligned, since we want digits to line up, * and with a nonproportional font, the width of a space != width of a digit. * Technically, only 12-hour format needs this, but we do it always, for consistency. */ @@ -592,7 +592,7 @@ e_date_edit_get_time (EDateEdit *dedit) struct tm tmp_tm = { 0 }; g_return_val_if_fail (E_IS_DATE_EDIT (dedit), -1); - + priv = dedit->priv; /* Try to parse any new value now. */ @@ -832,7 +832,7 @@ e_date_edit_set_time_of_day (EDateEdit *dedit, date_edit_signals [CHANGED], 0); } -void +void e_date_edit_set_date_and_time_of_day (EDateEdit *dedit, gint year, gint month, @@ -848,7 +848,7 @@ e_date_edit_set_date_and_time_of_day (EDateEdit *dedit, year - 1900, month - 1, day); time_changed = e_date_edit_set_time_internal (dedit, TRUE, FALSE, hour, minute); - + e_date_edit_update_date_entry (dedit); e_date_edit_update_time_entry (dedit); e_date_edit_update_time_combo_state (dedit); @@ -1570,7 +1570,7 @@ on_time_entry_key_press (GtkWidget *widget, { /* I'd like to use Alt+Up/Down for popping up the list, like Win32, but the combo steals any Up/Down keys, so we use Alt+Return. */ -#if 0 +#if 0 if (event->state & GDK_MOD1_MASK && (event->keyval == GDK_Up || event->keyval == GDK_Down)) { #else @@ -1630,7 +1630,7 @@ on_date_entry_focus_out (GtkEntry *entry, tmp_tm.tm_year = 0; tmp_tm.tm_mon = 0; tmp_tm.tm_mday = 0; - + e_date_edit_check_date_changed (dedit); if (!e_date_edit_date_is_valid (dedit)) { @@ -1643,7 +1643,7 @@ on_date_entry_focus_out (GtkEntry *entry, gtk_widget_destroy (msg_dialog); e_date_edit_get_date (dedit,&tmp_tm.tm_year,&tmp_tm.tm_mon,&tmp_tm.tm_mday); e_date_edit_set_date (dedit,tmp_tm.tm_year,tmp_tm.tm_mon,tmp_tm.tm_mday); - gtk_widget_grab_focus (GTK_WIDGET (entry)); + gtk_widget_grab_focus (GTK_WIDGET (entry)); return FALSE; } return FALSE; @@ -1656,7 +1656,7 @@ on_time_entry_focus_out (GtkEntry *entry, EDateEdit *dedit) { GtkWidget *msg_dialog; - + e_date_edit_check_time_changed (dedit); if (!e_date_edit_time_is_valid (dedit)) { @@ -1732,7 +1732,7 @@ e_date_edit_update_date_entry (EDateEdit *dedit) tmp_tm.tm_mday = priv->day; tmp_tm.tm_isdst = -1; - /* This is a strftime() format for a short date. + /* This is a strftime() format for a short date. %x the preferred date representation for the current locale without the time*/ e_utf8_strftime (buffer, sizeof (buffer), "%x", &tmp_tm); gtk_entry_set_text (GTK_ENTRY (priv->date_entry), buffer); diff --git a/widgets/misc/e-dateedit.h b/widgets/misc/e-dateedit.h index 1e9aa4142c..3f8def7146 100644 --- a/widgets/misc/e-dateedit.h +++ b/widgets/misc/e-dateedit.h @@ -38,13 +38,13 @@ */ #ifndef __E_DATE_EDIT_H_ -#define __E_DATE_EDIT_H_ +#define __E_DATE_EDIT_H_ #include <time.h> #include <glib.h> #include <gtk/gtkhbox.h> #include <gtk/gtkwidget.h> - + #define E_TYPE_DATE_EDIT (e_date_edit_get_type ()) #define E_DATE_EDIT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DATE_EDIT, EDateEdit)) #define E_DATE_EDIT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_DATE_EDIT, EDateEditClass)) diff --git a/widgets/misc/e-dropdown-button.c b/widgets/misc/e-dropdown-button.c index 3fbdd3648e..4054e4a254 100644 --- a/widgets/misc/e-dropdown-button.c +++ b/widgets/misc/e-dropdown-button.c @@ -19,7 +19,7 @@ * * Authors: * Ettore Perazzoli <ettore@ximian.com> - * Damon Chaplin <damon@ximian.com> + * Damon Chaplin <damon@ximian.com> */ #ifdef HAVE_CONFIG_H @@ -167,7 +167,7 @@ e_dropdown_button_init (EDropdownButton *dropdown_button) * @dropdown_button: A pointer to an %EDropdownButton object * @label_text: Text to display in the button * @menu: The menu to pop up when the button is pressed - * + * * Construct the @dropdown_button with the specified @label_text and the * associated @menu. **/ @@ -216,10 +216,10 @@ e_dropdown_button_construct (EDropdownButton *dropdown_button, * e_dropdown_button_new: * @label_text: Text to display in the button * @menu: The menu to pop up when the button is pressed - * + * * Create a new dropdown button. When the button is clicked, the specified * @menu will be popped up. - * + * * Return value: A pointer to the newly created %EDropdownButton. **/ GtkWidget * diff --git a/widgets/misc/e-expander.c b/widgets/misc/e-expander.c index 4c2ecdb317..7c60c28d4b 100644 --- a/widgets/misc/e-expander.c +++ b/widgets/misc/e-expander.c @@ -112,7 +112,7 @@ GType e_expander_get_type (void) { static GType expander_type = 0; - + if (!expander_type) { static const GTypeInfo expander_info = @@ -127,12 +127,12 @@ e_expander_get_type (void) 0, /* n_preallocs */ (GInstanceInitFunc) e_expander_init, }; - + expander_type = g_type_register_static (GTK_TYPE_BIN, "EExpander", &expander_info, 0); } - + return expander_type; } @@ -256,7 +256,7 @@ e_expander_init (EExpander *expander) /* ESTUFF */ priv = g_new0 (EExpanderPrivate, 1); g_object_set_data_full (G_OBJECT (expander), "e-expander-priv", priv, g_free); - + /* ESTUFF priv = E_EXPANDER_GET_PRIVATE (expander); */ GTK_WIDGET_SET_FLAGS (expander, GTK_CAN_FOCUS); @@ -281,7 +281,7 @@ e_expander_set_property (GObject *object, GParamSpec *pspec) { EExpander *expander = E_EXPANDER (object); - + switch (prop_id) { case PROP_EXPANDED: @@ -315,7 +315,7 @@ e_expander_get_property (GObject *object, EExpanderPrivate *priv; priv = E_EXPANDER_GET_PRIVATE (expander); - + switch (prop_id) { case PROP_EXPANDED: @@ -366,7 +366,7 @@ e_expander_realize (GtkWidget *widget) GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); border_width = GTK_CONTAINER (widget)->border_width; - + attributes.x = widget->allocation.x + border_width; attributes.y = widget->allocation.y + border_width; attributes.width = widget->allocation.width - 2 * border_width; @@ -393,7 +393,7 @@ e_expander_realize (GtkWidget *widget) widget->style = gtk_style_attach (widget->style, widget->window); gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL); } - + static void e_expander_size_request (GtkWidget *widget, GtkRequisition *requisition) @@ -827,7 +827,7 @@ e_expander_button_release (GtkWidget *widget, if (event->button == 1 && priv->button_down) { g_signal_emit_by_name (expander, "activate"); - + priv->button_down = FALSE; return TRUE; } diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index 121fb3c82a..e80f7747ef 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-search-bar.c * * Copyright (C) 2001 Ximian, Inc. @@ -74,10 +74,10 @@ static void full_rule_editor_response (GtkWidget *dialog, int response, void *data) { EFilterBar *efb = data; - + if (response == GTK_RESPONSE_OK) rule_context_save (efb->context, efb->userrules); - + gtk_widget_destroy (dialog); } @@ -86,19 +86,19 @@ rule_editor_response (GtkWidget *dialog, int response, void *data) { EFilterBar *efb = data; FilterRule *rule; - + if (response == GTK_RESPONSE_OK) { rule = g_object_get_data (G_OBJECT (dialog), "rule"); if (rule) { if (!filter_rule_validate (rule)) return; - + rule_context_add_rule (efb->context, rule); /* FIXME: check return */ rule_context_save (efb->context, efb->userrules); } } - + gtk_widget_destroy (dialog); } @@ -109,7 +109,7 @@ rule_advanced_response (GtkWidget *dialog, int response, void *data) /* the below generates a compiler warning about incompatible pointer types */ ESearchBar *esb = (ESearchBar *)efb; FilterRule *rule; - + if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) { rule = g_object_get_data ((GObject *) dialog, "rule"); if (rule) { @@ -117,7 +117,7 @@ rule_advanced_response (GtkWidget *dialog, int response, void *data) if (!filter_rule_validate (rule)) return; - + efb->current_query = rule; g_object_ref (rule); g_signal_emit_by_name (efb, "search_activated"); @@ -128,7 +128,7 @@ rule_advanced_response (GtkWidget *dialog, int response, void *data) gtk_widget_modify_base (esb->viewoption, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); e_search_bar_set_text (esb,_("Advanced Search")); gtk_widget_set_sensitive (esb->clear_button, TRUE); - + if (response == GTK_RESPONSE_APPLY) { if (!rule_context_find_rule (efb->context, rule->name, rule->source)) rule_context_add_rule (efb->context, rule); @@ -139,7 +139,7 @@ rule_advanced_response (GtkWidget *dialog, int response, void *data) } else { e_search_bar_set_item_id (esb, esb->last_search_option); } - + if (response != GTK_RESPONSE_APPLY) gtk_widget_destroy (dialog); } @@ -160,20 +160,20 @@ static void do_advanced (ESearchBar *esb) { EFilterBar *efb = (EFilterBar *)esb; - + d(printf("Advanced search!\n")); - + if (!efb->save_dialog && !efb->setquery) { GtkWidget *dialog, *w; FilterRule *rule; - + if (efb->current_query) rule = filter_rule_clone (efb->current_query); else { rule = filter_rule_new (); efb->current_query = rule; } - + w = filter_rule_get_widget (rule, efb->context); filter_rule_set_source (rule, FILTER_SOURCE_INCOMING); gtk_container_set_border_width (GTK_CONTAINER (w), 12); @@ -183,17 +183,17 @@ do_advanced (ESearchBar *esb) GTK_STOCK_SAVE, GTK_RESPONSE_APPLY, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); - + efb->save_dialog = dialog; gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); - + gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 300); gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 0); gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 12); - + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), w, TRUE, TRUE, 0); - + g_object_ref (rule); g_object_set_data_full ((GObject *) dialog, "rule", rule, (GDestroyNotify) g_object_unref); @@ -202,9 +202,9 @@ do_advanced (ESearchBar *esb) g_signal_connect (dialog, "response", G_CALLBACK (rule_advanced_response), efb); g_object_weak_ref ((GObject *) dialog, (GWeakNotify) rule_editor_destroyed, efb); - + e_search_bar_set_menu_sensitive (esb, E_FILTERBAR_SAVE_ID, FALSE); - + gtk_widget_show (dialog); } } @@ -215,7 +215,7 @@ save_search_dialog (ESearchBar *esb) FilterRule *rule; char *name, *text; GtkWidget *dialog, *w; - + EFilterBar *efb = (EFilterBar *)esb; rule = filter_rule_clone (efb->current_query); @@ -224,7 +224,7 @@ save_search_dialog (ESearchBar *esb) filter_rule_set_name (rule, name); g_free (text); g_free (name); - + w = filter_rule_get_widget (rule, efb->context); filter_rule_set_source (rule, FILTER_SOURCE_INCOMING); gtk_container_set_border_width (GTK_CONTAINER (w), 12); @@ -261,14 +261,14 @@ menubar_activated (ESearchBar *esb, int id, void *data) EFilterBar *efb = (EFilterBar *)esb; GtkWidget *dialog; GtkStyle *style; - + d(printf ("menubar activated!\n")); switch (id) { case E_FILTERBAR_EDIT_ID: if (!efb->save_dialog) { efb->save_dialog = dialog = (GtkWidget *) rule_editor_new (efb->context, FILTER_SOURCE_INCOMING, _("_Searches")); - + gtk_window_set_title (GTK_WINDOW (dialog), _("Searches")); g_signal_connect (dialog, "response", G_CALLBACK (full_rule_editor_response), efb); g_object_weak_ref ((GObject *) dialog, (GWeakNotify) rule_editor_destroyed, efb); @@ -276,9 +276,9 @@ menubar_activated (ESearchBar *esb, int id, void *data) } break; case E_FILTERBAR_SAVE_ID: - if (efb->current_query && !efb->save_dialog) + if (efb->current_query && !efb->save_dialog) save_search_dialog (esb); - + d(printf("Save menu\n")); break; case E_FILTERBAR_ADVANCED_ID: @@ -288,14 +288,14 @@ menubar_activated (ESearchBar *esb, int id, void *data) if (id >= efb->menu_base && id < efb->menu_base + efb->menu_rules->len) { #if d(!)0 GString *out = g_string_new (""); - + printf("Selected rule: %s\n", ((FilterRule *)efb->menu_rules->pdata[id - efb->menu_base])->name); filter_rule_build_code (efb->menu_rules->pdata[id - efb->menu_base], out); printf("query: '%s'\n", out->str); g_string_free (out, TRUE); #endif efb->current_query = (FilterRule *)efb->menu_rules->pdata[id - efb->menu_base]; - + efb->setquery = TRUE; e_search_bar_set_item_id (esb, E_FILTERBAR_ADVANCED_ID); efb->setquery = FALSE; @@ -307,14 +307,14 @@ menubar_activated (ESearchBar *esb, int id, void *data) gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, &(style->text [GTK_STATE_SELECTED] )); gtk_widget_modify_base (esb->icon_entry, GTK_STATE_NORMAL, &(style->base [GTK_STATE_SELECTED] )); gtk_widget_modify_base (esb->viewoption, GTK_STATE_NORMAL, &(style->base [GTK_STATE_SELECTED] )); - e_search_bar_set_text (esb,_("Advanced Search")); + e_search_bar_set_text (esb,_("Advanced Search")); g_signal_emit_by_name (efb, "search_activated", NULL); efb->setquery = FALSE; } else { return; } } - + g_signal_stop_emission_by_name (esb, "menu_activated"); } @@ -324,7 +324,7 @@ option_changed (ESearchBar *esb, void *data) EFilterBar *efb = (EFilterBar *)esb; int id = e_search_bar_get_item_id (esb); char *query; - + d(printf("option changed, id = %d, setquery = %s %d\n", id, efb->setquery ? "true" : "false", esb->block_search)); if (esb->scopeitem_id == E_FILTERBAR_CURRENT_MESSAGE_ID) { @@ -332,7 +332,7 @@ option_changed (ESearchBar *esb, void *data) } else { gtk_widget_set_sensitive (esb->option_button, TRUE); } - + if (efb->setquery) return; @@ -384,7 +384,7 @@ build_items (ESearchBar *esb, ESearchBarItem *items, int type, int *start, GPtrA char *source; GSList *gtksux = NULL; int num; - + /* So gtk calls a signal again if you connect to it WHILE inside a changed event. So this snot is to work around that shit fucked up situation */ for (i=0;i<rules->len;i++) @@ -402,7 +402,7 @@ build_items (ESearchBar *esb, ESearchBarItem *items, int type, int *start, GPtrA dup_item_no_subitems (&dup_item, items + i); g_array_append_vals (menu, &dup_item, 1); } - + *start = id; if (type == 0) { @@ -453,10 +453,10 @@ build_items (ESearchBar *esb, ESearchBarItem *items, int type, int *start, GPtrA g_slist_free_1(gtksux); gtksux = next; } - + /* always add on the advanced menu */ if (type == 1) { - ESearchBarItem sb_items[2] = { E_FILTERBAR_SEPARATOR, E_FILTERBAR_ADVANCED, + ESearchBarItem sb_items[2] = { E_FILTERBAR_SEPARATOR, E_FILTERBAR_ADVANCED, /* E_FILTERBAR_SEPARATOR, E_FILTERBAR_SAVE */ }; ESearchBarItem dup_items[2]; @@ -466,11 +466,11 @@ build_items (ESearchBar *esb, ESearchBarItem *items, int type, int *start, GPtrA /* dup_item_no_subitems (&dup_items[3], &sb_items[3]); */ g_array_append_vals (menu, &dup_items, 2); } - + item.id = -1; item.text = NULL; g_array_append_vals (menu, &item, 1); - + return menu; } @@ -504,11 +504,11 @@ static void free_items (ESearchBarItem *items) { int i; - - for (i = 0; items[i].id != -1; i++) + + for (i = 0; items[i].id != -1; i++) g_free (items[i].text); - + g_free (items); } @@ -519,22 +519,22 @@ set_menu (ESearchBar *esb, ESearchBarItem *items) EFilterBar *efb = E_FILTER_BAR (esb); ESearchBarItem *default_items; int i, num; - + if (efb->default_items) free_items (efb->default_items); - + for (num = 0; items[num].id != -1; num++) ; - + default_items = g_new (ESearchBarItem, num + 1); for (i = 0; i < num + 1; i++) { default_items[i].text = g_strdup (items[i].text); default_items[i].id = items[i].id; default_items[i].type = items[i].type; } - + efb->default_items = default_items; - + generate_menu (esb, default_items); } @@ -543,11 +543,11 @@ set_option (ESearchBar *esb, ESearchBarItem *items) { GArray *menu; EFilterBar *efb = (EFilterBar *)esb; - + menu = build_items (esb, items, 1, &efb->option_base, efb->option_rules); ((ESearchBarClass *)parent_class)->set_option (esb, (ESearchBarItem *)menu->data); free_built_items (menu); - + e_search_bar_set_item_id (esb, efb->option_base); } @@ -556,7 +556,7 @@ context_changed (RuleContext *context, gpointer user_data) { EFilterBar *efb = E_FILTER_BAR (user_data); ESearchBar *esb = E_SEARCH_BAR (user_data); - + /* just generate whole menu again */ generate_menu (esb, efb->default_items); } @@ -566,7 +566,7 @@ context_rule_removed (RuleContext *context, FilterRule *rule, gpointer user_data { EFilterBar *efb = E_FILTER_BAR (user_data); ESearchBar *esb = E_SEARCH_BAR (user_data); - + /* just generate whole menu again */ generate_menu (esb, efb->default_items); } @@ -576,7 +576,7 @@ rule_changed (FilterRule *rule, gpointer user_data) { EFilterBar *efb = E_FILTER_BAR (user_data); ESearchBar *esb = E_SEARCH_BAR (user_data); - + /* just generate whole menu again */ generate_menu (esb, efb->default_items); } @@ -589,12 +589,12 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp { EFilterBar *efb = (EFilterBar *) object; ESearchBar *esb = E_SEARCH_BAR (object); - + switch (property_id) { case PROP_QUERY: if (efb->current_query) { GString *out = g_string_new (""); - + filter_rule_build_code (efb->current_query, out); g_value_take_string (value, out->str); g_string_free (out, FALSE); @@ -609,9 +609,9 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp int searchscope, item_id, n, view_id; xmlNodePtr root, node; xmlDocPtr doc; - + item_id = e_search_bar_get_item_id ((ESearchBar *) efb); - + doc = xmlNewDoc ((const unsigned char *)"1.0"); root = xmlNewDocNode (doc, NULL, (const unsigned char *)"state", NULL); xmlDocSetRootElement (doc, root); @@ -620,7 +620,7 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp if (searchscope < E_FILTERBAR_CURRENT_FOLDER_ID) item_id = esb->last_search_option; - + if (item_id == E_FILTERBAR_ADVANCED_ID) { /* advanced query, save the filterbar state */ node = xmlNewChild (root, NULL, (const unsigned char *)"filter-bar", NULL); @@ -631,12 +631,12 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp xmlSetProp (node, (const unsigned char *)"searchscope", (unsigned char *)buf); sprintf (buf, "%d", view_id); xmlSetProp (node, (const unsigned char *)"view_id", (unsigned char *)buf); - - xmlAddChild (node, filter_rule_xml_encode (efb->current_query)); + + xmlAddChild (node, filter_rule_xml_encode (efb->current_query)); } else { /* simple query, save the searchbar state */ text = e_search_bar_get_text ((ESearchBar *) efb); - + node = xmlNewChild (root, NULL, (const unsigned char *)"search-bar", NULL); xmlSetProp (node, (const unsigned char *)"text", (unsigned char *)(text ? text : "")); sprintf (buf, "%d", item_id); @@ -647,18 +647,18 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp xmlSetProp (node, (const unsigned char *)"view_id", (unsigned char *)buf); g_free (text); } - + xmlDocDumpMemory (doc, &xmlbuf, &n); xmlFreeDoc (doc); - + /* remap to glib memory */ text = g_malloc (n + 1); memcpy (text, (char *)xmlbuf, n); text[n] = '\0'; xmlFree (xmlbuf); - + g_value_take_string (value, text); - + break; } default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -671,14 +671,14 @@ xml_get_prop_int (xmlNodePtr node, const char *prop) { char *buf; int ret; - + if ((buf = (char *)xmlGetProp (node, (unsigned char *)prop))) { ret = strtol (buf, NULL, 10); xmlFree (buf); } else { ret = -1; } - + return ret; } @@ -691,26 +691,26 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe const char *state; xmlDocPtr doc; gboolean rule_set = FALSE, is_cur_folder=FALSE; - int view_id, scope, item_id; - + int view_id, scope, item_id; + switch (property_id) { case PROP_STATE: if ((state = g_value_get_string (value))) { if (!(doc = xmlParseDoc ((unsigned char *) state))) return; - + root = doc->children; if (strcmp ((char *)root->name, "state") != 0) { xmlFreeDoc (doc); return; } - + node = root->children; while (node != NULL) { if (!strcmp ((char *)node->name, "filter-bar")) { FilterRule *rule = NULL; - + view_id = xml_get_prop_int (node, "view_id"); scope = xml_get_prop_int (node, "searchscope"); item_id = xml_get_prop_int (node, "item_id"); @@ -719,12 +719,12 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe if (scope == E_FILTERBAR_CURRENT_FOLDER_ID) is_cur_folder = TRUE; - + if ((node = node->children)) { GtkStyle *style = gtk_widget_get_default_style (); - + rule = filter_rule_new (); - if (filter_rule_xml_decode (rule, node, efb->context) != 0) { + if (filter_rule_xml_decode (rule, node, efb->context) != 0) { gtk_widget_modify_base (E_SEARCH_BAR (efb)->entry, GTK_STATE_NORMAL, NULL); gtk_widget_modify_text (((ESearchBar *)efb)->entry, GTK_STATE_NORMAL, NULL); gtk_widget_modify_base (((ESearchBar *)efb)->icon_entry, GTK_STATE_NORMAL, NULL); @@ -736,7 +736,7 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe gtk_widget_modify_base (((ESearchBar *)efb)->entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); gtk_widget_modify_text (((ESearchBar *)efb)->entry, GTK_STATE_NORMAL, &(style->text[GTK_STATE_SELECTED])); gtk_widget_modify_base (((ESearchBar *)efb)->icon_entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); - gtk_widget_modify_base (((ESearchBar *)efb)->viewoption, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); + gtk_widget_modify_base (((ESearchBar *)efb)->viewoption, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); g_object_set_data_full (object, "rule", rule, (GDestroyNotify) g_object_unref); } } @@ -746,31 +746,31 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe esb->block_search = TRUE; e_search_bar_set_text (esb, _("Advanced Search")); e_search_bar_set_item_menu ((ESearchBar *) efb, item_id); - e_search_bar_set_search_scope ((ESearchBar *) efb, scope); + e_search_bar_set_search_scope ((ESearchBar *) efb, scope); esb->block_search = FALSE; efb->current_query = (FilterRule *)efb->option_rules->pdata[item_id - efb->option_base]; if (efb->config && efb->current_query) { char *query = e_search_bar_get_text (esb); efb->config (efb, efb->current_query, item_id, query, efb->config_data); g_free (query); - + } } e_search_bar_set_viewitem_id ((ESearchBar *) efb, view_id); efb->current_query = rule; efb->setquery = TRUE; - e_search_bar_set_item_id ((ESearchBar *) efb, E_FILTERBAR_ADVANCED_ID); + e_search_bar_set_item_id ((ESearchBar *) efb, E_FILTERBAR_ADVANCED_ID); efb->setquery = FALSE; - + break; } else if (!strcmp ((char *)node->name, "search-bar")) { int subitem_id, item_id, scope, view_id; char *text; GtkStyle *style = gtk_widget_get_default_style (); - + /* set the text first (it doesn't emit a signal) */ - + /* now set the item_id and subitem_id */ item_id = xml_get_prop_int (node, "item_id"); subitem_id = xml_get_prop_int (node, "subitem_id"); @@ -791,7 +791,7 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe if (text && *text) { efb->current_query = (FilterRule *)efb->option_rules->pdata[item_id - efb->option_base]; if (efb->config && efb->current_query) - efb->config (efb, efb->current_query, item_id, text, efb->config_data); + efb->config (efb, efb->current_query, item_id, text, efb->config_data); gtk_widget_set_sensitive (esb->clear_button, TRUE); gtk_widget_modify_base (((ESearchBar *)efb)->entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); gtk_widget_modify_text (((ESearchBar *)efb)->entry, GTK_STATE_NORMAL, &(style->text[GTK_STATE_SELECTED])); @@ -799,23 +799,23 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe gtk_widget_modify_base (((ESearchBar *)efb)->viewoption, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); } else { gtk_widget_modify_base (((ESearchBar *)efb)->entry, GTK_STATE_NORMAL, NULL); - gtk_widget_modify_text (((ESearchBar *)efb)->entry, GTK_STATE_NORMAL, NULL); + gtk_widget_modify_text (((ESearchBar *)efb)->entry, GTK_STATE_NORMAL, NULL); gtk_widget_modify_base (((ESearchBar *)efb)->icon_entry, GTK_STATE_NORMAL, NULL); e_search_bar_paint (esb); efb->current_query = (FilterRule *)efb->option_rules->pdata[item_id - efb->option_base]; if (efb->config && efb->current_query) - efb->config (efb, efb->current_query, item_id, "", efb->config_data); + efb->config (efb, efb->current_query, item_id, "", efb->config_data); } - + xmlFree (text); break; } - + node = node->next; } - + xmlFreeDoc (doc); } else { /* set default state */ @@ -823,16 +823,16 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe e_search_bar_set_viewitem_id ((ESearchBar *) efb, 0); e_search_bar_set_search_scope ((ESearchBar *) efb, E_FILTERBAR_CURRENT_FOLDER_ID); } - + /* we don't want to run option_changed */ efb->setquery = TRUE; g_signal_emit_by_name (efb, "search_activated", NULL); efb->setquery = FALSE; - + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; + break; } } @@ -854,15 +854,15 @@ static void dispose (GObject *object) { EFilterBar *bar; - + g_return_if_fail (object != NULL); g_return_if_fail (E_IS_FILTER_BAR (object)); - + bar = E_FILTER_BAR (object); - + if (bar->context != NULL && bar->userrules != NULL) rule_context_save (bar->context, bar->userrules); - + if (bar->menu_rules != NULL) { clear_rules(bar, bar->menu_rules); clear_rules(bar, bar->option_rules); @@ -902,24 +902,24 @@ class_init (EFilterBarClass *klass) GObjectClass *object_class = (GObjectClass *) klass; ESearchBarClass *esb_class = (ESearchBarClass *) klass; GParamSpec *pspec; - + parent_class = g_type_class_ref (e_search_bar_get_type ()); - + object_class->dispose = dispose; object_class->get_property = get_property; object_class->set_property = set_property; - + esb_class->set_menu = set_menu; esb_class->set_option = set_option; - + pspec = g_param_spec_string ("query", NULL, NULL, NULL, G_PARAM_READABLE); g_object_class_install_property (object_class, PROP_QUERY, pspec); - + pspec = g_param_spec_string ("state", NULL, NULL, NULL, G_PARAM_READWRITE); g_object_class_install_property (object_class, PROP_STATE, pspec); - + /*gtk_object_add_arg_type ("EFilterBar::query", GTK_TYPE_STRING, GTK_ARG_READABLE, ARG_QUERY);*/ - + #if 0 esb_signals [QUERY_CHANGED] = gtk_signal_new ("query_changed", @@ -928,7 +928,7 @@ class_init (EFilterBarClass *klass) G_STRUCT_OFFSET (EFilterBarClass, query_changed), gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); - + esb_signals [MENU_ACTIVATED] = gtk_signal_new ("menu_activated", GTK_RUN_LAST, @@ -936,7 +936,7 @@ class_init (EFilterBarClass *klass) G_STRUCT_OFFSET (EFilterBarClass, menu_activated), g_cclosure_marshal_VOID__INT, GTK_TYPE_NONE, 1, GTK_TYPE_INT); - + gtk_object_class_add_signals (object_class, esb_signals, LAST_SIGNAL); #endif } @@ -947,7 +947,7 @@ init (EFilterBar *efb) g_signal_connect (efb, "menu_activated", G_CALLBACK (menubar_activated), NULL); g_signal_connect (efb, "query_changed", G_CALLBACK (option_changed), NULL); g_signal_connect (efb, "search_activated", G_CALLBACK (option_changed), NULL); - + efb->menu_rules = g_ptr_array_new (); efb->option_rules = g_ptr_array_new (); } @@ -963,16 +963,16 @@ e_filter_bar_new (RuleContext *context, void *data) { EFilterBar *bar; - + bar = g_object_new (e_filter_bar_get_type (), NULL); e_filter_bar_new_construct (context, systemrules, userrules, config, data, bar); - + return bar; } -void +void e_filter_bar_new_construct (RuleContext *context, const char *systemrules, const char *userrules, @@ -983,18 +983,18 @@ e_filter_bar_new_construct (RuleContext *context, bar->context = context; g_object_ref (context); - + bar->config = config; bar->config_data = data; - + bar->systemrules = g_strdup (systemrules); bar->userrules = g_strdup (userrules); - + bar->all_account_search_vf = NULL; bar->account_search_vf = NULL; - + e_search_bar_construct ((ESearchBar *)bar, &item, &item); - + g_signal_connect (context, "changed", G_CALLBACK (context_changed), bar); g_signal_connect (context, "rule_removed", G_CALLBACK (context_rule_removed), bar); @@ -1004,7 +1004,7 @@ GtkType e_filter_bar_get_type (void) { static GtkType type = 0; - + if (!type) { static const GtkTypeInfo info = { "EFilterBar", @@ -1016,9 +1016,9 @@ e_filter_bar_get_type (void) /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; - + type = gtk_type_unique (e_search_bar_get_type (), &info); } - + return type; } diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h index 4e64e29ccd..7588517c4b 100644 --- a/widgets/misc/e-filter-bar.h +++ b/widgets/misc/e-filter-bar.h @@ -58,18 +58,18 @@ struct _EFilterBar { ESearchBar parent; int menu_base, option_base; GPtrArray *menu_rules, *option_rules; - + ESearchBarItem *default_items; - + GtkWidget *save_dialog; /* current save dialogue (so we dont pop up multiple ones) */ FilterRule *current_query; /* as it says */ int setquery; /* true when we're setting a query directly to advanced, so dont popup the dialog */ - + RuleContext *context; char *systemrules; char *userrules; - + EFilterBarConfigRule config; void *config_data; @@ -122,7 +122,7 @@ EFilterBar *e_filter_bar_new (RuleContext *context, const char *userrules, EFilterBarConfigRule config, void *data); -void +void e_filter_bar_new_construct (RuleContext *context, const char *systemrules, const char *userrules, diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c index bd94ddb4d9..3a827c430f 100644 --- a/widgets/misc/e-gui-utils.c +++ b/widgets/misc/e-gui-utils.c @@ -33,7 +33,7 @@ void e_auto_kill_popup_menu_on_selection_done (GtkMenu *menu) { g_return_if_fail (GTK_IS_MENU (menu)); - + g_signal_connect (menu, "selection_done", G_CALLBACK (gtk_widget_destroy), menu); } diff --git a/widgets/misc/e-gui-utils.h b/widgets/misc/e-gui-utils.h index de7f6a066b..a4d0c3795f 100644 --- a/widgets/misc/e-gui-utils.h +++ b/widgets/misc/e-gui-utils.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-gui-utils.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/misc/e-hsv-utils.c b/widgets/misc/e-hsv-utils.c index 9da22788f7..b42271fb19 100644 --- a/widgets/misc/e-hsv-utils.c +++ b/widgets/misc/e-hsv-utils.c @@ -30,22 +30,22 @@ how much you want their respective channels modified (and in what direction). if it can't do the specified modification, it does it in the oppositon direction */ void -e_hsv_tweak (GdkColor *colour, gdouble delta_h, gdouble delta_s, gdouble delta_v) +e_hsv_tweak (GdkColor *colour, gdouble delta_h, gdouble delta_s, gdouble delta_v) { gdouble h, s, v, r, g, b; r = colour->red / 65535.0f; g = colour->green / 65535.0f; b = colour->blue / 65535.0f; - + e_rgb_to_hsv (r, g, b, &h, &s, &v); - + if (h + delta_h < 0) { h -= delta_h; } else { h += delta_h; } - + if (s + delta_s < 0) { s -= delta_s; } else { @@ -59,7 +59,7 @@ e_hsv_tweak (GdkColor *colour, gdouble delta_h, gdouble delta_s, gdouble delta_v } e_hsv_to_rgb (h, s, v, &r, &g, &b); - + colour->red = r * 65535.0f; colour->green = g * 65535.0f; colour->blue = b * 65535.0f; diff --git a/widgets/misc/e-hsv-utils.h b/widgets/misc/e-hsv-utils.h index 186818d7f6..f76bed73f6 100644 --- a/widgets/misc/e-hsv-utils.h +++ b/widgets/misc/e-hsv-utils.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-hsv-utils.h - utilites for manipulating colours in HSV space * Copyright (C) 1995-2001 Seth Nickell, Peter Mattis, Spencer Kimball and Josh MacDonald * diff --git a/widgets/misc/e-icon-entry.c b/widgets/misc/e-icon-entry.c index 48a40e088e..c246edc04c 100644 --- a/widgets/misc/e-icon-entry.c +++ b/widgets/misc/e-icon-entry.c @@ -28,7 +28,7 @@ * Modified by the GTK+ Team and others 1997-2005. See the AUTHORS * file in the gtk+ distribution for a list of people on the GTK+ Team. * See the ChangeLog in the gtk+ distribution files for a list of changes. - * These files are distributed with GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * These files are distributed with GTK+ at ftp://ftp.gtk.org/pub/gtk/. * */ @@ -113,9 +113,9 @@ e_icon_entry_paint (GtkWidget *widget, height -= 2 * focus_width; } - gtk_paint_flat_box (entry_widget->style, widget->window, + gtk_paint_flat_box (entry_widget->style, widget->window, GTK_WIDGET_STATE (entry_widget), GTK_SHADOW_NONE, - NULL, entry_widget, "entry_bg", + NULL, entry_widget, "entry_bg", /* FIXME: was 0, 0 in gtk_entry_expose, but I think this is correct: */ x, y, width, height); @@ -254,7 +254,7 @@ e_icon_entry_size_allocate (GtkWidget *widget, child_allocation.width, child_allocation.height); } - + child_allocation.x = container->border_width + xborder; child_allocation.y = container->border_width + yborder; child_allocation.width = MAX (allocation->width - (container->border_width + xborder) * 2, 0); @@ -350,7 +350,7 @@ e_icon_entry_pack_widget (EIconEntry *entry, } } -static void +static void set_cursor (GtkWidget *widget, GdkEventCrossing *event, gpointer dummy) { diff --git a/widgets/misc/e-icon-entry.h b/widgets/misc/e-icon-entry.h index 0bdc00c94f..db3f01dc56 100644 --- a/widgets/misc/e-icon-entry.h +++ b/widgets/misc/e-icon-entry.h @@ -30,7 +30,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file in the gtk+ distribution for a list of people on the GTK+ Team. * See the ChangeLog in the gtk+ distribution files for a list of changes. - * These files are distributed with GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * These files are distributed with GTK+ at ftp://ftp.gtk.org/pub/gtk/. * */ diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c index 319c2b55ac..c15cb54817 100644 --- a/widgets/misc/e-image-chooser.c +++ b/widgets/misc/e-image-chooser.c @@ -234,11 +234,11 @@ set_image_from_data (EImageChooser *chooser, gdk_pixbuf_loader_write (loader, (unsigned char *)data, length, NULL); gdk_pixbuf_loader_close (loader, NULL); - + pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); if (pixbuf) g_object_ref (pixbuf); - + g_object_unref (loader); if (pixbuf) { diff --git a/widgets/misc/e-image-chooser.h b/widgets/misc/e-image-chooser.h index 4f9d177394..ff876038ae 100644 --- a/widgets/misc/e-image-chooser.h +++ b/widgets/misc/e-image-chooser.h @@ -49,7 +49,7 @@ struct _EImageChooserClass /* signals */ void (*changed) (EImageChooser *chooser); - + }; GtkWidget *e_image_chooser_new (void); diff --git a/widgets/misc/e-info-label.c b/widgets/misc/e-info-label.c index e38d4692cc..617a92f350 100644 --- a/widgets/misc/e-info-label.c +++ b/widgets/misc/e-info-label.c @@ -73,7 +73,7 @@ static void el_class_init(GObjectClass *klass) { klass->finalize = el_finalise; - + ((GtkObjectClass *)klass)->destroy = el_destroy; ((GtkWidgetClass *)klass)->expose_event = el_expose_event; } @@ -101,12 +101,12 @@ e_info_label_get_type(void) /** * e_info_label_new: - * @icon: - * + * @icon: + * * Create a new info label widget. @icon is the name of the icon * (from the icon theme) to use for the icon image. - * - * Return value: + * + * Return value: **/ GtkWidget * e_info_label_new(const char *icon) @@ -114,7 +114,7 @@ e_info_label_new(const char *icon) EInfoLabel *el = g_object_new(e_info_label_get_type(), NULL); GtkWidget *image; char *name = e_icon_factory_get_icon_filename (icon, E_ICON_SIZE_MENU); - + image = gtk_image_new_from_file(name); g_free(name); gtk_misc_set_padding((GtkMisc *)image, 6, 6); @@ -128,10 +128,10 @@ e_info_label_new(const char *icon) /** * e_info_label_set_info: - * @el: - * @location: - * @info: - * + * @el: + * @location: + * @info: + * * Set the information to show on the label. @location is some * context about the current view. e.g. the folder name. If the * label is too wide, this will be truncated. diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index 17c1ecbb35..758d4f960c 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -124,11 +124,11 @@ static GtkWidgetClass *parent_class; /** * e_map_get_type: - * @void: - * + * @void: + * * Registers the #EMap class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the #EMap class. **/ @@ -608,10 +608,10 @@ e_map_key_press (GtkWidget *widget, GdkEventKey *event) /** * e_map_new: - * @void: - * + * @void: + * * Creates a new empty map widget. - * + * * Return value: A newly-created map widget. **/ @@ -635,7 +635,7 @@ e_map_new (void) /* These functions translate coordinates between longitude/latitude and * the image x/y offsets, using the equidistant cylindrical projection. - * + * * Longitude E <-180, 180] * Latitude E <-90, 90] */ @@ -692,7 +692,7 @@ double e_map_get_magnification (EMap *map) { EMapPrivate *priv; - + priv = map->priv; if (priv->zoom_state == E_MAP_ZOOMED_IN) return 2.0; else return 1.0; @@ -812,7 +812,7 @@ e_map_remove_point (EMap *map, EMapPoint *point) update_render_pixbuf (map, GDK_INTERP_BILINEAR, TRUE); repaint_point (map, point); } - + g_free (point); } @@ -878,11 +878,11 @@ e_map_point_is_in_view (EMap *map, EMapPoint *point) if (!priv->map_render_pixbuf) return FALSE; e_map_world_to_window (map, point->longitude, point->latitude, &x, &y); - + if (x >= 0 && x < GTK_WIDGET (map)->allocation.width && y >= 0 && y < GTK_WIDGET (map)->allocation.height) return TRUE; - + return FALSE; } @@ -932,7 +932,7 @@ repaint_visible (EMap *map) area.y = 0; area.width = GTK_WIDGET (map)->allocation.width; area.height = GTK_WIDGET (map)->allocation.height; - + request_paint_area (map, &area); } @@ -1014,7 +1014,7 @@ update_render_pixbuf (EMap *map, GdkInterpType interp, gboolean render_overlays) zoom, zoom, /* Scale (x, y) */ interp); } - + if (render_overlays) { /* Add points */ @@ -1056,7 +1056,7 @@ request_paint_area (EMap *view, GdkRectangle *area) if (priv->yofs + height > gdk_pixbuf_get_height (priv->map_render_pixbuf)) height = gdk_pixbuf_get_height (priv->map_render_pixbuf) - priv->yofs; - + /* We rely on the fast case always being the case, since we load and * preprocess the source pixbuf ourselves */ @@ -1148,7 +1148,7 @@ repaint_point (EMap *map, EMapPoint *point) GdkRectangle area; double px, py; - if (!e_map_point_is_in_view (map, point)) return; + if (!e_map_point_is_in_view (map, point)) return; e_map_world_to_window (map, point->longitude, point->latitude, &px, &py); @@ -1212,7 +1212,7 @@ smooth_center_at (EMap *map, int x, int y) dx = (x < priv->xofs) ? -1 : (x > priv->xofs) ? 1 : 0; dy = (y < priv->yofs) ? -1 : (y > priv->yofs) ? 1 : 0; - + scroll_to (map, priv->xofs + dx, priv->yofs + dy); } } @@ -1564,32 +1564,32 @@ zoom_in_smooth (EMap *map) height = gdk_pixbuf_get_height (priv->map_render_pixbuf); /* Center the target point as much as possible */ - + e_map_world_to_window (map, priv->zoom_target_long, priv->zoom_target_lat, &x, &y); smooth_center_at (map, x + priv->xofs, y + priv->yofs); /* Render and paint a temporary map without overlays, so they don't get in * the way (look ugly) while zooming */ - + update_render_pixbuf (map, GDK_INTERP_BILINEAR, FALSE); request_paint_area (map, &area); - + /* Find out where in the area we're going to zoom to */ e_map_world_to_window (map, priv->zoom_target_long, priv->zoom_target_lat, &x, &y); - + /* Pre-render the zoomed-in map, so we can put it there quickly when the * blowup sequence ends */ - + priv->zoom_state = E_MAP_ZOOMED_IN; update_render_pixbuf (map, GDK_INTERP_BILINEAR, TRUE); - + /* Do the blowup */ - + blowup_window_area (window, priv->xofs, priv->yofs, x, y, width, height, 1.68); /* Set new scroll offsets and paint the zoomed map */ - + e_map_world_to_window (map, priv->zoom_target_long, priv->zoom_target_lat, &x, &y); priv->xofs = CLAMP (priv->xofs + x - area.width / 2.0, 0, E_MAP_GET_WIDTH (map) - area.width); priv->yofs = CLAMP (priv->yofs + y - area.height / 2.0, 0, E_MAP_GET_HEIGHT (map) - area.height); @@ -1673,7 +1673,7 @@ zoom_do (EMap *map) /* if (e_map_get_smooth_zoom(map)) zoom_out_smooth(map); */ zoom_out (map); } - + g_signal_handlers_unblock_matched (priv->hadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, map); g_signal_handlers_unblock_matched (priv->vadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, map); diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c index 86bade5f97..bd73f1d2de 100644 --- a/widgets/misc/e-multi-config-dialog.c +++ b/widgets/misc/e-multi-config-dialog.c @@ -39,12 +39,12 @@ struct _EMultiConfigDialogPrivate { GSList *pages; - + GtkWidget *list_e_table; ETableModel *list_e_table_model; - + GtkWidget *notebook; - + int set_page_timeout_id; int set_page_timeout_page; }; @@ -85,7 +85,7 @@ create_page_container (const char *description, vbox = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 0); gtk_widget_show (widget); gtk_widget_show (vbox); @@ -248,7 +248,7 @@ canvas_realize (GtkWidget *widget, EMultiConfigDialog *dialog) { int i; int row_count; - + row_count = e_table_model_row_count (dialog->priv->list_e_table_model); for (i = 0; i < row_count; i++) { fill_in_pixbufs (dialog, i); @@ -285,9 +285,9 @@ e_multi_config_dialog_init (EMultiConfigDialog *multi_config_dialog) gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (multi_config_dialog)->action_area), 12); hbox = gtk_hbox_new (FALSE, 6); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); dialog_vbox = GTK_DIALOG (multi_config_dialog)->vbox; - + gtk_container_add (GTK_CONTAINER (dialog_vbox), hbox); list_e_table_model = e_table_memory_store_new (columns); @@ -336,7 +336,7 @@ e_multi_config_dialog_init (EMultiConfigDialog *multi_config_dialog) GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); gtk_dialog_set_default_response (GTK_DIALOG (multi_config_dialog), GTK_RESPONSE_OK); - + gtk_window_set_policy (GTK_WINDOW (multi_config_dialog), FALSE /* allow_shrink */, diff --git a/widgets/misc/e-pilot-settings.c b/widgets/misc/e-pilot-settings.c index 6dfd4873f6..1c97306032 100644 --- a/widgets/misc/e-pilot-settings.c +++ b/widgets/misc/e-pilot-settings.c @@ -30,7 +30,7 @@ #include <libedataserverui/e-source-combo-box.h> #include "e-pilot-settings.h" -struct _EPilotSettingsPrivate +struct _EPilotSettingsPrivate { GtkWidget *source; GtkWidget *secret; @@ -81,7 +81,7 @@ static void init (EPilotSettings *ps) { EPilotSettingsPrivate *priv; - + priv = g_new0 (EPilotSettingsPrivate, 1); ps->priv = priv; @@ -93,7 +93,7 @@ build_ui (EPilotSettings *ps, ESourceList *source_list) { EPilotSettingsPrivate *priv; GtkWidget *lbl; - + priv = ps->priv; gtk_table_resize (GTK_TABLE (ps), 2, 2); @@ -134,12 +134,12 @@ e_pilot_settings_new (ESourceList *source_list) { EPilotSettings *ps; EPilotSettingsPrivate *priv; - + ps = g_object_new (E_TYPE_PILOT_SETTINGS, NULL); priv = ps->priv; build_ui (ps, source_list); - + return GTK_WIDGET (ps); } @@ -147,7 +147,7 @@ ESource * e_pilot_settings_get_source (EPilotSettings *ps) { EPilotSettingsPrivate *priv; - + g_return_val_if_fail (ps != NULL, NULL); g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), NULL); @@ -161,7 +161,7 @@ void e_pilot_settings_set_source (EPilotSettings *ps, ESource *source) { EPilotSettingsPrivate *priv; - + g_return_if_fail (ps != NULL); g_return_if_fail (E_IS_PILOT_SETTINGS (ps)); @@ -175,12 +175,12 @@ gboolean e_pilot_settings_get_secret (EPilotSettings *ps) { EPilotSettingsPrivate *priv; - + g_return_val_if_fail (ps != NULL, FALSE); g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), FALSE); priv = ps->priv; - + return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->secret)); } @@ -188,7 +188,7 @@ void e_pilot_settings_set_secret (EPilotSettings *ps, gboolean secret) { EPilotSettingsPrivate *priv; - + g_return_if_fail (ps != NULL); g_return_if_fail (E_IS_PILOT_SETTINGS (ps)); diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c index 8e790e41ed..8cd38b9331 100644 --- a/widgets/misc/e-popup-menu.c +++ b/widgets/misc/e-popup-menu.c @@ -51,9 +51,9 @@ make_item (GtkMenu *menu, GtkMenuItem *item, const char *name, GtkWidget *pixmap label = gtk_label_new_with_mnemonic (name); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_widget_show (label); - + gtk_container_add (GTK_CONTAINER (item), label); - + if (pixmap && GTK_IS_IMAGE_MENU_ITEM (item)){ gtk_widget_show (pixmap); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), pixmap); @@ -151,12 +151,12 @@ void e_popup_menu_run (EPopupMenu *menu_list, GdkEvent *event, guint32 disable_mask, guint32 hide_mask, void *default_closure) { GtkMenu *menu; - + g_return_if_fail (menu_list != NULL); g_return_if_fail (event != NULL); - + menu = e_popup_menu_create (menu_list, disable_mask, hide_mask, default_closure); - + e_popup_menu (menu, event); } diff --git a/widgets/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h index 91adb76a76..88e08de05f 100644 --- a/widgets/misc/e-popup-menu.h +++ b/widgets/misc/e-popup-menu.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-popup-menu.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c index 7fb79432d6..ee906a6670 100644 --- a/widgets/misc/e-printable.c +++ b/widgets/misc/e-printable.c @@ -51,7 +51,7 @@ static void e_printable_class_init (EPrintableClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - + e_printable_signals [PRINT_PAGE] = g_signal_new ("print_page", G_OBJECT_CLASS_TYPE (object_class), @@ -89,7 +89,7 @@ e_printable_class_init (EPrintableClass *klass) e_util_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOLEAN, G_TYPE_DOUBLE, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_BOOLEAN); - + e_printable_signals [WILL_FIT] = g_signal_new ("will_fit", G_OBJECT_CLASS_TYPE (object_class), @@ -100,7 +100,7 @@ e_printable_class_init (EPrintableClass *klass) G_TYPE_BOOLEAN, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_BOOLEAN); - klass->print_page = NULL; + klass->print_page = NULL; klass->data_left = NULL; klass->reset = NULL; klass->height = NULL; @@ -128,7 +128,7 @@ e_printable_print_page (EPrintable *e_printable, { g_return_if_fail (e_printable != NULL); g_return_if_fail (E_IS_PRINTABLE (e_printable)); - + g_signal_emit (e_printable, e_printable_signals [PRINT_PAGE], 0, context, @@ -157,7 +157,7 @@ e_printable_reset (EPrintable *e_printable) { g_return_if_fail (e_printable != NULL); g_return_if_fail (E_IS_PRINTABLE (e_printable)); - + g_signal_emit (e_printable, e_printable_signals [RESET], 0); } diff --git a/widgets/misc/e-printable.h b/widgets/misc/e-printable.h index bc5443bc6f..b79e042d08 100644 --- a/widgets/misc/e-printable.h +++ b/widgets/misc/e-printable.h @@ -64,7 +64,7 @@ typedef struct { GtkType e_printable_get_type (void); EPrintable *e_printable_new (void); - + /* * Routines for emitting signals on the e_table */ void e_printable_print_page (EPrintable *e_printable, diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c index 13460b975e..9efb689b46 100644 --- a/widgets/misc/e-reflow-model.c +++ b/widgets/misc/e-reflow-model.c @@ -246,7 +246,7 @@ e_reflow_model_changed (EReflowModel *e_reflow_model) { g_return_if_fail (e_reflow_model != NULL); g_return_if_fail (E_IS_REFLOW_MODEL (e_reflow_model)); - + d(print_tabs()); d(g_print("Emitting model_changed on model 0x%p.\n", e_reflow_model)); d(depth++); @@ -269,7 +269,7 @@ e_reflow_model_comparison_changed (EReflowModel *e_reflow_model) { g_return_if_fail (e_reflow_model != NULL); g_return_if_fail (E_IS_REFLOW_MODEL (e_reflow_model)); - + d(print_tabs()); d(g_print("Emitting comparison_changed on model 0x%p.\n", e_reflow_model)); d(depth++); @@ -283,7 +283,7 @@ e_reflow_model_comparison_changed (EReflowModel *e_reflow_model) * @e_reflow_model: The model changed. * @position: The position the items were insert in. * @count: The number of items inserted. - * + * * Use this function to notify any views of the reflow model that a number of items have been inserted. **/ void @@ -305,7 +305,7 @@ e_reflow_model_items_inserted (EReflowModel *e_reflow_model, int position, int c * e_reflow_model_item_removed: * @e_reflow_model: The model changed. * @n: The position from which the items were removed. - * + * * Use this function to notify any views of the reflow model that an * item has been removed. **/ diff --git a/widgets/misc/e-reflow-model.h b/widgets/misc/e-reflow-model.h index f7fd74fd0c..07b29c4636 100644 --- a/widgets/misc/e-reflow-model.h +++ b/widgets/misc/e-reflow-model.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-reflow-model.h * Copyright 2000, 2001, Ximian, Inc. * @@ -55,7 +55,7 @@ typedef struct { GnomeCanvasItem *(*incarnate) (EReflowModel *etm, int n, GnomeCanvasGroup *parent); int (*compare) (EReflowModel *etm, int n1, int n2); void (*reincarnate) (EReflowModel *etm, int n, GnomeCanvasItem *item); - + /* * Signals */ diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c index a8306ffbb3..86f8fa6064 100644 --- a/widgets/misc/e-reflow.c +++ b/widgets/misc/e-reflow.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-reflow.c * Copyright 2000, 2001, Ximian, Inc. * @@ -193,7 +193,7 @@ do_adjustment (gpointer user_data) } reflow->do_adjustment_idle_id = 0; - + return FALSE; } @@ -226,10 +226,10 @@ cursor_changed (ESelectionModel *selection, int row, int col, EReflow *reflow) NULL); } } - + if (reflow->do_adjustment_idle_id == 0) reflow->do_adjustment_idle_id = g_idle_add (do_adjustment, reflow); - + } @@ -334,7 +334,7 @@ reflow_columns (EReflow *reflow) } reflow->column_count = column_count; - reflow->columns = g_renew (int, reflow->columns, column_count); + reflow->columns = g_renew (int, reflow->columns, column_count); column_count --; for (; column_count > column_start; column_count--) { @@ -714,7 +714,7 @@ e_reflow_set_property (GObject *object, guint prop_id, const GValue *value, GPar item = GNOME_CANVAS_ITEM (object); reflow = E_REFLOW (object); - + switch (prop_id){ case PROP_HEIGHT: reflow->height = g_value_get_double (value); @@ -811,11 +811,11 @@ e_reflow_dispose (GObject *object) if (reflow->do_adjustment_idle_id) g_source_remove (reflow->do_adjustment_idle_id); - reflow->do_adjustment_idle_id = 0; + reflow->do_adjustment_idle_id = 0; disconnect_model (reflow); disconnect_selection (reflow); - + g_free(reflow->empty_message); reflow->empty_message = NULL; @@ -839,7 +839,7 @@ e_reflow_realize (GnomeCanvasItem *item) if (GNOME_CANVAS_ITEM_CLASS(e_reflow_parent_class)->realize) (* GNOME_CANVAS_ITEM_CLASS(e_reflow_parent_class)->realize) (item); - + reflow->arrow_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW); reflow->default_cursor = gdk_cursor_new (GDK_LEFT_PTR); @@ -866,7 +866,7 @@ e_reflow_realize (GnomeCanvasItem *item) adjustment->step_increment = (reflow->column_width + E_REFLOW_FULL_GUTTER) / 2; adjustment->page_increment = adjustment->page_size - adjustment->step_increment; gtk_adjustment_changed(adjustment); - + if (!item->canvas->aa) { } } @@ -880,7 +880,7 @@ e_reflow_unrealize (GnomeCanvasItem *item) if (!item->canvas->aa) { } - + gdk_cursor_unref (reflow->arrow_cursor); gdk_cursor_unref (reflow->default_cursor); reflow->arrow_cursor = NULL; @@ -901,7 +901,7 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) { EReflow *reflow; int return_val = FALSE; - + reflow = E_REFLOW (item); switch( event->type ) @@ -910,8 +910,8 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) return_val = e_selection_model_key_press(reflow->selection, (GdkEventKey *) event); break; #if 0 - if (event->key.keyval == GDK_Tab || - event->key.keyval == GDK_KP_Tab || + if (event->key.keyval == GDK_Tab || + event->key.keyval == GDK_KP_Tab || event->key.keyval == GDK_ISO_Left_Tab) { int i; int count; @@ -934,7 +934,7 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) return FALSE; i++; } - + unsorted = e_sorter_sorted_to_model (E_SORTER (reflow->sorter), i); if (reflow->items[unsorted] == NULL) { reflow->items[unsorted] = e_reflow_model_incarnate (reflow->model, unsorted, GNOME_CANVAS_GROUP (reflow)); @@ -951,7 +951,7 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) } #endif case GDK_BUTTON_PRESS: - switch(event->button.button) + switch(event->button.button) { case 1: { @@ -971,12 +971,12 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) reflow->start_x = reflow->which_column_dragged * (reflow->column_width + E_REFLOW_FULL_GUTTER) - E_REFLOW_DIVIDER_WIDTH / 2; reflow->temp_column_width = reflow->column_width; reflow->column_drag = TRUE; - - gnome_canvas_item_grab (item, + + gnome_canvas_item_grab (item, GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK, reflow->arrow_cursor, button->time); - + reflow->previous_temp_column_width = -1; reflow->need_column_resize = TRUE; gnome_canvas_item_request_update(item); @@ -992,7 +992,7 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) gtk_adjustment_set_value(adjustment, new_value); } break; - case 5: + case 5: { GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas)); gdouble new_value = adjustment->value; @@ -1061,12 +1061,12 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, reflow->arrow_cursor); reflow->default_cursor_shown = FALSE; } - } else + } else if ( ! reflow->default_cursor_shown ) { gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, reflow->default_cursor); reflow->default_cursor_shown = TRUE; } - + } break; case GDK_ENTER_NOTIFY: @@ -1155,7 +1155,7 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable, } if (reflow->column_drag) { int start_line = e_reflow_pick_line(reflow, - gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas))->value); + gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas))->value); i = x - start_line * (column_width + E_REFLOW_FULL_GUTTER); running_width = start_line * (column_width + E_REFLOW_FULL_GUTTER); column_width = reflow->temp_column_width; @@ -1170,7 +1170,7 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable, /* Compute first column to draw. */ i /= column_width + E_REFLOW_FULL_GUTTER; running_width += i * (column_width + E_REFLOW_FULL_GUTTER); - + for ( ; i < reflow->column_count; i++) { if ( running_width > x + width ) break; @@ -1181,7 +1181,7 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable, x_rect - x, y_rect - y, width_rect - 1, - height_rect - 1); + height_rect - 1); running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH; } } @@ -1197,7 +1197,7 @@ e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gin if (GNOME_CANVAS_ITEM_CLASS(e_reflow_parent_class)->update) GNOME_CANVAS_ITEM_CLASS(e_reflow_parent_class)->update (item, affine, clip_path, flags); - + x0 = item->x1; y0 = item->y1; x1 = item->x2; @@ -1228,11 +1228,11 @@ e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gin } else if (reflow->need_column_resize) { int x_rect, y_rect, width_rect, height_rect; int start_line = e_reflow_pick_line(reflow, - gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas))->value); + gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas))->value); gdouble running_width; int i; double column_width; - + if ( reflow->previous_temp_column_width != -1 ) { running_width = start_line * (reflow->column_width + E_REFLOW_FULL_GUTTER); column_width = reflow->previous_temp_column_width; @@ -1241,14 +1241,14 @@ e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gin y_rect = E_REFLOW_BORDER_WIDTH; width_rect = E_REFLOW_DIVIDER_WIDTH; height_rect = reflow->height - (E_REFLOW_BORDER_WIDTH * 2); - + for ( i = 0; i < reflow->column_count; i++) { x_rect = running_width; gnome_canvas_request_redraw(item->canvas, x_rect, y_rect, x_rect + width_rect, y_rect + height_rect); running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH; } } - + if ( reflow->temp_column_width != -1 ) { running_width = start_line * (reflow->column_width + E_REFLOW_FULL_GUTTER); column_width = reflow->temp_column_width; @@ -1257,14 +1257,14 @@ e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gin y_rect = E_REFLOW_BORDER_WIDTH; width_rect = E_REFLOW_DIVIDER_WIDTH; height_rect = reflow->height - (E_REFLOW_BORDER_WIDTH * 2); - + for ( i = 0; i < reflow->column_count; i++) { x_rect = running_width; gnome_canvas_request_redraw(item->canvas, x_rect, y_rect, x_rect + width_rect, y_rect + height_rect); running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH; } } - + reflow->previous_temp_column_width = reflow->temp_column_width; reflow->need_column_resize = FALSE; } @@ -1283,7 +1283,7 @@ e_reflow_point (GnomeCanvasItem *item, distance = GNOME_CANVAS_ITEM_CLASS(e_reflow_parent_class)->point (item, x, y, cx, cy, actual_item); if ((int) (distance * item->canvas->pixels_per_unit + 0.5) <= item->canvas->close_enough && *actual_item) return distance; - + *actual_item = item; return 0; #if 0 @@ -1317,7 +1317,7 @@ e_reflow_reflow( GnomeCanvasItem *item, int flags ) if (reflow->need_reflow_columns) { reflow_columns (reflow); } - + old_width = reflow->width; running_width = E_REFLOW_BORDER_WIDTH; @@ -1359,7 +1359,7 @@ e_reflow_selection_event_real (EReflow *reflow, GnomeCanvasItem *item, GdkEvent case 2: row = er_find_item (reflow, item); if (event->button.button == 1) { - reflow->maybe_did_something = + reflow->maybe_did_something = e_selection_model_maybe_do_something(reflow->selection, row, 0, event->button.state); reflow->maybe_in_drag = TRUE; } else { @@ -1409,7 +1409,7 @@ e_reflow_class_init (EReflowClass *klass) object_class->set_property = e_reflow_set_property; object_class->get_property = e_reflow_get_property; object_class->dispose = e_reflow_dispose; - + /* GnomeCanvasItem method overrides */ item_class->event = e_reflow_event; item_class->realize = e_reflow_realize; @@ -1530,13 +1530,13 @@ e_reflow_init (EReflow *reflow) "sorter", reflow->sorter, NULL); - reflow->selection_changed_id = + reflow->selection_changed_id = g_signal_connect(reflow->selection, "selection_changed", G_CALLBACK (selection_changed), reflow); - reflow->selection_row_changed_id = + reflow->selection_row_changed_id = g_signal_connect(reflow->selection, "selection_row_changed", G_CALLBACK (selection_row_changed), reflow); - reflow->cursor_changed_id = + reflow->cursor_changed_id = g_signal_connect(reflow->selection, "cursor_changed", G_CALLBACK (cursor_changed), reflow); diff --git a/widgets/misc/e-reflow.h b/widgets/misc/e-reflow.h index 4e47fbf900..1a11ddbddc 100644 --- a/widgets/misc/e-reflow.h +++ b/widgets/misc/e-reflow.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-reflow.h * Copyright 2000, 2001, Ximian, Inc. * @@ -60,7 +60,7 @@ typedef struct _EReflowClass EReflowClass; struct _EReflow { GnomeCanvasGroup parent; - + /* item specific fields */ EReflowModel *model; guint model_changed_id; @@ -132,7 +132,7 @@ struct _EReflowClass void (*column_width_changed) (EReflow *reflow, double width); }; -/* +/* * To be added to a reflow, an item must have the argument "width" as * a Read/Write argument and "height" as a Read Only argument. It * should also do an ECanvas parent reflow request if its size diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index e93a532ed8..a4da8b3f79 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-search-bar.c * * Copyright (C) 2000, 2001 Ximian, Inc. @@ -130,12 +130,12 @@ verb_name_from_id (int id) static void clear_search (ESearchBar *esb) { - e_search_bar_set_text (esb, ""); + e_search_bar_set_text (esb, ""); esb->block_search = TRUE; if (esb->item_id < 0) - e_search_bar_set_item_id (esb, esb->last_search_option); + e_search_bar_set_item_id (esb, esb->last_search_option); e_search_bar_set_viewitem_id (esb, 0); - esb->block_search = FALSE; + esb->block_search = FALSE; emit_search_activated (esb); } @@ -218,10 +218,10 @@ search_now_verb_cb (BonoboUIComponent *ui_component, } else { gtk_widget_modify_base (esb->entry, GTK_STATE_NORMAL, NULL); - gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, NULL); + gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, NULL); gtk_widget_modify_base (esb->icon_entry, GTK_STATE_NORMAL, NULL); } - + emit_search_activated (esb); } @@ -238,7 +238,7 @@ clear_verb_cb (BonoboUIComponent *ui_component, gtk_widget_modify_base (esb->icon_entry, GTK_STATE_NORMAL, NULL); clear_search (esb); - gtk_entry_set_text (GTK_ENTRY (esb->entry), ""); + gtk_entry_set_text (GTK_ENTRY (esb->entry), ""); gtk_widget_grab_focus (esb->entry); } @@ -293,7 +293,7 @@ get_selected_item_label (GtkWidget *menu) item = gtk_menu_get_active ((GtkMenu *)menu); label = gtk_bin_get_child ((GtkBin *)item); - if (GTK_IS_LABEL (label)) + if (GTK_IS_LABEL (label)) text = gtk_label_get_text ((GtkLabel *)label); return text; @@ -312,7 +312,7 @@ entry_focus_in_cb (GtkWidget *widget, if (gdk_color_equal (&(entry_style->text[GTK_STATE_NORMAL]), &(default_style->text[GTK_STATE_INSENSITIVE]))) { gtk_entry_set_text (GTK_ENTRY (esb->entry), ""); gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, NULL); - } + } return FALSE; } @@ -327,7 +327,7 @@ paint_search_text (GtkWidget *widget, ESearchBar *esb) text = gtk_entry_get_text (GTK_ENTRY (widget)); if (text && *text) return FALSE; - + if (!GTK_WIDGET_SENSITIVE (esb->option_button)) { menu_widget = esb->scopeoption_menu; text = g_object_get_data (G_OBJECT(gtk_menu_get_active ( GTK_MENU (esb->scopeoption_menu))),"string"); @@ -335,8 +335,8 @@ paint_search_text (GtkWidget *widget, ESearchBar *esb) return FALSE; else /* no query in search entry .. so set the current option */ text = get_selected_item_label (menu_widget); - - + + if (text && *text) { gchar *t; @@ -350,7 +350,7 @@ paint_search_text (GtkWidget *widget, ESearchBar *esb) g_free (t); gtk_widget_set_sensitive (esb->clear_button, FALSE); } - + return FALSE; } @@ -376,16 +376,16 @@ entry_activated_cb (GtkWidget *widget, GtkStyle *style = gtk_widget_get_default_style (); if (text && *text) { - gtk_widget_modify_base (esb->entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); + gtk_widget_modify_base (esb->entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, &(style->text[GTK_STATE_SELECTED])); - gtk_widget_modify_base (esb->icon_entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); + gtk_widget_modify_base (esb->icon_entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); gtk_widget_modify_base (esb->viewoption, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); } else { gtk_widget_modify_base (esb->entry, GTK_STATE_NORMAL, NULL); - gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, NULL); + gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, NULL); gtk_widget_modify_base (esb->icon_entry, GTK_STATE_NORMAL, NULL); } - + emit_search_activated (esb); } @@ -398,11 +398,11 @@ entry_changed_cb (GtkWidget *widget, entry_style = gtk_widget_get_style (esb->entry); default_style = gtk_widget_get_default_style (); - + if (text && *text) - if (gdk_color_equal (&(entry_style->text[GTK_STATE_NORMAL]), &(default_style->text[GTK_STATE_INSENSITIVE]))) + if (gdk_color_equal (&(entry_style->text[GTK_STATE_NORMAL]), &(default_style->text[GTK_STATE_INSENSITIVE]))) gtk_widget_set_sensitive (esb->clear_button, FALSE); - else + else gtk_widget_set_sensitive (esb->clear_button, TRUE); else gtk_widget_set_sensitive (esb->clear_button, FALSE); @@ -426,7 +426,7 @@ viewitem_activated_cb(GtkWidget *widget, ESearchBar *esb) if (gdk_color_equal (&(entry_style->text[GTK_STATE_NORMAL]), &(default_style->text[GTK_STATE_INSENSITIVE]))) { gtk_entry_set_text (GTK_ENTRY (esb->entry), ""); gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, NULL); - } + } esb->block_search = TRUE; emit_search_activated (esb); @@ -449,14 +449,14 @@ scopeitem_activated_cb(GtkWidget *widget, ESearchBar *esb) /* If the text is grayed, Its not the query string */ if (gdk_color_equal (&(entry_style->text[GTK_STATE_NORMAL]), &(default_style->text[GTK_STATE_INSENSITIVE]))) { - gtk_widget_grab_focus (esb->entry); + gtk_widget_grab_focus (esb->entry); gtk_entry_set_text (GTK_ENTRY (esb->entry), ""); gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, NULL); - } + } - esb->block_search = TRUE; + esb->block_search = TRUE; emit_search_activated (esb); - esb->block_search = FALSE; + esb->block_search = FALSE; } static void @@ -465,7 +465,7 @@ option_activated_cb (GtkWidget *widget, { int id; const char *text; - + id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "EsbItemId")); e_search_bar_set_item_id (esb, id); @@ -477,7 +477,7 @@ option_activated_cb (GtkWidget *widget, t = g_strdup_printf ("%s: %s\n%s", _("Search"), text, _("Click here to change the search type")); else t = g_strdup_printf ("%s: %s", _("Search"), _("Click here to change the search type")); - + gtk_tooltips_set_tip (esb->tooltips, esb->option_button, t, "Search type"); g_free (t); } @@ -517,12 +517,12 @@ entry_key_press_cb (GtkWidget *widget, GdkEventKey *key_event, ESearchBar *esb) { - if (((key_event->state & gtk_accelerator_get_default_mod_mask ()) == + if (((key_event->state & gtk_accelerator_get_default_mod_mask ()) == GDK_MOD1_MASK) && (key_event->keyval == GDK_Down)) { option_button_clicked_cb (NULL, NULL, esb); return TRUE; } - + return FALSE; } @@ -571,17 +571,17 @@ append_xml_menu_item (GString *xml, const char *accelerator) { char *encoded_label; - + encoded_label = bonobo_ui_util_encode_str (label); g_string_append_printf (xml, "<menuitem name=\"%s\" verb=\"%s\" label=\"%s\"", name, verb, encoded_label); g_free (encoded_label); - + if (accelerator != NULL) g_string_append_printf (xml, " accel=\"%s\"", accelerator); if (stock != NULL) g_string_append_printf (xml, " pixtype=\"stock\" pixname=\"%s\"", stock); - + g_string_append (xml, "/>"); } @@ -590,7 +590,7 @@ remove_bonobo_menus (ESearchBar *esb) { if (bonobo_ui_component_get_container (esb->ui_component) == CORBA_OBJECT_NIL) return; - + bonobo_ui_component_rm (esb->ui_component, "/menu/SearchPlaceholder", NULL); } @@ -601,37 +601,37 @@ setup_bonobo_menus (ESearchBar *esb) GSList *p; char *verb_name; char *encoded_title; - + xml = g_string_new (""); - + encoded_title = bonobo_ui_util_encode_str (_("_Search")); g_string_append_printf (xml, "<submenu name=\"Search\" label=\"%s\">", encoded_title); g_free (encoded_title); - + g_string_append (xml, "<placeholder name=\"SearchBar\">"); - + append_xml_menu_item (xml, "FindNow", _("_Find Now"), "gtk-find", "ESearchBar:FindNow", NULL); append_xml_menu_item (xml, "Clear", _("_Clear"), "gtk-clear", "ESearchBar:Clear", "*Control**Shift*q"); - + for (p = esb->menu_items; p != NULL; p = p->next) { const ESearchBarItem *item; - + item = (const ESearchBarItem *) p->data; - + verb_name = verb_name_from_id (item->id); bonobo_ui_component_add_verb (esb->ui_component, verb_name, search_verb_cb, esb); - + if (item->text == NULL) g_string_append (xml, "<separator/>"); else append_xml_menu_item (xml, verb_name, item->text, NULL, verb_name, NULL); - + g_free (verb_name); } - + g_string_append (xml, "</placeholder>"); g_string_append (xml, "</submenu>"); - + remove_bonobo_menus (esb); bonobo_ui_component_set (esb->ui_component, "/menu/SearchPlaceholder", xml->str, NULL); @@ -696,7 +696,7 @@ set_option (ESearchBar *esb, ESearchBarItem *items) GSList *group = NULL; int i; - if (esb->option_menu) + if (esb->option_menu) gtk_widget_destroy (esb->option_menu); esb->option_menu = menu = gtk_menu_new (); @@ -715,7 +715,7 @@ set_option (ESearchBar *esb, ESearchBarItem *items) item = gtk_menu_item_new_with_label (str); break; case ESB_ITEMTYPE_CHECK: - item = gtk_check_menu_item_new_with_label (str); + item = gtk_check_menu_item_new_with_label (str); break; case ESB_ITEMTYPE_RADIO: item = gtk_radio_menu_item_new_with_label (group, str); @@ -796,7 +796,7 @@ static void impl_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { ESearchBar *esb = E_SEARCH_BAR(object); - + switch (prop_id) { case PROP_ITEM_ID: e_search_bar_set_item_id (esb, g_value_get_int (value)); @@ -805,7 +805,7 @@ impl_set_property (GObject *object, guint prop_id, const GValue *value, GParamSp case PROP_TEXT: e_search_bar_set_text (esb, g_value_get_string (value)); break; - + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -816,7 +816,7 @@ static void impl_dispose (GObject *object) { ESearchBar *esb = E_SEARCH_BAR (object); - + g_return_if_fail (object != NULL); g_return_if_fail (E_IS_SEARCH_BAR (object)); @@ -835,14 +835,14 @@ impl_dispose (GObject *object) g_object_unref (esb->suboption); esb->suboption = NULL; } - + if (esb->pending_activate) { g_source_remove (esb->pending_activate); esb->pending_activate = 0; } free_menu_items (esb); - + if (G_OBJECT_CLASS (parent_class)->dispose) G_OBJECT_CLASS (parent_class)->dispose (object); } @@ -852,15 +852,15 @@ static void class_init (ESearchBarClass *klass) { GObjectClass *object_class; - + object_class = G_OBJECT_CLASS (klass); - + parent_class = g_type_class_ref (gtk_hbox_get_type ()); - + object_class->set_property = impl_set_property; object_class->get_property = impl_get_property; object_class->dispose = impl_dispose; - + klass->set_menu = set_menu; klass->set_option = set_option; @@ -871,13 +871,13 @@ class_init (ESearchBarClass *klass) 0, 0, 0, G_PARAM_READWRITE | G_PARAM_LAX_VALIDATION)); - g_object_class_install_property (object_class, PROP_TEXT, + g_object_class_install_property (object_class, PROP_TEXT, g_param_spec_string ("text", _("Text"), /*_( */"XXX blurb" /*)*/, NULL, G_PARAM_READWRITE)); - + esb_signals [QUERY_CHANGED] = g_signal_new ("query_changed", G_OBJECT_CLASS_TYPE (object_class), @@ -886,7 +886,7 @@ class_init (ESearchBarClass *klass) NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - + esb_signals [MENU_ACTIVATED] = g_signal_new ("menu_activated", G_OBJECT_CLASS_TYPE (object_class), @@ -912,7 +912,7 @@ class_init (ESearchBarClass *klass) G_STRUCT_OFFSET (ESearchBarClass, search_cleared), NULL, NULL, g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + G_TYPE_NONE, 0); } static void @@ -924,7 +924,7 @@ init (ESearchBar *esb) esb->option = NULL; esb->entry = NULL; esb->suboption = NULL; - + esb->option_menu = NULL; esb->suboption_menu = NULL; esb->option_button = NULL; @@ -1018,7 +1018,7 @@ e_search_bar_construct (ESearchBar *search_bar, gtk_box_pack_start (GTK_BOX(search_bar), search_bar->viewoption_box, FALSE, FALSE, 0); hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX(search_bar), hbox, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(search_bar), hbox, FALSE, FALSE, 0); /* Search entry */ hbox = gtk_hbox_new (FALSE, 0); @@ -1049,7 +1049,7 @@ e_search_bar_construct (ESearchBar *search_bar, gtk_box_pack_end (GTK_BOX(hbox), search_bar->scopeoption_box, FALSE, FALSE, 0); gtk_widget_hide (search_bar->scopeoption_box); - + gtk_box_pack_end (GTK_BOX(search_bar), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); @@ -1057,7 +1057,7 @@ e_search_bar_construct (ESearchBar *search_bar, e_search_bar_set_menu (search_bar, menu_items); e_search_bar_set_option (search_bar, option_items); - /* + /* * If the default choice for the option menu has subitems, then we need to * activate the search immediately. However, the developer won't have * connected to the activated signal until after the object is constructed, @@ -1073,7 +1073,7 @@ e_search_bar_set_menu (ESearchBar *search_bar, ESearchBarItem *menu_items) { g_return_if_fail (search_bar != NULL); g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); - + ((ESearchBarClass *) GTK_OBJECT_GET_CLASS (search_bar))->set_menu (search_bar, menu_items); } @@ -1082,7 +1082,7 @@ e_search_bar_add_menu (ESearchBar *search_bar, ESearchBarItem *menu_item) { g_return_if_fail (search_bar != NULL); g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); - + set_menu (search_bar, menu_item); } @@ -1092,7 +1092,7 @@ e_search_bar_set_option (ESearchBar *search_bar, ESearchBarItem *option_items) g_return_if_fail (search_bar != NULL); g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); g_return_if_fail (option_items != NULL); - + ((ESearchBarClass *) GTK_OBJECT_GET_CLASS (search_bar))->set_option (search_bar, option_items); } @@ -1108,18 +1108,18 @@ e_search_bar_set_viewoption_menufunc (ESearchBar *search_bar, ESearchBarMenuFunc * @option_id: Identifier of the main option menu item under which the subitems * are to be set. * @subitems: Array of subitem information. - * + * * Sets the items for the secondary option menu of a search bar. **/ -void +void e_search_bar_set_viewoption_menu (ESearchBar *search_bar, GtkWidget *menu) { - if (search_bar->viewoption_menu != NULL) + if (search_bar->viewoption_menu != NULL) gtk_option_menu_remove_menu (GTK_OPTION_MENU (search_bar->viewoption)); - - search_bar->viewoption_menu = menu; - gtk_option_menu_set_menu (GTK_OPTION_MENU (search_bar->viewoption), search_bar->viewoption_menu); + + search_bar->viewoption_menu = menu; + gtk_option_menu_set_menu (GTK_OPTION_MENU (search_bar->viewoption), search_bar->viewoption_menu); g_signal_connect (search_bar->viewoption_menu, "selection-done", @@ -1143,7 +1143,7 @@ e_search_bar_get_selected_viewitem (ESearchBar *search_bar) * @option_id: Identifier of the main option menu item under which the subitems * are to be set. * @subitems: Array of subitem information. - * + * * Sets the items for the secondary option menu of a search bar. **/ void @@ -1195,7 +1195,7 @@ e_search_bar_set_viewoption (ESearchBar *search_bar, int option_id, ESearchBarIt * @search_bar: A search bar. * are to be set. * @scopeitems: Array of scope information. - * + * * Sets the items for the search scope option menu of a search bar. **/ void @@ -1204,7 +1204,7 @@ e_search_bar_set_scopeoption (ESearchBar *search_bar, ESearchBarItem *scopeitems GtkWidget *menu; GtkWidget *menu_item; gint i; - + gtk_widget_show (search_bar->scopeoption_box); if (search_bar->scopeoption_menu != NULL) { gtk_option_menu_remove_menu (GTK_OPTION_MENU (search_bar->scopeoption)); @@ -1218,7 +1218,7 @@ e_search_bar_set_scopeoption (ESearchBar *search_bar, ESearchBarItem *scopeitems char *str; str = e_str_without_underscores (_(scopeitems[i].text)); menu_item = gtk_menu_item_new_with_label (str); - g_object_set_data_full (G_OBJECT (menu_item), "string",str, g_free); + g_object_set_data_full (G_OBJECT (menu_item), "string",str, g_free); } else { menu_item = gtk_menu_item_new (); gtk_widget_set_sensitive (menu_item, FALSE); @@ -1241,19 +1241,19 @@ e_search_bar_set_scopeoption (ESearchBar *search_bar, ESearchBarItem *scopeitems /** * e_search_bar_set_scopeoption_menu: * @search_bar: A search bar. - * @menu: the scope option menu + * @menu: the scope option menu * * Sets the items for the secondary option menu of a search bar. **/ -void +void e_search_bar_set_scopeoption_menu (ESearchBar *search_bar, GtkMenu *menu) { - if (search_bar->scopeoption_menu != NULL) + if (search_bar->scopeoption_menu != NULL) gtk_option_menu_remove_menu (GTK_OPTION_MENU (search_bar->scopeoption)); - - search_bar->scopeoption_menu = GTK_WIDGET (menu); - gtk_option_menu_set_menu (GTK_OPTION_MENU (search_bar->scopeoption), search_bar->scopeoption_menu); + + search_bar->scopeoption_menu = GTK_WIDGET (menu); + gtk_option_menu_set_menu (GTK_OPTION_MENU (search_bar->scopeoption), search_bar->scopeoption_menu); g_signal_connect (search_bar->scopeoption_menu, "selection-done", @@ -1268,11 +1268,11 @@ e_search_bar_new (ESearchBarItem *menu_items, GtkWidget *widget; g_return_val_if_fail (option_items != NULL, NULL); - + widget = g_object_new (e_search_bar_get_type (), NULL); - + e_search_bar_construct (E_SEARCH_BAR (widget), menu_items, option_items); - + return widget; } @@ -1340,9 +1340,9 @@ void e_search_bar_set_viewitem_id (ESearchBar *search_bar, int id) { int row; - + g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); - + row = find_id (search_bar->viewoption_menu, id, "EsbItemId", NULL); if (row == -1) return; @@ -1356,16 +1356,16 @@ e_search_bar_set_viewitem_id (ESearchBar *search_bar, int id) * e_search_bar_set_item_id: * @search_bar: A search bar. * @id: Identifier of the item to set. - * + * * Sets the active item in the options menu of a search bar. **/ void e_search_bar_set_item_id (ESearchBar *search_bar, int id) { int row; - + g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); - + row = find_id (search_bar->option_menu, id, "EsbItemId", NULL); if (row == -1) return; @@ -1387,11 +1387,11 @@ e_search_bar_set_item_menu (ESearchBar *search_bar, int id) int row; GtkWidget *item; g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); - + row = find_id (search_bar->option_menu, id, "EsbItemId", &item); - if (row == -1) + if (row == -1) return; - + gtk_menu_set_active ((GtkMenu *)search_bar->option_menu, row); if (id>=0) gtk_check_menu_item_set_active ((GtkCheckMenuItem *)item, TRUE); @@ -1401,20 +1401,20 @@ e_search_bar_set_item_menu (ESearchBar *search_bar, int id) * e_search_bar_set_search_scope: * @search_bar: A search bar. * @id: Identifier of the item to set. - * + * * Sets the active item in the options menu of a search bar. **/ void e_search_bar_set_search_scope (ESearchBar *search_bar, int id) { int row; - + g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); - + row = find_id (search_bar->scopeoption_menu, id, "EsbItemId", NULL); if (row == -1) return; - + search_bar->scopeitem_id = id; gtk_option_menu_set_history (GTK_OPTION_MENU (search_bar->scopeoption), row); @@ -1426,9 +1426,9 @@ e_search_bar_set_search_scope (ESearchBar *search_bar, int id) /** * e_search_bar_get_item_id: * @search_bar: A search bar. - * + * * Queries the currently selected item in the options menu of a search bar. - * + * * Return value: Identifier of the selected item in the options menu. **/ int @@ -1439,7 +1439,7 @@ e_search_bar_get_item_id (ESearchBar *search_bar) g_return_val_if_fail (search_bar != NULL, -1); g_return_val_if_fail (E_IS_SEARCH_BAR (search_bar), -1); - + menu_item = gtk_menu_get_active (GTK_MENU (search_bar->option_menu)); item_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menu_item), "EsbItemId")); search_bar->item_id = item_id; @@ -1450,9 +1450,9 @@ e_search_bar_get_item_id (ESearchBar *search_bar) /** * e_search_bar_get_search_scope: * @search_bar: A search bar. - * + * * Queries the currently selected search type in the options menu of a search bar. - * + * * Return value: Identifier of the selected item in the options menu. **/ int @@ -1475,9 +1475,9 @@ e_search_bar_get_search_scope (ESearchBar *search_bar) /** * e_search_bar_get_viewitem_id: * @search_bar: A search bar. - * + * * Queries the currently selected item in the viewoptions menu of a search bar. - * + * * Return value: Identifier of the selected item in the viewoptions menu. * If the search bar currently contains an entry rather than a a viewoption menu, * a value less than zero is returned. @@ -1490,7 +1490,7 @@ e_search_bar_get_viewitem_id (ESearchBar *search_bar) g_return_val_if_fail (search_bar != NULL, -1); g_return_val_if_fail (E_IS_SEARCH_BAR (search_bar), -1); - + menu_item = gtk_menu_get_active (GTK_MENU (search_bar->viewoption_menu)); viewitem_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menu_item), "EsbItemId")); @@ -1504,7 +1504,7 @@ e_search_bar_get_viewitem_id (ESearchBar *search_bar) * @search_bar: A search bar. * @item_id: Identifier of the item to set. * @subitem_id: Identifier of the subitem to set. - * + * * Sets the item and subitem ids for a search bar. This is intended to switch * to an item that has subitems. **/ @@ -1543,9 +1543,9 @@ e_search_bar_set_text (ESearchBar *search_bar, const char *text) /** * e_search_bar_get_text: * @search_bar: A search bar. - * + * * Queries the text of the entry line in a search bar. - * + * * Return value: The text string that is in the entry line of the search bar. * This must be freed using g_free(). If a suboption menu is active instead * of an entry, NULL is returned. diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h index 12f0129b4e..7c4144ce2f 100644 --- a/widgets/misc/e-search-bar.h +++ b/widgets/misc/e-search-bar.h @@ -69,12 +69,12 @@ struct _ESearchBar BonoboUIComponent *ui_component; GSList *menu_items; - + /* item specific fields */ GtkWidget *option; GtkWidget *entry; GtkWidget *suboption; /* an option menu for the choices associated with some options */ - + /* PRIVATE */ GtkWidget *dropdown_holder; /* holds the dropdown */ GtkWidget *option_menu; @@ -143,8 +143,8 @@ void e_search_bar_add_menu (ESearchBar *search_bar, void e_search_bar_set_option (ESearchBar *search_bar, ESearchBarItem *option_items); void e_search_bar_paint (ESearchBar *search_bar); -void e_search_bar_set_viewoption (ESearchBar *search_bar, - int option_id, +void e_search_bar_set_viewoption (ESearchBar *search_bar, + int option_id, ESearchBarItem *subitems); void e_search_bar_set_menu_sensitive (ESearchBar *search_bar, diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c index ffb3c8dc94..ed846e7711 100644 --- a/widgets/misc/e-selection-model-array.c +++ b/widgets/misc/e-selection-model-array.c @@ -70,7 +70,7 @@ e_selection_model_array_delete_rows(ESelectionModelArray *esma, int row, int cou } else if (esma->cursor_row < 0) { esma->cursor_row = -1; } - if (esma->cursor_row >= 0) + if (esma->cursor_row >= 0) e_bit_array_change_one_row(esma->eba, esma->cursor_row, TRUE); esma->selected_row = -1; @@ -177,7 +177,7 @@ esma_set_property (GObject *object, guint prop_id, const GValue *value, GParamSp } } -/** +/** * e_selection_model_is_row_selected * @selection: #ESelectionModel to check * @n: The row to check @@ -197,7 +197,7 @@ esma_is_row_selected (ESelectionModel *selection, return FALSE; } -/** +/** * e_selection_model_foreach * @selection: #ESelectionModel to traverse * @callback: The callback function to call back. @@ -206,7 +206,7 @@ esma_is_row_selected (ESelectionModel *selection, * This routine calls the given callback function once for each * selected row, passing closure as the closure. */ -static void +static void esma_foreach (ESelectionModel *selection, EForeachFunc callback, gpointer closure) @@ -216,7 +216,7 @@ esma_foreach (ESelectionModel *selection, e_bit_array_foreach(esma->eba, callback, closure); } -/** +/** * e_selection_model_clear * @selection: #ESelectionModel to clear * @@ -241,7 +241,7 @@ esma_clear(ESelectionModel *selection) #define PART(x,n) (((x) & (0x01010101 << n)) >> n) #define SECTION(x, n) (((x) >> (n * 8)) & 0xff) -/** +/** * e_selection_model_selected_count * @selection: #ESelectionModel to count * @@ -259,7 +259,7 @@ esma_selected_count (ESelectionModel *selection) return 0; } -/** +/** * e_selection_model_select_all * @selection: #ESelectionModel to select all * @@ -284,7 +284,7 @@ esma_select_all (ESelectionModel *selection) e_selection_model_cursor_changed(E_SELECTION_MODEL(esma), 0, 0); } -/** +/** * e_selection_model_invert_selection * @selection: #ESelectionModel to invert * @@ -299,7 +299,7 @@ esma_invert_selection (ESelectionModel *selection) e_selection_model_array_confirm_row_count(esma); e_bit_array_invert_selection(esma->eba); - + esma->cursor_col = -1; esma->cursor_row = -1; esma->selection_start_row = 0; @@ -376,7 +376,7 @@ esma_real_select_single_row (ESelectionModel *selection, int row) ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); e_selection_model_array_confirm_row_count(esma); - + e_bit_array_select_single_row(esma->eba, row); esma->selection_start_row = row; @@ -538,14 +538,14 @@ e_selection_model_array_class_init (ESelectionModelArrayClass *klass) klass->get_row_count = NULL ; - g_object_class_install_property (object_class, PROP_CURSOR_ROW, + g_object_class_install_property (object_class, PROP_CURSOR_ROW, g_param_spec_int ("cursor_row", _("Cursor Row"), /*_( */"XXX blurb" /*)*/, 0, G_MAXINT, 0, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_CURSOR_COL, + g_object_class_install_property (object_class, PROP_CURSOR_COL, g_param_spec_int ("cursor_col", _("Cursor Column"), /*_( */"XXX blurb" /*)*/, diff --git a/widgets/misc/e-selection-model-array.h b/widgets/misc/e-selection-model-array.h index 0635ce6715..e0fcb2221f 100644 --- a/widgets/misc/e-selection-model-array.h +++ b/widgets/misc/e-selection-model-array.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-selection-model-array.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/misc/e-selection-model-simple.c b/widgets/misc/e-selection-model-simple.c index c6d6288fa5..46b480b94c 100644 --- a/widgets/misc/e-selection-model-simple.c +++ b/widgets/misc/e-selection-model-simple.c @@ -48,7 +48,7 @@ e_selection_model_simple_class_init (ESelectionModelSimpleClass *klass) G_DEFINE_TYPE (ESelectionModelSimple, e_selection_model_simple, e_selection_model_array_get_type()) -/** +/** * e_selection_model_simple_new * * This routine creates a new #ESelectionModelSimple. diff --git a/widgets/misc/e-selection-model-simple.h b/widgets/misc/e-selection-model-simple.h index 5b27dc9c0b..978289cab4 100644 --- a/widgets/misc/e-selection-model-simple.h +++ b/widgets/misc/e-selection-model-simple.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-selection-model-simple.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c index 786e0bd52b..230e3550a5 100644 --- a/widgets/misc/e-selection-model.c +++ b/widgets/misc/e-selection-model.c @@ -105,7 +105,7 @@ static void esm_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { ESelectionModel *esm = E_SELECTION_MODEL (object); - + switch (prop_id){ case PROP_SORTER: drop_sorter(esm); @@ -205,14 +205,14 @@ e_selection_model_class_init (ESelectionModelClass *klass) klass->move_selection_end = NULL; klass->set_selection_end = NULL; - g_object_class_install_property (object_class, PROP_SORTER, + g_object_class_install_property (object_class, PROP_SORTER, g_param_spec_object ("sorter", _("Sorter"), /*_( */"XXX blurb" /*)*/, E_SORTER_TYPE, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_SELECTION_MODE, + g_object_class_install_property (object_class, PROP_SELECTION_MODE, g_param_spec_int ("selection_mode", _("Selection Mode"), /*_( */"XXX blurb" /*)*/, @@ -220,7 +220,7 @@ e_selection_model_class_init (ESelectionModelClass *klass) GTK_SELECTION_SINGLE, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_CURSOR_MODE, + g_object_class_install_property (object_class, PROP_CURSOR_MODE, g_param_spec_int ("cursor_mode", _("Cursor Mode"), /*_( */"XXX blurb" /*)*/, @@ -229,7 +229,7 @@ e_selection_model_class_init (ESelectionModelClass *klass) G_PARAM_READWRITE)); } -/** +/** * e_selection_model_is_row_selected * @selection: #ESelectionModel to check * @n: The row to check @@ -248,7 +248,7 @@ e_selection_model_is_row_selected (ESelectionModel *selection, return FALSE; } -/** +/** * e_selection_model_foreach * @selection: #ESelectionModel to traverse * @callback: The callback function to call back. @@ -257,7 +257,7 @@ e_selection_model_is_row_selected (ESelectionModel *selection, * This routine calls the given callback function once for each * selected row, passing closure as the closure. */ -void +void e_selection_model_foreach (ESelectionModel *selection, EForeachFunc callback, gpointer closure) @@ -266,7 +266,7 @@ e_selection_model_foreach (ESelectionModel *selection, E_SELECTION_MODEL_GET_CLASS(selection)->foreach (selection, callback, closure); } -/** +/** * e_selection_model_clear * @selection: #ESelectionModel to clear * @@ -279,7 +279,7 @@ e_selection_model_clear(ESelectionModel *selection) E_SELECTION_MODEL_GET_CLASS(selection)->clear (selection); } -/** +/** * e_selection_model_selected_count * @selection: #ESelectionModel to count * @@ -296,7 +296,7 @@ e_selection_model_selected_count (ESelectionModel *selection) return 0; } -/** +/** * e_selection_model_select_all * @selection: #ESelectionModel to select all * @@ -310,7 +310,7 @@ e_selection_model_select_all (ESelectionModel *selection) E_SELECTION_MODEL_GET_CLASS(selection)->select_all (selection); } -/** +/** * e_selection_model_invert_selection * @selection: #ESelectionModel to invert * @@ -393,7 +393,7 @@ e_selection_model_set_selection_end (ESelectionModel *selection, int row) E_SELECTION_MODEL_GET_CLASS(selection)->set_selection_end (selection, row); } -/** +/** * e_selection_model_do_something * @selection: #ESelectionModel to do something to. * @row: The row to do something in. @@ -452,7 +452,7 @@ e_selection_model_do_something (ESelectionModel *selection, } } -/** +/** * e_selection_model_maybe_do_something * @selection: #ESelectionModel to do something to. * @row: The row to do something in. @@ -577,7 +577,7 @@ move_selection (ESelectionModel *selection, return TRUE; } -/** +/** * e_selection_model_key_press * @selection: #ESelectionModel to affect. * @key: The event. diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h index c8bca0d61f..e9b76723f2 100644 --- a/widgets/misc/e-selection-model.h +++ b/widgets/misc/e-selection-model.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-selection-model.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c index c4e407a9c3..cb84f1e5b0 100644 --- a/widgets/misc/e-send-options.c +++ b/widgets/misc/e-send-options.c @@ -59,7 +59,7 @@ struct _ESendOptionsDialogPrivate { /* Security */ GtkWidget *security; - + /* Widgets for Reply Requestion options */ GtkWidget *reply_request; GtkWidget *reply_convenient; @@ -86,7 +86,7 @@ struct _ESendOptionsDialogPrivate { GtkWidget *when_declined; GtkWidget *when_accepted; GtkWidget *when_completed; - + /* label widgets */ GtkWidget *security_label; GtkWidget *priority_label; @@ -94,7 +94,7 @@ struct _ESendOptionsDialogPrivate { GtkWidget *sopts_label; GtkWidget *opened_label; GtkWidget *declined_label; - GtkWidget *accepted_label; + GtkWidget *accepted_label; GtkWidget *completed_label; GtkWidget *until_label; char *help_section; @@ -120,40 +120,40 @@ e_send_options_get_widgets_data (ESendOptionsDialog *sod) ESendOptionsDialogPrivate *priv; ESendOptionsGeneral *gopts; ESendOptionsStatusTracking *sopts; - + priv = sod->priv; gopts = sod->data->gopts; sopts = sod->data->sopts; - + gopts->priority = gtk_combo_box_get_active ((GtkComboBox *) priv->priority); gopts->security = gtk_combo_box_get_active ((GtkComboBox *) priv->security); - + gopts->reply_enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->reply_request)); gopts->reply_convenient = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->reply_convenient)); gopts->reply_within = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (priv->within_days)); - + gopts->expiration_enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->expiration)); gopts->expire_after = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (priv->expire_after)); gopts->delay_enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delay_delivery)); - - if (e_date_edit_date_is_valid (E_DATE_EDIT (priv->delay_until)) && + + if (e_date_edit_date_is_valid (E_DATE_EDIT (priv->delay_until)) && e_date_edit_time_is_valid (E_DATE_EDIT(priv->delay_until))) gopts->delay_until = e_date_edit_get_time (E_DATE_EDIT (priv->delay_until)); sopts->tracking_enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->create_sent)); - + sopts->autodelete = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->autodelete)); - + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delivered))) sopts->track_when = E_DELIVERED; else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delivered_opened))) sopts->track_when = E_DELIVERED_OPENED; else sopts->track_when = E_ALL; - + sopts->opened = gtk_combo_box_get_active ((GtkComboBox *) priv->when_opened); sopts->accepted = gtk_combo_box_get_active ((GtkComboBox *) priv->when_accepted); - sopts->declined = gtk_combo_box_get_active ((GtkComboBox *) priv->when_declined); + sopts->declined = gtk_combo_box_get_active ((GtkComboBox *) priv->when_declined); sopts->completed = gtk_combo_box_get_active ((GtkComboBox *) priv->when_completed); } @@ -162,56 +162,56 @@ e_send_options_fill_widgets_with_data (ESendOptionsDialog *sod) { ESendOptionsDialogPrivate *priv; ESendOptionsGeneral *gopts; - ESendOptionsStatusTracking *sopts; + ESendOptionsStatusTracking *sopts; time_t tmp; - + priv = sod->priv; gopts = sod->data->gopts; - sopts = sod->data->sopts; + sopts = sod->data->sopts; tmp = time (NULL); gtk_combo_box_set_active ((GtkComboBox *) priv->priority, gopts->priority); gtk_combo_box_set_active ((GtkComboBox *) priv->security, gopts->security); - if (gopts->reply_enabled) + if (gopts->reply_enabled) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->reply_request), TRUE); else gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->reply_request), FALSE); - + if (gopts->reply_convenient) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->reply_convenient), TRUE); - else + else gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->reply_within), TRUE); - + gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->within_days), (gdouble) gopts->reply_within); - - if (gopts->expiration_enabled) + + if (gopts->expiration_enabled) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->expiration), TRUE); else gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->expiration), FALSE); gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->expire_after), (gdouble) gopts->expire_after); - if (gopts->delay_enabled) + if (gopts->delay_enabled) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->delay_delivery), TRUE); else gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->delay_delivery), FALSE); - + if (!gopts->delay_until || (!difftime (gopts->delay_until, tmp) < 0)) e_date_edit_set_time (E_DATE_EDIT (priv->delay_until), 0); else e_date_edit_set_time (E_DATE_EDIT (priv->delay_until), gopts->delay_until); - - if (sopts->tracking_enabled) + + if (sopts->tracking_enabled) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->create_sent), TRUE); else gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->create_sent), FALSE); - + if (sopts->autodelete) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->autodelete), TRUE); else gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->autodelete), FALSE); - + switch (sopts->track_when) { case E_DELIVERED: gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->delivered), TRUE); @@ -222,20 +222,20 @@ e_send_options_fill_widgets_with_data (ESendOptionsDialog *sod) case E_ALL: gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->all_info), TRUE); } - + gtk_combo_box_set_active ((GtkComboBox *) priv->when_opened, sopts->opened); gtk_combo_box_set_active ((GtkComboBox *) priv->when_declined, sopts->declined); gtk_combo_box_set_active ((GtkComboBox *) priv->when_accepted, sopts->accepted); gtk_combo_box_set_active ((GtkComboBox *) priv->when_completed, sopts->completed); - + } - -static void + +static void sensitize_widgets (ESendOptionsDialog *sod) { ESendOptionsDialogPrivate *priv; ESendOptionsGeneral *gopts; - ESendOptionsStatusTracking *sopts; + ESendOptionsStatusTracking *sopts; priv = sod->priv; gopts = sod->data->gopts; @@ -283,7 +283,7 @@ reply_request_toggled_cb (GtkWidget *toggle, gpointer data) gboolean active; ESendOptionsDialog *sod; ESendOptionsDialogPrivate *priv; - + sod = data; priv = sod->priv; active = GTK_TOGGLE_BUTTON (toggle)->active; @@ -291,7 +291,7 @@ reply_request_toggled_cb (GtkWidget *toggle, gpointer data) gtk_widget_set_sensitive (priv->reply_convenient, active); gtk_widget_set_sensitive (priv->reply_within, active); gtk_widget_set_sensitive (priv->within_days, active); - + } static void @@ -300,7 +300,7 @@ delay_delivery_toggled_cb (GtkWidget *toggle, gpointer data) gboolean active; ESendOptionsDialog *sod; ESendOptionsDialogPrivate *priv; - + sod = data; priv = sod->priv; active = GTK_TOGGLE_BUTTON (toggle)->active; @@ -335,14 +335,14 @@ delay_until_date_changed_cb (GtkWidget *dedit, gpointer data) sod = data; priv = sod->priv; - + current = time (NULL); tmp = e_date_edit_get_time (E_DATE_EDIT (priv->delay_until)); - if ((difftime (tmp, current) < 0) || !e_date_edit_time_is_valid (E_DATE_EDIT (priv->delay_until)) + if ((difftime (tmp, current) < 0) || !e_date_edit_time_is_valid (E_DATE_EDIT (priv->delay_until)) || !e_date_edit_date_is_valid (E_DATE_EDIT (priv->delay_until))) e_date_edit_set_time (E_DATE_EDIT (priv->delay_until), 0); - + } static void page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, gpointer data) @@ -363,34 +363,34 @@ page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, gpointer gtk_widget_hide (priv->completed_label); gtk_widget_hide (priv->when_completed); gtk_widget_set_sensitive (priv->autodelete, FALSE); - + gtk_widget_show (priv->accepted_label); gtk_widget_show (priv->when_accepted); sod->data->sopts = sod->data->copts; } else { gtk_widget_set_sensitive (priv->autodelete, FALSE); - + gtk_widget_show (priv->completed_label); gtk_widget_show (priv->when_completed); gtk_widget_show (priv->accepted_label); gtk_widget_show (priv->when_accepted); - sod->data->sopts = sod->data->topts; + sod->data->sopts = sod->data->topts; } } e_send_options_fill_widgets_with_data (sod); } - - + + static void init_widgets (ESendOptionsDialog *sod) { ESendOptionsDialogPrivate *priv; - - priv = sod->priv; - + + priv = sod->priv; + g_signal_connect (priv->expiration, "toggled", G_CALLBACK (expiration_toggled_cb), sod); g_signal_connect (priv->reply_request, "toggled", G_CALLBACK (reply_request_toggled_cb), sod); - g_signal_connect (priv->delay_delivery, "toggled", G_CALLBACK (delay_delivery_toggled_cb), sod); + g_signal_connect (priv->delay_delivery, "toggled", G_CALLBACK (delay_delivery_toggled_cb), sod); g_signal_connect (priv->create_sent, "toggled", G_CALLBACK (sent_item_toggled_cb), sod); g_signal_connect (GTK_DIALOG (priv->main), "response", G_CALLBACK(e_send_options_cb), sod); @@ -401,7 +401,7 @@ init_widgets (ESendOptionsDialog *sod) } - + static gboolean get_widgets (ESendOptionsDialog *sod) { @@ -446,7 +446,7 @@ get_widgets (ESendOptionsDialog *sod) priv->declined_label = GW ("declined-label"); priv->accepted_label = GW ("accepted-label"); priv->completed_label = GW ("completed-label"); - + #undef GW return (priv->priority @@ -476,9 +476,9 @@ get_widgets (ESendOptionsDialog *sod) && priv->declined_label && priv->accepted_label && priv->completed_label); - + } - + static void setup_widgets (ESendOptionsDialog *sod, Item_type type) { @@ -488,7 +488,7 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type) if (!priv->gopts_needed) { gtk_notebook_set_show_tabs (priv->notebook, FALSE); - gtk_notebook_set_current_page (priv->notebook, 1); + gtk_notebook_set_current_page (priv->notebook, 1); gtk_widget_hide (priv->delay_until); } else gtk_notebook_set_show_tabs (priv->notebook, TRUE); @@ -503,7 +503,7 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type) if (priv->global) { GtkWidget *widget = gtk_label_new ("Calendar"); - gtk_label_set_text (GTK_LABEL (priv->sopts_label), "Mail"); + gtk_label_set_text (GTK_LABEL (priv->sopts_label), "Mail"); gtk_notebook_append_page (priv->notebook, priv->status, widget); gtk_widget_show (widget); widget = gtk_label_new ("Task"); @@ -511,7 +511,7 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type) gtk_notebook_append_page (priv->notebook, priv->status,widget); gtk_notebook_set_show_tabs (priv->notebook, TRUE); } - + switch (type) { case E_ITEM_MAIL: priv->help_section = g_strdup ("usage-mail"); @@ -541,11 +541,11 @@ e_sendoptions_dialog_new (void) { ESendOptionsDialog *sod; sod = g_object_new (E_TYPE_SENDOPTIONS_DIALOG, NULL); - + return sod; } -void +void e_sendoptions_set_need_general_options (ESendOptionsDialog *sod, gboolean needed) { g_return_if_fail (E_IS_SENDOPTIONS_DIALOG (sod)); @@ -567,7 +567,7 @@ GtkWidget * send_options_make_dateedit (void) { EDateEdit *dedit; - + dedit = E_DATE_EDIT (e_date_edit_new ()); e_date_edit_set_show_date (dedit, TRUE); @@ -590,7 +590,7 @@ static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data { ESendOptionsDialogPrivate *priv; ESendOptionsDialog *sod; - GError *error = NULL; + GError *error = NULL; sod = func_data; priv = sod->priv; @@ -616,7 +616,7 @@ static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state); } -gboolean +gboolean e_sendoptions_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type type) { ESendOptionsDialogPrivate *priv; @@ -624,7 +624,7 @@ e_sendoptions_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type gchar *filename; g_return_val_if_fail (sod != NULL || E_IS_SENDOPTIONS_DIALOG (sod), FALSE); - + priv = sod->priv; filename = g_build_filename (EVOLUTION_GLADEDIR, @@ -660,9 +660,9 @@ e_sendoptions_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type sensitize_widgets (sod); init_widgets (sod); gtk_window_set_modal ((GtkWindow *)priv->main, TRUE); - + gtk_widget_show (priv->main); - + return TRUE; } @@ -691,17 +691,17 @@ e_sendoptions_dialog_finalize (GObject *object) g_free (sod->data->mopts); sod->data->mopts = NULL; } - + if (sod->data->copts) { g_free (sod->data->copts); sod->data->copts = NULL; } - + if (sod->data->topts) { g_free (sod->data->topts); sod->data->topts = NULL; - } - + } + if (sod->data) { g_free (sod->data); sod->data = NULL; @@ -711,7 +711,7 @@ e_sendoptions_dialog_finalize (GObject *object) g_free (sod->priv); sod->priv = NULL; } - + if (parent_class->finalize) (* parent_class->finalize) (object); @@ -736,7 +736,7 @@ e_sendoptions_dialog_init (GObject *object) ESendOptionsDialog *sod; ESendOptionsDialogPrivate *priv; ESendOptionsData *new; - + sod = E_SENDOPTIONS_DIALOG (object); new = g_new0 (ESendOptionsData, 1); diff --git a/widgets/misc/e-send-options.h b/widgets/misc/e-send-options.h index 4a46dae4d1..c096d4696c 100644 --- a/widgets/misc/e-send-options.h +++ b/widgets/misc/e-send-options.h @@ -101,7 +101,7 @@ typedef struct { ESendOptionsStatusTracking *mopts; ESendOptionsStatusTracking *copts; ESendOptionsStatusTracking *topts; - + } ESendOptionsData; struct _ESendOptionsDialog { @@ -123,4 +123,4 @@ void e_sendoptions_set_need_general_options (ESendOptionsDialog *sod, gboolean n gboolean e_sendoptions_get_need_general_options (ESendOptionsDialog *sod); gboolean e_sendoptions_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type type); gboolean e_sendoptions_set_global (ESendOptionsDialog *sod, gboolean set); -#endif +#endif diff --git a/widgets/misc/e-spinner.c b/widgets/misc/e-spinner.c index bbd5d2e5f2..79ababe803 100644 --- a/widgets/misc/e-spinner.c +++ b/widgets/misc/e-spinner.c @@ -1,4 +1,4 @@ -/* +/* * Copyright © 2000 Eazel, Inc. * Copyright © 2002-2004 Marco Pesenti Gritti * Copyright © 2004, 2006 Christian Persch @@ -20,13 +20,13 @@ * Author: Andy Hertzfeld <andy@eazel.com> * * Ephy port by Marco Pesenti Gritti <marco@it.gnome.org> - * + * * $Id: e-spinner.c 12639 2006-12-12 17:06:55Z chpe $ */ /* * From Nautilus ephy-spinner.c - */ + */ #include "config.h" @@ -259,7 +259,7 @@ e_spinner_images_load (GdkScreen *screen, if (icon_info == NULL) { g_warning ("Throbber animation not found"); - + /* If the icon naming spec compliant name wasn't found, try the old name */ icon_info = gtk_icon_theme_lookup_icon (icon_theme, SPINNER_FALLBACK_ICON_NAME, @@ -463,7 +463,7 @@ e_spinner_cache_init (ESpinnerCache *cache) static void e_spinner_cache_finalize (GObject *object) { - ESpinnerCache *cache = E_SPINNER_CACHE (object); + ESpinnerCache *cache = E_SPINNER_CACHE (object); ESpinnerCachePrivate *priv = cache->priv; g_hash_table_destroy (priv->hash); @@ -644,7 +644,7 @@ e_spinner_expose (GtkWidget *widget, /* Otherwise |images| will be NULL anyway */ g_return_val_if_fail (images->n_animation_pixbufs > 0, FALSE); - + g_return_val_if_fail (details->current_image >= 0 && details->current_image < images->n_animation_pixbufs, FALSE); diff --git a/widgets/misc/e-spinner.h b/widgets/misc/e-spinner.h index c3f4e9263a..e438b43aab 100644 --- a/widgets/misc/e-spinner.h +++ b/widgets/misc/e-spinner.h @@ -23,7 +23,7 @@ */ /* - * From Nautilus ephy-spinner.h + * From Nautilus ephy-spinner.h */ #ifndef E_SPINNER_H #define E_SPINNER_H diff --git a/widgets/misc/e-task-bar.c b/widgets/misc/e-task-bar.c index eda370584c..075322dd97 100644 --- a/widgets/misc/e-task-bar.c +++ b/widgets/misc/e-task-bar.c @@ -93,7 +93,7 @@ static void e_task_bar_init (ETaskBar *task_bar) { GtkWidget *label, *hbox; - + task_bar->priv = g_new (ETaskBarPrivate, 1); gtk_box_set_spacing (GTK_BOX (task_bar), 10); @@ -101,7 +101,7 @@ e_task_bar_init (ETaskBar *task_bar) label = gtk_label_new (NULL); gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); gtk_box_pack_start (GTK_BOX (task_bar), label, TRUE, TRUE, 0); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); task_bar->priv->message_label = label; hbox = gtk_hbox_new (FALSE, 0); @@ -208,7 +208,7 @@ e_task_bar_remove_task (ETaskBar *task_bar, if (g_list_length (GTK_BOX (task_bar->priv->hbox)->children) == 0) gtk_widget_hide (GTK_WIDGET (task_bar->priv->hbox)); } - + ETaskWidget * e_task_bar_get_task_widget (ETaskBar *task_bar, int n) diff --git a/widgets/misc/e-task-bar.h b/widgets/misc/e-task-bar.h index 744b80272f..50301326d6 100644 --- a/widgets/misc/e-task-bar.h +++ b/widgets/misc/e-task-bar.h @@ -45,7 +45,7 @@ typedef struct _ETaskBarClass ETaskBarClass; struct _ETaskBar { GtkHBox parent; - + ETaskBarPrivate *priv; }; diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c index 0321587310..50d459d3f0 100644 --- a/widgets/misc/e-task-widget.c +++ b/widgets/misc/e-task-widget.c @@ -95,7 +95,7 @@ static void e_task_widget_class_init (ETaskWidgetClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - + object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; } @@ -149,7 +149,7 @@ e_task_widget_construct (ETaskWidget *task_widget, gtk_widget_show (box); gtk_widget_set_size_request (box, 1, -1); - + /* FIXME: Experimenting Spinner widget instead of an image. REWORK THIS */ /* priv->icon_pixbuf = g_object_ref (icon_pixbuf); */ @@ -239,7 +239,7 @@ e_task_wiget_unalert (ETaskWidget *task_widget) g_return_if_fail (task_widget != NULL); g_return_if_fail (E_IS_TASK_WIDGET (task_widget)); } - + const char * e_task_widget_get_component_id (ETaskWidget *task_widget) diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c index cdbd715871..5aec40a125 100644 --- a/widgets/misc/e-unicode.c +++ b/widgets/misc/e-unicode.c @@ -321,7 +321,7 @@ e_utf8_to_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes) ibl = bytes; new = ob = g_new (char, ibl * 4 + 4); obl = ibl * 4; - + while (ibl > 0) { e_iconv (ic, &ib, &ibl, &ob, &obl); if (ibl > 0) { @@ -337,16 +337,16 @@ e_utf8_to_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes) ib += len; ibl = bytes - (ib - string); if (ibl > bytes) ibl = 0; - + /* FIXME: this is wrong... what if the destination charset is 16 or 32 bit? */ *ob++ = '_'; obl--; } } - + /* Make sure to terminate with plenty of padding */ memset (ob, 0, 4); - + return new; } @@ -501,7 +501,7 @@ e_utf8_gtk_entry_set_text (GtkEntry *entry, const gchar *text) else gtk_entry_set_text (entry, text); } - + /* * Translate \U+XXXX\ sequences to utf8 chars */ @@ -591,9 +591,9 @@ e_utf8_xml1_encode (const gchar *text) * @outbuf: output buffer, must have at least 6 bytes of space. * If %NULL, the length will be computed and returned * and nothing will be written to @out. - * + * * Convert a single character to utf8 - * + * * Return value: number of bytes written **/ diff --git a/widgets/misc/e-url-entry.c b/widgets/misc/e-url-entry.c index 59469cc6a0..1b921f07b0 100644 --- a/widgets/misc/e-url-entry.c +++ b/widgets/misc/e-url-entry.c @@ -83,7 +83,7 @@ class_init (EUrlEntryClass *klass) widget_class = GTK_WIDGET_CLASS (klass); parent_class = g_type_class_ref(gtk_hbox_get_type ()); - + object_class->destroy = destroy; widget_class->mnemonic_activate = mnemonic_activate; @@ -111,7 +111,7 @@ init (EUrlEntry *url_entry) gtk_widget_show (priv->button); gtk_widget_show (priv->entry); - + g_signal_connect (priv->button, "clicked", G_CALLBACK (button_clicked_cb), url_entry); g_signal_connect (priv->entry, "changed", @@ -122,7 +122,7 @@ static void destroy (GtkObject *obj) { EUrlEntry *url_entry; - + url_entry = E_URL_ENTRY (obj); if (url_entry->priv) { g_free (url_entry->priv); @@ -158,12 +158,12 @@ GtkWidget * e_url_entry_get_entry (EUrlEntry *url_entry) { EUrlEntryPrivate *priv; - + g_return_val_if_fail (url_entry != NULL, NULL); g_return_val_if_fail (E_IS_URL_ENTRY (url_entry), NULL); priv = url_entry->priv; - + return priv->entry; } @@ -185,10 +185,10 @@ entry_changed_cb (GtkEditable *editable, gpointer data) EUrlEntry *url_entry; EUrlEntryPrivate *priv; const char *url; - + url_entry = E_URL_ENTRY (data); priv = url_entry->priv; - + url = gtk_entry_get_text (GTK_ENTRY (priv->entry)); gtk_widget_set_sensitive (priv->button, url != NULL && *url != '\0'); } diff --git a/widgets/misc/test-color.c b/widgets/misc/test-color.c index 9117976a1a..6039e4b902 100644 --- a/widgets/misc/test-color.c +++ b/widgets/misc/test-color.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * test-color.c * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/misc/test-dropdown-button.c b/widgets/misc/test-dropdown-button.c index fef505d47a..80c6a37a14 100644 --- a/widgets/misc/test-dropdown-button.c +++ b/widgets/misc/test-dropdown-button.c @@ -19,7 +19,7 @@ * * Authors: * Ettore Perazzoli <ettore@ximian.com> - * Damon Chaplin <damon@ximian.com> + * Damon Chaplin <damon@ximian.com> */ #ifdef HAVE_CONFIG_H diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c index a8b251bbbb..b00b101afa 100644 --- a/widgets/table/e-cell-checkbox.c +++ b/widgets/table/e-cell-checkbox.c @@ -39,15 +39,15 @@ G_DEFINE_TYPE (ECellCheckbox, e_cell_checkbox, E_CELL_TOGGLE_TYPE) static GdkPixbuf *checks [2]; static void -ecc_print (ECellView *ecell_view, GtkPrintContext *context, +ecc_print (ECellView *ecell_view, GtkPrintContext *context, int model_col, int view_col, int row, - double width, double height) + double width, double height) { cairo_t *cr = gtk_print_context_get_cairo_context (context); const int value = GPOINTER_TO_INT ( e_table_model_value_at (ecell_view->e_table_model, model_col, row)); - cairo_save (cr); - + cairo_save (cr); + if ( value == 1) { cairo_set_line_width (cr, 2); @@ -55,8 +55,8 @@ ecc_print (ECellView *ecell_view, GtkPrintContext *context, cairo_line_to (cr, 7, 14); cairo_line_to (cr, 11, 5); cairo_stroke (cr); - } - cairo_restore (cr); + } + cairo_restore (cr); } static void @@ -80,7 +80,7 @@ e_cell_checkbox_init (ECellCheckbox *eccb) * Creates a new ECell renderer that can be used to render check * boxes. the data provided from the model is cast to an integer. * zero is used for the off display, and non-zero for checked status. - * + * * Returns: an ECell object that can be used to render checkboxes. */ ECell * @@ -89,6 +89,6 @@ e_cell_checkbox_new (void) ECellCheckbox *eccb = g_object_new (E_CELL_CHECKBOX_TYPE, NULL); e_cell_toggle_construct (E_CELL_TOGGLE (eccb), 2, 2, checks); - + return (ECell *) eccb; } diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c index 764a2c2031..6a8992d119 100644 --- a/widgets/table/e-cell-combo.c +++ b/widgets/table/e-cell-combo.c @@ -140,7 +140,7 @@ e_cell_combo_init (ECellCombo *ecc) gtk_window_set_policy (GTK_WINDOW (ecc->popup_window), TRUE, TRUE, FALSE); - + frame = gtk_frame_new (NULL); gtk_container_add (GTK_CONTAINER (ecc->popup_window), frame); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT); @@ -226,7 +226,7 @@ e_cell_combo_dispose (GObject *object) void -e_cell_combo_set_popdown_strings (ECellCombo *ecc, +e_cell_combo_set_popdown_strings (ECellCombo *ecc, GList *strings) { GList *elem; @@ -278,7 +278,7 @@ e_cell_combo_do_popup (ECellPopup *ecp, error_code = gdk_pointer_grab (ecc->popup_list->window, TRUE, GDK_ENTER_NOTIFY_MASK | - GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON1_MOTION_MASK, @@ -388,11 +388,11 @@ e_cell_combo_get_popup_pos (ECellCombo *ecc, gint column_width, row_height, scrollbar_width; double x1, y1; double wx, wy; - + /* This code is practically copied from GtkCombo. */ popup = GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window); popwin = GTK_BIN (ecc->popup_window); - + gdk_window_get_origin (canvas->window, x, y); x1 = e_table_header_col_diff (eti->header, 0, view_col + 1); @@ -427,13 +427,13 @@ e_cell_combo_get_popup_pos (ECellCombo *ecc, the vertical scrollbar in case we need to show that. */ screen_width = gdk_screen_width (); avail_width = screen_width - scrollbar_width; - + gtk_widget_size_request (ecc->popup_list, &list_requisition); - min_height = MIN (list_requisition.height, + min_height = MIN (list_requisition.height, popup->vscrollbar->requisition.height); if (!GTK_LIST (ecc->popup_list)->children) list_requisition.height += E_CELL_COMBO_LIST_EMPTY_HEIGHT; - + /* Calculate the desired width. */ *width = list_requisition.width + 2 * popwin->child->style->xthickness @@ -587,7 +587,7 @@ e_cell_combo_button_release (GtkWidget *popup_window, GtkWidget *event_widget; event_widget = gtk_get_event_widget ((GdkEvent*) event); - + /* See if the button was released in the list (or its children). */ while (event_widget && event_widget != ecc->popup_list) event_widget = event_widget->parent; diff --git a/widgets/table/e-cell-combo.h b/widgets/table/e-cell-combo.h index ed8803f655..9be7f18c80 100644 --- a/widgets/table/e-cell-combo.h +++ b/widgets/table/e-cell-combo.h @@ -57,7 +57,7 @@ GType e_cell_combo_get_type (void); ECell *e_cell_combo_new (void); /* These must be UTF-8. */ -void e_cell_combo_set_popdown_strings (ECellCombo *ecc, +void e_cell_combo_set_popdown_strings (ECellCombo *ecc, GList *strings); #endif /* _E_CELL_COMBO_H_ */ diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c index 0d185310cc..eb8312b290 100644 --- a/widgets/table/e-cell-date.c +++ b/widgets/table/e-cell-date.c @@ -1,4 +1,4 @@ -/* +/* * e-cell-date.c - Date item for e-table. * Copyright 2001, Ximian, Inc. * @@ -151,7 +151,7 @@ e_cell_date_init (ECellDate *ecd) * rendered with strikeout, underline, or bolded. In the case of the * "color_column" argument, the column in the model is expected to * have a string that can be parsed by gdk_color_parse(). - * + * * Returns: an ECell object that can be used to render dates. */ ECell * @@ -160,7 +160,7 @@ e_cell_date_new (const char *fontname, GtkJustification justify) ECellDate *ecd = g_object_new (E_CELL_DATE_TYPE, NULL); e_cell_text_construct(E_CELL_TEXT(ecd), fontname, justify); - + return (ECell *) ecd; } diff --git a/widgets/table/e-cell-date.h b/widgets/table/e-cell-date.h index e6ca4964d5..a99f1ddd6d 100644 --- a/widgets/table/e-cell-date.h +++ b/widgets/table/e-cell-date.h @@ -1,4 +1,4 @@ -/* +/* * e-cell-date.h - Date item for e-table. * Copyright 2001, Ximian, Inc. * diff --git a/widgets/table/e-cell-float.c b/widgets/table/e-cell-float.c index 1cd61efcbb..281000af23 100644 --- a/widgets/table/e-cell-float.c +++ b/widgets/table/e-cell-float.c @@ -40,9 +40,9 @@ static char * ecf_get_text(ECellText *cell, ETableModel *model, int col, int row) { gfloat *fvalue; - + fvalue = e_table_model_value_at (model, col, row); - + return e_format_number_float (*fvalue); } @@ -76,7 +76,7 @@ e_cell_float_init (ECellFloat *cell_float) * interpreted as being an int. * * See ECellText for other features. - * + * * Returns: an ECell object that can be used to render floats. */ ECell * @@ -85,7 +85,7 @@ e_cell_float_new (const char *fontname, GtkJustification justify) ECellFloat *ecn = g_object_new (E_CELL_FLOAT_TYPE, NULL); e_cell_text_construct(E_CELL_TEXT(ecn), fontname, justify); - + return (ECell *) ecn; } diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c index 0dbee373cb..0f49d035c9 100644 --- a/widgets/table/e-cell-hbox.c +++ b/widgets/table/e-cell-hbox.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-cell-hbox.c - Hbox cell object. * Copyright 2006 Novell, Inc. * @@ -55,13 +55,13 @@ ecv_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view) ECellHbox *ecv = E_CELL_HBOX (ecell); ECellHboxView *hbox_view = g_new0 (ECellHboxView, 1); int i; - + hbox_view->cell_view.ecell = ecell; hbox_view->cell_view.e_table_model = table_model; hbox_view->cell_view.e_table_item_view = e_table_item_view; hbox_view->cell_view.kill_view_cb = NULL; hbox_view->cell_view.kill_view_cb_data = NULL; - + /* create our subcell view */ hbox_view->subcell_view_count = ecv->subcell_count; hbox_view->subcell_views = g_new (ECellView *, hbox_view->subcell_view_count); @@ -149,7 +149,7 @@ ecv_draw (ECellView *ecell_view, GdkDrawable *drawable, int subcell_offset = 0; int i; int allotted_width = x2-x1; - + for (i = 0; i < hbox_view->subcell_view_count; i++) { /* Now cause our subcells to draw their contents, shifted by subcell_offset pixels */ @@ -207,7 +207,7 @@ ecv_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, * ECell::height method */ static int -ecv_height (ECellView *ecell_view, int model_col, int view_col, int row) +ecv_height (ECellView *ecell_view, int model_col, int view_col, int row) { ECellHboxView *hbox_view = (ECellHboxView *)ecell_view; int height = 0, max_height = 0; @@ -232,9 +232,9 @@ ecv_max_width (ECellView *ecell_view, int model_col, int view_col) for (i = 0; i < hbox_view->subcell_view_count; i++) { int cell_width = e_cell_max_width (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col); - + if (cell_width < hbox_view->def_size_cols[i]) - cell_width = hbox_view->def_size_cols[i]; + cell_width = hbox_view->def_size_cols[i]; width += cell_width; } @@ -291,10 +291,10 @@ e_cell_hbox_init (ECellHbox *ecv) /** * e_cell_hbox_new: - * + * * Creates a new ECell renderer that can be used to render multiple * child cells. - * + * * Return value: an ECell object that can be used to render multiple * child cells. **/ @@ -314,7 +314,7 @@ e_cell_hbox_append (ECellHbox *hbox, ECell *subcell, int model_col, int size) hbox->subcells = g_renew (ECell *, hbox->subcells, hbox->subcell_count); hbox->model_cols = g_renew (int, hbox->model_cols, hbox->subcell_count); hbox->def_size_cols = g_renew (int, hbox->def_size_cols, hbox->subcell_count); - + hbox->subcells[hbox->subcell_count - 1] = subcell; hbox->model_cols[hbox->subcell_count - 1] = model_col; hbox->def_size_cols[hbox->subcell_count - 1] = size; diff --git a/widgets/table/e-cell-hbox.h b/widgets/table/e-cell-hbox.h index 448ed7c425..8965f2b1da 100644 --- a/widgets/table/e-cell-hbox.h +++ b/widgets/table/e-cell-hbox.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-cell-hbox.h - Hbox cell object. * Copyright 2006, Novell, Inc. * @@ -54,7 +54,7 @@ typedef struct { int subcell_view_count; ECellView **subcell_views; int *model_cols; - int *def_size_cols; + int *def_size_cols; } ECellHboxView; typedef struct { diff --git a/widgets/table/e-cell-number.c b/widgets/table/e-cell-number.c index d87ffced8e..b4b7119c6b 100644 --- a/widgets/table/e-cell-number.c +++ b/widgets/table/e-cell-number.c @@ -1,4 +1,4 @@ -/* +/* * e-cell-number.c - Number item for e-table. * Copyright 2001, Ximian, Inc. * @@ -68,7 +68,7 @@ e_cell_number_init (ECellNumber *cell_number) * interpreted as being an int. * * See ECellText for other features. - * + * * Returns: an ECell object that can be used to render numbers. */ ECell * @@ -77,7 +77,7 @@ e_cell_number_new (const char *fontname, GtkJustification justify) ECellNumber *ecn = g_object_new (E_CELL_NUMBER_TYPE, NULL); e_cell_text_construct(E_CELL_TEXT(ecn), fontname, justify); - + return (ECell *) ecn; } diff --git a/widgets/table/e-cell-number.h b/widgets/table/e-cell-number.h index 573f589108..ff9736f201 100644 --- a/widgets/table/e-cell-number.h +++ b/widgets/table/e-cell-number.h @@ -1,4 +1,4 @@ -/* +/* * e-cell-number.h - Number item for e-table. * Copyright 2001, Ximian, Inc. * diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c index 9963a2d361..36fd8a49b3 100644 --- a/widgets/table/e-cell-pixbuf.c +++ b/widgets/table/e-cell-pixbuf.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-cell-pixbuf.c - An ECell that displays a GdkPixbuf * Copyright 2001, Ximian, Inc. * @@ -215,14 +215,14 @@ pixbuf_height (ECellView *ecell_view, int model_col, int view_col, int row) * ECell::print method */ static void -pixbuf_print (ECellView *ecell_view, GtkPrintContext *context, +pixbuf_print (ECellView *ecell_view, GtkPrintContext *context, int model_col, int view_col, int row, double width, double height) { GdkPixbuf *pixbuf; int scale; cairo_t *cr = gtk_print_context_get_cairo_context (context); - + pixbuf = (GdkPixbuf *) e_table_model_value_at (ecell_view->e_table_model, model_col, row); if (pixbuf == NULL) return; @@ -231,12 +231,12 @@ pixbuf_print (ECellView *ecell_view, GtkPrintContext *context, cairo_save (cr); cairo_translate (cr, 0, (double)(height - scale) / (double)2); gdk_cairo_set_source_pixbuf (cr, pixbuf, (double)scale, (double)scale); - cairo_paint (cr); + cairo_paint (cr); cairo_restore (cr); } static gdouble -pixbuf_print_height (ECellView *ecell_view, GtkPrintContext *context, +pixbuf_print_height (ECellView *ecell_view, GtkPrintContext *context, int model_col, int view_col, int row, double width) { @@ -249,11 +249,11 @@ pixbuf_print_height (ECellView *ecell_view, GtkPrintContext *context, return 6; } } - + pixbuf = (GdkPixbuf *) e_table_model_value_at (ecell_view->e_table_model, model_col, row); if (!pixbuf) return 0; - + /* We give ourselves 3 pixels of padding on either side */ return gdk_pixbuf_get_height (pixbuf); } @@ -331,7 +331,7 @@ pixbuf_get_property (GObject *object, ECellPixbuf *pixbuf; pixbuf = E_CELL_PIXBUF (object); - + switch (prop_id) { case PROP_SELECTED_COLUMN: g_value_set_int (value, pixbuf->selected_column); diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c index c082c2416e..29eaafba4a 100644 --- a/widgets/table/e-cell-popup.c +++ b/widgets/table/e-cell-popup.c @@ -87,14 +87,14 @@ static void ecp_leave_edit (ECellView *ecv, int row, void *edit_context); static void ecp_print (ECellView *ecv, - GtkPrintContext *context, + GtkPrintContext *context, int model_col, int view_col, int row, double width, double height); static gdouble ecp_print_height (ECellView *ecv, - GtkPrintContext *context, + GtkPrintContext *context, int model_col, int view_col, int row, @@ -102,7 +102,7 @@ static gdouble ecp_print_height (ECellView *ecv, static int ecp_max_width (ECellView *ecv, int model_col, int view_col); -static void ecp_show_tooltip (ECellView *ecv, +static void ecp_show_tooltip (ECellView *ecv, int model_col, int view_col, int row, @@ -194,7 +194,7 @@ ecp_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view) { ECellPopup *ecp = E_CELL_POPUP (ecell); ECellPopupView *ecp_view; - + /* We must have a child ECell before we create any views. */ g_return_val_if_fail (ecp->child != NULL, NULL); @@ -370,7 +370,7 @@ ecp_event (ECellView *ecv, GdkEvent *event, int model_col, int view_col, * ECell::height method */ static int -ecp_height (ECellView *ecv, int model_col, int view_col, int row) +ecp_height (ECellView *ecv, int model_col, int view_col, int row) { ECellPopupView *ecp_view = (ECellPopupView *) ecv; @@ -405,7 +405,7 @@ ecp_leave_edit (ECellView *ecv, int model_col, int view_col, int row, static void -ecp_print (ECellView *ecv, GtkPrintContext *context, +ecp_print (ECellView *ecv, GtkPrintContext *context, int model_col, int view_col, int row, double width, double height) { ECellPopupView *ecp_view = (ECellPopupView *) ecv; @@ -416,7 +416,7 @@ ecp_print (ECellView *ecv, GtkPrintContext *context, static gdouble -ecp_print_height (ECellView *ecv, GtkPrintContext *context, +ecp_print_height (ECellView *ecv, GtkPrintContext *context, int model_col, int view_col, int row, double width) { @@ -439,7 +439,7 @@ ecp_max_width (ECellView *ecv, static void -ecp_show_tooltip (ECellView *ecv, +ecp_show_tooltip (ECellView *ecv, int model_col, int view_col, int row, @@ -454,7 +454,7 @@ ecp_show_tooltip (ECellView *ecv, static char * ecp_get_bg_color (ECellView *ecell_view, int row) -{ +{ ECellPopupView *ecp_view = (ECellPopupView *) ecell_view; return e_cell_get_bg_color (ecp_view->child_view, row); diff --git a/widgets/table/e-cell-progress.c b/widgets/table/e-cell-progress.c index d22978c09d..943cc769d2 100644 --- a/widgets/table/e-cell-progress.c +++ b/widgets/table/e-cell-progress.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-cell-progress.c - Progress display cell object. * Copyright 1999-2002, Ximian, Inc. * Copyright 2001, 2002, Krisztian Pifko <monsta@users.sourceforge.net> @@ -64,14 +64,14 @@ eprog_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view) ECellProgressView *progress_view = g_new0 (ECellProgressView, 1); ETableItem *eti = E_TABLE_ITEM (e_table_item_view); GnomeCanvas *canvas = GNOME_CANVAS_ITEM (eti)->canvas; - + progress_view->cell_view.ecell = ecell; progress_view->cell_view.e_table_model = table_model; progress_view->cell_view.e_table_item_view = e_table_item_view; progress_view->cell_view.kill_view_cb = NULL; progress_view->cell_view.kill_view_cb_data = NULL; progress_view->canvas = canvas; - + return (ECellView *) progress_view; } @@ -87,7 +87,7 @@ eprog_kill_view (ECellView *ecell_view) g_list_free(progress_view->cell_view.kill_view_cb_data); g_free (ecell_view); -} +} static void eprog_realize (ECellView *ecell_view) @@ -112,7 +112,7 @@ eprog_unrealize (ECellView *ecv) static void eprog_clear (ECellProgress *progress) { - memset(progress->buffer,0x00,progress->width*progress->height*4); + memset(progress->buffer,0x00,progress->width*progress->height*4); } static void @@ -158,7 +158,7 @@ static void eprog_draw_bar (ECellProgress *progress, guchar red, guchar green, guchar blue, gint value) { gint i, j, w; - + w=value*(progress->width-2*(progress->padding+progress->border+1))/progress->max; for (i=(progress->padding+progress->border+1)*4;i<(progress->padding+progress->border+1+w)*4;i+=4){ for (j=0;j<progress->height-2*(progress->padding+progress->border+1);j++){ @@ -180,10 +180,10 @@ eprog_draw (ECellView *ecell_view, GdkDrawable *drawable, { ECellProgress *progress = E_CELL_PROGRESS (ecell_view->ecell); int x, y; - + const int value = GPOINTER_TO_INT ( e_table_model_value_at (ecell_view->e_table_model, model_col, row)); - + if ((value > progress->max)||(value < progress->min)){ g_warning ("Value from the table model is %d, the states we support are [%d..%d]\n", value, progress->min, progress->max); @@ -257,7 +257,7 @@ eprog_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col case GDK_BUTTON_PRESS: if (!e_table_model_is_cell_editable(ecell_view->e_table_model, model_col, row)) return FALSE; - + eprog_set_value (progress_view, model_col, view_col, row, value + 1); return TRUE; @@ -292,7 +292,7 @@ static void eprog_dispose (GObject *object) { ECellProgress *eprog = E_CELL_PROGRESS (object); - + g_object_unref (eprog->image); g_free (eprog->image); g_free (eprog->buffer); @@ -371,7 +371,7 @@ e_cell_progress_construct (ECellProgress *eprog, int padding, int border, int mi * Creates a new ECell renderer that can be used to render progress * bars displaying the percentage of the current value between min * and max. - * + * * Returns: an ECell object that can be used to render progress cells. */ ECell * diff --git a/widgets/table/e-cell-progress.h b/widgets/table/e-cell-progress.h index 9339038594..212d498f3b 100644 --- a/widgets/table/e-cell-progress.h +++ b/widgets/table/e-cell-progress.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-cell-progress.h - Progress display cell object. * Copyright 1999-2002, Ximian, Inc. * Copyright 2001, 2002, Krisztian Pifko <monsta@users.sourceforge.net> diff --git a/widgets/table/e-cell-size.c b/widgets/table/e-cell-size.c index 038ff9dc28..227592c4e3 100644 --- a/widgets/table/e-cell-size.c +++ b/widgets/table/e-cell-size.c @@ -37,7 +37,7 @@ ecd_get_text(ECellText *cell, ETableModel *model, int col, int row) { gint size = GPOINTER_TO_INT(e_table_model_value_at(model, col, row)); gfloat fsize; - + if (size < 1024) { return g_strdup_printf ("%d bytes", size); } else { @@ -94,7 +94,7 @@ e_cell_size_init (ECellSize *e_cell_size) * rendered with strikeout, underline, or bolded. In the case of the * "color_column" argument, the column in the model is expected to * have a string that can be parsed by gdk_color_parse(). - * + * * Returns: an ECell object that can be used to render file sizes. */ ECell * e_cell_size_new (const char *fontname, GtkJustification justify) @@ -102,7 +102,7 @@ e_cell_size_new (const char *fontname, GtkJustification justify) ECellSize *ecd = g_object_new (E_CELL_SIZE_TYPE, NULL); e_cell_text_construct(E_CELL_TEXT(ecd), fontname, justify); - + return (ECell *) ecd; } diff --git a/widgets/table/e-cell-spin-button.c b/widgets/table/e-cell-spin-button.c index 7f04af9358..ea7f294cfa 100644 --- a/widgets/table/e-cell-spin-button.c +++ b/widgets/table/e-cell-spin-button.c @@ -7,9 +7,9 @@ * Authors: * Mikael Hallendal <micke@codefactory.se> * - * Celltype for drawing a spinbutton in a cell. + * Celltype for drawing a spinbutton in a cell. * - * Used ECellPopup by Damon Chaplin <damon@ximian.com> as base for + * Used ECellPopup by Damon Chaplin <damon@ximian.com> as base for * buttondrawings. * * This library is free software; you can redistribute it and/or @@ -54,24 +54,24 @@ static ECellView * ecsb_new_view (ECell *ecell, static void ecsb_realize (ECellView *ecv); static void ecsb_kill_view (ECellView *ecv); static void ecsb_unrealize (ECellView *ecv); -static void ecsb_draw (ECellView *ecv, - GdkDrawable *drawable, - int model_col, - int view_col, - int row, - ECellFlags flags, - int x1, - int y1, - int x2, - int y2); - -static gint ecsb_event (ECellView *ecv, - GdkEvent *event, - int model_col, - int view_col, +static void ecsb_draw (ECellView *ecv, + GdkDrawable *drawable, + int model_col, + int view_col, + int row, + ECellFlags flags, + int x1, + int y1, + int x2, + int y2); + +static gint ecsb_event (ECellView *ecv, + GdkEvent *event, + int model_col, + int view_col, int row, - ECellFlags flags, - ECellActions *actions); + ECellFlags flags, + ECellActions *actions); static gint ecsb_height (ECellView *ecv, int model_col, @@ -79,14 +79,14 @@ static gint ecsb_height (ECellView *ecv, int row); static void * ecsb_enter_edit (ECellView *ecv, - int model_col, - int view_col, + int model_col, + int view_col, int row); static void ecsb_leave_edit (ECellView *ecv, - int model_col, - int view_col, - int row, + int model_col, + int view_col, + int row, void *context); static void ecsb_focus (ECellView *ecell_view, int model_col, @@ -99,15 +99,15 @@ static void ecsb_focus (ECellView *ecell_view, static void ecsb_unfocus (ECellView *ecell_view); static void ecsb_show_tooltip (ECellView *ecv, - int model_col, - int view_col, - int row, - int col_width, + int model_col, + int view_col, + int row, + int col_width, ETableTooltip *tooltip); typedef struct { ECellView cell_view; - + ECellView *child_view; } ECellSpinButtonView; @@ -118,12 +118,12 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; -static void +static void e_cell_spin_button_class_init (ECellSpinButtonClass *klass) { ECellClass *ecc = E_CELL_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass); - + object_class->dispose = ecsb_dispose; ecc->realize = ecsb_realize; @@ -151,20 +151,20 @@ e_cell_spin_button_class_init (ECellSpinButtonClass *klass) NULL, NULL, e_util_marshal_NONE__POINTER_INT_INT_INT, G_TYPE_NONE, - 4, G_TYPE_POINTER, G_TYPE_INT, + 4, G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT); } -static void +static void e_cell_spin_button_init (ECellSpinButton *ecsb) { g_return_if_fail (M_IS_CELL_SPIN_BUTTON (ecsb)); - + ecsb->up_pressed = FALSE; ecsb->down_pressed = FALSE; } -static ECellView * +static ECellView * ecsb_new_view (ECell *ecell, ETableModel *etm, void *eti_view) @@ -187,23 +187,23 @@ ecsb_new_view (ECell *ecell, return (ECellView *) ecsb_view; } -static void +static void ecsb_realize (ECellView *ecv) -{ +{ ECellSpinButtonView *ecsb_view; - + g_return_if_fail (ecv != NULL); ecsb_view = (ECellSpinButtonView *) ecv; e_cell_realize (ecsb_view->child_view); -} +} -static void +static void ecsb_kill_view (ECellView *ecv) { ECellSpinButtonView *ecsb_view; - + g_return_if_fail (ecv != NULL); ecsb_view = (ECellSpinButtonView *) ecv; @@ -211,15 +211,15 @@ ecsb_kill_view (ECellView *ecv) if (ecsb_view->child_view) { e_cell_kill_view (ecsb_view->child_view); } - + g_free (ecsb_view); } -static void +static void ecsb_unrealize (ECellView *ecv) -{ +{ ECellSpinButtonView *ecsb_view; - + g_return_if_fail (ecv != NULL); ecsb_view = (ECellSpinButtonView *) ecv; @@ -227,16 +227,16 @@ ecsb_unrealize (ECellView *ecv) e_cell_unrealize (ecsb_view->child_view); } -static void -ecsb_draw (ECellView *ecv, - GdkDrawable *drawable, - int model_col, - int view_col, - int row, - ECellFlags flags, - int x1, - int y1, - int x2, +static void +ecsb_draw (ECellView *ecv, + GdkDrawable *drawable, + int model_col, + int view_col, + int row, + ECellFlags flags, + int x1, + int y1, + int x2, int y2) { ECellSpinButton *ecsb; @@ -245,38 +245,38 @@ ecsb_draw (ECellView *ecv, GtkWidget *canvas; GtkShadowType shadow = GTK_SHADOW_OUT; GdkRectangle rect; - + g_return_if_fail (ecv != NULL); - + ecsb_view = (ECellSpinButtonView *) ecv; ecsb = E_CELL_SPIN_BUTTON (ecsb_view->cell_view.ecell); - + eti = E_TABLE_ITEM (ecsb_view->cell_view.e_table_item_view); canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (eti)->canvas); - - if (eti->editing_col == view_col && + + if (eti->editing_col == view_col && eti->editing_row == row) { /* Draw child (Whats shown under the buttons) */ - e_cell_draw (ecsb_view->child_view, + e_cell_draw (ecsb_view->child_view, drawable, model_col, view_col, - row, flags, - x1, y1, - x2 - E_CELL_SPIN_BUTTON_ARROW_WIDTH, y2); + row, flags, + x1, y1, + x2 - E_CELL_SPIN_BUTTON_ARROW_WIDTH, y2); /* Draw down-arrow */ rect.x = x2 - E_CELL_SPIN_BUTTON_ARROW_WIDTH; rect.y = y1 + (y2 - y1) / 2; rect.width = E_CELL_SPIN_BUTTON_ARROW_WIDTH; rect.height = (y2 - y1) / 2; - + if (ecsb->down_pressed) { shadow = GTK_SHADOW_IN; } else { shadow = GTK_SHADOW_OUT; } - - gtk_paint_box (canvas->style, drawable, + + gtk_paint_box (canvas->style, drawable, GTK_STATE_NORMAL, shadow, &rect, canvas, "ecellspinbutton_down", rect.x, rect.y, rect.width, rect.height); @@ -292,14 +292,14 @@ ecsb_draw (ECellView *ecv, /* Draw up-arrow */ rect.y = y1; - + if (ecsb->up_pressed) { shadow = GTK_SHADOW_IN; } else { shadow = GTK_SHADOW_OUT; } - gtk_paint_box (canvas->style, drawable, + gtk_paint_box (canvas->style, drawable, GTK_STATE_NORMAL, shadow, &rect, canvas, "ecellspinbutton_up", rect.x, rect.y, rect.width, rect.height); @@ -314,34 +314,34 @@ ecsb_draw (ECellView *ecv, rect.height); } else { /* Draw child */ - e_cell_draw (ecsb_view->child_view, + e_cell_draw (ecsb_view->child_view, drawable, model_col, view_col, - row, flags, - x1, y1, - x2, y2); + row, flags, + x1, y1, + x2, y2); } } -static gint -ecsb_event (ECellView *ecv, - GdkEvent *event, - int model_col, - int view_col, +static gint +ecsb_event (ECellView *ecv, + GdkEvent *event, + int model_col, + int view_col, int row, - ECellFlags flags, + ECellFlags flags, ECellActions *actions) { ECellSpinButton *ecsb; ECellSpinButtonView *ecsb_view; ETableItem *eti; gint height, width; - + g_return_val_if_fail (ecv != NULL, FALSE); - + ecsb_view = (ECellSpinButtonView *) ecv; ecsb = E_CELL_SPIN_BUTTON (ecsb_view->cell_view.ecell); eti = E_TABLE_ITEM (ecsb_view->cell_view.e_table_item_view); - + switch (event->type) { case GDK_BUTTON_PRESS: if (eti->editing_col == view_col && @@ -377,10 +377,10 @@ ecsb_event (ECellView *ecv, row, view_col, row); - + } - } - + } + break; case GDK_BUTTON_RELEASE: ecsb->up_pressed = FALSE; @@ -401,29 +401,29 @@ ecsb_event (ECellView *ecv, view_col, row, flags, actions); } -static gint +static gint ecsb_height (ECellView *ecv, int model_col, int view_col, int row) { ECellSpinButtonView *ecsb_view; - + g_return_val_if_fail (ecv != NULL, -1); - + ecsb_view = (ECellSpinButtonView *) ecv; return e_cell_height (ecsb_view->child_view, model_col, view_col, row); } -static void * +static void * ecsb_enter_edit (ECellView *ecv, - int model_col, - int view_col, + int model_col, + int view_col, int row) { ECellSpinButtonView *ecsb_view; - + g_return_val_if_fail (ecv != NULL, NULL); ecsb_view = (ECellSpinButtonView *) ecv; @@ -433,20 +433,20 @@ ecsb_enter_edit (ECellView *ecv, } -static void +static void ecsb_leave_edit (ECellView *ecv, - int model_col, - int view_col, - int row, + int model_col, + int view_col, + int row, void *context) { ECellSpinButtonView *ecsb_view; - + g_return_if_fail (ecv != NULL); - + ecsb_view = (ECellSpinButtonView *) ecv; - e_cell_leave_edit (ecsb_view->child_view, model_col, view_col, + e_cell_leave_edit (ecsb_view->child_view, model_col, view_col, row, context); } @@ -461,11 +461,11 @@ ecsb_focus (ECellView *ecell_view, int y2) { ECellClass *klass; - + klass = E_CELL_GET_CLASS (ecell_view->ecell); if (klass->focus) - klass->focus (ecell_view, model_col, view_col, row, + klass->focus (ecell_view, model_col, view_col, row, x1, y1, x2, y2); } @@ -473,37 +473,37 @@ static void ecsb_unfocus (ECellView *ecell_view) { ECellClass *klass; - + klass = E_CELL_GET_CLASS (ecell_view->ecell); if (klass->unfocus) klass->unfocus (ecell_view); } -static void +static void ecsb_show_tooltip (ECellView *ecv, - int model_col, - int view_col, - int row, - int col_width, + int model_col, + int view_col, + int row, + int col_width, ETableTooltip *tooltip) { ECellSpinButtonView *ecsb_view; - + g_return_if_fail (ecv != NULL); ecsb_view = (ECellSpinButtonView *) ecv; - - e_cell_show_tooltip (ecsb_view->child_view, model_col, view_col, + + e_cell_show_tooltip (ecsb_view->child_view, model_col, view_col, row, col_width, tooltip); } -static void +static void ecsb_dispose (GObject *object) { g_return_if_fail (object != NULL); g_return_if_fail (M_IS_CELL_SPIN_BUTTON (object)); - + G_OBJECT_CLASS (e_cell_spin_button_parent_class)->dispose (object); } @@ -514,18 +514,18 @@ e_cell_spin_button_new (gint min, ECell *child_cell) { ECellSpinButton *ecsb; - + ecsb = g_object_new (E_CELL_SPIN_BUTTON_TYPE, NULL); if (!child_cell) { - child_cell = e_cell_number_new (NULL, + child_cell = e_cell_number_new (NULL, GTK_JUSTIFY_LEFT); - + g_signal_connect (ecsb, "step", G_CALLBACK (e_cell_spin_button_step), NULL); } - + ecsb->child = child_cell; ecsb->min.i = min; ecsb->max.i = max; @@ -541,7 +541,7 @@ e_cell_spin_button_new_float (gfloat min, ECell *child_cell) { ECellSpinButton *ecsb; - + ecsb = g_object_new (E_CELL_SPIN_BUTTON_TYPE, NULL); if (!child_cell) { @@ -550,7 +550,7 @@ e_cell_spin_button_new_float (gfloat min, G_CALLBACK (e_cell_spin_button_step_float), NULL); } - + ecsb->child = child_cell; ecsb->min.f = min; ecsb->max.f = max; @@ -566,30 +566,30 @@ e_cell_spin_button_step (ECellSpinButton *ecsb, gint col, gint row) { - ECellSpinButtonView *ecsb_view; - + ECellSpinButtonView *ecsb_view; + ETableModel *etm; gint value; gint new_value; gchar *str_value; - + g_return_if_fail (ecsb != NULL); g_return_if_fail (M_IS_CELL_SPIN_BUTTON (ecsb)); g_return_if_fail (ecv != NULL); - - ecsb_view = (ECellSpinButtonView *) ecv; + + ecsb_view = (ECellSpinButtonView *) ecv; etm = ecsb_view->cell_view.e_table_model; - + value = GPOINTER_TO_INT (e_table_model_value_at (etm, col, row)); new_value = value; - + switch (direction) { case STEP_UP: - new_value = CLAMP (value + ecsb->step.i, + new_value = CLAMP (value + ecsb->step.i, ecsb->min.i, ecsb->max.i); break; case STEP_DOWN: - new_value = CLAMP (value - ecsb->step.i, + new_value = CLAMP (value - ecsb->step.i, ecsb->min.i, ecsb->max.i); break; default: @@ -610,40 +610,40 @@ e_cell_spin_button_step_float (ECellSpinButton *ecsb, gint col, gint row) { - ECellSpinButtonView *ecsb_view; - + ECellSpinButtonView *ecsb_view; + ETableModel *etm; gfloat value; gfloat new_value; gchar *str_value; - + g_return_if_fail (ecsb != NULL); g_return_if_fail (M_IS_CELL_SPIN_BUTTON (ecsb)); g_return_if_fail (ecv != NULL); - - ecsb_view = (ECellSpinButtonView *) ecv; + + ecsb_view = (ECellSpinButtonView *) ecv; etm = ecsb_view->cell_view.e_table_model; - + value = *(gfloat *) e_table_model_value_at (etm, col, row); switch (direction) { case STEP_UP: - new_value = CLAMP (value + ecsb->step.f, + new_value = CLAMP (value + ecsb->step.f, ecsb->min.f, ecsb->max.f); break; case STEP_DOWN: - new_value = CLAMP (value - ecsb->step.f, + new_value = CLAMP (value - ecsb->step.f, ecsb->min.f, ecsb->max.f); break; default: new_value = value; break; }; - + str_value = g_strdup_printf ("%f", new_value); e_table_model_set_value_at (etm, col, row, str_value); - + g_free (str_value); } diff --git a/widgets/table/e-cell-spin-button.h b/widgets/table/e-cell-spin-button.h index 9294857074..6bbd79bc99 100644 --- a/widgets/table/e-cell-spin-button.h +++ b/widgets/table/e-cell-spin-button.h @@ -7,9 +7,9 @@ * Authors: * Mikael Hallendal <micke@codefactory.se> * - * Celltype for drawing a spinbutton in a cell. + * Celltype for drawing a spinbutton in a cell. * - * Used ECellPopup by Damon Chaplin <damon@ximian.com> as base for + * Used ECellPopup by Damon Chaplin <damon@ximian.com> as base for * buttondrawings. * * This library is free software; you can redistribute it and/or @@ -58,7 +58,7 @@ typedef struct { ECellSpinButtonData min; ECellSpinButtonData max; ECellSpinButtonData step; - + gboolean up_pressed; gboolean down_pressed; @@ -66,7 +66,7 @@ typedef struct { typedef struct { ECellClass parent_class; - + /* Functions */ void (*step) (ECellSpinButton *mcsb, ECellView *ecv, @@ -82,9 +82,9 @@ ECell * e_cell_spin_button_new (gint min, ECell *child_cell); ECell * e_cell_spin_button_new_float (gfloat min, - gfloat max, + gfloat max, gfloat step, - ECell *child_cell); + ECell *child_cell); void e_cell_spin_button_step (ECellSpinButton *mcsb, diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 9c548b620f..5a55a51982 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -120,7 +120,7 @@ typedef struct { int max_width; int ref_count; } ECellTextLineBreaks; - + typedef struct _CellEdit CellEdit; @@ -129,7 +129,7 @@ typedef struct { GdkGC *gc; GdkCursor *i_cursor; GdkBitmap *stipple; /* Stipple for text */ - + GnomeCanvas *canvas; /* @@ -288,7 +288,7 @@ ect_stop_editing (ECellTextView *text_view, gboolean commit) row = edit->row; view_col = edit->view_col; model_col = edit->model_col; - + old_text = edit->old_text; text = edit->text; if (edit->tep) @@ -306,7 +306,7 @@ ect_stop_editing (ECellTextView *text_view, gboolean commit) g_timer_destroy (edit->timer); edit->timer = NULL; } - + g_signal_handlers_disconnect_matched ( edit->im_context, G_SIGNAL_MATCH_DATA, 0, 0, @@ -354,20 +354,20 @@ ect_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view) { ECellTextView *text_view = g_new0 (ECellTextView, 1); GnomeCanvas *canvas = GNOME_CANVAS_ITEM (e_table_item_view)->canvas; - + text_view->cell_view.ecell = ecell; text_view->cell_view.e_table_model = table_model; text_view->cell_view.e_table_item_view = e_table_item_view; text_view->cell_view.kill_view_cb = NULL; text_view->cell_view.kill_view_cb_data = NULL; - + text_view->canvas = canvas; text_view->xofs = 0.0; text_view->yofs = 0.0; - + return (ECellView *)text_view; } @@ -395,11 +395,11 @@ static void ect_realize (ECellView *ecell_view) { ECellTextView *text_view = (ECellTextView *) ecell_view; - + text_view->gc = gdk_gc_new (GTK_WIDGET (text_view->canvas)->window); text_view->i_cursor = gdk_cursor_new (GDK_XTERM); - + if (E_CELL_CLASS (e_cell_text_parent_class)->realize) (* E_CELL_CLASS (e_cell_text_parent_class)->realize) (ecell_view); } @@ -456,7 +456,7 @@ ect_free_color (gchar *color_spec, GdkColor *color, GdkColormap *colormap) static PangoAttrList* -build_attr_list (ECellTextView *text_view, int row, int text_length) +build_attr_list (ECellTextView *text_view, int row, int text_length) { ECellView *ecell_view = (ECellView *) text_view; @@ -512,7 +512,7 @@ layout_with_preedit (ECellTextView *text_view, int row, const char *text, gint w gint preedit_length = 0; gint text_length = strlen (text); gint mlen = MIN(edit->selection_start,text_length); - + gtk_im_context_get_preedit_string (edit->im_context, &preedit_string,&preedit_attrs, @@ -521,10 +521,10 @@ layout_with_preedit (ECellTextView *text_view, int row, const char *text, gint w layout = edit->layout; - g_string_prepend_len (tmp_string, text,text_length); + g_string_prepend_len (tmp_string, text,text_length); if (preedit_length) { - + /* mlen is the text_length in bytes, not chars * check whether we are not inserting into * the middle of a utf8 character @@ -541,7 +541,7 @@ layout_with_preedit (ECellTextView *text_view, int row, const char *text, gint w } g_string_insert (tmp_string, mlen, preedit_string); - } + } pango_layout_set_text (layout, tmp_string->str, tmp_string->len); @@ -594,13 +594,13 @@ build_layout (ECellTextView *text_view, int row, const char *text, gint width) PangoFontDescription *desc = NULL, *fixed_desc = NULL; char *fixed_family = NULL; gint fixed_size = 0; - + fixed_desc = pango_font_description_from_string (ect->font_name); if (fixed_desc) { fixed_family = (char *)pango_font_description_get_family (fixed_desc); fixed_size = pango_font_description_get_size (fixed_desc); - } - + } + desc = pango_font_description_copy (gtk_widget_get_style (GTK_WIDGET (((GnomeCanvasItem *)ecell_view->e_table_item_view)->canvas))->font_desc); pango_font_description_set_family (desc, fixed_family); pango_font_description_set_size (desc, fixed_size); @@ -609,7 +609,7 @@ build_layout (ECellTextView *text_view, int row, const char *text, gint width) pango_font_description_free (desc); pango_font_description_free (fixed_desc); } - + pango_layout_set_width (layout, width * PANGO_SCALE); pango_layout_set_wrap (layout, PANGO_WRAP_CHAR); @@ -780,7 +780,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable, if (edit && edit->view_col == view_col && edit->row == row) { layout = layout_with_preedit (text_view, row, edit->text ? edit->text : "?", x2 - x1); - } + } gdk_draw_layout (drawable, text_view->gc, x_origin, y_origin, @@ -836,7 +836,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable, gdk_region_destroy (rect_region); gdk_gc_set_clip_region (text_gc, clip_region); - gdk_draw_layout (drawable, text_gc, + gdk_draw_layout (drawable, text_gc, x_origin, y_origin, layout); gdk_gc_set_clip_region (text_gc, NULL); @@ -848,7 +848,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable, if (edit->show_cursor) { PangoRectangle strong_pos, weak_pos; pango_layout_get_cursor_pos (layout, edit->selection_start + edit->preedit_length, &strong_pos, &weak_pos); - + draw_pango_rectangle (drawable, text_view->gc, x_origin, y_origin, strong_pos); if (strong_pos.x != weak_pos.x || strong_pos.y != weak_pos.y || @@ -889,7 +889,7 @@ static void ect_edit_select_all (ECellTextView *text_view) { g_return_if_fail (text_view->edit); - + text_view->edit->selection_start = 0; text_view->edit->selection_end = strlen (text_view->edit->text); } @@ -920,7 +920,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, if (!(flags & E_CELL_EDITING)) return 0; - + if ( edit && !edit->preedit_length && flags & E_CELL_PREEDIT) return 1; @@ -934,31 +934,31 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, break; case GDK_KEY_PRESS: /* Fall Through */ if (edit_display) { - if (edit->im_context && + if (edit->im_context && !edit->im_context_signals_registered) { - g_signal_connect (edit->im_context, + g_signal_connect (edit->im_context, "preedit_changed", G_CALLBACK (\ e_cell_text_preedit_changed_cb), text_view); - g_signal_connect (edit->im_context, + g_signal_connect (edit->im_context, "commit", G_CALLBACK (\ - e_cell_text_commit_cb), + e_cell_text_commit_cb), text_view); - g_signal_connect (edit->im_context, + g_signal_connect (edit->im_context, "retrieve_surrounding", G_CALLBACK (\ - e_cell_text_retrieve_surrounding_cb), + e_cell_text_retrieve_surrounding_cb), text_view); - g_signal_connect (edit->im_context, + g_signal_connect (edit->im_context, "delete_surrounding", G_CALLBACK (\ - e_cell_text_delete_surrounding_cb), + e_cell_text_delete_surrounding_cb), text_view); edit->im_context_signals_registered = TRUE; @@ -969,8 +969,8 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, } else { if (edit && edit->im_context) { g_signal_handlers_disconnect_matched ( - edit->im_context, - G_SIGNAL_MATCH_DATA, 0, 0, + edit->im_context, + G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, edit); edit->im_context_signals_registered = FALSE; } @@ -992,7 +992,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, else return 1; } - + if (event->key.keyval == GDK_Escape){ /* if not changed, then pass this even to parent */ return_val = text_view->edit != NULL && text_view->edit->text && text_view->edit->old_text && 0 != strcmp (text_view->edit->text, text_view->edit->old_text); @@ -1007,7 +1007,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, ect_edit_select_all (text_view); edit = text_view->edit; edit_display = TRUE; - } + } if (edit_display) { GdkEventKey key = event->key; if (key.type == GDK_KEY_PRESS && @@ -1033,7 +1033,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, #endif _get_tep (edit); return_val = e_text_event_processor_handle_event (edit->tep, &e_tep_event); - if (e_tep_event.key.string) + if (e_tep_event.key.string) g_free (e_tep_event.key.string); break; } @@ -1046,7 +1046,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, d(g_print ("%s: %s\n", __FUNCTION__, press ? "GDK_BUTTON_PRESS" : "GDK_BUTTON_RELEASE")); event->button.x -= 4; event->button.y -= 1; - if ((!edit_display) + if ((!edit_display) && e_table_model_is_cell_editable (ecell_view->e_table_model, model_col, row) && event->type == GDK_BUTTON_RELEASE && event->button.button == 1) { @@ -1055,7 +1055,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, e_table_item_enter_edit (text_view->cell_view.e_table_item_view, view_col, row); edit = text_view->edit; edit_display = TRUE; - + e_tep_event.button.type = GDK_BUTTON_PRESS; e_tep_event.button.time = button.time; e_tep_event.button.state = button.state; @@ -1151,7 +1151,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, * ECell::height method */ static int -ect_height (ECellView *ecell_view, int model_col, int view_col, int row) +ect_height (ECellView *ecell_view, int model_col, int view_col, int row) { ECellTextView *text_view = (ECellTextView *) ecell_view; gint height; @@ -1193,10 +1193,10 @@ ect_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row) view_col)->width - 8; edit->layout = generate_layout (text_view, model_col, view_col, row, edit->cell_width); - + edit->xofs_edit = 0.0; edit->yofs_edit = 0.0; - + edit->selection_start = 0; edit->selection_end = 0; edit->select_by_word = FALSE; @@ -1213,14 +1213,14 @@ ect_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row) edit->scroll_start = 0; edit->show_cursor = TRUE; edit->button_down = FALSE; - + edit->tep = NULL; edit->has_selection = FALSE; - + edit->pointer_in = FALSE; edit->default_cursor_shown = TRUE; - + temp = e_cell_text_get_text(ect, ecell_view->e_table_model, model_col, row); edit->old_text = g_strdup (temp); e_cell_text_free_text(ect, temp); @@ -1235,7 +1235,7 @@ ect_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row) } #endif ect_queue_redraw (text_view, view_col, row); - + return NULL; } @@ -1332,7 +1332,7 @@ get_font_size (PangoLayout *layout, PangoFontDescription *font, const char *text } static void -ect_print (ECellView *ecell_view, GtkPrintContext *context, +ect_print (ECellView *ecell_view, GtkPrintContext *context, int model_col, int view_col, int row, double width, double height) { @@ -1342,7 +1342,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, PangoFontMetrics *font_metrics; ECellText *ect = E_CELL_TEXT(ecell_view->ecell); ECellTextView *ectView = (ECellTextView *)ecell_view; - GtkWidget *canvas = GTK_WIDGET(ectView->canvas); + GtkWidget *canvas = GTK_WIDGET(ectView->canvas); PangoDirection dir; gboolean strikeout, underline; cairo_t *cr; @@ -1357,19 +1357,19 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, layout = gtk_print_context_create_pango_layout (context); font_des = pango_font_description_from_string ("sans 12"); /* fix me font hardcoded */ pango_layout_set_font_description (layout, font_des); - + pango_layout_set_text (layout, string, -1); get_font_size (layout, font_des, string, &text_width, &text_height); - + cairo_move_to(cr, 2, 2); cairo_rectangle (cr, 2, 2, width + 2, height + 2); - cairo_clip(cr); + cairo_clip(cr); pango_context = gtk_widget_get_pango_context (canvas); font_metrics = pango_context_get_metrics (pango_context, canvas->style->font_desc, pango_context_get_language(pango_context)); - ty = (double)(text_height - - pango_font_metrics_get_ascent (font_metrics) + ty = (double)(text_height + - pango_font_metrics_get_ascent (font_metrics) - pango_font_metrics_get_descent (font_metrics)) / 2.0 /(double)PANGO_SCALE; strikeout = ect->strikeout_column >= 0 && row >= 0 && @@ -1378,7 +1378,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, e_table_model_value_at(ecell_view->e_table_model, ect->underline_column, row); dir = pango_find_base_dir (string, strlen(string)); - + if (underline) { ly = ty + (double)pango_font_metrics_get_underline_position (font_metrics)/(double)PANGO_SCALE; cairo_new_path (cr); @@ -1408,10 +1408,10 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, cairo_set_line_width (cr,(double)pango_font_metrics_get_strikethrough_thickness (font_metrics)/(double)PANGO_SCALE); cairo_stroke (cr); - } + } cairo_move_to(cr, 2, text_height- 5); - pango_layout_set_width (layout, (width - 4)*PANGO_SCALE); + pango_layout_set_width (layout, (width - 4)*PANGO_SCALE); pango_cairo_show_layout(cr, layout); cairo_restore (cr); @@ -1421,15 +1421,15 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, } static gdouble -ect_print_height (ECellView *ecell_view, GtkPrintContext *context, +ect_print_height (ECellView *ecell_view, GtkPrintContext *context, int model_col, int view_col, int row, double width) { - /* - * Font size is 16 by default. To leave some margin for cell - * text area, 2 for footer, 2 for header, actual print height + /* + * Font size is 16 by default. To leave some margin for cell + * text area, 2 for footer, 2 for header, actual print height * should be 16 + 4. - * Height of some special font is much higher than others, + * Height of some special font is much higher than others, * such as Arabic. So leave some more margin for cell. ` */ return 16 + 8; @@ -1457,7 +1457,7 @@ ect_max_width (ECellView *ecell_view, max_width = MAX (max_width, width); g_object_unref (layout); } - + return max_width + 8; } @@ -1478,7 +1478,7 @@ ect_max_width_by_row (ECellView *ecell_view, layout = generate_layout (text_view, model_col, view_col, row, 0); pango_layout_get_pixel_size (layout, &width, NULL); g_object_unref (layout); - + return width + 8; } @@ -1488,7 +1488,7 @@ tooltip_event (GtkWidget *window, ETableTooltip *tooltip) { gint ret_val = FALSE; - + switch (event->type) { case GDK_LEAVE_NOTIFY: e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(tooltip->eti)->canvas)); @@ -1523,7 +1523,7 @@ tooltip_event (GtkWidget *window, } static void -ect_show_tooltip (ECellView *ecell_view, +ect_show_tooltip (ECellView *ecell_view, int model_col, int view_col, int row, @@ -1775,7 +1775,7 @@ e_cell_text_class_init (ECellTextClass *klass) object_class->get_property = ect_get_property; object_class->set_property = ect_set_property; - signals [TEXT_INSERTED] = + signals [TEXT_INSERTED] = g_signal_new ("text_inserted", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_FIRST, @@ -1786,7 +1786,7 @@ e_cell_text_class_init (ECellTextClass *klass) G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT); - signals [TEXT_DELETED] = + signals [TEXT_DELETED] = g_signal_new ("text_deleted", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_FIRST, @@ -1852,7 +1852,7 @@ e_cell_text_class_init (ECellTextClass *klass) use_ellipsis_default = FALSE; } } - + gal_a11y_e_cell_registry_add_cell_type (NULL, E_CELL_TEXT_TYPE, gal_a11y_e_cell_text_new); } @@ -1883,12 +1883,12 @@ e_cell_text_get_cursor_locations (ECellTextView *tv, &x, &y, NULL, &area.height); gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (parent_item), &x1, &y1, NULL, NULL); - + gnome_canvas_get_scroll_offsets (GNOME_CANVAS (GNOME_CANVAS_ITEM (parent_item)->canvas), &cx, &cy); index = edit->selection_end + edit->preedit_pos; - pango_layout_get_cursor_pos (edit->layout, + pango_layout_get_cursor_pos (edit->layout, index, strong_pos ? &pango_strong_pos : NULL, weak_pos ? &pango_weak_pos : NULL); @@ -1913,7 +1913,7 @@ update_im_cursor_location (ECellTextView *tv) { CellEdit *edit=tv->edit; GdkRectangle area; - + e_cell_text_get_cursor_locations (tv, &area, NULL); gtk_im_context_set_cursor_location (edit->im_context, &area); @@ -1926,7 +1926,7 @@ e_cell_text_preedit_changed_cb (GtkIMContext *context, gchar *preedit_string; gint cursor_pos; CellEdit *edit=tv->edit; - gtk_im_context_get_preedit_string (edit->im_context, &preedit_string, + gtk_im_context_get_preedit_string (edit->im_context, &preedit_string, NULL, &cursor_pos); edit->preedit_length = strlen (preedit_string); @@ -1944,7 +1944,7 @@ e_cell_text_commit_cb (GtkIMContext *context, { CellEdit *edit = tv->edit; ETextEventProcessorCommand command; - + if (g_utf8_validate (str, strlen (str), NULL)) { command.action = E_TEP_INSERT; command.position = E_TEP_SELECTION; @@ -1966,7 +1966,7 @@ e_cell_text_retrieve_surrounding_cb (GtkIMContext *context, strlen (edit->text), MIN (edit->selection_start, edit->selection_end) ); - + return TRUE; } @@ -2056,7 +2056,7 @@ e_cell_text_construct (ECellText *cell, const char *fontname, GtkJustification j * rendered with strikeout, or bolded. In the case of the * "color_column" argument, the column in the model is expected to * have a string that can be parsed by gdk_color_parse(). - * + * * Returns: an ECell object that can be used to render strings. */ ECell * @@ -2107,7 +2107,7 @@ _blink_scroll_timeout (gpointer data) gboolean scroll = FALSE; gboolean redraw = FALSE; int width, height; - + g_timer_elapsed (edit->timer, ¤t_time); if (edit->scroll_start + SCROLL_WAIT_TIME > 1000000) { @@ -2198,9 +2198,9 @@ _get_position (ECellTextView *text_view, ETextEventProcessorCommand *command) int unival; int index; int trailing; - + switch (command->position) { - + case E_TEP_VALUE: return command->value; @@ -2321,7 +2321,7 @@ _get_position (ECellTextView *text_view, ETextEventProcessorCommand *command) return index; case E_TEP_FORWARD_PARAGRAPH: case E_TEP_BACKWARD_PARAGRAPH: - + case E_TEP_FORWARD_PAGE: case E_TEP_BACKWARD_PAGE: return edit->selection_end; @@ -2451,7 +2451,7 @@ e_cell_text_view_command (ETextEventProcessor *tep, ETextEventProcessorCommand * gboolean redraw = FALSE; int sel_start, sel_end; - + /* If the EText isn't editable, then ignore any commands that would modify the text. */ if (!ect->editable && (command->action == E_TEP_DELETE @@ -2589,9 +2589,9 @@ e_cell_text_view_supply_selection (CellEdit *edit, guint time, GdkAtom selection { #if DO_SELECTION GtkClipboard *clipboard; - + clipboard = gtk_widget_get_clipboard (GTK_WIDGET (edit->text_view->canvas), selection); - + if (selection == GDK_SELECTION_PRIMARY) { edit->has_selection = TRUE; } @@ -2700,7 +2700,7 @@ e_cell_text_get_color (ECellTextView *cell_view, gchar *color_spec) * If success, the [start, end) part of the text will be selected. * * This API is most likely to be used by a11y implementations. - * + * * Returns: whether the action is successful. */ gboolean @@ -2748,7 +2748,7 @@ e_cell_text_set_selection (ECellView *cell_view, * will return FALSE; * * This API is most likely to be used by a11y implementations. - * + * * Returns: whether the action is successful. */ gboolean @@ -2871,7 +2871,7 @@ e_cell_text_delete_selection (ECellView *cell_view, gint col, gint row) * @cell_view: the given cell view * @col: column of the given cell in the model * @row: row of the given cell in the model - * + * * Get the cell's text directly from CellEdit, * during editting this cell, the cell's text value maybe inconsistant * with the text got from table_model. @@ -2888,11 +2888,11 @@ e_cell_text_get_text_by_view (ECellView *cell_view, gint col, gint row) ectv = (ECellTextView *)cell_view; edit = ectv->edit; - + if (edit && ectv->edit->row == row && ectv->edit->model_col == col) { /* being editted now */ ret = g_strdup (edit->text); } else{ - model_text = e_cell_text_get_text (E_CELL_TEXT (cell_view->ecell), + model_text = e_cell_text_get_text (E_CELL_TEXT (cell_view->ecell), cell_view->e_table_model, col, row); ret = g_strdup (model_text); e_cell_text_free_text (E_CELL_TEXT (cell_view->ecell), model_text); diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h index 040c794829..93b958be0d 100644 --- a/widgets/table/e-cell-text.h +++ b/widgets/table/e-cell-text.h @@ -8,7 +8,7 @@ * Chris Lahey <clahey@ximian.com> * * A lot of code taken from: - * + * * Text item type for GnomeCanvas widget * * GnomeCanvas is basically a port of the Tk toolkit's most excellent @@ -63,7 +63,7 @@ typedef struct { guint use_ellipsis : 1; /* Whether to use the ellipsis. */ guint editable : 1; /* Whether the text can be edited. */ - + int strikeout_column; int underline_column; int bold_column; diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c index 9ae6cb2b56..ce98cbeb89 100644 --- a/widgets/table/e-cell-toggle.c +++ b/widgets/table/e-cell-toggle.c @@ -89,7 +89,7 @@ etog_kill_view (ECellView *ecell_view) g_object_unref (toggle_view->pixmap_cache[i]); g_free (toggle_view->pixmap_cache); g_free (ecell_view); -} +} static void etog_realize (ECellView *ecell_view) @@ -134,7 +134,7 @@ check_cache (ECellToggleView *toggle_view, int image_seq, int cache_seq) gdk_pixmap_new (toggle_view->canvas->layout.bin_window, width, height, gtk_widget_get_visual (GTK_WIDGET (toggle_view->canvas))->depth); - + switch (cache_seq % 3) { case 0: color = GTK_WIDGET (toggle_view->canvas)->style->bg [GTK_STATE_SELECTED]; @@ -187,7 +187,7 @@ etog_draw (ECellView *ecell_view, GdkDrawable *drawable, const int value = GPOINTER_TO_INT ( e_table_model_value_at (ecell_view->e_table_model, model_col, row)); - + if (value < 0 || value >= toggle->n_states){ g_warning ("Value from the table model is %d, the states we support are [0..%d)\n", value, toggle->n_states); @@ -261,7 +261,7 @@ etog_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, return FALSE; #endif - switch (event->type){ + switch (event->type){ case GDK_KEY_PRESS: if (event->key.keyval != GDK_space) return FALSE; @@ -269,7 +269,7 @@ etog_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, case GDK_BUTTON_PRESS: if (!e_table_model_is_cell_editable(ecell_view->e_table_model, model_col, row)) return FALSE; - + etog_set_value (toggle_view, model_col, view_col, row, value + 1); return TRUE; @@ -293,7 +293,7 @@ etog_height (ECellView *ecell_view, int model_col, int view_col, int row) * ECell::print method */ static void -etog_print (ECellView *ecell_view, GtkPrintContext *context, +etog_print (ECellView *ecell_view, GtkPrintContext *context, int model_col, int view_col, int row, double width, double height) { @@ -303,7 +303,7 @@ etog_print (ECellView *ecell_view, GtkPrintContext *context, const int value = GPOINTER_TO_INT ( e_table_model_value_at (ecell_view->e_table_model, model_col, row)); - cairo_t *cr; + cairo_t *cr; if (value >= toggle->n_states){ g_warning ("Value from the table model is %d, the states we support are [0..%d)\n", value, toggle->n_states); @@ -313,13 +313,13 @@ etog_print (ECellView *ecell_view, GtkPrintContext *context, cr = gtk_print_context_get_cairo_context (context); cairo_save(cr); image = toggle->images[value]; - cairo_translate (cr, 0 , 0); + cairo_translate (cr, 0 , 0); image = gdk_pixbuf_add_alpha (image, TRUE, 255, 255, 255); image_width = (double)gdk_pixbuf_get_width (image); image_height = (double)gdk_pixbuf_get_height (image); - cairo_rectangle (cr, image_width / 7, image_height / 3, - image_width - image_width / 4, - image_width - image_height / 7); + cairo_rectangle (cr, image_width / 7, image_height / 3, + image_width - image_width / 4, + image_width - image_height / 7); cairo_clip (cr); gdk_cairo_set_source_pixbuf (cr, image, 0, image_height / 4); cairo_paint (cr); @@ -327,7 +327,7 @@ etog_print (ECellView *ecell_view, GtkPrintContext *context, } static gdouble -etog_print_height (ECellView *ecell_view, GtkPrintContext *context, +etog_print_height (ECellView *ecell_view, GtkPrintContext *context, int model_col, int view_col, int row, double width) { @@ -377,7 +377,7 @@ etog_finalize (GObject *object) { ECellToggle *etog = E_CELL_TOGGLE (object); int i; - + for (i = 0; i < etog->n_states; i++) g_object_unref (etog->images [i]); @@ -435,7 +435,7 @@ e_cell_toggle_construct (ECellToggle *etog, int border, int n_states, GdkPixbuf { int max_height = 0; int i; - + etog->border = border; etog->n_states = n_states; @@ -459,10 +459,10 @@ e_cell_toggle_construct (ECellToggle *etog, int border, int n_states, GdkPixbuf * @images: a collection of @n_states images, one for each state. * * Creates a new ECell renderer that can be used to render toggle - * buttons with the images specified in @images. The value returned + * buttons with the images specified in @images. The value returned * by ETableModel::get_value is typecase into an integer and clamped * to the [0..n_states) range. That will select the image rendered. - * + * * Returns: an ECell object that can be used to render multi-state * toggle cells. */ diff --git a/widgets/table/e-cell-toggle.h b/widgets/table/e-cell-toggle.h index f2355410d4..3797248a5b 100644 --- a/widgets/table/e-cell-toggle.h +++ b/widgets/table/e-cell-toggle.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-cell-toggle.h - Multi-state image toggle cell object. * Copyright 1999, 2000, Ximian, Inc. * diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c index d0c74e17a0..f56ee02bc5 100644 --- a/widgets/table/e-cell-tree.c +++ b/widgets/table/e-cell-tree.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-cell-tree.c - Tree cell object. * Copyright 1999, 2000, 2001, Ximian, Inc. * @@ -128,13 +128,13 @@ ect_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view) ECellTree *ect = E_CELL_TREE (ecell); ECellTreeView *tree_view = g_new0 (ECellTreeView, 1); GnomeCanvas *canvas = GNOME_CANVAS_ITEM (e_table_item_view)->canvas; - + tree_view->cell_view.ecell = ecell; tree_view->cell_view.e_table_model = table_model; tree_view->cell_view.e_table_item_view = e_table_item_view; tree_view->cell_view.kill_view_cb = NULL; tree_view->cell_view.kill_view_cb_data = NULL; - + /* create our subcell view */ tree_view->subcell_view = e_cell_new_view (ect->subcell, table_model, e_table_item_view /* XXX */); @@ -176,7 +176,7 @@ ect_realize (ECellView *ecell_view) tree_view->gc = gdk_gc_new (GTK_WIDGET (tree_view->canvas)->window); - gdk_gc_set_line_attributes (tree_view->gc, 1, + gdk_gc_set_line_attributes (tree_view->gc, 1, GDK_LINE_ON_OFF_DASH, GDK_CAP_NOT_LAST, GDK_JOIN_MITER); @@ -220,7 +220,7 @@ draw_retro_expander (ECellTreeView *ectv, GdkDrawable *drawable, gboolean expand NULL, image, rect->x, rect->y, - rect->width - image_width / 2, + rect->width - image_width / 2, rect->height - image_height / 2, image_width, image_height, GDK_RGB_DITHER_NORMAL, @@ -290,7 +290,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable, rect.y = y1; rect.width = subcell_offset + node_image_width; rect.height = y2 - y1; - + gdk_gc_set_clip_rectangle (tree_view->gc, &rect); gdk_gc_set_clip_rectangle (fg_gc, &rect); clip_rect = ▭ @@ -427,7 +427,7 @@ event_in_expander (GdkEvent *event, gint offset, gint height) * ECell::height method */ static int -ect_height (ECellView *ecell_view, int model_col, int view_col, int row) +ect_height (ECellView *ecell_view, int model_col, int view_col, int row) { ECellTreeView *tree_view = (ECellTreeView *) ecell_view; @@ -489,7 +489,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, GdkRectangle area; animate_closure_t *closure = g_new0 (animate_closure_t, 1); int hgt; - + e_table_item_get_cell_geometry (tree_view->cell_view.e_table_item_view, &tmp_row, &view_col, &area.x, &area.y, NULL, &area.height); area.width = offset - 2; @@ -497,7 +497,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, if (hgt != area.height) /* Composite cells */ area.height += hgt; - + draw_expander (tree_view, GTK_LAYOUT (tree_view->canvas)->bin_window, expanded ? GTK_EXPANDER_SEMI_EXPANDED : GTK_EXPANDER_SEMI_COLLAPSED, GTK_STATE_NORMAL, &area); @@ -581,21 +581,21 @@ ect_max_width (ECellView *ecell_view, int model_col, int view_col) if (!per_row) subcell_max_width = e_cell_max_width (tree_view->subcell_view, model_col, view_col); - + for (row = 0; row < number_of_rows; row++) { ETreeModel *tree_model = e_cell_tree_get_tree_model(ecell_view->e_table_model, row); ETreePath node; GdkPixbuf *node_image; int node_image_width = 0; - + int offset, subcell_offset; #if 0 gboolean expanded, expandable; ETreeTableAdapter *tree_table_adapter = e_cell_tree_get_tree_table_adapter(ecell_view->e_table_model, row); #endif - + node = e_cell_tree_get_node (ecell_view->e_table_model, row); - + offset = offset_of_node (ecell_view->e_table_model, row); subcell_offset = offset; @@ -623,7 +623,7 @@ ect_max_width (ECellView *ecell_view, int model_col, int view_col) if (expandable) { GdkPixbuf *image; - image = (expanded + image = (expanded ? E_CELL_TREE(tree_view->cell_view.ecell)->open_pixbuf : E_CELL_TREE(tree_view->cell_view.ecell)->closed_pixbuf); @@ -643,7 +643,7 @@ ect_max_width (ECellView *ecell_view, int model_col, int view_col) static void ect_show_tooltip (ECellView *ecell_view, int model_col, int view_col, int row, int col_width, ETableTooltip *tooltip) -{ +{ ECellTreeView *tree_view = (ECellTreeView *) ecell_view; ETreeModel *tree_model = e_cell_tree_get_tree_model (ecell_view->e_table_model, row); ETreePath node = e_cell_tree_get_node (ecell_view->e_table_model, row); @@ -663,12 +663,12 @@ ect_show_tooltip (ECellView *ecell_view, int model_col, int view_col, int row, */ static char * ect_get_bg_color (ECellView *ecell_view, int row) -{ +{ ECellTreeView *tree_view = (ECellTreeView *) ecell_view; return e_cell_get_bg_color (tree_view->subcell_view, row); } - + /* * ECellView::enter_edit method */ @@ -694,7 +694,7 @@ ect_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, voi } static void -ect_print (ECellView *ecell_view, GtkPrintContext *context, +ect_print (ECellView *ecell_view, GtkPrintContext *context, int model_col, int view_col, int row, double width, double height) { @@ -789,7 +789,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, } static gdouble -ect_print_height (ECellView *ecell_view, GtkPrintContext *context, +ect_print_height (ECellView *ecell_view, GtkPrintContext *context, int model_col, int view_col, int row, double width) { @@ -859,10 +859,10 @@ e_cell_tree_init (ECellTree *ect) * @closed_pixbuf: pixbuf to be used instead of the '+' icon. * @draw_lines: whether or not to draw the lines between parents/children/siblings. * @subcell: the ECell to render to the right of the tree effects. - * + * * Constructs an ECellTree. used by subclasses that need to * initialize a nested ECellTree. See e_cell_tree_new() for more info. - * + * **/ void e_cell_tree_construct (ECellTree *ect, @@ -870,7 +870,7 @@ e_cell_tree_construct (ECellTree *ect, GdkPixbuf *closed_pixbuf, gboolean draw_lines, ECell *subcell) -{ +{ ect->subcell = subcell; if (subcell) g_object_ref_sink (subcell); @@ -893,14 +893,14 @@ e_cell_tree_construct (ECellTree *ect, * @closed_pixbuf: pixbuf to be used instead of the '+' icon. * @draw_lines: whether or not to draw the lines between parents/children/siblings. * @subcell: the ECell to render to the right of the tree effects. - * + * * Creates a new ECell renderer that can be used to render tree * effects that come from an ETreeModel. Various assumptions are made * as to the fact that the ETableModel the ETable this cell is * associated with is in fact an ETreeModel. The cell uses special * columns to get at structural information (needed to draw the * lines/icons. - * + * * Return value: an ECell object that can be used to render trees. **/ ECell * diff --git a/widgets/table/e-cell-tree.h b/widgets/table/e-cell-tree.h index 8c59920c27..3b03990024 100644 --- a/widgets/table/e-cell-tree.h +++ b/widgets/table/e-cell-tree.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-cell-tree.h - Tree cell object. * Copyright 1999, 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c index ff060b9a86..e9033b4f23 100644 --- a/widgets/table/e-cell-vbox.c +++ b/widgets/table/e-cell-vbox.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-cell-vbox.c - Vbox cell object. * Copyright 1999, 2000, 2001, Ximian, Inc. * @@ -55,13 +55,13 @@ ecv_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view) ECellVbox *ecv = E_CELL_VBOX (ecell); ECellVboxView *vbox_view = g_new0 (ECellVboxView, 1); int i; - + vbox_view->cell_view.ecell = ecell; vbox_view->cell_view.e_table_model = table_model; vbox_view->cell_view.e_table_item_view = e_table_item_view; vbox_view->cell_view.kill_view_cb = NULL; vbox_view->cell_view.kill_view_cb_data = NULL; - + /* create our subcell view */ vbox_view->subcell_view_count = ecv->subcell_count; vbox_view->subcell_views = g_new (ECellView *, vbox_view->subcell_view_count); @@ -198,7 +198,7 @@ ecv_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, * ECell::height method */ static int -ecv_height (ECellView *ecell_view, int model_col, int view_col, int row) +ecv_height (ECellView *ecell_view, int model_col, int view_col, int row) { ECellVboxView *vbox_view = (ECellVboxView *)ecell_view; int height = 0; @@ -235,7 +235,7 @@ ecv_max_width (ECellView *ecell_view, int model_col, int view_col) static void ecv_show_tooltip (ECellView *ecell_view, int model_col, int view_col, int row, int col_width, ETableTooltip *tooltip) -{ +{ ECellVboxView *vbox_view = (ECellVboxView *) ecell_view; EVboxModel *vbox_model = e_cell_vbox_get_vbox_model (ecell_view->e_table_model, row); EVboxPath node = e_cell_vbox_get_node (ecell_view->e_table_model, row); @@ -255,12 +255,12 @@ ecv_show_tooltip (ECellView *ecell_view, int model_col, int view_col, int row, */ static char * ecv_get_bg_color (ECellView *ecell_view, int row) -{ +{ ECellVboxView *vbox_view = (ECellVboxView *) ecell_view; return e_cell_get_bg_color (vbox_view->subcell_views[0], row); } - + /* * ECellView::enter_edit method */ @@ -286,7 +286,7 @@ ecv_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, voi } static void -ecv_print (ECellView *ecell_view, GnomePrintContext *context, +ecv_print (ECellView *ecell_view, GnomePrintContext *context, int model_col, int view_col, int row, double width, double height) { @@ -351,7 +351,7 @@ ecv_print (ECellView *ecell_view, GnomePrintContext *context, /* now draw our icon if we're expandable */ if (expandable) { double image_matrix [6] = {16, 0, 0, 16, 0, 0}; - GdkPixbuf *image = (expanded + GdkPixbuf *image = (expanded ? E_CELL_VBOX(vbox_view->cell_view.ecell)->open_pixbuf : E_CELL_VBOX(vbox_view->cell_view.ecell)->closed_pixbuf); int image_width, image_height, image_rowstride; @@ -384,7 +384,7 @@ ecv_print (ECellView *ecell_view, GnomePrintContext *context, } static gdouble -ecv_print_height (ECellView *ecell_view, GnomePrintContext *context, +ecv_print_height (ECellView *ecell_view, GnomePrintContext *context, int model_col, int view_col, int row, double width) { @@ -463,10 +463,10 @@ e_cell_vbox_init (ECellVbox *ecv) /** * e_cell_vbox_new: - * + * * Creates a new ECell renderer that can be used to render multiple * child cells. - * + * * Return value: an ECell object that can be used to render multiple * child cells. **/ diff --git a/widgets/table/e-cell-vbox.h b/widgets/table/e-cell-vbox.h index 5d57122402..e80f23cba6 100644 --- a/widgets/table/e-cell-vbox.h +++ b/widgets/table/e-cell-vbox.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-cell-vbox.h - Vbox cell object. * Copyright 1999 - 2002, Ximian, Inc. * diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c index 69d787f8eb..6d04c756ec 100644 --- a/widgets/table/e-cell.c +++ b/widgets/table/e-cell.c @@ -78,7 +78,7 @@ ec_height (ECellView *ecell_view, int model_col, int view_col, int row) static void ec_focus (ECellView *ecell_view, int model_col, int view_col, int row, int x1, int y1, int x2, int y2) { - ecell_view->focus_col = view_col; + ecell_view->focus_col = view_col; ecell_view->focus_row = row; ecell_view->focus_x1 = x1; ecell_view->focus_y1 = y1; @@ -180,7 +180,7 @@ e_cell_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_co ecell_view, event, model_col, view_col, row, flags, actions); } -/** +/** * e_cell_new_view: * @ecell: the Ecell that will create the new view * @table_model: the table model the ecell is bound to @@ -280,13 +280,13 @@ e_cell_draw (ECellView *ecell_view, GdkDrawable *drawable, * @model_col: the column in the model being drawn. * @view_col: the column in the view being drawn (what the model maps to). * @row: the row being drawn - * @width: width + * @width: width * @height: height * * FIXME: */ void -e_cell_print (ECellView *ecell_view, GtkPrintContext *context, +e_cell_print (ECellView *ecell_view, GtkPrintContext *context, int model_col, int view_col, int row, double width, double height) { @@ -300,7 +300,7 @@ e_cell_print (ECellView *ecell_view, GtkPrintContext *context, * FIXME: */ gdouble -e_cell_print_height (ECellView *ecell_view, GtkPrintContext *context, +e_cell_print_height (ECellView *ecell_view, GtkPrintContext *context, int model_col, int view_col, int row, double width) { @@ -431,7 +431,7 @@ e_cell_free_state (ECellView *ecell_view, int model_col, int view_col, int row, int e_cell_max_width (ECellView *ecell_view, int model_col, int view_col) { - return ECVIEW_EC_CLASS(ecell_view)->max_width + return ECVIEW_EC_CLASS(ecell_view)->max_width (ecell_view, model_col, view_col); } @@ -470,9 +470,9 @@ e_cell_max_width_by_row_implemented (ECellView *ecell_view) { return (ECVIEW_EC_CLASS(ecell_view)->max_width_by_row != NULL); } - + void -e_cell_show_tooltip (ECellView *ecell_view, int model_col, int view_col, +e_cell_show_tooltip (ECellView *ecell_view, int model_col, int view_col, int row, int col_width, ETableTooltip *tooltip) { ECVIEW_EC_CLASS(ecell_view)->show_tooltip @@ -494,4 +494,4 @@ e_cell_style_set(ECellView *ecell_view, GtkStyle *previous_style) if (ECVIEW_EC_CLASS(ecell_view)->style_set) ECVIEW_EC_CLASS(ecell_view)->style_set (ecell_view, previous_style); } - + diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h index 338695cb9e..b92e493e19 100644 --- a/widgets/table/e-cell.h +++ b/widgets/table/e-cell.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-cell.h * Copyright 1999, 2000, 2001, Ximian, Inc. * @@ -76,7 +76,7 @@ typedef struct _ECellView { ECell *ecell; ETableModel *e_table_model; void *e_table_item_view; - + gint focus_x1, focus_y1, focus_x2, focus_y2; gint focus_col, focus_row; @@ -88,7 +88,7 @@ typedef struct _ECellView { typedef struct { GtkObjectClass parent_class; - + ECellView *(*new_view) (ECell *ecell, ETableModel *table_model, void *e_table_item_view); void (*kill_view) (ECellView *ecell_view); diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c index 572d79acc1..663d6f3a67 100644 --- a/widgets/table/e-table-click-to-add.c +++ b/widgets/table/e-table-click-to-add.c @@ -81,7 +81,7 @@ etcta_style_set (ETableClickToAdd *etcta, GtkStyle *previous_style) if (etcta->rect) { gnome_canvas_item_set (etcta->rect, - "outline_color_gdk", &widget->style->fg[GTK_STATE_NORMAL], + "outline_color_gdk", &widget->style->fg[GTK_STATE_NORMAL], "fill_color_gdk", &widget->style->bg[GTK_STATE_NORMAL], NULL ); @@ -248,7 +248,7 @@ create_rect_and_text (ETableClickToAdd *etcta) "y1", (double) 0, "x2", (double) etcta->width - 1, "y2", (double) etcta->height - 1, - "outline_color_gdk", &widget->style->fg[GTK_STATE_NORMAL], + "outline_color_gdk", &widget->style->fg[GTK_STATE_NORMAL], "fill_color_gdk", &widget->style->bg[GTK_STATE_NORMAL], NULL); @@ -332,8 +332,8 @@ item_key_press (ETableItem *item, int row, int col, GdkEvent *event, ETableClick static void set_initial_selection (ETableClickToAdd *etcta) { - e_selection_model_do_something (E_SELECTION_MODEL(etcta->selection), - 0, e_table_header_prioritized_column (etcta->eth), + e_selection_model_do_something (E_SELECTION_MODEL(etcta->selection), + 0, e_table_header_prioritized_column (etcta->eth), 0); } @@ -401,7 +401,7 @@ etcta_event (GnomeCanvasItem *item, GdkEvent *e) one = e_table_one_new(etcta->model); etcta_add_one (etcta, one); g_object_unref (one); - + e_selection_model_clear(E_SELECTION_MODEL(etcta->selection)); etcta->row = gnome_canvas_item_new(GNOME_CANVAS_GROUP(item), @@ -445,7 +445,7 @@ etcta_event (GnomeCanvasItem *item, GdkEvent *e) break; } break; - + default: return FALSE; } @@ -456,7 +456,7 @@ static void etcta_reflow (GnomeCanvasItem *item, int flags) { ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item); - + double old_height = etcta->height; if (etcta->text) { @@ -498,35 +498,35 @@ etcta_class_init (ETableClickToAddClass *klass) item_class->unrealize = etcta_unrealize; item_class->event = etcta_event; - g_object_class_install_property (object_class, PROP_HEADER, + g_object_class_install_property (object_class, PROP_HEADER, g_param_spec_object ("header", _("Header"), /*_( */"XXX blurb" /*)*/, E_TABLE_HEADER_TYPE, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_MODEL, + g_object_class_install_property (object_class, PROP_MODEL, g_param_spec_object ("model", _("Model"), /*_( */"XXX blurb" /*)*/, E_TABLE_MODEL_TYPE, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_MESSAGE, + g_object_class_install_property (object_class, PROP_MESSAGE, g_param_spec_string ("message", _("Message"), /*_( */"XXX blurb" /*)*/, NULL, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_WIDTH, + g_object_class_install_property (object_class, PROP_WIDTH, g_param_spec_double ("width", _("Width"), /*_( */"XXX blurb" /*)*/, 0.0, G_MAXDOUBLE, 0.0, G_PARAM_READWRITE | G_PARAM_LAX_VALIDATION)); - g_object_class_install_property (object_class, PROP_HEIGHT, + g_object_class_install_property (object_class, PROP_HEIGHT, g_param_spec_double ("height", _("Height"), /*_( */"XXX blurb" /*)*/, @@ -586,7 +586,7 @@ etcta_init (ETableClickToAdd *etcta) /** * e_table_click_to_add_commit: * @etcta: The %ETableClickToAdd to commit. - * + * * This routine commits the current thing being edited and returns to * just displaying the click to add message. **/ diff --git a/widgets/table/e-table-click-to-add.h b/widgets/table/e-table-click-to-add.h index 3ef30e2587..d05bddbda2 100644 --- a/widgets/table/e-table-click-to-add.h +++ b/widgets/table/e-table-click-to-add.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-click-to-add.h * Copyright 2000, 2001, Ximian, Inc. * @@ -52,7 +52,7 @@ typedef struct { GnomeCanvasItem *row; /* If row is NULL, we're sitting with no data and a "Click here" message. */ GnomeCanvasItem *text; /* If text is NULL, row shouldn't be. */ GnomeCanvasItem *rect; /* What the heck. Why not. */ - + gdouble width; gdouble height; diff --git a/widgets/table/e-table-col-dnd.h b/widgets/table/e-table-col-dnd.h index d47c97d3d9..50c3caa9ac 100644 --- a/widgets/table/e-table-col-dnd.h +++ b/widgets/table/e-table-col-dnd.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-col-dnd.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c index b53bc299e0..224334ad77 100644 --- a/widgets/table/e-table-col.c +++ b/widgets/table/e-table-col.c @@ -51,7 +51,7 @@ etc_dispose (GObject *object) if (etc->text) g_free (etc->text); etc->text = NULL; - + if (G_OBJECT_CLASS (e_table_col_parent_class)->dispose) G_OBJECT_CLASS (e_table_col_parent_class)->dispose (object); } @@ -84,11 +84,11 @@ etc_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *psp break; } } - + static void e_table_col_class_init (ETableColClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->dispose = etc_dispose; object_class->set_property = etc_set_property; @@ -97,9 +97,9 @@ e_table_col_class_init (ETableColClass *klass) g_object_class_install_property (object_class, PROP_COMPARE_COL, g_param_spec_int ("compare_col", _( "Width" ), - "Width", + "Width", 0, G_MAXINT, 0, - G_PARAM_READWRITE)); + G_PARAM_READWRITE)); } static void @@ -112,7 +112,7 @@ e_table_col_init (ETableCol *etc) etc->priority = 0; } -/** +/** * e_table_col_new: * @col_idx: the column we represent in the model * @text: a title for this column @@ -126,7 +126,7 @@ e_table_col_init (ETableCol *etc) * The ETableCol represents a column to be used inside an ETable. The * ETableCol objects are inserted inside an ETableHeader (which is just a collection * of ETableCols). The ETableHeader is the definition of the order in which - * columns are shown to the user. + * columns are shown to the user. * * The @text argument is the the text that will be shown as a header to the * user. @col_idx reflects where the data for this ETableCol object will @@ -135,7 +135,7 @@ e_table_col_init (ETableCol *etc) * column will always point to the same column inside the ETableModel. * * The @ecell argument is an ECell object that needs to know how to render the - * data in the ETableModel for this specific row. + * data in the ETableModel for this specific row. * * Returns: the newly created ETableCol object. */ @@ -144,7 +144,7 @@ e_table_col_new (int col_idx, const char *text, double expansion, int min_width, ECell *ecell, GCompareFunc compare, gboolean resizable, gboolean disabled, int priority) { ETableCol *etc; - + g_return_val_if_fail (expansion >= 0, NULL); g_return_val_if_fail (min_width >= 0, NULL); g_return_val_if_fail (ecell != NULL, NULL); @@ -152,7 +152,7 @@ e_table_col_new (int col_idx, const char *text, double expansion, int min_width, g_return_val_if_fail (text != NULL, NULL); etc = g_object_new (E_TABLE_COL_TYPE, NULL); - + etc->is_pixbuf = FALSE; etc->col_idx = col_idx; @@ -174,7 +174,7 @@ e_table_col_new (int col_idx, const char *text, double expansion, int min_width, return etc; } -/** +/** * e_table_col_new_with_pixbuf: * @col_idx: the column we represent in the model * @pixbuf: the image to be used for the header @@ -187,7 +187,7 @@ e_table_col_new (int col_idx, const char *text, double expansion, int min_width, * The ETableCol represents a column to be used inside an ETable. The * ETableCol objects are inserted inside an ETableHeader (which is just a collection * of ETableCols). The ETableHeader is the definition of the order in which - * columns are shown to the user. + * columns are shown to the user. * * The @text argument is the the text that will be shown as a header to the * user. @col_idx reflects where the data for this ETableCol object will @@ -196,7 +196,7 @@ e_table_col_new (int col_idx, const char *text, double expansion, int min_width, * column will always point to the same column inside the ETableModel. * * The @ecell argument is an ECell object that needs to know how to render the - * data in the ETableModel for this specific row. + * data in the ETableModel for this specific row. * * Returns: the newly created ETableCol object. */ @@ -205,7 +205,7 @@ e_table_col_new_with_pixbuf (int col_idx, const char *text, GdkPixbuf *pixbuf, d ECell *ecell, GCompareFunc compare, gboolean resizable, gboolean disabled, int priority) { ETableCol *etc; - + g_return_val_if_fail (expansion >= 0, NULL); g_return_val_if_fail (min_width >= 0, NULL); g_return_val_if_fail (ecell != NULL, NULL); diff --git a/widgets/table/e-table-col.h b/widgets/table/e-table-col.h index f41713a973..3dae732469 100644 --- a/widgets/table/e-table-col.h +++ b/widgets/table/e-table-col.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-col.h * Copyright 1999, 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-column-specification.c b/widgets/table/e-table-column-specification.c index 85497e51dd..8371176738 100644 --- a/widgets/table/e-table-column-specification.c +++ b/widgets/table/e-table-column-specification.c @@ -77,12 +77,12 @@ etcs_init (ETableColumnSpecification *specification) specification->compare_col = 0; specification->title = g_strdup(""); specification->pixbuf = NULL; - + specification->expansion = 0; specification->minimum_width = 0; specification->resizable = FALSE; specification->disabled = FALSE; - + specification->cell = NULL; specification->compare = NULL; specification->search = NULL; diff --git a/widgets/table/e-table-column-specification.h b/widgets/table/e-table-column-specification.h index 9fc0db5737..54cd683d3d 100644 --- a/widgets/table/e-table-column-specification.h +++ b/widgets/table/e-table-column-specification.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-column-specification.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-column.c b/widgets/table/e-table-column.c index 653f33beff..b4a2bc5126 100644 --- a/widgets/table/e-table-column.c +++ b/widgets/table/e-table-column.c @@ -54,7 +54,7 @@ e_table_column_finalize (GObject *object) */ for (i = 0; i < cols; i++) e_table_column_remove (etc, i); - + G_OBJECT_CLASS (e_table_column_parent_class)->finalize (object); } @@ -73,8 +73,8 @@ e_table_column_class_init (GtkObjectClass *object_class) NULL, NULL, e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); - etc_signals [DIMENSION_CHANGE] = - g_signal_new ("dimension_change", + etc_signals [DIMENSION_CHANGE] = + g_signal_new ("dimension_change", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableColumn, dimension_change), @@ -94,7 +94,7 @@ void e_table_column_add_column (ETableColumn *etc, ETableCol *tc, int pos) { ETableCol **new_ptr; - + g_return_if_fail (etc != NULL); g_return_if_fail (E_IS_TABLE_COLUMN (etc)); g_return_if_fail (tc != NULL); @@ -137,14 +137,14 @@ int e_table_column_index (ETableColumn *etc, const char *identifier) { int i; - + g_return_val_if_fail (etc != NULL, 0); g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0); g_return_val_if_fail (identifier != NULL, 0); for (i = 0; i < etc->col_count; i++){ ETableCol *tc = etc->columns [i]; - + if (strcmp (i->id, identifier) == 0) return i; } @@ -156,7 +156,7 @@ int e_table_column_get_index_at (ETableColumn *etc, int x_offset) { int i, total; - + g_return_val_if_fail (etc != NULL, 0); g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0); g_return_val_if_fail (identifier != NULL, 0); @@ -177,7 +177,7 @@ e_table_column_get_columns (ETableColumn *etc) { ETableCol **ret; int i; - + g_return_val_if_fail (etc != NULL, 0); g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0); @@ -202,7 +202,7 @@ ve_table_column_get_selected (ETableColumn *etc) { int i; int selected = 0; - + g_return_val_if_fail (etc != NULL, 0); g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0); @@ -218,7 +218,7 @@ int e_table_column_total_width (ETableColumn *etc) { int total; - + g_return_val_if_fail (etc != NULL, 0); g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0); diff --git a/widgets/table/e-table-config-field.h b/widgets/table/e-table-config-field.h index 5439a67f18..9ad8f76b6e 100644 --- a/widgets/table/e-table-config-field.h +++ b/widgets/table/e-table-config-field.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-config-field.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index 9bada0a0cf..796f2e4a59 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -131,8 +131,8 @@ config_get_property (GObject *object, static void e_table_config_class_init (ETableConfigClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - + GObjectClass *object_class = G_OBJECT_CLASS (klass); + klass->changed = NULL; object_class->finalize = config_finalize; @@ -279,11 +279,11 @@ update_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort) config->temp_state->sort_info); widgets = &config->group [0]; } - + for (i = 0; i < 4; i++){ gboolean sensitive = (i <= count); char *text = ""; - + gtk_widget_set_sensitive (widgets [i].frames, sensitive); /* @@ -295,7 +295,7 @@ update_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort) g_signal_handler_block ( widgets [i].combo, widgets [i].changed_id); - + if (i < count){ GtkToggleButton *a, *d; ETableSortColumn col = @@ -306,7 +306,7 @@ update_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort) : e_table_sort_info_grouping_get_nth ( config->temp_state->sort_info, i); - + ETableColumnSpecification *column = find_column_in_spec (config->source_spec, col.column); @@ -329,11 +329,11 @@ update_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort) widgets [i].radio_ascending); d = GTK_TOGGLE_BUTTON ( widgets [i].radio_descending); - + gtk_toggle_button_set_active (col.ascending ? a:d, 1); } else { GtkToggleButton *t; - + t = GTK_TOGGLE_BUTTON ( widgets [i].radio_ascending); @@ -370,13 +370,13 @@ config_sort_info_update (ETableConfig *config) for (i = 0; i < count; i++) { ETableSortColumn col = e_table_sort_info_sorting_get_nth (info, i); ETableColumnSpecification *column; - + column = find_column_in_spec (config->source_spec, col.column); if (!column){ g_warning ("Could not find column model in specification"); continue; } - + g_string_append (res, dgettext (config->domain, (column)->title)); g_string_append_c (res, ' '); g_string_append ( @@ -387,10 +387,10 @@ config_sort_info_update (ETableConfig *config) if ((i + 1) != count) g_string_append (res, ", "); } - + if (res->str [0] == 0) g_string_append (res, _("Not sorted")); - + gtk_label_set_text (GTK_LABEL(config->sort_label), res->str); g_string_free (res, TRUE); @@ -484,7 +484,7 @@ config_fields_info_update (ETableConfig *config) break; } } - + gtk_label_set_text (GTK_LABEL (config->fields_label), res->str); g_string_free (res, TRUE); } @@ -503,13 +503,13 @@ do_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort) is_sort ? config->sort [0].combo : config->group [0].combo)); - + if (is_sort) dialog = GTK_DIALOG (config->dialog_sort); else dialog = GTK_DIALOG (config->dialog_group_by); - + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (config->dialog_toplevel)); do { @@ -541,10 +541,10 @@ do_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort) running = 0; break; } - + } while (running); gtk_widget_hide (GTK_WIDGET (dialog)); - + if (is_sort) config_sort_info_update (config); else @@ -585,7 +585,7 @@ do_fields_config_dialog (ETableConfig *config) running = 0; break; } - + } while (running); gtk_widget_hide (GTK_WIDGET (config->dialog_show_fields)); @@ -619,51 +619,51 @@ create_global_store (ETableConfig *config) } } -static char *spec = "<ETableSpecification gettext-domain=\"" GETTEXT_PACKAGE "\" no-headers=\"true\" cursor-mode=\"line\" " -" draw-grid=\"false\" draw-focus=\"true\" selection-mode=\"browse\">" -"<ETableColumn model_col= \"0\" _title=\"Name\" minimum_width=\"30\" resizable=\"true\" cell=\"string\" compare=\"string\"/>" -"<ETableState> <column source=\"0\"/>" -"<grouping/>" -"</ETableState>" -"</ETableSpecification>"; - -GtkWidget *e_table_proxy_etable_shown_new (void); - -GtkWidget * -e_table_proxy_etable_shown_new (void) -{ - ETableModel *model = NULL; - GtkWidget *widget; - ETableScrolled *ets; - - model = e_table_subset_variable_new (global_store); - - widget = e_table_scrolled_new (model, NULL, spec, NULL); - ets = E_TABLE_SCROLLED (widget); - atk_object_set_name (gtk_widget_get_accessible ((GtkWidget *)ets->table), _("Show Fields")); - - return widget; -} - -GtkWidget *e_table_proxy_etable_available_new (void); - -GtkWidget * -e_table_proxy_etable_available_new (void) -{ - ETableModel *model; - GtkWidget *widget; - ETableScrolled *ets; - - model = e_table_without_new (global_store, - NULL, NULL, NULL, NULL, NULL, NULL, NULL); - - e_table_without_show_all (E_TABLE_WITHOUT (model)); - - widget = e_table_scrolled_new (model, NULL, spec, NULL); - ets = E_TABLE_SCROLLED (widget); - atk_object_set_name (gtk_widget_get_accessible ((GtkWidget *)ets->table), _("Available Fields")); - - return widget; +static char *spec = "<ETableSpecification gettext-domain=\"" GETTEXT_PACKAGE "\" no-headers=\"true\" cursor-mode=\"line\" " +" draw-grid=\"false\" draw-focus=\"true\" selection-mode=\"browse\">" +"<ETableColumn model_col= \"0\" _title=\"Name\" minimum_width=\"30\" resizable=\"true\" cell=\"string\" compare=\"string\"/>" +"<ETableState> <column source=\"0\"/>" +"<grouping/>" +"</ETableState>" +"</ETableSpecification>"; + +GtkWidget *e_table_proxy_etable_shown_new (void); + +GtkWidget * +e_table_proxy_etable_shown_new (void) +{ + ETableModel *model = NULL; + GtkWidget *widget; + ETableScrolled *ets; + + model = e_table_subset_variable_new (global_store); + + widget = e_table_scrolled_new (model, NULL, spec, NULL); + ets = E_TABLE_SCROLLED (widget); + atk_object_set_name (gtk_widget_get_accessible ((GtkWidget *)ets->table), _("Show Fields")); + + return widget; +} + +GtkWidget *e_table_proxy_etable_available_new (void); + +GtkWidget * +e_table_proxy_etable_available_new (void) +{ + ETableModel *model; + GtkWidget *widget; + ETableScrolled *ets; + + model = e_table_without_new (global_store, + NULL, NULL, NULL, NULL, NULL, NULL, NULL); + + e_table_without_show_all (E_TABLE_WITHOUT (model)); + + widget = e_table_scrolled_new (model, NULL, spec, NULL); + ets = E_TABLE_SCROLLED (widget); + atk_object_set_name (gtk_widget_get_accessible ((GtkWidget *)ets->table), _("Available Fields")); + + return widget; } static void @@ -703,7 +703,7 @@ dialog_response (GtkWidget *dialog, int response_id, ETableConfig *config) || response_id == GTK_RESPONSE_OK) { gtk_widget_destroy (dialog); } -} +} /* * Invoked by the Glade auto-connect code @@ -743,7 +743,7 @@ static GtkWidget * configure_dialog (GladeXML *gui, const char *widget_name, ETableConfig *config) { GtkWidget *w; - + w = glade_xml_get_widget (gui, widget_name); return w; @@ -768,7 +768,7 @@ get_source_model_col_index (ETableConfig *config, gint idx) ETableModel *src_model = E_TABLE_SUBSET (config->available_model)->source; visible_index = e_table_subset_view_to_model_row (E_TABLE_SUBSET (config->available_model), idx); - + return GPOINTER_TO_INT (e_table_model_value_at (src_model, 1, visible_index)); } @@ -786,7 +786,7 @@ sort_combo_changed (GtkComboBox *combo_box, ETableConfigSortWidgets *sort) if (s != NULL) { ETableSortColumn c; int col; - + col = find_model_column_by_name (config->source_spec, s); if (col == -1){ g_warning ("sort: This should not happen (%s)", s); @@ -798,7 +798,7 @@ sort_combo_changed (GtkComboBox *combo_box, ETableConfigSortWidgets *sort) config->sort [idx].radio_ascending)->active; c.column = col; e_table_sort_info_sorting_set_nth (sort_info, idx, c); - + update_sort_and_group_config_dialog (config, TRUE); } else { e_table_sort_info_sorting_truncate (sort_info, idx); @@ -816,7 +816,7 @@ sort_ascending_toggled (GtkToggleButton *t, ETableConfigSortWidgets *sort) ETableConfigSortWidgets *base = &config->sort[0]; int idx = sort - base; ETableSortColumn c; - + c = e_table_sort_info_sorting_get_nth (si, idx); c.ascending = t->active; e_table_sort_info_sorting_set_nth (si, idx, c); @@ -827,7 +827,7 @@ configure_sort_dialog (ETableConfig *config, GladeXML *gui) { GSList *l; int i; - + for (i = 0; i < 4; i++){ char buffer [80]; @@ -838,7 +838,7 @@ configure_sort_dialog (ETableConfig *config, GladeXML *gui) GTK_COMBO_BOX (config->sort[i].combo), "", ""); snprintf (buffer, sizeof (buffer), "frame-sort-%d", i + 1); - config->sort [i].frames = + config->sort [i].frames = glade_xml_get_widget (gui, buffer); snprintf ( @@ -896,7 +896,7 @@ group_combo_changed (GtkComboBox *combo_box, ETableConfigSortWidgets *group) if (s != NULL) { ETableSortColumn c; int col; - + col = find_model_column_by_name (config->source_spec, s); if (col == -1){ g_warning ("grouping: this should not happen, %s", s); @@ -908,7 +908,7 @@ group_combo_changed (GtkComboBox *combo_box, ETableConfigSortWidgets *group) config->group [idx].radio_ascending)->active; c.column = col; e_table_sort_info_grouping_set_nth (sort_info, idx, c); - + update_sort_and_group_config_dialog (config, FALSE); } else { e_table_sort_info_grouping_truncate (sort_info, idx); @@ -926,7 +926,7 @@ group_ascending_toggled (GtkToggleButton *t, ETableConfigSortWidgets *group) ETableConfigSortWidgets *base = &config->group[0]; int idx = group - base; ETableSortColumn c; - + c = e_table_sort_info_grouping_get_nth (si, idx); c.ascending = t->active; e_table_sort_info_grouping_set_nth (si, idx, c); @@ -937,7 +937,7 @@ configure_group_dialog (ETableConfig *config, GladeXML *gui) { GSList *l; int i; - + for (i = 0; i < 4; i++){ char buffer [80]; @@ -949,7 +949,7 @@ configure_group_dialog (ETableConfig *config, GladeXML *gui) GTK_COMBO_BOX (config->group[i].combo), "", ""); snprintf (buffer, sizeof (buffer), "frame-group-%d", i + 1); - config->group [i].frames = + config->group [i].frames = glade_xml_get_widget (gui, buffer); snprintf ( @@ -969,11 +969,11 @@ configure_group_dialog (ETableConfig *config, GladeXML *gui) "checkbutton-group-%d", i+1); config->group [i].view_check = glade_xml_get_widget ( gui, buffer); - + config->group [i].e_table_config = config; } - + for (l = config->column_names; l; l = l->next){ char *label = l->data; @@ -1211,7 +1211,7 @@ setup_gui (ETableConfig *config) g_free (filename); g_object_unref (global_store); - + config->dialog_toplevel = glade_xml_get_widget ( gui, "e-table-config"); @@ -1284,7 +1284,7 @@ e_table_config_construct (ETableConfig *config, g_return_val_if_fail (header != NULL, NULL); g_return_val_if_fail (spec != NULL, NULL); g_return_val_if_fail (state != NULL, NULL); - + config->source_spec = spec; config->source_state = state; config->header = g_strdup (header); @@ -1314,7 +1314,7 @@ e_table_config_construct (ETableConfig *config, config_sort_info_update (config); config_group_info_update (config); config_fields_info_update (config); - + return E_TABLE_CONFIG (config); } diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h index 1ece37aabf..ca81b5bb6d 100644 --- a/widgets/table/e-table-config.h +++ b/widgets/table/e-table-config.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-config.h * Copyright 2000, 2001, Ximian, Inc. * @@ -49,7 +49,7 @@ typedef struct { GtkWidget *view_check; /* Only for group dialog */ guint changed_id, toggled_id; void *e_table_config; -} ETableConfigSortWidgets; +} ETableConfigSortWidgets; typedef struct { diff --git a/widgets/table/e-table-defines.h b/widgets/table/e-table-defines.h index 71b59202e5..7048cfa8fa 100644 --- a/widgets/table/e-table-defines.h +++ b/widgets/table/e-table-defines.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-defines.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-example-1.c b/widgets/table/e-table-example-1.c index f482062c9e..d4fefa27ef 100644 --- a/widgets/table/e-table-example-1.c +++ b/widgets/table/e-table-example-1.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-example-1.c * Copyright 2000, 2001, Ximian, Inc. * @@ -42,16 +42,16 @@ * the ETableSimple class. Instead of creating your own ETableModel * class, you simply create a new object of the ETableSimple class. You * give it a bunch of functions that act as callbacks. - * + * * You also get to pass a void * to ETableSimple and it gets passed to * your callbacks. This would be for having multiple models of the same * type. This is just an example though, so we statically define all the * data and ignore the void *data parameter. - * + * * In our example we will be creating a table model with 6 columns and 10 * rows. This corresponds to having 6 different types of information and * 10 different sets of data in our database. - * + * * The headers will be hard coded, as will be the example data. * */ @@ -219,7 +219,7 @@ create_table (void) e_table_model = e_table_simple_new ( my_col_count, my_row_count, my_value_at, my_set_value_at, my_is_cell_editable, - my_duplicate_value, my_free_value, + my_duplicate_value, my_free_value, my_initialize_value, my_value_is_empty, my_value_to_string, NULL); @@ -234,7 +234,7 @@ create_table (void) * First we create the header. */ e_table_header = e_table_header_new (); - + /* * Next we have to build renderers for all of the columns. * Since all our columns are text columns, we can simply use @@ -243,7 +243,7 @@ create_table (void) * each column. */ cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT); - + /* * Next we create a column object for each view column and add * them to the header. We don't create a column object for @@ -299,7 +299,7 @@ main (int argc, char *argv []) gtk_widget_push_colormap (gdk_rgb_get_cmap ()); create_table (); - + gtk_main (); e_cursors_shutdown (); diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c index 17126e7572..328be5fcde 100644 --- a/widgets/table/e-table-example-2.c +++ b/widgets/table/e-table-example-2.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-example-2.c * Copyright 2000, 2001, Ximian, Inc. * @@ -165,7 +165,7 @@ my_value_at (ETableModel *etc, int col, int row, void *data) static void my_set_value_at (ETableModel *etc, int col, int row, const void *val, void *data) { - if (col == COLOR_COLUMN){ + if (col == COLOR_COLUMN){ } else if (col == IMPORTANCE_COLUMN){ importance_data[row] = (gboolean) val; } else { @@ -280,14 +280,14 @@ create_table () First we create the header. */ e_table_header = e_table_header_new (); - + /* Next we have to build renderers for all of the columns. Since all our columns are text columns, we can simply use the same renderer over and over again. If we had different types of columns, we could use a different renderer for each column. */ cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT); - + /* Next we create a column object for each view column and add them to the header. We don't create a column object for the importance column since it will not be shown. */ @@ -300,7 +300,7 @@ create_table () /* Add it to the header. */ e_table_header_add_column (e_table_header, ecol, i); } - + /* Next we add a special column for the check box. */ cell_checkbox = e_cell_checkbox_new (); @@ -343,7 +343,7 @@ main (int argc, char *argv []) gtk_widget_push_colormap (gdk_rgb_get_cmap ()); create_table (); - + gtk_main (); e_cursors_shutdown (); diff --git a/widgets/table/e-table-extras.h b/widgets/table/e-table-extras.h index f0ae91eefc..78cdccf918 100644 --- a/widgets/table/e-table-extras.h +++ b/widgets/table/e-table-extras.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-extras.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c index b56096f4a4..eeb34dd6ef 100644 --- a/widgets/table/e-table-field-chooser-dialog.c +++ b/widgets/table/e-table-field-chooser-dialog.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-field-chooser-dialog.c * Copyright 2000, 2001, Ximian, Inc. * @@ -101,13 +101,13 @@ e_table_field_chooser_dialog_init (ETableFieldChooserDialog *e_table_field_choos widget = e_table_field_chooser_new(); e_table_field_chooser_dialog->etfc = E_TABLE_FIELD_CHOOSER(widget); - + g_object_set(widget, "dnd_code", e_table_field_chooser_dialog->dnd_code, "full_header", e_table_field_chooser_dialog->full_header, "header", e_table_field_chooser_dialog->header, NULL); - + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(e_table_field_chooser_dialog)->vbox), widget, TRUE, TRUE, 0); diff --git a/widgets/table/e-table-field-chooser-dialog.h b/widgets/table/e-table-field-chooser-dialog.h index 930c68f1af..32012e4494 100644 --- a/widgets/table/e-table-field-chooser-dialog.h +++ b/widgets/table/e-table-field-chooser-dialog.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-field-chooser-dialog.h * Copyright 2000, 2001, Ximian, Inc. * @@ -54,7 +54,7 @@ typedef struct _ETableFieldChooserDialogClass ETableFieldChooserDialogClass; struct _ETableFieldChooserDialog { GtkDialog parent; - + /* item specific fields */ ETableFieldChooser *etfc; gchar *dnd_code; diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index d7da7e89da..e5d3afc201 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -171,10 +171,10 @@ etfci_reflow (GnomeCanvasItem *item, gint flags) } etfci->height = height; - + if (old_height != etfci->height) e_canvas_item_request_parent_reflow(item); - + gnome_canvas_item_request_update(item); } @@ -184,7 +184,7 @@ etfci_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flag ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item); double i2c [6]; ArtPoint c1, c2, i1, i2; - + if (GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->update) (*GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->update)(item, affine, clip_path, flags); @@ -230,7 +230,7 @@ static void etfci_drop_full_header (ETableFieldChooserItem *etfci) { GObject *header; - + if (!etfci->full_header) return; @@ -249,7 +249,7 @@ etfci_drop_full_header (ETableFieldChooserItem *etfci) e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(etfci)); } -static void +static void full_header_structure_changed (ETableHeader *header, ETableFieldChooserItem *etfci) { e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(etfci)); @@ -280,7 +280,7 @@ static void etfci_drop_table_header (ETableFieldChooserItem *etfci) { GObject *header; - + if (!etfci->header) return; @@ -299,7 +299,7 @@ etfci_drop_table_header (ETableFieldChooserItem *etfci) e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(etfci)); } -static void +static void table_header_structure_changed (ETableHeader *header, ETableFieldChooserItem *etfci) { e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(etfci)); @@ -404,7 +404,7 @@ etfci_drag_data_get (GtkWidget *widget, } static void -etfci_drag_end (GtkWidget *canvas, +etfci_drag_end (GtkWidget *canvas, GdkDragContext *context, ETableFieldChooserItem *etfci) { @@ -444,7 +444,7 @@ etfci_unrealize (GnomeCanvasItem *item) etfci->drag_end_id = 0; g_signal_handler_disconnect (item->canvas, etfci->drag_data_get_id); etfci->drag_data_get_id = 0; - + if (GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->unrealize) (*GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->unrealize)(item); } @@ -478,7 +478,7 @@ etfci_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int widt continue; y2 += e_table_header_compute_height (ecol, GTK_WIDGET (canvas)); - + if (y1 > (y + height)) break; @@ -582,7 +582,7 @@ etfci_event (GnomeCanvasItem *item, GdkEvent *e) ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item); GnomeCanvas *canvas = item->canvas; int x, y; - + switch (e->type){ case GDK_MOTION_NOTIFY: gnome_canvas_w2c (canvas, e->motion.x, e->motion.y, &x, &y); @@ -590,22 +590,22 @@ etfci_event (GnomeCanvasItem *item, GdkEvent *e) if (etfci_maybe_start_drag (etfci, x, y)) etfci_start_drag (etfci, e, x, y); break; - + case GDK_BUTTON_PRESS: gnome_canvas_w2c (canvas, e->button.x, e->button.y, &x, &y); - + if (e->button.button == 1){ etfci->click_x = x; etfci->click_y = y; etfci->maybe_drag = TRUE; } break; - + case GDK_BUTTON_RELEASE: { etfci->maybe_drag = FALSE; break; } - + default: return FALSE; } @@ -671,7 +671,7 @@ etfci_init (ETableFieldChooserItem *etfci) etfci->full_header = NULL; etfci->header = NULL; etfci->combined_header = NULL; - + etfci->height = etfci->width = 0; etfci->font_desc = NULL; diff --git a/widgets/table/e-table-field-chooser-item.h b/widgets/table/e-table-field-chooser-item.h index 374df211a5..f2e97750f5 100644 --- a/widgets/table/e-table-field-chooser-item.h +++ b/widgets/table/e-table-field-chooser-item.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-field-chooser-item.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c index e3031072f6..67fd47708b 100644 --- a/widgets/table/e-table-field-chooser.c +++ b/widgets/table/e-table-field-chooser.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-field-chooser.c * Copyright 2000, 2001, Ximian, Inc. * @@ -95,7 +95,7 @@ ensure_nonzero_step_increments (ETableFieldChooser *etfc) /* it looks pretty complicated to get height of column header so use 16 pixels which should be OK - */ + */ if (va) va->step_increment = 16.0; if (ha) @@ -134,7 +134,7 @@ static void resize(GnomeCanvas *canvas, ETableFieldChooser *etfc) gnome_canvas_item_set( etfc->rect, "x2", (double) etfc->last_alloc.width, "y2", (double) height, - NULL ); + NULL ); ensure_nonzero_step_increments (etfc); } @@ -206,7 +206,7 @@ e_table_field_chooser_dispose (GObject *object) if (etfc->full_header) g_object_unref (etfc->full_header); etfc->full_header = NULL; - + if (etfc->header) g_object_unref (etfc->header); etfc->header = NULL; diff --git a/widgets/table/e-table-field-chooser.h b/widgets/table/e-table-field-chooser.h index 992ed189b4..f6dca643d7 100644 --- a/widgets/table/e-table-field-chooser.h +++ b/widgets/table/e-table-field-chooser.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-field-chooser.h * Copyright 2000, 2001, Ximian, Inc. * @@ -51,7 +51,7 @@ typedef struct _ETableFieldChooserClass ETableFieldChooserClass; struct _ETableFieldChooser { GtkVBox parent; - + /* item specific fields */ GladeXML *gui; GnomeCanvas *canvas; diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c index 114bcbfc04..57dd2d18a8 100644 --- a/widgets/table/e-table-group-container.c +++ b/widgets/table/e-table-group-container.c @@ -128,7 +128,7 @@ etgc_dispose (GObject *object) G_OBJECT_CLASS (etgc_parent_class)->dispose (object); } -/** +/** * e_table_group_container_construct * @parent: The %GnomeCanvasGroup to create a child of. * @etgc: The %ETableGroupContainer. @@ -168,7 +168,7 @@ e_table_group_container_construct (GnomeCanvasGroup *parent, ETableGroupContaine etgc->open = TRUE; } -/** +/** * e_table_group_container_new * @parent: The %GnomeCanvasGroup to create a child of. * @full_header: The full header of the %ETable. @@ -191,7 +191,7 @@ e_table_group_container_new (GnomeCanvasGroup *parent, ETableHeader *full_header ETableGroupContainer *etgc; g_return_val_if_fail (parent != NULL, NULL); - + etgc = g_object_new (E_TABLE_GROUP_CONTAINER_TYPE, NULL); e_table_group_container_construct (parent, etgc, full_header, header, @@ -213,8 +213,8 @@ etgc_event (GnomeCanvasItem *item, GdkEvent *event) switch (event->type) { case GDK_KEY_PRESS: - if (event->key.keyval == GDK_Tab || - event->key.keyval == GDK_KP_Tab || + if (event->key.keyval == GDK_Tab || + event->key.keyval == GDK_KP_Tab || event->key.keyval == GDK_ISO_Left_Tab) { change_focus = TRUE; use_col = TRUE; @@ -248,7 +248,7 @@ etgc_event (GnomeCanvasItem *item, GdkEvent *event) use_col = FALSE; direction = E_FOCUS_START; } - if (change_focus){ + if (change_focus){ GList *list; for (list = etgc->children; list; list = list->next) { ETableGroupContainerChildNode *child_node; @@ -263,12 +263,12 @@ etgc_event (GnomeCanvasItem *item, GdkEvent *event) old_col = 0; if (start_col == -1) start_col = e_table_header_count (e_table_group_get_header (child)) - 1; - + if (direction == E_FOCUS_END) list = list->prev; else list = list->next; - + if (list) { child_node = (ETableGroupContainerChildNode *)list->data; child = child_node->child; @@ -311,7 +311,7 @@ etgc_event (GnomeCanvasItem *item, GdkEvent *event) return GNOME_CANVAS_ITEM_CLASS (etgc_parent_class)->event (item, event); } return return_val; - + } /* Realize handler for the text item */ @@ -354,7 +354,7 @@ compute_text (ETableGroupContainer *etgc, ETableGroupContainerChildNode *child_n child_node->string, (gint) child_node->count); } - gnome_canvas_item_set (child_node->text, + gnome_canvas_item_set (child_node->text, "text", text, NULL); g_free (text); @@ -848,7 +848,7 @@ etgc_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *ps case PROP_HEIGHT: g_value_set_double (value, etgc->height); break; - case PROP_WIDTH: + case PROP_WIDTH: g_value_set_double (value, etgc->width); break; case PROP_MINIMUM_WIDTH: @@ -894,7 +894,7 @@ etgc_class_init (ETableGroupContainerClass *klass) g_object_class_install_property (object_class, PROP_TABLE_ALTERNATING_ROW_COLORS, g_param_spec_boolean ("alternating_row_colors", _( "Alternating Row Colors" ), - _( "Alternating Row Colors" ), + _( "Alternating Row Colors" ), FALSE, G_PARAM_WRITABLE)); @@ -988,14 +988,14 @@ etgc_reflow (GnomeCanvasItem *item, gint flags) if (frozen) return; - + if (GTK_OBJECT_FLAGS(etgc)& GNOME_CANVAS_ITEM_REALIZED){ gdouble running_height = 0; gdouble running_width = 0; gdouble old_height; gdouble old_width; - + old_height = etgc->height; old_width = etgc->width; if (etgc->children == NULL){ @@ -1004,7 +1004,7 @@ etgc_reflow (GnomeCanvasItem *item, gint flags) gdouble extra_height = 0; gdouble item_height = 0; gdouble item_width = 0; - + if (etgc->font_desc) { PangoContext *context; PangoFontMetrics *metrics; @@ -1017,15 +1017,15 @@ etgc_reflow (GnomeCanvasItem *item, gint flags) BUTTON_PADDING * 2; pango_font_metrics_unref (metrics); } - + extra_height = MAX(extra_height, BUTTON_HEIGHT + BUTTON_PADDING * 2); - + running_height = extra_height; - + for ( list = etgc->children; list; list = g_list_next (list)){ ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data; ETableGroup *child = child_node->child; - + g_object_get (child, "width", &item_width, NULL); @@ -1039,22 +1039,22 @@ etgc_reflow (GnomeCanvasItem *item, gint flags) g_object_get (child, "height", &item_height, NULL); - + e_canvas_item_move_absolute (GNOME_CANVAS_ITEM(child_node->text), GROUP_INDENT, running_height - BUTTON_PADDING); - + e_canvas_item_move_absolute (GNOME_CANVAS_ITEM(child), GROUP_INDENT, running_height); - + gnome_canvas_item_set (GNOME_CANVAS_ITEM(child_node->rect), "x1", (double) 0, "x2", (double) running_width + GROUP_INDENT, "y1", (double) running_height - extra_height, "y2", (double) running_height + item_height, NULL); - + running_height += item_height + extra_height; } running_height -= extra_height; @@ -1142,7 +1142,7 @@ e_table_group_container_print_page (EPrintable *ep, gdouble height, gboolean quantize, ETGCPrintContext *groupcontext) -{ +{ cairo_t *cr; gdouble yd = height; gdouble child_height; @@ -1156,7 +1156,7 @@ e_table_group_container_print_page (EPrintable *ep, child_printable = groupcontext->child_printable; child = groupcontext->child; yd = 6.5 * 72; - height = 5 * 72; + height = 5 * 72; if (child_printable) { if (child) @@ -1185,7 +1185,7 @@ e_table_group_container_print_page (EPrintable *ep, pango_font_description_free (desc); while (1) { - child_height = e_printable_height(child_printable, context, width,yd + 2 * TEXT_AREA_HEIGHT, quantize); + child_height = e_printable_height(child_printable, context, width,yd + 2 * TEXT_AREA_HEIGHT, quantize); cr = gtk_print_context_get_cairo_context (context); cairo_save (cr); cairo_rectangle (cr, 0, 0, width,TEXT_AREA_HEIGHT); @@ -1198,7 +1198,7 @@ e_table_group_container_print_page (EPrintable *ep, cairo_rectangle (cr, 0, 0, width, TEXT_AREA_HEIGHT); cairo_clip (cr); cairo_restore (cr); - + cairo_move_to(cr, 0, 0); if (groupcontext->etgc->ecol->text) string = g_strdup_printf ("%s : %s (%d item%s)", @@ -1214,13 +1214,13 @@ e_table_group_container_print_page (EPrintable *ep, pango_layout_set_text (layout, string, -1); pango_cairo_show_layout (cr, layout); g_free(string); - + cairo_translate(cr, 2 * TEXT_AREA_HEIGHT, TEXT_AREA_HEIGHT) ; cairo_move_to(cr, 0, 0); cairo_rectangle (cr, 0, 0, width - 2 * TEXT_AREA_HEIGHT,child_height); cairo_clip(cr); - - e_printable_print_page (child_printable, context, width-2 * TEXT_AREA_HEIGHT, 0, quantize); + + e_printable_print_page (child_printable, context, width-2 * TEXT_AREA_HEIGHT, 0, quantize); yd += child_height + TEXT_AREA_HEIGHT; if (e_printable_data_left(child_printable)) @@ -1301,7 +1301,7 @@ e_table_group_container_height (EPrintable *ep, if (yd != -1 && yd < TEXT_AREA_HEIGHT) return 0; - + while (1) { child_height = e_printable_height(child_printable, context, width - 36, yd - (yd == -1 ? 0 : TEXT_AREA_HEIGHT), quantize); @@ -1319,7 +1319,7 @@ e_table_group_container_height (EPrintable *ep, if (!child) { break; } - + child_node = child->data; if (child_printable) g_object_unref (child_printable); @@ -1366,27 +1366,27 @@ e_table_group_container_will_fit (EPrintable *ep, e_printable_reset(child_printable); } } - + if (yd != -1 && yd < TEXT_AREA_HEIGHT) will_fit = FALSE; else { while (1) { child_height = e_printable_height(child_printable, context, width - 36, yd - (yd == -1 ? 0 : TEXT_AREA_HEIGHT), quantize); - + if (yd != -1) { if (!e_printable_will_fit(child_printable, context, width - 36, yd - (yd == -1 ? 0 : TEXT_AREA_HEIGHT), quantize)) { will_fit = FALSE; break; } - + yd += child_height + TEXT_AREA_HEIGHT; } - + child = child->next; if (!child) { break; } - + child_node = child->data; if (child_printable) g_object_unref (child_printable); @@ -1407,7 +1407,7 @@ e_table_group_container_will_fit (EPrintable *ep, static void e_table_group_container_printable_destroy (gpointer data, GObject *where_object_was) - + { ETGCPrintContext *groupcontext = data; diff --git a/widgets/table/e-table-group-container.h b/widgets/table/e-table-group-container.h index a4f203b596..999e5a154e 100644 --- a/widgets/table/e-table-group-container.h +++ b/widgets/table/e-table-group-container.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-group-container.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c index 17dabeaee3..c21a5ffcbd 100644 --- a/widgets/table/e-table-group-leaf.c +++ b/widgets/table/e-table-group-leaf.c @@ -570,7 +570,7 @@ etgl_class_init (ETableGroupLeafClass *klass) g_object_class_install_property (object_class, PROP_TABLE_ALTERNATING_ROW_COLORS, g_param_spec_boolean ("alternating_row_colors", _( "Alternating Row Colors" ), - _( "Alternating Row Colors" ), + _( "Alternating Row Colors" ), FALSE, G_PARAM_WRITABLE)); diff --git a/widgets/table/e-table-group-leaf.h b/widgets/table/e-table-group-leaf.h index b7139d98c5..1a8a3ebb3d 100644 --- a/widgets/table/e-table-group-leaf.h +++ b/widgets/table/e-table-group-leaf.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-group-leaf.h * Copyright 2000, 2001, Ximian, Inc. * @@ -40,7 +40,7 @@ G_BEGIN_DECLS typedef struct { ETableGroup group; - /* + /* * Item. */ ETableItem *item; diff --git a/widgets/table/e-table-group.h b/widgets/table/e-table-group.h index ec57184c26..a7993dc6f8 100644 --- a/widgets/table/e-table-group.h +++ b/widgets/table/e-table-group.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-group.h * Copyright 2000, 2001, Ximian, Inc. * @@ -48,7 +48,7 @@ typedef struct { */ ETableHeader *full_header; ETableHeader *header; - + /* * The model we pull data from. */ @@ -61,7 +61,7 @@ typedef struct { guint transparent : 1; guint has_focus : 1; - + guint frozen : 1; } ETableGroup; diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index a477f127ae..70e56a1933 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -85,7 +85,7 @@ static void ethi_drop_table_header (ETableHeaderItem *ethi); /* * They display the arrows for the drop location. */ - + static GtkWidget *arrow_up, *arrow_down; /* @@ -148,7 +148,7 @@ ethi_dispose (GObject *object){ if (ethi->config) g_object_unref (ethi->config); ethi->config = NULL; - + if (G_OBJECT_CLASS (ethi_parent_class)->dispose) (*G_OBJECT_CLASS (ethi_parent_class)->dispose) (object); } @@ -162,7 +162,7 @@ e_table_header_item_get_height (ETableHeaderItem *ethi) g_return_val_if_fail (ethi != NULL, 0); g_return_val_if_fail (E_IS_TABLE_HEADER_ITEM (ethi), 0); - + eth = ethi->eth; numcols = e_table_header_count (eth); @@ -186,10 +186,10 @@ static void ethi_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags) { ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item); - + double i2c [6]; ArtPoint c1, c2, i1, i2; - + if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->update) (*GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->update)(item, affine, clip_path, flags); @@ -242,7 +242,7 @@ static void ethi_drop_table_header (ETableHeaderItem *ethi) { GObject *header; - + if (!ethi->eth) return; @@ -255,7 +255,7 @@ ethi_drop_table_header (ETableHeaderItem *ethi) ethi->width = 0; } -static void +static void structure_changed (ETableHeader *header, ETableHeaderItem *ethi) { gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(ethi)); @@ -395,11 +395,11 @@ ethi_find_col_by_x (ETableHeaderItem *ethi, int x) const int cols = e_table_header_count (ethi->eth); int x1 = 0; int col; - + d(g_print ("%s:%d: x = %d, x1 = %d\n", __FUNCTION__, __LINE__, x, x1)); x1 += ethi->group_indent_width; - + if (x < x1) { d(g_print ("%s:%d: Returning 0\n", __FUNCTION__, __LINE__)); return 0; @@ -427,7 +427,7 @@ ethi_find_col_by_x_nearest (ETableHeaderItem *ethi, int x) int col; x1 += ethi->group_indent_width; - + if (x < x1) return 0; @@ -452,7 +452,7 @@ ethi_remove_drop_marker (ETableHeaderItem *ethi) gtk_widget_hide (arrow_up); gtk_widget_hide (arrow_down); - + ethi->drag_mark = -1; } @@ -463,7 +463,7 @@ make_shaped_window_from_xpm (const char **xpm) GdkPixmap *pixmap; GdkBitmap *bitmap; GtkWidget *win, *pix; - + pixbuf = gdk_pixbuf_new_from_xpm_data (xpm); gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &bitmap, 128); g_object_unref (pixbuf); @@ -476,10 +476,10 @@ make_shaped_window_from_xpm (const char **xpm) gtk_container_add (GTK_CONTAINER (win), pix); gtk_widget_shape_combine_mask (win, bitmap, 0, 0); gtk_widget_pop_colormap (); - + g_object_unref (pixmap); g_object_unref (bitmap); - + return win; } @@ -488,7 +488,7 @@ ethi_add_drop_marker (ETableHeaderItem *ethi, int col, gboolean recreate) { int rx, ry; int x; - + if (!recreate && ethi->drag_mark == col) return; @@ -497,7 +497,7 @@ ethi_add_drop_marker (ETableHeaderItem *ethi, int col, gboolean recreate) x = e_table_header_col_diff (ethi->eth, 0, col); if (col > 0) x += ethi->group_indent_width; - + if (!arrow_up){ arrow_up = make_shaped_window_from_xpm (arrow_up_xpm); arrow_down = make_shaped_window_from_xpm (arrow_down_xpm); @@ -526,18 +526,18 @@ static void ethi_add_destroy_marker (ETableHeaderItem *ethi) { double x1; - + if (ethi->remove_item) gtk_object_destroy (GTK_OBJECT (ethi->remove_item)); if (!ethi->stipple) ethi->stipple = gdk_bitmap_create_from_data ( NULL, gray50_bits, gray50_width, gray50_height); - + x1 = (double) e_table_header_col_diff (ethi->eth, 0, ethi->drag_col); if (ethi->drag_col > 0) x1 += ethi->group_indent_width; - + ethi->remove_item = gnome_canvas_item_new ( GNOME_CANVAS_GROUP (GNOME_CANVAS_ITEM (ethi)->canvas->root), gnome_canvas_rect_get_type (), @@ -557,7 +557,7 @@ ethi_remove_destroy_marker (ETableHeaderItem *ethi) { if (!ethi->remove_item) return; - + gtk_object_destroy (GTK_OBJECT (ethi->remove_item)); ethi->remove_item = NULL; } @@ -595,16 +595,16 @@ do_drag_motion(ETableHeaderItem *ethi, (y >= 0) && (y <= (ethi->height))){ int col; d(g_print("In header\n")); - + col = ethi_find_col_by_x_nearest (ethi, x); if (ethi->drag_col != -1 && (col == ethi->drag_col || col == ethi->drag_col + 1)) { if (ethi->drag_col != -1) ethi_remove_destroy_marker (ethi); - + ethi_remove_drop_marker (ethi); gdk_drag_status (context, context->suggested_action, time); - } + } else if (col != -1){ if (ethi->drag_col != -1) ethi_remove_destroy_marker (ethi); @@ -816,7 +816,7 @@ ethi_drag_data_get (GtkWidget *canvas, { if (ethi->drag_col != -1) { ETableCol *ecol = e_table_header_get_column (ethi->eth, ethi->drag_col); - + gchar *string = g_strdup_printf("%d", ecol->col_idx); gtk_selection_data_set(selection_data, GDK_SELECTION_TYPE_STRING, @@ -840,13 +840,13 @@ ethi_drag_drop (GtkWidget *canvas, if ((x >= 0) && (x <= (ethi->width)) && (y >= 0) && (y <= (ethi->height))){ int col; - + col = ethi_find_col_by_x_nearest (ethi, x); - + ethi_add_drop_marker (ethi, col, FALSE); ethi->drop_col = col; - + if (col != -1) { char *target = g_strdup_printf ("%s-%s", TARGET_ETABLE_COL_TYPE, ethi->dnd_code); d(g_print ("ethi - %s\n", target)); @@ -875,7 +875,7 @@ ethi_realize (GnomeCanvasItem *item) { TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER }, }; - + if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)-> realize) (*GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->realize)(item); @@ -889,7 +889,7 @@ ethi_realize (GnomeCanvasItem *item) gtk_drag_dest_set (GTK_WIDGET (item->canvas), 0, ethi_drop_types, ELEMENTS (ethi_drop_types), GDK_ACTION_MOVE); - g_free(ethi_drop_types[0].target); + g_free(ethi_drop_types[0].target); /* Drop signals */ ethi->drag_motion_id = g_signal_connect (item->canvas, "drag_motion", @@ -930,7 +930,7 @@ ethi_unrealize (GnomeCanvasItem *item) g_object_unref (ethi->stipple); ethi->stipple = NULL; } - + if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->unrealize) (*GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->unrealize)(item); } @@ -951,19 +951,19 @@ ethi_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width int i; for (i = 0; i < length; i++) { ETableSortColumn column = e_table_sort_info_grouping_get_nth(ethi->sort_info, i); - g_hash_table_insert (arrows, + g_hash_table_insert (arrows, GINT_TO_POINTER ((gint) column.column), GINT_TO_POINTER (column.ascending ? - E_TABLE_COL_ARROW_DOWN : + E_TABLE_COL_ARROW_DOWN : E_TABLE_COL_ARROW_UP)); } length = e_table_sort_info_sorting_get_count(ethi->sort_info); for (i = 0; i < length; i++) { ETableSortColumn column = e_table_sort_info_sorting_get_nth(ethi->sort_info, i); - g_hash_table_insert (arrows, + g_hash_table_insert (arrows, GINT_TO_POINTER ((gint) column.column), GINT_TO_POINTER (column.ascending ? - E_TABLE_COL_ARROW_DOWN : + E_TABLE_COL_ARROW_DOWN : E_TABLE_COL_ARROW_UP)); } } @@ -976,9 +976,9 @@ ethi_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width int col_width; col_width = ecol->width; - + x2 += col_width; - + if (x1 > (x + width)) break; @@ -1029,7 +1029,7 @@ is_pointer_on_division (ETableHeaderItem *ethi, int pos, int *the_total, int *re if (col == 0) total += ethi->group_indent_width; - + total += ecol->width; if ((total - TOLERANCE < pos)&& (pos < total + TOLERANCE)){ @@ -1058,7 +1058,7 @@ set_cursor (ETableHeaderItem *ethi, int pos) int col; GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas); gboolean resizable = FALSE; - + /* We might be invoked before we are realized */ if (!canvas->window) return; @@ -1084,7 +1084,7 @@ set_cursor (ETableHeaderItem *ethi, int pos) } } } - + if (resizable) e_cursor_set (canvas->window, E_CURSOR_SIZE_X); else @@ -1111,7 +1111,7 @@ ethi_maybe_start_drag (ETableHeaderItem *ethi, GdkEventMotion *event) ethi->maybe_drag = FALSE; return FALSE; } - + if (MAX (abs (ethi->click_x - event->x), abs (ethi->click_y - event->y)) <= 3) return FALSE; @@ -1149,10 +1149,10 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event) ethi->sort_info, i); group_indent ++; g_hash_table_insert ( - arrows, + arrows, GINT_TO_POINTER ((gint) column.column), GINT_TO_POINTER (column.ascending ? - E_TABLE_COL_ARROW_DOWN : + E_TABLE_COL_ARROW_DOWN : E_TABLE_COL_ARROW_UP)); } length = e_table_sort_info_sorting_get_count(ethi->sort_info); @@ -1162,10 +1162,10 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event) ethi->sort_info, i); g_hash_table_insert ( - arrows, + arrows, GINT_TO_POINTER ((gint) column.column), GINT_TO_POINTER (column.ascending ? - E_TABLE_COL_ARROW_DOWN : + E_TABLE_COL_ARROW_DOWN : E_TABLE_COL_ARROW_UP)); } } @@ -1363,15 +1363,15 @@ ethi_popup_field_chooser(GtkWidget *widget, EthiHeaderInfo *info) if (etfcd) { gtk_window_present (GTK_WINDOW (etfcd)); - + return; } - + info->ethi->etfcd.widget = e_table_field_chooser_dialog_new (); etfcd = info->ethi->etfcd.widget; g_object_add_weak_pointer (G_OBJECT (etfcd), &info->ethi->etfcd.pointer); - + g_object_set (info->ethi->etfcd.widget, "full_header", info->ethi->full_header, "header", info->ethi->eth, @@ -1397,7 +1397,7 @@ ethi_popup_best_fit(GtkWidget *widget, EthiHeaderInfo *info) info->col, &width); /* Add 10 to stop it from "..."ing */ e_table_header_set_size (ethi->eth, info->col, width + 10); - + gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(ethi)); } @@ -1435,7 +1435,7 @@ ethi_popup_customize_view(GtkWidget *widget, EthiHeaderInfo *info) ETableHeaderItem *ethi = info->ethi; ETableState *state; ETableSpecification *spec; - + if (ethi->config) e_table_config_raise (E_TABLE_CONFIG (ethi->config)); else { @@ -1526,7 +1526,7 @@ ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event) ETableSortColumn column; gboolean ascending = TRUE; d( g_print("ethi_header_context_menu: \n") ); - + info->ethi = ethi; info->col = ethi_find_col_by_x (ethi, event->x); col = e_table_header_get_column (ethi->eth, info->col); @@ -1534,11 +1534,11 @@ ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event) popup = e_popup_menu_create_with_domain (ethi_context_menu, 1 + 0 + - ((ethi->table || ethi->tree) ? 0 : 4) + + ((ethi->table || ethi->tree) ? 0 : 4) + ((e_table_header_count (ethi->eth) > 1) ? 0 : 8), ((e_table_sort_info_get_can_group (ethi->sort_info)) ? 0 : 16) + 128, info, GETTEXT_PACKAGE); - + menu_item = gtk_menu_item_new_with_label (_("Sort By")); gtk_widget_show (menu_item); sub_menu = gtk_menu_new (); @@ -1555,7 +1555,7 @@ ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event) sort_col = column.column; ascending = column.ascending; } - + /* Custom */ menu_item = gtk_check_menu_item_new_with_label (_("Custom")); gtk_widget_show (menu_item); @@ -1564,7 +1564,7 @@ ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event) gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), TRUE); gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (menu_item), TRUE); g_signal_connect (menu_item, "activate", G_CALLBACK (popup_custom), info); - + /* Show a seperator */ menu_item = gtk_separator_menu_item_new (); gtk_widget_show (menu_item); @@ -1577,17 +1577,17 @@ ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event) if (!ethi->full_header->columns[ncol]->sortable || ethi->full_header->columns[ncol]->disabled) continue; - + if (ncol == sort_col) { text = g_strdup_printf("%s (%s)", ethi->full_header->columns[ncol]->text, ascending ? _("Ascending"):_("Descending")); menu_item = gtk_check_menu_item_new_with_label (text); g_free (text); } else menu_item = gtk_check_menu_item_new_with_label (ethi->full_header->columns[ncol]->text); - + gtk_widget_show (menu_item); gtk_menu_shell_prepend (GTK_MENU_SHELL (sub_menu), menu_item); - + if (ncol == sort_col) gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), TRUE); gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (menu_item), TRUE); @@ -1615,13 +1615,13 @@ ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col) int length; int i; gboolean found = FALSE; - + if (col == NULL) return; if (col->sortable) model_col = col->col_idx; - + length = e_table_sort_info_grouping_get_count(ethi->sort_info); for (i = 0; i < length; i++) { ETableSortColumn column = e_table_sort_info_grouping_get_nth(ethi->sort_info, i); @@ -1635,7 +1635,7 @@ ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col) break; } } - + if (!found) { length = e_table_sort_info_sorting_get_count(ethi->sort_info); for (i = 0; i < length; i++) { @@ -1643,7 +1643,7 @@ ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col) if (model_col == column.column || model_col == -1){ int ascending = column.ascending; - + if (ascending == 0 && model_col != -1){ /* * This means the user has clicked twice @@ -1691,7 +1691,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e) const gboolean resizing = ETHI_RESIZING (ethi); int x, y, start, col; int was_maybe_drag = 0; - + switch (e->type){ case GDK_ENTER_NOTIFY: convert (canvas, e->crossing.x, e->crossing.y, &x, &y); @@ -1702,17 +1702,17 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e) gdk_window_set_cursor (GTK_WIDGET (canvas)->window, NULL); /* e_cursor_set (GTK_WIDGET (canvas)->window, E_CURSOR_ARROW);*/ break; - + case GDK_MOTION_NOTIFY: convert (canvas, e->motion.x, e->motion.y, &x, &y); if (resizing){ int new_width; - + if (ethi->resize_guide == NULL){ /* Quick hack until I actually bind the views */ ethi->resize_guide = GINT_TO_POINTER (1); - + gnome_canvas_item_grab (item, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, @@ -1730,16 +1730,16 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e) } else set_cursor (ethi, x); break; - + case GDK_BUTTON_PRESS: if (e->button.button > 3) return FALSE; convert (canvas, e->button.x, e->button.y, &x, &y); - + if (is_pointer_on_division (ethi, x, &start, &col) && e->button.button == 1){ ETableCol *ecol; - + /* * Record the important bits. * @@ -1748,7 +1748,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e) * other event handlers). */ ecol = e_table_header_get_column (ethi->eth, col); - + if (!ecol->resizable) break; ethi->resize_col = col; @@ -1769,11 +1769,11 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e) ethi_button_pressed (ethi, &e->button); } break; - + case GDK_2BUTTON_PRESS: if (!resizing) break; - + if (e->button.button != 1) break; else { @@ -1788,12 +1788,12 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e) ethi->maybe_drag = FALSE; } break; - + case GDK_BUTTON_RELEASE: { gboolean needs_ungrab = FALSE; - + was_maybe_drag = ethi->maybe_drag; - + ethi->maybe_drag = FALSE; if (ethi->resize_col != -1){ @@ -1801,11 +1801,11 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e) ethi_end_resize (ethi); } else if (was_maybe_drag && ethi->sort_info) { ETableCol *ecol; - + ecol = e_table_header_get_column (ethi->eth, ethi_find_col_by_x (ethi, e->button.x)); ethi_change_sort_state (ethi, ecol); } - + if (needs_ungrab) gnome_canvas_item_ungrab (item, e->button.time); @@ -1816,15 +1816,15 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e) EthiHeaderInfo *info = g_new(EthiHeaderInfo, 1); ETableCol *ecol; GtkMenu *popup; - + info->ethi = ethi; info->col = ethi->selected_col; ecol = e_table_header_get_column (ethi->eth, info->col); - + popup = e_popup_menu_create_with_domain (ethi_context_menu, 1 + (ecol->sortable ? 0 : 2) + - ((ethi->table || ethi->tree) ? 0 : 4) + + ((ethi->table || ethi->tree) ? 0 : 4) + ((e_table_header_count (ethi->eth) > 1) ? 0 : 8), ((e_table_sort_info_get_can_group (ethi->sort_info)) ? 0 : 16) + 128, info, GETTEXT_PACKAGE); @@ -1834,7 +1834,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e) e_popup_menu (popup, NULL); } else if (e->key.keyval == GDK_space) { ETableCol *ecol; - + ecol = e_table_header_get_column (ethi->eth, ethi->selected_col); ethi_change_sort_state (ethi, ecol); } else if ((e->key.keyval == GDK_Right) || (e->key.keyval == GDK_KP_Right)) { @@ -1842,7 +1842,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e) if ((ethi->selected_col < 0) || (ethi->selected_col >= ethi->eth->col_count - 1)) ethi->selected_col = 0; - else + else ethi->selected_col++; ecol = e_table_header_get_column (ethi->eth, ethi->selected_col); ethi_change_sort_state (ethi, ecol); @@ -1851,13 +1851,13 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e) if ((ethi->selected_col <= 0) || (ethi->selected_col >= ethi->eth->col_count)) ethi->selected_col = ethi->eth->col_count - 1; - else + else ethi->selected_col--; ecol = e_table_header_get_column (ethi->eth, ethi->selected_col); ethi_change_sort_state (ethi, ecol); } break; - + default: return FALSE; } @@ -1966,7 +1966,7 @@ ethi_init (ETableHeaderItem *ethi) ethi->drag_col = -1; ethi->drag_mark = -1; - + ethi->sort_info = NULL; ethi->sort_info_changed_id = 0; diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h index fe3733bbdf..824c6e0178 100644 --- a/widgets/table/e-table-header-item.h +++ b/widgets/table/e-table-header-item.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-header-item.h * Copyright 1999, 2000, 2001, Ximian, Inc. * @@ -55,7 +55,7 @@ typedef struct { int resize_col; int resize_start_pos; int resize_min_width; - + GtkObject *resize_guide; int group_indent_width; @@ -83,7 +83,7 @@ typedef struct { * For column sorting info */ ETableSortInfo *sort_info; - + guint scroll_direction : 4; int last_drop_x; int last_drop_y; diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c index c36e8d11b3..0cc6c65030 100644 --- a/widgets/table/e-table-header-utils.c +++ b/widgets/table/e-table-header-utils.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-header-utils.h * Copyright 2000, 2001, Ximian, Inc. * @@ -232,13 +232,13 @@ make_composite_pixmap (GdkDrawable *drawable, GdkGC *gc, * @str: the string we're drawing, passed in so we can change the layout if it needs eliding. * @max_width: Maximum width in which the string must fit. * @center: Whether to center the string in the available area if it does fit. - * + * * Draws a string, possibly trimming it so that it fits inside the specified * maximum width. If it does not fit, an elision indicator is drawn after the * last character that does fit. **/ static void -e_table_draw_elided_string (GdkDrawable *drawable, GdkGC *gc, GtkWidget *widget, +e_table_draw_elided_string (GdkDrawable *drawable, GdkGC *gc, GtkWidget *widget, int x, int y, PangoLayout *layout, char *str, int max_width, gboolean center) { @@ -317,7 +317,7 @@ e_table_draw_elided_string (GdkDrawable *drawable, GdkGC *gc, GtkWidget *widget, * @button_width: Width for the complete button. * @button_height: Height for the complete button. * @arrow: Arrow type to use as a sort indicator. - * + * * Draws a button suitable for a table header. **/ void @@ -462,7 +462,7 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol, g_object_unref (pixmap); } } else { - e_table_draw_elided_string (drawable, gc, widget, + e_table_draw_elided_string (drawable, gc, widget, inner_x, inner_y, layout, ecol->text, inner_width, TRUE); } diff --git a/widgets/table/e-table-header-utils.h b/widgets/table/e-table-header-utils.h index 2b44309eec..084291c39d 100644 --- a/widgets/table/e-table-header-utils.h +++ b/widgets/table/e-table-header-utils.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-header-utils.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c index 2a4e77014a..535a52c0aa 100644 --- a/widgets/table/e-table-header.c +++ b/widgets/table/e-table-header.c @@ -115,7 +115,7 @@ enqueue (ETableHeader *eth, int column, int width) store = g_new(struct two_ints, 1); store->column = column; store->width = width; - + eth->change_tail = g_slist_last(g_slist_append(eth->change_tail, store)); if (!eth->change_queue) eth->change_queue = eth->change_tail; @@ -139,7 +139,7 @@ eth_do_remove (ETableHeader *eth, int idx, gboolean do_unref) { if (do_unref) g_object_unref (eth->columns [idx]); - + memmove (ð->columns [idx], ð->columns [idx+1], sizeof (ETableCol *) * (eth->col_count - idx - 1)); eth->col_count--; @@ -151,7 +151,7 @@ eth_finalize (GObject *object) ETableHeader *eth = E_TABLE_HEADER (object); const int cols = eth->col_count; int i; - + if (eth->sort_info) { if (eth->sort_info_group_change_id) g_signal_handler_disconnect(G_OBJECT(eth->sort_info), @@ -169,7 +169,7 @@ eth_finalize (GObject *object) g_slist_free(eth->change_queue); eth->change_queue = NULL; } - + /* * Destroy columns */ @@ -214,7 +214,7 @@ eth_set_property (GObject *object, guint prop_id, const GValue *val, GParamSpec eth->sort_info = E_TABLE_SORT_INFO(g_value_get_object (val)); if (eth->sort_info) { g_object_ref(eth->sort_info); - eth->sort_info_group_change_id + eth->sort_info_group_change_id = g_signal_connect(G_OBJECT(eth->sort_info), "group_info_changed", G_CALLBACK(eth_group_info_changed), eth); } @@ -259,21 +259,21 @@ e_table_header_class_init (ETableHeaderClass *klass) g_object_class_install_property ( object_class, PROP_WIDTH, - g_param_spec_double ("width", "Width", "Width", - 0.0, G_MAXDOUBLE, 0.0, - G_PARAM_READWRITE)); + g_param_spec_double ("width", "Width", "Width", + 0.0, G_MAXDOUBLE, 0.0, + G_PARAM_READWRITE)); g_object_class_install_property ( object_class, PROP_WIDTH_EXTRAS, - g_param_spec_double ("width_extras", "Width of Extras", "Width of Extras", - 0.0, G_MAXDOUBLE, 0.0, - G_PARAM_READWRITE)); + g_param_spec_double ("width_extras", "Width of Extras", "Width of Extras", + 0.0, G_MAXDOUBLE, 0.0, + G_PARAM_READWRITE)); g_object_class_install_property ( object_class, PROP_SORT_INFO, - g_param_spec_object ("sort_info", "Sort Info", "Sort Info", + g_param_spec_object ("sort_info", "Sort Info", "Sort Info", E_TABLE_SORT_INFO_TYPE, - G_PARAM_READWRITE)); + G_PARAM_READWRITE)); eth_signals [STRUCTURE_CHANGE] = g_signal_new ("structure_change", @@ -283,23 +283,23 @@ e_table_header_class_init (ETableHeaderClass *klass) (GSignalAccumulator) NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - eth_signals [DIMENSION_CHANGE] = - g_signal_new ("dimension_change", + eth_signals [DIMENSION_CHANGE] = + g_signal_new ("dimension_change", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableHeaderClass, dimension_change), (GSignalAccumulator) NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); - eth_signals [EXPANSION_CHANGE] = - g_signal_new ("expansion_change", + eth_signals [EXPANSION_CHANGE] = + g_signal_new ("expansion_change", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableHeaderClass, expansion_change), (GSignalAccumulator) NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - eth_signals [REQUEST_WIDTH] = + eth_signals [REQUEST_WIDTH] = g_signal_new ("request_width", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, @@ -324,7 +324,7 @@ e_table_header_init (ETableHeader *eth) eth->sort_info_group_change_id = 0; eth->columns = NULL; - + eth->change_queue = NULL; eth->change_tail = NULL; @@ -348,7 +348,7 @@ eth_update_offsets (ETableHeader *eth) { int i; int x = 0; - + for (i = 0; i < eth->col_count; i++){ ETableCol *etc = eth->columns [i]; @@ -378,7 +378,7 @@ eth_do_insert (ETableHeader *eth, int pos, ETableCol *val) * unref it after you add it. * * This function will emit the "structure_change" signal on the @eth object. - * The ETableCol is assumed + * The ETableCol is assumed */ void e_table_header_add_column (ETableHeader *eth, ETableCol *tc, int pos) @@ -397,7 +397,7 @@ e_table_header_add_column (ETableHeader *eth, ETableCol *tc, int pos) * We are the primary owners of the column */ g_object_ref (tc); - + eth_do_insert (eth, pos, tc); enqueue(eth, -1, eth->nominal_width); @@ -464,7 +464,7 @@ e_table_header_count (ETableHeader *eth) return eth->col_count; } -/** +/** * e_table_header_index: * @eth: the ETableHeader to query * @col: the column to fetch. @@ -501,7 +501,7 @@ int e_table_header_get_index_at (ETableHeader *eth, int x_offset) { int i, total; - + g_return_val_if_fail (eth != NULL, 0); g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0); @@ -531,7 +531,7 @@ e_table_header_get_columns (ETableHeader *eth) { ETableCol **ret; int i; - + g_return_val_if_fail (eth != NULL, NULL); g_return_val_if_fail (E_IS_TABLE_HEADER (eth), NULL); @@ -557,7 +557,7 @@ e_table_header_get_selected (ETableHeader *eth) { int i; int selected = 0; - + g_return_val_if_fail (eth != NULL, 0); g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0); @@ -580,7 +580,7 @@ int e_table_header_total_width (ETableHeader *eth) { int total, i; - + g_return_val_if_fail (eth != NULL, 0); g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0); @@ -601,7 +601,7 @@ int e_table_header_min_width (ETableHeader *eth) { int total, i; - + g_return_val_if_fail (eth != NULL, 0); g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0); @@ -626,7 +626,7 @@ void e_table_header_move (ETableHeader *eth, int source_index, int target_index) { ETableCol *old; - + g_return_if_fail (eth != NULL); g_return_if_fail (E_IS_TABLE_HEADER (eth)); g_return_if_fail (source_index >= 0); @@ -641,7 +641,7 @@ e_table_header_move (ETableHeader *eth, int source_index, int target_index) eth_do_remove (eth, source_index, FALSE); eth_do_insert (eth, target_index, old); eth_update_offsets (eth); - + g_signal_emit (G_OBJECT (eth), eth_signals [DIMENSION_CHANGE], 0, eth->width); g_signal_emit (G_OBJECT (eth), eth_signals [STRUCTURE_CHANGE], 0); } @@ -692,7 +692,7 @@ eth_set_size (ETableHeader *eth, int idx, int size) g_return_if_fail (E_IS_TABLE_HEADER (eth)); g_return_if_fail (idx >= 0); g_return_if_fail (idx < eth->col_count); - + /* If this column is not resizable, don't do anything. */ if (!eth->columns[idx]->resizable) return; @@ -713,7 +713,7 @@ eth_set_size (ETableHeader *eth, int idx, int size) usable_width -= e_table_sort_info_grouping_get_count(eth->sort_info) * GROUP_INDENT; /* Calculate minimum_width of stuff on the right as well as - * total usable expansion on the right. + * total usable expansion on the right. */ for (; i < eth->col_count; i++) { min_width += eth->columns[i]->min_width + eth->width_extras; @@ -765,7 +765,7 @@ eth_set_size (ETableHeader *eth, int idx, int size) g_signal_emit (G_OBJECT (eth), eth_signals [EXPANSION_CHANGE], 0); return; } - + /* The old_expansion used by columns to the right. */ old_expansion = expansion; old_expansion -= eth->columns[idx]->expansion; @@ -829,7 +829,7 @@ e_table_header_col_diff (ETableHeader *eth, int start_col, int end_col) total = 0; for (col = start_col; col < end_col; col++){ - + total += eth->columns [col]->width; } @@ -895,7 +895,7 @@ e_table_header_update_horizontal (ETableHeader *eth) for (i = 0; i < cols; i++) { int width = 0; - + g_signal_emit_by_name (G_OBJECT (eth), "request_width", i, &width); diff --git a/widgets/table/e-table-header.h b/widgets/table/e-table-header.h index 396eed77d6..172a2da314 100644 --- a/widgets/table/e-table-header.h +++ b/widgets/table/e-table-header.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-header.h * Copyright 1999, 2000, 2001, Ximian, Inc. * @@ -58,7 +58,7 @@ struct _ETableHeader { int sort_info_group_change_id; ETableCol **columns; - + GSList *change_queue, *change_tail; gint idle; }; diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index ecdfc52c6e..4957e1d86a 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -235,7 +235,7 @@ inline static gboolean eti_editing (ETableItem *eti) { d(g_print("%s: %s\n", __FUNCTION__, (eti->editing_col == -1) ? "false":"true")); - + if (eti->editing_col == -1) return FALSE; else @@ -273,7 +273,7 @@ eti_get_cell_background_color (ETableItem *eti, int row, int col, gboolean selec if (eti->alternating_row_colors) { if (row % 2) { - + } else { if (!allocated) { background = gdk_color_copy (background); @@ -343,7 +343,7 @@ eti_realize_cell_views ( ETableItem *eti) if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) return; - + for (i = 0; i < eti->n_cells; i++) e_cell_realize (eti->cell_views [i]); eti->cell_views_realized = 1; @@ -373,7 +373,7 @@ eti_attach_cell_views (ETableItem *eti) for (i = 0; i < eti->n_cells; i++){ ETableCol *ecol = e_table_header_get_column (eti->header, i); - + eti->cell_views [i] = e_cell_new_view (ecol->ecell, eti->table_model, eti); } @@ -394,7 +394,7 @@ eti_unrealize_cell_views (ETableItem *eti) if (eti->cell_views_realized == 0) return; - + eti_free_save_state (eti); for (i = 0; i < eti->n_cells; i++) @@ -406,14 +406,14 @@ static void eti_detach_cell_views (ETableItem *eti) { int i; - + eti_free_save_state (eti); for (i = 0; i < eti->n_cells; i++){ e_cell_kill_view (eti->cell_views [i]); eti->cell_views [i] = NULL; } - + g_free (eti->cell_views); eti->cell_views = NULL; eti->n_cells = 0; @@ -429,14 +429,14 @@ eti_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y /* Wrong BBox's are the source of redraw nightmares */ gnome_canvas_item_i2c_affine (GNOME_CANVAS_ITEM (eti), i2c); - + i1.x = eti->x1; i1.y = eti->y1; i2.x = eti->x1 + eti->width; i2.y = eti->y1 + eti->height; art_affine_point (&c1, &i1, i2c); art_affine_point (&c2, &i2, i2c); - + *x1 = c1.x; *y1 = c1.y; *x2 = c2.x + 1; @@ -589,7 +589,7 @@ eti_remove_header_model (ETableItem *eti) eti->header_dim_change_id); g_signal_handler_disconnect (G_OBJECT (eti->header), eti->header_request_width_id); - + if (eti->cell_views){ eti_unrealize_cell_views (eti); eti_detach_cell_views (eti); @@ -617,9 +617,9 @@ eti_row_height_real (ETableItem *eti, int row) int h, max_h; g_return_val_if_fail (cols == 0 || eti->cell_views, 0); - + max_h = 0; - + for (col = 0; col < cols; col++){ h = e_cell_height (eti->cell_views [col], view_to_model_col(eti, col), col, row); @@ -661,7 +661,7 @@ height_cache_idle(ETableItem *eti) return TRUE; } eti->height_cache_idle_id = 0; - return FALSE; + return FALSE; } static void @@ -710,8 +710,8 @@ eti_row_height (ETableItem *eti, int row) } if (eti->height_cache[row] == -1) { eti->height_cache[row] = eti_row_height_real(eti, row); - if (row > 0 && - eti->length_threshold != -1 && + if (row > 0 && + eti->length_threshold != -1 && eti->rows > eti->length_threshold && eti->height_cache[row] != eti_row_height(eti, 0)) { eti->needs_compute_height = 1; @@ -729,7 +729,7 @@ eti_row_height (ETableItem *eti, int row) * * The ETableItem might compute the whole height by asking every row its * size. There is a special mode (designed to work when there are too - * many rows in the table that performing the previous step could take + * many rows in the table that performing the previous step could take * too long) set by the ETableItem->length_threshold that would determine * when the height is computed by using the first row as the size for * every other row in the ETableItem. @@ -786,7 +786,7 @@ eti_item_region_redraw (ETableItem *eti, int x0, int y0, int x1, int y1) GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti); ArtDRect rect; double i2c [6]; - + rect.x0 = x0; rect.y0 = y0; rect.x1 = x1; @@ -831,7 +831,7 @@ eti_get_region (ETableItem *eti, int *x2p, int *y2p) { int x1, y1, x2, y2; - + x1 = e_table_header_col_diff (eti->header, 0, start_col); y1 = e_table_item_row_diff (eti, 0, start_row); x2 = x1 + e_table_header_col_diff (eti->header, start_col, end_col + 1); @@ -869,7 +869,7 @@ eti_request_region_redraw (ETableItem *eti, start_col, start_row, end_col, end_row, &x1, &y1, &x2, &y2); - + eti_item_region_redraw (eti, eti->x1 + x1 - border, eti->y1 + y1 - border, eti->x1 + x2 + 1 + border, @@ -905,7 +905,7 @@ static void eti_show_cursor (ETableItem *eti, int delay) { int cursor_row; - + if (!((GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED) && eti->cell_views_realized)) return; @@ -913,7 +913,7 @@ eti_show_cursor (ETableItem *eti, int delay) eti->queue_show_cursor = TRUE; return; } - + #if 0 g_object_get(eti->selection, "cursor_row", &cursor_row, @@ -962,14 +962,14 @@ eti_check_cursor_bounds (ETableItem *eti) if (eti->frozen_count > 0) { return; } - + if (!((GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED) && eti->cell_views_realized)) return; if (eti->frozen_count > 0) { return; } - + g_object_get(eti->selection, "cursor_row", &cursor_row, NULL); @@ -1208,7 +1208,7 @@ eti_table_model_rows_deleted (ETableModel *table_model, int row, int count, ETab gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (eti)); } -/** +/** * e_table_item_redraw_range * @eti: %ETableItem which will be redrawn * @start_col: The first col to redraw. @@ -1226,10 +1226,10 @@ e_table_item_redraw_range (ETableItem *eti, { int border; int cursor_col, cursor_row; - + g_return_if_fail (eti != NULL); g_return_if_fail (E_IS_TABLE_ITEM (eti)); - + g_object_get(eti->selection, "cursor_col", &cursor_col, "cursor_row", &cursor_row, @@ -1258,7 +1258,7 @@ static void eti_add_table_model (ETableItem *eti, ETableModel *table_model) { g_return_if_fail (eti->table_model == NULL); - + eti->table_model = table_model; g_object_ref (eti->table_model); @@ -1303,7 +1303,7 @@ eti_add_table_model (ETableItem *eti, ETableModel *table_model) } eti_freeze (eti); - + eti_table_model_changed (table_model, eti); } @@ -1311,7 +1311,7 @@ static void eti_add_selection_model (ETableItem *eti, ESelectionModel *selection) { g_return_if_fail (eti->selection == NULL); - + eti->selection = selection; g_object_ref (eti->selection); @@ -1376,7 +1376,7 @@ static int eti_request_column_width (ETableHeader *eth, int col, ETableItem *eti) { int width = 0; - + if (eti->cell_views && eti->cell_views_realized) { width = e_cell_max_width (eti->cell_views[col], view_to_model_col(eti, col), col); } @@ -1388,12 +1388,12 @@ static void eti_add_header_model (ETableItem *eti, ETableHeader *header) { g_return_if_fail (eti->header == NULL); - + eti->header = header; g_object_ref (header); eti_header_structure_changed (header, eti); - + eti->header_dim_change_id = g_signal_connect ( G_OBJECT (header), "dimension_change", G_CALLBACK (eti_header_dim_changed), eti); @@ -1402,7 +1402,7 @@ eti_add_header_model (ETableItem *eti, ETableHeader *header) G_OBJECT (header), "structure_change", G_CALLBACK (eti_header_structure_changed), eti); - eti->header_request_width_id = g_signal_connect + eti->header_request_width_id = g_signal_connect (G_OBJECT (header), "request_width", G_CALLBACK (eti_request_column_width), eti); } @@ -1476,7 +1476,7 @@ eti_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpe eti_remove_table_model (eti); eti_add_table_model (eti, E_TABLE_MODEL(g_value_get_object (value))); break; - + case PROP_SELECTION_MODEL: g_signal_emit_by_name (G_OBJECT(eti), "selection_model_removed", eti->selection); @@ -1484,7 +1484,7 @@ eti_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpe if (g_value_get_object (value)) eti_add_selection_model (eti, E_SELECTION_MODEL(g_value_get_object(value))); break; - + case PROP_LENGTH_THRESHOLD: eti->length_threshold = g_value_get_int (value); break; @@ -1595,13 +1595,13 @@ eti_init (ETableItem *eti) eti->height_cache = NULL; eti->height_cache_idle_id = 0; eti->height_cache_idle_count = 0; - + eti->length_threshold = -1; eti->uniform_row_height = FALSE; eti->uses_source_model = 0; eti->source_model = NULL; - + eti->row_guess = -1; eti->cursor_mode = E_CURSOR_SIMPLE; @@ -1682,7 +1682,7 @@ eti_realize (GnomeCanvasItem *item) ETableItem *eti = E_TABLE_ITEM (item); GtkWidget *canvas_widget = GTK_WIDGET (item->canvas); GdkWindow *window; - + if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize) (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)(item); @@ -1723,7 +1723,7 @@ eti_realize (GnomeCanvasItem *item) if (eti->cell_views == NULL) eti_attach_cell_views (eti); - + eti_realize_cell_views (eti); free_height_cache(eti); @@ -1929,23 +1929,23 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, } yd += height_extra; - + for (row = first_row; row < last_row; row++){ int xd; gboolean selected; gint cursor_col, cursor_row; - + height = ETI_ROW_HEIGHT (eti, row); xd = x_offset; - + selected = e_selection_model_is_row_selected(E_SELECTION_MODEL (eti->selection), view_to_model_row(eti,row)); - + g_object_get(eti->selection, "cursor_col", &cursor_col, "cursor_row", &cursor_row, NULL); - + for (col = first_col; col < last_col; col++){ ETableCol *ecol = e_table_header_get_column (eti->header, col); ECellView *ecell_view = eti->cell_views [col]; @@ -1998,7 +1998,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, e_cell_draw (ecell_view, drawable, ecol->col_idx, col, row, flags, xd, yd, xd + ecol->width, yd + height); - + if (!f_found) { switch (eti->cursor_mode) { case E_CURSOR_LINE: @@ -2038,7 +2038,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, if (eti->vertical_draw_grid){ int xd = x_offset; - + for (col = first_col; col <= last_col; col++){ ETableCol *ecol = e_table_header_get_column (eti->header, col); @@ -2053,7 +2053,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, xd += ecol->width; } } - + /* * Draw focus */ @@ -2092,20 +2092,20 @@ find_cell (ETableItem *eti, double x, double y, int *view_col_res, int *view_row *y1_res = y - eti->y1 - e_table_item_row_diff (eti, 0, eti->grabbed_row); return TRUE; } - + if (cols == 0 || rows == 0) return FALSE; x -= eti->x1; y -= eti->y1; - + x1 = 0; for (col = 0; col < cols - 1; col++, x1 = x2){ ETableCol *ecol = e_table_header_get_column (eti->header, col); if (x < x1) return FALSE; - + x2 = x1 + ecol->width; if (x <= x2) @@ -2121,7 +2121,7 @@ find_cell (ETableItem *eti, double x, double y, int *view_col_res, int *view_row return FALSE; } else { y1 = y2 = height_extra; - if (y < height_extra) + if (y < height_extra) return FALSE; for (row = 0; row < rows - 1; row++, y1 = y2){ y2 += ETI_ROW_HEIGHT (eti, row) + height_extra; @@ -2225,7 +2225,7 @@ _do_tooltip (ETableItem *eti) if (!free_color) eti->tooltip->foreground = gdk_color_copy(eti->tooltip->foreground); - e_cell_show_tooltip (ecell_view, + e_cell_show_tooltip (ecell_view, view_to_model_col (eti, eti->tooltip->col), eti->tooltip->col, eti->tooltip->row, @@ -2339,7 +2339,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) "cursor_col", &cursor_col, NULL); - eti->maybe_did_something = + eti->maybe_did_something = e_selection_model_maybe_do_something(E_SELECTION_MODEL (eti->selection), view_to_model_row(eti, row), view_to_model_col(eti, col), button.state); g_object_get(eti->selection, "cursor_row", &new_cursor_row, @@ -2361,7 +2361,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) */ if (eti_editing (eti)) { - return_val = eti_e_cell_event (eti, ecell_view, (GdkEvent *) &button, button.time, + return_val = eti_e_cell_event (eti, ecell_view, (GdkEvent *) &button, button.time, view_to_model_col(eti, col), col, row, E_CELL_EDITING | E_CELL_CURSOR); if (return_val) return TRUE; @@ -2399,7 +2399,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) case 4: case 5: return FALSE; - + } break; } @@ -2445,7 +2445,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) } #endif - + if (!find_cell (eti, e->button.x, e->button.y, &col, &row, &x1, &y1)) return TRUE; @@ -2483,7 +2483,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) case 4: case 5: return FALSE; - + } break; } @@ -2579,7 +2579,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) cross->crossing.time = e->motion.time; return_val = eti_e_cell_event (eti, eti->cell_views [eti->motion_col], cross, cross->crossing.time, - view_to_model_col(eti, eti->motion_col), + view_to_model_col(eti, eti->motion_col), eti->motion_col, eti->motion_row, 0); } @@ -2652,8 +2652,8 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) handled = FALSE; break; } - - + + g_signal_emit (eti, eti_signals [KEY_PRESS], 0, model_to_view_row(eti, cursor_row), cursor_col, e, &return_val); if ((!return_val) && @@ -2678,15 +2678,15 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) eti_cursor_move_right (eti); return_val = 1; break; - + case GDK_Up: case GDK_KP_Up: case GDK_Down: case GDK_KP_Down: if ((e->key.state & GDK_MOD1_MASK) && ((e->key.keyval == GDK_Down ) || (e->key.keyval == GDK_KP_Down))) { - gint view_col = model_to_view_col(eti, cursor_col); - + gint view_col = model_to_view_col(eti, cursor_col); + if ((view_col >= 0) && (view_col < eti->cols)) if (eti_e_cell_event (eti, eti->cell_views [view_col], e, ((GdkEventKey *)e)->time, cursor_col, view_col, model_to_view_row(eti, cursor_row), E_CELL_CURSOR)) return TRUE; @@ -2698,7 +2698,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) if (eti->cursor_mode != E_CURSOR_LINE) { eti_cursor_move (eti, model_to_view_row(eti, cursor_row), 0); return_val = TRUE; - } else + } else return_val = e_selection_model_key_press(E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e); break; case GDK_End: @@ -2706,7 +2706,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) if (eti->cursor_mode != E_CURSOR_LINE) { eti_cursor_move (eti, model_to_view_row(eti, cursor_row), eti->cols - 1); return_val = TRUE; - } else + } else return_val = e_selection_model_key_press(E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e); break; case GDK_Tab: @@ -2730,7 +2730,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) eti_cursor_move_right (eti); else if (cursor_row != view_to_model_row(eti, eti->rows - 1)) eti_cursor_move (eti, model_to_view_row(eti, cursor_row) + 1, 0); - else + else return_val = FALSE; } g_object_get(eti->selection, @@ -2766,7 +2766,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) if (!return_val) return_val = e_selection_model_key_press (E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e); break; - + default: handled = FALSE; break; @@ -2798,7 +2798,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) gint col, row; row = model_to_view_row(eti, cursor_row); col = model_to_view_col(eti, cursor_col); - if (col != -1 && row != -1 && e_table_model_is_cell_editable(eti->table_model, cursor_col, row)) { + if (col != -1 && row != -1 && e_table_model_is_cell_editable(eti->table_model, cursor_col, row)) { e_table_item_enter_edit (eti, col, row); } } @@ -2821,7 +2821,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) eti->in_key_press = FALSE; break; } - + case GDK_KEY_RELEASE: { gint cursor_row, cursor_col; @@ -2854,7 +2854,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) if (eti->motion_row != -1 && eti->motion_col != -1) return_val = eti_e_cell_event (eti, eti->cell_views [eti->motion_col], e, e->crossing.time, - view_to_model_col(eti, eti->motion_col), + view_to_model_col(eti, eti->motion_col), eti->motion_col, eti->motion_row, 0); eti->motion_row = -1; eti->motion_col = -1; @@ -2867,7 +2867,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) if (eti->save_row != -1 && eti->save_col != -1 && !eti_editing (eti) && - e_table_model_is_cell_editable(eti->table_model, view_to_model_col (eti, eti->save_col), eti->save_row)) { + e_table_model_is_cell_editable(eti->table_model, view_to_model_col (eti, eti->save_col), eti->save_row)) { e_table_item_enter_edit (eti, eti->save_col, eti->save_row); e_cell_load_state (eti->cell_views [eti->editing_col], view_to_model_col(eti, eti->save_col), eti->save_col, eti->save_row, eti->edit_ctx, eti->save_state); @@ -2934,7 +2934,7 @@ eti_class_init (ETableItemClass *klass) item_class->draw = eti_draw; item_class->point = eti_point; item_class->event = eti_event; - + klass->cursor_change = NULL; klass->cursor_activated = NULL; klass->double_click = NULL; @@ -2970,7 +2970,7 @@ eti_class_init (ETableItemClass *klass) g_object_class_install_property (object_class, PROP_TABLE_ALTERNATING_ROW_COLORS, g_param_spec_boolean ("alternating_row_colors", _( "Alternating Row Colors" ), - _( "Alternating Row Colors" ), + _( "Alternating Row Colors" ), FALSE, G_PARAM_WRITABLE)); @@ -3144,7 +3144,7 @@ eti_class_init (ETableItemClass *klass) gal_a11y_e_table_item_init (); } -/** +/** * e_table_item_set_cursor: * @eti: %ETableItem which will have the cursor set. * @col: Column to select. -1 means the last column. @@ -3163,7 +3163,7 @@ e_table_item_focus (ETableItem *eti, int col, int row, GdkModifierType state) { g_return_if_fail (eti != NULL); g_return_if_fail (E_IS_TABLE_ITEM (eti)); - + if (row == -1) { row = view_to_model_row(eti, eti->rows - 1); } @@ -3179,7 +3179,7 @@ e_table_item_focus (ETableItem *eti, int col, int row, GdkModifierType state) } } -/** +/** * e_table_item_get_focused_column: * @eti: %ETableItem which will have the cursor retrieved. * @@ -3189,12 +3189,12 @@ e_table_item_focus (ETableItem *eti, int col, int row, GdkModifierType state) */ gint e_table_item_get_focused_column (ETableItem *eti) -{ +{ int cursor_col; g_return_val_if_fail (eti != NULL, -1); g_return_val_if_fail (E_IS_TABLE_ITEM (eti), -1); - + g_object_get(eti->selection, "cursor_col", &cursor_col, NULL); @@ -3211,7 +3211,7 @@ eti_cursor_change (ESelectionModel *selection, int row, int col, ETableItem *eti return; view_row = model_to_view_row(eti, row); - + if (eti->old_cursor_row != -1 && view_row != eti->old_cursor_row) e_table_item_redraw_row (eti, eti->old_cursor_row); @@ -3251,7 +3251,7 @@ eti_cursor_activated (ESelectionModel *selection, int row, int col, ETableItem * view_row = model_to_view_row(eti, row); view_col = model_to_view_col(eti, col); - + if (view_row != -1 && view_col != -1) { if (! e_table_model_has_change_pending (eti->table_model)) { if (!eti->in_key_press) { @@ -3293,7 +3293,7 @@ eti_selection_row_change (ESelectionModel *selection, int row, ETableItem *eti) } -/** +/** * e_table_item_enter_edit * @eti: %ETableItem which will start being edited * @col: The view col to edit. @@ -3307,7 +3307,7 @@ e_table_item_enter_edit (ETableItem *eti, int col, int row) { g_return_if_fail (eti != NULL); g_return_if_fail (E_IS_TABLE_ITEM (eti)); - + d(g_print("%s: %d, %d, eti_editing() = %s\n", __FUNCTION__, col, row, eti_editing(eti)?"true":"false")); if (eti_editing (eti)) @@ -3319,7 +3319,7 @@ e_table_item_enter_edit (ETableItem *eti, int col, int row) eti->edit_ctx = e_cell_enter_edit (eti->cell_views [col], view_to_model_col(eti, col), col, row); } -/** +/** * e_table_item_leave_edit_ * @eti: %ETableItem which will stop being edited * @@ -3330,7 +3330,7 @@ e_table_item_leave_edit (ETableItem *eti) { int col, row; void *edit_ctx; - + g_return_if_fail (eti != NULL); g_return_if_fail (E_IS_TABLE_ITEM (eti)); @@ -3352,7 +3352,7 @@ e_table_item_leave_edit (ETableItem *eti) col, row, edit_ctx); } -/** +/** * e_table_item_compute_location * @eti: %ETableItem to look in. * @x: A pointer to the x location to find in the %ETableItem. @@ -3366,7 +3366,7 @@ e_table_item_leave_edit (ETableItem *eti) * location is not in the %ETableItem, the height of the %ETableItem * is removed from the value y points to. */ -void +void e_table_item_compute_location (ETableItem *eti, int *x, int *y, @@ -3449,7 +3449,7 @@ eti_printed_row_height (ETableItem *eti, gdouble *widths, GtkPrintContext *conte gdouble height = 0; for (col = 0; col < cols; col++) { ECellView *ecell_view = eti->cell_views [col]; - gdouble this_height = e_cell_print_height (ecell_view, context, view_to_model_col(eti, col), col, row, + gdouble this_height = e_cell_print_height (ecell_view, context, view_to_model_col(eti, col), col, row, widths[col] - 1); if (this_height > height) height = this_height; @@ -3463,12 +3463,12 @@ static gint gp_draw_rect (GtkPrintContext *context, double x, double y, double width, double height) { cairo_t *cr; - cr = gtk_print_context_get_cairo_context (context); + cr = gtk_print_context_get_cairo_context (context); cairo_save (cr); - cairo_rectangle (cr, x, y, width, height); + cairo_rectangle (cr, x, y, width, height); cairo_set_line_width (cr, 0.5); cairo_stroke (cr); - cairo_restore (cr); + cairo_restore (cr); return 0; } @@ -3486,18 +3486,18 @@ e_table_item_print_page (EPrintable *ep, gdouble max_height; int rows_printed = itemcontext->rows_printed; int row, col, next_page = 0; - double yd = height; + double yd = height; cairo_t *cr; gdouble *widths; - cr = gtk_print_context_get_cairo_context (context); + cr = gtk_print_context_get_cairo_context (context); max_height = gtk_print_context_get_height (context); widths = e_table_item_calculate_print_widths (itemcontext->item->header, width); /* * Draw cells */ - + if (eti->horizontal_draw_grid){ gp_draw_rect(context, 0, yd, width, 1); } @@ -3506,7 +3506,7 @@ e_table_item_print_page (EPrintable *ep, for (row = rows_printed; row < rows ; row++){ gdouble xd = 1, row_height; row_height = eti_printed_row_height(eti, widths, context, row); - + if (quantize) { if (yd + row_height + 1 > max_height && row != rows_printed) { next_page = 1; @@ -3514,36 +3514,36 @@ e_table_item_print_page (EPrintable *ep, } } else { if (yd > max_height) { - next_page = 1; + next_page = 1; break; - } - } - + } + } + for (col = 0; col < cols; col++){ ECellView *ecell_view = eti->cell_views [col]; - - cairo_save(cr); + + cairo_save(cr); cairo_translate(cr, xd, yd); cairo_rectangle (cr, 0, 0, widths[col] - 1, row_height); - cairo_clip(cr); - - e_cell_print (ecell_view, context, - view_to_model_col(eti, col), - col, - row, - widths[col] - 1, - row_height + 2 ); - + cairo_clip(cr); + + e_cell_print (ecell_view, context, + view_to_model_col(eti, col), + col, + row, + widths[col] - 1, + row_height + 2 ); + cairo_restore (cr); xd += widths[col]; } - + yd += row_height; if (eti->horizontal_draw_grid){ gp_draw_rect(context, 0, yd, width, 1); } yd ++; - } + } itemcontext->rows_printed = row; if (eti->vertical_draw_grid){ @@ -3558,7 +3558,7 @@ e_table_item_print_page (EPrintable *ep, if (next_page) { cairo_show_page (cr); next_page = 0; - } + } g_free (widths); } @@ -3595,17 +3595,17 @@ e_table_item_height (EPrintable *ep, gdouble *widths; int row; gdouble yd = 0; - + widths = e_table_item_calculate_print_widths (itemcontext->item->header, width); /* * Draw cells */ yd++; - + for (row = rows_printed; row < rows; row++){ gdouble row_height; - + row_height = eti_printed_row_height(item, widths, context, row); if (quantize) { if (max_height != -1 && yd + row_height + 1 > max_height && row != rows_printed) { @@ -3623,7 +3623,7 @@ e_table_item_height (EPrintable *ep, } g_free (widths); - + if (max_height != -1 && (!quantize) && yd > max_height) yd = max_height; @@ -3646,17 +3646,17 @@ e_table_item_will_fit (EPrintable *ep, int row; gdouble yd = 0; gboolean ret_val = TRUE; - + widths = e_table_item_calculate_print_widths (itemcontext->item->header, width); /* * Draw cells */ yd++; - + for (row = rows_printed; row < rows; row++){ gdouble row_height; - + row_height = eti_printed_row_height(item, widths, context, row); if (quantize) { if (max_height != -1 && yd + row_height + 1 > max_height && row != rows_printed) { @@ -3691,14 +3691,14 @@ e_table_item_printable_destroy (gpointer data, g_free(itemcontext); } -/** +/** * e_table_item_get_printable * @eti: %ETableItem which will be printed * * This routine creates and returns an %EPrintable that can be used to * print the given %ETableItem. * - * Returns: The %EPrintable. + * Returns: The %EPrintable. */ EPrintable * e_table_item_get_printable (ETableItem *item) diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h index 6937ed61b3..caabfe5581 100644 --- a/widgets/table/e-table-item.h +++ b/widgets/table/e-table-item.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-item.h * Copyright 1999, 2000, 2001, Ximian, Inc. * @@ -55,7 +55,7 @@ typedef struct { int cols, rows; int click_count; - + /* * Ids for the signals we connect to */ @@ -84,7 +84,7 @@ typedef struct { int hadjustment_value_change_id; int vadjustment_change_id; int vadjustment_value_change_id; - + GdkGC *fill_gc; GdkGC *grid_gc; GdkGC *focus_gc; @@ -96,7 +96,7 @@ typedef struct { guint draw_focus:1; guint uniform_row_height:1; guint cell_views_realized:1; - + guint needs_redraw : 1; guint needs_compute_height : 1; guint needs_compute_width : 1; @@ -146,7 +146,7 @@ typedef struct { * the size */ int length_threshold; - + gint row_guess; ECursorMode cursor_mode; diff --git a/widgets/table/e-table-memory-callbacks.c b/widgets/table/e-table-memory-callbacks.c index 2b0fdaec21..4b05a42120 100644 --- a/widgets/table/e-table-memory-callbacks.c +++ b/widgets/table/e-table-memory-callbacks.c @@ -96,7 +96,7 @@ static void * etmc_initialize_value (ETableModel *etm, int col) { ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm); - + if (etmc->initialize_value) return etmc->initialize_value (etm, col, etmc->data); else @@ -107,7 +107,7 @@ static gboolean etmc_value_is_empty (ETableModel *etm, int col, const void *value) { ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm); - + if (etmc->value_is_empty) return etmc->value_is_empty (etm, col, value, etmc->data); else @@ -118,7 +118,7 @@ static char * etmc_value_to_string (ETableModel *etm, int col, const void *value) { ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm); - + if (etmc->value_to_string) return etmc->value_to_string (etm, col, value, etmc->data); else @@ -129,7 +129,7 @@ static void etmc_append_row (ETableModel *etm, ETableModel *source, int row) { ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm); - + if (etmc->append_row) etmc->append_row (etm, source, row, etmc->data); } @@ -179,7 +179,7 @@ e_table_memory_callbacks_init (ETableMemoryCalbacks *etmc) * Instead, ETableMemoryCalbacksModel uses a setup based in callback functions, every * callback function signature mimics the signature of each ETableModel method * and passes the extra @data pointer to each one of the method to provide them - * with any context they might want to use. + * with any context they might want to use. * * Returns: An ETableMemoryCalbacksModel object (which is also an ETableModel * object). @@ -210,6 +210,6 @@ e_table_memory_callbacks_new (ETableMemoryCalbacksColumnCountFn col_count, et->value_is_empty = value_is_empty; et->value_to_string = value_to_string; et->data = data; - + return (ETableModel *) et; } diff --git a/widgets/table/e-table-memory-callbacks.h b/widgets/table/e-table-memory-callbacks.h index 6a75008a94..1a43b02bdd 100644 --- a/widgets/table/e-table-memory-callbacks.h +++ b/widgets/table/e-table-memory-callbacks.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-memory-callbacks.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c index b4fe2d2a16..7ebbcbd70c 100644 --- a/widgets/table/e-table-memory-store.c +++ b/widgets/table/e-table-memory-store.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-memory-store.c * Copyright 2000, 2001, Ximian, Inc. * @@ -145,7 +145,7 @@ static void * etms_initialize_value (ETableModel *etm, int col) { ETableMemoryStore *etms = E_TABLE_MEMORY_STORE(etm); - + switch (etms->priv->columns[col].type) { case E_TABLE_MEMORY_STORE_COLUMN_TYPE_STRING: return g_strdup (""); @@ -166,7 +166,7 @@ static gboolean etms_value_is_empty (ETableModel *etm, int col, const void *value) { ETableMemoryStore *etms = E_TABLE_MEMORY_STORE(etm); - + switch (etms->priv->columns[col].type) { case E_TABLE_MEMORY_STORE_COLUMN_TYPE_STRING: return !(value && *(char *) value); @@ -187,7 +187,7 @@ static char * etms_value_to_string (ETableModel *etm, int col, const void *value) { ETableMemoryStore *etms = E_TABLE_MEMORY_STORE(etm); - + switch (etms->priv->columns[col].type) { case E_TABLE_MEMORY_STORE_COLUMN_TYPE_STRING: return g_strdup (value); @@ -239,7 +239,7 @@ etms_finalize (GObject *obj) if (G_OBJECT_CLASS (e_table_memory_store_parent_class)->finalize) G_OBJECT_CLASS (e_table_memory_store_parent_class)->finalize (obj); } - + static void e_table_memory_store_init (ETableMemoryStore *etms) { @@ -291,7 +291,7 @@ e_table_memory_store_class_init (ETableMemoryStoreClass *klass) * Instead, ETableMemoryStoreModel uses a setup based in callback functions, every * callback function signature mimics the signature of each ETableModel method * and passes the extra @data pointer to each one of the method to provide them - * with any context they might want to use. + * with any context they might want to use. * * Returns: An ETableMemoryStoreModel object (which is also an ETableModel * object). @@ -323,7 +323,7 @@ e_table_memory_store_construct (ETableMemoryStore *etms, ETableMemoryStoreColumn return E_TABLE_MODEL (etms); } - + void e_table_memory_store_adopt_value_at (ETableMemoryStore *etms, int col, int row, void *value) diff --git a/widgets/table/e-table-memory-store.h b/widgets/table/e-table-memory-store.h index c95486fcd6..fe67e10d3d 100644 --- a/widgets/table/e-table-memory-store.h +++ b/widgets/table/e-table-memory-store.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-memory-store.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c index 824b8082cd..b708811cc5 100644 --- a/widgets/table/e-table-memory.c +++ b/widgets/table/e-table-memory.c @@ -113,12 +113,12 @@ e_table_memory_new (void) /** * e_table_memory_get_data: - * @etmm: - * @row: - * - * - * - * Return value: + * @etmm: + * @row: + * + * + * + * Return value: **/ gpointer e_table_memory_get_data (ETableMemory *etmm, int row) @@ -131,11 +131,11 @@ e_table_memory_get_data (ETableMemory *etmm, int row) /** * e_table_memory_set_data: - * @etmm: - * @row: - * @data: - * - * + * @etmm: + * @row: + * @data: + * + * **/ void e_table_memory_set_data (ETableMemory *etmm, int row, gpointer data) @@ -148,14 +148,14 @@ e_table_memory_set_data (ETableMemory *etmm, int row, gpointer data) /** * e_table_memory_insert: - * @table_model: - * @parent_path: - * @position: - * @data: - * - * - * - * Return value: + * @table_model: + * @parent_path: + * @position: + * @data: + * + * + * + * Return value: **/ void e_table_memory_insert (ETableMemory *etmm, @@ -182,12 +182,12 @@ e_table_memory_insert (ETableMemory *etmm, /** * e_table_memory_remove: - * @etable: - * @path: - * - * - * - * Return value: + * @etable: + * @path: + * + * + * + * Return value: **/ gpointer e_table_memory_remove (ETableMemory *etmm, int row) @@ -209,12 +209,12 @@ e_table_memory_remove (ETableMemory *etmm, int row) /** * e_table_memory_clear: - * @etable: - * @path: - * - * - * - * Return value: + * @etable: + * @path: + * + * + * + * Return value: **/ void e_table_memory_clear (ETableMemory *etmm) @@ -231,11 +231,11 @@ e_table_memory_clear (ETableMemory *etmm) /** * e_table_memory_freeze: * @etmm: the ETableModel to freeze. - * + * * This function prepares an ETableModel for a period of much change. * All signals regarding changes to the table are deferred until we * thaw the table. - * + * **/ void e_table_memory_freeze(ETableMemory *etmm) @@ -251,11 +251,11 @@ e_table_memory_freeze(ETableMemory *etmm) /** * e_table_memory_thaw: * @etmm: the ETableMemory to thaw. - * + * * This function thaws an ETableMemory. All the defered signals can add * up to a lot, we don't know - so we just emit a model_changed * signal. - * + * **/ void e_table_memory_thaw(ETableMemory *etmm) diff --git a/widgets/table/e-table-memory.h b/widgets/table/e-table-memory.h index aba80e0520..d1f382cd6b 100644 --- a/widgets/table/e-table-memory.h +++ b/widgets/table/e-table-memory.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-memory.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c index 3d73bbf83a..36dd691a86 100644 --- a/widgets/table/e-table-model.c +++ b/widgets/table/e-table-model.c @@ -134,7 +134,7 @@ e_table_model_value_at (ETableModel *e_table_model, int col, int row) * e_table_model_set_value_at: * @e_table_model: the table model to operate on. * @col: the column where the data will be stored in the model. - * @row: the row where the data will be stored in the model. + * @row: the row where the data will be stored in the model. * @value: the data to be stored. * * This function instructs the model to store the value in @data in the @@ -277,8 +277,8 @@ e_table_model_finalize (GObject *object) static void e_table_model_class_init (ETableModelClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - + GObjectClass *object_class = G_OBJECT_CLASS (klass); + object_class->finalize = e_table_model_finalize; e_table_model_signals [MODEL_NO_CHANGE] = @@ -345,27 +345,27 @@ e_table_model_class_init (ETableModelClass *klass) e_util_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); - klass->column_count = NULL; - klass->row_count = NULL; + klass->column_count = NULL; + klass->row_count = NULL; klass->append_row = NULL; - klass->value_at = NULL; - klass->set_value_at = NULL; - klass->is_cell_editable = NULL; + klass->value_at = NULL; + klass->set_value_at = NULL; + klass->is_cell_editable = NULL; klass->has_save_id = NULL; klass->get_save_id = NULL; klass->has_change_pending = NULL; - klass->duplicate_value = NULL; - klass->free_value = NULL; - klass->initialize_value = NULL; - klass->value_is_empty = NULL; + klass->duplicate_value = NULL; + klass->free_value = NULL; + klass->initialize_value = NULL; + klass->value_is_empty = NULL; klass->value_to_string = NULL; - klass->model_no_change = NULL; - klass->model_changed = NULL; + klass->model_no_change = NULL; + klass->model_changed = NULL; klass->model_row_changed = NULL; klass->model_cell_changed = NULL; klass->model_rows_inserted = NULL; @@ -396,11 +396,11 @@ e_table_model_pre_change (ETableModel *e_table_model) if (ETM_FROZEN (e_table_model)) return; - + d(print_tabs()); d(g_print("Emitting pre_change on model 0x%p, a %s.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type))); d(depth++); - g_signal_emit (G_OBJECT (e_table_model), + g_signal_emit (G_OBJECT (e_table_model), e_table_model_signals [MODEL_PRE_CHANGE], 0); d(depth--); } @@ -423,10 +423,10 @@ e_table_model_no_change (ETableModel *e_table_model) { g_return_if_fail (e_table_model != NULL); g_return_if_fail (E_IS_TABLE_MODEL (e_table_model)); - + if (ETM_FROZEN (e_table_model)) return; - + d(print_tabs()); d(g_print("Emitting model_no_change on model 0x%p, a %s.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type))); d(depth++); @@ -453,10 +453,10 @@ e_table_model_changed (ETableModel *e_table_model) { g_return_if_fail (e_table_model != NULL); g_return_if_fail (E_IS_TABLE_MODEL (e_table_model)); - + if (ETM_FROZEN (e_table_model)) return; - + d(print_tabs()); d(g_print("Emitting model_changed on model 0x%p, a %s.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type))); d(depth++); @@ -483,7 +483,7 @@ e_table_model_row_changed (ETableModel *e_table_model, int row) if (ETM_FROZEN (e_table_model)) return; - + d(print_tabs()); d(g_print("Emitting row_changed on model 0x%p, a %s, row %d.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type), row)); d(depth++); @@ -511,7 +511,7 @@ e_table_model_cell_changed (ETableModel *e_table_model, int col, int row) if (ETM_FROZEN (e_table_model)) return; - + d(print_tabs()); d(g_print("Emitting cell_changed on model 0x%p, a %s, row %d, col %d.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type), row, col)); d(depth++); @@ -539,7 +539,7 @@ e_table_model_rows_inserted (ETableModel *e_table_model, int row, int count) if (ETM_FROZEN (e_table_model)) return; - + d(print_tabs()); d(g_print("Emitting row_inserted on model 0x%p, a %s, row %d.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type), row)); d(depth++); @@ -582,7 +582,7 @@ e_table_model_rows_deleted (ETableModel *e_table_model, int row, int count) if (ETM_FROZEN (e_table_model)) return; - + d(print_tabs()); d(g_print("Emitting row_deleted on model 0x%p, a %s, row %d.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type), row)); d(depth++); diff --git a/widgets/table/e-table-model.h b/widgets/table/e-table-model.h index ba8e9f91b5..3bc5a2f526 100644 --- a/widgets/table/e-table-model.h +++ b/widgets/table/e-table-model.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-model.h * Copyright 2000, 2001, Ximian, Inc. * @@ -69,7 +69,7 @@ typedef struct { /* Return an allocated string. */ char *(*value_to_string) (ETableModel *etm, int col, const void *value); - + /* * Signals */ diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c index 817dcfd2dd..b374fd9cb3 100644 --- a/widgets/table/e-table-one.c +++ b/widgets/table/e-table-one.c @@ -104,7 +104,7 @@ static void * one_initialize_value (ETableModel *etm, int col) { ETableOne *one = E_TABLE_ONE(etm); - + if (one->source) return e_table_model_initialize_value (one->source, col); else @@ -115,7 +115,7 @@ static gboolean one_value_is_empty (ETableModel *etm, int col, const void *value) { ETableOne *one = E_TABLE_ONE(etm); - + if (one->source) return e_table_model_value_is_empty (one->source, col, value); else @@ -126,7 +126,7 @@ static char * one_value_to_string (ETableModel *etm, int col, const void *value) { ETableOne *one = E_TABLE_ONE(etm); - + if (one->source) return e_table_model_value_to_string (one->source, col, value); else @@ -155,7 +155,7 @@ one_dispose (GObject *object) for (i = 0; i < col_count; i++) e_table_model_free_value(one->source, i, one->data[i]); } - + g_free (one->data); } one->data = NULL; @@ -204,16 +204,16 @@ e_table_one_new (ETableModel *source) eto = g_object_new (E_TABLE_ONE_TYPE, NULL); eto->source = source; - + col_count = e_table_model_column_count(source); eto->data = g_new(void *, col_count); for (i = 0; i < col_count; i++) { eto->data[i] = e_table_model_initialize_value(source, i); } - + if (source) g_object_ref(source); - + return (ETableModel *) eto; } diff --git a/widgets/table/e-table-one.h b/widgets/table/e-table-one.h index 44d0ed22a9..f32d8cc0d4 100644 --- a/widgets/table/e-table-one.h +++ b/widgets/table/e-table-one.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-one.h * Copyright 2000, 2001, Ximian, Inc. * @@ -37,7 +37,7 @@ G_BEGIN_DECLS typedef struct { ETableModel parent; - + ETableModel *source; void **data; } ETableOne; diff --git a/widgets/table/e-table-scrolled.h b/widgets/table/e-table-scrolled.h index d5671f28a3..1c7c0b48fd 100644 --- a/widgets/table/e-table-scrolled.h +++ b/widgets/table/e-table-scrolled.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-scrolled.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c index 50c319c66d..891ba665e4 100644 --- a/widgets/table/e-table-search.c +++ b/widgets/table/e-table-search.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-search.c * Copyright 2000, 2001, Ximian, Inc. * @@ -56,9 +56,9 @@ e_table_search_search (ETableSearch *e_table_search, char *string, ETableSearchF gboolean ret_val; g_return_val_if_fail (e_table_search != NULL, FALSE); g_return_val_if_fail (E_IS_TABLE_SEARCH (e_table_search), FALSE); - + g_signal_emit (G_OBJECT (e_table_search), - e_table_search_signals [SEARCH_SEARCH], + e_table_search_signals [SEARCH_SEARCH], 0, string, flags, &ret_val); return ret_val; @@ -69,7 +69,7 @@ e_table_search_accept (ETableSearch *e_table_search) { g_return_if_fail (e_table_search != NULL); g_return_if_fail (E_IS_TABLE_SEARCH (e_table_search)); - + g_signal_emit (G_OBJECT (e_table_search), e_table_search_signals [SEARCH_ACCEPT], 0); } @@ -108,11 +108,11 @@ static void e_table_search_finalize (GObject *object) { ETableSearch *ets = (ETableSearch *) object; - + drop_timeout (ets); g_free (ets->priv->search_string); g_free (ets->priv); - + if (G_OBJECT_CLASS (e_table_search_parent_class)->finalize) (*G_OBJECT_CLASS (e_table_search_parent_class)->finalize)(object); } diff --git a/widgets/table/e-table-search.h b/widgets/table/e-table-search.h index eff681e0aa..ecb3efa6e9 100644 --- a/widgets/table/e-table-search.h +++ b/widgets/table/e-table-search.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-search.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c index 2b8ec0fa99..2706fd4ba4 100644 --- a/widgets/table/e-table-selection-model.c +++ b/widgets/table/e-table-selection-model.c @@ -105,7 +105,7 @@ model_changed_idle(ETableSelectionModel *etsm) char *save_id = e_table_model_get_save_id(etm, i); if (g_hash_table_lookup(etsm->hash, save_id)) e_selection_model_change_one_row(E_SELECTION_MODEL(etsm), i, TRUE); - + if (etsm->cursor_id && !strcmp(etsm->cursor_id, save_id)) { cursor_row = i; cursor_col = e_selection_model_cursor_col(E_SELECTION_MODEL(etsm)); @@ -261,7 +261,7 @@ static void etsm_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { ETableSelectionModel *etsm = E_TABLE_SELECTION_MODEL (object); - + switch (prop_id){ case PROP_MODEL: drop_model(etsm); @@ -298,14 +298,14 @@ e_table_selection_model_class_init (ETableSelectionModelClass *klass) esma_class->get_row_count = etsm_get_row_count; - g_object_class_install_property (object_class, PROP_MODEL, + g_object_class_install_property (object_class, PROP_MODEL, g_param_spec_object ("model", _("Model"), /*_( */"XXX blurb" /*)*/, E_TABLE_MODEL_TYPE, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_HEADER, + g_object_class_install_property (object_class, PROP_HEADER, g_param_spec_object ("header", _("Header"), /*_( */"XXX blurb" /*)*/, @@ -313,7 +313,7 @@ e_table_selection_model_class_init (ETableSelectionModelClass *klass) G_PARAM_READWRITE)); } -/** +/** * e_table_selection_model_new * * This routine creates a new #ETableSelectionModel. diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h index ce98bd4b4e..60b7812413 100644 --- a/widgets/table/e-table-selection-model.h +++ b/widgets/table/e-table-selection-model.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-selection-model.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-simple.c b/widgets/table/e-table-simple.c index f47786e7b7..41ce63f943 100644 --- a/widgets/table/e-table-simple.c +++ b/widgets/table/e-table-simple.c @@ -56,7 +56,7 @@ static void simple_append_row (ETableModel *etm, ETableModel *source, int row) { ETableSimple *simple = E_TABLE_SIMPLE(etm); - + if (simple->append_row) simple->append_row (etm, source, row, simple->data); } @@ -139,7 +139,7 @@ static void * simple_initialize_value (ETableModel *etm, int col) { ETableSimple *simple = E_TABLE_SIMPLE(etm); - + if (simple->initialize_value) return simple->initialize_value (etm, col, simple->data); else @@ -150,7 +150,7 @@ static gboolean simple_value_is_empty (ETableModel *etm, int col, const void *value) { ETableSimple *simple = E_TABLE_SIMPLE(etm); - + if (simple->value_is_empty) return simple->value_is_empty (etm, col, value, simple->data); else @@ -161,7 +161,7 @@ static char * simple_value_to_string (ETableModel *etm, int col, const void *value) { ETableSimple *simple = E_TABLE_SIMPLE(etm); - + if (simple->value_to_string) return simple->value_to_string (etm, col, value, simple->data); else @@ -219,7 +219,7 @@ e_table_simple_init (ETableSimple *simple) * Instead, ETableSimpleModel uses a setup based in callback functions, every * callback function signature mimics the signature of each ETableModel method * and passes the extra @data pointer to each one of the method to provide them - * with any context they might want to use. + * with any context they might want to use. * * Returns: An ETableSimpleModel object (which is also an ETableModel * object). diff --git a/widgets/table/e-table-simple.h b/widgets/table/e-table-simple.h index db49cc6ced..fd489b5b54 100644 --- a/widgets/table/e-table-simple.h +++ b/widgets/table/e-table-simple.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-simple.h * Copyright 2000, 2001, Ximian, Inc. * @@ -71,7 +71,7 @@ typedef struct { ETableSimpleFreeValueFn free_value; ETableSimpleInitializeValueFn initialize_value; ETableSimpleValueIsEmptyFn value_is_empty; - ETableSimpleValueToStringFn value_to_string; + ETableSimpleValueToStringFn value_to_string; void *data; } ETableSimple; diff --git a/widgets/table/e-table-size-test.c b/widgets/table/e-table-size-test.c index b70e890f1d..3260f9621f 100644 --- a/widgets/table/e-table-size-test.c +++ b/widgets/table/e-table-size-test.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-size-test.c * Copyright 2000, 2001, Ximian, Inc. * @@ -41,16 +41,16 @@ * the ETableSimple class. Instead of creating your own ETableModel * class, you simply create a new object of the ETableSimple class. You * give it a bunch of functions that act as callbacks. - * + * * You also get to pass a void * to ETableSimple and it gets passed to * your callbacks. This would be for having multiple models of the same * type. This is just an example though, so we statically define all the * data and ignore the void *data parameter. - * + * * In our example we will be creating a table model with 6 columns and 10 * rows. This corresponds to having 6 different types of information and * 10 different sets of data in our database. - * + * * The headers will be hard coded, as will be the example data. * */ @@ -234,7 +234,7 @@ create_table (void) * First we create the header. */ e_table_header = e_table_header_new (); - + /* * Next we have to build renderers for all of the columns. * Since all our columns are text columns, we can simply use @@ -298,7 +298,7 @@ main (int argc, char *argv []) gtk_widget_push_colormap (gdk_rgb_get_cmap ()); create_table (); - + gtk_main (); e_cursors_shutdown (); diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c index 8d8d8fe580..e91ade2381 100644 --- a/widgets/table/e-table-sort-info.c +++ b/widgets/table/e-table-sort-info.c @@ -46,7 +46,7 @@ static void etsi_finalize (GObject *object) { ETableSortInfo *etsi = E_TABLE_SORT_INFO (object); - + if (etsi->groupings) g_free(etsi->groupings); etsi->groupings = NULL; @@ -107,7 +107,7 @@ e_table_sort_info_sort_info_changed (ETableSortInfo *info) { g_return_if_fail (info != NULL); g_return_if_fail (E_IS_TABLE_SORT_INFO (info)); - + if (info->frozen) { info->sort_info_changed = 1; } else { @@ -120,7 +120,7 @@ e_table_sort_info_group_info_changed (ETableSortInfo *info) { g_return_if_fail (info != NULL); g_return_if_fail (E_IS_TABLE_SORT_INFO (info)); - + if (info->frozen) { info->group_info_changed = 1; } else { @@ -139,7 +139,7 @@ e_table_sort_info_group_info_changed (ETableSortInfo *info) * To thaw, invoke the e_table_sort_info_thaw() function, which will * trigger any signals that might have been queued. */ -void +void e_table_sort_info_freeze (ETableSortInfo *info) { info->frozen++; @@ -162,7 +162,7 @@ e_table_sort_info_thaw (ETableSortInfo *info) info->frozen--; if (info->frozen != 0) return; - + if (info->sort_info_changed) { info->sort_info_changed = 0; e_table_sort_info_sort_info_changed(info); @@ -206,7 +206,7 @@ e_table_sort_info_grouping_real_truncate (ETableSortInfo *info, int length) * @lenght: position where the truncation happens. * * This routine can be used to reduce or grow the number of grouping - * criteria in the object. + * criteria in the object. */ void e_table_sort_info_grouping_truncate (ETableSortInfo *info, int length) @@ -283,7 +283,7 @@ e_table_sort_info_sorting_real_truncate (ETableSortInfo *info, int length) * @lenght: position where the truncation happens. * * This routine can be used to reduce or grow the number of sort - * criteria in the object. + * criteria in the object. */ void e_table_sort_info_sorting_truncate (ETableSortInfo *info, int length) @@ -335,7 +335,7 @@ e_table_sort_info_sorting_set_nth (ETableSortInfo *info, int n, ETableSortColu * This creates a new e_table_sort_info object that contains no * grouping and no sorting defined as of yet. This object is used * to keep track of multi-level sorting and multi-level grouping of - * the ETable. + * the ETable. * * Returns: A new %ETableSortInfo object */ @@ -418,7 +418,7 @@ e_table_sort_info_save_to_node (ETableSortInfo *info, int i; const int sort_count = e_table_sort_info_sorting_get_count (info); const int group_count = e_table_sort_info_grouping_get_count (info); - + grouping = xmlNewChild (parent, NULL, (const unsigned char *)"grouping", NULL); for (i = 0; i < group_count; i++) { @@ -432,7 +432,7 @@ e_table_sort_info_save_to_node (ETableSortInfo *info, for (i = 0; i < sort_count; i++) { ETableSortColumn column = e_table_sort_info_sorting_get_nth(info, i); xmlNode *new_node = xmlNewChild(grouping, NULL, (const unsigned char *)"leaf", NULL); - + e_xml_set_integer_prop_by_name (new_node, (const unsigned char *)"column", column.column); e_xml_set_bool_prop_by_name (new_node, (const unsigned char *)"ascending", column.ascending); } diff --git a/widgets/table/e-table-sort-info.h b/widgets/table/e-table-sort-info.h index 5140b40d5a..81e02cae17 100644 --- a/widgets/table/e-table-sort-info.h +++ b/widgets/table/e-table-sort-info.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-sort-info.h * Copyright 2000, 2001, Ximian, Inc. * @@ -45,12 +45,12 @@ struct _ETableSortColumn { typedef struct { GObject base; - + gint group_count; ETableSortColumn *groupings; gint sort_count; ETableSortColumn *sortings; - + guint frozen : 1; guint sort_info_changed : 1; guint group_info_changed : 1; diff --git a/widgets/table/e-table-sorted-variable.h b/widgets/table/e-table-sorted-variable.h index f2cc695bc5..5c91c11aa1 100644 --- a/widgets/table/e-table-sorted-variable.h +++ b/widgets/table/e-table-sorted-variable.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-sorted-variable.h * Copyright 2000, 2001, Ximian, Inc. * @@ -43,7 +43,7 @@ typedef struct { ETableSubsetVariable base; ETableSortInfo *sort_info; - + ETableHeader *full_header; int sort_info_changed_id; diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c index 32985a5dd8..e2a5ecdde9 100644 --- a/widgets/table/e-table-sorted.c +++ b/widgets/table/e-table-sorted.c @@ -182,7 +182,7 @@ ets_proxy_model_row_changed (ETableSubset *subset, ETableModel *source, int row) { if (!E_TABLE_SORTED(subset)->sort_idle_id) E_TABLE_SORTED(subset)->sort_idle_id = g_idle_add_full(50, (GSourceFunc) ets_sort_idle, subset, NULL); - + if (E_TABLE_SUBSET_CLASS (ets_parent_class)->proxy_model_row_changed) (E_TABLE_SUBSET_CLASS (ets_parent_class)->proxy_model_row_changed) (subset, source, row); } diff --git a/widgets/table/e-table-sorted.h b/widgets/table/e-table-sorted.h index 297e622587..2fa1cafbdb 100644 --- a/widgets/table/e-table-sorted.h +++ b/widgets/table/e-table-sorted.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-sorted.h * Copyright 2000, 2001, Ximian, Inc. * @@ -43,7 +43,7 @@ typedef struct { ETableSubset base; ETableSortInfo *sort_info; - + ETableHeader *full_header; int sort_info_changed_id; diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c index 1d70c4959c..365b869795 100644 --- a/widgets/table/e-table-sorter.c +++ b/widgets/table/e-table-sorter.c @@ -165,10 +165,10 @@ ets_class_init (ETableSorterClass *klass) sorter_class->model_to_sorted = ets_model_to_sorted ; sorter_class->sorted_to_model = ets_sorted_to_model ; sorter_class->get_model_to_sorted_array = ets_get_model_to_sorted_array ; - sorter_class->get_sorted_to_model_array = ets_get_sorted_to_model_array ; + sorter_class->get_sorted_to_model_array = ets_get_sorted_to_model_array ; sorter_class->needs_sorting = ets_needs_sorting ; - g_object_class_install_property (object_class, PROP_SORT_INFO, + g_object_class_install_property (object_class, PROP_SORT_INFO, g_param_spec_object ("sort_info", _("Sort Info"), /*_( */"XXX blurb" /*)*/, @@ -198,7 +198,7 @@ ETableSorter * e_table_sorter_new (ETableModel *source, ETableHeader *full_header, ETableSortInfo *sort_info) { ETableSorter *ets = g_object_new (E_TABLE_SORTER_TYPE, NULL); - + ets->sort_info = sort_info; g_object_ref(ets->sort_info); ets->full_header = full_header; @@ -220,7 +220,7 @@ e_table_sorter_new (ETableModel *source, ETableHeader *full_header, ETableSortIn G_CALLBACK (ets_sort_info_changed), ets); ets->group_info_changed_id = g_signal_connect (sort_info, "group_info_changed", G_CALLBACK (ets_sort_info_changed), ets); - + return ets; } diff --git a/widgets/table/e-table-sorter.h b/widgets/table/e-table-sorter.h index e9bce1bfe7..e4c389c148 100644 --- a/widgets/table/e-table-sorter.h +++ b/widgets/table/e-table-sorter.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-sorter.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c index 9a3f1913d8..b2fb86958c 100644 --- a/widgets/table/e-table-sorting-utils.c +++ b/widgets/table/e-table-sorting-utils.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-sorting-utils.c * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-sorting-utils.h b/widgets/table/e-table-sorting-utils.h index d4ed88876b..cfcde6091b 100644 --- a/widgets/table/e-table-sorting-utils.h +++ b/widgets/table/e-table-sorting-utils.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-sorting-utils.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c index 8ee2eb3c8c..47bc9c4a13 100644 --- a/widgets/table/e-table-specification.c +++ b/widgets/table/e-table-specification.c @@ -106,7 +106,7 @@ etsp_init (ETableSpecification *etsp) * * Creates a new %ETableSpecification object. This object is used to hold the * information about the rendering information for ETable. - * + * * Returns: a newly created %ETableSpecification object. */ ETableSpecification * @@ -123,7 +123,7 @@ e_table_specification_new (void) * @filename: a filename that contains an ETableSpecification * * This routine modifies @specification to reflect the state described - * by the file @filename. + * by the file @filename. * * Returns: TRUE on success, FALSE on failure. */ @@ -279,7 +279,7 @@ e_table_specification_load_from_node (ETableSpecification *specification, * @specification: An %ETableSpecification that you want to save * @filename: a file name to store the specification. * - * This routine stores the @specification into @filename. + * This routine stores the @specification into @filename. * * Returns: 0 on success or -1 on error. */ @@ -289,20 +289,20 @@ e_table_specification_save_to_file (ETableSpecification *specification, { xmlDoc *doc; int ret; - + g_return_val_if_fail (specification != NULL, -1); g_return_val_if_fail (filename != NULL, -1); g_return_val_if_fail (E_IS_TABLE_SPECIFICATION (specification), -1); - + if ((doc = xmlNewDoc ((const unsigned char *)"1.0")) == NULL) return -1; - + xmlDocSetRootElement (doc, e_table_specification_save_to_node (specification, doc)); - + ret = e_xml_save_file (filename, doc); - + xmlFreeDoc (doc); - + return ret; } @@ -312,7 +312,7 @@ e_table_specification_save_to_file (ETableSpecification *specification, * * Saves the state of @specification to a string. * - * Returns: an g_alloc() allocated string containing the stringified + * Returns: an g_alloc() allocated string containing the stringified * representation of @specification. This stringified representation * uses XML as a convenience. */ @@ -326,7 +326,7 @@ e_table_specification_save_to_string (ETableSpecification *specification) g_return_val_if_fail (specification != NULL, NULL); g_return_val_if_fail (E_IS_TABLE_SPECIFICATION (specification), NULL); - + doc = xmlNewDoc ((const unsigned char *)"1.0"); xmlDocSetRootElement (doc, e_table_specification_save_to_node (specification, doc)); xmlDocDumpMemory (doc, &string, &length); @@ -342,7 +342,7 @@ e_table_specification_save_to_string (ETableSpecification *specification) * @doc: Node where the specification is saved * * This routine saves the %ETableSpecification state in the object @specification - * into the xmlDoc represented by @doc. + * into the xmlDoc represented by @doc. * * Returns: The node that has been attached to @doc with the contents * of the ETableSpecification. @@ -393,7 +393,7 @@ e_table_specification_save_to_node (ETableSpecification *specification, if (specification->columns){ int i; - + for (i = 0; specification->columns [i]; i++) e_table_column_specification_save_to_node ( specification->columns [i], @@ -422,7 +422,7 @@ e_table_specification_duplicate (ETableSpecification *spec) g_return_val_if_fail (spec != NULL, NULL); g_return_val_if_fail (E_IS_TABLE_SPECIFICATION (spec), NULL); - + new_spec = e_table_specification_new (); spec_str = e_table_specification_save_to_string (spec); if (!e_table_specification_load_from_string (new_spec, spec_str)) { @@ -431,6 +431,6 @@ e_table_specification_duplicate (ETableSpecification *spec) new_spec = NULL; } g_free (spec_str); - + return new_spec; } diff --git a/widgets/table/e-table-specification.h b/widgets/table/e-table-specification.h index bd2de91c67..75d07c7154 100644 --- a/widgets/table/e-table-specification.h +++ b/widgets/table/e-table-specification.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-specification.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c index 5e15a02c4b..57d4376612 100644 --- a/widgets/table/e-table-state.c +++ b/widgets/table/e-table-state.c @@ -52,7 +52,7 @@ etst_dispose (GObject *object) G_OBJECT_CLASS (e_table_state_parent_class)->dispose (object); } - + static void etst_finalize (GObject *object) { @@ -67,7 +67,7 @@ etst_finalize (GObject *object) g_free (etst->expansions); etst->expansions = NULL; } - + G_OBJECT_CLASS (e_table_state_parent_class)->finalize (object); } @@ -130,7 +130,7 @@ e_table_state_load_from_file (ETableState *state, return FALSE; } -void +void e_table_state_load_from_string (ETableState *state, const char *xml) { @@ -192,7 +192,7 @@ e_table_state_load_from_node (ETableState *state, for (iterator = list, i = 0; iterator; i++) { int_and_double *column_info = iterator->data; - + state->columns [i] = column_info->column; state->expansions [i] = column_info->expansion; g_free (column_info); @@ -206,14 +206,14 @@ e_table_state_save_to_file (ETableState *state, const char *filename) { xmlDoc *doc; - + if ((doc = xmlNewDoc ((const unsigned char *)"1.0")) == NULL) return; - + xmlDocSetRootElement (doc, e_table_state_save_to_node (state, NULL)); - + e_xml_save_file (filename, doc); - + xmlFreeDoc (doc); } @@ -279,7 +279,7 @@ e_table_state_duplicate (ETableState *state) { ETableState *new_state; char *copy; - + g_return_val_if_fail (state != NULL, NULL); g_return_val_if_fail (E_IS_TABLE_STATE (state), NULL); diff --git a/widgets/table/e-table-state.h b/widgets/table/e-table-state.h index 2c155eaa19..5612d3fe49 100644 --- a/widgets/table/e-table-state.h +++ b/widgets/table/e-table-state.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-state.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c index f8548139fe..14adabec8b 100644 --- a/widgets/table/e-table-subset-variable.c +++ b/widgets/table/e-table-subset-variable.c @@ -44,7 +44,7 @@ etssv_add (ETableSubsetVariable *etssv, { ETableModel *etm = E_TABLE_MODEL(etssv); ETableSubset *etss = E_TABLE_SUBSET(etssv); - + e_table_model_pre_change(etm); if (etss->n_map + 1 > etssv->n_vals_allocated){ @@ -67,7 +67,7 @@ etssv_add_array (ETableSubsetVariable *etssv, int i; e_table_model_pre_change(etm); - + if (etss->n_map + count > etssv->n_vals_allocated){ etssv->n_vals_allocated += MAX(INCREMENT_AMOUNT, count); etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(int)); @@ -87,7 +87,7 @@ etssv_add_all (ETableSubsetVariable *etssv) int i; e_table_model_pre_change(etm); - + rows = e_table_model_row_count(etss->source); if (etss->n_map + rows > etssv->n_vals_allocated){ etssv->n_vals_allocated += MAX(INCREMENT_AMOUNT, rows); @@ -106,13 +106,13 @@ etssv_remove (ETableSubsetVariable *etssv, ETableModel *etm = E_TABLE_MODEL(etssv); ETableSubset *etss = E_TABLE_SUBSET(etssv); int i; - + for (i = 0; i < etss->n_map; i++){ if (etss->map_table[i] == row) { e_table_model_pre_change (etm); memmove (etss->map_table + i, etss->map_table + i + 1, (etss->n_map - i - 1) * sizeof(int)); etss->n_map --; - + e_table_model_row_deleted (etm, i); return TRUE; } @@ -216,7 +216,7 @@ e_table_subset_variable_clear (ETableSubsetVariable *etssv) g_free (etss->map_table); etss->map_table = (int *)g_new (unsigned int, 1); etssv->n_vals_allocated = 1; - + e_table_model_changed (etm); } diff --git a/widgets/table/e-table-subset-variable.h b/widgets/table/e-table-subset-variable.h index a02b096dbb..5789e0696a 100644 --- a/widgets/table/e-table-subset-variable.h +++ b/widgets/table/e-table-subset-variable.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-subset-variable.h * Copyright 2000, 2001, Ximian, Inc. * @@ -44,7 +44,7 @@ typedef struct { typedef struct { ETableSubsetClass parent_class; - + void (*add) (ETableSubsetVariable *ets, gint row); void (*add_array) (ETableSubsetVariable *ets, diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c index 7c7e8a6def..0c4849a649 100644 --- a/widgets/table/e-table-subset.c +++ b/widgets/table/e-table-subset.c @@ -403,7 +403,7 @@ e_table_subset_construct (ETableSubset *etss, ETableModel *source, int nvals) etss->n_map = nvals; etss->source = source; g_object_ref (source); - + /* Init */ for (i = 0; i < nvals; i++) etss->map_table [i] = i; @@ -422,7 +422,7 @@ e_table_subset_construct (ETableSubset *etss, ETableModel *source, int nvals) G_CALLBACK (etss_proxy_model_rows_inserted), etss); etss->table_model_rows_deleted_id = g_signal_connect (G_OBJECT (source), "model_rows_deleted", G_CALLBACK (etss_proxy_model_rows_deleted), etss); - + return E_TABLE_MODEL (etss); } diff --git a/widgets/table/e-table-subset.h b/widgets/table/e-table-subset.h index 04f1c7efe5..a17b0af976 100644 --- a/widgets/table/e-table-subset.h +++ b/widgets/table/e-table-subset.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-subset.h - Implements a table that contains a subset of another table. * Copyright 1999, 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-tooltip.h b/widgets/table/e-table-tooltip.h index 40fbd5c7d2..2761fccb06 100644 --- a/widgets/table/e-table-tooltip.h +++ b/widgets/table/e-table-tooltip.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-tooltip.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-tree.h b/widgets/table/e-table-tree.h index dd9b844943..0261eb1b6c 100644 --- a/widgets/table/e-table-tree.h +++ b/widgets/table/e-table-tree.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-tree.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-utils.h b/widgets/table/e-table-utils.h index 1a2c213d2d..989a38945e 100644 --- a/widgets/table/e-table-utils.h +++ b/widgets/table/e-table-utils.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-utils.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c index f3c5965716..16e94b2505 100644 --- a/widgets/table/e-table-without.c +++ b/widgets/table/e-table-without.c @@ -50,7 +50,7 @@ struct _ETableWithoutPrivate { void *closure; }; -static gboolean +static gboolean check (ETableWithout *etw, int model_row) { gboolean ret_val; @@ -67,7 +67,7 @@ check (ETableWithout *etw, int model_row) return ret_val; } -static gboolean +static gboolean check_with_key (ETableWithout *etw, void *key, int model_row) { gboolean ret_val; diff --git a/widgets/table/e-table-without.h b/widgets/table/e-table-without.h index c0241dae2d..57d6a4cfe2 100644 --- a/widgets/table/e-table-without.h +++ b/widgets/table/e-table-without.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-without.h * Copyright 2000, 2001, Ximian, Inc. * @@ -54,7 +54,7 @@ typedef struct { typedef struct { ETableSubsetClass parent_class; - + } ETableWithoutClass; GType e_table_without_get_type (void); diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 0925e399f9..a6adf312cf 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -206,7 +206,7 @@ static ETableCol * current_search_col (ETable *et) { if (!et->search_col_set) { - et->current_search_col = + et->current_search_col = e_table_util_calculate_current_search_col (et->header, et->full_header, et->sort_info, @@ -319,7 +319,7 @@ et_dispose (GObject *object) et->group_info_change_id); et->group_info_change_id = 0; } - + if (et->sort_info_change_id) { g_signal_handler_disconnect (G_OBJECT (et->sort_info), et->sort_info_change_id); @@ -480,10 +480,10 @@ init_search (ETable *e_table) e_table->search = e_table_search_new(); - e_table->search_search_id = + e_table->search_search_id = g_signal_connect (G_OBJECT (e_table->search), "search", G_CALLBACK (et_search_search), e_table); - e_table->search_accept_id = + e_table->search_accept_id = g_signal_connect (G_OBJECT (e_table->search), "accept", G_CALLBACK (et_search_accept), e_table); } @@ -925,7 +925,7 @@ et_build_groups (ETable *et) et->model, et->sort_info, 0); - + if (et->use_click_to_add_end) e_canvas_vbox_add_item_start(E_CANVAS_VBOX(et->canvas_vbox), GNOME_CANVAS_ITEM(et->group)); else @@ -1092,7 +1092,7 @@ static gint table_canvas_focus_event_cb (GtkWidget *widget, GdkEventFocus *event, gpointer data) { GnomeCanvas *canvas; - ECanvas *ecanvas; + ECanvas *ecanvas; ETable *etable; gtk_widget_queue_draw (widget); @@ -1108,8 +1108,8 @@ table_canvas_focus_event_cb (GtkWidget *widget, GdkEventFocus *event, gpointer d etable = E_TABLE (data); - if (e_table_model_row_count(etable->model) < 1 - && (etable->click_to_add) + if (e_table_model_row_count(etable->model) < 1 + && (etable->click_to_add) && !(E_TABLE_CLICK_TO_ADD(etable->click_to_add)->row)) { gnome_canvas_item_grab_focus (etable->canvas_vbox); gnome_canvas_item_grab_focus (etable->click_to_add); @@ -1160,7 +1160,7 @@ click_to_add_event (ETableClickToAdd *etcta, GdkEventKey *key, ETable *etable) if (key->type != GDK_KEY_PRESS && key->type != GDK_KEY_RELEASE) { return FALSE; - } + } switch (key->keyval) { case GDK_Tab: case GDK_KP_Tab: @@ -1305,7 +1305,7 @@ e_table_set_state_object(ETable *e_table, ETableState *state) connect_header (e_table, state); - g_value_set_double (val, (double) (GTK_WIDGET(e_table->table_canvas)->allocation.width)); + g_value_set_double (val, (double) (GTK_WIDGET(e_table->table_canvas)->allocation.width)); g_object_set_property (G_OBJECT (e_table->header), "width", val); g_free (val); @@ -1344,7 +1344,7 @@ e_table_set_state_object(ETable *e_table, ETableState *state) g_object_set(e_table->click_to_add, "header", e_table->header, NULL); - + e_table->need_rebuild = TRUE; if (!e_table->rebuild_idle_id) e_table->rebuild_idle_id = g_idle_add_full (20, changed_idle, e_table, NULL); @@ -1452,11 +1452,11 @@ e_table_get_state_object (ETable *e_table) /** * e_table_get_state: * @e_table: The #ETable to act on. - * + * * Builds a state object based on the current state and returns the * string corresponding to that state. - * - * Return value: + * + * Return value: * A string describing the current state of the #ETable. **/ gchar *e_table_get_state (ETable *e_table) @@ -1623,11 +1623,11 @@ et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete, * @ete: An optional #ETableExtras. (%NULL is valid.) * @spec_str: The spec. * @state_str: An optional state. (%NULL is valid.) - * + * * This is the internal implementation of e_table_new() for use by * subclasses or language bindings. See e_table_new() for details. - * - * Return value: + * + * Return value: * The passed in value @e_table or %NULL if there's an error. **/ ETable * @@ -1686,8 +1686,8 @@ e_table_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete, * This is the internal implementation of e_table_new_from_spec_file() * for use by subclasses or language bindings. See * e_table_new_from_spec_file() for details. - * - * Return value: + * + * Return value: * The passed in value @e_table or %NULL if there's an error. **/ ETable * @@ -1752,8 +1752,8 @@ e_table_construct_from_spec_file (ETable *e_table, ETableModel *etm, ETableExtra * default sorting state and such. @state is an optional string * specifying the current sorting state and such. If @state is NULL, * then the default state from the spec will be used. - * - * Return value: + * + * Return value: * The newly created #ETable or %NULL if there's an error. **/ GtkWidget * @@ -1779,7 +1779,7 @@ e_table_new (ETableModel *etm, ETableExtras *ete, const char *spec, const char * * @ete: An optional #ETableExtras. (%NULL is valid.) * @spec_fn: The filename of the spec. * @state_fn: An optional state file. (%NULL is valid.) - * + * * This is very similar to e_table_new(), except instead of passing in * strings you pass in the file names of the spec and state to load. * @@ -1789,8 +1789,8 @@ e_table_new (ETableModel *etm, ETableExtras *ete, const char *spec, const char * * @state_fn is the filename of the initial state to load. If this is * %NULL or if the specified file doesn't exist, the default state * from the spec file is used. - * - * Return value: + * + * Return value: * The newly created #ETable or %NULL if there's an error. **/ GtkWidget * @@ -1920,13 +1920,13 @@ void e_table_save_specification (ETable *e_table, const char *filename) { xmlDoc *doc = et_build_tree (e_table); - + g_return_if_fail(e_table != NULL); g_return_if_fail(E_IS_TABLE(e_table)); g_return_if_fail(filename != NULL); - + e_xml_save_file (filename, doc); - + xmlFreeDoc (doc); } @@ -1961,7 +1961,7 @@ e_table_load_specification (ETable *e_table, gchar *filename) * e_table_set_cursor_row: * @e_table: The #ETable to set the cursor row of * @row: The row number - * + * * Sets the cursor row and the selection to the given row number. **/ void @@ -1979,10 +1979,10 @@ e_table_set_cursor_row (ETable *e_table, int row) /** * e_table_get_cursor_row: * @e_table: The #ETable to query - * + * * Calculates the cursor row. -1 means that we don't have a cursor. - * - * Return value: + * + * Return value: * Cursor row **/ int @@ -2003,7 +2003,7 @@ e_table_get_cursor_row (ETable *e_table) * @e_table: The #ETable to act on * @callback: The callback function to call * @closure: The value passed to the callback's closure argument - * + * * Calls the given @callback function once for every selected row. * * If you change the selection or delete or add rows to the table @@ -2027,10 +2027,10 @@ e_table_selected_row_foreach (ETable *e_table, /** * e_table_selected_count: * @e_table: The #ETable to query - * + * * Counts the number of selected rows. - * - * Return value: + * + * Return value: * The number of rows selected. **/ gint @@ -2045,7 +2045,7 @@ e_table_selected_count (ETable *e_table) /** * e_table_select_all: * @table: The #ETable to modify - * + * * Selects all the rows in @table. **/ void @@ -2060,7 +2060,7 @@ e_table_select_all (ETable *table) /** * e_table_invert_selection: * @table: The #ETable to modify - * + * * Inverts the selection in @table. **/ void @@ -2076,10 +2076,10 @@ e_table_invert_selection (ETable *table) /** * e_table_get_printable: * @e_table: #ETable to query - * + * * Used for printing your #ETable. - * - * Return value: + * + * Return value: * The #EPrintable to print. **/ EPrintable * @@ -2094,7 +2094,7 @@ e_table_get_printable (ETable *e_table) /** * e_table_right_click_up: * @table: The #ETable to modify. - * + * * Call this function when you're done handling the right click if you * return TRUE from the "right_click" signal. **/ @@ -2107,7 +2107,7 @@ e_table_right_click_up (ETable *table) /** * e_table_commit_click_to_add: * @table: The #ETable to modify - * + * * Commits the current values in the click to add to the table. **/ void @@ -2244,11 +2244,11 @@ set_scroll_adjustments (ETable *table, * e_table_get_next_row: * @e_table: The #ETable to query * @model_row: The model row to go from - * + * * This function is used when your table is sorted, but you're using * model row numbers. It returns the next row in sorted order as a model row. - * - * Return value: + * + * Return value: * The model row number. **/ gint @@ -2277,12 +2277,12 @@ e_table_get_next_row (ETable *e_table, * e_table_get_prev_row: * @e_table: The #ETable to query * @model_row: The model row to go from - * + * * This function is used when your table is sorted, but you're using * model row numbers. It returns the previous row in sorted order as * a model row. - * - * Return value: + * + * Return value: * The model row number. **/ gint @@ -2308,10 +2308,10 @@ e_table_get_prev_row (ETable *e_table, * e_table_model_to_view_row: * @e_table: The #ETable to query * @model_row: The model row number - * + * * Turns a model row into a view row. - * - * Return value: + * + * Return value: * The view row number. **/ gint @@ -2331,10 +2331,10 @@ e_table_model_to_view_row (ETable *e_table, * e_table_view_to_model_row: * @e_table: The #ETable to query * @view_row: The view row number - * + * * Turns a view row into a model row. - * - * Return value: + * + * Return value: * The model row number. **/ gint @@ -2357,7 +2357,7 @@ e_table_view_to_model_row (ETable *e_table, * @y: Y coordinate for the pixel * @row_return: Pointer to return the row value * @col_return: Pointer to return the column value - * + * * Return the row and column for the cell in which the pixel at (@x, @y) is * contained. **/ @@ -2388,7 +2388,7 @@ e_table_get_cell_at (ETable *table, * @y_return: Returns the y coordinate of the upper left hand corner of the cell with respect to the widget. * @width_return: Returns the width of the cell. * @height_return: Returns the height of the cell. - * + * * Returns the x, y, width, and height of the given cell. These can * all be #NULL and they just won't be set. **/ @@ -2416,11 +2416,11 @@ e_table_get_cell_geometry (ETable *table, /** * e_table_get_selection_model: * @table: The #ETable to query - * + * * Returns the table's #ESelectionModel in case you want to access it * directly. - * - * Return value: + * + * Return value: * The #ESelectionModel. **/ ESelectionModel * @@ -2504,14 +2504,14 @@ struct _GtkDragSourceInfo /** * e_table_drag_get_data: - * @table: - * @row: - * @col: - * @context: - * @target: - * @time: - * - * + * @table: + * @row: + * @col: + * @context: + * @target: + * @time: + * + * **/ void e_table_drag_get_data (ETable *table, @@ -2586,7 +2586,7 @@ e_table_drag_highlight (ETable *table, /** * e_table_drag_unhighlight: * @table: The #ETable to unhighlight - * + * * Removes the highlight from an #ETable. **/ void @@ -2688,7 +2688,7 @@ et_real_start_drag (ETable *table, int row, int col, GdkEvent *event) * @targets: Table of targets for this source * @n_targets: Number of targets in @targets * @actions: Actions allowed for this source - * + * * Registers this table as a drag site, and possibly adds default behaviors. **/ void @@ -2735,7 +2735,7 @@ e_table_drag_source_set (ETable *table, /** * e_table_drag_source_unset: * @table: The #ETable to un set up as a drag site - * + * * Unregisters this #ETable as a drag site. **/ void @@ -2770,10 +2770,10 @@ e_table_drag_source_unset (ETable *table) * @actions: The available actions supported by the drag * @button: The button held down for the drag * @event: The event that initiated the drag - * + * * Start a drag from this cell. - * - * Return value: + * + * Return value: * The drag context. **/ GdkDragContext * @@ -2896,7 +2896,7 @@ scroll_timeout (gpointer data) et->last_drop_x, et->last_drop_y, et->last_drop_time); - + return TRUE; } diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h index 6be18b462d..7d6bb2a97e 100644 --- a/widgets/table/e-table.h +++ b/widgets/table/e-table.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table.h - A graphical view of a Table. * Copyright 1999, 2000, 2001, Ximian, Inc. * @@ -129,7 +129,7 @@ typedef struct { guint uniform_row_height : 1; guint allow_grouping : 1; - + guint always_search : 1; guint search_col_set : 1; @@ -195,8 +195,8 @@ typedef struct { int row, int col, GdkDragContext *context); - - /* Target side drag signals */ + + /* Target side drag signals */ void (* table_drag_leave) (ETable *table, int row, int col, diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c index 7be5be153c..b10e14c262 100644 --- a/widgets/table/e-tree-memory-callbacks.c +++ b/widgets/table/e-tree-memory-callbacks.c @@ -102,7 +102,7 @@ etmc_sort_value_at (ETreeModel *etm, ETreePath node, int col) if (etmc->sort_value_at) return etmc->sort_value_at (etm, node, col, etmc->model_data); - else + else return etmc->value_at (etm, node, col, etmc->model_data); } @@ -156,7 +156,7 @@ static void * etmc_initialize_value (ETreeModel *etm, int col) { ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm); - + if (etmc->initialize_value) return etmc->initialize_value (etm, col, etmc->model_data); else @@ -167,7 +167,7 @@ static gboolean etmc_value_is_empty (ETreeModel *etm, int col, const void *value) { ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm); - + if (etmc->value_is_empty) return etmc->value_is_empty (etm, col, value, etmc->model_data); else @@ -178,7 +178,7 @@ static char * etmc_value_to_string (ETreeModel *etm, int col, const void *value) { ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm); - + if (etmc->value_to_string) return etmc->value_to_string (etm, col, value, etmc->model_data); else @@ -220,7 +220,7 @@ e_tree_memory_callbacks_init (ETreeMemoryCallbacks *etmc) /** * e_tree_memory_callbacks_new: - * + * * This initializes a new ETreeMemoryCallbacksModel object. * ETreeMemoryCallbacksModel is an implementaiton of the somewhat * abstract class ETreeMemory. The ETreeMemoryCallbacksModel is @@ -231,8 +231,8 @@ e_tree_memory_callbacks_init (ETreeMemoryCallbacks *etmc) * Instead, ETreeMemoryCallbacksModel uses a setup based in callback functions, every * callback function signature mimics the signature of each ETreeModel method * and passes the extra @data pointer to each one of the method to provide them - * with any context they might want to use. - * + * with any context they might want to use. + * * ETreeMemoryCallbacks is to ETreeMemory as ETableSimple is to ETableModel. * * Return value: An ETreeMemoryCallbacks object (which is also an diff --git a/widgets/table/e-tree-memory-callbacks.h b/widgets/table/e-tree-memory-callbacks.h index 04df18ae7a..dcec18a8ba 100644 --- a/widgets/table/e-tree-memory-callbacks.h +++ b/widgets/table/e-tree-memory-callbacks.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-tree-memory-callbacks.h * Copyright 2000, 2001, Ximian, Inc. * @@ -71,7 +71,7 @@ typedef struct { ETreeMemoryCallbacksHasGetNodeByIdFn has_get_node_by_id; ETreeMemoryCallbacksGetNodeByIdFn get_node_by_id; - ETreeMemoryCallbacksValueAtFn sort_value_at; + ETreeMemoryCallbacksValueAtFn sort_value_at; ETreeMemoryCallbacksValueAtFn value_at; ETreeMemoryCallbacksSetValueAtFn set_value_at; ETreeMemoryCallbacksIsEditableFn is_editable; diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c index 4ea1e01c3d..301468c3d4 100644 --- a/widgets/table/e-tree-memory.c +++ b/widgets/table/e-tree-memory.c @@ -166,11 +166,11 @@ e_tree_path_unlink (ETreeMemoryPath *path) /** * e_tree_memory_freeze: * @etmm: the ETreeModel to freeze. - * + * * This function prepares an ETreeModel for a period of much change. * All signals regarding changes to the tree are deferred until we * thaw the tree. - * + * **/ void e_tree_memory_freeze(ETreeMemory *etmm) @@ -186,11 +186,11 @@ e_tree_memory_freeze(ETreeMemory *etmm) /** * e_tree_memory_thaw: * @etmm: the ETreeMemory to thaw. - * + * * This function thaws an ETreeMemory. All the defered signals can add * up to a lot, we don't know - so we just emit a model_changed * signal. - * + * **/ void e_tree_memory_thaw(ETreeMemory *etmm) @@ -399,9 +399,9 @@ e_tree_memory_init (ETreeMemory *etmm) /** * e_tree_memory_construct: - * @etree: - * - * + * @etree: + * + * **/ void e_tree_memory_construct (ETreeMemory *etmm) @@ -432,18 +432,18 @@ void e_tree_memory_set_expanded_default (ETreeMemory *etree, gboolean expanded) { g_return_if_fail (etree != NULL); - + etree->priv->expanded_default = expanded; } /** * e_tree_memory_node_get_data: - * @etmm: - * @node: - * - * - * - * Return value: + * @etmm: + * @node: + * + * + * + * Return value: **/ gpointer e_tree_memory_node_get_data (ETreeMemory *etmm, ETreePath node) @@ -457,11 +457,11 @@ e_tree_memory_node_get_data (ETreeMemory *etmm, ETreePath node) /** * e_tree_memory_node_set_data: - * @etmm: - * @node: - * @node_data: - * - * + * @etmm: + * @node: + * @node_data: + * + * **/ void e_tree_memory_node_set_data (ETreeMemory *etmm, ETreePath node, gpointer node_data) @@ -475,14 +475,14 @@ e_tree_memory_node_set_data (ETreeMemory *etmm, ETreePath node, gpointer node_da /** * e_tree_memory_node_insert: - * @tree_model: - * @parent_path: - * @position: - * @node_data: - * - * - * - * Return value: + * @tree_model: + * @parent_path: + * @position: + * @node_data: + * + * + * + * Return value: **/ ETreePath e_tree_memory_node_insert (ETreeMemory *tree_model, @@ -530,14 +530,14 @@ ETreePath e_tree_memory_node_insert_id (ETreeMemory *etree, ETreePath parent /** * e_tree_memory_node_insert_before: - * @etree: - * @parent: - * @sibling: - * @node_data: - * - * - * - * Return value: + * @etree: + * @parent: + * @sibling: + * @node_data: + * + * + * + * Return value: **/ ETreePath e_tree_memory_node_insert_before (ETreeMemory *etree, @@ -585,12 +585,12 @@ child_free(ETreeMemory *etree, ETreeMemoryPath *node) /** * e_tree_memory_node_remove: - * @etree: - * @path: - * - * - * - * Return value: + * @etree: + * @path: + * + * + * + * Return value: **/ gpointer e_tree_memory_node_remove (ETreeMemory *etree, ETreePath node) @@ -606,7 +606,7 @@ e_tree_memory_node_remove (ETreeMemory *etree, ETreePath node) if (!etree->priv->frozen) { e_tree_model_pre_change(E_TREE_MODEL(etree)); for (old_position = 0, sibling = path; - sibling; + sibling; old_position++, sibling = sibling->prev_sibling) /* Empty intentionally*/; old_position --; @@ -661,7 +661,7 @@ e_tree_memory_sort_node (ETreeMemory *etmm, ETreeMemoryPath *last; e_tree_model_pre_change (E_TREE_MODEL (etmm)); - + i = 0; for (child = path->first_child; child; child = child->next_sibling) i++; diff --git a/widgets/table/e-tree-memory.h b/widgets/table/e-tree-memory.h index ca498c99eb..a1318e28d3 100644 --- a/widgets/table/e-tree-memory.h +++ b/widgets/table/e-tree-memory.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-tree-memory.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c index b694536763..54cece5d00 100644 --- a/widgets/table/e-tree-model.c +++ b/widgets/table/e-tree-model.c @@ -203,19 +203,19 @@ e_tree_model_init (ETreeModel *tree_model) /** * e_tree_model_node_changed: - * @tree_model: - * @node: - * - * - * - * Return value: + * @tree_model: + * @node: + * + * + * + * Return value: **/ void e_tree_model_pre_change (ETreeModel *tree_model) { g_return_if_fail (tree_model != NULL); g_return_if_fail (E_IS_TREE_MODEL (tree_model)); - + d(g_print("Emitting pre_change on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type))); g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [PRE_CHANGE], 0); @@ -223,19 +223,19 @@ e_tree_model_pre_change (ETreeModel *tree_model) /** * e_tree_model_node_changed: - * @tree_model: - * @node: - * - * - * - * Return value: + * @tree_model: + * @node: + * + * + * + * Return value: **/ void e_tree_model_no_change (ETreeModel *tree_model) { g_return_if_fail (tree_model != NULL); g_return_if_fail (E_IS_TREE_MODEL (tree_model)); - + d(g_print("Emitting no_change on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type))); g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NO_CHANGE], 0); @@ -243,19 +243,19 @@ e_tree_model_no_change (ETreeModel *tree_model) /** * e_tree_model_node_changed: - * @tree_model: - * @node: - * - * - * - * Return value: + * @tree_model: + * @node: + * + * + * + * Return value: **/ void e_tree_model_node_changed (ETreeModel *tree_model, ETreePath node) { g_return_if_fail (tree_model != NULL); g_return_if_fail (E_IS_TREE_MODEL (tree_model)); - + d(g_print("Emitting node_changed on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type))); g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NODE_CHANGED], 0, node); @@ -263,19 +263,19 @@ e_tree_model_node_changed (ETreeModel *tree_model, ETreePath node) /** * e_tree_model_node_data_changed: - * @tree_model: - * @node: - * - * - * - * Return value: + * @tree_model: + * @node: + * + * + * + * Return value: **/ void e_tree_model_node_data_changed (ETreeModel *tree_model, ETreePath node) { g_return_if_fail (tree_model != NULL); g_return_if_fail (E_IS_TREE_MODEL (tree_model)); - + d(g_print("Emitting node_data_changed on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type))); g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NODE_DATA_CHANGED], 0, node); @@ -283,19 +283,19 @@ e_tree_model_node_data_changed (ETreeModel *tree_model, ETreePath node) /** * e_tree_model_node_col_changed: - * @tree_model: - * @node: - * - * - * - * Return value: + * @tree_model: + * @node: + * + * + * + * Return value: **/ void e_tree_model_node_col_changed (ETreeModel *tree_model, ETreePath node, int col) { g_return_if_fail (tree_model != NULL); g_return_if_fail (E_IS_TREE_MODEL (tree_model)); - + d(g_print("Emitting node_col_changed on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type))); g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NODE_COL_CHANGED], 0, node, col); @@ -303,11 +303,11 @@ e_tree_model_node_col_changed (ETreeModel *tree_model, ETreePath node, int col) /** * e_tree_model_node_inserted: - * @tree_model: - * @parent_node: - * @inserted_node: - * - * + * @tree_model: + * @parent_node: + * @inserted_node: + * + * **/ void e_tree_model_node_inserted (ETreeModel *tree_model, @@ -325,18 +325,18 @@ e_tree_model_node_inserted (ETreeModel *tree_model, /** * e_tree_model_node_removed: - * @tree_model: - * @parent_node: - * @removed_node: - * - * + * @tree_model: + * @parent_node: + * @removed_node: + * + * **/ void e_tree_model_node_removed (ETreeModel *tree_model, ETreePath parent_node, ETreePath removed_node, int old_position) { g_return_if_fail (tree_model != NULL); g_return_if_fail (E_IS_TREE_MODEL (tree_model)); - + d(g_print("Emitting node_removed on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type))); g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NODE_REMOVED], 0, @@ -345,17 +345,17 @@ e_tree_model_node_removed (ETreeModel *tree_model, ETreePath parent_node, ETree /** * e_tree_model_node_deleted: - * @tree_model: - * @deleted_node: - * - * + * @tree_model: + * @deleted_node: + * + * **/ void e_tree_model_node_deleted (ETreeModel *tree_model, ETreePath deleted_node) { g_return_if_fail (tree_model != NULL); g_return_if_fail (E_IS_TREE_MODEL (tree_model)); - + d(g_print("Emitting node_deleted on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type))); g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NODE_DELETED], 0, deleted_node); @@ -363,17 +363,17 @@ e_tree_model_node_deleted (ETreeModel *tree_model, ETreePath deleted_node) /** * e_tree_model_node_request_collapse: - * @tree_model: - * @collapsed_node: - * - * + * @tree_model: + * @collapsed_node: + * + * **/ void e_tree_model_node_request_collapse (ETreeModel *tree_model, ETreePath collapsed_node) { g_return_if_fail (tree_model != NULL); g_return_if_fail (E_IS_TREE_MODEL (tree_model)); - + d(g_print("Emitting node_request_collapse on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type))); g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NODE_REQUEST_COLLAPSE], 0, collapsed_node); @@ -402,7 +402,7 @@ e_tree_model_new (void) * * return values: the ETreePath corresponding to the root node. */ -ETreePath +ETreePath e_tree_model_get_root (ETreeModel *etree) { g_return_val_if_fail (etree != NULL, NULL); @@ -416,14 +416,14 @@ e_tree_model_get_root (ETreeModel *etree) /** * e_tree_model_node_get_parent: - * @etree: - * @path: - * - * - * - * Return value: + * @etree: + * @path: + * + * + * + * Return value: **/ -ETreePath +ETreePath e_tree_model_node_get_parent (ETreeModel *etree, ETreePath node) { g_return_val_if_fail(etree != NULL, NULL); @@ -435,14 +435,14 @@ e_tree_model_node_get_parent (ETreeModel *etree, ETreePath node) /** * e_tree_model_node_get_first_child: - * @etree: - * @node: - * - * - * - * Return value: + * @etree: + * @node: + * + * + * + * Return value: **/ -ETreePath +ETreePath e_tree_model_node_get_first_child (ETreeModel *etree, ETreePath node) { g_return_val_if_fail (etree != NULL, NULL); @@ -456,14 +456,14 @@ e_tree_model_node_get_first_child (ETreeModel *etree, ETreePath node) /** * e_tree_model_node_get_last_child: - * @etree: - * @node: - * - * - * - * Return value: + * @etree: + * @node: + * + * + * + * Return value: **/ -ETreePath +ETreePath e_tree_model_node_get_last_child (ETreeModel *etree, ETreePath node) { g_return_val_if_fail (etree != NULL, NULL); @@ -478,14 +478,14 @@ e_tree_model_node_get_last_child (ETreeModel *etree, ETreePath node) /** * e_tree_model_node_get_next: - * @etree: - * @node: - * - * - * - * Return value: + * @etree: + * @node: + * + * + * + * Return value: **/ -ETreePath +ETreePath e_tree_model_node_get_next (ETreeModel *etree, ETreePath node) { g_return_val_if_fail (etree != NULL, NULL); @@ -499,14 +499,14 @@ e_tree_model_node_get_next (ETreeModel *etree, ETreePath node) /** * e_tree_model_node_get_prev: - * @etree: - * @node: - * - * - * - * Return value: + * @etree: + * @node: + * + * + * + * Return value: **/ -ETreePath +ETreePath e_tree_model_node_get_prev (ETreeModel *etree, ETreePath node) { g_return_val_if_fail (etree != NULL, NULL); @@ -520,12 +520,12 @@ e_tree_model_node_get_prev (ETreeModel *etree, ETreePath node) /** * e_tree_model_node_is_root: - * @etree: - * @path: - * - * - * - * Return value: + * @etree: + * @path: + * + * + * + * Return value: **/ gboolean e_tree_model_node_is_root (ETreeModel *etree, ETreePath node) @@ -540,12 +540,12 @@ e_tree_model_node_is_root (ETreeModel *etree, ETreePath node) /** * e_tree_model_node_is_expandable: - * @etree: - * @path: - * - * - * - * Return value: + * @etree: + * @path: + * + * + * + * Return value: **/ gboolean e_tree_model_node_is_expandable (ETreeModel *etree, ETreePath node) @@ -571,12 +571,12 @@ e_tree_model_node_get_children (ETreeModel *etree, ETreePath node, ETreePath **n /** * e_tree_model_node_depth: - * @etree: - * @path: - * - * - * - * Return value: + * @etree: + * @path: + * + * + * + * Return value: **/ guint e_tree_model_node_depth (ETreeModel *etree, ETreePath node) @@ -761,12 +761,12 @@ e_tree_model_has_change_pending (ETreeModel *etree) * @etree: The ETreeModel. * @node: The ETreePath to the node we're getting the data from. * @col: the column to retrieve data from - * + * * Return value: This function returns the value that is stored by the * @etree in column @col and node @node. The data returned can be a * pointer or any data value that can be stored inside a pointer. * - * The data returned is typically used by an sort renderer if it wants + * The data returned is typically used by an sort renderer if it wants * to proxy the data of cell value_at at a better sorting order. * * The data returned must be valid until the model sends a signal that @@ -793,7 +793,7 @@ e_tree_model_sort_value_at (ETreeModel *etree, ETreePath node, int col) * @etree: The ETreeModel. * @node: The ETreePath to the node we're getting the data from. * @col: the column to retrieve data from - * + * * Return value: This function returns the value that is stored by the * @etree in column @col and node @node. The data returned can be a * pointer or any data value that can be stored inside a pointer. @@ -831,12 +831,12 @@ e_tree_model_set_value_at (ETreeModel *etree, ETreePath node, int col, const voi /** * e_tree_model_node_is_editable: - * @etree: - * @path: - * - * - * - * Return value: + * @etree: + * @path: + * + * + * + * Return value: **/ gboolean e_tree_model_node_is_editable (ETreeModel *etree, ETreePath node, int col) @@ -851,12 +851,12 @@ e_tree_model_node_is_editable (ETreeModel *etree, ETreePath node, int col) /** * e_tree_model_duplicate_value: - * @etree: - * @path: - * - * - * - * Return value: + * @etree: + * @path: + * + * + * + * Return value: **/ void * e_tree_model_duplicate_value (ETreeModel *etree, int col, const void *value) @@ -871,12 +871,12 @@ e_tree_model_duplicate_value (ETreeModel *etree, int col, const void *value) /** * e_tree_model_free_value: - * @etree: - * @path: - * - * - * - * Return value: + * @etree: + * @path: + * + * + * + * Return value: **/ void e_tree_model_free_value (ETreeModel *etree, int col, void *value) @@ -889,12 +889,12 @@ e_tree_model_free_value (ETreeModel *etree, int col, void *value) /** * e_tree_model_initialize_value: - * @etree: - * @path: - * - * - * - * Return value: + * @etree: + * @path: + * + * + * + * Return value: **/ void * e_tree_model_initialize_value (ETreeModel *etree, int col) @@ -909,12 +909,12 @@ e_tree_model_initialize_value (ETreeModel *etree, int col) /** * e_tree_model_value_is_empty: - * @etree: - * @path: - * - * - * - * Return value: + * @etree: + * @path: + * + * + * + * Return value: **/ gboolean e_tree_model_value_is_empty (ETreeModel *etree, int col, const void *value) @@ -929,12 +929,12 @@ e_tree_model_value_is_empty (ETreeModel *etree, int col, const void *value) /** * e_tree_model_value_to_string: - * @etree: - * @path: - * - * - * - * Return value: + * @etree: + * @path: + * + * + * + * Return value: **/ char * e_tree_model_value_to_string (ETreeModel *etree, int col, const void *value) @@ -949,12 +949,12 @@ e_tree_model_value_to_string (ETreeModel *etree, int col, const void *value) /** * e_tree_model_node_traverse: - * @model: - * @path: - * @func: - * @data: - * - * + * @model: + * @path: + * @func: + * @data: + * + * **/ void e_tree_model_node_traverse (ETreeModel *model, ETreePath path, ETreePathFunc func, gpointer data) @@ -981,12 +981,12 @@ e_tree_model_node_traverse (ETreeModel *model, ETreePath path, ETreePathFunc fun /** * e_tree_model_node_traverse_preorder: - * @model: - * @path: - * @func: - * @data: - * - * + * @model: + * @path: + * @func: + * @data: + * + * **/ void e_tree_model_node_traverse_preorder (ETreeModel *model, ETreePath path, ETreePathFunc func, gpointer data) @@ -1014,12 +1014,12 @@ e_tree_model_node_traverse_preorder (ETreeModel *model, ETreePath path, ETreePat /** * e_tree_model_node_traverse_preorder: - * @model: - * @path: - * @func: - * @data: - * - * + * @model: + * @path: + * @func: + * @data: + * + * **/ static ETreePath e_tree_model_node_real_traverse (ETreeModel *model, ETreePath path, ETreePath end_path, gboolean forward_direction, ETreePathFunc func, gpointer data) @@ -1057,12 +1057,12 @@ e_tree_model_node_real_traverse (ETreeModel *model, ETreePath path, ETreePath en /** * e_tree_model_node_traverse_preorder: - * @model: - * @path: - * @func: - * @data: - * - * + * @model: + * @path: + * @func: + * @data: + * + * **/ ETreePath e_tree_model_node_find (ETreeModel *model, ETreePath path, ETreePath end_path, gboolean forward_direction, ETreePathFunc func, gpointer data) diff --git a/widgets/table/e-tree-model.h b/widgets/table/e-tree-model.h index ae20775fca..1d6168ff6f 100644 --- a/widgets/table/e-tree-model.h +++ b/widgets/table/e-tree-model.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-tree-model.h * Copyright 2000, 2001, Ximian, Inc. * @@ -88,7 +88,7 @@ struct ETreeModelClass { void *(*value_at) (ETreeModel *etm, ETreePath node, int col); void (*set_value_at) (ETreeModel *etm, ETreePath node, int col, const void *val); gboolean (*is_editable) (ETreeModel *etm, ETreePath node, int col); - + void *(*duplicate_value) (ETreeModel *etm, int col, const void *value); void (*free_value) (ETreeModel *etm, int col, void *value); void *(*initialize_value) (ETreeModel *etm, int col); diff --git a/widgets/table/e-tree-scrolled.h b/widgets/table/e-tree-scrolled.h index 21d543e2d0..9671061222 100644 --- a/widgets/table/e-tree-scrolled.h +++ b/widgets/table/e-tree-scrolled.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-tree-scrolled.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c index be6be84dbe..2cd81690a5 100644 --- a/widgets/table/e-tree-selection-model.c +++ b/widgets/table/e-tree-selection-model.c @@ -357,7 +357,7 @@ etsm_is_path_selected (ETreeSelectionModel *etsm, ETreePath path) return FALSE; } -/** +/** * e_selection_model_is_row_selected * @selection: #ESelectionModel to check * @n: The row to check @@ -398,7 +398,7 @@ etsm_row_foreach_cb (gpointer key, gpointer value, gpointer user_data) mac->callback(row, mac->closure); } -/** +/** * e_selection_model_foreach * @selection: #ESelectionModel to traverse * @callback: The callback function to call back. @@ -407,7 +407,7 @@ etsm_row_foreach_cb (gpointer key, gpointer value, gpointer user_data) * This routine calls the given callback function once for each * selected row, passing closure as the closure. */ -static void +static void etsm_foreach (ESelectionModel *selection, EForeachFunc callback, gpointer closure) @@ -422,7 +422,7 @@ etsm_foreach (ESelectionModel *selection, g_hash_table_foreach(etsm->priv->paths, etsm_row_foreach_cb, &mac); } -/** +/** * e_selection_model_clear * @selection: #ESelectionModel to clear * @@ -440,7 +440,7 @@ etsm_clear(ESelectionModel *selection) e_selection_model_cursor_changed(E_SELECTION_MODEL(etsm), -1, -1); } -/** +/** * e_selection_model_selected_count * @selection: #ESelectionModel to count * @@ -463,7 +463,7 @@ etsm_row_count (ESelectionModel *selection) return e_table_model_row_count(E_TABLE_MODEL(etsm->priv->etta)); } -/** +/** * e_selection_model_select_all * @selection: #ESelectionModel to select all * @@ -490,7 +490,7 @@ etsm_select_all (ESelectionModel *selection) e_selection_model_cursor_changed(E_SELECTION_MODEL(etsm), get_cursor_row(etsm), etsm->priv->cursor_col); } -/** +/** * e_selection_model_invert_selection * @selection: #ESelectionModel to invert * @@ -802,28 +802,28 @@ e_tree_selection_model_class_init (ETreeSelectionModelClass *klass) esm_class->move_selection_end = etsm_move_selection_end ; esm_class->set_selection_end = etsm_set_selection_end ; - g_object_class_install_property (object_class, PROP_CURSOR_ROW, + g_object_class_install_property (object_class, PROP_CURSOR_ROW, g_param_spec_int ("cursor_row", _("Cursor Row"), /*_( */"XXX blurb" /*)*/, 0, G_MAXINT, 0, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_CURSOR_COL, + g_object_class_install_property (object_class, PROP_CURSOR_COL, g_param_spec_int ("cursor_col", _("Cursor Column"), /*_( */"XXX blurb" /*)*/, 0, G_MAXINT, 0, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_MODEL, + g_object_class_install_property (object_class, PROP_MODEL, g_param_spec_object ("model", _("Model"), "XXX blurb", E_TREE_MODEL_TYPE, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_ETTA, + g_object_class_install_property (object_class, PROP_ETTA, g_param_spec_object ("etta", "ETTA", "XXX blurb", diff --git a/widgets/table/e-tree-selection-model.h b/widgets/table/e-tree-selection-model.h index d574bf3ab6..2920ac6a9e 100644 --- a/widgets/table/e-tree-selection-model.h +++ b/widgets/table/e-tree-selection-model.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-tree-selection-model.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-tree-simple.c b/widgets/table/e-tree-simple.c index f63e991ec1..8d77ca7078 100644 --- a/widgets/table/e-tree-simple.c +++ b/widgets/table/e-tree-simple.c @@ -63,7 +63,7 @@ static void * simple_initialize_value (ETableModel *etm, int col) { ETreeSimple *simple = E_TREE_SIMPLE(etm); - + if (simple->initialize_value) return simple->initialize_value (etm, col, simple->model_data); else @@ -74,7 +74,7 @@ static gboolean simple_value_is_empty (ETableModel *etm, int col, const void *value) { ETreeSimple *simple = E_TREE_SIMPLE(etm); - + if (simple->value_is_empty) return simple->value_is_empty (etm, col, value, simple->model_data); else @@ -85,7 +85,7 @@ static char * simple_value_to_string (ETableModel *etm, int col, const void *value) { ETreeSimple *simple = E_TREE_SIMPLE(etm); - + if (simple->value_to_string) return simple->value_to_string (etm, col, value, simple->model_data); else @@ -147,18 +147,18 @@ G_DEFINE_TYPE (ETreeSimple, e_tree_simple, E_TREE_MODEL_TYPE) /** * e_tree_simple_new: - * @col_count: - * @duplicate_value: - * @free_value: - * @initialize_value: - * @value_is_empty: - * @value_to_string: - * @icon_at: - * @value_at: - * @set_value_at: - * @is_editable: - * @model_data: - * + * @col_count: + * @duplicate_value: + * @free_value: + * @initialize_value: + * @value_is_empty: + * @value_to_string: + * @icon_at: + * @value_at: + * @set_value_at: + * @is_editable: + * @model_data: + * * This initializes a new ETreeSimpleModel object. ETreeSimpleModel is * an implementaiton of the abstract class ETreeModel. The ETreeSimpleModel * is designed to allow people to easily create ETreeModels without having @@ -167,8 +167,8 @@ G_DEFINE_TYPE (ETreeSimple, e_tree_simple, E_TREE_MODEL_TYPE) * Instead, ETreeSimpleModel uses a setup based in callback functions, every * callback function signature mimics the signature of each ETreeModel method * and passes the extra @data pointer to each one of the method to provide them - * with any context they might want to use. - * + * with any context they might want to use. + * * ETreeSimple is to ETreeModel as ETableSimple is to ETableModel. * * Return value: An ETreeSimple object (which is also an ETreeModel diff --git a/widgets/table/e-tree-simple.h b/widgets/table/e-tree-simple.h index d0b4f14828..c96acbcfe8 100644 --- a/widgets/table/e-tree-simple.h +++ b/widgets/table/e-tree-simple.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-tree-simple.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c index 0145a409d1..4bb9d9ada7 100644 --- a/widgets/table/e-tree-sorted-variable.c +++ b/widgets/table/e-tree-sorted-variable.c @@ -84,7 +84,7 @@ etsv_dispose (GObject *object) if (etsv->sort_idle_id) g_source_remove(etsv->sort_idle_id); etsv->sort_idle_id = 0; - + if (etsv->insert_idle_id) g_source_remove(etsv->insert_idle_id); etsv->insert_idle_id = 0; @@ -359,7 +359,7 @@ etsv_sort_tree(ETreeSortedVariable *etsv, GNode *root) GNode *childr; etsv_sort_node(etsv, node); - + for (child = node->child; child; child = child->next) { etsv_sort_tree(etsv, child); } diff --git a/widgets/table/e-tree-sorted-variable.h b/widgets/table/e-tree-sorted-variable.h index bf599a0b2d..e737b87e02 100644 --- a/widgets/table/e-tree-sorted-variable.h +++ b/widgets/table/e-tree-sorted-variable.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-tree-sorted-variable.h * Copyright 2000, 2001, Ximian, Inc. * @@ -43,7 +43,7 @@ typedef struct { ETreeModel base; ETableSortInfo *sort_info; - + ETableHeader *full_header; int table_model_changed_id; diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c index ea8f024dd4..62496a301f 100644 --- a/widgets/table/e-tree-sorted.c +++ b/widgets/table/e-tree-sorted.c @@ -519,7 +519,7 @@ resort_node (ETreeSorted *ets, ETreeSortedPath *path, gboolean resort_all_childr path->child_needs_resort = 0; } } - path->needs_resort = 0; + path->needs_resort = 0; path->child_needs_resort = 0; path->needs_regen_to_sort = 0; path->resort_all_children = 0; @@ -920,7 +920,7 @@ static void * ets_initialize_value (ETreeModel *etm, int col) { ETreeSorted *ets = E_TREE_SORTED(etm); - + return e_tree_model_initialize_value (ets->priv->source, col); } @@ -928,7 +928,7 @@ static gboolean ets_value_is_empty (ETreeModel *etm, int col, const void *value) { ETreeSorted *ets = E_TREE_SORTED(etm); - + return e_tree_model_value_is_empty (ets->priv->source, col, value); } @@ -936,7 +936,7 @@ static char * ets_value_to_string (ETreeModel *etm, int col, const void *value) { ETreeSorted *ets = E_TREE_SORTED(etm); - + return e_tree_model_value_to_string (ets->priv->source, col, value); } @@ -1153,7 +1153,7 @@ e_tree_sorted_class_init (ETreeSortedClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); klass->node_resorted = NULL; - + object_class->dispose = ets_dispose; object_class->finalize = ets_finalize; @@ -1239,9 +1239,9 @@ e_tree_sorted_init (ETreeSorted *ets) /** * e_tree_sorted_construct: - * @etree: - * - * + * @etree: + * + * **/ void e_tree_sorted_construct (ETreeSorted *ets, ETreeModel *source, ETableHeader *full_header, ETableSortInfo *sort_info) @@ -1340,7 +1340,7 @@ e_tree_sorted_node_resorted (ETreeSorted *sorted, ETreePath node) { g_return_if_fail (sorted != NULL); g_return_if_fail (E_IS_TREE_SORTED (sorted)); - + g_signal_emit (G_OBJECT (sorted), signals [NODE_RESORTED], 0, node); } diff --git a/widgets/table/e-tree-sorted.h b/widgets/table/e-tree-sorted.h index d866bbd8fc..fce505f672 100644 --- a/widgets/table/e-tree-sorted.h +++ b/widgets/table/e-tree-sorted.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-tree-sorted.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index afaf5f57fc..17e1987e86 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-tree-table-adapter.c * Copyright 2000, 2001, Ximian, Inc. * @@ -168,8 +168,8 @@ resort_node(ETreeTableAdapter *etta, GNode *gnode, gboolean recurse) sort_needed = etta->priv->sort_info && e_table_sort_info_sorting_get_count (etta->priv->sort_info) > 0; - for (i = 0, path = e_tree_model_node_get_first_child(etta->priv->source, node->path); path; - path = e_tree_model_node_get_next(etta->priv->source, path), i++); + for (i = 0, path = e_tree_model_node_get_first_child(etta->priv->source, node->path); path; + path = e_tree_model_node_get_next(etta->priv->source, path), i++); count = i; if (count <= 1) @@ -177,7 +177,7 @@ resort_node(ETreeTableAdapter *etta, GNode *gnode, gboolean recurse) paths = g_new0(ETreePath, count); - for (i = 0, path = e_tree_model_node_get_first_child(etta->priv->source, node->path); path; + for (i = 0, path = e_tree_model_node_get_first_child(etta->priv->source, node->path); path; path = e_tree_model_node_get_next(etta->priv->source, path), i++) paths[i] = path; @@ -805,7 +805,7 @@ etta_proxy_node_inserted (ETreeModel *etm, ETreePath parent, ETreePath child, ET generate_tree(etta, child); else insert_node(etta, parent, child); - + e_table_model_changed(E_TABLE_MODEL(etta)); } @@ -918,7 +918,7 @@ e_tree_table_adapter_save_expanded_state (ETreeTableAdapter *etta, const char *f TreeAndRoot tar; xmlDocPtr doc; xmlNode *root; - + g_return_if_fail(etta != NULL); doc = xmlNewDoc ((const unsigned char *)"1.0"); @@ -928,7 +928,7 @@ e_tree_table_adapter_save_expanded_state (ETreeTableAdapter *etta, const char *f tar.model = etta->priv->source; tar.root = root; tar.expanded_default = e_tree_model_get_expanded_default(etta->priv->source); - + e_xml_set_integer_prop_by_name (root, (const unsigned char *)"vers", 2); e_xml_set_bool_prop_by_name (root, (const unsigned char *)"default", tar.expanded_default); @@ -1012,7 +1012,7 @@ set_collapsed_state_func (gpointer keyp, gpointer value, gpointer data) void e_tree_table_adapter_load_all_expanded_state (ETreeTableAdapter *etta, gboolean state) { - + g_return_if_fail(etta != NULL); if (state) @@ -1038,7 +1038,7 @@ e_tree_table_adapter_load_expanded_state (ETreeTableAdapter *etta, const char *f root = xmlDocGetRootElement (doc); e_table_model_pre_change(E_TABLE_MODEL(etta)); - + model_default = e_tree_model_get_expanded_default(etta->priv->source); if (!strcmp ((char *)root->name, "expanded_state")) { @@ -1048,10 +1048,10 @@ e_tree_table_adapter_load_expanded_state (ETreeTableAdapter *etta, const char *f if (state[0] == 't') file_default = TRUE; - else + else file_default = FALSE; /* Even unspecified we'll consider as false */ } - + /* Incase the default is changed, lets forget the changes and stick to default */ if (file_default != model_default) { @@ -1136,7 +1136,7 @@ e_tree_table_adapter_node_set_expanded (ETreeTableAdapter *etta, ETreePath path, return; node->expanded = expanded; - + row = get_row(etta, path); if (row == -1) return; @@ -1178,8 +1178,8 @@ e_tree_table_adapter_node_set_expanded_recurse (ETreeTableAdapter *etta, ETreePa e_tree_table_adapter_node_set_expanded(etta, path, expanded); - for (children = e_tree_model_node_get_first_child(etta->priv->source, path); - children; + for (children = e_tree_model_node_get_first_child(etta->priv->source, path); + children; children = e_tree_model_node_get_next(etta->priv->source, children)) { e_tree_table_adapter_node_set_expanded_recurse(etta, children, expanded); } @@ -1197,13 +1197,13 @@ e_tree_table_adapter_row_of_node (ETreeTableAdapter *etta, ETreePath path) return get_row(etta, path); } -gboolean +gboolean e_tree_table_adapter_root_node_is_visible(ETreeTableAdapter *etta) { return etta->priv->root_visible; } -void +void e_tree_table_adapter_show_node (ETreeTableAdapter *etta, ETreePath path) { ETreePath parent; @@ -1216,7 +1216,7 @@ e_tree_table_adapter_show_node (ETreeTableAdapter *etta, ETreePath path) } } -gboolean +gboolean e_tree_table_adapter_node_is_expanded (ETreeTableAdapter *etta, ETreePath path) { node_t *node = get_node(etta, path); diff --git a/widgets/table/e-tree-table-adapter.h b/widgets/table/e-tree-table-adapter.h index 36cbd09f27..0a57b593e8 100644 --- a/widgets/table/e-tree-table-adapter.h +++ b/widgets/table/e-tree-table-adapter.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-tree-table-adapter.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index 24ee33ff73..2c5f991bdc 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -275,7 +275,7 @@ static ETableCol * current_search_col (ETree *et) { if (!et->priv->search_col_set) { - et->priv->current_search_col = + et->priv->current_search_col = e_table_util_calculate_current_search_col (et->priv->header, et->priv->full_header, et->priv->sort_info, @@ -608,10 +608,10 @@ e_tree_init (ETree *e_tree) e_tree->priv->search = e_table_search_new(); - e_tree->priv->search_search_id = + e_tree->priv->search_search_id = g_signal_connect (G_OBJECT (e_tree->priv->search), "search", G_CALLBACK (et_search_search), e_tree); - e_tree->priv->search_accept_id = + e_tree->priv->search_accept_id = g_signal_connect (G_OBJECT (e_tree->priv->search), "accept", G_CALLBACK (et_search_accept), e_tree); @@ -1124,7 +1124,7 @@ e_tree_setup_table (ETree *e_tree) /** * e_tree_set_search_column: * @e_tree: #ETree object that will be modified - * @col: Column index to use for searches + * @col: Column index to use for searches * * This routine sets the current search column to be used for keypress * searches of the #ETree. If -1 is passed in for column, the current @@ -1269,11 +1269,11 @@ e_tree_get_state_object (ETree *e_tree) /** * e_tree_get_state: * @e_tree: The #ETree to act on - * + * * Builds a state object based on the current state and returns the * string corresponding to that state. - * - * Return value: + * + * Return value: * A string describing the current state of the #ETree. **/ gchar * @@ -1310,9 +1310,9 @@ e_tree_save_state (ETree *e_tree, /** * e_tree_get_spec: * @e_tree: The #ETree to query - * + * * Returns the specification object. - * + * * Return value: **/ ETableSpecification * @@ -1352,7 +1352,7 @@ et_table_rows_deleted (ETableModel *table_model, int row, int count, ETree *et) prev_node = e_tree_node_at_row (et, row-1); node = e_tree_get_cursor (et); - + /* Check if the cursor is a child of the node directly before the * deleted region (implying that an expander was collapsed with * the cursor inside it) */ @@ -1377,7 +1377,7 @@ et_connect_to_etta (ETree *et) et->priv->table_cell_change_id = g_signal_connect (et->priv->etta, "model_cell_changed", G_CALLBACK (et_table_cell_changed), et); - + et->priv->table_rows_delete_id = g_signal_connect (et->priv->etta, "model_rows_deleted", G_CALLBACK (et_table_rows_deleted), et); @@ -1473,10 +1473,10 @@ et_real_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete, * @ete: An optional #ETableExtras. (%NULL is valid.) * @spec_str: The spec. * @state_str: An optional state. (%NULL is valid.) - * + * * This is the internal implementation of e_tree_new() for use by * subclasses or language bindings. See e_tree_new() for details. - * + * * Return value: %TRUE on success, %FALSE if an error occurred **/ gboolean @@ -1535,7 +1535,7 @@ e_tree_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete, * This is the internal implementation of e_tree_new_from_spec_file() * for use by subclasses or language bindings. See * e_tree_new_from_spec_file() for details. - * + * * Return value: %TRUE on success, %FALSE if an error occurred **/ gboolean @@ -1593,7 +1593,7 @@ e_tree_construct_from_spec_file (ETree *e_tree, ETreeModel *etm, ETableExtras *e * @ete: An optional #ETableExtras (%NULL is valid.) * @spec: The spec * @state: An optional state (%NULL is valid.) - * + * * This function creates an #ETree from the given parameters. The * #ETreeModel is a tree model to be represented. The #ETableExtras * is an optional set of pixbufs, cells, and sorting functions to be @@ -1604,8 +1604,8 @@ e_tree_construct_from_spec_file (ETree *e_tree, ETreeModel *etm, ETableExtras *e * default sorting state and such. @state is an optional string * specifying the current sorting state and such. If @state is NULL, * then the default state from the spec will be used. - * - * Return value: + * + * Return value: * The newly created #ETree or %NULL if there's an error. **/ GtkWidget * @@ -1634,7 +1634,7 @@ e_tree_new (ETreeModel *etm, ETableExtras *ete, const char *spec, const char *st * @ete: An optional #ETableExtras. (%NULL is valid.) * @spec_fn: The filename of the spec. * @state_fn: An optional state file. (%NULL is valid.) - * + * * This is very similar to e_tree_new(), except instead of passing in * strings you pass in the file names of the spec and state to load. * @@ -1644,8 +1644,8 @@ e_tree_new (ETreeModel *etm, ETableExtras *ete, const char *spec, const char *st * @state_fn is the filename of the initial state to load. If this is * %NULL or if the specified file doesn't exist, the default state * from the spec file is used. - * - * Return value: + * + * Return value: * The newly created #ETree or %NULL if there's an error. **/ GtkWidget * @@ -1851,7 +1851,7 @@ et_set_property (GObject *object, NULL); } break; - + case PROP_DRAW_FOCUS: etree->priv->draw_focus = g_value_get_boolean (value); if (etree->priv->item) { @@ -2111,12 +2111,12 @@ e_tree_find_next (ETree *et, ETreeFindNextParams params, ETreePathFunc func, gpo cursor = e_tree_get_cursor (et); row = e_tree_table_adapter_row_of_node (et->priv->etta, cursor); row_count = e_table_model_row_count (E_TABLE_MODEL (et->priv->etta)); - + if (params & E_TREE_FIND_NEXT_FORWARD) found = find_next_in_range (et, row + 1, row_count - 1, func, data); else found = find_prev_in_range (et, row == -1 ? -1 : row - 1, 0, func, data); - + if (found) { e_tree_table_adapter_show_node (et->priv->etta, found); e_tree_set_cursor (et, found); @@ -2541,7 +2541,7 @@ e_tree_drag_begin (ETree *tree, * @y: Y coordinate for the pixel * @row_return: Pointer to return the row value * @col_return: Pointer to return the column value - * + * * Return the row and column for the cell in which the pixel at (@x, @y) is * contained. **/ @@ -2577,7 +2577,7 @@ e_tree_get_cell_at (ETree *tree, * @y_return: Returns the y coordinate of the upper right hand corner of the cell with respect to the widget. * @width_return: Returns the width of the cell. * @height_return: Returns the height of the cell. - * + * * Computes the data about this cell. **/ void @@ -2739,7 +2739,7 @@ scroll_timeout (gpointer data) et->priv->last_drop_x, et->priv->last_drop_y, et->priv->last_drop_time); - + return TRUE; } @@ -2866,8 +2866,8 @@ context_connect (ETree *et, GdkDragContext *context) { if (context == et->priv->last_drop_context) return; - - if (et->priv->last_drop_context) + + if (et->priv->last_drop_context) g_object_weak_unref (G_OBJECT(et->priv->last_drop_context), context_destroyed, et); else g_object_ref (et); @@ -3000,7 +3000,7 @@ et_drag_drop(GtkWidget *widget, et->priv->drop_path = NULL; et->priv->drop_col = -1; - collapse_drag (et, path); + collapse_drag (et, path); scroll_off (et); return ret_val; @@ -3222,7 +3222,7 @@ e_tree_class_init (ETreeClass *class) G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_DRAG_CONTEXT); - + et_signals[TREE_DRAG_LEAVE] = g_signal_new ("tree_drag_leave", G_OBJECT_CLASS_TYPE (object_class), diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h index e25110a0e6..2b3de1b042 100644 --- a/widgets/table/e-tree.h +++ b/widgets/table/e-tree.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-tree.h * Copyright 2000, 2001, Ximian, Inc. * @@ -101,8 +101,8 @@ typedef struct { ETreePath path, int col, GdkDragContext *context); - - /* Target side drag signals */ + + /* Target side drag signals */ void (* tree_drag_leave) (ETree *tree, int row, ETreePath path, diff --git a/widgets/table/table-test.h b/widgets/table/table-test.h index 60d62e8dc3..21696df835 100644 --- a/widgets/table/table-test.h +++ b/widgets/table/table-test.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * table-test.c * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/table/test-check.c b/widgets/table/test-check.c index 0fb1d38279..89f2af1ec2 100644 --- a/widgets/table/test-check.c +++ b/widgets/table/test-check.c @@ -78,7 +78,7 @@ value_at (ETableModel *etc, int col, int row, void *data) return GINT_TO_POINTER (my_table [row].value); else return my_table [row].string; - + } static void @@ -165,11 +165,11 @@ check_test (void) GnomeCanvasItem *item; gtk_widget_push_colormap (gdk_rgb_get_cmap ()); - + e_table_model = e_table_simple_new ( col_count, row_count, value_at, - set_value_at, is_cell_editable, - duplicate_value, free_value, + set_value_at, is_cell_editable, + duplicate_value, free_value, initialize_value, value_is_empty, value_to_string, NULL); @@ -186,7 +186,7 @@ check_test (void) col_0 = e_table_col_new_with_pixbuf (0, pixbuf, 0.0, 18, cell_image_check, e_int_compare, TRUE); gdk_pixbuf_unref (pixbuf); e_table_header_add_column (e_table_header, col_0, 0); - + col_1 = e_table_col_new (1, "Item Name", 1.0, 20, cell_left_just, e_str_compare, TRUE); e_table_header_add_column (e_table_header, col_1, 1); e_table_col_set_arrow (col_1, E_TABLE_COL_ARROW_DOWN); @@ -199,7 +199,7 @@ check_test (void) g_signal_connect (canvas, "size_allocate", G_CALLBACK (set_canvas_size), NULL); - + gtk_container_add (GTK_CONTAINER (window), canvas); gtk_widget_show_all (window); gnome_canvas_item_new ( diff --git a/widgets/table/test-cols.c b/widgets/table/test-cols.c index f0f0c970ae..b1dd6c4e6d 100644 --- a/widgets/table/test-cols.c +++ b/widgets/table/test-cols.c @@ -78,7 +78,7 @@ value_at (ETableModel *etc, int col, int row, void *data) return GINT_TO_POINTER (my_table [row].value); else return my_table [row].string; - + } static void @@ -164,7 +164,7 @@ multi_cols_test (void) GnomeCanvasItem *item; gtk_widget_push_colormap (gdk_rgb_get_cmap ()); - + e_table_model = e_table_simple_new ( col_count, row_count, value_at, set_value_at, is_cell_editable, @@ -183,7 +183,7 @@ multi_cols_test (void) { GdkPixbuf **images = g_new (GdkPixbuf *, 3); int i; - + images [0] = gdk_pixbuf_new_from_file ("image1.png"); images [1] = gdk_pixbuf_new_from_file ("image2.png"); images [2] = gdk_pixbuf_new_from_file ("image3.png"); @@ -192,10 +192,10 @@ multi_cols_test (void) for (i = 0; i < 3; i++) gdk_pixbuf_unref (images [i]); - + g_free (images); - } - + } + col_1 = e_table_col_new (1, "Item Name", 1.0, 20, cell_left_just, e_str_compare, TRUE); e_table_header_add_column (e_table_header, col_1, 0); @@ -209,7 +209,7 @@ multi_cols_test (void) e_table_header_add_column (e_table_header_multiple, col_0, 0); e_table_header_add_column (e_table_header_multiple, col_1, 1); e_table_header_add_column (e_table_header_multiple, col_1, 2); - + /* * GUI */ @@ -218,7 +218,7 @@ multi_cols_test (void) g_signal_connect (canvas, "size_allocate", G_CALLBACK (set_canvas_size), NULL); - + gtk_container_add (GTK_CONTAINER (window), canvas); gtk_widget_show_all (window); @@ -242,7 +242,7 @@ multi_cols_test (void) NULL); e_canvas_item_move_absolute (item, 0, 30); - + gnome_canvas_item_new ( gnome_canvas_root (GNOME_CANVAS (canvas)), e_table_header_item_get_type (), diff --git a/widgets/text/e-text-model-repos.c b/widgets/text/e-text-model-repos.c index d6687610b6..cb7309279e 100644 --- a/widgets/text/e-text-model-repos.c +++ b/widgets/text/e-text-model-repos.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-text-model-repos.c - Standard ETextModelReposFn definitions * Copyright 2000, 2001, Ximian, Inc. * @@ -45,7 +45,7 @@ e_repos_absolute (gint pos, gpointer data) gint len = e_text_model_get_text_length (info->model); pos += len + 1; } - + return e_text_model_validate_position (info->model, pos); } diff --git a/widgets/text/e-text-model-repos.h b/widgets/text/e-text-model-repos.h index 46c928f133..2f1ef67430 100644 --- a/widgets/text/e-text-model-repos.h +++ b/widgets/text/e-text-model-repos.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-text-model-repos.h - Standard ETextModelReposFn definitions * Copyright 2000, 2001, Ximian, Inc. * @@ -56,7 +56,7 @@ typedef struct { ETextModel *model; gint pos; /* Location of first deleted character. */ gint len; /* Number of characters deleted. */ -} EReposDeleteShift; +} EReposDeleteShift; gint e_repos_delete_shift (gint pos, gpointer data); diff --git a/widgets/text/e-text-model-test.c b/widgets/text/e-text-model-test.c index efa4bc0402..13d6121414 100644 --- a/widgets/text/e-text-model-test.c +++ b/widgets/text/e-text-model-test.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-text-model-test.c * Copyright 2000, 2001, Ximian, Inc. * @@ -65,10 +65,10 @@ main (int argc, gchar **argv) e_text_model_set_text (model, "My favorite website is http://www.ximian.com. My next favorite www.assbarn.com."); // describe_model (model); - + for (i=0; i<2; ++i) { win[i] = gtk_window_new (GTK_WINDOW_TOPLEVEL); - + gtk_widget_push_colormap (gdk_rgb_get_cmap ()); canvas[i] = e_canvas_new (); gtk_widget_pop_colormap (); diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c index 1b4a507518..4f5cf529a6 100644 --- a/widgets/text/e-text-model.c +++ b/widgets/text/e-text-model.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-text-model.c * Copyright 2000, 2001, Ximian, Inc. * @@ -108,12 +108,12 @@ e_text_model_class_init (ETextModelClass *klass) NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - + /* No default signal handlers. */ klass->changed = NULL; klass->reposition = NULL; klass->object_activated = NULL; - + klass->validate_pos = e_text_model_real_validate_position; klass->get_text = e_text_model_real_get_text; @@ -127,7 +127,7 @@ e_text_model_class_init (ETextModelClass *klass) klass->objectify = NULL; klass->obj_count = NULL; klass->get_nth_obj = NULL; - + object_class->dispose = e_text_model_dispose; } @@ -201,7 +201,7 @@ e_text_model_real_set_text (ETextModel *model, const gchar *text) g_string_set_size (model->priv->text, 0); } else if (*model->priv->text->str == '\0' || strcmp (model->priv->text->str, text)) { - + g_string_assign (model->priv->text, text); changed = TRUE; @@ -305,7 +305,7 @@ void e_text_model_cancel_completion (ETextModel *model) { g_return_if_fail (E_IS_TEXT_MODEL (model)); - + g_signal_emit (model, e_text_model_signals[E_TEXT_MODEL_CANCEL_COMPLETION], 0); } @@ -383,7 +383,7 @@ e_text_model_set_text (ETextModel *model, const gchar *text) void e_text_model_insert (ETextModel *model, gint position, const gchar *text) -{ +{ g_return_if_fail (model != NULL); g_return_if_fail (E_IS_TEXT_MODEL (model)); @@ -535,7 +535,7 @@ e_text_model_get_object_at_offset (ETextModel *model, gint offset) return E_TEXT_MODEL_GET_CLASS (model)->obj_at_offset (model, offset); - } else { + } else { /* If not, we fake it.*/ gint i, N, pos0, pos1; @@ -547,7 +547,7 @@ e_text_model_get_object_at_offset (ETextModel *model, gint offset) if (pos0 <= offset && offset < pos1) return i; } - + } return -1; diff --git a/widgets/text/e-text-model.h b/widgets/text/e-text-model.h index 5d6422f5c0..d45e3f37cd 100644 --- a/widgets/text/e-text-model.h +++ b/widgets/text/e-text-model.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-text-model.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/text/e-text-test.c b/widgets/text/e-text-test.c index ec6562787d..01396cbd78 100644 --- a/widgets/text/e-text-test.c +++ b/widgets/text/e-text-test.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-text-test.c - E-Text item test program * Copyright 2000: Iain Holmes <ih@csd.abdn.ac.uk> * @@ -121,7 +121,7 @@ main (int argc, gtk_entry_set_text(GTK_ENTRY(text), "Hello World! This is a really long string to test out the ellipsis stuff."); gtk_container_add (GTK_CONTAINER (frame), text); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); - + frame = gtk_frame_new ("Font"); font = gtk_entry_new (); gtk_entry_set_text(GTK_ENTRY(font), "fixed"); diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index 6941314dfa..f514f41672 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-text.c - Text item for evolution. * Copyright 2000, 2001, Ximian, Inc. * @@ -155,7 +155,7 @@ static void e_text_editable_set_position (GtkEditable *editable, gint position); static gint e_text_editable_get_position (GtkEditable *editable); #endif - + /* IM Context Callbacks */ static void e_text_commit_cb (GtkIMContext *context, const gchar *str, @@ -203,7 +203,7 @@ e_text_dispose (GObject *object) text->tooltip_owner = 0; if (text->model_changed_signal_id) - g_signal_handler_disconnect (text->model, + g_signal_handler_disconnect (text->model, text->model_changed_signal_id); text->model_changed_signal_id = 0; @@ -236,13 +236,13 @@ e_text_dispose (GObject *object) g_source_remove(text->timeout_id); text->timeout_id = 0; } - + if (text->timer) { g_timer_stop(text->timer); g_timer_destroy(text->timer); text->timer = NULL; } - + if ( text->tooltip_timeout ) { g_source_remove (text->tooltip_timeout); text->tooltip_timeout = 0; @@ -297,7 +297,7 @@ insert_preedit_text (EText *text) text->text = e_text_model_get_text(text->model); length = strlen (text->text); - g_string_prepend_len (tmp_string, text->text,length); + g_string_prepend_len (tmp_string, text->text,length); if (text->preedit_len) gtk_im_context_get_preedit_string (text->im_context, @@ -309,7 +309,7 @@ insert_preedit_text (EText *text) else text->preedit_len = preedit_length = 0; - cpos = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text; + cpos = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text; if (preedit_length) { g_string_insert (tmp_string, cpos, preedit_string); @@ -428,7 +428,7 @@ reset_layout (EText *text) pango_layout_context_changed (text->layout); text->font_desc = pango_font_description_new (); - pango_font_description_set_size (text->font_desc, + pango_font_description_set_size (text->font_desc, pango_font_description_get_size ((GTK_WIDGET (item->canvas))->style->font_desc)); pango_font_description_set_family (text->font_desc, pango_font_description_get_family ((GTK_WIDGET (item->canvas))->style->font_desc)); @@ -679,7 +679,7 @@ e_text_set_property (GObject *object, GdkColor color = { 0, 0, 0, 0, }; GdkColor *pcolor; gboolean color_changed; - + gboolean needs_update = 0; gboolean needs_reflow = 0; @@ -694,7 +694,7 @@ e_text_set_property (GObject *object, if ( text->model_changed_signal_id ) g_signal_handler_disconnect (text->model, text->model_changed_signal_id); - + if ( text->model_repos_signal_id ) g_signal_handler_disconnect (text->model, text->model_repos_signal_id); @@ -731,7 +731,7 @@ e_text_set_property (GObject *object, } text->tep = E_TEXT_EVENT_PROCESSOR(g_value_get_object (value)); g_object_ref(text->tep); - text->tep_command_id = + text->tep_command_id = g_signal_connect(text->tep, "command", G_CALLBACK(e_text_command), @@ -898,7 +898,7 @@ e_text_set_property (GObject *object, text->needs_split_into_lines = 1; needs_reflow = 1; break; - + case PROP_BREAK_CHARACTERS: if ( text->break_characters ) { g_free(text->break_characters); @@ -930,7 +930,7 @@ e_text_set_property (GObject *object, } needs_reflow = 1; break; - + case PROP_DRAW_BORDERS: if (text->draw_borders != g_value_get_boolean (value)) { text->draw_borders = g_value_get_boolean (value); @@ -1096,7 +1096,7 @@ e_text_get_property (GObject *object, case PROP_TEXT_HEIGHT: g_value_set_double (value, text->height / text->item.canvas->pixels_per_unit); break; - + case PROP_EDITABLE: g_value_set_boolean (value, text->editable); break; @@ -1112,7 +1112,7 @@ e_text_get_property (GObject *object, case PROP_LINE_WRAP: g_value_set_boolean (value, text->line_wrap); break; - + case PROP_BREAK_CHARACTERS: g_value_set_string (value, g_strdup (text->break_characters)); break; @@ -1136,11 +1136,11 @@ e_text_get_property (GObject *object, case PROP_DRAW_BACKGROUND: g_value_set_boolean (value, text->draw_background); break; - + case PROP_DRAW_BUTTON: g_value_set_boolean (value, text->draw_button); break; - + case PROP_ALLOW_NEWLINES: g_value_set_boolean (value, text->allow_newlines); break; @@ -1152,7 +1152,7 @@ e_text_get_property (GObject *object, case PROP_IM_CONTEXT: g_value_set_object (value, text->im_context); break; - + case PROP_HANDLE_POPUP: g_value_set_boolean (value, text->handle_popup); break; @@ -1252,7 +1252,7 @@ e_text_realize (GnomeCanvasItem *item) gdk_color_context_query_color (item->canvas->cc, &text->color); gdk_gc_set_foreground (text->gc, &text->color); #endif - + text->i_cursor = gdk_cursor_new (GDK_XTERM); text->default_cursor = gdk_cursor_new (GDK_LEFT_PTR); } @@ -1282,7 +1282,7 @@ _get_tep(EText *text) { if (!text->tep) { text->tep = e_text_event_processor_emacs_like_new(); - text->tep_command_id = + text->tep_command_id = g_signal_connect(text->tep, "command", G_CALLBACK(e_text_command), @@ -1399,7 +1399,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, "width", &thiswidth, "height", &thisheight, NULL); - + if (text->draw_borders){ gtk_paint_shadow (widget->style, drawable, @@ -1412,9 +1412,9 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, if (text->draw_background) { gtk_paint_flat_box (widget->style, drawable, GTK_WIDGET_STATE(widget), GTK_SHADOW_NONE, - NULL, widget, "entry_bg", + NULL, widget, "entry_bg", thisx + widget->style->xthickness, - thisy + widget->style->ythickness, + thisy + widget->style->ythickness, thiswidth - widget->style->xthickness * 2, thisheight - widget->style->ythickness * 2); } @@ -1513,7 +1513,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, } - insert_preedit_text (text); + insert_preedit_text (text); if (!pango_layout_get_text (text->layout)) return; @@ -1533,7 +1533,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, rect.y = ypos; rect.width = text->clip_cwidth - text->xofs; rect.height = text->clip_cheight - text->yofs; - + gdk_gc_set_clip_rectangle (main_gc, &rect); clip_rect = ▭ } @@ -1583,7 +1583,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, if (start_index < line->start_index + line->length && end_index > line->start_index) { - + if (start_index <= line->start_index) s = line->start_index; else @@ -1624,7 +1624,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, } gdk_gc_set_clip_region (text_gc, clip_region); - gdk_draw_layout (drawable, text_gc, + gdk_draw_layout (drawable, text_gc, xpos, ypos, text->layout); @@ -1807,7 +1807,7 @@ _blink_scroll_timeout (gpointer data) gulong current_time; gboolean scroll = FALSE; gboolean redraw = FALSE; - + g_timer_elapsed(text->timer, ¤t_time); if (text->scroll_start + SCROLL_WAIT_TIME > 1000000) { @@ -1917,7 +1917,7 @@ tooltip_ungrab (GtkWidget *tooltip, GdkEvent *event, EText *text) gdk_keyboard_ungrab(GDK_CURRENT_TIME); e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(text)->canvas)); - + gtk_propagate_event (GTK_WIDGET(GNOME_CANVAS_ITEM(text)->canvas), event); return TRUE; @@ -1994,7 +1994,7 @@ _do_tooltip (gpointer data) canvas = e_canvas_new (); gtk_container_add (GTK_CONTAINER (tooltip_window), canvas); - + /* Get the longest line length */ pango_layout_get_size (text->layout, &max_width, NULL); @@ -2094,7 +2094,7 @@ _do_tooltip (gpointer data) "x2", (double) tooltip_width + 4 + (text->draw_borders ? BORDER_INDENT * 2 : 0), "y2", (double) tooltip_height + 4 + (text->draw_borders ? BORDER_INDENT * 2 : 0), NULL); - + gtk_widget_show (canvas); gtk_widget_realize (tooltip_window); @@ -2102,11 +2102,11 @@ _do_tooltip (gpointer data) tooltip_width + 4 + (text->draw_borders ? BORDER_INDENT * 2 : 0), tooltip_height + 4 + (text->draw_borders ? BORDER_INDENT * 2 : 0)); gnome_canvas_set_scroll_region (GNOME_CANVAS(canvas), 0.0, 0.0, - tooltip_width + (text->draw_borders ? BORDER_INDENT * 2 : 0), + tooltip_width + (text->draw_borders ? BORDER_INDENT * 2 : 0), (double)tooltip_height + (text->draw_borders ? BORDER_INDENT * 2 : 0)); g_signal_connect (tooltip_window, "event", G_CALLBACK(tooltip_event), text); - + g_object_weak_ref (G_OBJECT (tooltip_window), tooltip_destroy, text); g_object_ref (text); @@ -2118,9 +2118,9 @@ _do_tooltip (gpointer data) gdk_keyboard_grab (tooltip_window->window, FALSE, GDK_CURRENT_TIME); g_signal_connect (tooltip_window, "key-press-event", G_CALLBACK (tooltip_ungrab), text); - + text->tooltip_owner = TRUE; - + text->tooltip_timeout = 0; return FALSE; @@ -2212,11 +2212,11 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event) /* Evil hack to disconnect the signal handlers for the previous Etext * which was not disconnected because of being in preedit mode. * In preedit mode the widget can go out of focus due to popups associated - * with preedit.,but still the callbacks need to be connected. - * Here when a new text widget comes into focus we can disconnect the + * with preedit.,but still the callbacks need to be connected. + * Here when a new text widget comes into focus we can disconnect the * old one.Shouldn't hurt much, as in worst case, save_text which should - * be disconnected will be overwritten and we will have signal - * handlers connect to multiple e-texts but with subsequent commit these + * be disconnected will be overwritten and we will have signal + * handlers connect to multiple e-texts but with subsequent commit these * should go away. */ @@ -2244,8 +2244,8 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event) start_editing (text); text->show_cursor = FALSE; /* so we'll redraw and the cursor will be shown */ } else { - /* Incase we are not disconnecting the signals - * for text, we are saving text for + /* Incase we are not disconnecting the signals + * for text, we are saving text for * disconnecting in the next focus_in. */ if (!text->preedit_len && text->im_context) { @@ -2275,11 +2275,11 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event) } return_val = 0; break; - case GDK_KEY_PRESS: + case GDK_KEY_PRESS: /* Handle S-F10 key binding here. */ - if (event->key.keyval == GDK_F10 + if (event->key.keyval == GDK_F10 && (event->key.state & GDK_SHIFT_MASK) && text->handle_popup ){ @@ -2337,7 +2337,7 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event) if (event->type == GDK_KEY_PRESS) g_signal_emit (text, e_text_signals[E_TEXT_KEYPRESS], 0, e_tep_event.key.keyval, e_tep_event.key.state); - + if (e_tep_event.key.string) g_free (e_tep_event.key.string); @@ -2354,8 +2354,8 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event) } e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(text)->canvas)); #if 0 - if ((!text->editing) - && text->editable + if ((!text->editing) + && text->editable && event->type == GDK_BUTTON_RELEASE && event->button.button == 1) { GdkEventButton button = event->button; @@ -2373,8 +2373,8 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event) e_tep_event.type = GDK_BUTTON_RELEASE; } #else - if ((!text->editing) - && text->editable + if ((!text->editing) + && text->editable && (event->button.button == 1 || event->button.button == 2)) { e_canvas_item_grab_focus (item, TRUE); @@ -2394,10 +2394,10 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event) } } - /* Create our own double and triple click events, + /* Create our own double and triple click events, as gnome-canvas doesn't forward them to us */ if (event->type == GDK_BUTTON_PRESS) { - if (text->dbl_timeout == 0 && + if (text->dbl_timeout == 0 && text->tpl_timeout == 0) { text->dbl_timeout = g_timeout_add (200, _click, @@ -2408,10 +2408,10 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event) text->tpl_timeout = g_timeout_add (200, _click, &(text->tpl_timeout)); } else { e_tep_event.type = GDK_3BUTTON_PRESS; - } + } } } - + if (text->editing) { GdkEventButton button = event->button; e_tep_event.button.time = button.time; @@ -2472,7 +2472,7 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event) text->tooltip_timeout = 0; } } - + text->pointer_in = FALSE; if (text->editing || text->draw_borders) { if ( ! text->default_cursor_shown ) { @@ -2495,7 +2495,7 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event) void e_text_copy_clipboard (EText *text) { - gint selection_start_pos; + gint selection_start_pos; gint selection_end_pos; selection_start_pos = MIN (text->selection_start, text->selection_end); @@ -2573,7 +2573,7 @@ primary_get_cb (GtkClipboard *clipboard, sel_end = g_utf8_offset_to_pointer (text->text, sel_end) - text->text; if (sel_start != sel_end) { - gtk_selection_data_set_text (selection_data, + gtk_selection_data_set_text (selection_data, text->text + sel_start, sel_end - sel_start); } @@ -2596,13 +2596,13 @@ e_text_update_primary_selection (EText *text) { "UTF8_STRING", 0, 0 }, { "UTF-8", 0, 0 }, { "STRING", 0, 0 }, - { "TEXT", 0, 0 }, + { "TEXT", 0, 0 }, { "COMPOUND_TEXT", 0, 0 } }; GtkClipboard *clipboard; clipboard = gtk_widget_get_clipboard (GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas), GDK_SELECTION_PRIMARY); - + if (text->selection_start != text->selection_end) { if (!gtk_clipboard_set_with_owner (clipboard, targets, G_N_ELEMENTS (targets), primary_get_cb, primary_clear_cb, G_OBJECT (text))) @@ -2620,7 +2620,7 @@ paste_received (GtkClipboard *clipboard, gpointer data) { EText *etext = E_TEXT (data); - + if (text && g_utf8_validate (text, strlen (text), NULL)) { if (etext->selection_end != etext->selection_start) e_text_delete_selection (etext); @@ -2728,7 +2728,7 @@ popup_targets_received (GtkClipboard *clipboard, gtk_widget_show (menuitem); submenu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu); - + gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menuitem); gtk_im_multicontext_append_menuitems (GTK_IM_MULTICONTEXT (text->im_context), @@ -2813,7 +2813,7 @@ next_word (EText *text, int start) } } } - + return g_utf8_pointer_to_offset (text->text, p); } @@ -2831,7 +2831,7 @@ find_offset_into_line (EText *text, int offset_into_text, char **start_of_line) } else { p = g_utf8_find_prev_char (text->text, p); - + while (p && p > text->text) { if (*p == '\n') { if (start_of_line) @@ -2859,11 +2859,11 @@ _get_updated_position (EText *text, gboolean direction) char *p = NULL; gint new_pos = 0; gint length = 0; - + /* Basic sanity test, return whatever position we are currently at. */ g_return_val_if_fail (text->layout != NULL, text->selection_end); - length = g_utf8_strlen (text->text, -1); + length = g_utf8_strlen (text->text, -1); /* length checks to make sure we are not wandering off into nonexistant memory... */ if((text->selection_end >= length) && (TRUE == direction)) /* forward */ @@ -2871,7 +2871,7 @@ _get_updated_position (EText *text, gboolean direction) /* checking for -ve value wont hurt! */ if((text->selection_end <= 0) && (FALSE == direction)) /* backward */ return 0; - + /* check for validness of full text->text */ if(!g_utf8_validate(text->text, -1, NULL)) return text->selection_end; @@ -2891,13 +2891,13 @@ _get_updated_position (EText *text, gboolean direction) p = g_utf8_next_char (p); else p = g_utf8_prev_char (p); - + /* validate the new string & return with original position if check fails */ if(!g_utf8_validate (p, -1, NULL)) break; /* will return old value of new_pos */ - + new_pos = g_utf8_pointer_to_offset (text->text, p); - + /* if is_cursor_position is set, cursor can appear in front of character. i.e. this is a grapheme boundary AND make some sanity checks */ if((new_pos >=0) && (new_pos < n_attrs) && (log_attrs[new_pos].is_cursor_position)) @@ -2908,10 +2908,10 @@ _get_updated_position (EText *text, gboolean direction) break; } } - + if(log_attrs) g_free(log_attrs); - + return new_pos; } @@ -2926,7 +2926,7 @@ _get_position(EText *text, ETextEventProcessorCommand *command) gint new_pos = 0; switch (command->position) { - + case E_TEP_VALUE: new_pos = command->value; break; @@ -2946,7 +2946,7 @@ _get_position(EText *text, ETextEventProcessorCommand *command) case E_TEP_START_OF_LINE: if (text->selection_end >= 1) { - + p = g_utf8_offset_to_pointer (text->text, text->selection_end); if (p != text->text) { p = g_utf8_find_prev_char (text->text, p); @@ -2965,7 +2965,7 @@ _get_position(EText *text, ETextEventProcessorCommand *command) case E_TEP_END_OF_LINE: new_pos = -1; length = g_utf8_strlen (text->text, -1); - + if (text->selection_end >= length) { new_pos = length; } else { @@ -2976,7 +2976,7 @@ _get_position(EText *text, ETextEventProcessorCommand *command) if (*p == '\n') { new_pos = g_utf8_pointer_to_offset (text->text, p); p = NULL; - } else + } else p = g_utf8_next_char (p); } } @@ -2993,7 +2993,7 @@ _get_position(EText *text, ETextEventProcessorCommand *command) new_pos = length; else new_pos = _get_updated_position(text, TRUE); /* get updated position to display cursor */ - + break; case E_TEP_BACKWARD_CHARACTER: @@ -3032,7 +3032,7 @@ _get_position(EText *text, ETextEventProcessorCommand *command) } } } - + break; case E_TEP_FORWARD_LINE: { @@ -3107,7 +3107,7 @@ _get_position(EText *text, ETextEventProcessorCommand *command) /* This is a silly hack to cause double-clicking on an object to activate that object. (Normally, double click == select word, which is why this is here.) */ - + obj_num = e_text_model_get_object_at_offset (text->model, text->selection_start); if (obj_num != -1) { e_text_model_activate_nth_object (text->model, obj_num); @@ -3140,7 +3140,7 @@ _get_position(EText *text, ETextEventProcessorCommand *command) text->selection_start = e_text_model_validate_position (text->model, text->selection_start); - + length = g_utf8_strlen (text->text, -1); if (text->selection_end >= length) { new_pos = length; @@ -3169,7 +3169,7 @@ _get_position(EText *text, ETextEventProcessorCommand *command) case E_TEP_FORWARD_PARAGRAPH: case E_TEP_BACKWARD_PARAGRAPH: - + case E_TEP_FORWARD_PAGE: case E_TEP_BACKWARD_PAGE: new_pos = text->selection_end; @@ -3288,7 +3288,7 @@ e_text_command(ETextEventProcessor *tep, ETextEventProcessorCommand *command, gp case E_TEP_SELECT: text->selection_start = e_text_model_validate_position (text->model, text->selection_start); /* paranoia */ text->selection_end = _get_position(text, command); - + e_text_update_primary_selection (text); use_start = FALSE; @@ -3346,7 +3346,7 @@ e_text_command(ETextEventProcessor *tep, ETextEventProcessorCommand *command, gp break; case E_TEP_GRAB: e_canvas_item_grab (E_CANVAS (GNOME_CANVAS_ITEM(text)->canvas), - GNOME_CANVAS_ITEM(text), + GNOME_CANVAS_ITEM(text), GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK, text->i_cursor, command->time, @@ -3392,7 +3392,7 @@ e_text_command(ETextEventProcessor *tep, ETextEventProcessorCommand *command, gp /* check if we are using selection_start or selection_end for moving? */ selection_index = use_start ? text->selection_start : text->selection_end; - + /* convert to a byte index */ selection_index = g_utf8_offset_to_pointer (text->text, selection_index) - text->text; @@ -3431,14 +3431,14 @@ e_text_command(ETextEventProcessor *tep, ETextEventProcessorCommand *command, gp if (xpos + 2 < text->xofs_edit) { text->xofs_edit = xpos; } - + clip_width = text->clip_width; if (clip_width >= 0 && text->draw_borders) { clip_width -= 6; if (clip_width < 0) clip_width = 0; } - + if (xpos + pango_pos.width - clip_width > text->xofs_edit) { text->xofs_edit = xpos + pango_pos.width - clip_width; } @@ -3456,13 +3456,13 @@ e_text_command(ETextEventProcessor *tep, ETextEventProcessorCommand *command, gp clip_height = text->height; else clip_height = text->clip_height; - + if (clip_height >= 0 && text->draw_borders) { clip_height -= 6; if (clip_height < 0) clip_height = 0; } - + if (ypos - clip_height > text->yofs_edit) { text->yofs_edit = ypos - clip_height; } @@ -3572,7 +3572,7 @@ e_text_class_init (ETextClass *klass) _( "Strikeout" ), FALSE, G_PARAM_READWRITE)); - + g_object_class_install_property (gobject_class, PROP_ANCHOR, g_param_spec_enum ("anchor", _( "Anchor" ), @@ -3798,12 +3798,12 @@ e_text_init (EText *text) text->revert = NULL; - text->model_changed_signal_id = + text->model_changed_signal_id = g_signal_connect (text->model, "changed", G_CALLBACK (e_text_text_model_changed), text); - text->model_repos_signal_id = + text->model_repos_signal_id = g_signal_connect (text->model, "reposition", G_CALLBACK (e_text_text_model_reposition), @@ -3894,9 +3894,9 @@ e_text_commit_cb (GtkIMContext *context, } } -/* +/* * Fetch cursor location into Strong or Weak positions so as to - * display the preedit candidate selection window in the right place + * display the preedit candidate selection window in the right place */ static void e_text_get_cursor_locations (EText *text, @@ -3939,7 +3939,7 @@ static void update_im_cursor_position (EText *text) { GdkRectangle area; - + e_text_get_cursor_locations (text, &area, NULL); gtk_im_context_set_cursor_location (text->im_context, &area); @@ -3952,7 +3952,7 @@ e_text_preedit_changed_cb (GtkIMContext *context, gchar *preedit_string = NULL; gint cursor_pos; - gtk_im_context_get_preedit_string (context, &preedit_string, + gtk_im_context_get_preedit_string (context, &preedit_string, NULL, &cursor_pos); cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1)); @@ -3971,7 +3971,7 @@ e_text_retrieve_surrounding_cb (GtkIMContext *context, text->text, strlen (text->text), g_utf8_offset_to_pointer (text->text, MIN (text->selection_start, text->selection_end)) - text->text); - + return TRUE; } diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h index 0f911b002d..eb7539f14b 100644 --- a/widgets/text/e-text.h +++ b/widgets/text/e-text.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-text.h - Text item for evolution. * Copyright 2000, 2001, Ximian, Inc. * @@ -102,7 +102,7 @@ typedef struct _ETextClass ETextClass; struct _EText { GnomeCanvasItem item; - + ETextModel *model; gint model_changed_signal_id; gint model_repos_signal_id; |