Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ** Fixes bug #534360 | Matthew Barnes | 2008-05-23 | 1 | -25/+34 |
| | | | | | | | | | | | | 2008-05-22 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #534360 Migrate from deprecated GtkObject symbols to GObject equivalents. Touches over 150 files in all components; too many to list. svn path=/trunk/; revision=35526 | ||||
* | ** Fixes bug #392747 (extra cleanup work) | Matthew Barnes | 2007-12-06 | 1 | -27/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | 2007-12-05 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #392747 (extra cleanup work) * calendar/gui/e-day-view.c (e_day_view_style_set): * calendar/gui/e-week-view-titles-item.c (e_week_view_titles_item_draw): * calendar/gui/e-week-view.c (e_week_view_style_set): * calendar/gui/print.c (print_month_summary): * calendar/gui/e-meeting-time-sel.c (e_meeting_time_selector_recalc_date_form): Call e_get_month_name() or e_get_weekday_name() instead of e_utf8_strftime() or g_date_strftime(). e_utf8_strftime() or g_date_strftime(). * widgets/misc/e-calendar-item.c (e_calendar_item_show_popup_menu): Call e_get_month_name() instead of e_utf8_strftime(). svn path=/trunk/; revision=34659 | ||||
* | ** Remove trailing whitespace from source code. | Matthew Barnes | 2007-11-15 | 1 | -5/+5 |
| | | | | | | | | | 2007-11-14 Matthew Barnes <mbarnes@redhat.com> ** Remove trailing whitespace from source code. svn path=/trunk/; revision=34537 | ||||
* | Update FSF address in header comments (#469886). Patch from Tobias | Matthew Barnes | 2007-09-02 | 1 | -1/+1 |
| | | | | | | | | | | 2007-09-02 Matthew Barnes <mbarnes@redhat.com> * Update FSF address in header comments (#469886). Patch from Tobias Mueller. svn path=/trunk/; revision=34151 | ||||
* | Cleanups: - remove unused vars - remove extraneous semi-colons - add some | Kjartan Maraas | 2006-02-08 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2006-01-09 Kjartan Maraas <kmaraas@gnome.org> * gui/alarm-notify/alarm-notify-dialog.c: (add_alarm_to_notified_alarms_dialog): * gui/alarm-notify/alarm-queue.c: (remove_queued_alarm), (open_alarm_dialog), (menu_item_toggle_callback), (populate): * gui/alarm-notify/alarm.c: (pop_alarm), (alarm_remove): * gui/alarm-notify/config-data.c: (config_data_replace_string_list): * gui/cal-search-bar.c: (regen_query): * gui/calendar-view-factory.c: * gui/calendar-view.c: * gui/comp-editor-factory.c: (edit_existing), (resolve_pending_requests), (impl_editExisting), (impl_editNew): * gui/control-factory.c: * gui/dialogs/cal-attachment-select-file.c: (comp_editor_select_file_attachments): * gui/dialogs/calendar-setup.c: (eccp_get_source_type): * gui/dialogs/comp-editor.c: (comp_editor_class_init), (commit_all_fields), (delete_event_cb), (editor_key_press_event), (menu_file_save_cb), (menu_file_close_cb), (make_icon_from_comp), (comp_editor_focus), (needs_send_cb): * gui/dialogs/delete-comp.c: (delete_component_dialog): * gui/dialogs/e-delegate-dialog.c: * gui/dialogs/event-editor.c: * gui/dialogs/event-page.c: (event_page_fill_widgets), (popup_delete_cb), (list_key_press): * gui/dialogs/meeting-page.c: (remove_clicked_cb), (popup_delete_cb), (button_press_event), (list_key_press), (meeting_page_construct): * gui/dialogs/memo-editor.c: (init_widgets), (memo_editor_set_e_cal), (memo_editor_edit_comp), (memo_editor_send_comp): * gui/dialogs/memo-page.c: * gui/dialogs/recurrence-page.c: (fill_exception_widgets), (exception_add_cb): * gui/dialogs/schedule-page.c: (clear_widgets), (schedule_page_fill_component): * gui/dialogs/task-details-page.c: (task_details_page_fill_timezones), (complete_date_changed): * gui/dialogs/task-editor.c: * gui/dialogs/task-page.c: (task_page_fill_widgets), (popup_delete_cb), (list_key_press): * gui/e-alarm-list.c: (get_alarm_string): * gui/e-cal-component-memo-preview.c: (write_html): * gui/e-cal-component-preview.c: (write_html): * gui/e-cal-list-view-config.c: (e_cal_list_view_config_set_property), (e_cal_list_view_config_get_property), (e_cal_list_view_config_dispose): * gui/e-cal-list-view.c: * gui/e-cal-model-calendar.c: (ecmc_value_at): * gui/e-cal-model-memos.c: (ecmm_value_at): * gui/e-cal-model-tasks.c: (get_due_status), (ecmt_value_at), (ecmt_set_value_at), (ecmt_is_cell_editable), (ecmt_value_is_empty), (e_cal_model_tasks_mark_task_complete), (e_cal_model_tasks_update_due_tasks): * gui/e-cal-model.c: (get_classification), (ecm_get_color_for_component), (e_cal_model_set_default_client), (e_cal_view_objects_modified_cb), (e_cal_model_add_client), (e_cal_model_remove_client), (e_cal_model_set_instance_times): * gui/e-cal-popup.c: (ecalp_part_popup_saveas): * gui/e-calendar-table-config.c: (e_calendar_table_config_set_property), (e_calendar_table_config_get_property), (e_calendar_table_config_dispose): * gui/e-calendar-table.c: (e_calendar_table_class_init): * gui/e-calendar-table.h: * gui/e-calendar-view.c: (e_calendar_view_set_property), (e_calendar_view_get_property), (open_event_with_flags), (e_calendar_view_get_tooltips): * gui/e-cell-date-edit-config.c: (e_cell_date_edit_config_set_property), (e_cell_date_edit_config_get_property), (e_cell_date_edit_config_dispose): * gui/e-cell-date-edit-text.c: * gui/e-comp-editor-registry.c: * gui/e-date-edit-config.c: (e_date_edit_config_set_property), (e_date_edit_config_get_property), (e_date_edit_config_dispose): * gui/e-day-view-config.c: (e_day_view_config_set_property), (e_day_view_config_get_property), (e_day_view_config_dispose): * gui/e-day-view-main-item.c: (e_day_view_main_item_set_arg), (e_day_view_main_item_draw_day_event), (e_day_view_main_item_event): * gui/e-day-view-time-item.c: (e_day_view_time_item_set_arg), (e_day_view_time_item_get_column_width): * gui/e-day-view-top-item.c: (e_day_view_top_item_set_arg), (e_day_view_top_item_draw_long_event), (e_day_view_top_item_draw_triangle), (e_day_view_top_item_event): * gui/e-day-view.c: (process_component), (e_day_view_style_set), (e_day_view_recalc_cell_sizes), (e_day_view_foreach_event), (e_day_view_reshape_resize_long_event_rect_item), (e_day_view_update_long_event_resize), (e_day_view_update_resize), (e_day_view_reshape_long_event), (e_day_view_reshape_day_event), (e_day_view_change_duration_to_start_of_work_day), (tooltip_destroy), (e_day_view_on_text_item_event), (e_day_view_on_editing_stopped): * gui/e-itip-control.c: (e_itip_control_class_init), (find_cal_opened_cb), (find_server), (set_date_label), (ok_clicked_cb): * gui/e-meeting-attendee.c: * gui/e-meeting-list-view.c: (e_meeting_list_view_remove_attendee_from_name_selector): * gui/e-meeting-store.c: (role_to_text), (partstat_to_text), (e_meeting_store_set_value): * gui/e-meeting-time-sel-item.c: (e_meeting_time_selector_item_set_arg), (e_meeting_time_selector_item_paint_all_attendees_busy_periods): * gui/e-meeting-time-sel.c: (e_meeting_time_selector_construct), (e_meeting_time_selector_recalc_date_format): * gui/e-memo-table-config.c: (e_memo_table_config_set_property), (e_memo_table_config_get_property), (e_memo_table_config_dispose): * gui/e-memo-table.c: (e_memo_table_class_init), (task_compare_cb): * gui/e-memos.c: (update_view), (backend_error_cb), (open_ecal): * gui/e-mini-calendar-config.c: (e_mini_calendar_config_set_property), (e_mini_calendar_config_get_property), (e_mini_calendar_config_dispose): * gui/e-pub-utils.c: (is_publish_time), (e_pub_publish): * gui/e-tasks.c: (process_completed_tasks), (backend_error_cb): * gui/e-timezone-entry.c: (e_timezone_entry_destroy): * gui/e-week-view-config.c: (e_week_view_config_set_property), (e_week_view_config_get_property), (e_week_view_config_dispose): * gui/e-week-view-event-item.c: (e_week_view_event_item_draw), (e_week_view_event_item_draw_icons): * gui/e-week-view-main-item.c: (e_week_view_main_item_set_arg): * gui/e-week-view-titles-item.c: (e_week_view_titles_item_set_arg), (e_week_view_titles_item_draw): * gui/e-week-view.c: (process_component), (tooltip_destroy), (tooltip_event_cb), (e_week_view_reshape_event_span), (e_week_view_on_text_item_event), (e_week_view_event_move), (e_week_view_on_editing_stopped), (e_week_view_do_key_press): * gui/gnome-cal.c: (dn_e_cal_view_objects_modified_cb), (dn_e_cal_view_done_cb), (table_selection_change_cb), (gnome_calendar_goto), (focus_current_view), (backend_error_cb), (gnome_calendar_set_selected_time_range), (gnome_calendar_get_current_time_range), (gnome_calendar_get_visible_time_range), (gnome_calendar_delete_selected_occurrence): * gui/goto.c: (goto_dialog): * gui/itip-utils.c: (comp_fb_normalize): * gui/memos-component.c: (create_new_memo), (impl_requestCreateItem): * gui/migration.c: (migrate_memos): * gui/print.c: (print_month_small), (print_day_details), (print_todo_details), (print_comp_item): * gui/tasks-component.c: (create_new_todo), (impl_requestCreateItem): * gui/weekday-picker.c: Cleanups: - remove unused vars - remove extraneous semi-colons - add some comments where assignments were done without using the results later - remove break; statements after return foo; - add casts in some places to be more type correct - rename variables with name clashes - s/if/ifdef in some cases - mark some code static - remove some unused functions - use guint for 1-bit bitfields svn path=/trunk/; revision=31451 | ||||
* | convert to G_DEFINE_TYPE | JP Rosevear | 2004-10-14 | 1 | -13/+6 |
| | | | | | | | | | | | | | | | | 2004-10-14 JP Rosevear <jpr@novell.com> * gui/e-week-view-config.c: convert to G_DEFINE_TYPE * gui/e-week-view-event-item.c: ditto * gui/e-week-view-main-item.c: ditto * gui/e-week-view-titles-item.c: ditto * gui/e-week-view.c: ditto svn path=/trunk/; revision=27578 | ||||
* | Nuke GdkFont and use Pango's font measuring. | Hans Petter Jansson | 2003-04-02 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2003-04-01 Hans Petter Jansson <hpj@ximian.com> * gui/e-day-view-main-item.c (e_day_view_main_item_draw): Nuke GdkFont and use Pango's font measuring. * gui/e-day-view-time-itme.c (e_day_view_time_item_get_column_width) (e_day_view_time_item_draw): Ditto. * gui/e-day-view-top-item.c (e_day_view_top_item_draw) (e_day_view_top_item_draw_long_event): Ditto. * gui/e-day-view.c (e_day_view_style_set) (e_day_view_recalc_cell_sizes) (e_day_view_reshape_long_event) (e_day_view_update_top_canvas_drag) (e_day_view_update_main_canvas_drag): Ditto. * gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set) (e_meeting_time_selector_recalc_date_form): Ditto. * gui/e-week-view-event-item.c (e_week_view_draw_time): Ditto. * gui/e-week-view-main-item.c (e_week_view_main_item_draw_day): Ditto. * gui/e-week-view-titles-item.c (e_week_view_titles_item_draw): Ditto. * gui/e-week-view.c (e_week_view_style_set) (e_week_view_recalc_cell_sizes) (e_week_view_reshape_event_span): Ditto. * gui/weekday-picker.c (weekday_picker_style_set): Ditto. svn path=/trunk/; revision=20627 | ||||
* | Remove cruft. Rename ICONSDIR to IMAGESDIR. (gladedir, etspecdir, | Dan Winship | 2003-02-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gui/Makefile.am (INCLUDES): Remove cruft. Rename ICONSDIR to IMAGESDIR. (gladedir, etspecdir, serverdir): Remove definitions (libevolution_calendar_la_LDFLAGS): Remove -export-dynamic, add -module. * gui/calendar-config.c: #include <string.h> * gui/calendar-component.c (add_creatable_item): s/ICONSDIR/IMAGESDIR/ * gui/comp-util.c: #include <string.h> * gui/e-alarm-list.c: #include e-time-utils.h (row_deleted): Remove unused variable. (e_alarm_list_append): Likewise. * gui/e-date-time-list.c: #include e-time-utils.h, timeutil.h, calendar-config.h (row_deleted): Remove unused variable (e_date_time_list_append): Likewise. * gui/e-day-view.c (e_day_view_unrealize): Remove unused var (e_day_view_style_set): Likewise. (e_day_view_set_event_font_cb): Likewise. * gui/e-day-view-time-item.c: #include <string.h> (e_day_view_time_item_get_column_width): Remove unused variable. * gui/e-itip-control.c: #include <unistd.h> (url_requested_cb): s/ICONSDIR/IMAGESDIR/ * gui/e-week-view.c (e_week_view_unrealize): Remove unused variable (e_week_view_style_set): Likewise * gui/e-week-view-titles-item.c: #include string.h * gui/itip-bonobo-control.c: Likewise * gui/print.c: Likewise svn path=/trunk/; revision=19794 | ||||
* | Mainly making all views use PangoLayouts for text. When drawing a | Hans Petter Jansson | 2003-01-26 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2003-01-25 Hans Petter Jansson <hpj@ximian.com> Mainly making all views use PangoLayouts for text. When drawing a PangoLayout, the draw offset is the top left corner of the layout, not the text's baseline. Keep this in mind when viewing the changes. I'll be brief about the exact changes, since they speak better for themselves. * gui/e-day-view-time-item.c (e_day_view_time_item_get_column_width): Use Pango. (e_day_view_time_item_draw): Use Pango. * gui/e-day-view-top-item.c (e_day_view_top_item_draw): Use Pango. (e_day_view_top_item_draw_long_event): Add some FIXME text so we can see when this is being used. Is it in use at all? * gui/e-day-view.c: No longer specify an explicit X font string for the large font. Use the main font, and change the point size. (e_day_view_init): Use Pango. (e_day_view_style_set): Use Pango. Comment out the gdk_font setting for the drag text items for now. * gui/e-day-view.h: Use Pango. * gui/e-week-view-event-item.c (e_week_view_draw_time): Use Pango. * gui/e-week-view-main-item.c (e_week_view_main_item_draw_day): Use Pango. * gui/e-week-view-titles-item.c (e_week_view_titles_item_draw): Use Pango. * gui/e-week-view.c: No longer specify an explicit X font string for the small font. Use the main font, and change the point size. (e_week_view_init): Use Pango. (e_week_view_destroy): Use Pango. (get_string_width): Implemented for convenience. (get_digit_width): Implemented for convenience. (e_week_view_style_set): Use Pango. (e_week_view_recalc_cell_sizes): Use Pango. (e_week_view_get_time_string_width): Use Pango. * gui/e-week-view.h: Use Pango. Following are some random UTF-8 fixes and a crash fix. * gui/itip-utils.c (comp_description): Use g_locale_to_utf8 (). * gui/dialogs/comp-editor.c (make_title_from_comp): Return a UTF-8 string. * gui/dialogs/alarm-page.c (alarm_page_set_summary): Pass UTF-8 directly to GTK. * gui/dialogs/delete-comp.c (delete_component_dialog): Ditto. * gui/dialogs/meeting-page.c (meeting_page_fill_widgets): Ditto. (meeting_page_construct): Ditto. * gui/dialogs/recurrence-page.c (recurrence_page_set_summary): Ditto. * gui/dialogs/event-editor.c (event_editor_finalize): Fix crash caused by gtk_object_destroy()-ing a non-GtkObject. svn path=/trunk/; revision=19628 | ||||
* | Create a non-abstract enumeration type derived from GEnum. | Hans Petter Jansson | 2002-12-07 | 1 | -25/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2002-12-06 Hans Petter Jansson <hpj@ximian.com> * cal-client/cal-client.c (cal_client_open_status_enum_get_type): Create a non-abstract enumeration type derived from GEnum. (cal_client_set_mode_status_enum_get_type): Ditto. (cal_mode_enum_get_type): Ditto. (cal_client_class_init): Use our enumerations and not the abstract one. (cal_client_finalize): Don't destroy factories, since the CalClient doesn't own them anymore. They're shared between CalClients now. (get_factories): Implement. Move the factory setup code here from cal_client_construct (), and cache the factories. This is hopefully temporary, until wombat goes away or is fixed. (cal_client_construct): Most of the code moved to get_factories (). * cal-client/cal-client.h: Add enumeration type macros and protos. * gui/cal-search-bar.c (cal_search_bar_get_type): Removed in favour of E_MAKE_TYPE, which uses GObject calls. (cal_search_bar_class_init): Use g_type_class_peek_parent (). * gui/calendar-model.c (calendar_model_get_type): (calendar_model_class_init): Ditto, like above file. * gui/calendar-view.c (calendar_view_get_type): (calendar_view_class_init): Ditto. * gui/e-calendar-table.c (e_calendar_table_get_type): (e_calendar_table_class_init): Ditto. * gui/e-comp-editor-registry.c (e_comp_editor_registry_get_type): (class_init): Ditto. * gui/e-day-view-main-item.c (e_day_view_main_item_get_type): (e_day_view_main_item_class_init): Ditto. * gui/e-day-view-time-item.c (e_day_view_time_item_get_type): (e_day_view_time_item_class_init): Ditto. * gui/e-day-view-top-item.c (e_day_view_top_item_get_type): (e_day_view_top_item_class_init): Ditto. * gui/e-day-view.c (e_day_view_get_type): (e_day_view_class_init): Ditto. * gui/e-itip-control.c (e_itip_control_get_type): (class_init): Ditto. * gui/e-meeting-attendee.c (e_meeting_attendee_get_type): (class_init): Ditto. * gui/e-meeting-model.c (e_meeting_model_get_type): (class_init): Ditto. * gui/e-meeting-time-sel-item.c (e_meeting_time_selector_item_get_type): (e_meeting_time_selector_item_class_init): Ditto. * gui/e-meeting-time-sel.c (e_meeting_time_selector_get_type): (e_meeting_time_selector_class_init): Ditto. * gui/e-timezone-entry.c (e_timezone_entry_get_type): (e_timezone_entry_class_init): Ditto. * gui/e-week-view-event-item.c (e_week_view_event_item_get_type): (e_week_view_event_item_class_init): Ditto. * gui/e-week-view-main-item.c (e_week_view_main_item_get_type): (e_week_view_main_item_class_init): Ditto. * gui/e-week-view-titles-item.c (e_week_view_titles_item_get_type): (e_week_view_titles_item_class_init): Ditto. * gui/gnome-cal.c (gnome_calendar_get_type): (gnome_calendar_class_init): Ditto. * gui/weekday-picker.c (weekday_picker_get_type): (weekday_picker_class_init): Ditto. * gui/e-week-view.c (e_week_view_get_type): (e_week_view_class_init): Ditto, but parent_class init was moved from get_type() to class_init(). * gui/calendar-view-factory.c (calendar_view_factory_get_type): (calendar_view_factory_class_init): Ditto, and set up finalize callback instead of destroy. (calendar_view_factory_finalize): It's a GObject, so implement this. (celendar_view_factory_destroy): Move code to _finalize() and remove. * gui/main.c (init_bonobo): Remove extraneous bonobo_activation_init(). svn path=/trunk/; revision=19043 | ||||
* | Initial port of gui/ subdir to GNOME 2 | JP Rosevear | 2002-11-08 | 1 | -2/+2 |
| | | | | | | | | 2002-11-07 JP Rosevear <jpr@ximian.com> * Initial port of gui/ subdir to GNOME 2 svn path=/trunk/; revision=18648 | ||||
* | Fixing the license text. | Ettore Perazzoli | 2001-10-28 | 1 | -1/+0 |
| | | | | svn path=/trunk/; revision=14211 | ||||
* | Update the licensing information to require version 2 of the GPL | Ettore Perazzoli | 2001-10-27 | 1 | -2/+2 |
| | | | | | | (instead of version 2 or any later version). svn path=/trunk/; revision=14190 | ||||
* | Update the copyrights, replacing Helix Code with Ximian and | Ettore Perazzoli | 2001-06-23 | 1 | -2/+2 |
| | | | | | | helixcode.com with ximian.com all over the place. svn path=/trunk/; revision=10440 | ||||
* | added more support for config settings. | Damon Chaplin | 2000-11-27 | 1 | -5/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2000-11-26 Damon Chaplin <damon@helixcode.com> * gui/gnome-cal.c: added more support for config settings. * gui/e-week-view.[hc]: * gui/e-day-view.[hc]: added support for setting - show event end times, week start day and 12-hour format (unfinished). * gui/e-day-view-time-item.c: started 12-hour support. * gui/tag-calendar.c (prepare_tag): use end_day + 1 since we want to include the last day. * gui/event-editor.c (set_all_day): minor change when turning all_day off - set the event end to one hour after the event start if it is on or before the start time. Also added more comments to make it a bit clearer. * cal-util/cal-recur.c (cal_obj_time_add_days): use a gint for day rather than a guint since we now support -ve days. Also fixed bug with weekly recurrences. * gui/dialogs/task-editor.c (task_editor_create_date_edit): use config settings. * gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_update_config): updated EDateEdit calls. svn path=/trunk/; revision=6675 | ||||
* | added new source files and pixmaps, and removed old source files, which | Damon Chaplin | 2000-04-24 | 1 | -0/+300 |
2000-04-24 Damon Chaplin <damon@helixcode.com> * gui/Makefile.am: added new source files and pixmaps, and removed old source files, which can be deleted. * gui/e-week-view-titles-item.[hc]: * gui/e-week-view-main-item.[hc]: * gui/e-week-view-event-item.[hc]: * gui/e-week-view.[hc]: new files implementing the week/month views. * gui/yearview.xpm: * gui/monthview.xpm: * gui/weekview.xpm: * gui/workweekview.xpm: * gui/dayview.xpm: new pixmaps for the toolbar buttons. These aren't intended to be the final pixmaps. * gui/calendar-commands.c: added radio buttons to the toolbar to switch between the calendar views, and moved the am_pm_flag here so we can get rid of view-utils.c. * gui/gnome-cal.[hc]: made it a subclass of GtkVBox, rearranged the widgets into 2 notebooks, and added the selection_start_time and selection_end_time fields. * gui/goto.c: updated to use new selection time range. * gui/quick-view.c: added '#include <gtk/gtkwindow.h>' so it compiles. * gui/e-day-view.[hc]: changed the interface to support the new selection time range, got rid of a few debugging messages and changed a few bits. svn path=/trunk/; revision=2583 |